@torrent-tv/proxy 2.89.17 → 2.89.19

package/README.md

@@ -309,18 +309,29 @@ npm start -- --server-url http://localhost:3000
 
 ## Docker
 
+The image holds the npm package (built from `npm pack`, so `files` in
+`package.json` decides its contents), its production dependencies, node and
+ffmpeg. It starts the proxy on port 9090 with the image's ffmpeg and keeps its
+state in `/data`; arguments after the image name are passed to the proxy.
+
 ```bash
 docker build -t torrent-tv-proxy .
-docker run torrent-tv-proxy --server-url http://my-server:8080
+docker run --network host -v ttv-proxy:/data torrent-tv-proxy --server-url https://webauth.courses
 ```
 
+WebRTC uses UDP port 9090 beside the HTTP API on TCP 9090, and UPnP mapping
+needs the host's own address, so host networking is the supported setup.
+
 Without `--log-file` the log is only in `docker logs`, which recreating the
-container deletes. To keep it, put it on a volume:
+container deletes. To keep it, write it to the volume:
 
 ```bash
-docker run -v ttv-proxy-logs:/logs torrent-tv-proxy --server-url http://my-server:8080 --log-file /logs/proxy.log
+docker run --network host -v ttv-proxy:/data torrent-tv-proxy --server-url https://webauth.courses --log-file /data/proxy.log
 ```
 
