@torrent-tv/proxy 2.100.9 → 2.100.11

package/package.json

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

package/services/encode/Renditions.js

@@ -36,7 +36,15 @@ export class Renditions {
   #host;
 
   /**
-   * @param {object} host - `viewerSecondsOn`, `audioStartSecondsFor`, `activeOutputFor`, `viewersOf`, `audioRenditionName`, `logger`, `placeViewer`, `viewerLeaves`, `createOrGetSession`, `planEncodersSoon`, `disposeSession`, `viewerPositionOf`, `encodeRuns`, `fileStartTimeReads`, `getCachedAudioTracks`, `getCachedMediaInfo`, `getContainerMediaInfo`, `localBaseUrl`, `outputTimes`, `outputs`, `quality`, `qualityOffer`, `segmentDurationSec`, `sourceFiles`, `viewers`, `generationOfRequest`, `givenOutputOf`, `noteGivenOutput`, `chosenOutputOf`, `chooseOutput`, `storedPieceReady`, `headersCompatible`, `audioChoiceOf`, `linkMbpsOf`, `qualityModeOf`, `noteServingVerdict`, `limitsFor`, `heightsChosenAs`, `highestGivenSegmentOf`, `sameHeightSwitchOf`, `noteSameHeightSwitch`, `switchingOnto`, `segmentClosed`, `bufferedSecondsOf`, `minimumBufferSecondsFor`
+   * The segment each viewer's move was last said to wait for on the output
+   * they are leaving, so that a wait is said once per segment.
+   *
+   * @type {Map<string, number>}
+   */
+  #moveWaitsSaid = new Map();
+
+  /**
+   * @param {object} host - `viewerSecondsOn`, `audioStartSecondsFor`, `activeOutputFor`, `viewersOf`, `audioRenditionName`, `logger`, `placeViewer`, `viewerLeaves`, `createOrGetSession`, `planEncodersSoon`, `disposeSession`, `viewerPositionOf`, `encodeRuns`, `fileStartTimeReads`, `getCachedAudioTracks`, `getCachedMediaInfo`, `getContainerMediaInfo`, `localBaseUrl`, `outputTimes`, `outputs`, `quality`, `qualityOffer`, `segmentDurationSec`, `sourceFiles`, `viewers`, `generationOfRequest`, `givenOutputOf`, `noteGivenOutput`, `chosenOutputOf`, `chooseOutput`, `storedPieceReady`, `headersCompatible`, `audioChoiceOf`, `linkMbpsOf`, `qualityModeOf`, `noteServingVerdict`, `limitsFor`, `heightsChosenAs`, `highestGivenSegmentOf`, `sameHeightSwitchOf`, `noteSameHeightSwitch`, `switchingOnto`, `switchingFrom`, `segmentClosed`, `bufferedSecondsOf`, `minimumBufferSecondsFor`
    */
   constructor(host) {
     this.#host = host;
@@ -836,6 +844,14 @@ export class Renditions {
       for (const consumerId of this.#host.switchingOnto(output)) {
         this.#reconsiderSameHeightSwitch(base, consumerId, index);
       }
+      // A segment closed on the output a viewer is LEAVING may be the one their
+      // move waits for (`#givenAndOpenOn`). It is behind the segment the move
+      // begins at by construction, so it is asked about with no index.
+      for (const consumerId of this.#host.switchingFrom?.(output) ?? []) {
+        if (this.#host.activeOutputFor({ base, consumerId, outputs: this.#host.outputs }) === output) {
+          this.#reconsiderSameHeightSwitch(base, consumerId, null);
+        }
+      }
     }
   }
 
@@ -894,6 +910,28 @@ export class Renditions {
     }
   }
 
