@torrent-tv/proxy 2.89.7 → 2.89.9

package/services/encode/EncodeRun.js

@@ -589,7 +589,7 @@ export class EncodeRun {
         // A refused closed piece must release this run's claim now, rather
         // than keep its viewer waiting until the rest of the film is encoded.
         this.#continue();
-        try { this.#process?.kill("SIGTERM"); } catch { /* Exit will release the claim. */ }
+        this.#signal("SIGTERM");
         return false;
       } finally {
         this.#closedTimings.delete(name);
@@ -663,10 +663,37 @@ export class EncodeRun {
     // A suspended process does not act on SIGTERM until it is continued, so the
     // wait for its exit would never end. Let it run before asking it to stop.
     this.#continue();
+    this.#signal("SIGTERM");
+  }
+
+  /**
+   * Send a signal to this run's process, and only to it.
+   *
+   * ONLY A PROCESS THAT STARTED IS SIGNALLED. When the executable cannot be
+   * started, Node reports the failure on a later turn, and until then the child
+   * holds a handle whose process id is 0. Signalling it then is `kill(0, …)`,
+   * which reaches every process in our own process group: the proxy itself, and
+   * under `node --test` the test runner. Measured 2026-10-03: a run stopped in
+   * the same turn its `ffmpeg` failed to start ended the whole test run
+   * ("Interrupted while running") in 5 of 40 runs of one file.
+   *
+   * Sent through the child object rather than `process.kill(pid)`, so the
+   * signal goes to the process this run spawned and to nothing that happens to
+   * hold the same number.
+   *
+   * @param {NodeJS.Signals} signal
+   * @returns {boolean} Whether the signal was delivered.
+   */
+  #signal(signal) {
+    const child = this.#process;
+    if (!child || !(Number(child.pid) > 0)) {
+      return false;
+    }
     try {
-      this.#process.kill("SIGTERM");
+      return child.kill(signal) !== false;
     } catch {
       // Best effort: it may already be gone, and its exit will say so.
+      return false;
     }
   }
 
@@ -685,7 +712,9 @@ export class EncodeRun {
       return false;
     }
     try {
-      globalThis.process.kill(this.#process.pid, "SIGSTOP");
+      // A platform without the signal throws here (ENOSYS), which is what
+      // marks suspension unsupported below.
+      this.#process.kill("SIGSTOP");
     } catch (error) {
       this.#pauseUnsupported = true;
       this.logger.info(
@@ -731,15 +760,10 @@ export class EncodeRun {
     if (this.#state !== ENCODE_RUN_STATE.SUSPENDED || !this.#process?.pid) {
       return false;
     }
-    let continued = true;
-    try {
-      globalThis.process.kill(this.#process.pid, "SIGCONT");
-    } catch {
-      // The process is gone; its exit handler will deal with it. The state is
-      // moved either way — but nothing was resumed, and saying so is what stops
-      // a dead run being reported as producing again.
-      continued = false;
-    }
+    // The process may be gone; its exit handler will deal with it. The state
+    // is moved either way — but nothing was resumed, and saying so is what
+    // stops a dead run being reported as producing again.
+    const continued = this.#signal("SIGCONT");
     this.#transition(ENCODE_RUN_EVENT.RESUMED);
     this.clock.continued();
     return continued;

package/services/encode/Encoder.js

@@ -1,142 +1,142 @@
-/**
- * @file One kind of encoder: what it is called, how it is fed, how its
- * arguments are built, and what its own setting for speed is.
- *
- * Until 2026-09-04 each kind was an object literal returned by a factory in
- * `encode/hwaccel.js`, and everything a kind knows beyond its arguments was either
- * absent or spread into conditions elsewhere. The clearest case is the ladder
- * of speed settings: `pickSoftwarePreset` walks one for libx264, and the four
- * hardware kinds have none at all — NVENC is given a hardcoded `-preset p4`,
- * QSV and VAAPI are given no speed setting whatever. That is not a decision
- * anybody took; it is a gap that had nowhere to be written down.
- *
- * So a kind states its own ladder here, and says whether that ladder has been
- * MEASURED on a host or only read out of ffmpeg's option list. Nothing consumes
- * it yet: benchmarking the hardware ladders is its own work, and a hardware
- * encoder that passes the strict startup test at one setting is not thereby
- * correct at another — `h264_v4l2m2m` on the CM4 is the standing reminder.
- * Stating it is what makes the gap visible instead of invisible.
- */
-
-/**
- * A kind's own setting for trading picture against speed.
- *
- * @typedef {object} SpeedLadder
- * @property {string} flag - The ffmpeg option, e.g. `-preset`.
- * @property {string[]} values - Ordered slowest first, fastest last. Empty when
- *   the kind has no such setting at all.
- * @property {boolean} measured - Whether a host has ever been benchmarked
- *   across these values. False means the values were read from ffmpeg's own
- *   option list and nothing here knows what they cost.
- * @property {string} note - What is known and what is not, in words.
- */
-
-export class Encoder {
-  /**
-   * @param {object} params
-   * @param {string} params.name - ffmpeg's own name for it, e.g. `libx264`.
-   * @param {"software"|"vaapi"|"qsv"|"nvenc"|"v4l2m2m"} params.kind
-   * @param {string|null} [params.device] - The render node or device path, for
-   *   the kinds that take one.
-   * @param {string[]} [params.inputArgs] - Arguments that belong BEFORE the
-   *   input, because they decide how frames are decoded and where they land.
-   */
-  constructor({ name, kind, device = null, inputArgs = [] }) {
-    this.name = name;
-    this.kind = kind;
-    this.device = device;
-    this.inputArgs = inputArgs;
-  }
-
-  /**
-   * Whether frames are encoded by dedicated silicon rather than by the
-   * processor. It decides what a runtime failure means: a hardware encode that
-   * fails takes this proxy down to software for the rest of the process, and a
-   * software encode that fails has nowhere to fall.
-   *
-   * @returns {boolean}
-   */
-  get isHardware() {
-    return this.kind !== "software";
-  }
-
-  /**
-   * @returns {SpeedLadder}
-   */
-  get speedLadder() {
-    return {
-      flag: "",
-      values: [],
-      measured: false,
-      note: "This kind has not stated a speed setting."
-    };
-  }
-
-  /**
-   * The settings of {@link speedLadder} a real output can actually be encoded
-   * at, slowest first — what `buildVideoArgs` honours. The startup calibration
-   * qualifies and measures exactly these and nothing else (roadmap item 97,
-   * step 14): a setting the arguments never pass is not a mode of this host,
-   * and pricing one would price something no output is ever encoded with.
-   *
-   * `[null]` for a kind driven at one fixed setting: there is one mode, and it
-   * is the one its arguments state.
-   *
-   * @returns {Array<string | null>}
-   */
-  get selectableRungs() {
-    return [null];
-  }
-
-  /**
-   * The arguments that produce the picture. Every kind states its own.
-   *
-   * @param {{ targetWidth: number, targetHeight: number, segmentDurationSec: number, preset?: string, fps?: number, tonemap?: boolean, forcedKeyframeTimes?: number[] | null, rateControl?: { maxrateKbps: number, bufsizeKbps: number, level: string | null } | null }} _options
-   * @returns {string[]}
-   */
-  buildVideoArgs(_options) {
-    throw new Error(`${this.name} does not say how to build its video arguments.`);
-  }
-
-  /**
-   * What this kind needs BEFORE the input when it is being benchmarked.
-   *
-   * Not `inputArgs`: those set up hardware DECODING, and a benchmark is fed raw
-   * frames — there is nothing to decode. What a device-backed encoder still
-   * needs is the device itself, and without it `h264_vaapi` and `h264_qsv` fail
-   * to open at all, so the benchmark would answer "this host cannot encode"
-   * about a host that encodes perfectly well.
-   *
-   * @returns {string[]}
-   */
-  benchmarkInputArgs() {
-    return [];
-  }
-
-  /**
-   * How to encode raw frames at one rung of this kind's speed ladder, for the
-   * startup benchmark and nothing else.
-   *
-   * SEPARATE FROM `buildVideoArgs` on purpose. That one produces a picture from
-   * a film: it scales, it tone-maps, it forces keyframes onto a grid, it caps a
-   * bitrate. The benchmark is fed raw frames of a known size and wants the
-   * encoder and the rung with nothing else in the way — otherwise the reading
-   * prices a scaler as though it were the encoder.
-   *
-   * WHY EVERY KIND MUST ANSWER IT. Until now the throughput benchmark existed
-   * only for libx264 and was gated on the chosen encoder being software, so a
-   * host with NVENC, QSV, VAAPI or V4L2M2M measured its encoder not at all —
-   * and the quality offer, which is arithmetic over pixels per second, had no
-   * pixels per second to work with. NVENC's own ladder is `p1`…`p7` and QSV's
-   * is `veryfast`…`veryslow`; both are declared here and neither was ever run.
-   *
-   * @param {string | null} rung - One value of {@link speedLadder}, or null
-   *   where the kind has no ladder and there is one thing to measure.
-   * @returns {string[]}
-   */
-  benchmarkArgs(rung = null) {
-    const ladder = this.speedLadder;
-    const setting = ladder?.flag && rung ? [ladder.flag, rung] : [];
-    return ["-c:v", this.name, ...setting];
-  }
-}
+/**
+ * @file One kind of encoder: what it is called, how it is fed, how its
+ * arguments are built, and what its own setting for speed is.
+ *
+ * Until 2026-09-04 each kind was an object literal returned by a factory in
+ * `encode/hwaccel.js`, and everything a kind knows beyond its arguments was either
+ * absent or spread into conditions elsewhere. The clearest case is the ladder
+ * of speed settings: `pickSoftwarePreset` walks one for libx264, and the four
+ * hardware kinds have none at all — NVENC is given a hardcoded `-preset p4`,
+ * QSV and VAAPI are given no speed setting whatever. That is not a decision
+ * anybody took; it is a gap that had nowhere to be written down.
+ *
+ * So a kind states its own ladder here, and says whether that ladder has been
+ * MEASURED on a host or only read out of ffmpeg's option list. Nothing consumes
+ * it yet: benchmarking the hardware ladders is its own work, and a hardware
+ * encoder that passes the strict startup test at one setting is not thereby
+ * correct at another — `h264_v4l2m2m` on the CM4 is the standing reminder.
+ * Stating it is what makes the gap visible instead of invisible.
+ */
+
+/**
+ * A kind's own setting for trading picture against speed.
+ *
+ * @typedef {object} SpeedLadder
+ * @property {string} flag - The ffmpeg option, e.g. `-preset`.
+ * @property {string[]} values - Ordered slowest first, fastest last. Empty when
+ *   the kind has no such setting at all.
+ * @property {boolean} measured - Whether a host has ever been benchmarked
+ *   across these values. False means the values were read from ffmpeg's own
+ *   option list and nothing here knows what they cost.
+ * @property {string} note - What is known and what is not, in words.
+ */
+
+export class Encoder {
+  /**
+   * @param {object} params
+   * @param {string} params.name - ffmpeg's own name for it, e.g. `libx264`.
+   * @param {"software"|"vaapi"|"qsv"|"nvenc"|"v4l2m2m"} params.kind
+   * @param {string|null} [params.device] - The render node or device path, for
+   *   the kinds that take one.
+   * @param {string[]} [params.inputArgs] - Arguments that belong BEFORE the
+   *   input, because they decide how frames are decoded and where they land.
+   */
+  constructor({ name, kind, device = null, inputArgs = [] }) {
+    this.name = name;
+    this.kind = kind;
+    this.device = device;
+    this.inputArgs = inputArgs;
+  }
+
+  /**
+   * Whether frames are encoded by dedicated silicon rather than by the
+   * processor. It decides what a runtime failure means: a hardware encode that
+   * fails takes this proxy down to software for the rest of the process, and a
+   * software encode that fails has nowhere to fall.
+   *
+   * @returns {boolean}
+   */
+  get isHardware() {
+    return this.kind !== "software";
+  }
+
+  /**
+   * @returns {SpeedLadder}
+   */
+  get speedLadder() {
+    return {
+      flag: "",
+      values: [],
+      measured: false,
+      note: "This kind has not stated a speed setting."
+    };
+  }
+
+  /**
+   * The settings of {@link speedLadder} a real output can actually be encoded
+   * at, slowest first — what `buildVideoArgs` honours. The startup calibration
+   * qualifies and measures exactly these and nothing else (roadmap item 97,
+   * step 14): a setting the arguments never pass is not a mode of this host,
+   * and pricing one would price something no output is ever encoded with.
+   *
+   * `[null]` for a kind driven at one fixed setting: there is one mode, and it
+   * is the one its arguments state.
+   *
+   * @returns {Array<string | null>}
+   */
+  get selectableRungs() {
+    return [null];
+  }
+
+  /**
+   * The arguments that produce the picture. Every kind states its own.
+   *
+   * @param {{ targetWidth: number, targetHeight: number, segmentDurationSec: number, preset?: string, fps?: number, tonemap?: boolean, forcedKeyframeTimes?: number[] | null, rateControl?: { maxrateKbps: number, bufsizeKbps: number, level: string | null } | null }} _options
+   * @returns {string[]}
+   */
+  buildVideoArgs(_options) {
+    throw new Error(`${this.name} does not say how to build its video arguments.`);
+  }
+
+  /**
+   * What this kind needs BEFORE the input when it is being benchmarked.
+   *
+   * Not `inputArgs`: those set up hardware DECODING, and a benchmark is fed raw
+   * frames — there is nothing to decode. What a device-backed encoder still
+   * needs is the device itself, and without it `h264_vaapi` and `h264_qsv` fail
+   * to open at all, so the benchmark would answer "this host cannot encode"
+   * about a host that encodes perfectly well.
+   *
+   * @returns {string[]}
+   */
+  benchmarkInputArgs() {
+    return [];
+  }
+
+  /**
+   * How to encode raw frames at one rung of this kind's speed ladder, for the
+   * startup benchmark and nothing else.
+   *
+   * SEPARATE FROM `buildVideoArgs` on purpose. That one produces a picture from
+   * a film: it scales, it tone-maps, it forces keyframes onto a grid, it caps a
+   * bitrate. The benchmark is fed raw frames of a known size and wants the
+   * encoder and the rung with nothing else in the way — otherwise the reading
+   * prices a scaler as though it were the encoder.
+   *
+   * WHY EVERY KIND MUST ANSWER IT. Until now the throughput benchmark existed
+   * only for libx264 and was gated on the chosen encoder being software, so a
+   * host with NVENC, QSV, VAAPI or V4L2M2M measured its encoder not at all —
+   * and the quality offer, which is arithmetic over pixels per second, had no
+   * pixels per second to work with. NVENC's own ladder is `p1`…`p7` and QSV's
+   * is `veryfast`…`veryslow`; both are declared here and neither was ever run.
+   *
+   * @param {string | null} rung - One value of {@link speedLadder}, or null
+   *   where the kind has no ladder and there is one thing to measure.
+   * @returns {string[]}
+   */
+  benchmarkArgs(rung = null) {
+    const ladder = this.speedLadder;
+    const setting = ladder?.flag && rung ? [ladder.flag, rung] : [];
+    return ["-c:v", this.name, ...setting];
+  }
+}

package/services/encode/EncoderSelection.js

@@ -1,38 +1,38 @@
-/**
- * @file The encoder this host currently uses for new video outputs.
- *
- * Detection chooses the initial descriptor. A genuine hardware encoder failure
- * moves the host to software for the rest of the process. That mutable choice
- * belongs to encoding, not to the server composition object.
- */
-
-export class EncoderSelection {
-  #current;
-  #softwareDescriptor;
-
-  /**
-   * @param {object} params
-   * @param {object | null} params.detected
-   * @param {() => object} params.softwareDescriptor
-   */
-  constructor({ detected, softwareDescriptor }) {
-    this.#softwareDescriptor = softwareDescriptor;
-    this.#current = detected ?? softwareDescriptor();
-  }
-
-  get current() {
-    return this.#current;
-  }
-
-  /**
-   * Select software encoding and return the descriptor that failed.
-   *
-   * @returns {object | null}
-   */
-  useSoftware() {
-    if (this.#current?.kind === "software") return null;
-    const failed = this.#current;
-    this.#current = this.#softwareDescriptor();
-    return failed;
-  }
-}
+/**
+ * @file The encoder this host currently uses for new video outputs.
+ *
+ * Detection chooses the initial descriptor. A genuine hardware encoder failure
+ * moves the host to software for the rest of the process. That mutable choice
+ * belongs to encoding, not to the server composition object.
+ */
+
+export class EncoderSelection {
+  #current;
+  #softwareDescriptor;
+
+  /**
+   * @param {object} params
+   * @param {object | null} params.detected
+   * @param {() => object} params.softwareDescriptor
+   */
+  constructor({ detected, softwareDescriptor }) {
+    this.#softwareDescriptor = softwareDescriptor;
+    this.#current = detected ?? softwareDescriptor();
+  }
+
+  get current() {
+    return this.#current;
+  }
+
+  /**
+   * Select software encoding and return the descriptor that failed.
+   *
+   * @returns {object | null}
+   */
+  useSoftware() {
+    if (this.#current?.kind === "software") return null;
+    const failed = this.#current;
+    this.#current = this.#softwareDescriptor();
+    return failed;
+  }
+}