@torrent-tv/proxy 2.99.18 → 2.99.20

package/package.json

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

package/server.js

@@ -15,6 +15,7 @@ import { handleHealthGet } from "./routes/health/get.js";
 import { handleMediaGet } from "./routes/media/get.js";
 import { ProbeRequests } from "./services/media/ProbeRequests.js";
 import { IndexMemory } from "./services/storage/IndexMemory.js";
+import { LARGEST_GROWTH_BYTES } from "./services/media/container/PacketRecords.js";
 import { probePackets } from "./services/media/probe-packets.js";
 import { trackChoicesOf } from "./services/viewer/segment-demands.js";
 import { PlaybackProjection } from "./services/torrent/PlaybackProjection.js";
@@ -770,6 +771,7 @@ export async function startProxyServer({
     failed: (request, error) => logger.warn(`media request=${request.key} probe failed: ${error?.message ?? error}`)
   });
   const indexMemory = new IndexMemory({
+    growthBytes: LARGEST_GROWTH_BYTES,
     reviseBudget: () => { void outputParts.machineBudget.revise("memory", "media metadata").catch(error => logger.warn(`packet index budget: ${error.message}`)); },
     changed: () => { mediaReads.memoryChanged(); probeReads.memoryChanged(); outputParts.encodeInputs?.memoryChanged(); }
   });

package/services/media/container/MatroskaContainer.js

@@ -680,6 +680,26 @@ export class MatroskaContainer extends Container {
     return cues.points.some(point => point.positions.some(position => !video || position.track === video.trackNumber));
   }
 
+  /**
+   * Whether `statement` is answered from what this container has already
+   * read, so it may be answered beside a read of the same file in progress
+   * (`ContainerOrchestrator.inspect`), as an AVI's are. The picture's
+   * ranges are arithmetic over the Cues once they are read; asked behind a
+   * soundtrack's packet walk in the file's one queue, the picture's next
+   * input after a seek was ready only after the sound's, one piece every
+   * 7-8 s, where the two had been prepared side by side every 2 s (r57 against
+   * r50, torrent-tv/meta#178).
+   *
+   * @param {string} statement
+   * @returns {boolean}
+   */
+  answersWithoutReading(statement) {
+    if (statement === "media-info") return this.mediaInfo?.durationSeconds != null;
+    if (statement === "source-navigation") return this.#cues !== undefined && this.#tracks !== null;
+    if (statement === "source-ranges") return this.#sourceSeekPoints !== null;
+    return false;
+  }
+
   async readMappedSourceRanges(interval) { return this.readSourceRanges(interval); }
 
   /**

package/services/media/container/PacketRecords.js

@@ -9,6 +9,8 @@ const BLOCK_BYTES = 65536;
 // Matroska soundtrack read in stretches: 144 tables of one 25-minute film held
 // 18.9 MB for 3.7 MB of records (r47 reproduced, torrent-tv/meta#178).
 const FIRST_BLOCK_BYTES = 4096;
+/** The most one record can make a table take at once: a block of records and one of addresses. */
+export const LARGEST_GROWTH_BYTES = 2 * BLOCK_BYTES;
 const ADDRESS_BYTES = 8;
 const HEADER_BYTES = 56;
 

package/services/storage/IndexMemory.js

@@ -7,18 +7,35 @@ export class IndexMemory {
   #revise;
   #changed;
   #revisionQueued = false;
+  #growthBytes;
 
-  constructor({ reviseBudget, changed }) {
+  /**
+   * @param {object} params
+   * @param {() => void} params.reviseBudget
+   * @param {() => void} params.changed
+   * @param {number} [params.growthBytes] - What one growth of a table can
+   *   take at most, kept free beyond what is held while anything is held. A
+   *   table grows a block at a time, each twice the last; allowed exactly what
+   *   it held, each growth was refused first and its whole read tried again:
+   *   a soundtrack piece after a seek was refused three times and ready after
+   *   53.7 s (r58, torrent-tv/meta#178).
+   */
+  constructor({ reviseBudget, changed, growthBytes = 0 }) {
     this.#revise = reviseBudget;
     this.#changed = changed;
+    this.#growthBytes = growthBytes;
   }
 
   held() { return this.#held; }
   packetBytes() { return this.#packetBytes; }
   wanted() {
+    const short = [...this.#files.values()].reduce((sum, file) => sum + Math.max(0, file.needed - file.held), 0);
+    return this.#held + Math.max(short, this.#held > 0 ? this.#growthBytes : 0);
+  }
+  /** What is held and asked for, without the margin kept for growth. */
+  required() {
     return this.#held + [...this.#files.values()].reduce((sum, file) => sum + Math.max(0, file.needed - file.held), 0);
   }
-  required() { return this.wanted(); }
 
   allow(bytes) {
     const allowed = Math.max(0, bytes);