@torrent-tv/proxy 2.87.5 → 2.87.7

package/services/torrent/worker/pool-adapter.js

@@ -21,7 +21,7 @@
  */
 
 import { TorrentWorkerClient } from "./client.js";
-import { deriveSourceKey } from "../torrent-source-key.js";
+import { deriveSourceKey } from "../../../utils/torrent-source-key.js";
 
 /**
  * A torrent pool whose work happens on another thread.

package/services/torrent/worker/resume-warm.js

@@ -1,107 +1,107 @@
-/**
- * @file Fetching the region under a viewer's resume position.
- *
- * All that is left of a file that used to read containers here as well. The
- * parsing moved to the main thread on 2026-09-15: a container is built from one
- * function, `readRange(start, end)`, the pieces behind it live in shared memory,
- * and the reason it had been put here — "the main thread cannot open a read
- * stream on one of its files" — was true of WebTorrent's own API and not of the
- * bytes. Three commands, a second `ContainerOrchestrator` in this thread, and
- * every answer carried back over the channel went with it.
- *
- * What stays is the part that really is the torrent's: turning a position in
- * seconds into a byte offset and pulling that region off the swarm. How long
- * the file runs is TOLD to it, because that is what the file states about
- * itself and this thread no longer reads such things.
- */
-
-import { logger } from "../../../utils/logger.js";
-
-
-
-
-
-
-
-
-
-
-/**
- * How much of the file to pull in under the viewer's resume position.
- *
- * One piece of a video torrent is 4-16 MB and a resume lands anywhere inside
- * one, so anything smaller would still leave the encoder waiting for the piece
- * it starts in. Eight megabytes covers that piece and usually the next.
- */
-const RESUME_REGION_BYTES = 8 * 1024 * 1024;
-
-/**
- * Where a position in seconds falls in a file, in bytes.
- *
- * Proportional, and therefore approximate on a variable bitrate — which is what
- * it is for: a prefetch that puts the swarm to work on roughly the right place
- * while the plan and the session are still being built. The encoder's own read
- * asks for the exact bytes a moment later and corrects it.
- *
- * A position past the end is clamped to the end rather than refused: a resume
- * position can outlive the file it was recorded against, and reading the last
- * bytes is harmless where reading past them is an error.
- *
- * @param {number} fileLength
- * @param {number} durationSeconds
- * @param {number} positionSeconds
- * @returns {number}
- */
-export function resumeByteOffset(fileLength, durationSeconds, positionSeconds) {
-  if (!(fileLength > 0) || !(durationSeconds > 0) || !(positionSeconds > 0)) {
-    return 0;
-  }
-  const within = Math.min(positionSeconds, durationSeconds);
-  return Math.min(fileLength - 1, Math.floor((fileLength * within) / durationSeconds));
-}
-
-/**
- * Start fetching the region a viewer is about to resume at.
- *
- * Where that region IS can only be worked out from two numbers the file itself
- * holds — its length and its duration — so this belongs beside the container
- * read rather than in the route: the route knows a position in seconds and
- * nothing else. The conversion is proportional and therefore approximate on a
- * variable bitrate; it is a prefetch, and the encoder's own read corrects it.
- *
- * @param {object} torrent
- * @param {number} fileIndex
- * @param {string} sourceKey
- * @param {number} positionSeconds
- * @param {{ prefetchEdges?: () => Promise<unknown>, fetchRegion?: (start: number, bytes: number) => Promise<unknown> }} options
- * @returns {Promise<boolean>} Whether a region was asked for.
- */
-export async function warmResumePosition(torrent, fileIndex, sourceKey, positionSeconds, options = {}) {
-  const file = torrent?.files?.[fileIndex];
-  if (!file || !(positionSeconds > 0) || typeof options.fetchRegion !== "function") {
-    return false;
-  }
-  // TOLD, not worked out here. How long a file runs is what the file states
-  // about itself, and that is read on the main thread now; this one turns a
-  // position into a byte offset and fetches the region under it, which is all
-  // of the job that is actually the torrent's.
-  const duration = Number(options.durationSeconds);
-  if (!Number.isFinite(duration) || duration <= 0) {
-    logger.info(
-      `warm ${sourceKey.slice(0, 8)}: "${String(file.name).slice(0, 40)}" does not declare its ` +
-      "duration, so where the viewer's position falls in it cannot be worked out — " +
-      "the region under it is left to the encoder's own read"
-    );
-    return false;
-  }
-  const at = resumeByteOffset(file.length, duration, positionSeconds);
-  logger.info(
-    `warm ${sourceKey.slice(0, 8)}: fetching ${(RESUME_REGION_BYTES / (1024 * 1024)).toFixed(0)}MB under the ` +
-    `viewer's position ${positionSeconds.toFixed(1)}s of ${duration.toFixed(1)}s, which is ` +
-    `${(at / (1024 * 1024)).toFixed(1)}MB into "${String(file.name).slice(0, 40)}"`
-  );
-  await options.fetchRegion(at, RESUME_REGION_BYTES);
-  return true;
-}
-
-
+/**
+ * @file Fetching the region under a viewer's resume position.
+ *
+ * All that is left of a file that used to read containers here as well. The
+ * parsing moved to the main thread on 2026-09-15: a container is built from one
+ * function, `readRange(start, end)`, the pieces behind it live in shared memory,
+ * and the reason it had been put here — "the main thread cannot open a read
+ * stream on one of its files" — was true of WebTorrent's own API and not of the
+ * bytes. Three commands, a second `ContainerOrchestrator` in this thread, and
+ * every answer carried back over the channel went with it.
+ *
+ * What stays is the part that really is the torrent's: turning a position in
+ * seconds into a byte offset and pulling that region off the swarm. How long
+ * the file runs is TOLD to it, because that is what the file states about
+ * itself and this thread no longer reads such things.
+ */
+
+import { logger } from "../../../utils/logger.js";
+
+
+
+
+
+
+
+
+
+
+/**
+ * How much of the file to pull in under the viewer's resume position.
+ *
+ * One piece of a video torrent is 4-16 MB and a resume lands anywhere inside
+ * one, so anything smaller would still leave the encoder waiting for the piece
+ * it starts in. Eight megabytes covers that piece and usually the next.
+ */
+const RESUME_REGION_BYTES = 8 * 1024 * 1024;
+
+/**
+ * Where a position in seconds falls in a file, in bytes.
+ *
+ * Proportional, and therefore approximate on a variable bitrate — which is what
+ * it is for: a prefetch that puts the swarm to work on roughly the right place
+ * while the plan and the session are still being built. The encoder's own read
+ * asks for the exact bytes a moment later and corrects it.
+ *
+ * A position past the end is clamped to the end rather than refused: a resume
+ * position can outlive the file it was recorded against, and reading the last
+ * bytes is harmless where reading past them is an error.
+ *
+ * @param {number} fileLength
+ * @param {number} durationSeconds
+ * @param {number} positionSeconds
+ * @returns {number}
+ */
+export function resumeByteOffset(fileLength, durationSeconds, positionSeconds) {
+  if (!(fileLength > 0) || !(durationSeconds > 0) || !(positionSeconds > 0)) {
+    return 0;
+  }
+  const within = Math.min(positionSeconds, durationSeconds);
+  return Math.min(fileLength - 1, Math.floor((fileLength * within) / durationSeconds));
+}
+
+/**
+ * Start fetching the region a viewer is about to resume at.
+ *
+ * Where that region IS can only be worked out from two numbers the file itself
+ * holds — its length and its duration — so this belongs beside the container
+ * read rather than in the route: the route knows a position in seconds and
+ * nothing else. The conversion is proportional and therefore approximate on a
+ * variable bitrate; it is a prefetch, and the encoder's own read corrects it.
+ *
+ * @param {object} torrent
+ * @param {number} fileIndex
+ * @param {string} sourceKey
+ * @param {number} positionSeconds
+ * @param {{ prefetchEdges?: () => Promise<unknown>, fetchRegion?: (start: number, bytes: number) => Promise<unknown> }} options
+ * @returns {Promise<boolean>} Whether a region was asked for.
+ */
+export async function warmResumePosition(torrent, fileIndex, sourceKey, positionSeconds, options = {}) {
+  const file = torrent?.files?.[fileIndex];
+  if (!file || !(positionSeconds > 0) || typeof options.fetchRegion !== "function") {
+    return false;
+  }
+  // TOLD, not worked out here. How long a file runs is what the file states
+  // about itself, and that is read on the main thread now; this one turns a
+  // position into a byte offset and fetches the region under it, which is all
+  // of the job that is actually the torrent's.
+  const duration = Number(options.durationSeconds);
+  if (!Number.isFinite(duration) || duration <= 0) {
+    logger.info(
+      `warm ${sourceKey.slice(0, 8)}: "${String(file.name).slice(0, 40)}" does not declare its ` +
+      "duration, so where the viewer's position falls in it cannot be worked out — " +
+      "the region under it is left to the encoder's own read"
+    );
+    return false;
+  }
+  const at = resumeByteOffset(file.length, duration, positionSeconds);
+  logger.info(
+    `warm ${sourceKey.slice(0, 8)}: fetching ${(RESUME_REGION_BYTES / (1024 * 1024)).toFixed(0)}MB under the ` +
+    `viewer's position ${positionSeconds.toFixed(1)}s of ${duration.toFixed(1)}s, which is ` +
+    `${(at / (1024 * 1024)).toFixed(1)}MB into "${String(file.name).slice(0, 40)}"`
+  );
+  await options.fetchRegion(at, RESUME_REGION_BYTES);
+  return true;
+}
+
+

