@torrent-tv/proxy 2.105.0 → 2.105.2

package/package.json

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

package/services/media/ContainerOrchestrator.js

@@ -155,7 +155,11 @@ export class ContainerOrchestrator {
     // picture's first input of an AVI waited about 4 s behind the sound's
     // table of the whole film it does not use (r38, torrent-tv/meta#178).
     const aside = this.#answersWithoutReading(key, statement);
-    const previous = aside ? Promise.resolve() : this.#reads.get(key) ?? Promise.resolve();
+    // Chapter discovery can walk a whole file when the format has no chapter
+    // index. Keep it serial with other chapter reads, but out of the queue used
+    // to prepare playback inputs for this file.
+    const queueKey = statement === "chapters" ? `${key}:chapters` : key;
+    const previous = aside ? Promise.resolve() : this.#reads.get(queueKey) ?? Promise.resolve();
     const askedAt = performance.now();
     const reading = previous.catch(() => undefined).then(async () => {
       if (!isCurrent()) return { result: { kind: "terminal", reason: "request-obsolete", requestId: params.requestId } };
@@ -168,7 +172,7 @@ export class ContainerOrchestrator {
         readMs: endedAt - startedAt, cached: aside, result: result.kind, reason: result.reason, ranges: result.ranges });
       return { result, revision };
     });
-    if (!aside) this.#reads.set(key, reading);
+    if (!aside) this.#reads.set(queueKey, reading);
     try {
       const { result, revision } = await reading;
       if (!isCurrent()) return { kind: "terminal", reason: "request-obsolete", requestId: params.requestId };
@@ -177,7 +181,7 @@ export class ContainerOrchestrator {
       await params.onReadResult?.(statement, result, revision);
       return result;
     } finally {
-      if (this.#reads.get(key) === reading) this.#reads.delete(key);
+      if (this.#reads.get(queueKey) === reading) this.#reads.delete(queueKey);
     }
   }
 

package/services/media/container/matroska-chapters.js

@@ -11,11 +11,12 @@ const TOP_LEVEL = new Set([SEEK_HEAD, CHAPTERS, CLUSTER, 0x1549a966, 0x1654ae6b,
 async function header(reader, at, limit) {
   reader.step();
   const vint = async (position, marker) => {
-    const first = (await reader.bytes(position, 1))[0];
+    const firstBytes = await reader.bytes(position, 1);
+    const first = firstBytes[0];
     let n = 1;
     while (n <= 8 && !(first & (0x80 >> (n - 1)))) n++;
     if (n > (marker ? 4 : 8) || position + n > limit) throw new Error("Invalid chapter EBML header");
-    const bytes = await reader.bytes(position, n);
+    const bytes = n === 1 ? firstBytes : Buffer.concat([firstBytes, await reader.bytes(position + 1, n - 1)]);
     const value = readVint(bytes, 0, marker);
     const mask = 2 ** (8 - n) - 1;
     return { ...value, unknown: !marker && (bytes[0] & mask) === mask && bytes.subarray(1).every((byte) => byte === 255) };

package/services/server/ViewerRequests.js

@@ -575,6 +575,7 @@ export class ViewerRequests {
     // still answered by the output it was made against — see the two deadlines
     // in `Assignments.js`.
     viewer.assignments.statedGeneration(generation);
+    this.#beginSeekWait(named, consumerId, generation);
     this.#host.outputs.touch(named);
     // EVERY REQUEST THIS VIEWER HAS OUTSTANDING WAS MADE FOR WHERE THEY WERE,
     // and hls.js keeps one fragment load outstanding per track: a request held
@@ -601,6 +602,40 @@ export class ViewerRequests {
     return true;
   }
 
+  #beginSeekWait(output, consumerId, generation) {
+    const file = output?.file;
+    if (!Number.isSafeInteger(generation) || !file || typeof file.sourceKey !== "string" ||
+        !Number.isSafeInteger(file.fileIndex) || file.fileIndex < 0) return;
+    const waitId = `${file.sourceKey}:${file.fileIndex}:${generation}`;
+    const key = `${consumerId}:${waitId}`;
+    const fileName = file.relativePath ?? file.name ?? "";
+    const extension = typeof fileName === "string" ? fileName.split(".").at(-1)?.toLowerCase() ?? "" : "";
+    const viewer = this.#host.viewers.get(consumerId);
+    const link = linkMeasurementOf(viewer);
+    const features = {
+      extension,
+      fileLength: Number.isFinite(file.length) && file.length > 0 ? file.length : null,
+      downloadSpeed: null,
+      linkMbps: link.mbps,
+      linkSampleAgeMs: link.ageMs,
+      preparedOutputBytes: this.#preparedOutputBytes(file.sourceKey, file.fileIndex),
+      fileAvailable: null,
+      headerRemaining: null,
+      peers: null,
+      videoOperation: null,
+      audioOperation: null,
+      videoSpeedX: null,
+      audioSpeedX: null
+    };
+    // A seek is a new waiting action even when a caller repeats the same
+    // generation. Start its clock at the explicit seek request, before the
+    // next readiness poll can return the first current-work estimate.
+    this.#earlyWaits.delete(key);
+    const context = this.#setEarlyWait({ consumerId, generation, sourceKey: file.sourceKey,
+      fileIndex: file.fileIndex, waitId, features, revision: 0, current: null, waitElapsedMs: 0 });
+    this.#recordEarlyWaitSnapshot(context, features);
+  }
+
   /**
    * Whether this viewer still takes a request made in the generation it states.
    *