@torrent-tv/proxy 2.9.93 → 2.9.95

package/test/piece-lru.test.js

@@ -107,3 +107,67 @@ test("a nonsensical capacity is refused at construction", () => {
   assert.throws(() => new PieceLru(-1), /positive integer/);
   assert.throws(() => new PieceLru(1.5), /positive integer/);
 });
+
+test("a declared window is the last thing evicted, not the first", () => {
+  const lru = new PieceLru(4);
+  // Oldest first: 10 was touched longest ago, so plain recency would take it.
+  for (const index of [10, 11, 12, 13]) {
+    lru.touch(index);
+  }
+  lru.protect("reader-a", 10, 11);
+
+  assert.equal(
+    lru.evictionCandidate(),
+    12,
+    "recency alone would have taken 10; the reader said it is about to read it"
+  );
+});
+
+test("protection yields when everything resident is protected", () => {
+  // The case the store cannot survive if protection were absolute: at its
+  // smallest budget only two pieces are resident, and both belong to a window.
+  const lru = new PieceLru(2);
+  lru.touch(4);
+  lru.touch(5);
+  lru.protect("reader-a", 4, 5);
+
+  assert.equal(lru.evictionCandidate(), 4, "a full store must still be able to admit a piece");
+});
+
+test("a pin is never overruled, protected or not", () => {
+  const lru = new PieceLru(2);
+  lru.touch(7);
+  lru.touch(8);
+  lru.pin(7);
+  lru.protect("reader-a", 7, 8);
+
+  assert.equal(lru.evictionCandidate(), 8, "the piece being read now must stay");
+  lru.pin(8);
+  assert.equal(lru.evictionCandidate(), null, "nothing may be taken from under a reader");
+});
+
+test("windows of several readers add up, and leaving takes only your own", () => {
+  const lru = new PieceLru(6);
+  for (const index of [20, 21, 22, 23, 24, 25]) {
+    lru.touch(index);
+  }
+  lru.protect("reader-a", 20, 21);
+  lru.protect("reader-b", 22, 23);
+  assert.equal(lru.evictionCandidate(), 24);
+
+  lru.unprotect("reader-b");
+  assert.equal(lru.evictionCandidate(), 22, "b's window is free once b has gone");
+  assert.equal(lru.protectedCount, 1);
+});
+
+test("a reader moving its window replaces it instead of accumulating", () => {
+  const lru = new PieceLru(4);
+  for (const index of [30, 31, 32, 33]) {
+    lru.touch(index);
+  }
+  lru.protect("reader-a", 30, 31);
+  lru.protect("reader-a", 32, 33);
+
+  assert.equal(lru.evictionCandidate(), 30, "the pieces already read are free again");
+  assert.equal(lru.protectedCount, 1);
+});

package/test/read-window.test.js

@@ -209,7 +209,7 @@ test("two readers add up, and one leaving takes only its own window", async () =
   }
 });
 
-test("criticality marks the piece being waited for, not the whole range", async () => {
+test("criticality marks the window being waited for, not the whole range", async () => {
   // Nothing is present, so the reader blocks on its first piece and marks it.
   let arrived = false;
   const { torrent, store, directory } = await recordingTorrent({
@@ -226,10 +226,14 @@ test("criticality marks the piece being waited for, not the whole range", async
 
     const criticals = torrent.calls.filter((entry) => entry.call === "critical");
     assert.equal(criticals.length, 1);
-    assert.ok(
-      criticals[0].to - criticals[0].from + 1 <= 3,
-      `marked ${criticals[0].to - criticals[0].from + 1} pieces critical; the signal means "blocked here now"`
-    );
+    const marked = criticals[0].to - criticals[0].from + 1;
+    // The window, and nothing beyond it. Marking only the blocked piece made
+    // the pieces after it arrive strictly one at a time — measured, the first
+    // segment after a seek took 7.2 s for four pieces. Marking the whole
+    // requested range would be the old mistake: for ffmpeg's input that is
+    // every piece to the end of the file, and the flag stops meaning anything.
+    assert.equal(marked, WINDOW_PIECES, `marked ${marked} pieces critical`);
+    assert.ok(criticals[0].to < 8000 - 1, "criticality must not reach the end of the file");
 
     arrived = true;
     torrent.emit("verified", 0);