@torrent-tv/proxy 2.96.9 → 2.96.10

package/package.json

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

package/server.js

@@ -54,6 +54,7 @@ import { wireOutputs } from "./services/server/wire-outputs.js";
 import { createPlaybackPlanner } from "./services/media/playback-planner.js";
 import { KeyframeTables } from "./services/media/KeyframeTables.js";
 import { contentsOf } from "./services/torrent/Contents.js";
+import { joinedWithinPieces } from "./services/torrent/demand/pieces.js";
 import { SubtitleOrchestrator } from "./services/media/SubtitleOrchestrator.js";
 import { containerOrchestrator, CONTAINER_HEAD_BYTES, describeWorkTags } from "./services/media/ContainerOrchestrator.js";
 import { readPlaybackDeclarations } from "./services/media/read-playback-declarations.js";
@@ -434,6 +435,9 @@ export async function startProxyServer({
       const media = await containerOrchestrator.inspect(params, "media-info");
       if (media.kind !== "result" || !map.isCurrent()) return [];
       const shift = Number(media.value?.startTimeSeconds) || 0;
+      // A zone's ranges are stated to the torrent at the precision it fetches:
+      // ranges closer than a piece hold the same pieces as one.
+      const pieceLength = Number(torrentPool.knownTorrent(map.sourceKey)?.pieceLength);
       const converted = [];
       const demands = [];
       for (const output of outputParts.outputs.values()) {
@@ -483,7 +487,7 @@ export async function startProxyServer({
           modes: Object.fromEntries(wanted.map(track => [track.trackNumber, modes.get(track)])) };
         const { tracks: _choices, owner: _owner, sourceInterval: _sourceInterval, ...demand } = zone;
         const convert = ranges => {
-          for (const [byteStart, byteEnd] of ranges) converted.push({ ...demand,
+          for (const [byteStart, byteEnd] of joinedWithinPieces(ranges, pieceLength)) converted.push({ ...demand,
             downloadInterval: { from: zone.owner.from, to: zone.owner.to }, byteStart, byteEnd });
         };
         // The bytes one segment needs are a fact of the file and the output, so

package/services/torrent/demand/pieces.js

@@ -106,3 +106,29 @@ export function nearestFirst({ byteStart, byteEnd, parts }) {
   }
   return ranges;
 }
+
+/**
+ * Byte ranges joined wherever the gap between two of them is shorter than a
+ * piece: the pieces they hold are the same, and there are fewer of them.
+ *
+ * A gap shorter than a piece cannot hold a whole piece, so every piece it
+ * touches is touched by a range beside it. The soundtrack of an AVI read from
+ * its own packets is one range per packet, interleaved with the picture's
+ * bytes: field 2026-10-10 (torrent-tv/meta#166), a map of 350 191 zones took
+ * 20.8 s to reach the torrent thread and grew its heap to 818 MB, for pieces of
+ * 4 MiB that the whole soundtrack touches anyway.
+ *
+ * @param {Array<[number, number]>} ranges - Inclusive byte ranges in ascending order.
+ * @param {number} pieceLength
+ * @returns {Array<[number, number]>} The same ranges when the piece length is not usable.
+ */
+export function joinedWithinPieces(ranges, pieceLength) {
+  if (!Number.isFinite(pieceLength) || pieceLength <= 0) return ranges;
+  const joined = [];
+  for (const [start, end] of ranges) {
+    const previous = joined.at(-1);
+    if (previous && start >= previous[0] && start - previous[1] - 1 < pieceLength) previous[1] = Math.max(previous[1], end);
+    else joined.push([start, end]);
+  }
+  return joined;
+}