@torrent-tv/proxy 2.80.12 → 2.80.14

package/services/hls-session-manager.js

@@ -3178,7 +3178,7 @@ export class HlsSessionManager {
    * @param {{ linkMbps: number, bufferedAheadSec: number, consumerId?: string, positionSeconds?: number }} report
    * @returns {boolean}
    */
-  recordNetReport(sessionId, { linkMbps, bufferedAheadSec, consumerId, positionSeconds, playing }) {
+  recordNetReport(sessionId, { linkMbps, bufferedAheadSec, consumerId, positionSeconds, playing, onScreen, inPictureInPicture }) {
     const named = this.sessionsById.get(sessionId);
     if (!named || named.state === "disposed") {
       return false;
@@ -3196,7 +3196,7 @@ export class HlsSessionManager {
     const now = Date.now();
     this.viewers
       .of(session, typeof consumerId === "string" && consumerId.length > 0 ? consumerId : "")
-      .report({ linkMbps, bufferedAheadSec, positionSeconds, playing }, now);
+      .report({ linkMbps, bufferedAheadSec, positionSeconds, playing, onScreen, inPictureInPicture }, now);
     // A stale reading must not go on deciding for the viewers still here: a
     // report describes a link at a moment, and a viewer who seeked since then
     // is somewhere else entirely.
@@ -8295,13 +8295,6 @@ export class HlsSessionManager {
     if (!this.liveOutputs.publishesVariants(session)) {
       return null;
     }
-    const sourceHeight = Number(session.file.height) || 0;
-    // What CAN be spliced, not what is worth offering this second. The live
-    // judgement travels in `offeredHeights` and in every progress report, which
-    // is what the viewer's menu follows; letting it decide the master's
-    // existence made a live session answer 404 to its own published address.
-    const rungs = this.liveOutputs.splicableHeights(session);
-    const sourceWidth = Number(session.file.width) || 0;
     // The audio tracks, published once for the whole file rather than muxed
     // into every rung. Two things follow from that: the same track is not
     // encoded once per rung on a host that struggles to encode it once, and
@@ -8319,10 +8312,12 @@ export class HlsSessionManager {
       ? this.#audioRenditionsOf(session, this.#audioChoiceOf(session, consumerId).trackIndex)
       : [];
     return masterPlaylistText({
-      playlistVersion: session.segmentFormat.playlistVersion,
-      heights: rungs,
-      sourceWidth,
-      sourceHeight,
+      // The shape of the film and the rates it carries, asked of the layer that
+      // holds both. What CAN be spliced, not what is worth offering this second:
+      // the live judgement travels in `offeredHeights` and in every progress
+      // report, and letting it decide the master's existence made a live session
+      // answer 404 to its own published address.
+      ...this.liveOutputs.masterFactsOf(session, (address) => this.segmentStore.largestPiece(address)),
       renditions,
       playlistFileName: PLAYLIST_FILE_NAME
     });
@@ -9648,6 +9643,8 @@ export class HlsSessionManager {
 
 
   #holdForProduction(session, fileName, isPlaylist, options) {
+    /** @type {{ address: string, rank: number, topRank: number } | null} */
+    let ranked = null;
     if (!isPlaylist) {
       this.#explainHold(session, fileName, "the file is not on disk");
     }
@@ -9667,20 +9664,16 @@ export class HlsSessionManager {
       // failed did the player move to the segment it actually needed — 63 s of
       // spinner after a track that had been made ready in 7.
       //
-      // WHETHER ANYBODY IS COMING FOR IT, asked of the priority map rather than
-      // measured in segments. The distance used to decide, against the reach of
-      // a repair that moved the encoder from a request — both are gone. A
-      // number inside somebody's zone will be made, so holding it is holding it
-      // for a viewer; a number in nobody's zone will not, and holding it spends
-      // the player's patience for nothing.
-      // AN EMPTY MAP IS NOT AN ANSWER. It says the map has not been built yet —
-      // a session created a moment ago, before the first pass — and that is a
-      // different thing from "nobody is coming", which is what this refusal
-      // needs. Told apart, because conflating them answers every behind-head
-      // request as absent for as long as a fresh session has no map.
-      const zones = this.encodeOrchestrator.demand.mapOn(session.outputKey ?? "");
-      const nobodyIsComing = zones.length > 0 &&
-        !zones.some((zone) => requestedIndex >= zone.from && requestedIndex <= zone.to);
+      // WHETHER ANYBODY IS COMING FOR IT, asked of the map (`SegmentDemand.rankOf`,
+      // which also tells "in nobody's zone" from "no map yet"). The same walk
+      // was written out here and could answer only yes or no, so the RANK was
+      // discarded at the one point where a viewer measurably waits for a named
+      // segment; it goes back out with the answer, because the wait is measured
+      // by whoever holds the request.
+      const address = session.outputKey ?? "";
+      const { rank, topRank } = this.encodeOrchestrator.demand.rankOf(address, requestedIndex);
+      ranked = { address, rank, topRank };
+      const nobodyIsComing = topRank > 0 && rank === 0;
       if (
         Number.isFinite(requestedIndex) &&
         requestedIndex < (earliestRunStart(session) ?? 0) &&
@@ -9691,7 +9684,7 @@ export class HlsSessionManager {
           `transcode ${session.id} segment #${requestedIndex} is ${(earliestRunStart(session) ?? 0) - requestedIndex} ` +
           "segments behind the run and in nobody's zone; answered as absent rather than held"
         );
-        return { kind: "not-found" };
+        return { kind: "not-found", ranked };
       }
       this.#ensureEncodingFor(
         session,
@@ -9699,7 +9692,7 @@ export class HlsSessionManager {
         Number.isFinite(options?.requestSeq) ? options.requestSeq : Number.MAX_SAFE_INTEGER
       );
     }
-    return { kind: "warming-up" };
+    return { kind: "warming-up", ranked };
   }
 
   /**