@postfetch/core 0.12.2 → 0.12.4

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

@@ -1218,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];
@@ -1230,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];
@@ -2359,7 +2361,7 @@ function cleanTwitterText(text, tweet) {
       break;
     text = text.slice(0, trailing.index).trimEnd();
   }
-  return text.replace(/&(?:gt|lt);/g, (entity) => entity === "&gt;" ? ">" : "<");
+  return text.replace(/&(?:amp|gt|lt);/g, (entity) => entity === "&amp;" ? "&" : entity === "&gt;" ? ">" : "<");
 }
 function needsFullText(tweet) {
   if (noteText(tweet) || string(tweet.full_text)) {
@@ -2711,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) {
@@ -2780,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.2",
+  "version": "0.12.4",
   "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/twitter.ts

@@ -111,7 +111,7 @@ function cleanTwitterText(text: string | null, tweet: Json): string | null {
     if (!trailing || !urls.has(trailing[1])) break;
     text = text.slice(0, trailing.index).trimEnd();
   }
-  return text.replace(/&(?:gt|lt);/g, (entity) => entity === "&gt;" ? ">" : "<");
+  return text.replace(/&(?:amp|gt|lt);/g, (entity) => entity === "&amp;" ? "&" : entity === "&gt;" ? ">" : "<");
 }
 
 function needsFullText(tweet: Json): boolean {

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,