@torrent-tv/proxy 2.102.1 → 2.102.2

package/package.json

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

package/services/encode/LocalObservations.js

@@ -305,6 +305,16 @@ export class LocalObservations {
    * @returns {number | null}
    */
   firstFrameSeconds(features) {
+    return this.firstFrameEstimate(features)?.seconds ?? null;
+  }
+
+  /**
+   * Return the current stage-median forecast and the measurements that formed it.
+   *
+   * @param {object} features
+   * @returns {{ seconds: number, stagesMs: object, observations: number } | null}
+   */
+  firstFrameEstimate(features) {
     if (!features || typeof features !== "object") return null;
     const stages = ["transportMs", "planMs", "prepareMs", "prebufferMs", "presentationMs"];
     const candidates = [];
@@ -319,7 +329,11 @@ export class LocalObservations {
     const prices = stages.map(stage => median(candidates.map(reading => reading[stage])
       .filter(Number.isFinite)));
     if (prices.some(value => value === null)) return null;
-    return prices.reduce((sum, value) => sum + value, 0) / 1000;
+    return {
+      seconds: prices.reduce((sum, value) => sum + value, 0) / 1000,
+      stagesMs: Object.fromEntries(stages.map((stage, index) => [stage, prices[index]])),
+      observations: candidates.length
+    };
   }
 
   #firstFrameKey() {

package/services/server/ViewerRequests.js

@@ -125,11 +125,13 @@ export class ViewerRequests {
       const changed = this.#recordEarlyWaitSnapshot(context, context.features);
       if (changed) context.revision += 1;
       this.#pruneEarlyWaits();
-      const totalSeconds = Number.isFinite(context.activeTotalSeconds)
-        ? context.activeTotalSeconds
-        : this.#host.firstFrameSecondsOf?.(context.features) ?? null;
-      const seconds = earlyWaitRemainingSeconds(totalSeconds, waitElapsedSince(context, waitElapsedMs));
+      const elapsedMs = waitElapsedSince(context, waitElapsedMs);
+      const historical = Number.isFinite(context.activeTotalSeconds) ? null : this.#historicalFirstFrame(context.features);
+      const totalSeconds = Number.isFinite(context.activeTotalSeconds) ? context.activeTotalSeconds : historical?.seconds ?? null;
+      const seconds = earlyWaitRemainingSeconds(totalSeconds, elapsedMs);
       if (!Number.isFinite(seconds) || seconds < 0) return null;
+      this.#logEarlyForecast(context, { elapsedMs, seconds, totalSeconds, historical,
+        firstRequiredSegmentsSeconds: context.activeFirstRequiredSegmentsSeconds });
       return { version: 1, waitId, revision: context.revision, remainingSeconds: seconds, ageMs: 0 };
     }
     const sameWait = current?.waitId === waitId;
@@ -139,11 +141,13 @@ export class ViewerRequests {
     const changed = this.#recordEarlyWaitSnapshot(context, context.features);
     if (sameWait && changed) context.revision += 1;
     this.#pruneEarlyWaits();
-    const totalSeconds = Number.isFinite(context.activeTotalSeconds)
-      ? context.activeTotalSeconds
-      : this.#host.firstFrameSecondsOf?.(context.features) ?? null;
-    const seconds = earlyWaitRemainingSeconds(totalSeconds, waitElapsedSince(context, waitElapsedMs));
+    const elapsedMs = waitElapsedSince(context, waitElapsedMs);
+    const historical = Number.isFinite(context.activeTotalSeconds) ? null : this.#historicalFirstFrame(context.features);
+    const totalSeconds = Number.isFinite(context.activeTotalSeconds) ? context.activeTotalSeconds : historical?.seconds ?? null;
+    const seconds = earlyWaitRemainingSeconds(totalSeconds, elapsedMs);
     if (!Number.isFinite(seconds) || seconds < 0) return null;
+    this.#logEarlyForecast(context, { elapsedMs, seconds, totalSeconds, historical,
+      firstRequiredSegmentsSeconds: context.activeFirstRequiredSegmentsSeconds });
     return { version: 1, waitId, revision: context.revision, remainingSeconds: seconds, ageMs: 0 };
   }
 
