@torrent-tv/proxy 2.101.25 → 2.101.27

package/package.json

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

package/routes/api/sources/files/get.js

@@ -75,10 +75,15 @@ export async function handleApiSourceFilesGet(req, reply, { sourceRegistry, torr
   if (consumerId) viewers?.visibleFiles(consumerId, sourceKey, contents.items.map(item => item.fileIndex));
   const generationRaw = typeof req.query?.generation === "string" ? req.query.generation : "";
   const generation = generationRaw !== "" && /^\d+$/.test(generationRaw) ? Number(generationRaw) : null;
+  const linkMbps = Number(req.query?.linkMbps);
+  const linkSampleAgeMs = Number(req.query?.linkSampleAgeMs);
+  const earlyLink = Number.isFinite(linkMbps) && linkMbps > 0
+    ? { linkMbps, linkSampleAgeMs: Number.isFinite(linkSampleAgeMs) && linkSampleAgeMs >= 0 ? linkSampleAgeMs : null }
+    : {};
   const files = contents.files().map(file => {
     if (!consumerId || !Number.isSafeInteger(generation) || file.kind !== "video" || file.excludedReason) return file;
     const waitEstimate = viewerRequests?.waitEstimateForFile?.({ consumerId, generation, sourceKey,
-      fileIndex: file.fileIndex, fileName: file.relativePath ?? file.name, fileLength: file.length }) ?? null;
+      fileIndex: file.fileIndex, fileName: file.relativePath ?? file.name, fileLength: file.length, ...earlyLink }) ?? null;
     return waitEstimate ? { ...file, waitEstimate } : file;
   });
   return reply.send({

package/routes/api/sources/stats/get.js

@@ -37,9 +37,14 @@ export async function handleApiSourceStatsGet(req, reply, { sourceRegistry, torr
   const requestedFileName = typeof req.query.fileName === "string" ? req.query.fileName : "";
   const requestedFileLength = typeof req.query.fileLength === "string" && /^\d+$/.test(req.query.fileLength)
     ? Number(req.query.fileLength) : null;
+  const linkMbps = Number(req.query.linkMbps);
+  const linkSampleAgeMs = Number(req.query.linkSampleAgeMs);
+  const earlyLink = Number.isFinite(linkMbps) && linkMbps > 0
+    ? { linkMbps, linkSampleAgeMs: Number.isFinite(linkSampleAgeMs) && linkSampleAgeMs >= 0 ? linkSampleAgeMs : null }
+    : {};
   const initialEstimate = () => consumerId && Number.isSafeInteger(generation) && Number.isSafeInteger(fileIndex)
     ? viewerRequests?.waitEstimateForFile?.({ consumerId, generation, sourceKey, fileIndex,
-      fileName: requestedFileName, fileLength: requestedFileLength }) ?? null
+      fileName: requestedFileName, fileLength: requestedFileLength, ...earlyLink }) ?? null
     : null;
 
   let torrent;
@@ -137,7 +142,7 @@ export async function handleApiSourceStatsGet(req, reply, { sourceRegistry, torr
 
   const waitEstimate = consumerId && Number.isSafeInteger(generation)
     ? viewerRequests?.waitEstimateForSource?.({ consumerId, generation, sourceKey, fileIndex,
-      fileName: torrent.files?.[fileIndex]?.name ?? requestedFileName, fileLength: requestedFileLength, stats }) ?? null
+      fileName: torrent.files?.[fileIndex]?.name ?? requestedFileName, fileLength: requestedFileLength, stats, ...earlyLink }) ?? null
     : null;
   return reply.send(waitEstimate ? { ...stats, waitEstimate } : stats);
 }

package/services/encode/LocalObservations.js

@@ -280,6 +280,8 @@ export class LocalObservations {
       fileLength: positive(features.fileLength),
       downloadSpeed: nonNegative(features.downloadSpeed),
       linkMbps: nonNegative(features.linkMbps),
+      linkSampleAgeMs: nonNegative(features.linkSampleAgeMs),
+      preparedOutputBytes: nonNegative(features.preparedOutputBytes),
       headerRemaining: nonNegative(features.headerRemaining),
       peers: nonNegative(features.peers),
       at: this.#now()
@@ -302,7 +304,8 @@ export class LocalObservations {
     const readings = this.#entries.firstFrame[this.#firstFrameKey()] ?? [];
     const candidates = readings.filter(reading => reading.extension === (features.extension ?? ""));
     if (candidates.length === 0) return null;
-    const dimensions = ["fileLength", "downloadSpeed", "linkMbps", "headerRemaining", "peers"];
+    const dimensions = ["fileLength", "downloadSpeed", "linkMbps", "linkSampleAgeMs", "preparedOutputBytes",
+      "headerRemaining", "peers"];
     const scales = new Map(dimensions.map(key => [key, median(candidates
       .map(reading => nonNegative(reading[key]))
       .filter(value => value !== null && value > 0))]));

package/services/server/ViewerRequests.js

@@ -106,7 +106,7 @@ export class ViewerRequests {
    * @param {{ consumerId: string, generation: number, sourceKey: string, fileIndex: number, fileName: string, fileLength: number }} params
    * @returns {object | null}
    */
-  waitEstimateForFile({ consumerId, generation, sourceKey, fileIndex, fileName, fileLength }) {
+  waitEstimateForFile({ consumerId, generation, sourceKey, fileIndex, fileName, fileLength, linkMbps, linkSampleAgeMs }) {
     if (!consumerId || !Number.isSafeInteger(generation) || typeof sourceKey !== "string" ||
         !Number.isSafeInteger(fileIndex) || fileIndex < 0) return null;
     const waitId = `${sourceKey}:${fileIndex}:${generation}`;
@@ -116,7 +116,10 @@ export class ViewerRequests {
       extension,
       fileLength,
       downloadSpeed: null,
-      linkMbps: this.#host.viewers.get(consumerId)?.linkReading()?.linkMbps,
+      linkMbps: Number.isFinite(linkMbps) && linkMbps > 0
+        ? linkMbps : this.#host.viewers.get(consumerId)?.linkReading()?.linkMbps,
+      linkSampleAgeMs: Number.isFinite(linkSampleAgeMs) && linkSampleAgeMs >= 0 ? linkSampleAgeMs : null,
+      preparedOutputBytes: this.#preparedOutputBytes(sourceKey, fileIndex),
       headerRemaining: null,
       peers: null
     };
@@ -144,7 +147,8 @@ export class ViewerRequests {
    * @param {{ consumerId: string, generation: number, sourceKey: string, fileIndex: number | null, fileName?: string, fileLength?: number | null, stats?: object }} params
    * @returns {object | null}
    */
-  waitEstimateForSource({ consumerId, generation, sourceKey, fileIndex, fileName = "", fileLength = null, stats = {} }) {
+  waitEstimateForSource({ consumerId, generation, sourceKey, fileIndex, fileName = "", fileLength = null,
+    stats = {}, linkMbps, linkSampleAgeMs }) {
     if (!consumerId || !Number.isSafeInteger(generation) || typeof sourceKey !== "string") return null;
     const waitId = `${sourceKey}:${fileIndex ?? "all"}:${generation}`;
     const key = `${consumerId}:${waitId}`;
@@ -154,7 +158,11 @@ export class ViewerRequests {
       fileLength: Number.isFinite(stats?.fileLength) && stats.fileLength > 0
         ? stats.fileLength : fileLength,
       downloadSpeed: stats?.downloadSpeed,
-      linkMbps: this.#host.viewers.get(consumerId)?.linkReading()?.linkMbps,
+      linkMbps: Number.isFinite(linkMbps) && linkMbps > 0
+        ? linkMbps : this.#host.viewers.get(consumerId)?.linkReading()?.linkMbps,
+      linkSampleAgeMs: Number.isFinite(linkSampleAgeMs) && linkSampleAgeMs >= 0 ? linkSampleAgeMs : null,
+      preparedOutputBytes: Number.isSafeInteger(fileIndex) && fileIndex >= 0
+        ? this.#preparedOutputBytes(sourceKey, fileIndex) : null,
       headerRemaining: Number.isFinite(stats?.headerBytes) && Number.isFinite(stats?.headerDownloadedBytes)
         ? Math.max(0, stats.headerBytes - stats.headerDownloadedBytes) : null,
       peers: stats?.connectedPeers ?? stats?.numPeers
@@ -216,6 +224,23 @@ export class ViewerRequests {
     return true;
   }
 
+  #preparedOutputBytes(sourceKey, fileIndex) {
+    const outputs = this.#host.outputs;
+    const segmentStore = this.#host.segmentStore;
+    if (!outputs?.values || !segmentStore?.sizesOf) return null;
+    let bytes = 0;
+    const seen = new Set();
+    for (const output of outputs.values()) {
+      if (output.file?.sourceKey !== sourceKey || output.file?.fileIndex !== fileIndex || !output.outputKey) continue;
+      if (seen.has(output.outputKey)) continue;
+      seen.add(output.outputKey);
+      for (const size of segmentStore.sizesOf(output.outputKey).values()) {
+        if (Number.isFinite(size) && size > 0) bytes += size;
+      }
+    }
+    return bytes;
+  }
+
   #pruneEarlyWaits() {
     const cutoff = Date.now() - 30 * 60_000;
     for (const [key, value] of this.#earlyWaits) {