@torrent-tv/proxy 2.88.2 → 2.88.4

package/services/server/http-responses.js

@@ -1,60 +1,60 @@
-/**
- * Shared HTTP responses used by more than one route.
- */
-/**
- * The answer given when no output suits this viewer: nothing this proxy holds
- * or could produce is admitted by their link. Machine-readable, because the
- * page has to explain it to the viewer and offer what they can do; the
- * figures are the ones the decision was made on.
- *
- * 409 and not a 5xx: nothing is wrong with the proxy, and repeating the same
- * request against the same link gives the same answer.
- *
- * @param {import("fastify").FastifyReply} reply
- * @param {{ reason: string, figures: object | null, wantedKey?: string }} details
- * @returns {import("fastify").FastifyReply}
- */
-export function replyOutputUnavailable(reply, details) {
-  return reply.code(409).send({
-    error: `No output suits this viewer: ${details?.reason ?? "unknown"}.`,
-    outcome: "output-unavailable",
-    reason: details?.reason ?? "",
-    figures: details?.figures ?? null
-  });
-}
-
-/**
- * The answer given when this machine cannot take the output asked for: nothing
- * it has shown it can encode fits, or it has no place for one more encoder.
- * The page answers it by asking the rest of the pool before anything plays.
- *
- * @param {import("fastify").FastifyReply} reply
- * @param {{ reason: string, figures?: object | null }} details
- * @returns {import("fastify").FastifyReply}
- */
-export function replyNoCapacity(reply, details) {
-  return reply.code(409).send({
-    error: `This proxy cannot take this video now: ${details?.reason ?? "unknown"}.`,
-    outcome: "no-capacity",
-    reason: details?.reason ?? "",
-    figures: details?.figures ?? null
-  });
-}
-
-/**
- * The answer given when an address this viewer was already given cannot be
- * given again without risking a piece under a header it may not match. The
- * page answers it by starting a new viewing where the picture is — which is
- * why it is not a "retry": the same request would be answered the same way.
- *
- * @param {import("fastify").FastifyReply} reply
- * @param {{ reason: string }} details
- * @returns {import("fastify").FastifyReply}
- */
-export function replyAssignmentLost(reply, details) {
-  return reply.code(409).send({
-    error: `This part was answered by an output that has gone: ${details?.reason ?? "unknown"}.`,
-    outcome: "assignment-lost",
-    reason: details?.reason ?? ""
-  });
-}
+/**
+ * Shared HTTP responses used by more than one route.
+ */
+/**
+ * The answer given when no output suits this viewer: nothing this proxy holds
+ * or could produce is admitted by their link. Machine-readable, because the
+ * page has to explain it to the viewer and offer what they can do; the
+ * figures are the ones the decision was made on.
+ *
+ * 409 and not a 5xx: nothing is wrong with the proxy, and repeating the same
+ * request against the same link gives the same answer.
+ *
+ * @param {import("fastify").FastifyReply} reply
+ * @param {{ reason: string, figures: object | null, wantedKey?: string }} details
+ * @returns {import("fastify").FastifyReply}
+ */
+export function replyOutputUnavailable(reply, details) {
+  return reply.code(409).send({
+    error: `No output suits this viewer: ${details?.reason ?? "unknown"}.`,
+    outcome: "output-unavailable",
+    reason: details?.reason ?? "",
+    figures: details?.figures ?? null
+  });
+}
+
+/**
+ * The answer given when this machine cannot take the output asked for: nothing
+ * it has shown it can encode fits, or it has no place for one more encoder.
+ * The page answers it by asking the rest of the pool before anything plays.
+ *
+ * @param {import("fastify").FastifyReply} reply
+ * @param {{ reason: string, figures?: object | null }} details
+ * @returns {import("fastify").FastifyReply}
+ */
+export function replyNoCapacity(reply, details) {
+  return reply.code(409).send({
+    error: `This proxy cannot take this video now: ${details?.reason ?? "unknown"}.`,
+    outcome: "no-capacity",
+    reason: details?.reason ?? "",
+    figures: details?.figures ?? null
+  });
+}
+
+/**
+ * The answer given when an address this viewer was already given cannot be
+ * given again without risking a piece under a header it may not match. The
+ * page answers it by starting a new viewing where the picture is — which is
+ * why it is not a "retry": the same request would be answered the same way.
+ *
+ * @param {import("fastify").FastifyReply} reply
+ * @param {{ reason: string }} details
+ * @returns {import("fastify").FastifyReply}
+ */
+export function replyAssignmentLost(reply, details) {
+  return reply.code(409).send({
+    error: `This part was answered by an output that has gone: ${details?.reason ?? "unknown"}.`,
+    outcome: "assignment-lost",
+    reason: details?.reason ?? ""
+  });
+}

package/services/server/playback-readiness.js

@@ -534,15 +534,15 @@ function isSafeSchedule(completions, productions, trackState, position, duration
     while (productionIndex < orderedProductions.length && orderedProductions[productionIndex].at <= time) {
       const { trackIndex, segment } = orderedProductions[productionIndex];
       for (const range of segment.mediaRanges ?? [{ start: segment.startSeconds, end: segment.endSeconds }]) {
-        addRange(preparedRanges[trackIndex], range.start, range.end);
+        addRange(preparedRanges[trackIndex], range.start, range.end, range.joinEnd);
       }
       productionIndex += 1;
     }
     while (completionIndex < orderedCompletions.length && orderedCompletions[completionIndex].at <= time) {
       const { trackIndex, segment } = orderedCompletions[completionIndex];
       for (const range of segment.mediaRanges ?? [{ start: segment.startSeconds, end: segment.endSeconds }]) {
-        addRange(clientRanges[trackIndex], range.start, range.end);
-        addRange(preparedRanges[trackIndex], range.start, range.end);
+        addRange(clientRanges[trackIndex], range.start, range.end, range.joinEnd);
+        addRange(preparedRanges[trackIndex], range.start, range.end, range.joinEnd);
       }
       completionIndex += 1;
     }
@@ -625,21 +625,26 @@ function isSafeSchedule(completions, productions, trackState, position, duration
   return { safe: atEnd.safe, bufferedAtStart: atStart.available, neededSeconds: atStart.neededSeconds, failure: atStart.failure };
 }
 
-function addRange(ranges, start, end) {
+function addRange(ranges, start, end, joinEnd) {
   const merged = [];
-  let next = { start, end };
+  let next = { start, end, ...(Number.isFinite(joinEnd) ? { joinEnd } : {}) };
   let inserted = false;
   for (const range of ranges) {
-    if (range.end < next.start) {
+    // The declared coded-frame join boundary connects two ranges only after
+    // both have arrived. It never extends an isolated range's playable end.
+    if (Math.max(range.end, range.joinEnd ?? range.end) < next.start) {
       merged.push(range);
-    } else if (next.end < range.start) {
+    } else if (Math.max(next.end, next.joinEnd ?? next.end) < range.start) {
       if (!inserted) {
         merged.push(next);
         inserted = true;
       }
       merged.push(range);
     } else {
-      next = { start: Math.min(next.start, range.start), end: Math.max(next.end, range.end) };
+      next = { start: Math.min(next.start, range.start), end: Math.max(next.end, range.end),
+        ...(next.joinEnd !== undefined || range.joinEnd !== undefined ? {
+          joinEnd: Math.max(next.joinEnd ?? next.end, range.joinEnd ?? range.end)
+        } : {}) };
     }
   }
   if (!inserted) {