@@ -192,20 +196,44 @@ export class ViewerRequests {
       ? elapsedMs / 1000 + measuredWorkSeconds
       : context.activeTotalSeconds;
     const activeEstimateChanged = hasActiveEstimate && activeTotalSeconds !== context.activeTotalSeconds;
-    if (hasActiveEstimate) context.activeTotalSeconds = activeTotalSeconds;
+    if (hasActiveEstimate) {
+      context.activeTotalSeconds = activeTotalSeconds;
+      context.activeFirstRequiredSegmentsSeconds = measuredWorkSeconds;
+    }
     const changed = featuresChanged || activeEstimateChanged;
     if (sameWait && changed) context.revision += 1;
     this.#pruneEarlyWaits();
     const progressHasComponentForecast = Object.hasOwn(processing, "firstRequiredSegmentsSeconds");
     let totalSeconds = activeTotalSeconds;
+    let historical = null;
     if (!Number.isFinite(totalSeconds) && !progressHasComponentForecast) {
-      totalSeconds = this.#host.firstFrameSecondsOf?.(context.features) ?? null;
+      historical = this.#historicalFirstFrame(context.features);
+      totalSeconds = historical?.seconds ?? null;
     }
     const seconds = earlyWaitRemainingSeconds(totalSeconds, elapsedMs);
     if (!Number.isFinite(seconds) || seconds < 0) return null;
+    this.#logEarlyForecast(context, { elapsedMs, seconds, totalSeconds, historical,
+      firstRequiredSegmentsSeconds: hasActiveEstimate ? measuredWorkSeconds : context.activeFirstRequiredSegmentsSeconds });
     return { version: 1, waitId, revision: context.revision, remainingSeconds: seconds, ageMs: 0 };
   }
 
+  #historicalFirstFrame(features) {
+    const estimate = this.#host.firstFrameSecondsOf?.(features) ?? null;
+    return Number.isFinite(estimate) ? { seconds: estimate, stagesMs: null, observations: null } : estimate;
+  }
+
+  #logEarlyForecast(context, { elapsedMs, seconds, totalSeconds, historical, firstRequiredSegmentsSeconds }) {
+    if (context.loggedForecastRevision === context.revision) return;
+    const basis = Number.isFinite(firstRequiredSegmentsSeconds) ? "first-required" : "historical-stages";
+    const estimate = basis === "first-required"
+      ? { firstRequiredSegmentsSeconds }
+      : { stagesMs: historical?.stagesMs ?? null, observations: historical?.observations ?? null };
+    logger.info(`early wait forecast ${JSON.stringify({ waitId: context.waitId, consumer: context.consumerId,
+      generation: context.generation, features: context.features, elapsedMs, revision: context.revision,
+      predicted: { remainingSeconds: seconds, totalSeconds, basis, ...estimate } })}`);
+    context.loggedForecastRevision = context.revision;
+  }
+
   /**
    * Learn from the browser's presented-frame measurement for the current
    * viewing. The saved source and link readings are the ones available at

package/services/server/wire-outputs.js

@@ -651,7 +651,7 @@ export function wireOutputs({
       const predicted = Number(qualityStateOf(output).predictedSpeedWhenOffered);
       return Number.isFinite(predicted) && predicted > 0 ? predicted : null;
     },
-    firstFrameSecondsOf: (features) => parts.localObservations?.firstFrameSeconds(features) ?? null,
+    firstFrameSecondsOf: (features) => parts.localObservations?.firstFrameEstimate(features) ?? null,
     noteFirstFrame: (observation) => parts.localObservations?.noteFirstFrame(observation),
     audioDescriptionOf,
     openSecondsOf: (output) => runStartSecondsOf(output),