@torrent-tv/proxy 2.99.15 → 2.99.17

package/package.json

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

package/services/encode/EncodeRuns.js

@@ -21,6 +21,7 @@ import { computeOutputDimensions } from "./args.js";
 import { buildAdmittedCommand } from "./admitted-command.js";
 import { buildOriginalCommand } from "./source-command.js";
 import { writeAdmittedInput } from "./AdmittedInput.js";
+import { nextPacketInputs } from "./next-packet-input.js";
 import { cutOf, cutShiftOf, judgeNeighbors, judgePiece, leadingSecondsOf, lacksOnlyItsLeadingPictures } from "./piece-completeness.js";
 import { leadingPictures, presentationSegment } from "./segment-formats/presentation-segment.js";
 import { InputFailures, failedAdmittedInput } from "./InputFailures.js";
@@ -1262,23 +1263,23 @@ export class EncodeRuns {
       }
     } else if (admittedInput) {
       run.admittedInputKeys = new Map([[safeIndex, inputKey]]);
-      let nextIndex = startIndex + 1;
+      const nextIndex = startIndex + 1;
       const canAppend = index => this.isLive(session) && run.isAlive &&
         this.#host.encodeOrchestrator.wantedSegmentsOn(session.outputKey).some(window => index >= window.from && index <= window.to) &&
         !this.liveRunsOf(session).some(other => other !== run && index >= other.from && index <= other.to) &&
         !this.#host.producedNumbers(session).includes(index);
+      // Only an input already prepared is appended, and the one after it is
+      // begun at once (`next-packet-input.js`).
+      const following = nextPacketInputs({ take: index => this.#host.encodeInputs.take(session, index, index),
+        canAppend, first: nextIndex, last: ordered?.to ?? startIndex });
       void writeAdmittedInput(admittedInput, run.process.stdin, { next: async () => {
-        if (nextIndex > (ordered?.to ?? startIndex) || !canAppend(nextIndex)) return null;
-        const next = await this.#host.encodeInputs.acquire(session, nextIndex, nextIndex);
-        if (!next) return null;
-        if (!canAppend(nextIndex)) { next.release(); return null; }
-        run.admittedInputKeys.set(nextIndex, this.#inputFailures.key(next, inputParameters));
-        run.to = nextIndex++;
+        const next = following.next(index => { run.to = index; });
+        if (next) run.admittedInputKeys.set(run.to, this.#inputFailures.key(next, inputParameters));
         return next;
-      }, waiting: waits => { if (waits) run.inputWaitBegins(); else run.inputWaitEnds(); } }).catch(error => {
+      } }).catch(error => {
         this.#host.logger.warn(`encode input output=${session.outputKey} segment=${safeIndex} write failed: ${error.message}`);
         run.process?.stdin?.destroy();
-      });
+      }).finally(() => following.release());
     }
     this.#runsByInputToken.set(inputToken, run);
     this.#host.encodersChanged?.();

package/services/encode/next-packet-input.js

@@ -0,0 +1,56 @@
+/**
+ * @file Which input a run fed packet by packet goes on with.
+ *
+ * Such a run keeps its input open while more is appended, and FFmpeg closes a
+ * piece only once it reads past the piece's end, so a piece is published when
+ * the input after it arrives or the input ends. Waited for, the next input
+ * held each piece back for as long as preparing it took: on Home Assistant a
+ * soundtrack's #7 waited 14 s for #8's attempt, which ended refused memory, and
+ * the picture stood at 61.8 s (r54, r55, torrent-tv/meta#178).
+ *
+ * So a run is given the next input only when it is ready, and the one after it
+ * is begun as soon as one is taken: the run goes on while preparation keeps
+ * ahead of it, and ends, publishing its last piece, when it does not. The plan
+ * starts the next run on the input being prepared.
+ */
+
+/**
+ * A source of the inputs after a run's first.
+ *
+ * @param {object} params
+ * @param {(index: number) => object | null} params.take - The input of one
+ *   piece if ready, beginning its preparation otherwise (`EncodeInputs.take`).
+ * @param {(index: number) => boolean} params.canAppend - Whether the piece may
+ *   still be made by this run.
+ * @param {number} params.first - The first piece after the run's own.
+ * @param {number} params.last - The last piece the run may reach.
+ * @returns {{ next: (onTaken?: (index: number) => void) => object | null, release: () => void }}
+ */
+export function nextPacketInputs({ take, canAppend, first, last }) {
+  let index = first;
+  let ahead = null;
+  const begin = at => {
+    if (at <= last && canAppend(at)) ahead = take(at);
+  };
+  begin(index);
+  return {
+    next(onTaken) {
+      if (index > last || !canAppend(index)) return null;
+      const input = ahead ?? take(index);
+      ahead = null;
+      if (!input) return null;
+      if (!canAppend(index)) {
+        input.release();
+        return null;
+      }
+      onTaken?.(index);
+      index += 1;
+      begin(index);
+      return input;
+    },
+    release() {
+      ahead?.release();
+      ahead = null;
+    }
+  };
+}

