@torrent-tv/proxy 2.88.2 → 2.88.4

package/services/encode/torrent-cost.js

@@ -1,88 +1,88 @@
-/**
- * @file What the torrent itself costs this machine, per megabyte it moves.
- *
- * Downloading, verifying every piece and pushing segments down a data channel
- * are work on the same box as the encoder, and they scale with what is moved.
- * The reading is taken only while nothing is encoding, because that is the one
- * moment the spending needs no arithmetic to attribute: what the process uses
- * then is the torrent's.
- *
- * Except that it is not all the torrent's, and that is what this file exists
- * for. Measured on the addon host 2026-08-18, one session reported **145.4 ms
- * per megabyte over 8.7 MB** and **23.1 ms per megabyte over 54 MB** — the same
- * host, the same minute, a sixfold disagreement that follows the size of the
- * interval rather than anything about the torrent. A process with nothing to do
- * still runs its timers, its tunnel and its session sweeps, and that draw does
- * not shrink when fewer megabytes move: divided by a small number it swamps the
- * answer. A minimum-megabytes threshold stood against exactly this and did not
- * hold, because a chosen number was standing in for a measured one.
- *
- * The draw is measurable. An interval in which nothing encodes and the torrents
- * move no bytes at all costs whatever this process spends anyway; subtract that
- * from an interval which did move bytes, and what remains is the torrent's.
- */
-
-/**
- * The share of one core this process draws while it has nothing to do.
- *
- * @param {{ cpuSeconds: number, elapsedSeconds: number }} interval - CPU seconds
- *   already divided by the number of cores, so the figure is comparable with
- *   the wall seconds every other cost in the budget is stated in.
- * @returns {number | null} Null when the interval cannot be divided.
- */
-export function baseDrawFrom({ cpuSeconds, elapsedSeconds }) {
-  if (!Number.isFinite(cpuSeconds) || !Number.isFinite(elapsedSeconds) || !(elapsedSeconds > 0)) {
-    return null;
-  }
-  if (!(cpuSeconds >= 0)) {
-    return null;
-  }
-  return cpuSeconds / elapsedSeconds;
-}
-
-/**
- * What one megabyte cost, once the draw that would have been spent anyway is
- * taken off.
- *
- * The draw is subtracted, so what is left is only as certain as the draw is.
- * The draw's own readings disagree with each other by a measured amount, and
- * over an interval that disagreement is worth `scatter × elapsed` seconds of
- * CPU: a reading whose remainder is smaller than that measures the wobble in
- * the subtraction rather than the torrent. This is what the removed
- * minimum-megabytes threshold was reaching for, arrived at from the readings
- * instead of from a chosen size — a small interval fails it because little was
- * moved in it, and a large one passes on the same arithmetic.
- *
- * @param {{ cpuSeconds: number, elapsedSeconds: number, megabytes: number, baseDraw: number | null, drawScatter?: number | null }} interval
- * @returns {number | null} Seconds of work per megabyte, or null when this
- *   interval cannot say — no base draw measured yet, nothing moved, or the
- *   interval spent no more than the draw and its own uncertainty account for.
- */
-export function costPerMegabyteFrom({ cpuSeconds, elapsedSeconds, megabytes, baseDraw, drawScatter = null }) {
-  if (!Number.isFinite(cpuSeconds) || !Number.isFinite(elapsedSeconds) || !(elapsedSeconds > 0)) {
-    return null;
-  }
-  if (!Number.isFinite(megabytes) || !(megabytes > 0)) {
-    return null;
-  }
-  if (!Number.isFinite(baseDraw) || !(baseDraw >= 0)) {
-    // Nothing measured to subtract. Publishing the whole spending as the
-    // torrent's is what produced the 145 ms/MB reading, so this interval says
-    // nothing instead.
-    return null;
-  }
-  const attributable = cpuSeconds - baseDraw * elapsedSeconds;
-  if (!(attributable > 0)) {
-    // The draw accounts for everything this interval spent. Not a discovery
-    // that the torrent is free — a reading with nothing left in it.
-    return null;
-  }
-  const uncertainty = Number.isFinite(drawScatter) && drawScatter > 0 ? drawScatter * elapsedSeconds : 0;
-  if (!(attributable > uncertainty)) {
-    // What is left is inside the disagreement between the draw's own readings.
-    // Dividing it by a small number of megabytes is how 145 ms/MB was reported
-    // on a host that costs 23.
-    return null;
-  }
-  return attributable / megabytes;
-}
+/**
+ * @file What the torrent itself costs this machine, per megabyte it moves.
+ *
+ * Downloading, verifying every piece and pushing segments down a data channel
+ * are work on the same box as the encoder, and they scale with what is moved.
+ * The reading is taken only while nothing is encoding, because that is the one
+ * moment the spending needs no arithmetic to attribute: what the process uses
+ * then is the torrent's.
+ *
+ * Except that it is not all the torrent's, and that is what this file exists
+ * for. Measured on the addon host 2026-08-18, one session reported **145.4 ms
+ * per megabyte over 8.7 MB** and **23.1 ms per megabyte over 54 MB** — the same
+ * host, the same minute, a sixfold disagreement that follows the size of the
+ * interval rather than anything about the torrent. A process with nothing to do
+ * still runs its timers, its tunnel and its session sweeps, and that draw does
+ * not shrink when fewer megabytes move: divided by a small number it swamps the
+ * answer. A minimum-megabytes threshold stood against exactly this and did not
+ * hold, because a chosen number was standing in for a measured one.
+ *
+ * The draw is measurable. An interval in which nothing encodes and the torrents
+ * move no bytes at all costs whatever this process spends anyway; subtract that
+ * from an interval which did move bytes, and what remains is the torrent's.
+ */
+
+/**
+ * The share of one core this process draws while it has nothing to do.
+ *
+ * @param {{ cpuSeconds: number, elapsedSeconds: number }} interval - CPU seconds
+ *   already divided by the number of cores, so the figure is comparable with
+ *   the wall seconds every other cost in the budget is stated in.
+ * @returns {number | null} Null when the interval cannot be divided.
+ */
+export function baseDrawFrom({ cpuSeconds, elapsedSeconds }) {
+  if (!Number.isFinite(cpuSeconds) || !Number.isFinite(elapsedSeconds) || !(elapsedSeconds > 0)) {
+    return null;
+  }
+  if (!(cpuSeconds >= 0)) {
+    return null;
+  }
+  return cpuSeconds / elapsedSeconds;
+}
+
+/**
+ * What one megabyte cost, once the draw that would have been spent anyway is
+ * taken off.
+ *
+ * The draw is subtracted, so what is left is only as certain as the draw is.
+ * The draw's own readings disagree with each other by a measured amount, and
+ * over an interval that disagreement is worth `scatter × elapsed` seconds of
+ * CPU: a reading whose remainder is smaller than that measures the wobble in
+ * the subtraction rather than the torrent. This is what the removed
+ * minimum-megabytes threshold was reaching for, arrived at from the readings
+ * instead of from a chosen size — a small interval fails it because little was
+ * moved in it, and a large one passes on the same arithmetic.
+ *
+ * @param {{ cpuSeconds: number, elapsedSeconds: number, megabytes: number, baseDraw: number | null, drawScatter?: number | null }} interval
+ * @returns {number | null} Seconds of work per megabyte, or null when this
+ *   interval cannot say — no base draw measured yet, nothing moved, or the
+ *   interval spent no more than the draw and its own uncertainty account for.
+ */
+export function costPerMegabyteFrom({ cpuSeconds, elapsedSeconds, megabytes, baseDraw, drawScatter = null }) {
+  if (!Number.isFinite(cpuSeconds) || !Number.isFinite(elapsedSeconds) || !(elapsedSeconds > 0)) {
+    return null;
+  }
+  if (!Number.isFinite(megabytes) || !(megabytes > 0)) {
+    return null;
+  }
+  if (!Number.isFinite(baseDraw) || !(baseDraw >= 0)) {
+    // Nothing measured to subtract. Publishing the whole spending as the
+    // torrent's is what produced the 145 ms/MB reading, so this interval says
+    // nothing instead.
+    return null;
+  }
+  const attributable = cpuSeconds - baseDraw * elapsedSeconds;
+  if (!(attributable > 0)) {
+    // The draw accounts for everything this interval spent. Not a discovery
+    // that the torrent is free — a reading with nothing left in it.
+    return null;
+  }
+  const uncertainty = Number.isFinite(drawScatter) && drawScatter > 0 ? drawScatter * elapsedSeconds : 0;
+  if (!(attributable > uncertainty)) {
+    // What is left is inside the disagreement between the draw's own readings.
+    // Dividing it by a small number of megabytes is how 145 ms/MB was reported
+    // on a host that costs 23.
+    return null;
+  }
+  return attributable / megabytes;
+}

