@torrent-tv/proxy 2.107.51 → 2.107.53

package/package.json

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

package/routes/api/sources/files/get.js

@@ -33,6 +33,11 @@ export async function handleApiSourceFilesGet(req, reply, { sourceRegistry, torr
     return reply.code(404).send({ error: "Source key was not found." });
   }
 
+  const consumerId = typeof req.query?.consumerId === "string" ? req.query.consumerId.trim() : "";
+  const generationRaw = typeof req.query?.generation === "string" ? req.query.generation : "";
+  const generation = generationRaw !== "" && /^\d+$/.test(generationRaw) ? Number(generationRaw) : null;
+  const viewerToken = viewerRequests?.viewerTokenOf?.(consumerId) ?? null;
+
   let cancelled;
   const waitPromise = new Promise(resolve => { cancelled = () => resolve(CANCELLED); });
   reply.raw?.once?.("close", cancelled);
@@ -71,10 +76,7 @@ export async function handleApiSourceFilesGet(req, reply, { sourceRegistry, torr
     if (file.excludedReason) logger.info(`contents request=${req.id ?? "unstated"} source=${sourceKey} ` +
       `file=${file.fileIndex} name=${JSON.stringify(file.relativePath)} bytes=${file.length} excluded=${file.excludedReason}`);
   }
-  const consumerId = typeof req.query?.consumerId === "string" ? req.query.consumerId.trim() : "";
   if (consumerId) viewers?.visibleFiles(consumerId, sourceKey, contents.items.map(item => item.fileIndex));
-  const generationRaw = typeof req.query?.generation === "string" ? req.query.generation : "";
-  const generation = generationRaw !== "" && /^\d+$/.test(generationRaw) ? Number(generationRaw) : null;
   const linkMbps = Number(req.query?.linkMbps);
   const linkSampleAgeMs = Number(req.query?.linkSampleAgeMs);
   const earlyLink = Number.isFinite(linkMbps) && linkMbps > 0
@@ -84,7 +86,7 @@ export async function handleApiSourceFilesGet(req, reply, { sourceRegistry, torr
     if (!consumerId || !Number.isSafeInteger(generation) || file.kind !== "video" || file.excludedReason) return file;
     viewerRequests?.noteWaitFileSnapshot?.({ consumerId, generation, sourceKey,
       fileIndex: file.fileIndex, fileName: file.relativePath ?? file.name, fileLength: file.length,
-      ...earlyLink });
+      ...earlyLink, ...(viewerToken ? { viewerToken } : {}) });
     return file;
   });
   return reply.send({

package/routes/api/sources/stats/get.js

@@ -34,6 +34,7 @@ export async function handleApiSourceStatsGet(req, reply, { sourceRegistry, torr
   const fileIndexRaw = typeof req.query.fileIndex === "string" ? req.query.fileIndex : "";
   const fileIndex = fileIndexRaw !== "" && /^\d+$/.test(fileIndexRaw) ? Number(fileIndexRaw) : null;
   const consumerId = typeof req.query.consumer === "string" ? req.query.consumer : "";
+  const viewerToken = viewerRequests?.viewerTokenOf?.(consumerId) ?? null;
   const generationRaw = typeof req.query.generation === "string" ? req.query.generation : "";
   const generation = generationRaw !== "" && /^\d+$/.test(generationRaw) ? Number(generationRaw) : null;
   const requestedFileName = typeof req.query.fileName === "string" ? req.query.fileName : "";
@@ -47,7 +48,8 @@ export async function handleApiSourceStatsGet(req, reply, { sourceRegistry, torr
   const noteInitialSnapshot = () => {
     if (consumerId && Number.isSafeInteger(generation) && Number.isSafeInteger(fileIndex)) {
       viewerRequests?.noteWaitFileSnapshot?.({ consumerId, generation, sourceKey, fileIndex,
-        fileName: requestedFileName, fileLength: requestedFileLength, ...earlyLink });
+        fileName: requestedFileName, fileLength: requestedFileLength, ...earlyLink,
+        ...(viewerToken ? { viewerToken } : {}) });
     }
   };
 
@@ -155,7 +157,7 @@ export async function handleApiSourceStatsGet(req, reply, { sourceRegistry, torr
   if (consumerId && Number.isSafeInteger(generation)) {
     viewerRequests?.noteWaitSourceSnapshot?.({ consumerId, generation, sourceKey, fileIndex,
       fileName: torrent.files?.[fileIndex]?.name ?? requestedFileName, fileLength: requestedFileLength,
-      stats, ...earlyLink });
+      stats, ...earlyLink, ...(viewerToken ? { viewerToken } : {}) });
   }
   const responsePreparedAtProxyMs = performance.now();
   return reply.send({ ...stats, sourceSnapshotTransport: {

package/services/encode/quality/HostLoad.js

@@ -325,7 +325,7 @@ export class HostLoad {
    * What the swarm can give every torrent, in bytes per second: the median of
    * what it carried while our selection held no connection back, but never
    * less than the median of what it carried in all — the same choice the
-   * start forecast makes for one source (`ViewerRequests` `sourceService`).
+   * start forecast makes for one source (`ViewerPlaybackState` `sourceService`).
    * Time our selection held a connection back measures our asking, not the
    * swarm, so holding the speculative levels back does not lower it
    * (torrent-tv/meta#180). Null before any interval was read.

package/services/server/ForecastDiagnostics.js

@@ -0,0 +1,23 @@
+/** Aggregates playback-forecast work for the existing once-a-minute log. */
+export class ForecastDiagnostics {
+  #logger;
+  #costs = { since: Date.now(), polls: 0, ms: 0, maxMs: 0, times: new Map() };
+
+  constructor({ logger }) {
+    this.#logger = logger;
+  }
+
+  note(ms, reasons) {
+    const costs = this.#costs;
+    costs.polls += 1;
+    costs.ms += ms;
+    costs.maxMs = Math.max(costs.maxMs, ms);
+    for (const reason of reasons) costs.times.set(reason, (costs.times.get(reason) ?? 0) + 1);
+    const now = Date.now();
+    if (now - costs.since < 60_000) return;
+    this.#logger.info(`start forecasts in ${((now - costs.since) / 1000).toFixed(1)}s: ${costs.polls}, ` +
+      `${Math.round(costs.ms)}ms in all, ${(costs.ms / costs.polls).toFixed(1)}ms each, longest ${Math.round(costs.maxMs)}ms; ` +
+      `times of a track's pieces: ${[...costs.times].map(([reason, count]) => `${reason} ${count}`).join(", ")}`);
+    Object.assign(costs, { since: now, polls: 0, ms: 0, maxMs: 0, times: new Map() });
+  }
+}

package/services/server/OutputLifecycle.js

@@ -73,6 +73,7 @@ export class OutputLifecycle {
       return;
     }
     this.#host.invalidateWaits(session);
+    this.#host.forgetForecastOutput?.(session);
     this.#host.outputs.delete(sessionId);
     this.#host.outputTimes.logIndexAccuracy(session);
 
@@ -406,7 +407,9 @@ export class OutputLifecycle {
     }
     // Presence ends synchronously, before disposal waits for a child process.
     // Late reports and preparations must not rejoin this viewer meanwhile.
+    const viewer = this.#host.viewers.get(consumerId);
     const outputs = this.#host.viewers.hasGone(consumerId);
+    this.#host.viewerDeparted?.(viewer);
     for (const outputId of outputs) {
       await this.releaseSessionConsumer(outputId, consumerId, because);
     }
@@ -428,11 +431,14 @@ export class OutputLifecycle {
     if (!output) {
       return false;
     }
+    const viewer = this.#host.viewers.get(consumerId);
     this.#host.releasePlaybackStorageDemand?.(output.outputKey ?? "", consumerId);
     // Nothing to release in the encoding: it holds one map per output, built
     // from where the viewers are, and the map that arrives next simply does not
     // have this one in it. A name to release was the last place a viewer
     // appeared inside the encoding at all.
-    return this.#host.viewers.leaves(output, consumerId);
+    const removed = this.#host.viewers.leaves(output, consumerId);
+    if (removed) this.#host.outputViewerDeparted?.(viewer, output);
+    return removed;
   }
 }