@torrent-tv/proxy 2.9.73 → 2.9.75

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

@@ -1,179 +1,179 @@
-/**
- * @file `TorrentPool`'s interface, served from the worker thread.
- *
- * The routes, the planner, the health report and the session manager all reach
- * for a torrent pool and use it the same handful of ways. Rather than rewrite
- * every one of them to thread a `sourceKey` through and await what used to be
- * immediate, this presents the shape they already expect and does the thread
- * hop behind it. Swapping the implementation is then a one-line change at
- * construction, and the call sites are untouched — which is what keeps a change
- * of this size reviewable.
- *
- * Two accommodations are needed, and both are deliberate:
- *
- *  - **`acquireFile` and `prioritizeByteRange` stay synchronous.** They return
- *    nothing the caller inspects, so the command is dispatched and not awaited.
- *    `acquireFile` hands back a release function exactly as before, which sends
- *    its own command when called. Awaiting them would mean touching every call
- *    site for no observable gain.
- *  - **`getTorrent` needs a `sourceKey`.** Torrent objects cannot cross a
- *    thread, so the worker keys them. Callers that have one pass it; the rest
- *    get one derived from the source itself, so the identity stays stable
- *    across calls for the same torrent.
- */
-
-import crypto from "node:crypto";
-import { TorrentWorkerClient } from "./client.js";
-
-/**
- * Stable key for a source, matching how the worker keys its torrents.
- *
- * Derived from the source itself rather than handed out per request, so two
- * routes asking for the same torrent name the same thing on the worker side.
- *
- * @param {"magnet" | "torrent"} sourceType
- * @param {string} source
- * @returns {string}
- */
-function deriveSourceKey(sourceType, source) {
-  return `${sourceType}:${crypto.createHash("sha1").update(source).digest("hex")}`;
-}
-
-/**
- * A torrent pool whose work happens on another thread.
- *
- * See `protocol.js` for why: the torrent was taking ~85% of the main thread and
- * everything owed to a viewer queued behind it.
- */
-export class WorkerTorrentPool {
-  #client;
-  /** Stand-ins by source key, so repeat calls return the same object. */
-  #torrents = new Map();
-
-  /**
-   * @param {{ maxDiskBytes?: number }} [options]
-   */
-  constructor(options = {}) {
-    this.#client = new TorrentWorkerClient(options);
-  }
-
-  /**
-   * Load (or join) a torrent and return a stand-in for it.
-   *
-   * @param {"magnet" | "torrent"} sourceType
-   * @param {string} source
-   * @returns {Promise<object>}
-   */
-  async getTorrent(sourceType, source) {
-    const sourceKey = deriveSourceKey(sourceType, source);
-    const existing = this.#torrents.get(sourceKey);
-    if (existing) {
-      return existing;
-    }
-    const torrent = await this.#client.getTorrent({ sourceKey, sourceType, source });
-    this.#torrents.set(sourceKey, torrent);
-    return torrent;
-  }
-
-  /**
-   * Claim a file for reading; the returned function releases it.
-   *
-   * Synchronous by design — see the file header.
-   *
-   * @param {object} torrent - A stand-in from {@link getTorrent}.
-   * @param {number} fileIndex
-   * @returns {() => void}
-   */
-  acquireFile(torrent, fileIndex) {
-    const sourceKey = torrent?.sourceKey;
-    if (!sourceKey) {
-      return () => undefined;
-    }
-    // Dispatched, not awaited — callers use the result immediately and inspect
-    // nothing. But the release MUST NOT overtake it: both are ordinary messages
-    // to the worker, and if release arrives first the reader count drops to zero
-    // while a read is still running. The idle sweep then removes the torrent AND
-    // its downloaded data out from under the encoder — field 2026-08-02:
-    // "removed idle torrent ... and its store" mid-playback, after which every
-    // read hung and ffmpeg saw an empty input ("Stream ends prematurely at 0").
-    // Chaining the release onto the acquire keeps them in order.
-    const acquired = this.#client.acquireFile(sourceKey, fileIndex).catch(() => undefined);
-    let released = false;
-    return () => {
-      if (released) {
-        return;
-      }
-      released = true;
-      void acquired.then(() => this.#client.releaseFile(sourceKey, fileIndex)).catch(() => undefined);
-    };
-  }
-
-  /**
-   * Live download figures for the progress display.
-   *
-   * @param {object} torrent
-   * @param {number | null} [fileIndex]
-   * @param {{ resumeAnchorByteStart?: number | null }} [options]
-   * @returns {Promise<object | null>}
-   */
-  async getFileStats(torrent, fileIndex = null, options = {}) {
-    const sourceKey = torrent?.sourceKey;
-    if (!sourceKey) {
-      return null;
-    }
-    return this.#client.getFileStats({
-      sourceKey,
-      fileIndex,
-      resumeAnchorByteStart: options?.resumeAnchorByteStart ?? null
-    });
-  }
-
-  /**
-   * Reorder piece selection around a read position.
-   *
-   * Synchronous by design — see the file header.
-   *
-   * @param {object} torrent
-   * @param {number} fileIndex
-   * @param {number} byteStart
-   * @param {number} [windowBytes]
-   * @returns {void}
-   */
-  prioritizeByteRange(torrent, fileIndex, byteStart, windowBytes) {
-    const sourceKey = torrent?.sourceKey;
-    if (!sourceKey) {
-      return;
-    }
-    void this.#client
-      .prioritizeByteRange({ sourceKey, fileIndex, byteStart, windowBytes })
-      .catch(() => undefined);
-  }
-
-  /**
-   * Pre-fetch the head and tail the codec probe needs.
-   *
-   * @param {object} torrent
-   * @param {number} fileIndex
-   * @param {number} [headBytes]
-   * @param {number} [tailBytes]
-   * @param {number} [timeoutMs]
-   * @returns {Promise<unknown>}
-   */
-  async prefetchFileEdges(torrent, fileIndex, headBytes, tailBytes, timeoutMs) {
-    const sourceKey = torrent?.sourceKey;
-    if (!sourceKey) {
-      return null;
-    }
-    return this.#client.prefetchFileEdges({ sourceKey, fileIndex, headBytes, tailBytes, timeoutMs });
-  }
-
-  /**
-   * Shut the torrent client down and stop the thread.
-   *
-   * @returns {Promise<void>}
-   */
-  async destroyAll() {
-    this.#torrents.clear();
-    await this.#client.destroyAll();
-  }
-}
+/**
+ * @file `TorrentPool`'s interface, served from the worker thread.
+ *
+ * The routes, the planner, the health report and the session manager all reach
+ * for a torrent pool and use it the same handful of ways. Rather than rewrite
+ * every one of them to thread a `sourceKey` through and await what used to be
+ * immediate, this presents the shape they already expect and does the thread
+ * hop behind it. Swapping the implementation is then a one-line change at
+ * construction, and the call sites are untouched — which is what keeps a change
+ * of this size reviewable.
+ *
+ * Two accommodations are needed, and both are deliberate:
+ *
+ *  - **`acquireFile` and `prioritizeByteRange` stay synchronous.** They return
+ *    nothing the caller inspects, so the command is dispatched and not awaited.
+ *    `acquireFile` hands back a release function exactly as before, which sends
+ *    its own command when called. Awaiting them would mean touching every call
+ *    site for no observable gain.
+ *  - **`getTorrent` needs a `sourceKey`.** Torrent objects cannot cross a
+ *    thread, so the worker keys them. Callers that have one pass it; the rest
+ *    get one derived from the source itself, so the identity stays stable
+ *    across calls for the same torrent.
+ */
+
+import crypto from "node:crypto";
+import { TorrentWorkerClient } from "./client.js";
+
+/**
+ * Stable key for a source, matching how the worker keys its torrents.
+ *
+ * Derived from the source itself rather than handed out per request, so two
+ * routes asking for the same torrent name the same thing on the worker side.
+ *
+ * @param {"magnet" | "torrent"} sourceType
+ * @param {string} source
+ * @returns {string}
+ */
+function deriveSourceKey(sourceType, source) {
+  return `${sourceType}:${crypto.createHash("sha1").update(source).digest("hex")}`;
+}
+
+/**
+ * A torrent pool whose work happens on another thread.
+ *
+ * See `protocol.js` for why: the torrent was taking ~85% of the main thread and
+ * everything owed to a viewer queued behind it.
+ */
+export class WorkerTorrentPool {
+  #client;
+  /** Stand-ins by source key, so repeat calls return the same object. */
+  #torrents = new Map();
+
+  /**
+   * @param {{ maxDiskBytes?: number, memoryBytes?: number }} [options]
+   */
+  constructor(options = {}) {
+    this.#client = new TorrentWorkerClient(options);
+  }
+
+  /**
+   * Load (or join) a torrent and return a stand-in for it.
+   *
+   * @param {"magnet" | "torrent"} sourceType
+   * @param {string} source
+   * @returns {Promise<object>}
+   */
+  async getTorrent(sourceType, source) {
+    const sourceKey = deriveSourceKey(sourceType, source);
+    const existing = this.#torrents.get(sourceKey);
+    if (existing) {
+      return existing;
+    }
+    const torrent = await this.#client.getTorrent({ sourceKey, sourceType, source });
+    this.#torrents.set(sourceKey, torrent);
+    return torrent;
+  }
+
+  /**
+   * Claim a file for reading; the returned function releases it.
+   *
+   * Synchronous by design — see the file header.
+   *
+   * @param {object} torrent - A stand-in from {@link getTorrent}.
+   * @param {number} fileIndex
+   * @returns {() => void}
+   */
+  acquireFile(torrent, fileIndex) {
+    const sourceKey = torrent?.sourceKey;
+    if (!sourceKey) {
+      return () => undefined;
+    }
+    // Dispatched, not awaited — callers use the result immediately and inspect
+    // nothing. But the release MUST NOT overtake it: both are ordinary messages
+    // to the worker, and if release arrives first the reader count drops to zero
+    // while a read is still running. The idle sweep then removes the torrent AND
+    // its downloaded data out from under the encoder — field 2026-08-02:
+    // "removed idle torrent ... and its store" mid-playback, after which every
+    // read hung and ffmpeg saw an empty input ("Stream ends prematurely at 0").
+    // Chaining the release onto the acquire keeps them in order.
+    const acquired = this.#client.acquireFile(sourceKey, fileIndex).catch(() => undefined);
+    let released = false;
+    return () => {
+      if (released) {
+        return;
+      }
+      released = true;
+      void acquired.then(() => this.#client.releaseFile(sourceKey, fileIndex)).catch(() => undefined);
+    };
+  }
+
+  /**
+   * Live download figures for the progress display.
+   *
+   * @param {object} torrent
+   * @param {number | null} [fileIndex]
+   * @param {{ resumeAnchorByteStart?: number | null }} [options]
+   * @returns {Promise<object | null>}
+   */
+  async getFileStats(torrent, fileIndex = null, options = {}) {
+    const sourceKey = torrent?.sourceKey;
+    if (!sourceKey) {
+      return null;
+    }
+    return this.#client.getFileStats({
+      sourceKey,
+      fileIndex,
+      resumeAnchorByteStart: options?.resumeAnchorByteStart ?? null
+    });
+  }
+
+  /**
+   * Reorder piece selection around a read position.
+   *
+   * Synchronous by design — see the file header.
+   *
+   * @param {object} torrent
+   * @param {number} fileIndex
+   * @param {number} byteStart
+   * @param {number} [windowBytes]
+   * @returns {void}
+   */
+  prioritizeByteRange(torrent, fileIndex, byteStart, windowBytes) {
+    const sourceKey = torrent?.sourceKey;
+    if (!sourceKey) {
+      return;
+    }
+    void this.#client
+      .prioritizeByteRange({ sourceKey, fileIndex, byteStart, windowBytes })
+      .catch(() => undefined);
+  }
+
+  /**
+   * Pre-fetch the head and tail the codec probe needs.
+   *
+   * @param {object} torrent
+   * @param {number} fileIndex
+   * @param {number} [headBytes]
+   * @param {number} [tailBytes]
+   * @param {number} [timeoutMs]
+   * @returns {Promise<unknown>}
+   */
+  async prefetchFileEdges(torrent, fileIndex, headBytes, tailBytes, timeoutMs) {
+    const sourceKey = torrent?.sourceKey;
+    if (!sourceKey) {
+      return null;
+    }
+    return this.#client.prefetchFileEdges({ sourceKey, fileIndex, headBytes, tailBytes, timeoutMs });
+  }
+
+  /**
+   * Shut the torrent client down and stop the thread.
+   *
+   * @returns {Promise<void>}
+   */
+  async destroyAll() {
+    this.#torrents.clear();
+    await this.#client.destroyAll();
+  }
+}

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

