@torrent-tv/proxy 2.101.33 → 2.101.35

package/package.json

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

package/services/encode/LocalObservations.js

@@ -290,10 +290,13 @@ export class LocalObservations {
   }
 
   /**
-   * Price the early wait from separate measured stage medians for the same
-   * output path. Numeric proximity of a past file, source rate, or link rate
-   * does not select a completed run. Each observation contributes once, using
-   * its latest snapshot that states the current cache and operation path.
+   * Price the early wait from separate measured stage medians on this proxy
+   * configuration. Before the container and track operations are known, use
+   * measurements from every observed file type; once current cache and
+   * operation facts are known, retain only observations that match those
+   * facts. Numeric proximity to a past file, source rate, or link rate never
+   * selects a completed run. Each observation contributes once, using its
+   * latest snapshot that states the current cache and operation path.
    *
    * @param {object} features
    * @returns {number | null}
@@ -303,7 +306,7 @@ export class LocalObservations {
     const stages = ["transportMs", "planMs", "prepareMs", "prebufferMs", "presentationMs"];
     const candidates = [];
     for (const reading of this.#entries.firstFrame[this.#firstFrameKey()] ?? []) {
-      if (reading.extension !== (features.extension ?? "") || !reading.stages) continue;
+      if (!reading.stages) continue;
       const points = Array.isArray(reading.featureSnapshots) && reading.featureSnapshots.length > 0
         ? reading.featureSnapshots : [reading];
       const point = [...points].reverse().find(candidate => firstFramePathMatches(features, candidate));

package/services/server/SegmentServing.js

@@ -1031,48 +1031,6 @@ export class SegmentServing {
     }
   }
 
-  /**
-   * Wait for a valid HLS playlist or a terminal output state, without polling.
-   *
-   * @param {HlsSession} session
-   * @returns {Promise<void>}
-   */
-  async waitUntilReady(session) {
-    // With a synthetic VOD playlist there is nothing to wait for: the playlist
-    // is generated from the probed duration and is available immediately.
-    // Individual segments are long-polled by the segment route as ffmpeg
-    // produces them.
-    if (session.useSyntheticPlaylist) {
-      if (this.#host.encodeRuns.hasFailed(session)) {
-        throw new Error(this.#host.encodeRuns.lastErrorOf(session) || "ffmpeg failed to start HLS session.");
-      }
-      return;
-    }
-
-    const playlistPath = path.join(this.#host.segmentStore.pathFor(session.outputKey ?? ""), PLAYLIST_FILE_NAME);
-    while (this.#host.outputs.get(session.id) === session) {
-      const change = this.subscribeFileChange(session.id);
-      try {
-      if (this.#host.encodeRuns.hasFailed(session)) {
-        throw new Error(this.#host.encodeRuns.lastErrorOf(session) || "ffmpeg failed to start HLS session.");
-      }
-      try {
-        await access(playlistPath);
-        const text = await readFile(playlistPath, "utf8");
-        if (text.includes("#EXTM3U")) {
-            return;
-        }
-      } catch (_error) {
-        // Playlist is not ready yet.
-      }
-      await change.changed;
-      } finally {
-        change.release();
-      }
-    }
-    throw new Error("HLS output was disposed before its playlist became available.");
-  }
-
   /**
    * Answer the player's report that a delivered fragment sits far from the edge
    * of its buffer, with the one fact only this side holds: which boundary the

package/services/server/ViewerRequests.js

@@ -11,13 +11,6 @@ import { logger } from "../../utils/logger.js";
 import { isOutputName, OutputSpec } from "../encode/output/index.js";
 import { withSubtitleReadiness } from "./subtitle-readiness.js";
 
-function isWarmupTimeoutError(error) {
-  if (!(error instanceof Error)) {
-    return false;
-  }
-  return error.message === "HLS playlist is still warming up.";
-}
-
 /**
  * The segment number an assignment is recorded under for this file, −1 for the
  * init, or null for anything that is neither (a playlist).
@@ -93,7 +86,7 @@ export class ViewerRequests {
   #forecastPieces = new WeakMap();
 
   /**
-   * @param {object} host - `opening`, `activeOutputFor`, `viewerSecondsOn`, `minimumBufferSecondsFor`, `getSourceStats`, `disposeSession`, `planEncodersSoon`, `waitUntilReady`, `encodeRuns`, `encodeSpeedReadingsOf`, `outputTimes`, `outputs`, `lookaheadSeconds`, `quality`, `qualityOffer`, `renditions`, `segmentDurationSec`, `segmentStore`, `sourceFiles`, `startupWaitMs`, `viewers`, `acceptsGeneration`, `generationOfRequest`, `noteGivenOutput`, `holdForResponse`, `noteServingVerdict`, `servingVerdictOf`
+   * @param {object} host - `opening`, `activeOutputFor`, `viewerSecondsOn`, `minimumBufferSecondsFor`, `getSourceStats`, `planEncodersSoon`, `encodeRuns`, `encodeSpeedReadingsOf`, `outputTimes`, `outputs`, `lookaheadSeconds`, `quality`, `qualityOffer`, `renditions`, `segmentDurationSec`, `segmentStore`, `sourceFiles`, `startupWaitMs`, `viewers`, `acceptsGeneration`, `generationOfRequest`, `noteGivenOutput`, `holdForResponse`, `noteServingVerdict`, `servingVerdictOf`
    */
   constructor(host) {
     this.#host = host;
@@ -421,19 +414,13 @@ export class ViewerRequests {
       // Where the first encoder goes is the plan's, from where the viewers stand.
       this.#host.planEncodersSoon();
     }
-    try {
-      await this.#host.waitUntilReady(output);
-    } catch (error) {
-      if (!existed && this.#host.encodeRuns.hasFailed(output)) {
-        await this.#host.disposeSession(output.id);
-        throw error;
-      }
-      if (existed && !isWarmupTimeoutError(error)) {
-        throw error;
-      }
-      // Not a failure of the request: the synthetic playlist is already there
-      // and segments appear as the encoder produces them.
-    }
+    // Return the allocated session before a keyframe-based output writes its
+    // first playlist. The browser can then poll this session's live playback
+    // forecast while the source, proxy and client-link work is still underway;
+    // otherwise this request hides all revised estimates until the first
+    // segment is already ready. The playlist route and the viewer's existing
+    // wait loop handle output that is still being prepared, and the progress
+    // route reports a terminal encoder failure.
     return output;
   }
 

package/services/server/wire-outputs.js

@@ -631,7 +631,6 @@ export function wireOutputs({
     getSourceStats: (...args) => parts.getSourceStats?.(...args) ?? null,
     disposeSession: (...args) => parts.lifecycle.disposeSession(...args),
     planEncodersSoon: (...args) => parts.encodeRuns.planEncodersSoon(...args),
-    waitUntilReady: (...args) => parts.serving.waitUntilReady(...args),
     noteViewerWaiting: (viewer, wait) => parts.encodeOrchestrator?.noteViewerWaiting(viewer, wait),
     get encodeRuns() { return parts.encodeRuns; },
     // When this viewer's playback can start and run to the end: the viewer