@postfetch/core 0.12.1 → 0.12.3

package/dist/hls.d.ts

@@ -12,5 +12,7 @@ export type HlsMaster = {
     audio: Record<string, string>;
 };
 export declare function isMasterPlaylist(text: string): boolean;
-export declare function parseMaster(text: string, baseUrl: string): HlsMaster;
+export declare function parseMaster(text: string, baseUrl: string, options?: {
+    preferOriginalAudio?: boolean;
+}): HlsMaster;
 export declare function assembleHls(net: Net, playlistUrl: string, headers: HeadersInit): Promise<Uint8Array>;

package/dist/index.js

@@ -365,8 +365,9 @@ function embedHeaders() {
 async function resolveInstagram(input) {
   const code = shortcode(input.url);
   const videoRequired = /\/(?:reel|reels|tv)\//.test(asUrl(input.url).pathname);
+  const page = await pageMedia(input.net, code, input.preferredWidth);
   const resolvers = [
-    () => pageMedia(input.net, code, input.preferredWidth),
+    async () => page.media,
     () => mobileMedia(input.net, code, input.preferredWidth),
     () => embedMedia(input.net, code),
     () => graphqlMedia(input.net, code)
@@ -380,7 +381,7 @@ async function resolveInstagram(input) {
     }
   }
   if (!media) {
-    throw await instagramUnavailable(input.net, code);
+    throw await instagramUnavailable(input.net, code, page.reason);
   }
   const items = mediaItems(media, code, input.preferredWidth);
   if (items.length === 0) {
@@ -388,12 +389,12 @@ async function resolveInstagram(input) {
   }
   return { archiveFilename: filename(`instagram_${code}.zip`), comments: [], id: code, items, metadata: instagramMetadata(media), platform: "instagram" };
 }
-async function instagramUnavailable(net, code) {
+async function instagramUnavailable(net, code, pageReason) {
   const url = new URL("https://i.instagram.com/api/v1/oembed/");
   url.searchParams.set("url", `https://www.instagram.com/p/${code}/`);
   const response = await net(url.href, { headers: mobileHeaders() }, 1).catch(() => null);
   const body = response ? await response.text().catch(() => "") : "";
-  const reason = instagramUnavailableReason(response?.status ?? 0, body);
+  const reason = pageReason ?? instagramUnavailableReason(response?.status ?? 0, body);
   const probe = response ? `oembed ${response.status}` : "oembed unreachable";
   return new PostfetchError(reasonStatus(reason), `Instagram post unavailable: ${reason} (${probe})`, reason);
 }
@@ -407,7 +408,7 @@ function instagramUnavailableReason(status, body) {
   if (status !== 0 && status < 400) {
     return "unavailable";
   }
-  if (/MIN_AGE_ACCOUNT|under 18/i.test(body)) {
+  if (/MIN_AGE_ACCOUNT|under 18|age[- ]restricted/i.test(body)) {
     return "ageRestricted";
   }
   if (/private account|"is_private":\s*true|account is private/i.test(body)) {
@@ -480,11 +481,15 @@ function shortcode(input) {
 async function pageMedia(net, code, preferredWidth) {
   const response = await net(`https://www.instagram.com/p/${code}/`, { headers: navigationHeaders() });
   if (!response.ok) {
-    return null;
+    return { media: null };
   }
   const html = await response.text();
   const media = inlineMedia(html, code);
-  return media && mediaItems(media, code, preferredWidth).length > 0 ? media : null;
+  const reason = media && object(media.gating_ruling) ? instagramUnavailableReason(400, JSON.stringify(media.gating_ruling)) : "unavailable";
+  return {
+    media: media && mediaItems(media, code, preferredWidth).length > 0 ? media : null,
+    reason: reason === "unavailable" ? undefined : reason
+  };
 }
 function inlineMedia(html, code) {
   for (const match of html.matchAll(/<script type="application\/json"[^>]*>(.*?)<\/script>/gs)) {
@@ -515,7 +520,7 @@ function searchMedia(node, code) {
     return null;
   }
   const hasMedia = Array.isArray(node.video_versions) || Array.isArray(node.carousel_media) || object(node.image_versions2) && Array.isArray(node.image_versions2.candidates);
-  if (hasMedia && node.code === code) {
+  if ((hasMedia || object(node.gating_ruling)) && node.code === code) {
     return node;
   }
   for (const key in node) {
@@ -1213,11 +1218,11 @@ function mediaFragment(fragment, sequence) {
 function isMasterPlaylist(text) {
   return text.includes("#EXT-X-STREAM-INF");
 }
-function parseMaster(text, baseUrl) {
+function parseMaster(text, baseUrl, options = {}) {
   const lines = text.split(`
 `).map((line) => line.trim());
   const audio = {};
-  const defaultAudio = new Set;
+  const audioPreference = {};
   const variants = [];
   for (let index = 0;index < lines.length; index += 1) {
     const line = lines[index];
@@ -1225,10 +1230,12 @@ function parseMaster(text, baseUrl) {
       const group = line.match(/GROUP-ID="([^"]+)"/)?.[1];
       const uri = line.match(/URI="([^"]+)"/)?.[1];
       const isDefault = /(?:^|,)DEFAULT=YES(?:,|$)/.test(line);
-      if (group && uri && (!audio[group] || isDefault && !defaultAudio.has(group))) {
+      const name = line.match(/(?:^|,)NAME="([^"]+)"/)?.[1] ?? "";
+      const isOriginal = options.preferOriginalAudio && /\boriginal\b/i.test(name);
+      const preference = isOriginal ? 2 : isDefault ? 1 : 0;
+      if (group && uri && (!audio[group] || preference > audioPreference[group])) {
         audio[group] = new URL(uri, baseUrl).href;
-        if (isDefault)
-          defaultAudio.add(group);
+        audioPreference[group] = preference;
       }
     } else if (line.startsWith("#EXT-X-STREAM-INF:")) {
       const target = lines[index + 1];
@@ -2706,7 +2713,7 @@ async function resolveVisionOs(input, id, visitorData) {
   if (!response.ok) {
     throw new Error(`YouTube HLS manifest failed: ${response.status}`);
   }
-  const master = parseMaster(await response.text(), manifestUrl);
+  const master = parseMaster(await response.text(), manifestUrl, { preferOriginalAudio: true });
   const variants = master.variants.filter((variant2) => /(?:^|,)(?:vp09|av01)\./i.test(variant2.codecs ?? "") && /(?:^|,)mp4a\.40\.2(?:,|$)/i.test(variant2.codecs ?? "") && variant2.audioGroup && master.audio[variant2.audioGroup]).sort((left, right) => Math.abs(left.width - input.preferredWidth) - Math.abs(right.width - input.preferredWidth) || right.bandwidth - left.bandwidth);
   const variant = variants[0];
   if (!variant?.audioGroup) {
@@ -2775,10 +2782,21 @@ function bestAudio(formats) {
     if (!current) {
       return format;
     }
+    const preference = audioPreference(format) - audioPreference(current);
+    if (preference !== 0) {
+      return preference > 0 ? format : current;
+    }
     return (number(format.bitrate) ?? 0) > (number(current.bitrate) ?? 0) ? format : current;
   }, null);
   return best ? string(best.url) : null;
 }
+function audioPreference(format) {
+  const track = object(format.audioTrack) ? format.audioTrack : null;
+  if (track && /\boriginal\b/i.test(string(track.displayName) ?? "")) {
+    return 2;
+  }
+  return track?.audioIsDefault === true ? 1 : 0;
+}
 function playerBody(id, session) {
   return {
     contentCheckOk: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postfetch/core",
-  "version": "0.12.1",
+  "version": "0.12.3",
   "description": "Zero-dependency typed core that turns Facebook, Instagram, LinkedIn, Pinterest, Reddit, SoundCloud, TikTok, X and YouTube post URLs into media files.",
   "license": "MIT",
   "type": "module",

package/src/hls.ts

@@ -16,10 +16,10 @@ export function isMasterPlaylist(text: string): boolean {
   return text.includes("#EXT-X-STREAM-INF");
 }
 
-export function parseMaster(text: string, baseUrl: string): HlsMaster {
+export function parseMaster(text: string, baseUrl: string, options: { preferOriginalAudio?: boolean } = {}): HlsMaster {
   const lines = text.split("\n").map((line) => line.trim());
   const audio: Record<string, string> = {};
-  const defaultAudio = new Set<string>();
+  const audioPreference: Record<string, number> = {};
   const variants: HlsVariant[] = [];
   for (let index = 0; index < lines.length; index += 1) {
     const line = lines[index];
@@ -27,9 +27,12 @@ export function parseMaster(text: string, baseUrl: string): HlsMaster {
       const group = line.match(/GROUP-ID="([^"]+)"/)?.[1];
       const uri = line.match(/URI="([^"]+)"/)?.[1];
       const isDefault = /(?:^|,)DEFAULT=YES(?:,|$)/.test(line);
-      if (group && uri && (!audio[group] || (isDefault && !defaultAudio.has(group)))) {
+      const name = line.match(/(?:^|,)NAME="([^"]+)"/)?.[1] ?? "";
+      const isOriginal = options.preferOriginalAudio && /\boriginal\b/i.test(name);
+      const preference = isOriginal ? 2 : isDefault ? 1 : 0;
+      if (group && uri && (!audio[group] || preference > audioPreference[group])) {
         audio[group] = new URL(uri, baseUrl).href;
-        if (isDefault) defaultAudio.add(group);
+        audioPreference[group] = preference;
       }
     } else if (line.startsWith("#EXT-X-STREAM-INF:")) {
       const target = lines[index + 1];

package/src/instagram.ts

@@ -59,8 +59,9 @@ function embedHeaders(): Record<string, string> {
 export async function resolveInstagram(input: ResolveContext): Promise<PostfetchResult> {
   const code = shortcode(input.url);
   const videoRequired = /\/(?:reel|reels|tv)\//.test(asUrl(input.url).pathname);
+  const page = await pageMedia(input.net, code, input.preferredWidth);
   const resolvers: Array<() => Promise<Json | null>> = [
-    () => pageMedia(input.net, code, input.preferredWidth),
+    async () => page.media,
     () => mobileMedia(input.net, code, input.preferredWidth),
     () => embedMedia(input.net, code),
     () => graphqlMedia(input.net, code),
@@ -74,7 +75,7 @@ export async function resolveInstagram(input: ResolveContext): Promise<Postfetch
     }
   }
   if (!media) {
-    throw await instagramUnavailable(input.net, code);
+    throw await instagramUnavailable(input.net, code, page.reason);
   }
   const items = mediaItems(media, code, input.preferredWidth);
   if (items.length === 0) {
@@ -83,12 +84,14 @@ export async function resolveInstagram(input: ResolveContext): Promise<Postfetch
   return { archiveFilename: filename(`instagram_${code}.zip`), comments: [], id: code, items, metadata: instagramMetadata(media), platform: "instagram" };
 }
 
-async function instagramUnavailable(net: Net, code: string): Promise<PostfetchError> {
+async function instagramUnavailable(net: Net, code: string, pageReason?: PostfetchReason): Promise<PostfetchError> {
   const url = new URL("https://i.instagram.com/api/v1/oembed/");
   url.searchParams.set("url", `https://www.instagram.com/p/${code}/`);
   const response = await net(url.href, { headers: mobileHeaders() }, 1).catch(() => null);
   const body = response ? await response.text().catch(() => "") : "";
-  const reason = instagramUnavailableReason(response?.status ?? 0, body);
+  // The page can identify an age gate even when oembed only reports a generic
+  // geoblock_required error with no MIN_AGE_ACCOUNT marker.
+  const reason = pageReason ?? instagramUnavailableReason(response?.status ?? 0, body);
   // Carry the oembed status so an unclassified failure still leaves a raw clue
   // (200 = post is public but no media could be parsed; 429 = throttled; …).
   const probe = response ? `oembed ${response.status}` : "oembed unreachable";
@@ -109,7 +112,7 @@ export function instagramUnavailableReason(status: number, body: string): Postfe
   if (status !== 0 && status < 400) {
     return "unavailable";
   }
-  if (/MIN_AGE_ACCOUNT|under 18/i.test(body)) {
+  if (/MIN_AGE_ACCOUNT|under 18|age[- ]restricted/i.test(body)) {
     return "ageRestricted";
   }
   if (/private account|"is_private":\s*true|account is private/i.test(body)) {
@@ -190,14 +193,20 @@ function shortcode(input: string): string {
   return code;
 }
 
-async function pageMedia(net: Net, code: string, preferredWidth: number): Promise<Json | null> {
+async function pageMedia(net: Net, code: string, preferredWidth: number): Promise<{ media: Json | null; reason?: PostfetchReason }> {
   const response = await net(`https://www.instagram.com/p/${code}/`, { headers: navigationHeaders() });
   if (!response.ok) {
-    return null;
+    return { media: null };
   }
   const html = await response.text();
   const media = inlineMedia(html, code);
-  return media && mediaItems(media, code, preferredWidth).length > 0 ? media : null;
+  const reason = media && object(media.gating_ruling)
+    ? instagramUnavailableReason(400, JSON.stringify(media.gating_ruling))
+    : "unavailable";
+  return {
+    media: media && mediaItems(media, code, preferredWidth).length > 0 ? media : null,
+    reason: reason === "unavailable" ? undefined : reason,
+  };
 }
 
 function inlineMedia(html: string, code: string): Json | null {
@@ -233,7 +242,7 @@ function searchMedia(node: unknown, code: string): Json | null {
     Array.isArray(node.video_versions) ||
     Array.isArray(node.carousel_media) ||
     (object(node.image_versions2) && Array.isArray(node.image_versions2.candidates));
-  if (hasMedia && node.code === code) {
+  if ((hasMedia || object(node.gating_ruling)) && node.code === code) {
     return node;
   }
   for (const key in node) {

package/src/youtube.ts

@@ -139,7 +139,7 @@ async function resolveVisionOs(input: ResolveContext, id: string, visitorData?:
   if (!response.ok) {
     throw new Error(`YouTube HLS manifest failed: ${response.status}`);
   }
-  const master = parseMaster(await response.text(), manifestUrl);
+  const master = parseMaster(await response.text(), manifestUrl, { preferOriginalAudio: true });
   // YouTube's AVC HLS variants use MPEG-TS. VP9/AV1 variants use fMP4 and
   // work with the bundled box-level merger. Require the paired AAC-LC track.
   const variants = master.variants.filter((variant) =>
@@ -230,11 +230,25 @@ function bestAudio(formats: Json[]): string | null {
     if (!current) {
       return format;
     }
+    // YouTube's default can be a dub, and bitrate varies between languages.
+    // Select the original track before comparing audio quality.
+    const preference = audioPreference(format) - audioPreference(current);
+    if (preference !== 0) {
+      return preference > 0 ? format : current;
+    }
     return (number(format.bitrate) ?? 0) > (number(current.bitrate) ?? 0) ? format : current;
   }, null);
   return best ? string(best.url) : null;
 }
 
+function audioPreference(format: Json): number {
+  const track = object(format.audioTrack) ? format.audioTrack : null;
+  if (track && /\boriginal\b/i.test(string(track.displayName) ?? "")) {
+    return 2;
+  }
+  return track?.audioIsDefault === true ? 1 : 0;
+}
+
 function playerBody(id: string, session: YoutubeSession): Json {
   return {
     contentCheckOk: true,