@torrent-tv/proxy 2.55.14 → 2.57.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@torrent-tv/proxy",
-  "version": "2.55.14",
+  "version": "2.57.0",
   "description": "Torrent proxy client that exposes webseed-like HTTP stream endpoint.",
   "license": "GPL-3.0-or-later",
   "publishConfig": {

package/routes/api/subtitles/get.js

@@ -268,9 +268,10 @@ function readFileFully(file, maxBytes) {
  * The cues of a track from clusters already downloaded, as WebVTT.
  *
  * `trackIndex` is the browser's number for the subtitle stream — its position
- * among the subtitle streams, as ffprobe lists them — while Matroska blocks
- * carry the file's own track number. The plan lists the text tracks in file
- * order, so the browser's Nth subtitle stream is the Nth entry.
+ * among ALL the subtitle streams, as ffmpeg lists them — while Matroska blocks
+ * carry the file's own track number. The plan lists only the tracks that can
+ * become text, so it is matched on `declaredIndex`, which each track carries
+ * for exactly this: its place in the file's full list of subtitle tracks.
  *
  * @param {object} torrentPool
  * @param {object} torrent
@@ -289,7 +290,15 @@ async function cuesFromDownloadedClusters(torrentPool, torrent, fileIndex, track
   } catch {
     return null;
   }
-  const track = Array.isArray(tracks) ? tracks[trackIndex] : null;
+  // BY the browser's number, not by position in this list. The list holds only
+  // the tracks that can become WebVTT, while the browser counts every subtitle
+  // stream ffmpeg lists — so on a file carrying a PGS or VobSub track the two
+  // ran one apart, and the request either found the wrong track or found none
+  // and fell through to the ffmpeg extraction below, which reads the whole film
+  // (752 s measured, 2026-08-19) for cues already in hand.
+  const track = Array.isArray(tracks)
+    ? tracks.find((candidate) => candidate.declaredIndex === trackIndex) ?? null
+    : null;
   if (!track) {
     return null;
   }

package/services/container-index/matroska-subtitles.js

@@ -63,6 +63,11 @@ const TEXT_CODECS = new Set(["S_TEXT/UTF8", "S_TEXT/ASS", "S_TEXT/SSA"]);
 /**
  * @typedef {object} SubtitleTrackPlan
  * @property {number} trackNumber - As the blocks name it.
+ * @property {number} declaredIndex - Its position among ALL of the file's
+ *   subtitle tracks, picture-based ones included — which is the number ffmpeg
+ *   gives the same stream in `0:s:N`, and therefore the only number the browser
+ *   ever names. Text tracks alone are not a numbering: a file whose PGS track
+ *   comes first would have every text track one lower here than in the browser.
  * @property {string} codecId
  * @property {string} language - The three-letter code the file declares.
  * @property {string} name - What the file calls the track, if anything.
@@ -178,6 +183,7 @@ export async function readSubtitlePlan(readRange, fileSize) {
     }
     tracks.push({
       trackNumber,
+      declaredIndex: declared.length - 1,
       codecId,
       language,
       name,

package/services/container-index/mp4-subtitles.js

@@ -29,6 +29,15 @@ const MAX_MOOV_BYTES = 32 * 1024 * 1024;
 
 /** Handlers that mean "this track is text on screen". */
 const TEXT_HANDLERS = new Set(["text", "sbtl", "subt"]);
+/**
+ * Every handler ffmpeg's mov demuxer turns into a SUBTITLE stream, whether or
+ * not this file can read it — `subp` is a DVD subpicture and `clcp` closed
+ * captions, both pictures or caption data rather than text. They are counted
+ * because `declaredIndex` has to equal ffmpeg's `0:s:N`, and a track left out
+ * of the count shifts every text track after it, which is the very defect
+ * `declaredIndex` exists to remove.
+ */
+const SUBTITLE_HANDLERS = new Set([...TEXT_HANDLERS, "subp", "clcp"]);
 /** Sample formats this can turn into cues. `stpp` (TTML) is XML and is not one. */
 const TEXT_FORMATS = new Set(["tx3g", "text", "wvtt"]);
 
@@ -218,6 +227,11 @@ function sampleOffsets(moov, stsc, chunkOffsets, sizes) {
 /**
  * @typedef {object} Mp4SubtitleTrack
  * @property {number} trackId
+ * @property {number} declaredIndex - Its position among ALL of the file's
+ *   subtitle tracks, including the ones whose sample format this cannot turn
+ *   into cues (`stpp` TTML). That is the number ffmpeg gives the same stream in
+ *   `0:s:N`, which is the number the browser names; counting only the readable
+ *   ones would shift every track after a TTML one.
  * @property {string} format - `tx3g`, `text` or `wvtt`.
  * @property {string} language - Three letters, as the file declares them.
  * @property {Mp4SubtitleSample[]} samples - In time order.
@@ -246,6 +260,9 @@ export async function readMp4SubtitlePlan(readRange, fileSize) {
 
   /** @type {Mp4SubtitleTrack[]} */
   const tracks = [];
+  // Counts every subtitle track the file has, whether or not this can read it,
+  // so the number handed out matches ffmpeg's `0:s:N`. See `declaredIndex`.
+  let declaredIndex = -1;
   for (const trak of childrenOf(moov, moovBox.dataOffset, moov.length, "trak")) {
     const mdia = childOf(moov, trak.dataOffset, trak.end, "mdia");
     if (!mdia) {
@@ -253,6 +270,13 @@ export async function readMp4SubtitlePlan(readRange, fileSize) {
     }
     const hdlr = childOf(moov, mdia.dataOffset, mdia.end, "hdlr");
     const handler = hdlr ? moov.toString("latin1", hdlr.dataOffset + 8, hdlr.dataOffset + 12) : "";
+    if (!SUBTITLE_HANDLERS.has(handler)) {
+      continue;
+    }
+    // Counted before the readability checks below, and before the handler is
+    // narrowed to the text ones: this number is the track's place in the file,
+    // not its place among the tracks this code can turn into cues.
+    declaredIndex += 1;
     if (!TEXT_HANDLERS.has(handler)) {
       continue;
     }
@@ -337,7 +361,7 @@ export async function readMp4SubtitlePlan(readRange, fileSize) {
         });
       }
     }
-    tracks.push({ trackId, format, language, samples });
+    tracks.push({ trackId, declaredIndex, format, language, samples });
   }
   return { tracks };
 }