package/services/torrent/worker/webrtc-shim.js

@@ -1,219 +1,219 @@
-/**
- * @file `webrtc-polyfill`'s interface, served by a pure-JavaScript WebRTC stack.
- *
- * **Why this exists.** node-datachannel is native, and its native side is not
- * safe to use from two V8 isolates at once: the process aborts with
- * `HandleScope: Entering the V8 API without proper locking in place`. Measured
- * on win32/x64 and linux/arm64 alike — one isolate is fine (either the main
- * thread or a worker), two at the same time is fatal, and preloading in both
- * does not help. The upstream issue about workers (#129) was closed in 0.4.0
- * but only covers use from a worker ALONE, which does work.
- *
- * We need it twice: `transport/webrtc-manager.js` runs the video channel to the browser on
- * the main thread, and the torrent client — which is now on its own thread —
- * creates peer connections of its own to announce on `wss://` trackers. Before
- * the thread split both lived in one isolate and nothing was wrong; afterwards
- * any torrent carrying a wss tracker took the whole proxy down.
- *
- * So the native stack stays where it earns its keep — the main thread, carrying
- * video — and the torrent's trackers get a JavaScript implementation, where the
- * traffic is a handful of signalling messages. `services/torrent/worker/worker.js`
- * installs a module resolution hook that points `webrtc-polyfill` here; nothing
- * outside the worker thread is affected, and no dependency is patched (the addon
- * installs with `--ignore-scripts`, so a postinstall patch would never run).
- *
- * **What the shim has to fix.** werift's peer connection matches the interface
- * `simple-peer` expects, but its data channel differs in two ways that matter:
- *
- *  - it has no `binaryType`, and hands `onmessage` a `Buffer`. `simple-peer`
- *    only recognises `ArrayBuffer`; anything else goes through `text2arr`,
- *    which would corrupt every byte of torrent payload.
- *  - it has no `onbufferedamountlow`. `simple-peer` builds its backpressure on
- *    that event, so without it a send that hits the high-water mark never
- *    resumes.
- */
-
-import {
-  RTCPeerConnection as WeriftPeerConnection,
-  RTCIceCandidate
-} from "werift";
-
-/**
- * A session description built the way browsers build it — from one object.
- *
- * werift's own class takes two positional arguments, `(sdp, type)`. Callers
- * written against the browser pass `{ type, sdp }`, so with werift's class the
- * type lands in the sdp slot and the description is rejected: field 2026-08-03,
- * wss announces succeeded but every peer connection died with "Connection
- * error: invalid sessionDescription".
- *
- * `RTCIceCandidate` needs no such treatment — werift already takes an object.
- */
-class ShimSessionDescription {
-  /**
-   * @param {{ type?: string, sdp?: string } | string} init
-   * @param {string} [type] - Tolerated for callers using werift's own order.
-   */
-  constructor(init, type) {
-    if (typeof init === "string") {
-      this.sdp = init;
-      this.type = type;
-      return;
-    }
-    this.type = init?.type;
-    this.sdp = init?.sdp;
-  }
-
-  toJSON() {
-    return { type: this.type, sdp: this.sdp };
-  }
-}
-
-/**
- * A werift data channel wearing the browser's interface.
- *
- * Only what `simple-peer` touches is implemented — promising more would be
- * pretending, since anything else has no caller and would never be exercised.
- */
-class ShimDataChannel {
-  #channel;
-  /** @type {"blob" | "arraybuffer"} */
-  binaryType = "blob";
-  /** @type {((event: { data: ArrayBuffer | Buffer }) => void) | null} */
-  onmessage = null;
-  /** @type {(() => void) | null} */
-  onopen = null;
-  /** @type {(() => void) | null} */
-  onclose = null;
-  /** @type {((event: { error?: Error }) => void) | null} */
-  onerror = null;
-  /** @type {(() => void) | null} */
-  onbufferedamountlow = null;
-
-  /**
-   * @param {object} channel - werift's `RTCDataChannel`.
-   */
-  constructor(channel) {
-    this.#channel = channel;
-
-    channel.onmessage = (event) => {
-      const data = event?.data ?? event;
-      this.onmessage?.({ data: this.#toWireFormat(data) });
-    };
-    channel.onopen = () => this.onopen?.();
-    channel.onclose = () => this.onclose?.();
-    channel.onerror = (event) => this.onerror?.(event ?? {});
-
-    // werift reports this as an observable rather than a handler property.
-    channel.bufferedAmountLow?.subscribe?.(() => this.onbufferedamountlow?.());
-  }
-
-  /**
-   * Match what a browser would deliver for the requested `binaryType`.
-   *
-   * `simple-peer` checks `instanceof ArrayBuffer` and sends everything else
-   * through a text decoder, so a `Buffer` handed over unchanged arrives
-   * mangled.
-   *
-   * @param {unknown} data
-   * @returns {ArrayBuffer | unknown}
-   */
-  #toWireFormat(data) {
-    if (this.binaryType !== "arraybuffer" || typeof data === "string") {
-      return data;
-    }
-    if (ArrayBuffer.isView(data)) {
-      return data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);
-    }
-    return data;
-  }
-
-  get label() {
-    return this.#channel.label;
-  }
-
-  get readyState() {
-    return this.#channel.readyState;
-  }
-
-  get bufferedAmount() {
-    return this.#channel.bufferedAmount;
-  }
-
-  get bufferedAmountLowThreshold() {
-    return this.#channel.bufferedAmountLowThreshold;
-  }
-
-  set bufferedAmountLowThreshold(value) {
-    this.#channel.bufferedAmountLowThreshold = value;
-  }
-
-  /**
-   * @param {string | ArrayBuffer | ArrayBufferView} data
-   * @returns {void}
-   */
-  send(data) {
-    if (typeof data === "string") {
-      this.#channel.send(data);
-      return;
-    }
-    this.#channel.send(ArrayBuffer.isView(data) ? Buffer.from(data.buffer, data.byteOffset, data.byteLength) : Buffer.from(data));
-  }
-
-  close() {
-    this.#channel.close();
-  }
-}
-
-/**
- * werift's peer connection, handing out data channels that carry the browser's
- * interface. Everything else is inherited unchanged — the peer connection side
- * already matches.
- */
-class ShimPeerConnection extends WeriftPeerConnection {
-  /**
-   * @param {...unknown} args - Passed through to werift.
-   */
-  constructor(...args) {
-    super(...args);
-
-    // `ondatachannel` has to be redefined on the instance, not declared as an
-    // accessor on this class: werift assigns it as an own field in its own
-    // constructor, and an own property shadows a prototype accessor — so a
-    // subclass setter is simply never called, and the caller receives werift's
-    // bare channel instead of the wrapped one.
-    let handler = null;
-    const deliver = (event) => {
-      handler?.({ ...event, channel: new ShimDataChannel(event?.channel ?? event) });
-    };
-    Object.defineProperty(this, "ondatachannel", {
-      configurable: true,
-      // werift reads this property to dispatch, so it must hand back the
-      // wrapper rather than what the caller assigned.
-      get: () => (handler ? deliver : null),
-      set: (value) => {
-        handler = value;
-      }
-    });
-  }
-
-  /**
-   * @param {string} label
-   * @param {object} [options]
-   * @returns {ShimDataChannel}
-   */
-  createDataChannel(label, options) {
-    return new ShimDataChannel(super.createDataChannel(label, options));
-  }
-}
-
-export {
-  ShimPeerConnection as RTCPeerConnection,
-  ShimSessionDescription as RTCSessionDescription,
-  RTCIceCandidate
-};
-export default {
-  RTCPeerConnection: ShimPeerConnection,
-  RTCSessionDescription: ShimSessionDescription,
-  RTCIceCandidate
-};
+/**
+ * @file `webrtc-polyfill`'s interface, served by a pure-JavaScript WebRTC stack.
+ *
+ * **Why this exists.** node-datachannel is native, and its native side is not
+ * safe to use from two V8 isolates at once: the process aborts with
+ * `HandleScope: Entering the V8 API without proper locking in place`. Measured
+ * on win32/x64 and linux/arm64 alike — one isolate is fine (either the main
+ * thread or a worker), two at the same time is fatal, and preloading in both
+ * does not help. The upstream issue about workers (#129) was closed in 0.4.0
+ * but only covers use from a worker ALONE, which does work.
+ *
+ * We need it twice: `transport/webrtc-manager.js` runs the video channel to the browser on
+ * the main thread, and the torrent client — which is now on its own thread —
+ * creates peer connections of its own to announce on `wss://` trackers. Before
+ * the thread split both lived in one isolate and nothing was wrong; afterwards
+ * any torrent carrying a wss tracker took the whole proxy down.
+ *
+ * So the native stack stays where it earns its keep — the main thread, carrying
+ * video — and the torrent's trackers get a JavaScript implementation, where the
+ * traffic is a handful of signalling messages. `services/torrent/worker/worker.js`
+ * installs a module resolution hook that points `webrtc-polyfill` here; nothing
+ * outside the worker thread is affected, and no dependency is patched (the addon
+ * installs with `--ignore-scripts`, so a postinstall patch would never run).
+ *
+ * **What the shim has to fix.** werift's peer connection matches the interface
+ * `simple-peer` expects, but its data channel differs in two ways that matter:
+ *
+ *  - it has no `binaryType`, and hands `onmessage` a `Buffer`. `simple-peer`
+ *    only recognises `ArrayBuffer`; anything else goes through `text2arr`,
+ *    which would corrupt every byte of torrent payload.
+ *  - it has no `onbufferedamountlow`. `simple-peer` builds its backpressure on
+ *    that event, so without it a send that hits the high-water mark never
+ *    resumes.
+ */
+
+import {
+  RTCPeerConnection as WeriftPeerConnection,
+  RTCIceCandidate
+} from "werift";
+
+/**
+ * A session description built the way browsers build it — from one object.
+ *
+ * werift's own class takes two positional arguments, `(sdp, type)`. Callers
+ * written against the browser pass `{ type, sdp }`, so with werift's class the
+ * type lands in the sdp slot and the description is rejected: field 2026-08-03,
+ * wss announces succeeded but every peer connection died with "Connection
+ * error: invalid sessionDescription".
+ *
+ * `RTCIceCandidate` needs no such treatment — werift already takes an object.
+ */
+class ShimSessionDescription {
+  /**
+   * @param {{ type?: string, sdp?: string } | string} init
+   * @param {string} [type] - Tolerated for callers using werift's own order.
+   */
+  constructor(init, type) {
+    if (typeof init === "string") {
+      this.sdp = init;
+      this.type = type;
+      return;
+    }
+    this.type = init?.type;
+    this.sdp = init?.sdp;
+  }
+
+  toJSON() {
+    return { type: this.type, sdp: this.sdp };
+  }
+}
+
+/**
+ * A werift data channel wearing the browser's interface.
+ *
+ * Only what `simple-peer` touches is implemented — promising more would be
+ * pretending, since anything else has no caller and would never be exercised.
+ */
+class ShimDataChannel {
+  #channel;
+  /** @type {"blob" | "arraybuffer"} */
+  binaryType = "blob";
+  /** @type {((event: { data: ArrayBuffer | Buffer }) => void) | null} */
+  onmessage = null;
+  /** @type {(() => void) | null} */
+  onopen = null;
+  /** @type {(() => void) | null} */
+  onclose = null;
+  /** @type {((event: { error?: Error }) => void) | null} */
+  onerror = null;
+  /** @type {(() => void) | null} */
+  onbufferedamountlow = null;
+
+  /**
+   * @param {object} channel - werift's `RTCDataChannel`.
+   */
+  constructor(channel) {
+    this.#channel = channel;
+
+    channel.onmessage = (event) => {
+      const data = event?.data ?? event;
+      this.onmessage?.({ data: this.#toWireFormat(data) });
+    };
+    channel.onopen = () => this.onopen?.();
+    channel.onclose = () => this.onclose?.();
+    channel.onerror = (event) => this.onerror?.(event ?? {});
+
+    // werift reports this as an observable rather than a handler property.
+    channel.bufferedAmountLow?.subscribe?.(() => this.onbufferedamountlow?.());
+  }
+
+  /**
+   * Match what a browser would deliver for the requested `binaryType`.
+   *
+   * `simple-peer` checks `instanceof ArrayBuffer` and sends everything else
+   * through a text decoder, so a `Buffer` handed over unchanged arrives
+   * mangled.
+   *
+   * @param {unknown} data
+   * @returns {ArrayBuffer | unknown}
+   */
+  #toWireFormat(data) {
+    if (this.binaryType !== "arraybuffer" || typeof data === "string") {
+      return data;
+    }
+    if (ArrayBuffer.isView(data)) {
+      return data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);
+    }
+    return data;
+  }
+
+  get label() {
+    return this.#channel.label;
+  }
+
+  get readyState() {
+    return this.#channel.readyState;
+  }
+
+  get bufferedAmount() {
+    return this.#channel.bufferedAmount;
+  }
+
+  get bufferedAmountLowThreshold() {
+    return this.#channel.bufferedAmountLowThreshold;
+  }
+
+  set bufferedAmountLowThreshold(value) {
+    this.#channel.bufferedAmountLowThreshold = value;
+  }
+
+  /**
+   * @param {string | ArrayBuffer | ArrayBufferView} data
+   * @returns {void}
+   */
+  send(data) {
+    if (typeof data === "string") {
+      this.#channel.send(data);
+      return;
+    }
+    this.#channel.send(ArrayBuffer.isView(data) ? Buffer.from(data.buffer, data.byteOffset, data.byteLength) : Buffer.from(data));
+  }
+
+  close() {
+    this.#channel.close();
+  }
+}
+
+/**
+ * werift's peer connection, handing out data channels that carry the browser's
+ * interface. Everything else is inherited unchanged — the peer connection side
+ * already matches.
+ */
+class ShimPeerConnection extends WeriftPeerConnection {
+  /**
+   * @param {...unknown} args - Passed through to werift.
+   */
+  constructor(...args) {
+    super(...args);
+
+    // `ondatachannel` has to be redefined on the instance, not declared as an
+    // accessor on this class: werift assigns it as an own field in its own
+    // constructor, and an own property shadows a prototype accessor — so a
+    // subclass setter is simply never called, and the caller receives werift's
+    // bare channel instead of the wrapped one.
+    let handler = null;
+    const deliver = (event) => {
+      handler?.({ ...event, channel: new ShimDataChannel(event?.channel ?? event) });
+    };
+    Object.defineProperty(this, "ondatachannel", {
+      configurable: true,
+      // werift reads this property to dispatch, so it must hand back the
+      // wrapper rather than what the caller assigned.
+      get: () => (handler ? deliver : null),
+      set: (value) => {
+        handler = value;
+      }
+    });
+  }
+
+  /**
+   * @param {string} label
+   * @param {object} [options]
+   * @returns {ShimDataChannel}
+   */
+  createDataChannel(label, options) {
+    return new ShimDataChannel(super.createDataChannel(label, options));
+  }
+}
+
+export {
+  ShimPeerConnection as RTCPeerConnection,
+  ShimSessionDescription as RTCSessionDescription,
+  RTCIceCandidate
+};
+export default {
+  RTCPeerConnection: ShimPeerConnection,
+  RTCSessionDescription: ShimSessionDescription,
+  RTCIceCandidate
+};