@@ -0,0 +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: `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
+};

package/services/torrent-worker/worker.js

@@ -17,12 +17,27 @@
  * threads.
  */
 
+// MUST stay first: it redirects `webrtc-polyfill` to a JavaScript WebRTC stack
+// before WebTorrent can reach the native one. Two isolates using
+// node-datachannel at once abort the process, and the torrent's wss trackers
+// create peer connections of their own.
+import "./install-webrtc-shim.js";
 import { parentPort, workerData } from "node:worker_threads";
-import { TorrentPool } from "../torrent-pool.js";
 import { createSendStream } from "./channel.js";
 import { Command, Event, STREAM_CHUNK_BYTES } from "./protocol.js";
 
-const pool = new TorrentPool({ maxDiskBytes: workerData?.maxDiskBytes });
+// Imported dynamically, and that is load-bearing: static imports are RESOLVED
+// during linking, before any module body runs, so a statically imported pool
+// would drag in WebTorrent — and with it the real `webrtc-polyfill` — before
+// the hook above had a chance to register. Verified the hard way: with a static
+// import the process still aborted, and the stack named the genuine polyfill.
+const { TorrentPool } = await import("../torrent-pool.js");
+const { collectStoreStats } = await import("../piece-store/shared-piece-store.js");
+
+const pool = new TorrentPool({
+  maxDiskBytes: workerData?.maxDiskBytes,
+  memoryBytes: workerData?.memoryBytes
+});
 
 /** Torrents by sourceKey — the main thread names them, this thread owns them. */
 const torrentsByKey = new Map();
@@ -262,4 +277,36 @@ parentPort.on("message", async (message) => {
   }
 });
 
+/**
+ * How often the piece store reports what it has been doing.
+ *
+ * The store decides whether a read costs nothing or costs a disk trip, and
+ * until 2.9.75 nothing about it reached the log — a field oddity would have had
+ * no evidence to work from. Reported only when something changed, so an idle
+ * proxy stays quiet.
+ */
+const STORE_REPORT_INTERVAL_MS = 60_000;
+
+/** Last reported figures per store, so unchanged ones stay silent. */
+const lastReported = new Map();
+
+setInterval(() => {
+  for (const stats of collectStoreStats()) {
+    const signature = `${stats.fromMemory}/${stats.fromDisk}/${stats.spills}/${stats.revivals}/${stats.blockedByPins}`;
+    if (lastReported.get(stats.name) === signature) {
+      continue;
+    }
+    lastReported.set(stats.name, signature);
+
+    const reads = stats.fromMemory + stats.fromDisk;
+    const fromMemoryShare = reads > 0 ? ((stats.fromMemory / reads) * 100).toFixed(1) : "—";
+    log(
+      `piece-store "${stats.name.slice(0, 40)}": resident=${stats.resident}/${stats.capacity} ` +
+      `spilled=${stats.spilled} reads=${reads} (${fromMemoryShare}% from memory) ` +
+      `spills=${stats.spills} revivals=${stats.revivals}` +
+      (stats.blockedByPins > 0 ? ` blocked-by-pins=${stats.blockedByPins}` : "")
+    );
+  }
+}, STORE_REPORT_INTERVAL_MS).unref();
+
 log("torrent worker started");