@torrent-tv/proxy 2.14.1 → 2.14.2

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.14.2
+
+- **Fix**: A separately published audio track starts BEHIND the picture's read head, and a request behind its run is answered as before. Two mistakes compounded in 2.14.1 and left the viewer on a spinner that never ended. The position this class keeps is written by the segments a session serves — the READ head — while the viewer's picture sits behind it by everything they have buffered, so the track was started AHEAD of them: field 2026-08-15, the run placed at segment #16 while the player asked for #10. On top of that, 2.14.1 had begun answering such a request "not found" at once instead of holding it, which turned a condition the encoder used to correct in twenty seconds into a permanent refusal: hls.js retried #10 for a minute and a half, raised a fatal network error, recovered, and retried it again. The prompt refusal is withdrawn — it was written for a probe and met a real request — and the track now starts a whole look-ahead behind the read head, which is exactly how far apart the two can be. The price is audio the player already holds: at ten to twenty times realtime and 75 KB a piece, a second or two of work.
+
 ## 2.14.1
 
 - **Fix**: Changing the audio track no longer costs twenty seconds of silence. The player asks the NEW rendition for its segment #0 before anything else — measured 2026-08-15, a track changed at 159 s with the rendition correctly placed at #26 — and the repair that exists for a run placed WRONGLY took that literally: it killed the run and restarted the encoder at the beginning of the film, so the segment the viewer was waiting for arrived 20.5 s later. A rendition is never repaired by moving it, because its run is placed where the viewer is and the request behind it is the player probing; and such a request is now answered at once rather than held, since holding it spends the player's patience on a fragment that can never be produced. The refusal stands down while a seek of the rendition's own is settling: a viewer going BACKWARDS is reported to the base and forwarded to the rendition, but its run only moves when the settle fires, so until then the requests for the new position are behind the old one — and those are exactly the ones the viewer is waiting for.

package/package.json

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

package/services/hls-session-manager.js

