@torrent-tv/proxy 2.98.12 → 2.98.13

package/package.json

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

package/services/encode/EncodeRuns.js

@@ -13,6 +13,7 @@ import { contentionPenalty } from "./contention.js";
 import { LOOKAHEAD_PAUSE_SECONDS } from "./CushionReport.js";
 import { SpeedReadings } from "./SpeedReadings.js";
 import { nextInputAtFirstPiece } from "./next-input.js";
+import { runOpenOf } from "./run-open.js";
 import { ENCODE_RUN_STATE, liveRunsOf, runStateOf, wireState } from "./encode-run-state.js";
 import { ENCODE_EXIT } from "./encode-exit.js";
 import { EncodeRun, endOfRun } from "./EncodeRun.js";
@@ -1330,11 +1331,14 @@ export class EncodeRuns {
     const grid = session.timeline?.published ?? session.timeline?.boundaries;
     const pieceSeconds = Number(grid?.[run.from + 1]) - Number(grid?.[run.from]);
     const speed = run.speedX > 0 ? run.speedX : this.#host.encodeOrchestrator.speedOn?.(session.outputKey) ?? 0;
-    if (!Number.isFinite(ended.firstNamedMs) || !(pieceSeconds > 0) || !(speed > 0)) return;
     // FFmpeg's reads may have waited for the stretch being copied; that wait
-    // is the copy's, and the stretch is sized from the open (torrent-tv/meta#178).
-    const waitedMs = Number.isFinite(ended.firstNamedWallMs) ? run.originalInput?.waitedBefore?.(ended.firstNamedWallMs) ?? 0 : 0;
-    const openSeconds = Math.max(0, (ended.firstNamedMs - waitedMs) / 1000 - pieceSeconds / speed);
+    // is the copy's, and the stretch is sized from the open (`run-open.js`).
+    const open = runOpenOf({
+      firstNamedMs: ended.firstNamedMs, firstNamedWallMs: ended.firstNamedWallMs, startedAt: run.startedAt,
+      waitedBefore: run.originalInput?.waitedBefore, pieceSeconds, speed
+    });
+    if (!open) return;
+    const { openSeconds, waitedMs } = open;
     this.#host.encodeOrchestrator.noteOpen?.(session.outputKey ?? "", openSeconds);
     this.#host.logger.info(`encode input of run #${run.from}..#${run.to} on ${session.outputKey}: opened in ` +
       `${openSeconds.toFixed(2)}s (first piece named at ${ended.firstNamedMs}ms, ${pieceSeconds.toFixed(3)}s of film at ${speed.toFixed(2)}x` +

package/services/encode/run-open.js

@@ -0,0 +1,29 @@
+/**
+ * @file How long a run took to open its original input (torrent-tv/meta#178).
+ *
+ * Measured from the run's spawn to the name of its first closed piece, less
+ * what encoding that piece costs at the run's speed, and less the time
+ * FFmpeg's reads waited for the stretch being copied: that wait is the copy's,
+ * and the stretch is sized from the open. The input states those waits on the
+ * wall clock, so they are taken up to the wall-clock moment the first piece
+ * was named — the run's start plus its time to that name, not that time alone,
+ * which as a moment lay before every wait and counted none of them.
+ */
+
+/**
+ * @param {object} params
+ * @param {number | null} params.firstNamedMs - Spawn to the first piece's name, pauses left out.
+ * @param {number | null} params.firstNamedWallMs - The same on the wall clock, pauses included.
+ * @param {number} params.startedAt - The run's spawn on the wall clock, ms.
+ * @param {((until: number) => number) | null | undefined} params.waitedBefore - The input's wall-clock waits for its copy before `until`, ms.
+ * @param {number} params.pieceSeconds - The first piece's film.
+ * @param {number} params.speed - Film seconds per second; 0 when not known.
+ * @returns {{ openSeconds: number, waitedMs: number } | null} Null where any term is unknown.
+ */
+export function runOpenOf({ firstNamedMs, firstNamedWallMs, startedAt, waitedBefore, pieceSeconds, speed }) {
+  if (!Number.isFinite(firstNamedMs) || !(pieceSeconds > 0) || !(speed > 0)) return null;
+  const waitedMs = Number.isFinite(firstNamedWallMs) && startedAt > 0 && typeof waitedBefore === "function"
+    ? waitedBefore(startedAt + firstNamedWallMs)
+    : 0;
+  return { waitedMs, openSeconds: Math.max(0, (firstNamedMs - waitedMs) / 1000 - pieceSeconds / speed) };
+}