package/services/media/container/ebml-stream.js

@@ -19,7 +19,6 @@
  */
 
 import { readVint } from "./ebml-reader.js";
-import { isUnavailable } from "./unavailable.js";
 
 /** An element id is at most four bytes and a size at most eight (RFC 8794 §4). */
 export const MAX_HEADER_BYTES = 12;
@@ -65,10 +64,6 @@ export class ElementReader {
   /** @type {number} */
   #windowAt = 0;
 
-  /** Below this position a portion was found missing: read exactly there. */
-  #exactBefore = -1;
-  #narrow;
-
   /**
    * @param {object} params
    * @param {(start: number, end: number) => Promise<Buffer>} params.read - Answers
@@ -84,13 +79,8 @@ export class ElementReader {
    *   last byte that can be read from `start` in one go. A read of what is
    *   downloaded must not run a prefetch past the end of the downloaded run,
    *   or a cluster that is whole would fail for the bytes after it.
-   * @param {boolean} [params.narrowWhenMissing] - When a prefetched portion is
-   *   not all downloaded, read only the bytes asked for, and read exactly up to
-   *   the end of that portion: what is not downloaded yet is then only what is
-   *   needed, and the bytes before it are read.
    */
-  constructor({ read, fileSize, portionBytes = Number.POSITIVE_INFINITY, prefetch = false, readableUntil, narrowWhenMissing = false }) {
-    this.#narrow = narrowWhenMissing;
+  constructor({ read, fileSize, portionBytes = Number.POSITIVE_INFINITY, prefetch = false, readableUntil }) {
     this.#read = read;
     this.#fileSize = fileSize;
     this.#readableUntil = typeof readableUntil === "function" ? readableUntil : () => fileSize;
@@ -120,15 +110,8 @@ export class ElementReader {
       return window.subarray(start - this.#windowAt, end - this.#windowAt);
     }
     const reach = Math.min(this.#fileSize, Math.max(end, this.#readableUntil(start)));
-    const span = this.#prefetch && start >= this.#exactBefore ? Math.max(end - start, Math.min(this.#portion, reach - start)) : end - start;
-    let got;
-    try {
-      got = await this.#read(start, start + span - 1);
-    } catch (error) {
-      if (!this.#narrow || span === end - start || !isUnavailable(error)) throw error;
-      this.#exactBefore = start + span;
-      got = await this.#read(start, end - 1);
-    }
+    const span = this.#prefetch ? Math.max(end - start, Math.min(this.#portion, reach - start)) : end - start;
+    const got = await this.#read(start, start + span - 1);
     this.#window = got;
     this.#windowAt = start;
     return got.subarray(0, end - start);

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

@@ -48,10 +48,13 @@ export async function walkMatroskaPackets({ readRange, fileSize, portionBytes, l
   // header at a time, each a read of a few bytes from the torrent thread, the
   // soundtrack's second piece of a copied 1080p film took 29.6 s on Home
   // Assistant while that thread was downloading (r52, torrent-tv/meta#178).
-  // Between clusters only their headers are read; where a portion is not all
-  // downloaded, only the bytes a header needs are read and asked for.
+  // A portion not all downloaded is asked for whole and the walk goes on from
+  // the same block once it is: read on header by header up to the gap, a walk
+  // held the file's reads 50 s and the picture's input waited behind it
+  // (r54). The headers lie throughout the portion, so it is all needed.
+  // Between clusters only their headers are read.
   let readableUntil = null;
-  const reader = new ElementReader({ read: readRange, fileSize, portionBytes, prefetch: true, narrowWhenMissing: true,
+  const reader = new ElementReader({ read: readRange, fileSize, portionBytes, prefetch: true,
     readableUntil: start => readableUntil ?? start });
   const declared = recordedTracks(tracks, trackIds);
   if (!state.packets) {

package/services/server/ViewerRequests.js

@@ -944,6 +944,25 @@ export class ViewerRequests {
     }
     // Totals that went back belong to a torrent added again: read on from them.
     if (limit) source.limit = limit;
-    return source.free.snapshot() ?? source.delivered.snapshot();
+    return sourceService(source.free.snapshot(), source.delivered.snapshot());
   }
 }
+
+/**
+ * The download service a source's forecast runs on: what the swarm carried
+ * while our selection held none of its connections back, but never less than
+ * what it carried in all. A stretch our selection held nothing back can be a
+ * moment with nothing to ask, and its rate then measures our asking: after a
+ * seek to 1000 s the forecast read 0 B/s from such a stretch while the torrent
+ * downloaded 5-18 MB/s, answered "service not advancing", and held the viewer
+ * (r54, torrent-tv/meta#178). What the swarm did carry, it can carry.
+ *
+ * @param {object | null} free - A rate summary (`RateTrend.snapshot`).
+ * @param {object | null} delivered
+ * @returns {object | null}
+ */
+export function sourceService(free, delivered) {
+  if (!free) return delivered;
+  if (!delivered) return free;
+  return delivered.lastValue > free.lastValue ? delivered : free;
+}