+The image has no tcpdump and no gdb, and it runs as an unprivileged user, so
+packet captures and `--usrsctp-state` readings are not taken there.
+
 ## Full End-to-End Flow
 
 ```mermaid

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@torrent-tv/proxy",
-  "version": "2.89.17",
+  "version": "2.89.19",
   "description": "Torrent proxy client that exposes webseed-like HTTP stream endpoint.",
   "license": "GPL-3.0-or-later",
   "repository": {
@@ -17,6 +17,15 @@
   "bin": {
     "torrent-tv-proxy": "bin/cli.js"
   },
+  "files": [
+    "assets/",
+    "bin/",
+    "routes/",
+    "services/",
+    "store/",
+    "utils/",
+    "server.js"
+  ],
   "scripts": {
     "start": "node ./bin/cli.js",
     "dev": "node --inspect=0 --experimental-network-inspection ./bin/cli.js",
@@ -27,7 +36,6 @@
   "dependencies": {
     "@fastify/cors": "^11.2.0",
     "@fastify/helmet": "^13.0.2",
-    "@fastify/static": "^10.1.2",
     "@silentbot1/nat-api": "^0.4.9",
     "chalk": "^5.4.1",
     "commander": "^12.1.0",

package/server.js

@@ -9,11 +9,8 @@
 import Fastify from "fastify";
 import fastifyCors from "@fastify/cors";
 import fastifyHelmet from "@fastify/helmet";
-import fastifyStatic from "@fastify/static";
 import getPort from "get-port";
-import path from "node:path";
 import { createRequire } from "node:module";
-import { fileURLToPath } from "node:url";
 import { handleHealthGet } from "./routes/health/get.js";
 import { handleHealthzGet } from "./routes/healthz/get.js";
 import { handleApiDeliverySinkGet } from "./routes/api/delivery-sink/get.js";
@@ -64,11 +61,8 @@ import { benchmarkAudio } from "./services/encode/audio-calibration.js";
 import { logger } from "./utils/logger.js";
 import { completedFilesRoot } from "./services/storage/files/CompletedFiles.js";
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
 const require = createRequire(import.meta.url);
 const { version } = require("./package.json");
-const publicRoot = path.resolve(__dirname, "./public");
 
 /**
  * Build a list of candidate port numbers starting at `startPort`.
@@ -714,11 +708,6 @@ export async function startProxyServer({
   app.get("/transcode/:sessionId/v/:height/:fileName", async (req, reply) =>
     handleTranscodeVariantFileGet(req, reply, { renditions: outputParts.renditions, serving: outputParts.serving, viewerRequests: outputParts.viewerRequests })
   );
-  await app.register(fastifyStatic, {
-    root: publicRoot,
-    prefix: "/",
-    serveDotFiles: true
-  });
 
   app.addHook("onClose", async () => {
     // Order matters: stop the ffmpeg readers (HLS sessions) before destroying

package/utils/client-log-file.js

@@ -9,11 +9,12 @@
  * the evidence for exactly this reason.
  *
  * Written here instead, next to the proxy's own log, on the same durable
- * directory (`/data` on the addon host). One file per viewing session, named so
- * the two halves join without guessing: the session's start, then the torrent.
+ * directory (`/data` on the addon host). One file per viewing session and
+ * torrent, named so the two halves join without guessing: the session's start,
+ * then the torrent.
  */
 
-import { createWriteStream, mkdirSync, renameSync, statSync } from "node:fs";
+import { createWriteStream, fstatSync, mkdirSync, openSync, renameSync } from "node:fs";
 import { dirname, join } from "node:path";
 
 /**
@@ -82,45 +83,106 @@ function stamp(iso) {
  *
  * @param {string} proxyLogPath - The proxy's own log file; its directory is
  *   used, so the two halves are always side by side.
- * @returns {{ write: (session: object, lines: string[]) => void, close: () => void }}
+ * @returns {{ write: (session: object, lines: string[]) => void, close: () => Promise<void> }}
  */
 export function createClientLogFiles(proxyLogPath) {
   const directory = typeof proxyLogPath === "string" && proxyLogPath.length > 0
     ? dirname(proxyLogPath)
     : "";
-  /** @type {Map<string, { stream: import("node:fs").WriteStream, path: string, bytes: number }>} */
+  /**
+   * @typedef {object} OpenFile
+   * @property {import("node:fs").WriteStream} stream
+   * @property {string} path
+   * @property {number} bytes
+   * @property {string} prefix - `client-<start>-<session>`, the part every file
+   *   of one session shares, so they are found together.
+   * @property {string} film - Which torrent the name carries; empty while it
+   *   still says `no-torrent-yet`.
+   */
+  /** @type {Map<string, OpenFile>} */
   const open = new Map();
+  /**
+   * Files taken out of `open` whose last lines are still being flushed: a
+   * rotated file, and the file of a film the session has moved away from.
+   *
+   * @type {Set<Promise<void>>}
+   */
+  const ending = new Set();
 
   /**
-   * The file for this session, opened on first use.
+   * Finish a file that is no longer written to, and remember the wait so that
+   * `close()` does not return before its last lines are on disk.
    *
-   * Keyed by the session's own id rather than by the name, because the name
-   * gains the torrent the moment one is chosen and the earlier lines — the
-   * page opening, the proxy being chosen, a connection failing — belong to the
-   * same session and must not start a second file.
+   * @param {OpenFile} record
+   * @returns {void}
+   */
+  function finish(record) {
+    const done = new Promise((resolve) => {
+      try {
+        record.stream.end(() => resolve(undefined));
+      } catch {
+        // A stream that cannot be ended has nothing left to flush.
+        resolve(undefined);
+      }
+    });
+    ending.add(done);
+    void done.then(() => ending.delete(done));
+  }
+
+  /**
+   * Which torrent a batch names, or empty when none is chosen yet.
    *
-   * @param {{ sessionId: string, startedAt: string, torrentName: string, infoHash: string }} session
-   * @returns {{ stream: import("node:fs").WriteStream, path: string, bytes: number } | null}
+   * @param {{ torrentName: string, infoHash: string }} session
+   * @returns {string}
    */
-  function fileFor(session) {
-    if (!directory) return null;
-    const key = session.sessionId;
-    const existing = open.get(key);
-    if (existing) return existing;
+  function filmOf(session) {
+    if (!session.torrentName) return "";
+    return session.infoHash || session.torrentName;
+  }
+
+  /**
+   * @param {string} prefix
+   * @param {{ torrentName: string, infoHash: string }} session
+   * @returns {string}
+   */
+  function pathFor(prefix, session) {
     const film = session.torrentName
       ? `${safeName(session.torrentName, 60)}-${safeName(session.infoHash, 8)}`
       : "no-torrent-yet";
-    const path = join(directory, `client-${stamp(session.startedAt)}-${safeName(session.sessionId, 8)}-${film}.log`);
+    return join(directory, `${prefix}-${film}.log`);
+  }
+
+  /**
+   * Open a file for appending.
+   *
+   * The descriptor is opened synchronously and handed to the stream, so the
+   * file exists under its path before this returns. A stream that opens its
+   * own file does so later, and a rename made in between would leave the
+   * stream creating a second file under the old name.
+   *
+   * @param {string} key
+   * @param {string} prefix
+   * @param {{ torrentName: string, infoHash: string }} session
+   * @returns {OpenFile | null}
+   */
+  function openFile(key, prefix, session) {
+    const path = pathFor(prefix, session);
     try {
       mkdirSync(directory, { recursive: true });
+      const fd = openSync(path, "a");
+      /** @type {OpenFile} */
       const record = {
-        stream: createWriteStream(path, { flags: "a" }),
+        stream: createWriteStream(path, { fd }),
         path,
-        bytes: statSync(path, { throwIfNoEntry: false })?.size ?? 0
+        bytes: fstatSync(fd).size,
+        prefix,
+        film: filmOf(session)
       };
       // A file that stops being writable must not take the proxy down with it,
       // and must not be retried on every line.
-      record.stream.on("error", () => open.delete(key));
+      record.stream.on("error", () => {
+        if (open.get(key) === record) open.delete(key);
+      });
       open.set(key, record);
       return record;
     } catch {
@@ -128,6 +190,51 @@ export function createClientLogFiles(proxyLogPath) {
     }
   }
 
+  /**
+   * The file for this session, opened on first use.
+   *
+   * Keyed by the session's own id rather than by the name. The first batch
+   * always arrives before a torrent is chosen, and the lines it carries — the
+   * page opening, the proxy being chosen, a connection failing — belong to the
+   * film the session goes on to play. So the file is RENAMED when the first
+   * torrent arrives, and those lines stay in it.
+   *
+   * A different torrent chosen later in the same page starts a file of its
+   * own under the same prefix: renaming again would leave the first film's
+   * lines under the second film's name, where nobody looking for the first
+   * film finds them.
+   *
+   * @param {{ sessionId: string, startedAt: string, torrentName: string, infoHash: string }} session
+   * @returns {OpenFile | null}
+   */
+  function fileFor(session) {
+    if (!directory) return null;
+    const key = session.sessionId;
+    const film = filmOf(session);
+    const existing = open.get(key);
+    if (!existing) {
+      const prefix = `client-${stamp(session.startedAt)}-${safeName(session.sessionId, 8)}`;
+      return openFile(key, prefix, session);
+    }
+    if (film === "" || film === existing.film) return existing;
+    if (existing.film === "") {
+      const path = pathFor(existing.prefix, session);
+      try {
+        renameSync(existing.path, path);
+        existing.path = path;
+      } catch {
+        // The lines keep going to the file under its old name; a name that
+        // cannot change is better than a session's log lost to an exception.
+      }
+      // Set even when the rename failed, so it is not retried on every batch.
+      existing.film = film;
+      return existing;
+    }
+    open.delete(key);
+    finish(existing);
+    return openFile(key, existing.prefix, session);
+  }
+
   return {
     write(session, lines) {
       const record = fileFor(session);
@@ -138,40 +245,38 @@ export function createClientLogFiles(proxyLogPath) {
         record.stream.write(text);
       }
       if (record.bytes >= MAX_BYTES) {
+        // Renamed before it is ended: the stream writes through its own
+        // descriptor, so the lines still in flight follow the file to its new
+        // name, and the next batch opens a fresh file under the old one
+        // instead of appending to the file that is about to be moved.
         try {
-          record.stream.end(() => {
-            try {
-              renameSync(record.path, `${record.path}.1`);
-            } catch {
-              // Renaming a file that has gone leaves nothing to do.
-            }
-          });
+          renameSync(record.path, `${record.path}.1`);
         } catch {
-          // A rotation that cannot happen leaves the file growing, which is
-          // better than losing the session's log to an exception.
+          // A rotation that cannot happen leaves the file growing under its
+          // name, which is better than losing the session's log. It is tried
+          // again after as much again, not on every batch.
+          record.bytes = 0;
+          return;
         }
-        open.delete(session.sessionId);
+        if (open.get(session.sessionId) === record) open.delete(session.sessionId);
+        finish(record);
       }
     },
     /**
      * Finish every open file.
      *
-     * Awaitable, and that is not a convenience: a write stream opens and
-     * flushes asynchronously, so a process that ends without waiting loses the
-     * last lines of every session — which are the ones a crash is explained by.
+     * Awaitable, and that is not a convenience: a write stream flushes
+     * asynchronously, so a process that ends without waiting loses the last
+     * lines of every session — which are the ones a crash is explained by.
+     * That includes the files already set aside by a rotation or by a change
+     * of film.
      *
      * @returns {Promise<void>}
      */
     async close() {
-      const ending = [...open.values()].map((record) => new Promise((resolve) => {
-        try {
-          record.stream.end(resolve);
-        } catch {
-          resolve(undefined);
-        }
-      }));
+      for (const record of open.values()) finish(record);
       open.clear();
-      await Promise.all(ending);
+      await Promise.all([...ending]);
     }
   };
 }

package/.claude/commands/opsx/apply.md

@@ -1,155 +0,0 @@
----
-name: "OPSX: Apply"
-description: Implement tasks from an OpenSpec change (Experimental)
-category: Workflow
-tags: [workflow, artifacts, experimental]
----
-
-Implement tasks from an OpenSpec change.
-
-**Store selection:** If the user names a store (a store is a standalone OpenSpec repo registered on this machine) or the work lives in one, run `openspec store list --json` to discover registered store ids, then pass `--store <id>` on the commands that read or write specs and changes (`new change`, `status`, `instructions`, `list`, `show`, `validate`, `archive`, `doctor`, `context`). Other commands do not take the flag. Hints printed by commands already carry the flag; keep it on follow-ups. Without a store, commands act on the nearest local `openspec/` root.
-
-**Input**: Optionally specify a change name (e.g., `/opsx:apply add-auth`). If omitted, check if it can be inferred from conversation context. If vague or ambiguous you MUST prompt for available changes.
-
-**Steps**
-
-1. **Select the change**
-
-   If a name is provided, use it. Otherwise:
-   - Infer from conversation context if the user mentioned a change
-   - Auto-select if only one active change exists
-   - If ambiguous, run `openspec list --json` to get available changes and use the **AskUserQuestion tool** to let the user select
-
-   Always announce: "Using change: <name>" and how to override (e.g., `/opsx:apply <other>`).
-
-2. **Check status to understand the schema**
-   ```bash
-   openspec status --change "<name>" --json
-   ```
-   Parse the JSON to understand:
-   - `schemaName`: The workflow being used (e.g., "spec-driven")
-   - `planningHome`, `changeRoot`, and `actionContext`: planning scope and edit constraints
-   - Which artifact contains the tasks (typically "tasks" for spec-driven, check status for others)
-
-3. **Get apply instructions**
-
-   ```bash
-   openspec instructions apply --change "<name>" --json
-   ```
-
-   This returns:
-   - `contextFiles`: artifact ID -> array of concrete file paths (varies by schema)
-   - Progress (total, complete, remaining)
-   - Task list with status
-   - Dynamic instruction based on current state
-
-   **Handle states:**
-   - If `state: "blocked"` (missing artifacts): show message, suggest using `/opsx:continue`
-   - If `state: "all_done"`: congratulate, suggest archive
-   - Otherwise: proceed to implementation
-
-4. **Read context files**
-
-   Read every file path listed under `contextFiles` from the apply instructions output.
-   The files depend on the schema being used:
-   - **spec-driven**: proposal, specs, design, tasks
-   - Other schemas: follow the contextFiles from CLI output
-
-5. **Show current progress**
-
-   Display:
-   - Schema being used
-   - Progress: "N/M tasks complete"
-   - Remaining tasks overview
-   - Dynamic instruction from CLI
-
-6. **Implement tasks (loop until done or blocked)**
-
-   For each pending task:
-   - Show which task is being worked on
-   - Make the code changes required
-   - Keep changes minimal and focused
-   - Mark task complete in the tasks file: `- [ ]` → `- [x]`
-   - Continue to next task
-
-   **Pause if:**
-   - Task is unclear → ask for clarification
-   - Implementation reveals a design issue → suggest updating artifacts
-   - Error or blocker encountered → report and wait for guidance
-   - User interrupts
-
-7. **On completion or pause, show status**
-
-   Display:
-   - Tasks completed this session
-   - Overall progress: "N/M tasks complete"
-   - If all done: suggest archive
-   - If paused: explain why and wait for guidance
-
-**Output During Implementation**
-
-```
-## Implementing: <change-name> (schema: <schema-name>)
-
-Working on task 3/7: <task description>
-[...implementation happening...]
-✓ Task complete
-
-Working on task 4/7: <task description>
-[...implementation happening...]
-✓ Task complete
-```
-
-**Output On Completion**
-
-```
-## Implementation Complete
-
-**Change:** <change-name>
-**Schema:** <schema-name>
-**Progress:** 7/7 tasks complete ✓
-
-### Completed This Session
-- [x] Task 1
-- [x] Task 2
-...
-
-All tasks complete! You can archive this change with `/opsx:archive`.
-```
-
-**Output On Pause (Issue Encountered)**
-
-```
-## Implementation Paused
-
-**Change:** <change-name>
-**Schema:** <schema-name>
-**Progress:** 4/7 tasks complete
-
-### Issue Encountered
-<description of the issue>
-
-**Options:**
-1. <option 1>
-2. <option 2>
-3. Other approach
-
-What would you like to do?
-```
-
-**Guardrails**
-- Keep going through tasks until done or blocked
-- Always read context files before starting (from the apply instructions output)
-- If task is ambiguous, pause and ask before implementing
-- If implementation reveals issues, pause and suggest artifact updates
-- Keep code changes minimal and scoped to each task
-- Update task checkbox immediately after completing each task
-- Pause on errors, blockers, or unclear requirements - don't guess
-- Use contextFiles from CLI output, don't assume specific file names
-
-**Fluid Workflow Integration**
-
-This skill supports the "actions on a change" model:
-
-- **Can be invoked anytime**: Before all artifacts are done (if tasks exist), after partial implementation, interleaved with other actions
-- **Allows artifact updates**: If implementation reveals design issues, suggest updating artifacts - not phase-locked, work fluidly

package/.claude/commands/opsx/archive.md

@@ -1,160 +0,0 @@
----
-name: "OPSX: Archive"
-description: Archive a completed change in the experimental workflow
-category: Workflow
-tags: [workflow, archive, experimental]
----
-
-Archive a completed change in the experimental workflow.
-
-**Store selection:** If the user names a store (a store is a standalone OpenSpec repo registered on this machine) or the work lives in one, run `openspec store list --json` to discover registered store ids, then pass `--store <id>` on the commands that read or write specs and changes (`new change`, `status`, `instructions`, `list`, `show`, `validate`, `archive`, `doctor`, `context`). Other commands do not take the flag. Hints printed by commands already carry the flag; keep it on follow-ups. Without a store, commands act on the nearest local `openspec/` root.
-
-**Input**: Optionally specify a change name after `/opsx:archive` (e.g., `/opsx:archive add-auth`). If omitted, check if it can be inferred from conversation context. If vague or ambiguous you MUST prompt for available changes.
-
-**Steps**
-
-1. **If no change name provided, prompt for selection**
-
-   Run `openspec list --json` to get available changes. Use the **AskUserQuestion tool** to let the user select.
-
-   Show only active changes (not already archived).
-   Include the schema used for each change if available.
-
-   **IMPORTANT**: Do NOT guess or auto-select a change. Always let the user choose.
-
-2. **Check artifact completion status**
-
-   Run `openspec status --change "<name>" --json` to check artifact completion.
-
-   Parse the JSON to understand:
-   - `schemaName`: The workflow being used
-   - `planningHome`, `changeRoot`, `artifactPaths`, and `actionContext`: path and scope context
-   - `artifacts`: List of artifacts with their status (`done` or other)
-
-   **If any artifacts are not `done`:**
-   - Display warning listing incomplete artifacts
-   - Prompt user for confirmation to continue
-   - Proceed if user confirms
-
-3. **Check task completion status**
-
-   Read the tasks file (typically `tasks.md`) to check for incomplete tasks.
-
-   Count tasks marked with `- [ ]` (incomplete) vs `- [x]` (complete).
-
-   **If incomplete tasks found:**
-   - Display warning showing count of incomplete tasks
-   - Prompt user for confirmation to continue
-   - Proceed if user confirms
-
-   **If no tasks file exists:** Proceed without task-related warning.
-
-4. **Assess delta spec sync state**
-
-   Use `artifactPaths.specs.existingOutputPaths` from status JSON to check for delta specs. If none exist, proceed without sync prompt.
-
-   **If delta specs exist:**
-   - Compare each delta spec with its corresponding main spec at `openspec/specs/<capability>/spec.md`
-   - Determine what changes would be applied (adds, modifications, removals, renames)
-   - Show a combined summary before prompting
-
-   **Prompt options:**
-   - If changes needed: "Sync now (recommended)", "Archive without syncing"
-   - If already synced: "Archive now", "Sync anyway", "Cancel"
-
-   If user chooses sync, use Task tool (subagent_type: "general-purpose", prompt: "Use Skill tool to invoke openspec-sync-specs for change '<name>'. Delta spec analysis: <include the analyzed delta spec summary>"). Proceed to archive regardless of choice.
-
-5. **Perform the archive**
-
-   Create an `archive` directory under `planningHome.changesDir` if it doesn't exist:
-   ```bash
-   mkdir -p "<planningHome.changesDir>/archive"
-   ```
-
-   Generate target name using current date: `YYYY-MM-DD-<change-name>`
-
-   **Check if target already exists:**
-   - If yes: Fail with error, suggest renaming existing archive or using different date
-   - If no: Move `changeRoot` to the archive directory
-
-   ```bash
-   mv "<changeRoot>" "<planningHome.changesDir>/archive/YYYY-MM-DD-<name>"
-   ```
-
-6. **Display summary**
-
-   Show archive completion summary including:
-   - Change name
-   - Schema that was used
-   - Archive location
-   - Spec sync status (synced / sync skipped / no delta specs)
-   - Note about any warnings (incomplete artifacts/tasks)
-
-**Output On Success**
-
-```
-## Archive Complete
-
-**Change:** <change-name>
-**Schema:** <schema-name>
-**Archived to:** the archive path derived from `planningHome.changesDir`/YYYY-MM-DD-<name>/
-**Specs:** ✓ Synced to main specs
-
-All artifacts complete. All tasks complete.
-```
-
-**Output On Success (No Delta Specs)**
-
-```
-## Archive Complete
-
-**Change:** <change-name>
-**Schema:** <schema-name>
-**Archived to:** the archive path derived from `planningHome.changesDir`/YYYY-MM-DD-<name>/
-**Specs:** No delta specs
-
-All artifacts complete. All tasks complete.
-```
-
-**Output On Success With Warnings**
-
-```
-## Archive Complete (with warnings)
-
-**Change:** <change-name>
-**Schema:** <schema-name>
-**Archived to:** the archive path derived from `planningHome.changesDir`/YYYY-MM-DD-<name>/
-**Specs:** Sync skipped (user chose to skip)
-
-**Warnings:**
-- Archived with 2 incomplete artifacts
-- Archived with 3 incomplete tasks
-- Delta spec sync was skipped (user chose to skip)
-
-Review the archive if this was not intentional.
-```
-
-**Output On Error (Archive Exists)**
-
-```
-## Archive Failed
-
-**Change:** <change-name>
-**Target:** the archive path derived from `planningHome.changesDir`/YYYY-MM-DD-<name>/
-
-Target archive directory already exists.
-
-**Options:**
-1. Rename the existing archive
-2. Delete the existing archive if it's a duplicate
-3. Wait until a different date to archive
-```
-
-**Guardrails**
-- Always prompt for change selection if not provided
-- Use artifact graph (openspec status --json) for completion checking
-- Don't block archive on warnings - just inform and confirm
-- Preserve .openspec.yaml when moving to archive (it moves with the directory)
-- Show clear summary of what happened
-- If sync is requested, use the Skill tool to invoke `openspec-sync-specs` (agent-driven)
-- If delta specs exist, always run the sync assessment and show the combined summary before prompting