@torrent-tv/proxy 2.80.8 → 2.80.10

package/test/helpers/encode-run.js

@@ -1,128 +1,136 @@
-/**
- * @file A real `EncodeRun` over a process that is not real.
- *
- * Tests used to set a session's process fields by hand — `session.ffmpeg`,
- * `session.runState`, `session.encodeStartIndex` — which is how a test can pass
- * over code that no longer works: the fields were the thing under test as much
- * as the behaviour was. A run is an object now, so a test builds the object the
- * product builds and injects only the one thing a test may not have, which is a
- * child process.
- *
- * The pid is deliberately absent unless a test asks for one. `pause` and
- * `resume` send signals by pid, and a made-up number is somebody else's process
- * on the machine running the tests.
- */
-
-import { EncodeRun } from "../../services/encode/EncodeRun.js";
-
-/**
- * A child process that records what was done to it.
- *
- * @param {object} [options]
- * @param {number | null} [options.pid] - Only where a test genuinely exercises
- *   suspend or resume, and then it must be this process's own.
- * @returns {object}
- */
-export function fakeProcess({ pid = null, exitsWhenKilled = true } = {}) {
-  /** @type {Map<string, (...args: unknown[]) => void>} */
-  const listeners = new Map();
-  return {
-    pid,
-    killed: false,
-    exitCode: null,
-    signalCode: null,
-    /** Every signal it was sent, in order. */
-    signals: [],
-    stdout: { on() {} },
-    stderr: { on() {} },
-    on(event, handler) {
-      const kept = listeners.get(event) ?? [];
-      kept.push(handler);
-      listeners.set(event, kept);
-      return this;
-    },
-    once(event, handler) {
-      return this.on(event, handler);
-    },
-    kill(signal = "SIGTERM") {
-      this.signals.push(signal);
-      this.killed = true;
-      // A real process answers a signal by exiting, and it does so on a later
-      // turn. A fake that never exits makes every disposal wait out the grace
-      // period, which is two seconds a test spends proving nothing.
-      if (exitsWhenKilled && this.exitCode === null && this.signalCode === null) {
-        queueMicrotask(() => this.exit(null, signal));
-      }
-      return true;
-    },
-    /**
-     * Report an exit, as the real thing would.
-     *
-     * @param {number | null} code
-     * @param {string | null} [signal]
-     */
-    exit(code, signal = null) {
-      this.exitCode = code;
-      this.signalCode = signal;
-      for (const handler of listeners.get("exit") ?? []) {
-        handler(code, signal);
-      }
-    }
-  };
-}
-
-/** A logger that says nothing, for tests that are not about the log. */
-export const silentLogger = { info() {}, warn() {}, error() {} };
-
-/**
- * Add a run to a session, started, over a fake process.
- *
- * A session holds a SET of runs — as many as the machine affords — so a test
- * that wants two heads on one output calls this twice.
- *
- * @param {object} session - The session under test.
- * @param {object} [options]
- * @param {number} [options.from] - First segment number it is making.
- * @param {number} [options.to] - Last, inclusive; below `from` means no end.
- * @param {object} [options.process] - The process it should own.
- * @param {boolean} [options.producing] - Whether it has already made its first
- *   segment, which is what moves it out of starting.
- * @param {number | null} [options.lastSegmentIndex] - The film's last number,
- *   for telling a finished file from an input that dried up.
- * @param {boolean} [options.usesExplicitCuts]
- * @returns {import("../../services/encode/EncodeRun.js").EncodeRun}
- */
-export function startRunOn(session, options = {}) {
-  const {
-    from = 0,
-    to = -1,
-    process: child = fakeProcess(),
-    producing = true,
-    lastSegmentIndex = null,
-    usesExplicitCuts = false
-  } = options;
-  const run = new EncodeRun({
-    address: session.outputKey ?? session.id ?? "output",
-    encoder: { name: "libx264", kind: "software" },
-    from,
-    to,
-    buildArgs: () => [],
-    spawn: () => child,
-    logger: silentLogger,
-    lastSegmentIndex: () => lastSegmentIndex,
-    usesExplicitCuts
-  });
-  run.start("a test asked for it");
-  if (producing) {
-    // What moves a run out of starting is its first segment, in the product as
-    // here — so a run that is producing has made one, and its head stands one
-    // past where it began. `from` is still where it started, which is what a
-    // test asserting a run's position asks for.
-    run.noteProduced(from);
-  }
-  if (!(session.runs instanceof Set)) {
-    session.runs = new Set();
-  }
-  session.runs.add(run);
-  return run;
-}
+/**
+ * @file A real `EncodeRun` over a process that is not real.
+ *
+ * Tests used to set a session's process fields by hand — `session.ffmpeg`,
+ * `session.runState`, `session.encodeStartIndex` — which is how a test can pass
+ * over code that no longer works: the fields were the thing under test as much
+ * as the behaviour was. A run is an object now, so a test builds the object the
+ * product builds and injects only the one thing a test may not have, which is a
+ * child process.
+ *
+ * The pid is deliberately absent unless a test asks for one. `pause` and
+ * `resume` send signals by pid, and a made-up number is somebody else's process
+ * on the machine running the tests.
+ */
+
+import { EncodeRun } from "../../services/encode/EncodeRun.js";
+
+/**
+ * A child process that records what was done to it.
+ *
+ * @param {object} [options]
+ * @param {number | null} [options.pid] - Only where a test genuinely exercises
+ *   suspend or resume, and then it must be this process's own.
+ * @returns {object}
+ */
+export function fakeProcess({ pid = null, exitsWhenKilled = true } = {}) {
+  /** @type {Map<string, (...args: unknown[]) => void>} */
+  const listeners = new Map();
+  return {
+    pid,
+    killed: false,
+    exitCode: null,
+    signalCode: null,
+    /** Every signal it was sent, in order. */
+    signals: [],
+    stdout: { on() {} },
+    stderr: { on() {} },
+    on(event, handler) {
+      const kept = listeners.get(event) ?? [];
+      kept.push(handler);
+      listeners.set(event, kept);
+      return this;
+    },
+    once(event, handler) {
+      return this.on(event, handler);
+    },
+    kill(signal = "SIGTERM") {
+      this.signals.push(signal);
+      this.killed = true;
+      // A real process answers a signal by exiting, and it does so on a later
+      // turn. A fake that never exits makes every disposal wait out the grace
+      // period, which is two seconds a test spends proving nothing.
+      if (exitsWhenKilled && this.exitCode === null && this.signalCode === null) {
+        queueMicrotask(() => this.exit(null, signal));
+      }
+      return true;
+    },
+    /**
+     * Report an exit, as the real thing would.
+     *
+     * @param {number | null} code
+     * @param {string | null} [signal]
+     */
+    exit(code, signal = null) {
+      this.exitCode = code;
+      this.signalCode = signal;
+      for (const handler of listeners.get("exit") ?? []) {
+        handler(code, signal);
+      }
+    }
+  };
+}
+
+/** A logger that says nothing, for tests that are not about the log. */
+export const silentLogger = { info() {}, warn() {}, error() {} };
+
+/**
+ * Add a run to a session, started, over a fake process.
+ *
+ * A session holds a SET of runs — as many as the machine affords — so a test
+ * that wants two heads on one output calls this twice.
+ *
+ * @param {object} session - The session under test.
+ * @param {object} [options]
+ * @param {number} [options.from] - First segment number it is making.
+ * @param {number} [options.to] - Last, inclusive; below `from` means no end.
+ * @param {object} [options.process] - The process it should own.
+ * @param {boolean} [options.producing] - Whether it has already made its first
+ *   segment, which is what moves it out of starting.
+ * @param {number | null} [options.lastSegmentIndex] - The film's last number,
+ *   for telling a finished file from an input that dried up.
+ * @param {boolean} [options.usesExplicitCuts]
+ * @returns {import("../../services/encode/EncodeRun.js").EncodeRun}
+ */
+export function startRunOn(session, options = {}) {
+  const {
+    from = 0,
+    to = -1,
+    process: child = fakeProcess(),
+    producing = true,
+    lastSegmentIndex = null,
+    usesExplicitCuts = false,
+    // WHAT FFMPEG HAS REPORTED IT IS RUNNING AT. It says so on its progress
+    // channel from the first seconds, before any piece closes — so a run can be
+    // starting and already have a speed, and every real one does. Left at zero,
+    // the plan has no speed to compute an arrival from, every arrangement of
+    // encoders is equally hopeless, they all tie, and the encoder is taken away
+    // for changing nothing.
+    speedX = 0
+  } = options;
+  const run = new EncodeRun({
+    address: session.outputKey ?? session.id ?? "output",
+    encoder: { name: "libx264", kind: "software" },
+    from,
+    to,
+    buildArgs: () => [],
+    spawn: () => child,
+    logger: silentLogger,
+    lastSegmentIndex: () => lastSegmentIndex,
+    usesExplicitCuts
+  });
+  run.start("a test asked for it");
+  run.noteSpeed(speedX);
+  if (producing) {
+    // What moves a run out of starting is its first segment, in the product as
+    // here — so a run that is producing has made one, and its head stands one
+    // past where it began. `from` is still where it started, which is what a
+    // test asserting a run's position asks for.
+    run.noteProduced(from);
+  }
+  if (!(session.runs instanceof Set)) {
+    session.runs = new Set();
+  }
+  session.runs.add(run);
+  return run;
+}