package/services/identity/installation-id.js

@@ -1,38 +1,38 @@
-import { randomUUID } from "node:crypto";
-import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
-import path from "node:path";
-
-const ID_FILE = "proxy-identity.json";
-
-/**
- * Resolve this installation's registry id. Without a state directory the id
- * remains ephemeral; with one, the id survives process restarts.
- *
- * @param {{ stateDir?: string, explicitId?: string, makeId?: () => string }} options
- * @returns {string}
- */
-export function installationId({ stateDir, explicitId, makeId = randomUUID } = {}) {
-  const requestedId = typeof explicitId === "string" ? explicitId.trim() : "";
-  if (!stateDir) {
-    return requestedId || makeId();
-  }
-
-  const file = path.join(stateDir, ID_FILE);
-  let savedId = "";
-  if (existsSync(file)) {
-    const saved = JSON.parse(readFileSync(file, "utf8"));
-    savedId = typeof saved?.id === "string" ? saved.id.trim() : "";
-    if (!savedId) {
-      throw new Error(`Invalid proxy identity file: ${file}`);
-    }
-  }
-
-  const id = requestedId || savedId || makeId();
-  if (id !== savedId) {
-    mkdirSync(stateDir, { recursive: true });
-    const temporary = `${file}.${process.pid}.tmp`;
-    writeFileSync(temporary, `${JSON.stringify({ id })}\n`, { mode: 0o600 });
-    renameSync(temporary, file);
-  }
-  return id;
-}
+import { randomUUID } from "node:crypto";
+import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import path from "node:path";
+
+const ID_FILE = "proxy-identity.json";
+
+/**
+ * Resolve this installation's registry id. Without a state directory the id
+ * remains ephemeral; with one, the id survives process restarts.
+ *
+ * @param {{ stateDir?: string, explicitId?: string, makeId?: () => string }} options
+ * @returns {string}
+ */
+export function installationId({ stateDir, explicitId, makeId = randomUUID } = {}) {
+  const requestedId = typeof explicitId === "string" ? explicitId.trim() : "";
+  if (!stateDir) {
+    return requestedId || makeId();
+  }
+
+  const file = path.join(stateDir, ID_FILE);
+  let savedId = "";
+  if (existsSync(file)) {
+    const saved = JSON.parse(readFileSync(file, "utf8"));
+    savedId = typeof saved?.id === "string" ? saved.id.trim() : "";
+    if (!savedId) {
+      throw new Error(`Invalid proxy identity file: ${file}`);
+    }
+  }
+
+  const id = requestedId || savedId || makeId();
+  if (id !== savedId) {
+    mkdirSync(stateDir, { recursive: true });
+    const temporary = `${file}.${process.pid}.tmp`;
+    writeFileSync(temporary, `${JSON.stringify({ id })}\n`, { mode: 0o600 });
+    renameSync(temporary, file);
+  }
+  return id;
+}

