@torrent-tv/proxy 2.74.1 → 2.75.0

package/services/tracks/AudioTrack.js

@@ -1,40 +1,131 @@
-/**
- * @file Audio track — extends ContainerTrack with audio-specific flags.
- *
- * Matroska RFC 9559 §5.1.4.1:
- *  - FlagOriginal 0x55AE (default 0) — track is original language.
- *  - FlagCommentary 0x55AF — commentary track.
- *  - FlagVisualImpaired 0x55AC — audio description for visually impaired.
- *  - FlagTextDescriptions 0x55AD, FlagHearingImpaired etc. may also appear
- *    but the three above drive the audio menu (research/container-spec-conformance).
- * MP4 ISO/IEC 14496-12: tkhd alternate_group groups alternate audio tracks.
- */
-
-import { ContainerTrack } from "./ContainerTrack.js";
-
-export class AudioTrack extends ContainerTrack {
-  /**
-   * @param {object} params - See ContainerTrack plus:
-   * @param {boolean} params.isOriginal - FlagOriginal
-   * @param {boolean} params.isCommentary - FlagCommentary
-   * @param {boolean} params.isVisualImpaired - FlagVisualImpaired / descriptive audio
-   * @param {number | null} params.channels
-   * @param {number | null} params.samplingFrequency
-   */
-  constructor(params) {
-    super({ ...params, type: "audio" });
-    this.isOriginal = params.isOriginal === true;
-    this.isCommentary = params.isCommentary === true;
-    this.isVisualImpaired = params.isVisualImpaired === true;
-    this.channels = Number.isFinite(params.channels) ? params.channels : null;
-    this.samplingFrequency = Number.isFinite(params.samplingFrequency) ? params.samplingFrequency : null;
-  }
-
-  /** Human label helper — commentary and descriptive audio must not look like main track. */
-  audioRoleLabel() {
-    if (this.isCommentary) return "commentary";
-    if (this.isVisualImpaired) return "descriptive";
-    if (this.isOriginal) return "original";
-    return "";
-  }
-}
+/**
+ * @file Audio track — extends ContainerTrack with audio-specific flags.
+ *
+ * Matroska RFC 9559 §5.1.4.1:
+ *  - FlagOriginal 0x55AE (default 0) — track is original language.
+ *  - FlagCommentary 0x55AF — commentary track.
+ *  - FlagVisualImpaired 0x55AC — audio description for visually impaired.
+ *  - FlagTextDescriptions 0x55AD, FlagHearingImpaired etc. may also appear
+ *    but the three above drive the audio menu (research/container-spec-conformance).
+ * MP4 ISO/IEC 14496-12: tkhd alternate_group groups alternate audio tracks.
+ */
+
+import { ContainerTrack } from "./ContainerTrack.js";
+
+/**
+ * Codec identifiers as containers write them, against the name ffmpeg prints.
+ *
+ * Needed because the browser decides whether it can play a soundtrack from that
+ * name, and for a sidecar file there is no ffmpeg banner to read it from — the
+ * track came from the container's own table, where Matroska writes `A_AC3` and
+ * MP4 writes `ac-3` for the thing ffmpeg calls `ac3`. Only what a soundtrack can
+ * actually be is listed; an identifier not here is reported as it was written,
+ * which the browser treats as one it does not know and therefore transcodes.
+ */
+const CODEC_NAMES = new Map([
+  ["A_AAC", "aac"],
+  ["A_AC3", "ac3"],
+  ["A_EAC3", "eac3"],
+  ["A_DTS", "dts"],
+  ["A_FLAC", "flac"],
+  ["A_OPUS", "opus"],
+  ["A_VORBIS", "vorbis"],
+  ["A_TRUEHD", "truehd"],
+  ["A_MPEG/L3", "mp3"],
+  ["A_MPEG/L2", "mp2"],
+  ["A_ALAC", "alac"],
+  ["mp4a", "aac"],
+  ["ac-3", "ac3"],
+  ["ec-3", "eac3"],
+  ["alac", "alac"],
+  ["opus", "opus"],
+  ["Opus", "opus"],
+  ["fLaC", "flac"],
+  ["flac", "flac"]
+]);
+
+/**
+ * Extensions of raw elementary streams, against the codec they carry.
+ *
+ * A bare `.ac3` has no track table to read, and its extension is the only thing
+ * that states its codec — which for an elementary stream is exactly what the
+ * extension means.
+ */
+const CODEC_BY_EXTENSION = new Map([
+  [".aac", "aac"],
+  [".ac3", "ac3"],
+  [".eac3", "eac3"],
+  [".dts", "dts"],
+  [".dtshd", "dts"],
+  [".flac", "flac"],
+  [".mp3", "mp3"],
+  [".mp2", "mp2"],
+  [".opus", "opus"],
+  [".ogg", "vorbis"],
+  [".oga", "vorbis"],
+  [".wav", "pcm"],
+  [".thd", "truehd"],
+  [".mlp", "truehd"],
+  [".m4a", "aac"]
+]);
+
+export class AudioTrack extends ContainerTrack {
+  /**
+   * @param {object} params - See ContainerTrack plus:
+   * @param {boolean} params.isOriginal - FlagOriginal
+   * @param {boolean} params.isCommentary - FlagCommentary
+   * @param {boolean} params.isVisualImpaired - FlagVisualImpaired / descriptive audio
+   * @param {number | null} params.channels
+   * @param {number | null} params.samplingFrequency
+   */
+  constructor(params) {
+    super({ ...params, type: "audio" });
+    this.isOriginal = params.isOriginal === true;
+    this.isCommentary = params.isCommentary === true;
+    this.isVisualImpaired = params.isVisualImpaired === true;
+    this.channels = Number.isFinite(params.channels) ? params.channels : null;
+    this.samplingFrequency = Number.isFinite(params.samplingFrequency) ? params.samplingFrequency : null;
+  }
+
+  /**
+   * The ffmpeg-side codec name for one track, from whatever the reading gave.
+   *
+   * @param {{ codec?: string, codecId?: string }} track
+   * @param {string} [extension] - The sidecar file's extension, when the track
+   *   came from a file with no readable table.
+   * @returns {string}
+   */
+  static codecNameOf(track, extension = "") {
+    const fromBanner = typeof track?.codec === "string" ? track.codec.trim() : "";
+    if (fromBanner.length > 0) {
+      return fromBanner.toLowerCase();
+    }
+    const codecId = typeof track?.codecId === "string" ? track.codecId.trim() : "";
+    if (codecId.length > 0) {
+      const known = CODEC_NAMES.get(codecId);
+      if (known) {
+        return known;
+      }
+      // Matroska allows a suffix — `A_AAC/MPEG4/LC`, `A_PCM/INT/LIT` — so the
+      // family is what the first two segments say.
+      const family = codecId.split("/").slice(0, 2).join("/");
+      const byFamily = CODEC_NAMES.get(family) ?? CODEC_NAMES.get(codecId.split("/")[0]);
+      if (byFamily) {
+        return byFamily;
+      }
+      if (codecId.startsWith("A_PCM")) {
+        return "pcm";
+      }
+      return codecId.toLowerCase();
+    }
+    return CODEC_BY_EXTENSION.get(extension) ?? "";
+  }
+
+  /** Human label helper — commentary and descriptive audio must not look like main track. */
+  audioRoleLabel() {
+    if (this.isCommentary) return "commentary";
+    if (this.isVisualImpaired) return "descriptive";
+    if (this.isOriginal) return "original";
+    return "";
+  }
+}

