@torrent-tv/proxy 2.101.26 → 2.101.28

package/package.json

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

package/services/encode/LocalObservations.js

@@ -281,6 +281,8 @@ export class LocalObservations {
       downloadSpeed: nonNegative(features.downloadSpeed),
       linkMbps: nonNegative(features.linkMbps),
       linkSampleAgeMs: nonNegative(features.linkSampleAgeMs),
+      preparedOutputBytes: nonNegative(features.preparedOutputBytes),
+      fileAvailable: typeof features.fileAvailable === "boolean" ? features.fileAvailable : null,
       headerRemaining: nonNegative(features.headerRemaining),
       peers: nonNegative(features.peers),
       at: this.#now()
@@ -291,9 +293,10 @@ export class LocalObservations {
 
   /**
    * Predict this host's first-frame wait from the closest measured start with
-   * the same media suffix. Distance is the sum of squared log-ratios for the
-   * independent measured inputs; it does not mix bytes, bit rates and peers
-   * in their raw units.
+   * the same media suffix. Distance uses squared log-ratios for numeric
+   * inputs and exact-state distance for categorical inputs; it does not mix
+   * bytes, bit rates and peers in their raw units. Missing data contributes
+   * distance only when the other observation measured that input.
    *
    * @param {object} features
    * @returns {number | null}
@@ -303,24 +306,40 @@ 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", "linkSampleAgeMs", "headerRemaining", "peers"];
+    const dimensions = ["fileLength", "downloadSpeed", "linkMbps", "linkSampleAgeMs", "preparedOutputBytes",
+      "fileAvailable", "headerRemaining", "peers"];
     const scales = new Map(dimensions.map(key => [key, median(candidates
-      .map(reading => nonNegative(reading[key]))
+      .map(reading => key === "fileAvailable" ? null : nonNegative(reading[key]))
       .filter(value => value !== null && value > 0))]));
     let best = null;
     for (const reading of candidates) {
       let distance = 0;
       let used = 0;
+      let shared = 0;
       for (const key of dimensions) {
+        const current = key === "fileAvailable"
+          ? (typeof features[key] === "boolean" ? features[key] : null)
+          : nonNegative(features[key]);
+        const previous = key === "fileAvailable"
+          ? (typeof reading[key] === "boolean" ? reading[key] : null)
+          : nonNegative(reading[key]);
+        if (current === null && previous === null) continue;
+        if (current === null || previous === null) {
+          distance += 1;
+          used += 1;
+          continue;
+        }
+        shared += 1;
         const scale = scales.get(key);
-        const current = nonNegative(features[key]);
-        const previous = nonNegative(reading[key]);
-        if (scale === null || current === null || previous === null) continue;
-        const difference = Math.log1p(current / scale) - Math.log1p(previous / scale);
+        const difference = typeof current === "boolean" && typeof previous === "boolean"
+          ? Number(current !== previous)
+          : scale === null
+            ? Number(current !== previous)
+            : Math.log1p(current / scale) - Math.log1p(previous / scale);
         distance += difference * difference;
         used += 1;
       }
-      if (used === 0) continue;
+      if (used === 0 || shared === 0) continue;
       distance /= used;
       if (!best || distance < best.distance || (distance === best.distance && reading.at > best.reading.at)) {
         best = { distance, reading };

package/services/server/ViewerRequests.js

@@ -119,6 +119,8 @@ export class ViewerRequests {
       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),
+      fileAvailable: null,
       headerRemaining: null,
       peers: null
     };
@@ -160,6 +162,9 @@ export class ViewerRequests {
       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,
+      fileAvailable: typeof stats?.fileAvailable === "boolean" ? stats.fileAvailable : null,
       headerRemaining: Number.isFinite(stats?.headerBytes) && Number.isFinite(stats?.headerDownloadedBytes)
         ? Math.max(0, stats.headerBytes - stats.headerDownloadedBytes) : null,
       peers: stats?.connectedPeers ?? stats?.numPeers
@@ -221,6 +226,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) {