@torrent-tv/proxy 2.107.26 → 2.107.27

package/package.json

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

package/services/encode/EncodeAdmission.js

@@ -194,9 +194,10 @@ export class EncodeAdmission {
   }
 
   /**
-   * Whether a not-yet-opened format can take a place on the whole machine.
-   * The output choice calls this for each candidate rung; the final claim uses
-   * `admitsWatching` with the same arithmetic after registering the output.
+   * Whether an output candidate can take a place on the whole machine. A
+   * partial output already in the catalogue uses its measured cost; a
+   * not-yet-opened output uses the same candidate estimate as before. The final
+   * claim uses `admitsWatching` after registering the output.
    *
    * @param {object} spec
    * @param {object} file
@@ -207,13 +208,22 @@ export class EncodeAdmission {
     if (!address) {
       return { admitted: false, reason: "the output has no address", speedX: null };
     }
+    if (this.#host.finished?.(address) === true) {
+      return { admitted: true, reason: "everything it serves is already made", speedX: null };
+    }
     if ((this.#host.liveRunsByAddress().get(address) ?? 0) > 0) {
       return { admitted: true, reason: "an encoder already runs there", speedX: null };
     }
     if (this.#heldWithoutRun().has(address)) {
       return { admitted: true, reason: "it already holds a place for another viewer", speedX: null };
     }
-    const load = this.#host.loadForCandidate?.(spec, file) ?? null;
+    // A partial output already in the catalogue has its measured rate. Use it
+    // before the candidate estimate; completed outputs took the return above.
+    const existing = this.#host.loadOf(address);
+    const hasMeasuredExistingCost = Number.isFinite(existing?.costSec) && existing.costSec > 0;
+    const load = hasMeasuredExistingCost
+      ? existing
+      : this.#host.loadForCandidate?.(spec, file) ?? existing;
     return this.#assessCandidate(address, load);
   }
 

package/services/encode/quality/output-format.js

@@ -228,6 +228,20 @@ export function decideOutputFormat({
       rateControl: limit === null ? null : softwareRateControlFor({ width: w, height: h, fps, source, capKbps: limit })
     }));
   };
+  let machineRefusal = null;
+  const machineAdmissionFor = (spec) => typeof machineAdmission === "function" ? machineAdmission(spec) : null;
+  const machineCanContinue = (spec) => machineAdmissionFor(spec)?.admitted !== false;
+  const admittedByMachine = (spec) => {
+    if (!machineCan(spec.video?.encode?.width ?? 0, spec.video?.encode?.height ?? 0)) {
+      return false;
+    }
+    const answer = machineAdmissionFor(spec);
+    if (answer?.admitted === false) {
+      machineRefusal ??= answer;
+      return false;
+    }
+    return true;
+  };
   const wantedFormats = formatsAt(width, height);
   const wantedSpec = wantedFormats[0];
   const wantedKey = wantedSpec.toKey();
@@ -247,6 +261,7 @@ export function decideOutputFormat({
       wanted: { width, height },
       nextLowerArea: nextRungAreaBelow(buildResolutionLadder(ceiling.w, ceiling.h), height),
       atRisk: measured && !canSustainOutput({ benchmark, ...priced, outputPixelsPerSec: width * height * fps, frame: { width, height } }).sustainable,
+      canProduce: (candidate) => machineCanContinue(candidate.spec),
       judge: (candidate) => judge(candidate.spec),
       candidates: servingCandidates({
         wanted: wantedSpec,
@@ -262,18 +277,6 @@ export function decideOutputFormat({
   }
 
   let anySizeHeld = false;
-  let machineRefusal = null;
-  const admittedByMachine = (spec) => {
-    if (!machineCan(spec.video?.encode?.width ?? 0, spec.video?.encode?.height ?? 0)) {
-      return false;
-    }
-    const answer = typeof machineAdmission === "function" ? machineAdmission(spec) : null;
-    if (answer?.admitted === false) {
-      machineRefusal ??= answer;
-      return false;
-    }
-    return true;
-  };
   if (machineCan(width, height)) {
     for (const spec of wantedFormats) {
       if (!admittedByMachine(spec)) {

package/services/encode/quality/serving-output.js

@@ -48,15 +48,17 @@ import { admissionRank } from "./link-budget.js";
  *   on this viewer's own ladder; zero when there is none.
  * @param {boolean} params.atRisk - Producing `wanted` here is measured not to
  *   keep up with what the file needs. False where nothing measured it.
+ * @param {(candidate: Candidate) => boolean} [params.canProduce] - Whether
+ *   this machine can keep producing an output that is not finished.
  * @param {(candidate: Candidate) => { admitted: boolean, load: object }} params.judge -
  *   What this viewer's link does with the candidate's whole load.
  * @param {Candidate[]} params.candidates
  * @returns {{ key: string, answer: object } | null} The output to serve, or
  *   null to produce `wanted`.
  */
-export function chooseServingOutput({ mode, wanted, nextLowerArea, atRisk, judge, candidates }) {
+export function chooseServingOutput({ mode, wanted, nextLowerArea, atRisk, canProduce = () => true, judge, candidates }) {
   const admitted = (candidates ?? [])
-    .filter((candidate) => candidate.readyHere === true)
+    .filter((candidate) => candidate.readyHere === true && canProduce(candidate))
     .map((candidate) => ({ candidate, answer: judge(candidate) }))
     .filter((one) => one.answer.admitted);
   const areaOf = (one) => one.candidate.width * one.candidate.height;