@torrent-tv/proxy 2.101.38 → 2.101.40

package/package.json

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

package/server.js

@@ -708,8 +708,13 @@ export async function startProxyServer({
       const waiting = new Set();
       const turn = takeTurns();
       // ONLY THE SEGMENTS WHOSE RANGES ARE NOT KNOWN are worked out, in the
-      // order the swarm is to fetch them.
+      // order the swarm is to fetch them. Range resolution can use either a
+      // direct source index or the fallback reads below; yield between zones
+      // in both cases so a large map cannot hold the main thread across its
+      // full projection.
       for (const zone of projection.unresolved()) {
+        if (!map.isCurrent()) return [];
+        await turn();
         if (!map.isCurrent()) return [];
         const reader = readers.get(zone.outputKey);
         if (!reader) continue;
@@ -764,14 +769,7 @@ export async function startProxyServer({
             waiting.add(zone.outputKey);
             continue;
           }
-          // The pass shares the thread in equal turns (`takeTurns`): in one
-          // stretch the first pass over a film's 4000 zones held the main thread
-          // for all of its work, and handed back after every zone it took
-          // 14.7-22 s while the start forecast waited for it. What was worked
-          // out is kept, so a pass a newer map ends is not lost
-          // (torrent-tv/meta#178).
           if (value?.kind === "result") segmentSourceRanges.set(rangesKey, value.ranges);
-          if (await turn() && !map.isCurrent()) return [];
           if (value?.kind === "result") {
             convert(value.ranges);
             continue;

package/services/server/ViewerRequests.js

@@ -999,8 +999,13 @@ export class ViewerRequests {
         } });
       if (waitEstimate) forecast.waitEstimate = waitEstimate;
     }
-    if (measurement.forecastReason !== forecast.reason) {
+    const unavailableInput = forecast.unavailableSource;
+    const forecastInputKey = unavailableInput ? JSON.stringify([
+      unavailableInput.sourceId, unavailableInput.trackId, unavailableInput.segmentIndex, unavailableInput.phase
+    ]) : null;
+    if (measurement.forecastReason !== forecast.reason || measurement.forecastInputKey !== forecastInputKey) {
       measurement.forecastReason = forecast.reason;
+      measurement.forecastInputKey = forecastInputKey;
       logger.info(`playback readiness ${session.id} consumer=${consumerId} ${JSON.stringify({
         ...forecast,
         positionSeconds,

package/services/viewer/playback-readiness.js

@@ -258,6 +258,7 @@ export function predictPlaybackReadiness(input = {}) {
   }
   const link = rateCurve(input.linkReadings, now);
   let unknownReason = null;
+  let unavailableSource = null;
   if (!link) {
     return result(false, null, buffered, reserve, null, "link-rate-unavailable", 0);
   }
@@ -323,7 +324,10 @@ export function predictPlaybackReadiness(input = {}) {
           } else if (source.source.complete !== true) {
             const ranges = exactInputs ? inputRangesOf(exactInputs, sourceId) : null;
             if (ranges === null) {
-              unknownReason ??= "source-input-ranges-unavailable";
+              if (unknownReason === null) {
+                unknownReason = "source-input-ranges-unavailable";
+                unavailableSource = { sourceId, trackId: track.id, segmentIndex: segment.index, phase: "near" };
+              }
             } else {
               if (sourceByteIntervals === NO_SOURCE_BYTES) sourceByteIntervals = new Map();
               sourceByteIntervals.set(sourceId, ranges);
@@ -348,7 +352,8 @@ export function predictPlaybackReadiness(input = {}) {
   }
 
   if (unknownReason) {
-    return result(false, null, buffered, reserve, null, unknownReason, preparedSegments);
+    return { ...result(false, null, buffered, reserve, null, unknownReason, preparedSegments),
+      ...(unavailableSource ? { unavailableSource } : {}) };
   }
   for (const { track, curve } of trackState) {
     if (jobs.some((job) => job.track === track && !job.produced) && !curve) {
@@ -671,7 +676,8 @@ function scheduleTail({ trackState, sourceState, sourceByteCoverage, sourceArriv
         if (!source) return { reason: "source-measurement-unavailable" };
         if (source.source.complete === true) continue;
         const ranges = exactInputs ? inputRangesOf(exactInputs, sourceId) : null;
-        if (ranges === null) return { reason: "source-input-ranges-unavailable" };
+        if (ranges === null) return { reason: "source-input-ranges-unavailable",
+          unavailableSource: { sourceId, trackId: track.id, segmentIndex: segment.index, phase: "tail" } };
         const bytes = supplyOf(sourceId);
         let order = 0;
         for (const range of ranges) {