@torrent-tv/proxy 2.93.1 → 2.93.3

package/package.json

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

package/services/encode/EncodeInputs.js

@@ -27,6 +27,14 @@ export class EncodeInputs {
 
   held() { return this.#held; }
   wanted() { return this.#held + [...this.#wanted.values()].reduce((sum, bytes) => sum + bytes, 0); }
+  required() {
+    let bytes = this.#held;
+    for (const [key, wanted] of this.#wanted) {
+      const request = this.#requests.get(key);
+      if (request && this.#urgent(request.output, request.from)) bytes += wanted;
+    }
+    return bytes;
+  }
   allow(bytes) {
     const changed = this.#allowed !== Math.max(0, bytes);
     this.#allowed = Math.max(0, bytes);

package/services/encode/EncodeRuns.js

@@ -370,7 +370,11 @@ export class EncodeRuns {
       if (!whole) {
         this.#host.logger.warn(
           `encode: not publishing piece ${index} of ${address.slice(0, 60)}: ` +
-            (reason ?? (throughSeconds === null ? "it holds no playable media" : `produced through ${throughSeconds}s, cut ${cut}s`))
+            (reason ?? (throughSeconds === null ? "it holds no playable media" : `produced through ${throughSeconds}s, cut ${cut}s`)) +
+            (interval ? ` expected=${interval.from}..${interval.to} tracks=${JSON.stringify(mediaRanges.tracks.map(track => ({
+              kind: track.kind, timescale: track.timescale, frame: track.productionFrame,
+              first: track.ranges[0], last: track.ranges.at(-1), count: track.ranges.length })),
+              (_key, value) => typeof value === "bigint" ? String(value) : value)}` : "")
         );
         return false;
       }

package/services/server/wire-outputs.js

@@ -982,7 +982,8 @@ export function wireOutputs({
       index >= window.from && index <= window.to && window.withinSeconds === 0),
     changed: (output, result) => {
       if (result.kind === "terminal") {
-        logger.warn(`encode input output=${output.outputKey} terminal=${result.reason}: ${result.message ?? ""}`);
+        logger.warn(`encode input output=${output.outputKey} terminal=${result.reason}: ${result.message ?? ""}` +
+          (Number.isFinite(result.bytes) ? ` bytes=${result.bytes} capacity=${result.capacity}` : ""));
         parts.serving.invalidateWaits(output);
       }
       parts.encodeRuns.planEncodersSoon();

package/services/storage/wire.js

@@ -90,7 +90,7 @@ export function wireMachineBudget({
 
   budget.defineResource({ name: "memory", readFree: () => availableMemoryBytes() });
   if (encodeInputs) budget.register({ name: "admitted encode inputs", resource: "memory",
-    held: () => encodeInputs.held(), wanted: () => encodeInputs.wanted(), required: () => encodeInputs.held(), allow: bytes => encodeInputs.allow(bytes) });
+    held: () => encodeInputs.held(), wanted: () => encodeInputs.wanted(), required: () => encodeInputs.required(), allow: bytes => encodeInputs.allow(bytes) });
   if (indexMemory) budget.register({ name: "media metadata", resource: "memory",
     held: () => indexMemory.held(), wanted: () => indexMemory.wanted(), required: () => indexMemory.required(), allow: bytes => indexMemory.allow(bytes) });
 

package/services/viewer/DownloadMaps.js

@@ -27,7 +27,7 @@ export class DownloadMaps {
       if (!current || Object.keys(current).some(key => key !== "from" && key !== "to" && !Object.is(zone[key], key === "deadlineAt" ? deadlineAt : current[key]))) changed = true;
       return current ? [{ ...zone, ...current, from: zone.from, to: zone.to, deadlineAt }] : [];
     });
-    file.zones = retained;
+    this.#setZones(file, retained);
     for (const [statement, metadata] of file.metadata) {
       if (metadata.interval && !this.wantsInterval(sourceKey, fileIndex, metadata.interval)) {
         file.metadata.delete(statement);
@@ -47,7 +47,7 @@ export class DownloadMaps {
     const resolved = await this.#resolvePlayback({ sourceKey, fileIndex, durationSeconds, zones: file.sourceZones,
       isCurrent: () => this.#files.get(`${sourceKey}:${fileIndex}`) === file && revision === file.revision });
     if (revision !== file.revision) return;
-    file.zones = resolved;
+    this.#setZones(file, resolved);
     return this.#emit(file);
   }
 
@@ -87,10 +87,10 @@ export class DownloadMaps {
     const sources = [];
     for (const file of this.#files.values()) {
       if (file.sourceKey !== sourceKey) continue;
-      const zones = file.zones.filter(zone => zone.outputKey === outputKey && zone.index === index);
-      if (!zones.length) continue;
+      const ranges = file.inputs.get(outputKey)?.get(index);
+      if (!ranges?.length) continue;
       sources.push({ sourceId: `${sourceKey}:${file.fileIndex}`,
-        ranges: zones.map(zone => ({ start: zone.byteStart, end: zone.byteEnd + 1 })) });
+        ranges });
     }
     return sources.length ? sources : null;
   }
@@ -130,7 +130,7 @@ export class DownloadMaps {
 
   forget(sourceKey, fileIndex, { keepPreparation = false } = {}) {
     const file = this.#file(sourceKey, fileIndex);
-    file.zones = [];
+    this.#setZones(file, []);
     file.sourceZones = [];
     if (!keepPreparation) file.nativeZones = [];
     file.revision++;
@@ -158,12 +158,25 @@ export class DownloadMaps {
     const key = `${sourceKey}:${fileIndex}`;
     let file = this.#files.get(key);
     if (!file) {
-      file = { sourceKey, fileIndex, durationSeconds: 0, zones: [], nativeZones: [], sourceZones: [], revision: 0, epoch: ++this.#nextEpoch, metadata: new Map(), pending: Promise.resolve() };
+      file = { sourceKey, fileIndex, durationSeconds: 0, zones: [], inputs: new Map(), nativeZones: [], sourceZones: [], revision: 0, epoch: ++this.#nextEpoch, metadata: new Map(), pending: Promise.resolve() };
       this.#files.set(key, file);
     }
     return file;
   }
 
+  #setZones(file, zones) {
+    file.zones = zones;
+    file.inputs = new Map();
+    for (const zone of zones) {
+      if (typeof zone.outputKey !== "string" || !Number.isSafeInteger(zone.index)) continue;
+      let output = file.inputs.get(zone.outputKey);
+      if (!output) file.inputs.set(zone.outputKey, output = new Map());
+      let ranges = output.get(zone.index);
+      if (!ranges) output.set(zone.index, ranges = []);
+      ranges.push({ start: zone.byteStart, end: zone.byteEnd + 1 });
+    }
+  }
+
   #emit(file) {
     const zones = [...file.zones, ...file.nativeZones];
     for (const { ranges, requestId, priority, urgent, deadlineAt, order } of file.metadata.values()) {