package/services/media/ContainerOrchestrator.js

@@ -1,149 +1,149 @@
-/**
- * @file Container orchestrator — application layer over Container domain.
- *
- * Holds a per-file cache of Container instances (key sourceKey:fileIndex) so
- * Tracks and keyframe index are read once per file, not per request.
- * Delegates format detection to ContainerFactory. Transport-agnostic — takes
- * readRange, knows nothing about torrents or HTTP.
- */
-
-import { ContainerFactory } from "./container/ContainerFactory.js";
-
-/**
- * How much of a file's head its track table lives in.
- *
- * A fact of the FORMATS, not of the torrent: Matroska puts its Tracks element
- * in the head and MP4's `moov` is there or pointed to from there. Whoever
- * fetches bytes before asking is told this figure rather than choosing one.
- */
-export const CONTAINER_HEAD_BYTES = 256 * 1024;
-import { logger } from "../../utils/logger.js";
-
-export class ContainerOrchestrator {
-  constructor() {
-    /** @type {Map<string, import("./container/Container.js").Container|null>} */
-    this.cache = new Map();
-    /** @type {Map<string, Promise<import("./container/Container.js").Container|null>>} */
-    this.pending = new Map();
-    /**
-     * What each file's container declares, once it has said anything.
-     *
-     * The container parses on every ask, so without this the header is read
-     * again for each question — and the track table is asked for the audio
-     * menu, the subtitle defaults and the video facts of one file. It used to
-     * be kept in the torrent thread (`torrent-worker/container-tracks.js`), which is where the
-     * parse used to happen; it is the same one cache in its new place, not a
-     * second one.
-     *
-     * @type {Map<string, import("./tracks/index.js").ContainerTrack[]>}
-     */
-    this.tracks = new Map();
-  }
-
-  /**
-   * @param {object} params
-   * @param {string} params.sourceKey
-   * @param {number} params.fileIndex
-   * @param {(start:number,end:number)=>Promise<Buffer|null>} params.readRange
-   * @param {number} params.fileSize
-   * @param {string} [params.label]
-   * @returns {Promise<import("./container/Container.js").Container|null>}
-   */
-  async getContainer({ sourceKey, fileIndex, readRange, fileSize, label = "" }) {
-    const key = `${sourceKey}:${fileIndex}`;
-    if (this.cache.has(key)) return this.cache.get(key);
-    if (this.pending.has(key)) return this.pending.get(key);
-    const p = ContainerFactory.create({ readRange, fileSize, label }).then((c) => {
-      this.cache.set(key, c);
-      this.pending.delete(key);
-      if (c) logger.info(`container: ${c.formatName} for "${label}"`);
-      else logger.info(`container: unknown for "${label}"`);
-      return c;
-    }).catch((e) => {
-      this.pending.delete(key);
-      logger.warn(`container: failed for "${label}": ${e?.message ?? e}`);
-      return null;
-    });
-    this.pending.set(key, p);
-    return p;
-  }
-
-  /**
-   * @param {object} params - same as getContainer
-   * @returns {Promise<import("./tracks/index.js").ContainerTrack[]>}
-   */
-  async getTracks(params) {
-    const key = `${params.sourceKey}:${params.fileIndex}`;
-    const known = this.tracks.get(key);
-    if (known) {
-      return known;
-    }
-    const container = await this.getContainer(params);
-    if (!container) return [];
-    try {
-      const tracks = await container.readTracks();
-      // ONLY A NON-EMPTY READING IS KEPT. An empty one usually means the header
-      // has not arrived off the swarm yet, and caching that would answer "this
-      // file declares nothing" for the life of the process — which is what
-      // decides whether the viewer is offered a soundtrack at all.
-      if (Array.isArray(tracks) && tracks.length > 0) {
-        this.tracks.set(key, tracks);
-        return tracks;
-      }
-      return Array.isArray(tracks) ? tracks : [];
-    } catch (e) {
-      logger.warn(`container: readTracks failed for "${params.label}": ${e?.message ?? e}`);
-      return [];
-    }
-  }
-
-  /**
-   * What the file declares about itself as a whole — format, duration, and
-   * where its own timeline begins.
-   *
-   * Read once per file, like the track table beside it, and from the same 64 KB
-   * of header. A `null` field means the container does not declare it, which is
-   * a final answer about the container.
-   *
-   * @param {object} params - same as getContainer
-   * @returns {Promise<import("./container/Container.js").ContainerMediaInfo|null>}
-   */
-  async getMediaInfo(params) {
-    const container = await this.getContainer(params);
-    if (!container) return null;
-    try {
-      return await container.readMediaInfo();
-    } catch (e) {
-      logger.warn(`container: readMediaInfo failed for "${params.label}": ${e?.message ?? e}`);
-      return null;
-    }
-  }
-
-  /**
-   * @param {object} params - same as getContainer
-   * @returns {Promise<{times:number[],tolerance:number}|null>}
-   */
-  async getKeyframeIndex(params) {
-    const container = await this.getContainer(params);
-    if (!container) return null;
-    try {
-      return await container.readKeyframeIndex();
-    } catch {
-      return null;
-    }
-  }
-
-  forget(sourceKey, fileIndex) {
-    if (fileIndex === undefined) {
-      for (const k of [...this.cache.keys()]) if (k.startsWith(`${sourceKey}:`)) this.cache.delete(k);
-      for (const k of [...this.pending.keys()]) if (k.startsWith(`${sourceKey}:`)) this.pending.delete(k);
-      for (const k of [...this.tracks.keys()]) if (k.startsWith(`${sourceKey}:`)) this.tracks.delete(k);
-      return;
-    }
-    this.cache.delete(`${sourceKey}:${fileIndex}`);
-    this.pending.delete(`${sourceKey}:${fileIndex}`);
-    this.tracks.delete(`${sourceKey}:${fileIndex}`);
-  }
-}
-
-export const containerOrchestrator = new ContainerOrchestrator();
+/**
+ * @file Container orchestrator — application layer over Container domain.
+ *
+ * Holds a per-file cache of Container instances (key sourceKey:fileIndex) so
+ * Tracks and keyframe index are read once per file, not per request.
+ * Delegates format detection to ContainerFactory. Transport-agnostic — takes
+ * readRange, knows nothing about torrents or HTTP.
+ */
+
+import { ContainerFactory } from "./container/ContainerFactory.js";
+
+/**
+ * How much of a file's head its track table lives in.
+ *
+ * A fact of the FORMATS, not of the torrent: Matroska puts its Tracks element
+ * in the head and MP4's `moov` is there or pointed to from there. Whoever
+ * fetches bytes before asking is told this figure rather than choosing one.
+ */
+export const CONTAINER_HEAD_BYTES = 256 * 1024;
+import { logger } from "../../utils/logger.js";
+
+export class ContainerOrchestrator {
+  constructor() {
+    /** @type {Map<string, import("./container/Container.js").Container|null>} */
+    this.cache = new Map();
+    /** @type {Map<string, Promise<import("./container/Container.js").Container|null>>} */
+    this.pending = new Map();
+    /**
+     * What each file's container declares, once it has said anything.
+     *
+     * The container parses on every ask, so without this the header is read
+     * again for each question — and the track table is asked for the audio
+     * menu, the subtitle defaults and the video facts of one file. It used to
+     * be kept in the torrent thread (`torrent-worker/container-tracks.js`), which is where the
+     * parse used to happen; it is the same one cache in its new place, not a
+     * second one.
+     *
+     * @type {Map<string, import("./tracks/index.js").ContainerTrack[]>}
+     */
+    this.tracks = new Map();
+  }
+
+  /**
+   * @param {object} params
+   * @param {string} params.sourceKey
+   * @param {number} params.fileIndex
+   * @param {(start:number,end:number)=>Promise<Buffer|null>} params.readRange
+   * @param {number} params.fileSize
+   * @param {string} [params.label]
+   * @returns {Promise<import("./container/Container.js").Container|null>}
+   */
+  async getContainer({ sourceKey, fileIndex, readRange, fileSize, label = "" }) {
+    const key = `${sourceKey}:${fileIndex}`;
+    if (this.cache.has(key)) return this.cache.get(key);
+    if (this.pending.has(key)) return this.pending.get(key);
+    const p = ContainerFactory.create({ readRange, fileSize, label }).then((c) => {
+      this.cache.set(key, c);
+      this.pending.delete(key);
+      if (c) logger.info(`container: ${c.formatName} for "${label}"`);
+      else logger.info(`container: unknown for "${label}"`);
+      return c;
+    }).catch((e) => {
+      this.pending.delete(key);
+      logger.warn(`container: failed for "${label}": ${e?.message ?? e}`);
+      return null;
+    });
+    this.pending.set(key, p);
+    return p;
+  }
+
+  /**
+   * @param {object} params - same as getContainer
+   * @returns {Promise<import("./tracks/index.js").ContainerTrack[]>}
+   */
+  async getTracks(params) {
+    const key = `${params.sourceKey}:${params.fileIndex}`;
+    const known = this.tracks.get(key);
+    if (known) {
+      return known;
+    }
+    const container = await this.getContainer(params);
+    if (!container) return [];
+    try {
+      const tracks = await container.readTracks();
+      // ONLY A NON-EMPTY READING IS KEPT. An empty one usually means the header
+      // has not arrived off the swarm yet, and caching that would answer "this
+      // file declares nothing" for the life of the process — which is what
+      // decides whether the viewer is offered a soundtrack at all.
+      if (Array.isArray(tracks) && tracks.length > 0) {
+        this.tracks.set(key, tracks);
+        return tracks;
+      }
+      return Array.isArray(tracks) ? tracks : [];
+    } catch (e) {
+      logger.warn(`container: readTracks failed for "${params.label}": ${e?.message ?? e}`);
+      return [];
+    }
+  }
+
+  /**
+   * What the file declares about itself as a whole — format, duration, and
+   * where its own timeline begins.
+   *
+   * Read once per file, like the track table beside it, and from the same 64 KB
+   * of header. A `null` field means the container does not declare it, which is
+   * a final answer about the container.
+   *
+   * @param {object} params - same as getContainer
+   * @returns {Promise<import("./container/Container.js").ContainerMediaInfo|null>}
+   */
+  async getMediaInfo(params) {
+    const container = await this.getContainer(params);
+    if (!container) return null;
+    try {
+      return await container.readMediaInfo();
+    } catch (e) {
+      logger.warn(`container: readMediaInfo failed for "${params.label}": ${e?.message ?? e}`);
+      return null;
+    }
+  }
+
+  /**
+   * @param {object} params - same as getContainer
+   * @returns {Promise<{times:number[],tolerance:number}|null>}
+   */
+  async getKeyframeIndex(params) {
+    const container = await this.getContainer(params);
+    if (!container) return null;
+    try {
+      return await container.readKeyframeIndex();
+    } catch {
+      return null;
+    }
+  }
+
+  forget(sourceKey, fileIndex) {
+    if (fileIndex === undefined) {
+      for (const k of [...this.cache.keys()]) if (k.startsWith(`${sourceKey}:`)) this.cache.delete(k);
+      for (const k of [...this.pending.keys()]) if (k.startsWith(`${sourceKey}:`)) this.pending.delete(k);
+      for (const k of [...this.tracks.keys()]) if (k.startsWith(`${sourceKey}:`)) this.tracks.delete(k);
+      return;
+    }
+    this.cache.delete(`${sourceKey}:${fileIndex}`);
+    this.pending.delete(`${sourceKey}:${fileIndex}`);
+    this.tracks.delete(`${sourceKey}:${fileIndex}`);
+  }
+}
+
+export const containerOrchestrator = new ContainerOrchestrator();