@torrent-tv/proxy 2.99.14 → 2.99.16

package/package.json

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

package/services/media/container/MatroskaContainer.js

@@ -682,6 +682,18 @@ export class MatroskaContainer extends Container {
 
   async readMappedSourceRanges(interval) { return this.readSourceRanges(interval); }
 
+  /**
+   * The bytes a packet table of `interval` is read from: the clusters the
+   * Cues name for it, as for the original file. Every block header in them is
+   * read, and the headers lie throughout. Null without Cues, where the walk
+   * itself finds what it needs.
+   */
+  async packetWalkRanges(interval) {
+    if (!await this.supportsOriginalSourceRanges()) return null;
+    const ranges = await this.readSourceRanges(interval);
+    return ranges.kind === "result" ? ranges : null;
+  }
+
   async readSourceRanges(interval) {
     if (!Number.isFinite(interval?.from) || !Number.isFinite(interval?.to) || interval.to <= interval.from) {
       throw new TypeError("Source ranges require a finite increasing interval.");

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/media/direct-segment-input.js

@@ -14,7 +14,8 @@
 import { SegmentInputs } from "./SegmentInputs.js";
 
 /**
- * @param {object} container - Has `supportsOriginalSourceRanges`, `readSourceRanges` and `readPacketIndex`.
+ * @param {object} container - Has `supportsOriginalSourceRanges`, `readSourceRanges` and `readPacketIndex`;
+ *   `packetWalkRanges` where a packet table is read from bytes the container can name in advance.
  * @param {{ interval: object, tracks: object[], mode: (track: object) => string }} segment
  * @param {(built: Promise<void>) => void} whenBuilt - Given a promise that settles when a table
  *   still being built is built or refused, when the answer is "pending".
@@ -23,6 +24,14 @@ import { SegmentInputs } from "./SegmentInputs.js";
  */
 export async function directSegmentInput(container, { interval, tracks, mode }, whenBuilt) {
   if (await container.supportsOriginalSourceRanges(interval) === true) return container.readSourceRanges(interval);
+  // A soundtrack read from its own packets is prepared by walking the
+  // clusters that hold them, so those are the bytes it waits for: the map and
+  // the start forecast are told them, as for the picture. Told only the
+  // packets once the walk had found them, a far piece's bytes were unknown
+  // until downloaded, the forecast never stood, and a copied 1080p film did not
+  // start in 275 s (r53, torrent-tv/meta#178).
+  const walked = await container.packetWalkRanges?.(interval);
+  if (walked) return walked;
   // The table is begun, or joined, and not waited for.
   if (container.packetTableWouldWait?.() === true) {
     whenBuilt(container.readPacketIndex(interval).then(() => undefined, () => undefined));

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;
+}