@torrent-tv/proxy 2.98.9 → 2.98.10

package/package.json

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

package/services/encode/EncodeRuns.js

@@ -497,15 +497,14 @@ export class EncodeRuns {
   }
 
   /**
-   * The speed readings of this output's runs measured after `after`, oldest
-   * first, within the forecast's horizon.
+   * The speed readings of this output's runs within the forecast's horizon,
+   * in the order they were taken.
    *
    * @param {object} output
-   * @param {number} [after] - The time of the last reading the asker has.
    * @returns {Array<{ speed: number, at: number }>}
    */
-  speedReadingsOf(output, after) {
-    return this.#speedReadings.after(output, after);
+  speedReadingsOf(output) {
+    return this.#speedReadings.windowOf(output);
   }
 
   /**

package/services/encode/SpeedReadings.js

@@ -2,8 +2,11 @@
  * @file The speed readings of each output's runs, in the order the runs
  * measured them, over the start forecast's horizon (torrent-tv/meta#178).
  *
- * A run announces a reading at each closed piece; whoever forecasts takes every
- * reading after the last one it has. The forecast used to take only the newest
+ * A run announces a reading at each closed piece; the forecast summarizes the
+ * whole window on each poll. Two runs of one output can announce out of order —
+ * each reading carries the time of its own run's last progress report — so the
+ * window is kept in the order the readings were TAKEN, and two taken in the
+ * same millisecond are two readings. The forecast used to take only the newest
  * reading of a run alive when it asked: on a cold start on Home Assistant the
  * runs were three pieces long and ended between its polls, and of the readings
  * 0.78, 1.80, 2.25, 2.84 and 2.69x it got 0.78 and 2.69x, and held the picture
@@ -28,18 +31,19 @@ export class SpeedReadings {
     if (!output || !(reading?.speed > 0) || !Number.isFinite(reading.at)) return;
     let readings = this.#byOutput.get(output);
     if (!readings) this.#byOutput.set(output, readings = []);
-    readings.push({ speed: reading.speed, at: reading.at });
-    const cutoff = reading.at - this.#keepMs;
+    let place = readings.length;
+    while (place > 0 && readings[place - 1].at > reading.at) place -= 1;
+    readings.splice(place, 0, { speed: reading.speed, at: reading.at });
+    const cutoff = readings.at(-1).at - this.#keepMs;
     // As the forecast's own trend keeps them: the newest one before the horizon stays.
     while (readings.length > 1 && readings[1].at <= cutoff) readings.shift();
   }
 
   /**
    * @param {object} output
-   * @param {number} [after] - The time of the last reading the asker has.
-   * @returns {Array<{ speed: number, at: number }>} Oldest first.
+   * @returns {Array<{ speed: number, at: number }>} The window, in the order the readings were taken.
    */
-  after(output, after = Number.NEGATIVE_INFINITY) {
-    return (this.#byOutput.get(output) ?? []).filter(reading => reading.at > after);
+  windowOf(output) {
+    return [...(this.#byOutput.get(output) ?? [])];
   }
 }

package/services/server/ViewerRequests.js

@@ -604,7 +604,7 @@ export class ViewerRequests {
     const tracks = [];
     for (const output of outputs) {
       const trackProgress = output === session ? progress : this.#host.encodeRuns.progressOf(output);
-      const trackRates = this.#trackRateReadings(measurement, output, now);
+      const trackRates = this.#trackRateReadings(output, now);
       const trackName = output === session ? "video" : "audio";
       // The page states the offset its player applied to this track, and the
       // init it applied it to is the session's. Until both are known, the
@@ -691,12 +691,6 @@ export class ViewerRequests {
       });
     }
 
-    const activeTrackIds = new Set(tracks.map(({ id }) => id));
-    for (const id of measurement.tracks.keys()) {
-      if (!activeTrackIds.has(id)) {
-        measurement.tracks.delete(id);
-      }
-    }
     const bufferedAheadSeconds = Number(viewerReading?.bufferedAheadSec);
     const positionSeconds = Number.isFinite(viewerReading?.positionSeconds)
       ? viewerReading.positionSeconds
@@ -880,25 +874,23 @@ export class ViewerRequests {
     const id = typeof consumerId === "string" ? consumerId : "";
     let state = byViewer.get(id);
     if (!state) {
-      state = { link: new this.#host.playbackReadiness.RateTrend(this.#host.lookaheadSeconds), tracks: new Map(), sources: new Map() };
+      state = { link: new this.#host.playbackReadiness.RateTrend(this.#host.lookaheadSeconds), sources: new Map() };
       byViewer.set(id, state);
     }
     return state;
   }
 
-  #trackRateReadings(state, output, now) {
-    const id = output.outputKey;
-    let trend = state.tracks.get(id);
-    if (!trend) {
-      trend = new this.#host.playbackReadiness.RateTrend(this.#host.lookaheadSeconds);
-      state.tracks.set(id, trend);
-    }
-    // Every reading since this trend's last, not the newest one at the poll:
-    // a run that ended between two polls took its readings with it.
-    for (const reading of this.#host.encodeSpeedReadingsOf?.(output, trend.lastAt) ?? []) {
-      if (reading.at <= now) trend.add(reading.at, reading.speed);
-    }
-    if (!trend.snapshot()) {
+  /**
+   * The encoder's rate for the forecast: the output's whole window of readings,
+   * summarized again on each poll. A run that ended between two polls took its
+   * readings with it when the forecast asked for the newest one alone; and two
+   * runs of one output can report out of order, so a summary kept and added to
+   * would drop the later-told, earlier-taken one (torrent-tv/meta#178).
+   */
+  #trackRateReadings(output, now) {
+    const readings = (this.#host.encodeSpeedReadingsOf?.(output) ?? []).filter(reading => reading.at <= now);
+    const summary = readings.length > 0 ? this.#host.playbackReadiness.rateSummaryOf(readings) : null;
+    if (!summary) {
       // ONLY UNTIL A PIECE IS MEASURED does the prediction stand for the
       // encoder, and it is not kept among the readings. Added on every poll
       // between runs, it put the machine's share of that moment — 1 % at a
@@ -911,7 +903,7 @@ export class ViewerRequests {
         return seed.snapshot();
       }
     }
-    return trend.snapshot();
+    return summary;
   }
 
   /**

package/services/server/wire-outputs.js

@@ -71,7 +71,7 @@ import { ViewerRequests } from "./ViewerRequests.js";
 import { OutputLifecycle } from "./OutputLifecycle.js";
 import { SegmentServing } from "./SegmentServing.js";
 import { audioStartSecondsFor } from "../viewer/audio-start.js";
-import { forecastRate, predictPlaybackReadiness, RateTrend } from "../viewer/playback-readiness.js";
+import { forecastRate, rateSummaryOf, predictPlaybackReadiness, RateTrend } from "../viewer/playback-readiness.js";
 import { audioRenditionName } from "../media/audio-inventory.js";
 import { Renditions } from "../encode/Renditions.js";
 import { CushionReport, LOOKAHEAD_PAUSE_SECONDS } from "../encode/CushionReport.js";
@@ -578,12 +578,12 @@ export function wireOutputs({
     get encodeRuns() { return parts.encodeRuns; },
     // When this viewer's playback can start and run to the end: the viewer
     // component's forecast, which models the viewer's browser.
-    playbackReadiness: { predict: predictPlaybackReadiness, forecastRate, RateTrend },
+    playbackReadiness: { predict: predictPlaybackReadiness, forecastRate, rateSummaryOf, RateTrend },
     // Whether the subtitle a viewer chose has been read where they stand — the
     // source preparation's answer, set on these parts by the assembly.
     subtitleReadyFor: (viewer) => parts.subtitleReadyFor?.(viewer) ?? true,
     sourceInputsFor: (output, index) => parts.sourceInputsFor?.(output, index),
-    encodeSpeedReadingsOf: (output, after) => parts.encodeRuns.speedReadingsOf(output, after),
+    encodeSpeedReadingsOf: (output) => parts.encodeRuns.speedReadingsOf(output),
     projectedEncodeSpeedOf: (output) => parts.encodeCost.projectedSpeedOf(output),
     // The speed the offer predicted for this output when it chose its mode: a
     // forecast with no measured piece yet stands on it rather than on the

package/services/viewer/playback-readiness.js

@@ -58,6 +58,22 @@ export function forecastRate(readings, now = Date.now(), horizonSeconds = 0, wei
   return horizon > 0 ? curve.workBy(horizon) / horizon : curve.rateAt(0);
 }
 
+/**
+ * The summary the forecast reads, of a window of readings taken in any order:
+ * ordered by when each was taken, readings taken in the same millisecond kept
+ * apart. Null for no reading.
+ *
+ * @param {Array<{ at: number, speed?: number, value?: number }>} readings
+ * @returns {object | null}
+ */
+export function rateSummaryOf(readings) {
+  const ordered = (Array.isArray(readings) ? readings : [])
+    .map(reading => ({ at: reading?.at, value: reading?.value ?? reading?.speed }))
+    .filter(reading => Number.isFinite(reading.at) && Number.isFinite(reading.value) && reading.value >= 0)
+    .sort((left, right) => left.at - right.at);
+  return ordered.length > 0 ? summarizeRate(ordered) : null;
+}
+
 /**
  * Measurements over the output's existing look-ahead horizon. The oldest
  * boundary sample is retained until another sample replaces it, so a repeated
@@ -84,11 +100,6 @@ export class RateTrend {
     return true;
   }
 
-  /** The time of the newest reading kept, or -Infinity. */
-  get lastAt() {
-    return this.#readings.at(-1)?.at ?? Number.NEGATIVE_INFINITY;
-  }
-
   snapshot() {
     if (this.#readings.length === 0) {
       return null;