+  /**
+   * The segment just before the one a move would begin at, when it was given
+   * to this viewer from the output on their screen and is not closed there:
+   * the segment their held request waits for. Null otherwise.
+   *
+   * @param {HlsSession | null} current - The output on their screen.
+   * @param {string} consumerId
+   * @param {number[]} askedHeights
+   * @param {number} next - The segment the move would begin at.
+   * @returns {number | null}
+   */
+  #givenAndOpenOn(current, consumerId, askedHeights, next) {
+    const segment = next - 1;
+    if (!current?.outputKey || segment < 0) {
+      return null;
+    }
+    const generation = this.#host.generationOfRequest(consumerId, Number.NaN);
+    const given = askedHeights.some((height) =>
+      this.#host.givenOutputOf(consumerId, generation, height, segment) === current.outputKey);
+    return given && !this.#host.segmentClosed(current.outputKey, segment) ? segment : null;
+  }
+
   /**
    * The segment this viewer will ask for next at these heights.
    *
@@ -967,6 +1005,24 @@ export class Renditions {
     if (!this.#host.segmentClosed(prepared.outputKey ?? "", next)) {
       return;
     }
+    // THE SEGMENT ALREADY GIVEN FROM THE OUTPUT ON SCREEN. A request is held by
+    // the output it was given from, and leaving that output stops its encoder:
+    // a segment given and not yet closed there would then be made by nobody.
+    // On Home Assistant a viewer waiting for #2176 was moved from #2177 and
+    // the picture stood for good (r71, torrent-tv/meta#178). The move waits for
+    // that segment to be closed; an output whose encoding has failed for good
+    // closes nothing, and its held request is the serving path's to answer.
+    const open = this.#givenAndOpenOn(current, consumerId, move.askedHeights, next);
+    if (open !== null && !this.#host.encodeRuns.hasFailed(current)) {
+      if (this.#moveWaitsSaid.get(consumerId) !== open) {
+        this.#moveWaitsSaid.set(consumerId, open);
+        this.#host.logger.info(
+          `transcode ${base.id} ${consumerId}'s move to ${move.outputKey} waits for #${open} on ` +
+          `${current.outputKey}, given and not yet closed there`
+        );
+      }
+      return;
+    }
     // THE CUSHION, for a move that is not urgent (roadmap item 98): a move up
     // is made once the viewer holds the cushion this file needs, and their
     // next report asks again until they do. A move DOWN is made at once — it
@@ -1026,6 +1082,7 @@ export class Renditions {
    * @returns {void}
    */
   #completeSameHeightSwitch(base, consumerId, move, prepared, current, next) {
+    this.#moveWaitsSaid.delete(consumerId);
     for (const height of move.askedHeights) {
       this.#choose(consumerId, height, prepared, base);
     }