@@ -3570,17 +3570,6 @@ export class HlsSessionManager {
     if (head - index > BEHIND_HEAD_REPAIR_MAX_SEGMENTS) {
       return;
     }
-    // An audio rendition is never repaired by moving it. Its run is placed
-    // where the VIEWER is, from the session they are watching, so a request
-    // behind that is not a run in the wrong place — it is the player probing.
-    // Measured 2026-08-15: changing track at 159 s, hls.js asked for the new
-    // rendition's segment #0, the repair obligingly took the encoder to the
-    // start of the film, and the audio the viewer was waiting for arrived
-    // 20.5 s later instead of at once. Left where it is, the right segment is
-    // already being produced.
-    if (session.audioOnly === true) {
-      return;
-    }
     // Nothing is encoding: a rung the viewer has switched away from is left
     // exactly so, and its held requests must not bring its encoder back.
     if (session.ffmpeg == null || hasChildExited(session.ffmpeg)) {
@@ -5345,8 +5334,26 @@ export class HlsSessionManager {
       // while the player is asking for segment #537 — and the audio would begin
       // at zero and never catch up, since nothing treats a far request as a
       // seek. The accessor falls back to the last segment actually requested.
-      startPositionSeconds:
-        Math.floor(this.#viewerPositionOf(this.#activeVariant(base)) / 10) * 10,
+      // Behind where the picture has been READ to, by the whole look-ahead.
+      //
+      // The position this class keeps is written by the segments a session
+      // serves, so it is the READ head, and the player's picture sits behind it
+      // by everything it has buffered — up to the look-ahead cap. Starting the
+      // audio at the read head therefore starts it AHEAD of the viewer, and
+      // every request they then make is behind a run that only moves forward.
+      // Field 2026-08-15: the run was placed at #16, the player asked for #10,
+      // and the audio never arrived until the encoder was dragged back.
+      //
+      // The cap is exactly how far apart the two can be, so subtracting it
+      // cannot leave the run ahead of the viewer. The price is audio the player
+      // already has — for a track being encoded at ten to twenty times realtime
+      // and served in 75 KB pieces, that is a second or two of work.
+      startPositionSeconds: Math.max(
+        0,
+        Math.floor(
+          (this.#viewerPositionOf(this.#activeVariant(base)) - LOOKAHEAD_PAUSE_SECONDS) / 10
+        ) * 10
+      ),
       segmentFormatId: base.segmentFormat.id,
       // Cut where the picture is cut. Two streams meant to be played together
       // have to be divided at the same times, and the grid is the base's — the
@@ -5874,34 +5881,6 @@ export class HlsSessionManager {
     // at this position (server-side seeking).  The caller long-polls.
     if (!isPlaylist) {
       const requestedIndex = session.segmentFormat.segmentIndexFromName(fileName);
-      // An audio rendition asked for something behind its run says so at once
-      // instead of holding. Its run is placed where the viewer is and is not
-      // moved from there, so the request can never be answered — and holding it
-      // for the full window costs the player its own patience on the fragment
-      // it needs NEXT. Measured 2026-08-15: on a track change at 159 s hls.js
-      // asked for segment #0, and a held request plus a repaired encoder cost
-      // 20.5 s of silence. Refused promptly, the player moves to the segment
-      // that is genuinely being produced.
-      if (
-        session.audioOnly === true &&
-        Number.isFinite(requestedIndex) &&
-        requestedIndex < (session.encodeStartIndex ?? 0) &&
-        session.ffmpeg != null &&
-        // Not while a seek of its own is settling. A viewer seeking BACKWARDS
-        // is reported to the base and forwarded here, but the run only moves
-        // when the settle fires — until then `encodeStartIndex` still names the
-        // old position, and every request for the new one is "behind" it. Those
-        // are exactly the requests the viewer is waiting for, so they are held,
-        // as they were before this refusal existed.
-        session.seekTarget == null &&
-        session.seekSettleTimer == null
-      ) {
-        logger.info(
-          `transcode ${session.id} audio segment #${requestedIndex} is behind this rendition's run ` +
-          `(#${session.encodeStartIndex}); it is not made and the run stays where the viewer is`
-        );
-        return { kind: "not-found" };
-      }
       this.#ensureEncodingFor(
         session,
         requestedIndex,

package/test/quality-variants.test.js

@@ -638,46 +638,38 @@ test("a rung served by copy stays offered while a re-encoded rung is on screen",
   );
 });
 
-test("an audio rendition refuses a segment behind its run instead of chasing it", async (t) => {
-  const { manager, dirPath } = await managerWithBase();
+test("a separately published audio track starts behind the picture's read head", async (t) => {
+  const { manager, base, dirPath } = await managerWithBase();
   t.after(async () => {
     await manager.disposeAll();
     await rm(dirPath, { recursive: true, force: true });
   });
-  // The field case of 2026-08-15: the viewer changes track at 159 s, the
-  // rendition is placed there (#26), and hls.js asks for its segment #0.
-  const RENDITION_ID = "99999999-8888-7777-6666-555555555555";
-  const rendition = fakeSession({ id: RENDITION_ID, encodeHeight: 0, dirPath });
-  rendition.audioOnly = true;
-  rendition.audioTrackIndex = 1;
-  rendition.encodeStartIndex = 26;
-  rendition.usesExplicitCuts = true;
-  rendition.ffmpeg = fakeEncoder();
-  rendition.variantBases = new Set([BASE_ID]);
-  manager.sessionsById.set(RENDITION_ID, rendition);
-
-  const answer = await manager.getFileStream(RENDITION_ID, "segment-00000.mp4");
-  // The distinction that matters: "not-found" is an answer, "warming-up" is the
-  // long poll — and holding this one is what cost 20.5 s of silence, because it
-  // can never be produced.
-  assert.notEqual(answer.kind, "warming-up", "not held: this request is unanswerable, not early");
-  assert.equal(
-    answer.kind,
-    "not-found",
-    "answered at once: the run stays where the viewer is, so this can never be produced"
-  );
-  assert.equal(rendition.encodeStartIndex, 26, "and the encoder was not moved to the start of the film");
-  assert.equal(rendition.seekTarget ?? null, null, "no seek was armed for it either");
-
-  // A seek of its own is the case where "behind the run" is temporary and real:
-  // the viewer went backwards, the base forwarded it here, and the run moves
-  // when the settle fires. Until then the request is held, not refused — it is
-  // the one the viewer is waiting for.
-  rendition.seekTarget = 4;
-  rendition.seekSettleTimer = setTimeout(() => {}, 60_000);
-  t.after(() => clearTimeout(rendition.seekSettleTimer));
+  // What broke playback on 2026-08-15: the position this class keeps is where
+  // segments have been SERVED to, and the viewer's picture is behind it by
+  // everything they have buffered. Started at the read head, the audio run sat
+  // ahead of the viewer and every request they made was behind a run that only
+  // moves forward.
+  base.viewerPositionSeconds = 140;
+  base.audioSeparate = true;
+  manager.getCachedAudioTracks = () => [
+    { index: 0, language: "rus", title: "", isDefault: true },
+    { index: 1, language: "eng", title: "", isDefault: false }
+  ];
+  const created = [];
+  manager.createOrGetSession = async (params) => {
+    created.push(params);
+    const rendition = fakeSession({ id: VARIANT_ID, encodeHeight: 0, dirPath });
+    rendition.audioOnly = true;
+    return { sessionId: VARIANT_ID, session: rendition };
+  };
 
-  const duringSeek = await manager.getFileStream(RENDITION_ID, "segment-00005.mp4");
+  // A segment, not the playlist: the playlist is answered from the base and
+  // deliberately starts no encoder.
+  await manager.resolveAudioRenditionFile(BASE_ID, 1, "segment-00010.mp4");
 
-  assert.equal(duringSeek.kind, "warming-up", "held: the run is about to move there");
+  assert.equal(created.length, 1, "the track's own session was made");
+  assert.ok(
+    created[0].startPositionSeconds <= 20,
+    `started behind the picture, not at the read head — got ${created[0].startPositionSeconds}s for a read head of 140s`
+  );
 });