@torrent-tv/proxy 2.6.0 → 2.6.4

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.6.3
+
+- **Fix**: Data channel handler now logs **all** requests regardless of body presence — `GET /transcode/…`, `GET /api/…/progress`, `GET /api/…/stats` etc. were previously invisible in logs. Non-2xx response statuses and fetch errors are also logged, enabling diagnosis of HLS manifest load failures.
+
+## 2.6.1
+
+- **Fix**: `TorrentPool.getTorrent()` — eliminated a race condition where two concurrent requests for the same torrent both found the cache empty and both called `client.add()`, causing WebTorrent to throw "Cannot add duplicate torrent". In-flight promises are now cached in a private `#pending` map; subsequent requests for the same key join the existing promise instead of triggering a second `client.add()`.
+
 ## 2.5.15
 
 - **New**: `GET /api/sources/:sourceKey/stats?fileIndex=N` — returns live torrent stats: connected peer count, download/upload speed, per-file download progress and size. Used by the browser to show meaningful feedback while waiting for file metadata.

package/package.json

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

package/services/data-channel-handler.js

@@ -143,9 +143,9 @@ export function createDataChannelHandler({ proxyPort, onLog }) {
       return;
     }
 
-    if (body != null && typeof body === "string" && body.length > 0) {
-      log(`[dc] ${method} ${path} body=${body.length} bytes`);
-    }
+    const queryInfo = query ? `?${query}` : "";
+    const bodyInfo = body != null && typeof body === "string" && body.length > 0 ? ` body=${body.length} bytes` : "";
+    log(`[dc] ${method} ${path}${queryInfo}${bodyInfo}`);
 
     const targetUrl = `http://127.0.0.1:${proxyPort}${path}${query ? `?${query}` : ""}`;
     const requestHeaders = { ...(forwardedHeaders ?? {}), host: `127.0.0.1:${proxyPort}` };
@@ -159,10 +159,15 @@ export function createDataChannelHandler({ proxyPort, onLog }) {
         redirect: "manual"
       });
     } catch (fetchError) {
+      log(`[dc] ${method} ${path}${queryInfo} → error: ${fetchError?.message ?? String(fetchError)}`);
       send(channel, { type: "response-error", requestId, error: fetchError?.message ?? String(fetchError) });
       return;
     }
 
+    if (response.status !== 200 && response.status !== 206) {
+      log(`[dc] ${method} ${path}${queryInfo} → ${response.status}`);
+    }
+
     /** @type {Record<string, string>} */
     const responseHeaders = {};
     for (const [name, value] of response.headers.entries()) {

package/services/torrent-pool.js

@@ -36,6 +36,15 @@ function decodeTorrentSource(sourceType, source) {
  * that only files with at least one active stream cause downloading.
  */
 export class TorrentPool {
+  /**
+   * In-flight `client.add()` promises keyed by the same key as `torrents`.
+   * Prevents duplicate `client.add()` calls when two requests arrive
+   * concurrently for the same torrent before the first one resolves.
+   *
+   * @type {Map<string, Promise<import("webtorrent").Torrent>>}
+   */
+  #pending = new Map();
+
   constructor() {
     /** @type {import("webtorrent").WebTorrent} */
     this.client = new WebTorrent();
@@ -70,26 +79,38 @@ export class TorrentPool {
    */
   async getTorrent(sourceType, source) {
     const key = `${sourceType}:${crypto.createHash("sha1").update(source).digest("hex")}`;
+
+    // Already resolved — return immediately.
     const existing = this.torrents.get(key);
     if (existing) {
       return existing;
     }
 
+    // In-flight — a concurrent request already called client.add() for the
+    // same torrent; join that promise instead of calling add() again.
+    const inFlight = this.#pending.get(key);
+    if (inFlight) {
+      return inFlight;
+    }
+
     const torrentId = decodeTorrentSource(sourceType, source);
-    const torrent = await new Promise((resolve, reject) => {
+    const promise = new Promise((resolve, reject) => {
       const onError = (error) => {
         this.client.off("error", onError);
+        this.#pending.delete(key);
         reject(error);
       };
       this.client.once("error", onError);
       this.client.add(torrentId, (readyTorrent) => {
         this.client.off("error", onError);
+        this.torrents.set(key, readyTorrent);
+        this.#pending.delete(key);
         resolve(readyTorrent);
       });
     });
 
-    this.torrents.set(key, torrent);
-    return torrent;
+    this.#pending.set(key, promise);
+    return promise;
   }
 
   /**