@torrent-tv/proxy 2.107.59 → 2.107.60

package/package.json

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

package/services/encode/EncodeRuns.js

@@ -1783,19 +1783,32 @@ export class EncodeRuns {
     // disposed. A run that had already finished or failed is not among them,
     // which is what keeps a stop from erasing how it actually ended.
     for (const run of running) {
-      // The run resumes itself if it was suspended — a stopped process does not
-      // act on SIGTERM until it is continued — records the cause, and answers
-      // its own exit. Nothing here has to null a field so that the exit is read
-      // correctly, because there is no shared field left to misread.
-      run.stop(reason);
       // Nothing is cleared up from here. What this run left open is under its
       // own working name, and the encoding layer removes it when the run's
       // ending reaches it — one place, and it needs neither the stretch nor the
       // init bytes this method used to fetch to judge a file by its contents.
+      this.stopRun(run, reason);
     }
     this.#host.logger.info(`transcode ${session.id} ${running.length} encoder(s) stopped: ${reason}`);
   }
 
+  /**
+   * Stop one run, for a stated reason, and nothing else of its output.
+   *
+   * For a caller that knows WHICH run is wrong: an output may hold a second run
+   * near the viewer that is positioned correctly and must keep producing.
+   *
+   * @param {object} run - A live run of this class's.
+   * @param {string} reason - Named in the log.
+   * @returns {void}
+   */
+  stopRun(run, reason) {
+    // The run resumes itself if it was suspended — a stopped process does not
+    // act on SIGTERM until it is continued — records the cause, and answers
+    // its own exit.
+    run.stop(reason);
+  }
+
   /**
    * What moving the encoder BACKWARDS costs, said out loud when it happens.
    *

package/services/encode/OutputTimes.js

@@ -98,7 +98,7 @@ export class OutputTimes {
   #host;
 
   /**
-   * @param {object} host - `logger`, `runsOf`, `stopEncodeRun`, `planEncodersSoon`, `outputs`, `segmentDurationSec`
+   * @param {object} host - `logger`, `runsOf`, `stopRun`, `planEncodersSoon`, `outputs`, `segmentDurationSec`
    */
   constructor(host) {
     this.#host = host;
@@ -454,7 +454,8 @@ export class OutputTimes {
     // claimed. It converges: once the boundary holds the true time, the next
     // reading agrees with it and the guard above returns before doing anything.
     for (const member of this.#host.outputs.familyOf(session)) {
-      if (member === session || runStartingAt(this.#host.runsOf(member), index) === null) {
+      const misplaced = member === session ? null : runStartingAt(this.#host.runsOf(member), index);
+      if (misplaced === null) {
         continue;
       }
       this.#host.logger.info(
@@ -474,7 +475,7 @@ export class OutputTimes {
       // which this function has just written it into and which every session of
       // the file shares. It used to be passed as an argument from here, so only
       // a run started by this line ever had it.
-      this.#host.stopEncodeRun(member, `#${index} really begins ${(trueStart - wasAt).toFixed(3)}s later than the table said`);
+      this.#host.stopRun(misplaced, `#${index} really begins ${(trueStart - wasAt).toFixed(3)}s later than the table said`);
     }
     this.#host.planEncodersSoon();
   }

package/services/server/wire-outputs.js

@@ -337,7 +337,7 @@ export function wireOutputs({
   parts.outputTimes = new OutputTimes({
     logger,
     runsOf: (...args) => parts.encodeRuns.runsOf(...args),
-    stopEncodeRun: (...args) => parts.encodeRuns.stopEncodeRun(...args),
+    stopRun: (...args) => parts.encodeRuns.stopRun(...args),
     planEncodersSoon: (...args) => parts.encodeRuns.planEncodersSoon(...args),
     get outputs() { return parts.outputs; },
     get segmentDurationSec() { return parts.segmentDurationSec; },