package/test/audio-inventory.test.js

@@ -1,177 +1,176 @@
-/**
- * @file One numbered list of soundtracks, from two readings of the same file.
- *
- * Two things are being pinned here, and each has cost a real failure elsewhere
- * in this project:
- *
- * 1. **The alignment guard.** The container reading is used ONLY when it can be
- *    lined up with ffmpeg's own numbering, because `0:a:N` is what the encoder
- *    is handed — a flag attributed to the wrong track is worse than a missing
- *    one. Same discipline as `subtitle-defaults.js`, for the same reason.
- * 2. **The flat numbering.** The browser's menu, the `audioTrackIndex` on a
- *    session request and the `a/<n>/` address of a rendition are one number.
- *    Embedded tracks must keep the numbers they have always had, so that a
- *    session created against an older cached plan means the same thing.
- */
-
-import test from "node:test";
-import assert from "node:assert/strict";
-import {
-  audioPairingHolds,
-  audioRenditionName,
-  buildAudioInventory,
-  codecNameOf,
-  mergeContainerAudioFlags,
-  resolveAudioIndex
-} from "../services/audio-inventory.js";
-
-test("a pair agreeing on language is accepted", () => {
-  assert.equal(audioPairingHolds({ language: "jpn" }, { language: "jpn" }), true);
-});
-
-test("a pair disagreeing on language is refused", () => {
-  assert.equal(audioPairingHolds({ language: "jpn" }, { language: "rus" }), false);
-});
-
-test("two tracks that say nothing about themselves do not break the alignment", () => {
-  assert.equal(audioPairingHolds({ language: "und", title: "" }, { language: "", name: "" }), true);
-});
-
-test("the container's own flags reach the merged track", () => {
-  const merged = mergeContainerAudioFlags(
-    [
-      { index: 0, language: "eng", title: "", isDefault: true, codec: "aac" },
-      { index: 1, language: "eng", title: "Director", isDefault: true, codec: "ac3" }
-    ],
-    [
-      { language: "eng", name: "", isOriginal: true, isDefault: true, declaresDefault: true, channels: 6 },
-      { language: "eng", name: "Director", isCommentary: true, isDefault: false, declaresDefault: true, channels: 2 }
-    ]
-  );
-  assert.equal(merged.aligned, true);
-  assert.equal(merged.tracks[0].isOriginal, true);
-  assert.equal(merged.tracks[0].channels, 6);
-  assert.equal(merged.tracks[1].isCommentary, true);
-  // Matroska defaults FlagDefault to 1 and ffmpeg prints the applied default, so
-  // the banner said both tracks were default. The container says otherwise.
-  assert.equal(merged.tracks[1].isDefault, false);
-});
-
-test("a count that differs drops the container reading whole", () => {
-  const merged = mergeContainerAudioFlags(
-    [{ index: 0, language: "eng", isDefault: true }],
-    [{ language: "eng" }, { language: "rus" }]
-  );
-  assert.equal(merged.aligned, false);
-  assert.match(merged.reason, /declares 2 audio tracks and the probe found 1/);
-  // Nothing of it is used — not even the flags that happened to line up.
-  assert.equal(merged.tracks[0].isCommentary, false);
-  assert.equal(merged.tracks[0].declaresDefault, false);
-});
-
-test("one pair that agrees on neither language nor title drops it too", () => {
-  const merged = mergeContainerAudioFlags(
-    [{ index: 0, language: "jpn", title: "" }, { index: 1, language: "rus", title: "" }],
-    [{ language: "jpn", name: "" }, { language: "eng", name: "" }]
-  );
-  assert.equal(merged.aligned, false);
-  assert.match(merged.reason, /audio 1 is/);
-});
-
-test("embedded tracks keep the numbers they have always had, sidecars follow", () => {
-  const inventory = buildAudioInventory({
-    embedded: [
-      { language: "jpn", codec: "aac", isDefault: true },
-      { language: "eng", codec: "ac3", title: "Commentary", isCommentary: true }
-    ],
-    videoFileIndex: 24,
-    sidecars: [
-      {
-        file: { fileIndex: 12, name: "ep.mka", folders: ["Rus Sound"], extension: ".mka" },
-        tracks: [{ language: "rus", codecId: "A_AC3", channels: 6 }]
-      }
-    ]
-  });
-
-  assert.deepEqual(inventory.map((entry) => entry.index), [0, 1, 2]);
-  assert.deepEqual(inventory.map((entry) => entry.fileIndex), [24, 24, 12]);
-  assert.deepEqual(inventory.map((entry) => entry.sourceTrackIndex), [0, 1, 0]);
-  assert.deepEqual(inventory.map((entry) => entry.kind), ["embedded", "embedded", "sidecar"]);
-  assert.equal(inventory[2].codec, "ac3");
-  assert.deepEqual(inventory[2].folders, ["Rus Sound"]);
-  assert.equal(inventory[2].fileName, "ep.mka");
-});
-
-test("a sidecar whose table could not be read is still offered, as one track", () => {
-  const inventory = buildAudioInventory({
-    embedded: [{ language: "eng", codec: "aac" }],
-    videoFileIndex: 0,
-    sidecars: [{ file: { fileIndex: 1, name: "dub.ac3", folders: [], extension: ".ac3" }, tracks: [] }]
-  });
-  assert.equal(inventory.length, 2);
-  assert.equal(inventory[1].sourceTrackIndex, 0);
-  // The extension of a bare elementary stream IS its codec.
-  assert.equal(inventory[1].codec, "ac3");
-});
-
-test("a sidecar carrying two tracks contributes both", () => {
-  const inventory = buildAudioInventory({
-    embedded: [],
-    videoFileIndex: 0,
-    sidecars: [
-      {
-        file: { fileIndex: 3, name: "dubs.mka", folders: [], extension: ".mka" },
-        tracks: [{ language: "rus" }, { language: "ukr" }]
-      }
-    ]
-  });
-  assert.deepEqual(inventory.map((entry) => [entry.index, entry.sourceTrackIndex]), [[0, 0], [1, 1]]);
-});
-
-test("the flat number resolves back to a file and a track inside it", () => {
-  const inventory = buildAudioInventory({
-    embedded: [{ language: "jpn" }],
-    videoFileIndex: 24,
-    sidecars: [{ file: { fileIndex: 12, name: "ep.mka", folders: [], extension: ".mka" }, tracks: [{}] }]
-  });
-  assert.equal(resolveAudioIndex(inventory, 1).fileIndex, 12);
-  assert.equal(resolveAudioIndex(inventory, 1).sourceTrackIndex, 0);
-  assert.equal(resolveAudioIndex(inventory, 9), null);
-});
-
-test("codec identifiers are translated to the names the browser judges by", () => {
-  assert.equal(codecNameOf({ codec: "AAC" }), "aac");
-  assert.equal(codecNameOf({ codecId: "A_AC3" }), "ac3");
-  assert.equal(codecNameOf({ codecId: "A_AAC/MPEG4/LC" }), "aac");
-  assert.equal(codecNameOf({ codecId: "A_PCM/INT/LIT" }), "pcm");
-  assert.equal(codecNameOf({ codecId: "ec-3" }), "eac3");
-  assert.equal(codecNameOf({}, ".dts"), "dts");
-  assert.equal(codecNameOf({}, ".unknown"), "");
-});
-
-test("a rendition is named by what the file says, and two never share a name", () => {
-  const inventory = buildAudioInventory({
-    embedded: [{ language: "jpn" }],
-    videoFileIndex: 0,
-    sidecars: [
-      { file: { fileIndex: 1, name: "a.mka", folders: ["Rus Sound"], extension: ".mka" }, tracks: [{}] },
-      { file: { fileIndex: 2, name: "b.mka", folders: ["Rus Sound"], extension: ".mka" }, tracks: [{}] }
-    ]
-  });
-  assert.equal(audioRenditionName(inventory[0], inventory), "jpn");
-  // Both sidecars sit in the same folder and neither names itself, so the names
-  // would collide — and hls.js groups renditions by name.
-  assert.notEqual(
-    audioRenditionName(inventory[1], inventory),
-    audioRenditionName(inventory[2], inventory)
-  );
-});
-
-test("a commentary says so in its rendition name", () => {
-  const inventory = buildAudioInventory({
-    embedded: [{ language: "eng" }, { language: "eng", title: "Director", isCommentary: true }],
-    videoFileIndex: 0,
-    sidecars: []
-  });
-  assert.match(audioRenditionName(inventory[1], inventory), /commentary/);
-});
+/**
+ * @file One numbered list of soundtracks, from two readings of the same file.
+ *
+ * Two things are being pinned here, and each has cost a real failure elsewhere
+ * in this project:
+ *
+ * 1. **The alignment guard.** The container reading is used ONLY when it can be
+ *    lined up with ffmpeg's own numbering, because `0:a:N` is what the encoder
+ *    is handed — a flag attributed to the wrong track is worse than a missing
+ *    one. Same discipline as `subtitle-defaults.js`, for the same reason.
+ * 2. **The flat numbering.** The browser's menu, the `audioTrackIndex` on a
+ *    session request and the `a/<n>/` address of a rendition are one number.
+ *    Embedded tracks must keep the numbers they have always had, so that a
+ *    session created against an older cached plan means the same thing.
+ */
+
+import test from "node:test";
+import { Container } from "../services/container/Container.js";
+import { AudioTrack } from "../services/tracks/AudioTrack.js";
+import assert from "node:assert/strict";
+import {
+  audioRenditionName,
+  buildAudioInventory,
+  resolveAudioIndex
+} from "../services/audio-inventory.js";
+
+test("a pair agreeing on language is accepted", () => {
+  assert.equal(Container.pairingHolds({ language: "jpn" }, { language: "jpn" }), true);
+});
+
+test("a pair disagreeing on language is refused", () => {
+  assert.equal(Container.pairingHolds({ language: "jpn" }, { language: "rus" }), false);
+});
+
+test("two tracks that say nothing about themselves do not break the alignment", () => {
+  assert.equal(Container.pairingHolds({ language: "und", title: "" }, { language: "", name: "" }), true);
+});
+
+test("the container's own flags reach the merged track", () => {
+  const merged = Container.mergeAudioFlags(
+    [
+      { index: 0, language: "eng", title: "", isDefault: true, codec: "aac" },
+      { index: 1, language: "eng", title: "Director", isDefault: true, codec: "ac3" }
+    ],
+    [
+      { language: "eng", name: "", isOriginal: true, isDefault: true, declaresDefault: true, channels: 6 },
+      { language: "eng", name: "Director", isCommentary: true, isDefault: false, declaresDefault: true, channels: 2 }
+    ]
+  );
+  assert.equal(merged.aligned, true);
+  assert.equal(merged.tracks[0].isOriginal, true);
+  assert.equal(merged.tracks[0].channels, 6);
+  assert.equal(merged.tracks[1].isCommentary, true);
+  // Matroska defaults FlagDefault to 1 and ffmpeg prints the applied default, so
+  // the banner said both tracks were default. The container says otherwise.
+  assert.equal(merged.tracks[1].isDefault, false);
+});
+
+test("a count that differs drops the container reading whole", () => {
+  const merged = Container.mergeAudioFlags(
+    [{ index: 0, language: "eng", isDefault: true }],
+    [{ language: "eng" }, { language: "rus" }]
+  );
+  assert.equal(merged.aligned, false);
+  assert.match(merged.reason, /declares 2 audio tracks and the probe found 1/);
+  // Nothing of it is used — not even the flags that happened to line up.
+  assert.equal(merged.tracks[0].isCommentary, false);
+  assert.equal(merged.tracks[0].declaresDefault, false);
+});
+
+test("one pair that agrees on neither language nor title drops it too", () => {
+  const merged = Container.mergeAudioFlags(
+    [{ index: 0, language: "jpn", title: "" }, { index: 1, language: "rus", title: "" }],
+    [{ language: "jpn", name: "" }, { language: "eng", name: "" }]
+  );
+  assert.equal(merged.aligned, false);
+  assert.match(merged.reason, /audio 1 is/);
+});
+
+test("embedded tracks keep the numbers they have always had, sidecars follow", () => {
+  const inventory = buildAudioInventory({
+    embedded: [
+      { language: "jpn", codec: "aac", isDefault: true },
+      { language: "eng", codec: "ac3", title: "Commentary", isCommentary: true }
+    ],
+    videoFileIndex: 24,
+    sidecars: [
+      {
+        file: { fileIndex: 12, name: "ep.mka", folders: ["Rus Sound"], extension: ".mka" },
+        tracks: [{ language: "rus", codecId: "A_AC3", channels: 6 }]
+      }
+    ]
+  });
+
+  assert.deepEqual(inventory.map((entry) => entry.index), [0, 1, 2]);
+  assert.deepEqual(inventory.map((entry) => entry.fileIndex), [24, 24, 12]);
+  assert.deepEqual(inventory.map((entry) => entry.sourceTrackIndex), [0, 1, 0]);
+  assert.deepEqual(inventory.map((entry) => entry.kind), ["embedded", "embedded", "sidecar"]);
+  assert.equal(inventory[2].codec, "ac3");
+  assert.deepEqual(inventory[2].folders, ["Rus Sound"]);
+  assert.equal(inventory[2].fileName, "ep.mka");
+});
+
+test("a sidecar whose table could not be read is still offered, as one track", () => {
+  const inventory = buildAudioInventory({
+    embedded: [{ language: "eng", codec: "aac" }],
+    videoFileIndex: 0,
+    sidecars: [{ file: { fileIndex: 1, name: "dub.ac3", folders: [], extension: ".ac3" }, tracks: [] }]
+  });
+  assert.equal(inventory.length, 2);
+  assert.equal(inventory[1].sourceTrackIndex, 0);
+  // The extension of a bare elementary stream IS its codec.
+  assert.equal(inventory[1].codec, "ac3");
+});
+
+test("a sidecar carrying two tracks contributes both", () => {
+  const inventory = buildAudioInventory({
+    embedded: [],
+    videoFileIndex: 0,
+    sidecars: [
+      {
+        file: { fileIndex: 3, name: "dubs.mka", folders: [], extension: ".mka" },
+        tracks: [{ language: "rus" }, { language: "ukr" }]
+      }
+    ]
+  });
+  assert.deepEqual(inventory.map((entry) => [entry.index, entry.sourceTrackIndex]), [[0, 0], [1, 1]]);
+});
+
+test("the flat number resolves back to a file and a track inside it", () => {
+  const inventory = buildAudioInventory({
+    embedded: [{ language: "jpn" }],
+    videoFileIndex: 24,
+    sidecars: [{ file: { fileIndex: 12, name: "ep.mka", folders: [], extension: ".mka" }, tracks: [{}] }]
+  });
+  assert.equal(resolveAudioIndex(inventory, 1).fileIndex, 12);
+  assert.equal(resolveAudioIndex(inventory, 1).sourceTrackIndex, 0);
+  assert.equal(resolveAudioIndex(inventory, 9), null);
+});
+
+test("codec identifiers are translated to the names the browser judges by", () => {
+  assert.equal(AudioTrack.codecNameOf({ codec: "AAC" }), "aac");
+  assert.equal(AudioTrack.codecNameOf({ codecId: "A_AC3" }), "ac3");
+  assert.equal(AudioTrack.codecNameOf({ codecId: "A_AAC/MPEG4/LC" }), "aac");
+  assert.equal(AudioTrack.codecNameOf({ codecId: "A_PCM/INT/LIT" }), "pcm");
+  assert.equal(AudioTrack.codecNameOf({ codecId: "ec-3" }), "eac3");
+  assert.equal(AudioTrack.codecNameOf({}, ".dts"), "dts");
+  assert.equal(AudioTrack.codecNameOf({}, ".unknown"), "");
+});
+
+test("a rendition is named by what the file says, and two never share a name", () => {
+  const inventory = buildAudioInventory({
+    embedded: [{ language: "jpn" }],
+    videoFileIndex: 0,
+    sidecars: [
+      { file: { fileIndex: 1, name: "a.mka", folders: ["Rus Sound"], extension: ".mka" }, tracks: [{}] },
+      { file: { fileIndex: 2, name: "b.mka", folders: ["Rus Sound"], extension: ".mka" }, tracks: [{}] }
+    ]
+  });
+  assert.equal(audioRenditionName(inventory[0], inventory), "jpn");
+  // Both sidecars sit in the same folder and neither names itself, so the names
+  // would collide — and hls.js groups renditions by name.
+  assert.notEqual(
+    audioRenditionName(inventory[1], inventory),
+    audioRenditionName(inventory[2], inventory)
+  );
+});
+
+test("a commentary says so in its rendition name", () => {
+  const inventory = buildAudioInventory({
+    embedded: [{ language: "eng" }, { language: "eng", title: "Director", isCommentary: true }],
+    videoFileIndex: 0,
+    sidecars: []
+  });
+  assert.match(audioRenditionName(inventory[1], inventory), /commentary/);
+});