@torrent-tv/proxy 2.106.0 → 2.106.1

package/package.json

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

package/server.js

@@ -23,6 +23,7 @@ import { trackChoicesOf } from "./services/viewer/segment-demands.js";
 import { PlaybackProjection } from "./services/torrent/PlaybackProjection.js";
 import { SegmentInputTable } from "./services/viewer/segment-input-table.js";
 import { SourcePreparation, preparationInterval } from "./services/viewer/SourcePreparation.js";
+import { publishPlaybackBeforePreparationRefresh } from "./services/server/publish-playback-before-preparation-refresh.js";
 import { handleHealthzGet } from "./routes/healthz/get.js";
 import { handleApiDeliverySinkGet } from "./routes/api/delivery-sink/get.js";
 import { handleApiLinkProbeGet } from "./routes/api/link-probe/get.js";
@@ -1213,7 +1214,6 @@ export async function startProxyServer({
     setDownloadRate: (bytesPerSecond, because) => torrentPool.setDownloadRate?.(bytesPerSecond, because),
     setSpeculativeHold: (held, because) => torrentPool.setSpeculativeHold?.(held, because),
     setPriorityMap: async ({ sourceKey, fileIndex, durationSeconds, zones }) => {
-      void sourcePreparation?.refresh();
       const record = sourceRegistry.get(sourceKey);
       if (!record) {
         return;
@@ -1224,9 +1224,13 @@ export async function startProxyServer({
           if (!outputParts.viewers.forSource(sourceKey).length) probeReads.forget(sourceKey, fileIndex);
           await downloadMaps.forget(sourceKey, fileIndex, { keepPreparation: true });
           playbackProjections.get(`${sourceKey}:${fileIndex}`)?.clear();
+          void sourcePreparation?.refresh();
           return;
         }
-        await downloadMaps.playback({ sourceKey, fileIndex, durationSeconds, zones });
+        await publishPlaybackBeforePreparationRefresh(
+          () => downloadMaps.playback({ sourceKey, fileIndex, durationSeconds, zones }),
+          () => { void sourcePreparation?.refresh(); }
+        );
         mediaReads.retain(sourceKey, fileIndex, params => !params.requestId?.startsWith("download:") ||
           zones.some(zone => zone.from === params.downloadInterval?.from && zone.to === params.downloadInterval?.to));
       } catch (error) {
@@ -1375,6 +1379,7 @@ export async function startProxyServer({
       const held = await torrentPool.heldRangesOf(torrent, work.fileIndex);
       return work.inputRanges.every(([start, end]) => held.some(([from, to]) => from <= start && to >= end));
     },
+    playbackAppliedFor: (sourceKey, fileIndex) => downloadMaps.hasAppliedPlayback(sourceKey, fileIndex),
     readyChanged: (work, ready) => logger.info(`source urgent request=${work.requestId} viewer=${work.ownerId} ` +
       `source=${work.sourceKey} file=${work.fileIndex} inputReady=${ready}`),
     inspect: async work => {

package/services/server/publish-playback-before-preparation-refresh.js

@@ -0,0 +1,11 @@
+/**
+ * Keep source preparation stated until the viewer's playback map is applied.
+ *
+ * @param {() => Promise<unknown>} publishPlayback
+ * @param {() => unknown} refreshPreparation
+ * @returns {Promise<void>}
+ */
+export async function publishPlaybackBeforePreparationRefresh(publishPlayback, refreshPreparation) {
+  await publishPlayback();
+  refreshPreparation();
+}

package/services/viewer/DownloadMaps.js

@@ -162,6 +162,11 @@ export class DownloadMaps {
     return this.#files.get(`${sourceKey}:${fileIndex}`)?.epoch ?? 0;
   }
 
+  hasAppliedPlayback(sourceKey, fileIndex) {
+    const file = this.#files.get(`${sourceKey}:${fileIndex}`);
+    return Boolean(file?.zones.length && file.shape && file.appliedShape === file.shape);
+  }
+
   native({ sourceKey, fileIndex, zones }) {
     const file = this.#file(sourceKey, fileIndex);
     file.nativeZones = zones;
@@ -325,7 +330,12 @@ export class DownloadMaps {
         const answeredAt = this.#clock();
         // A torrent not yet in the thread applies nothing, so this map was not
         // delivered and the next one, however alike, has to be.
-        if (reply?.appliedMs === null && file.shape === shape) file.shape = null;
+        if (reply?.appliedMs === null) {
+          if (file.shape === shape) file.shape = null;
+          if (file.appliedShape === shape) file.appliedShape = null;
+        } else {
+          file.appliedShape = shape;
+        }
         // The window open now, which a report since this map was asked for may have started.
         const stats = this.#statsOf(file);
         stats.sent += 1;
@@ -345,6 +355,7 @@ export class DownloadMaps {
     // sent, and leaves nothing to compare the next one against.
     file.pending = pending.catch(() => {
       if (file.shape === shape) file.shape = null;
+      if (file.appliedShape === shape) file.appliedShape = null;
     });
     return pending;
   }

package/services/viewer/SourcePreparation.js

@@ -38,6 +38,7 @@ export class SourcePreparation {
   #reprice;
   #inputReady;
   #readyChanged;
+  #playbackAppliedFor;
   #work = new Map();
   #revision = 0;
   #completedRevision = null;
@@ -45,7 +46,8 @@ export class SourcePreparation {
   #candidateAbort = new AbortController();
 
   constructor({ viewers, candidatesFor, relatedFilesFor = () => [], priorityFor = (_viewer, priority) => priority,
-    inputReady = async () => false, readyChanged = () => {}, inspect, withdraw, reprice = () => {}, failed }) {
+    inputReady = async () => false, readyChanged = () => {}, playbackAppliedFor = () => true,
+    inspect, withdraw, reprice = () => {}, failed }) {
     this.#viewers = viewers;
     this.#candidates = candidatesFor;
     this.#related = relatedFilesFor;
@@ -56,6 +58,7 @@ export class SourcePreparation {
     this.#reprice = reprice;
     this.#inputReady = inputReady;
     this.#readyChanged = readyChanged;
+    this.#playbackAppliedFor = playbackAppliedFor;
   }
 
   refresh() {
@@ -80,8 +83,13 @@ export class SourcePreparation {
 
   /** Current owners determine priority; old work never restores a withdrawn read. */
   demandFor(work) {
+    const handoffFileIndex = work.selected || (work.role === "source-rest" && work.ownerFileIndex === work.fileIndex)
+      ? work.fileIndex : null;
+    const opening = Number.isInteger(handoffFileIndex) && this.#viewers.forSource(work.sourceKey).some(viewer =>
+      (work.ownerId === undefined || viewer.id === work.ownerId) && viewer.source.selectedFileIndex === handoffFileIndex &&
+      viewer.outputs.size > 0 && !this.#playbackAppliedFor(work.sourceKey, handoffFileIndex));
     if (work.selected && work.statement === "packets" &&
-      work.positions !== this.#positionsFor(work.sourceKey, work.fileIndex, work.ownerId)) return null;
+      work.positions !== this.#positionsFor(work.sourceKey, work.fileIndex, work.ownerId, opening)) return null;
     if (work.role === "subtitle-embedded" && ["packets", "subtitle-cues"].includes(work.statement) &&
       work.positions !== this.#positionsFor(work.sourceKey, work.fileIndex, work.ownerId, true)) return null;
     const owners = this.#viewers.forSource(work.sourceKey).filter(viewer => {
@@ -90,9 +98,9 @@ export class SourcePreparation {
         viewer.subtitle.trackIndex !== work.trackIndex)) return false;
       const selected = viewer.source.selectedFileIndex;
       if (work.ownerFileIndex !== undefined) return selected === work.ownerFileIndex &&
-        (work.role !== "source-rest" || viewer.outputs.size === 0);
+        (work.role !== "source-rest" || viewer.outputs.size === 0 || opening);
       if (work.statement !== "packets") return selected === null || selected === work.fileIndex;
-      if (selected !== null) return selected === work.fileIndex && viewer.outputs.size === 0 && work.selected;
+      if (selected !== null) return selected === work.fileIndex && (viewer.outputs.size === 0 || opening) && work.selected;
       return !work.selected && viewer.source.visibleFileIndices.includes(work.fileIndex);
     });
     if (!owners.length) return null;