@torrent-tv/proxy 2.93.3 → 2.93.4

package/package.json

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

package/server.js

@@ -830,7 +830,7 @@ export async function startProxyServer({
             scope: "preparation", ...sourcePreparation.demandFor(work) });
         }
       }
-      if (["packets", "subtitle-cues"].includes(work.statement) && (work.selected || work.role === "subtitle-embedded")) {
+      if ((work.statement === "packets" && work.role !== "source-rest") || work.role === "subtitle-embedded" && work.statement === "subtitle-cues") {
         const info = await containerOrchestrator.inspect({ ...params, onReadResult: undefined }, "media-info");
         if (info.kind !== "result") return info;
         const positions = outputParts.viewers.forSource(work.sourceKey)

package/services/encode/EncodeRun.js

@@ -54,6 +54,7 @@ const MICROSECONDS_PER_SECOND = 1_000_000;
  *   the stretch it was given, which no other live run of that output holds.
  * @property {string} address
  * @property {string} ending - One of {@link ENCODE_EXIT}.
+ * @property {string | null} publicationCode - The closed-piece refusal category, separate from the process exit.
  * @property {string} because - Why, in words, including who asked when we did.
  * @property {number | null} code
  * @property {string | null} signal
@@ -108,6 +109,7 @@ export class EncodeRun {
   #pendingClosed = null;
   #closedTimings = new Map();
   #publicationError = null;
+  #publicationCode = null;
   #inputTruncated = false;
   #stderrReadTail = "";
   #processExited = false;
@@ -602,6 +604,7 @@ export class EncodeRun {
         served = this.onClosed(name, following, this.#closedTimings.get(name) ?? null);
       } catch (error) {
         this.#publicationError = error instanceof Error ? error.message : String(error);
+        this.#publicationCode = error?.code ?? null;
         this.lastError = this.#publicationError;
         // A refused closed piece must release this run's claim now, rather
         // than keep its viewer waiting until the rest of the film is encoded.
@@ -877,6 +880,7 @@ export class EncodeRun {
       run: this,
       address: this.address,
       ending,
+      publicationCode: this.#publicationCode,
       because,
       code: code ?? null,
       signal: signal ?? null,

package/services/encode/EncodeRuns.js

@@ -395,6 +395,7 @@ export class EncodeRuns {
       return mediaRanges;
     } catch (error) {
       this.#host.logger.warn(`encode: could not read the media of ${name}: ${error instanceof Error ? error.message : String(error)}`);
+      if (/^E[A-Z]+$/.test(error?.code ?? "")) throw error;
       return false;
     }
   }
@@ -986,7 +987,8 @@ export class EncodeRuns {
           }
         }
         const mediaRanges = this.#wholeClosedPiece(session, name, index, admittedInput, bytes);
-        if (mediaRanges === false) throw new Error(`Closed piece #${index} has incomplete media.`);
+        if (mediaRanges === false) throw Object.assign(new Error(`Closed piece #${index} has incomplete media.`),
+          { code: "ERR_INCOMPLETE_MEDIA" });
         const published = this.#host.segmentFiles.publish(session.outputKey ?? "", name, session.segmentFormat, { mediaRanges, bytes });
         if (!published) throw new Error(`Closed piece #${index} could not be stored.`);
         return published;

package/services/encode/InputFailures.js

@@ -3,6 +3,9 @@ import { ENCODE_EXIT } from "./encode-exit.js";
 
 /** Process and resource failures are not evidence against the admitted bytes. */
 export function failedAdmittedInput(ended, hardwareEncode = false) {
+  if (ended.ending === ENCODE_EXIT.PUBLICATION_FAILED) {
+    return !hardwareEncode && ended.publicationCode === "ERR_INCOMPLETE_MEDIA";
+  }
   if (hardwareEncode || ended.signal || ended.code === null || ended.code === undefined) return false;
   if (!Number.isInteger(ended.code) || ended.code < 0) return false;
   if (/cannot allocate memory|out of memory|no space left|resource temporarily unavailable|too many open files|ENOMEM|ENOSPC|EMFILE|EAGAIN/i.test(ended.because ?? "")) return false;

package/services/server/ViewerRequests.js

@@ -430,6 +430,9 @@ export class ViewerRequests {
     // without this the base session would idle out from under its own variants.
     const session = this.#host.activeOutputFor({ base: named, consumerId, outputs: this.#host.outputs });
     this.#host.outputs.touch(session);
+    const audio = this.#host.renditions.servesAudioSeparately(session)
+      ? this.#host.renditions.playbackAudioOutputFor(session, consumerId) : null;
+    const failed = [session, audio].find(output => output && this.#host.encodeRuns.wireStateOf(output) === "failed");
     const warmupTotalSeconds = this.#host.startupWaitMs / 1000;
     const warmupElapsedSeconds = Math.max(
       0,
@@ -452,7 +455,7 @@ export class ViewerRequests {
       // The id the caller asked about, not the variant it was answered from —
       // the browser tracks its sessions by the id it was given.
       sessionId: named.id,
-      state: this.#host.encodeRuns.wireStateOf(session),
+      state: failed ? "failed" : this.#host.encodeRuns.wireStateOf(session),
       // The smallest buffer at which no interruption reaches the viewer, from
       // THIS file's own recent interruptions: one whole segment — the one being
       // played — plus the worst wait that can arrive before the buffer refills.
@@ -537,7 +540,7 @@ export class ViewerRequests {
       expectedSessionCreateMs: this.#host.expectedSessionCreateMs(),
       expectedFirstSegmentMs: this.#host.expectedFirstSegmentMs(),
       updatedAt: progress.updatedAt,
-      error: this.#host.encodeRuns.failureOf(session)
+      error: this.#host.encodeRuns.failureOf(failed ?? session)
     };
   }