@torrent-tv/proxy 2.105.6 → 2.105.8

package/package.json

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

package/server.js

@@ -22,7 +22,7 @@ import { probePackets } from "./services/media/probe-packets.js";
 import { trackChoicesOf } from "./services/viewer/segment-demands.js";
 import { PlaybackProjection } from "./services/torrent/PlaybackProjection.js";
 import { SegmentInputTable } from "./services/viewer/segment-input-table.js";
-import { SourcePreparation } from "./services/viewer/SourcePreparation.js";
+import { SourcePreparation, preparationInterval } from "./services/viewer/SourcePreparation.js";
 import { handleHealthzGet } from "./routes/healthz/get.js";
 import { handleApiDeliverySinkGet } from "./routes/api/delivery-sink/get.js";
 import { handleApiLinkProbeGet } from "./routes/api/link-probe/get.js";
@@ -1403,7 +1403,7 @@ export async function startProxyServer({
             (work.ownerId === undefined || viewer.id === work.ownerId))
           .map(viewer => viewer.positionSeconds() ?? 0);
         const from = (positions.length ? Math.min(...positions) : 0) + (Number(info.value?.startTimeSeconds) || 0);
-        params.packetInterval = { from, to: from + outputParts.segmentDurationSec };
+        params.packetInterval = preparationInterval(work.role, from, outputParts.segmentDurationSec);
         if (work.role === "subtitle-embedded") {
           const tracks = await containerOrchestrator.containerFor(params).then(container => container.readTracks());
           const track = tracks.find(track => track.type === "subtitle" && track.declaredIndex === work.trackIndex);

package/services/media/SubtitleOrchestrator.js

@@ -76,7 +76,14 @@ export class SubtitleOrchestrator {
             endSeconds: packet.duration > 0 ? packet.pts + packet.duration : null, text };
           pending.push({ identity, cue });
         }
-        if (params.isCurrent?.() === false || this.#packetCues.get(key) !== state) {
+        // A cue read from the file is a fact about the file, not about where
+        // the viewer stood when the read began. A position report moves that
+        // stand every 1.5 s, so a read that crossed one used to throw away the
+        // cues it had read, and those lines never reached the page
+        // (torrent-tv/meta#7). They are kept and published; only a forgotten
+        // source cannot take them.
+        const obsolete = params.isCurrent?.() === false;
+        if (this.#packetCues.get(key) !== state) {
           return { kind: "terminal", reason: "request-obsolete", requestId };
         }
         state.ready = true;
@@ -96,7 +103,7 @@ export class SubtitleOrchestrator {
           }
         }
         const fresh = TextSubtitleTrack.finalizeCues(ordered(), track.codecId).filter(cue => !previous.has(cue.seq));
-        if (fresh.length && params.isCurrent?.() !== false) {
+        if (fresh.length) {
           const cues = fresh;
           this.cues.publish?.({ sourceKey: params.sourceKey, fileIndex: params.fileIndex,
             trackIndex: track.declaredIndex, cues, withdrawn, language: track.language ?? "",
@@ -104,6 +111,7 @@ export class SubtitleOrchestrator {
             cursor: state.cursor, spanStartSeconds: cues[0]?.startSeconds ?? null,
             spanEndSeconds: cues.at(-1)?.endSeconds ?? null, walkedClusters: 0, indexedClusters: 0 });
         }
+        if (obsolete) return { kind: "terminal", reason: "request-obsolete", requestId };
         result = { kind: "result", value: { cues: [...state.packets.values()], track, coveredClusters: 0, indexedClusters: 0 }, requestId };
       }
     } catch (error) {

package/services/viewer/SourcePreparation.js

@@ -1,3 +1,31 @@
+/**
+ * How many segments ahead of the viewer a chosen embedded subtitle is read.
+ *
+ * A reading window is taken again only when the viewer is planned again, which
+ * is when their report says they entered the next segment, and it starts where
+ * that report put them. Reports come every 1.5 s, so a window one segment long
+ * ended before the next one began whenever that report came later in its
+ * segment than the one before: a cue between the two was never read, and a
+ * cue just past a window was read only once the viewer had reached it (field
+ * 2026-10-22, Drifters 07: 1 of 27 cues missing, 7 late by 0.2-1.6 s,
+ * torrent-tv/meta#7). Two segments let each window reach past the start of the
+ * next while the viewer is planned at least once a segment.
+ */
+const SUBTITLE_SEGMENTS_AHEAD = 2;
+
+/**
+ * The stretch of film one preparation read covers from where its viewers stand.
+ *
+ * @param {string | undefined} role
+ * @param {number} from - Seconds on the file's own clock.
+ * @param {number} segmentDurationSec
+ * @returns {{ from: number, to: number }}
+ */
+export function preparationInterval(role, from, segmentDurationSec) {
+  const segments = role === "subtitle-embedded" ? SUBTITLE_SEGMENTS_AHEAD : 1;
+  return { from, to: from + segments * segmentDurationSec };
+}
+
 /** Source preparation is derived from viewers before any output exists. */
 export class SourcePreparation {
   #viewers;