package/test/orchestrator-wired.test.js

@@ -49,7 +49,7 @@ function sessionOn({ id, dirPath, encodeStartIndex = 0, runEndIndex = -1, speed
       cutGrid: "uniform"
     }),
     state: "ready",
-    file: new SourceFile({ sourceKey: "source-1", fileIndex: 0, name: "video.mkv" }),
+    file: new SourceFile({ sourceKey: "source-1", fileIndex: 0, name: "video.mkv" }).learn({ durationSeconds: 4000 }),
     // An ordinary session reads its own file, and its sound is inside it. The
     // three differ only for a soundtrack shipped as a file of its own.
     get inputFile() { return this.file; },
@@ -99,10 +99,14 @@ test("what a viewer waits for reaches the plan without their name", (t) => {
 
   manager.planEncodersNow();
 
-  const wanted = manager.encodeOrchestrator.demand.windowsOn(KEY);
-  assert.equal(wanted.length, 1);
-  assert.equal(wanted[0].from, 5, "where they are");
-  assert.ok(wanted[0].to > 5, "and the cushion in front of them");
+  // THE MAP IS BANDS NOW, not one window per viewer: what a viewer is stopped
+  // on, then what is in front of them band by band, then the rest of the track.
+  // The check is the same question asked of that shape — where the most urgent
+  // band begins, and that there is film in front of it.
+  const wanted = manager.encodeOrchestrator.demand.mapOn(KEY);
+  const first = [...wanted].sort((left, right) => right.priority - left.priority)[0];
+  assert.equal(first.from, 5, "where they are");
+  assert.ok(wanted.some((zone) => zone.to > 5), "and the cushion in front of them");
 });
 
 test("a viewer nothing has been heard from at all stops being waited for", (t) => {
@@ -120,7 +124,7 @@ test("a viewer nothing has been heard from at all stops being waited for", (t) =
 
   manager.planEncodersNow();
 
-  assert.equal(manager.encodeOrchestrator.demand.windowsOn(KEY).length, 0);
+  assert.equal(manager.encodeOrchestrator.demand.mapOn(KEY).length, 0);
 });
 
 test("a viewer who has arrived and asked for nothing is waited for", (t) => {
@@ -139,9 +143,10 @@ test("a viewer who has arrived and asked for nothing is waited for", (t) => {
 
   manager.planEncodersNow();
 
-  const wanted = manager.encodeOrchestrator.demand.windowsOn(KEY);
-  assert.equal(wanted.length, 1, "an output with a viewer on it is wanted");
-  assert.equal(wanted[0].from, 0, "and the beginning is where an unplaced viewer is");
+  const wanted = manager.encodeOrchestrator.demand.mapOn(KEY);
+  assert.ok(wanted.length > 0, "an output with a viewer on it is wanted");
+  const first = [...wanted].sort((left, right) => right.priority - left.priority)[0];
+  assert.equal(first.from, 0, "and the beginning is where an unplaced viewer is");
 });
 
 test("how many encoders the machine affords is measured, not chosen", (t) => {
@@ -155,7 +160,7 @@ test("how many encoders the machine affords is measured, not chosen", (t) => {
 
   // Fast, but what a second job costs on THIS machine has not been measured,
   // and an unmeasured penalty of 1 is not a statement that it is free.
-  cold.recentSpeed = { speed: 7.12 };
+  cold.lastAloneSpeed = 7.12;
   assert.equal(manager.maxRunsForOutput(KEY), 1, "no measurement, no second encoder");
 
   // Measured on the addon host 2026-09-03: at 854x480 one run made 7.12x and
@@ -166,7 +171,7 @@ test("how many encoders the machine affords is measured, not chosen", (t) => {
 
   // The same host at 1920x1080: one made 1.96x, two made 0.99x and 0.98x.
   manager.contentionPenalties = new Map([[1, 1.98]]);
-  cold.recentSpeed = { speed: 1.96 };
+  cold.lastAloneSpeed = 1.96;
   assert.equal(manager.maxRunsForOutput(KEY), 1, "the machine is full at one");
 });