@@ -1063,6 +1120,7 @@ export class Renditions {
    * @returns {void}
    */
   #cancelSameHeightSwitch(base, consumerId, reason) {
+    this.#moveWaitsSaid.delete(consumerId);
     const move = this.#host.sameHeightSwitchOf(consumerId);
     if (!move) {
       return;

package/services/encode/quality/QualityController.js

@@ -502,21 +502,13 @@ export class QualityController {
       remainingSec: Number.isFinite(buffer?.positionSec) && session.file?.durationSeconds > 0
         ? Math.max(0, session.file.durationSeconds - buffer.positionSec) : null
     });
-    // A viewer whose picture has not moved yet — at the start or after a seek —
-    // is held for the material a draining buffer would run out of, while their
-    // buffer grows: the trend says nothing about them. The same two reasons
-    // then decide. Held this way on Home Assistant, a picture made at 0.92-0.96x
-    // was moved to a faster setting 11 s after the start, which had waited 30 s
-    // for it (r70, torrent-tv/meta#178).
-    const held = !threat && buffer?.waiting === true;
-    if (!threat && !held) {
+    if (!threat) {
       return false;
     }
-    const why = held ? "their picture is held" : "their buffer is draining";
     // Whatever else happens, a step UP prepared for them is not what they need.
-    this.#dropUpAsk(session, consumerId, why);
+    this.#dropUpAsk(session, consumerId, "their buffer is draining");
     if (this.#host.sameHeightSwitchDirection(consumerId) === "up") {
-      this.#host.cancelSameHeightSwitch(consumerId, why);
+      this.#host.cancelSameHeightSwitch(consumerId, "their buffer is draining");
     }
     const report = this.#host.linkReportOf(session, consumerId);
     const observed = report ? await this.observedStreamMbps(session) : null;
@@ -532,8 +524,7 @@ export class QualityController {
     const reasonText =
       (linkShort ? `link=${report.linkMbps.toFixed(2)}Mbps stream=${observed.toFixed(2)}Mbps ` : "") +
       (machineShort ? `CPU-bound speed=${speed.toFixed(2)}x ` : "") +
-      `buffer=${(buffer?.bufferedSec ?? 0).toFixed(1)}s ` +
-      (held ? "held before it moves " : `empty in ${secondsToEmpty === null ? "?" : secondsToEmpty.toFixed(1)}s `) +
+      `buffer=${(buffer?.bufferedSec ?? 0).toFixed(1)}s empty in ${secondsToEmpty === null ? "?" : secondsToEmpty.toFixed(1)}s ` +
       `for ${consumerId}`;
     if (linkShort) {
       const move = await this.#host.prepareSameHeightSwitch(session, consumerId, "down", `viewer-link-bound ${reasonText}`);

package/services/server/wire-outputs.js

@@ -60,6 +60,7 @@ import {
   stepBeingWarmedOf,
   stepBeingWarmedSinceOf,
   stepOnScreenOf,
+  switchingFrom,
   switchingOnto,
   watches
 } from "../viewer/choices.js";
@@ -450,6 +451,7 @@ export function wireOutputs({
     sameHeightSwitchOf: (consumerId) => sameHeightSwitchOf(parts.viewers, consumerId),
     noteSameHeightSwitch: (consumerId, value) => noteSameHeightSwitch(parts.viewers, consumerId, value),
     switchingOnto: (output) => switchingOnto(parts.viewers, output),
+    switchingFrom: (output) => switchingFrom(parts.viewers, output),
     // What a viewer holds, and the cushion this file needs before a move that
     // is not urgent is made (roadmap item 98).
     bufferedSecondsOf: (consumerId) => bufferedSecondsOf(parts.viewers, consumerId),

package/services/viewer/choices.js

@@ -327,7 +327,7 @@ export function visiblePictureOf(viewers, output, consumerId) {
  * @param {object} output
  * @param {string} consumerId
  * @param {number} spanSec - The segment duration of the output they watch.
- * @returns {{ bufferedSec: number, slope: number | null, reportGapSec: number, positionSec: number | null, waiting: boolean } | null}
+ * @returns {{ bufferedSec: number, slope: number | null, reportGapSec: number } | null}
  *   Null for nobody of that name; `slope` null while their reports do not yet
  *   span one segment.
  */
@@ -339,9 +339,7 @@ export function bufferOf(viewers, output, consumerId, spanSec) {
   const trend = viewer.bufferTrend(spanSec);
   const held = Number.isFinite(viewer.bufferedSeconds) ? Math.max(0, viewer.bufferedSeconds) : 0;
   return { bufferedSec: held, slope: trend?.slope ?? null, reportGapSec: trend?.reportGapSec ?? 0,
-    positionSec: viewer.positionSeconds() ?? null,
-    // Blocked on material owed to them, with their picture not moving.
-    waiting: viewer.waiting === true && viewer.playing !== true };
+    positionSec: viewer.positionSeconds() ?? null };
 }
 
 /**
@@ -567,6 +565,25 @@ export function switchingOnto(viewers, output) {
   return found;
 }
 
+/**
+ * The present viewers on this output for whom a move onto ANOTHER output is
+ * being prepared: the ones a segment closed here may let go.
+ *
+ * @param {object} viewers
+ * @param {object} output
+ * @returns {string[]}
+ */
+export function switchingFrom(viewers, output) {
+  const found = [];
+  for (const [consumerId, viewer] of viewers.forOutput(output)) {
+    const move = viewer.sameHeightSwitch;
+    if (viewer.isPresent() && move && move.outputKey !== output.outputKey) {
+      found.push(consumerId);
+    }
+  }
+  return found;
+}
+
 /**
  * Every output a present viewer is being prepared onto, as ids.
  *