@torrent-tv/proxy 2.83.5 → 2.83.7

package/services/viewer/Viewers.js

@@ -201,6 +201,50 @@ export class Viewers {
     return true;
   }
 
+  /**
+   * This viewer has subtitles switched on for this file.
+   *
+   * Said by the request that turns them on, which is the only place that knows
+   * both the person and the file. Registering it here rather than against a
+   * channel is what makes it survive a reconnect and a deliberate rotation of
+   * the association.
+   *
+   * @param {string} consumerId
+   * @param {string} sourceKey
+   * @param {number} fileIndex
+   * @returns {boolean} Whether anybody by that name is known to want them.
+   */
+  wantsCues(consumerId, sourceKey, fileIndex) {
+    const viewer = consumerId ? this.#byId.get(consumerId) : null;
+    if (!viewer || !sourceKey || !Number.isInteger(fileIndex)) {
+      return false;
+    }
+    viewer.wantsCuesFor.add(`${sourceKey}:${fileIndex}`);
+    return true;
+  }
+
+  /**
+   * Who has subtitles switched on for this file.
+   *
+   * The answer is a list of NAMES. Whoever delivers to them resolves a name to
+   * whatever channel that person is reachable on right now, which is the whole
+   * point: the recipients outlive the connection.
+   *
+   * @param {string} sourceKey
+   * @param {number} fileIndex
+   * @returns {string[]}
+   */
+  wantingCues(sourceKey, fileIndex) {
+    const key = `${sourceKey}:${fileIndex}`;
+    const names = [];
+    for (const [consumerId, viewer] of this.#byId) {
+      if (viewer.wantsCuesFor.has(key)) {
+        names.push(consumerId);
+      }
+    }
+    return names;
+  }
+
   /**
    * How many named viewers are watching anything. For the log line and for a
    * check that the registry does not grow.

package/test/logger-repeats.test.js

@@ -14,7 +14,7 @@
 
 import test from "node:test";
 import assert from "node:assert/strict";
-import { logger } from "../utils/logger.js";
+import { logger, writeAlreadyDecided } from "../utils/logger.js";
 
 /** What reached the console while `body` ran. */
 function captured(body) {
@@ -109,6 +109,20 @@ test("when it is said again, it says how many were held back", async () => {
   assert.ok(Number(said[2]) > 0, `the span it covers must be stated: ${later[0]}`);
 });
 
+test("a line already decided on another thread is written as it is", () => {
+  const message = unique("forwarded");
+  const lines = captured(() => {
+    writeAlreadyDecided("info", message);
+    writeAlreadyDecided("info", message);
+    writeAlreadyDecided("warn", message);
+  });
+  // The worker holds the same rule and applies it before forwarding. Deciding
+  // again here would be one decision taken twice on two different histories,
+  // and the file's own promise is that a line cannot reach the console and miss
+  // the file.
+  assert.equal(lines.length, 3, "a forwarded line is not judged a second time");
+});
+
 test("every level goes through the same rule", () => {
   const message = unique("levels");
   const lines = captured(() => {

package/test/send-chunk-bytes.test.js

@@ -0,0 +1,86 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { bodySender } from "../services/data-channel-handler.js";
+
+/**
+ * Drives the sender over a body arriving in the given read sizes, and answers
+ * both what reached the far end and what was written — so "the body is
+ * unchanged" is asserted against the body rather than against a length.
+ *
+ * @param {number}   sizeBytes
+ * @param {number[]} readSizes - The sizes the body read hands over, in order.
+ * @returns {{ sent: Buffer[], counted: number, written: Buffer }}
+ */
+function sendBody(sizeBytes, readSizes) {
+  /** @type {Buffer[]} */
+  const sent = [];
+  const sender = bodySender((bytes) => sent.push(Buffer.from(bytes)), sizeBytes);
+  /** @type {Buffer[]} */
+  const written = [];
+  let counted = 0;
+  let next = 0;
+  for (const size of readSizes) {
+    const block = Buffer.alloc(size);
+    for (let index = 0; index < size; index += 1) {
+      block[index] = next & 0xff;
+      next += 1;
+    }
+    written.push(block);
+    counted += sender.push(block);
+  }
+  counted += sender.flush();
+  return { sent, counted, written: Buffer.concat(written) };
+}
+
+test("with no size chosen, one body read is one message", () => {
+  const { sent, counted } = sendBody(0, [1000, 2000, 3]);
+  assert.deepEqual(
+    sent.map((message) => message.length),
+    [1000, 2000, 3]
+  );
+  assert.equal(counted, 3);
+});
+
+test("a smaller size cuts a body read into messages of exactly that size", () => {
+  const { sent, counted } = sendBody(400, [1000]);
+  assert.deepEqual(
+    sent.map((message) => message.length),
+    [400, 400, 200]
+  );
+  assert.equal(counted, 3);
+});
+
+test("a larger size joins body reads until it is filled", () => {
+  const { sent } = sendBody(2500, [1000, 1000, 1000, 1000]);
+  assert.deepEqual(
+    sent.map((message) => message.length),
+    [2500, 1500]
+  );
+});
+
+test("every byte arrives once, in order, whatever the size", () => {
+  for (const size of [0, 1, 7, 400, 2500, 999_999]) {
+    const { sent, written } = sendBody(size, [1000, 3, 5000, 17]);
+    assert.deepEqual(Buffer.concat(sent), written, `size ${size} changed the body`);
+  }
+});
+
+test("a size larger than the whole body still sends it, once, on flush", () => {
+  const { sent, written, counted } = sendBody(10_000, [100, 200]);
+  assert.equal(sent.length, 1);
+  assert.equal(counted, 1);
+  assert.deepEqual(sent[0], written);
+});
+
+test("the count is of messages, which is what a reading is attributed to", () => {
+  // 163 messages for 10 657 210 bytes is the field reading of 2026-09-12; at
+  // 16 KB the same body is 651 of them, and that difference is the measurement.
+  const { counted } = sendBody(16 * 1024, [10_657_210]);
+  assert.equal(counted, Math.ceil(10_657_210 / (16 * 1024)));
+});
+
+test("nothing is sent for an empty body, and flush has nothing to release", () => {
+  const { sent, counted } = sendBody(400, []);
+  assert.deepEqual(sent, []);
+  assert.equal(counted, 0);
+});

package/test/viewer-subtitle-subscription.test.js

@@ -0,0 +1,96 @@
+/**
+ * @file Who wants subtitle cues, and why the answer is a person and not a channel.
+ *
+ * The subscription used to be a `Set<DataChannel>` inside the transport, keyed
+ * by `sourceKey:fileIndex`. Two things followed from that, and both are field
+ * facts rather than worries:
+ *
+ * 1. a seamless reconnect lost subtitles for the rest of the session, because
+ *    the new channel is a different object and nothing re-subscribed it;
+ * 2. the transport had to sniff `/api/subtitles` out of the request path and
+ *    derive a torrent key to build that key at all — application routing and
+ *    torrent identity, inside the layer that is only supposed to carry bytes.
+ *
+ * Held against the viewer instead, both go away by construction: whatever
+ * channel the person is reachable on next, they are still subscribed, and the
+ * transport never learns what a subtitle is.
+ */
+
+import test from "node:test";
+import assert from "node:assert/strict";
+
+import { Viewers } from "../services/viewer/Viewers.js";
+
+/** An output is only ever held by id here, so the thinnest possible stand-in. */
+const anOutput = (id) => ({ id, viewers: new Set() });
+
+test("a viewer who switched subtitles on is listed for that file", () => {
+  const viewers = new Viewers();
+  viewers.of(anOutput("picture"), "alice");
+
+  assert.equal(viewers.wantsCues("alice", "src-1", 3), true);
+  assert.deepEqual(viewers.wantingCues("src-1", 3), ["alice"]);
+});
+
+test("nobody is listed for a file nobody asked about", () => {
+  const viewers = new Viewers();
+  viewers.of(anOutput("picture"), "alice");
+  viewers.wantsCues("alice", "src-1", 3);
+
+  assert.deepEqual(viewers.wantingCues("src-1", 4), []);
+  assert.deepEqual(viewers.wantingCues("src-2", 3), []);
+});
+
+test("two viewers of one file are both listed, and one file each is kept apart", () => {
+  const viewers = new Viewers();
+  const picture = anOutput("picture");
+  viewers.of(picture, "alice");
+  viewers.of(picture, "bob");
+
+  viewers.wantsCues("alice", "src-1", 0);
+  viewers.wantsCues("bob", "src-1", 0);
+  viewers.wantsCues("bob", "src-1", 1);
+
+  assert.deepEqual(viewers.wantingCues("src-1", 0).sort(), ["alice", "bob"]);
+  assert.deepEqual(viewers.wantingCues("src-1", 1), ["bob"]);
+});
+
+test("the subscription outlives the connection, which is the whole point", () => {
+  // Nothing here mentions a channel, and that is the assertion: the registry
+  // has no way to express "this channel", so a channel dying cannot take a
+  // subscription with it.
+  const viewers = new Viewers();
+  viewers.of(anOutput("picture"), "alice");
+  viewers.wantsCues("alice", "src-1", 3);
+
+  // A reconnect is, from here, nothing at all: the same person is still known.
+  viewers.seen("alice");
+
+  assert.deepEqual(viewers.wantingCues("src-1", 3), ["alice"]);
+});
+
+test("a viewer who has gone is no longer listed", () => {
+  const viewers = new Viewers();
+  const picture = anOutput("picture");
+  viewers.of(picture, "alice");
+  viewers.wantsCues("alice", "src-1", 3);
+
+  viewers.hasGone("alice", (id) => (id === "picture" ? picture : null));
+
+  assert.deepEqual(viewers.wantingCues("src-1", 3), []);
+});
+
+test("an unknown name subscribes to nothing", () => {
+  const viewers = new Viewers();
+  assert.equal(viewers.wantsCues("nobody", "src-1", 3), false);
+  assert.deepEqual(viewers.wantingCues("src-1", 3), []);
+});
+
+test("a request missing the file index registers nothing", () => {
+  const viewers = new Viewers();
+  viewers.of(anOutput("picture"), "alice");
+
+  assert.equal(viewers.wantsCues("alice", "src-1", Number.NaN), false);
+  assert.equal(viewers.wantsCues("alice", "", 3), false);
+  assert.deepEqual(viewers.wantingCues("src-1", 3), []);
+});

package/utils/logger.js

@@ -166,6 +166,30 @@ export const logger = {
   error: (message) => write("error", message, chalk.red, console.error)
 };
 
+/**
+ * Write a line that has ALREADY been through the repeat rule on another thread.
+ *
+ * The worker holds the same rule and applies it before forwarding, so running
+ * it again here would be one decision taken twice, on two different histories.
+ * It does not lose lines today — a re-printed line carries its held-back count,
+ * which makes the text unique — but that is an accident of the wording, and the
+ * file's own promise is that a line cannot reach the console and miss the file.
+ * It also filled this thread's bounded map with keys that can never repeat.
+ *
+ * @param {string} level
+ * @param {string} message - Already decided; written as it is.
+ * @returns {void}
+ */
+export function writeAlreadyDecided(level, message) {
+  const colour = level === "error"
+    ? chalk.red
+    : level === "warn" ? chalk.yellow : level === "success" ? chalk.green : chalk.cyan;
+  const toConsole = level === "error" ? console.error : level === "warn" ? console.warn : console.log;
+  const line = `${PREFIX} [${ts()}] ${message}`;
+  toConsole(colour(line));
+  toFile(line);
+}
+
 /**
  * An established fact is said once, then with decreasing frequency.
  *
@@ -195,6 +219,22 @@ const REPEAT_KEYS = 512;
 /** @type {Map<string, { suppressed: number, printedAt: number, interval: number }>} */
 const recent = new Map();
 
+/**
+ * What to append when a line is said again after repeats were held back.
+ *
+ * One function because it was written twice, in the two branches that decide to
+ * speak — which is how two statements of one rule drift apart.
+ *
+ * @param {number} heldBack
+ * @param {number} overMs
+ * @returns {string}
+ */
+function heldBackSuffix(heldBack, overMs) {
+  return heldBack > 0
+    ? ` [said ${heldBack} more time(s) in the last ${(overMs / 1000).toFixed(1)}s]`
+    : "";
+}
+
 /**
  * Whether this line is a repeat to hold back, and what to say if it is not.
  *
@@ -223,12 +263,7 @@ function repeatCheck(message) {
       }
     }
     recent.set(message, { suppressed: 0, printedAt: now, interval: REPEAT_FIRST_MS });
-    return {
-      hold: false,
-      suffix: heldBack > 0
-        ? ` [said ${heldBack} more time(s) in the last ${(overMs / 1000).toFixed(1)}s]`
-        : ""
-    };
+    return { hold: false, suffix: heldBackSuffix(heldBack, overMs) };
   }
   if (now - seen.printedAt < seen.interval) {
     seen.suppressed += 1;
@@ -242,14 +277,9 @@ function repeatCheck(message) {
     printedAt: now,
     interval: Math.min(REPEAT_MAX_MS, seen.interval * 2)
   });
-  return {
-    hold: false,
-    // SAID, not merely hidden: the rate is the fact here, and a log that quietly
-    // drops repeats reports a healthy proxy where a loop was spinning.
-    suffix: heldBack > 0
-      ? ` [said ${heldBack} more time(s) in the last ${(overMs / 1000).toFixed(1)}s]`
-      : ""
-  };
+  // SAID, not merely hidden: the rate is the fact here, and a log that quietly
+  // drops repeats reports a healthy proxy where a loop was spinning.
+  return { hold: false, suffix: heldBackSuffix(heldBack, overMs) };
 }
 
 /**