@torrent-tv/proxy 2.83.3 → 2.83.4

package/services/torrent-worker/file-claims.js

@@ -1,91 +0,0 @@
-/**
- * @file Who is holding which file open.
- *
- * A claim keeps a file's data from being removed while something is reading it.
- * Until 2.9.77 claims were keyed by `sourceKey:fileIndex`, which quietly made
- * them **shared**: a second reader of the same file found the key taken and
- * added nothing, so the first reader to finish released the claim out from
- * under the second. The proxy reads one file from several places at once —
- * ffmpeg's input, the keyframe index, the codec probe, a second viewer — so
- * this was the normal case, not an edge one.
- *
- * The fix is not a counter. A counter restores the arithmetic but keeps the
- * ambiguity: a release names a file, not a claim, so a duplicate or late
- * release still decrements someone else's hold and nothing can detect it. Here
- * every claim gets its own identity and a release names exactly that claim —
- * so a stray release matches nothing, is reported, and harms no one.
- */
-
-/**
- * @typedef {object} FileClaims
- * @property {(sourceKey: string, fileIndex: number, release: () => void) => string} open
- * @property {(claimId: string) => boolean} close
- * @property {() => void} closeAll
- * @property {number} size
- */
-
-/**
- * Track file claims by identity.
- *
- * @returns {FileClaims}
- */
-export function createFileClaims() {
-  /** Claim id → the function that releases that one claim. */
-  const claims = new Map();
-  let counter = 0;
-
-  return {
-    /**
-     * Record a new claim and return its identity.
-     *
-     * Each call is a distinct claim even for the same file — that is the whole
-     * point.
-     *
-     * @param {string} sourceKey
-     * @param {number} fileIndex
-     * @param {() => void} release
-     * @returns {string}
-     */
-    open(sourceKey, fileIndex, release) {
-      counter += 1;
-      // The file is in the id purely so a log line reads usefully; matching is
-      // on the whole string.
-      const claimId = `${sourceKey}:${fileIndex}:${counter}`;
-      claims.set(claimId, release);
-      return claimId;
-    },
-
-    /**
-     * Release one claim. Returns false when there was no such claim, which is
-     * worth logging: it means a release arrived twice, or after teardown.
-     *
-     * @param {string} claimId
-     * @returns {boolean}
-     */
-    close(claimId) {
-      const release = claims.get(claimId);
-      if (!release) {
-        return false;
-      }
-      claims.delete(claimId);
-      release();
-      return true;
-    },
-
-    /**
-     * Release everything — the worker is shutting down.
-     *
-     * @returns {void}
-     */
-    closeAll() {
-      for (const [, release] of claims) {
-        release();
-      }
-      claims.clear();
-    },
-
-    get size() {
-      return claims.size;
-    }
-  };
-}

package/test/file-claims.test.js

@@ -1,64 +0,0 @@
-/**
- * @file File claims must be held per reader, not per file.
- *
- * The proxy reads one file from several places at once — ffmpeg's input, the
- * keyframe index, the codec probe, a second viewer. Keying claims by file made
- * them shared, so the first reader to finish released the hold while the others
- * were still reading, and the file's data could then be removed under them.
- */
-
-import test from "node:test";
-import assert from "node:assert/strict";
-import { createFileClaims } from "../services/torrent-worker/file-claims.js";
-
-test("two readers of one file hold two claims", () => {
-  const claims = createFileClaims();
-  let released = 0;
-
-  const first = claims.open("source", 0, () => (released += 1));
-  const second = claims.open("source", 0, () => (released += 1));
-
-  assert.notEqual(first, second, "the second reader reused the first one's claim");
-  assert.equal(claims.size, 2);
-
-  claims.close(first);
-  assert.equal(released, 1, "closing one claim released more than one hold");
-  assert.equal(claims.size, 1, "the second reader's claim went with the first");
-
-  claims.close(second);
-  assert.equal(released, 2);
-  assert.equal(claims.size, 0);
-});
-
-test("a repeated release affects nothing and reports itself", () => {
-  const claims = createFileClaims();
-  let released = 0;
-  const claimId = claims.open("source", 3, () => (released += 1));
-
-  assert.equal(claims.close(claimId), true);
-  assert.equal(claims.close(claimId), false, "a second release was accepted as valid");
-  assert.equal(released, 1, "the hold was released twice");
-});
-
-test("a release naming nothing is rejected rather than guessed at", () => {
-  const claims = createFileClaims();
-  let released = 0;
-  claims.open("source", 0, () => (released += 1));
-
-  assert.equal(claims.close("source:0:999"), false);
-  assert.equal(released, 0, "an unknown claim released a real hold");
-  assert.equal(claims.size, 1);
-});
-
-test("teardown releases every outstanding claim", () => {
-  const claims = createFileClaims();
-  let released = 0;
-  claims.open("a", 0, () => (released += 1));
-  claims.open("a", 1, () => (released += 1));
-  claims.open("b", 0, () => (released += 1));
-
-  claims.closeAll();
-
-  assert.equal(released, 3);
-  assert.equal(claims.size, 0);
-});