@torrent-tv/proxy 2.83.0 → 2.83.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +35 -0
- package/package.json +1 -1
- package/routes/api/sources/stats/get.js +11 -2
- package/routes/stream/get.js +74 -3
- package/services/delivery-probe.js +248 -43
- package/services/download/SwarmSelection.js +5 -5
- package/services/download/registry.js +20 -0
- package/services/encode/EncodeRun.js +1 -0
- package/services/encode/encode-exit.js +17 -0
- package/services/files/CompletedFiles.js +276 -0
- package/services/files/piece-from-whole-file.js +118 -0
- package/services/output/cut-grid.js +13 -3
- package/services/piece-store/piece-disk-store.js +72 -2
- package/services/piece-store/shared-piece-store.js +274 -27
- package/services/torrent-pool.js +238 -19
- package/services/torrent-worker/client.js +21 -0
- package/services/torrent-worker/protocol.js +9 -1
- package/services/torrent-worker/worker.js +183 -2
- package/test/completed-files.test.js +115 -0
- package/test/cuts-follow-published-grid.test.js +35 -0
- package/test/delivery-probe.test.js +114 -1
- package/test/encode-exit.test.js +18 -0
- package/test/piece-disk-store.test.js +26 -0
- package/test/piece-from-whole-file.test.js +129 -0
- package/test/piece-store-eviction.test.js +28 -15
- package/test/piece-store-never-refuses.test.js +153 -0
- package/test/piece-store-reservations.test.js +16 -3
- package/test/probe-wedge-certainty.test.js +3 -3
- package/test/shared-piece-store.test.js +27 -13
- package/test/stream-route.test.js +41 -0
- package/test/swarm-follows-readers.test.js +126 -0
- package/test/swarm-reach.test.js +5 -0
- package/test/upload-hurry.test.js +27 -0
|
@@ -0,0 +1,153 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file A store that is short of memory must inconvenience a read, never end a
|
|
3
|
+
* torrent.
|
|
4
|
+
*
|
|
5
|
+
* The field failure of 2026-09-11, in one sentence: the store could not hand
|
|
6
|
+
* out a block, threw, the throw travelled out through the torrent client's own
|
|
7
|
+
* write callback, and the client destroyed the torrent. For the rest of the
|
|
8
|
+
* process every read of that film answered `File 1 not found in
|
|
9
|
+
* torrent:d4022ff4…`, `/stats` reported `peers=0 connected of 1186 known`, and
|
|
10
|
+
* the viewer could not open anything until the addon was restarted.
|
|
11
|
+
*
|
|
12
|
+
* Three properties hold it shut, and each is checked here on its own:
|
|
13
|
+
*
|
|
14
|
+
* 1. an arriving piece is never refused — it has the disk;
|
|
15
|
+
* 2. a read on the torrent client's own path takes no block at all, so an
|
|
16
|
+
* upload can neither wait for memory nor be refused it;
|
|
17
|
+
* 3. a store between readers keeps room for one window, because that is what
|
|
18
|
+
* the next read asks for and the allowance is otherwise re-derived a
|
|
19
|
+
* minute later — twelve times slower than a claim gives up.
|
|
20
|
+
*/
|
|
21
|
+
|
|
22
|
+
import test from "node:test";
|
|
23
|
+
import assert from "node:assert/strict";
|
|
24
|
+
import fs from "node:fs/promises";
|
|
25
|
+
import os from "node:os";
|
|
26
|
+
import path from "node:path";
|
|
27
|
+
import { SharedPieceStore } from "../services/piece-store/shared-piece-store.js";
|
|
28
|
+
|
|
29
|
+
const PIECE = 1024;
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* @param {SharedPieceStore} store
|
|
33
|
+
* @param {number} index
|
|
34
|
+
* @returns {Promise<void>}
|
|
35
|
+
*/
|
|
36
|
+
const put = (store, index) =>
|
|
37
|
+
new Promise((resolve, reject) => {
|
|
38
|
+
store.put(index, Buffer.alloc(PIECE, index % 251), (error) => (error ? reject(error) : resolve()));
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
/**
|
|
42
|
+
* @param {SharedPieceStore} store
|
|
43
|
+
* @param {number} index
|
|
44
|
+
* @param {{ offset: number, length: number }} range
|
|
45
|
+
* @returns {Promise<Buffer>}
|
|
46
|
+
*/
|
|
47
|
+
const get = (store, index, range) =>
|
|
48
|
+
new Promise((resolve, reject) => {
|
|
49
|
+
store.get(index, range, (error, bytes) => (error ? reject(error) : resolve(bytes)));
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
/**
|
|
53
|
+
* @returns {Promise<string>}
|
|
54
|
+
*/
|
|
55
|
+
const directory = () => fs.mkdtemp(path.join(os.tmpdir(), "never-refuses-"));
|
|
56
|
+
|
|
57
|
+
test("a piece is never refused for want of memory", async () => {
|
|
58
|
+
const root = await directory();
|
|
59
|
+
// Every block held by a piece that may not leave. The ceiling never falls
|
|
60
|
+
// below two, so this is how a store with nothing to give is reached: what
|
|
61
|
+
// held the blocks in the field was two writes on their way to disk, and a pin
|
|
62
|
+
// reaches the same state deterministically.
|
|
63
|
+
//
|
|
64
|
+
// This one takes the store's own patience to run — it must be seen to give
|
|
65
|
+
// up and keep the piece anyway.
|
|
66
|
+
const store = new SharedPieceStore(PIECE, {
|
|
67
|
+
length: PIECE * 8,
|
|
68
|
+
memoryBytes: PIECE * 2,
|
|
69
|
+
path: root,
|
|
70
|
+
name: "no-block-to-be-had"
|
|
71
|
+
});
|
|
72
|
+
try {
|
|
73
|
+
await put(store, 0);
|
|
74
|
+
await put(store, 1);
|
|
75
|
+
store.pin(0);
|
|
76
|
+
store.pin(1);
|
|
77
|
+
|
|
78
|
+
await put(store, 3);
|
|
79
|
+
const stats = store.stats();
|
|
80
|
+
assert.equal(stats.spilled, 1, "the piece is on disk");
|
|
81
|
+
assert.equal(store.locate(3), null, "and not in memory, since no block could be had for it");
|
|
82
|
+
assert.equal(stats.resident, 2, "the pinned pieces were not taken from under their reader");
|
|
83
|
+
assert.ok(
|
|
84
|
+
stats.admittedWithoutSlot >= 1,
|
|
85
|
+
"and the store says so, rather than the torrent client saying it with a destroyed torrent"
|
|
86
|
+
);
|
|
87
|
+
const bytes = await get(store, 3, { offset: 0, length: PIECE });
|
|
88
|
+
assert.equal(bytes.length, PIECE, "and it reads back");
|
|
89
|
+
assert.equal(bytes[0], 3 % 251, "with its own contents");
|
|
90
|
+
} finally {
|
|
91
|
+
await new Promise((resolve) => store.destroy(resolve));
|
|
92
|
+
await fs.rm(root, { recursive: true, force: true });
|
|
93
|
+
}
|
|
94
|
+
});
|
|
95
|
+
|
|
96
|
+
test("a read for the torrent client takes no block and only its own range", async () => {
|
|
97
|
+
const root = await directory();
|
|
98
|
+
const store = new SharedPieceStore(PIECE, {
|
|
99
|
+
length: PIECE * 8,
|
|
100
|
+
memoryBytes: PIECE,
|
|
101
|
+
path: root,
|
|
102
|
+
name: "ranged-read"
|
|
103
|
+
});
|
|
104
|
+
try {
|
|
105
|
+
// Two fit; the third displaces the oldest, which goes to disk.
|
|
106
|
+
await put(store, 0);
|
|
107
|
+
await put(store, 1);
|
|
108
|
+
await put(store, 2);
|
|
109
|
+
const before = store.stats();
|
|
110
|
+
assert.equal(before.spilled, 1, "the first piece is on disk");
|
|
111
|
+
|
|
112
|
+
const wanted = 16;
|
|
113
|
+
const bytes = await get(store, 0, { offset: PIECE - wanted, length: wanted });
|
|
114
|
+
assert.equal(bytes.length, wanted, "only what was asked for comes back");
|
|
115
|
+
assert.equal(bytes[0], 0, "and it is that piece's own bytes");
|
|
116
|
+
|
|
117
|
+
const after = store.stats();
|
|
118
|
+
assert.equal(
|
|
119
|
+
after.blocksAllocated,
|
|
120
|
+
before.blocksAllocated,
|
|
121
|
+
"and answering it took no block: a peer asks for kilobytes and a piece here is megabytes"
|
|
122
|
+
);
|
|
123
|
+
assert.equal(after.resident, before.resident, "nothing was revived for it");
|
|
124
|
+
assert.equal(after.fromDisk, before.fromDisk + 1, "and the read is counted as coming from disk");
|
|
125
|
+
} finally {
|
|
126
|
+
await new Promise((resolve) => store.destroy(resolve));
|
|
127
|
+
await fs.rm(root, { recursive: true, force: true });
|
|
128
|
+
}
|
|
129
|
+
});
|
|
130
|
+
|
|
131
|
+
test("a store between readers keeps room for one window", async () => {
|
|
132
|
+
const root = await directory();
|
|
133
|
+
const store = new SharedPieceStore(PIECE, {
|
|
134
|
+
length: PIECE * 200,
|
|
135
|
+
memoryBytes: PIECE * 64,
|
|
136
|
+
path: root,
|
|
137
|
+
name: "between-readers"
|
|
138
|
+
});
|
|
139
|
+
try {
|
|
140
|
+
store.protectRange("read-1", 10, 21, 100);
|
|
141
|
+
const asked = store.wantedBytes;
|
|
142
|
+
assert.ok(asked >= PIECE * 12, "with a reader, the window it declared is asked for");
|
|
143
|
+
|
|
144
|
+
store.releaseProtection("read-1");
|
|
145
|
+
assert.ok(
|
|
146
|
+
store.wantedBytes >= PIECE * 12,
|
|
147
|
+
"and with the reader gone the floor is still one window — the next read asks for the same again"
|
|
148
|
+
);
|
|
149
|
+
} finally {
|
|
150
|
+
await new Promise((resolve) => store.destroy(resolve));
|
|
151
|
+
await fs.rm(root, { recursive: true, force: true });
|
|
152
|
+
}
|
|
153
|
+
});
|
|
@@ -129,10 +129,12 @@ const get = (store, index) =>
|
|
|
129
129
|
*
|
|
130
130
|
* @param {() => boolean} holds
|
|
131
131
|
* @param {string} what
|
|
132
|
+
* @param {number} [limit] - A backstop, never the measurement: one of the
|
|
133
|
+
* conditions here is the store's own patience, which is itself five seconds.
|
|
132
134
|
* @returns {Promise<void>}
|
|
133
135
|
*/
|
|
134
|
-
async function until(holds, what) {
|
|
135
|
-
const deadline = Date.now() +
|
|
136
|
+
async function until(holds, what, limit = 5_000) {
|
|
137
|
+
const deadline = Date.now() + limit;
|
|
136
138
|
while (!holds()) {
|
|
137
139
|
if (Date.now() > deadline) {
|
|
138
140
|
throw new Error(`timed out waiting until ${what}`);
|
|
@@ -196,10 +198,21 @@ test("a claim that cannot be met ends in an error, not in waiting for ever", { t
|
|
|
196
198
|
// other is pinned. The old rule waited while anything was nominally in
|
|
197
199
|
// flight, which here is for ever.
|
|
198
200
|
store.pin(1);
|
|
199
|
-
|
|
201
|
+
// The claim gives up within its own patience — that is the property. What
|
|
202
|
+
// the caller does with the refusal is its own business, and since
|
|
203
|
+
// 2026-09-11 an arriving piece answers it by taking the disk instead of
|
|
204
|
+
// failing the torrent client's write.
|
|
205
|
+
const arriving = put(store, 3);
|
|
206
|
+
await until(
|
|
207
|
+
() => store.stats().blockedByPins > 0,
|
|
208
|
+
"the claim gave up rather than waiting for ever",
|
|
209
|
+
20_000
|
|
210
|
+
);
|
|
200
211
|
|
|
201
212
|
store.unpin(1);
|
|
202
213
|
disk.releaseWrites();
|
|
214
|
+
await arriving;
|
|
215
|
+
disk.releaseWrites();
|
|
203
216
|
await spilling;
|
|
204
217
|
} finally {
|
|
205
218
|
disk.releaseWrites();
|
|
@@ -12,7 +12,7 @@ test("a seen-counter bounded lag is not a wedge, however long it lasts", () => {
|
|
|
12
12
|
stuckForMs: 3400,
|
|
13
13
|
longestHealthySeenGapMs: 3500
|
|
14
14
|
});
|
|
15
|
-
assert.equal(verdict.
|
|
15
|
+
assert.equal(verdict.isCertain, false);
|
|
16
16
|
});
|
|
17
17
|
|
|
18
18
|
test("a seen-counter frozen past this connection's own worst legitimate gap is a wedge", () => {
|
|
@@ -23,7 +23,7 @@ test("a seen-counter frozen past this connection's own worst legitimate gap is a
|
|
|
23
23
|
stuckForMs: 90_000,
|
|
24
24
|
longestHealthySeenGapMs: 3500
|
|
25
25
|
});
|
|
26
|
-
assert.equal(verdict.
|
|
26
|
+
assert.equal(verdict.isCertain, true);
|
|
27
27
|
});
|
|
28
28
|
|
|
29
29
|
test("with no healthy history yet, one probe interval is still required", () => {
|
|
@@ -31,7 +31,7 @@ test("with no healthy history yet, one probe interval is still required", () =>
|
|
|
31
31
|
stuckForMs: PROBE_INTERVAL_MS - 1,
|
|
32
32
|
longestHealthySeenGapMs: 0
|
|
33
33
|
});
|
|
34
|
-
assert.equal(verdict.
|
|
34
|
+
assert.equal(verdict.isCertain, false);
|
|
35
35
|
assert.equal(verdict.needMs, PROBE_INTERVAL_MS);
|
|
36
36
|
});
|
|
37
37
|
|
|
@@ -151,11 +151,16 @@ test("refuses to make room when every resident piece is being read", async () =>
|
|
|
151
151
|
store.pin(0);
|
|
152
152
|
store.pin(1);
|
|
153
153
|
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
)
|
|
154
|
+
// The pinned pieces stay where they are, and the arrival is kept anyway —
|
|
155
|
+
// on the disk, which is what it has. Refusing it was how a store short of
|
|
156
|
+
// memory ended a torrent: the refusal travelled out through the torrent
|
|
157
|
+
// client's own write callback and the client destroyed the torrent
|
|
158
|
+
// (field 2026-09-11).
|
|
159
|
+
await put(store, 2, piece(2));
|
|
160
|
+
assert.ok(store.locate(0), "the pinned piece was taken from under its reader");
|
|
161
|
+
assert.ok(store.locate(1), "the pinned piece was taken from under its reader");
|
|
162
|
+
assert.equal(store.locate(2), null, "and the arrival did not displace either of them");
|
|
163
|
+
assert.ok((await get(store, 2)).equals(piece(2)), "the arrival is kept, and reads back");
|
|
159
164
|
} finally {
|
|
160
165
|
store.unpin(0);
|
|
161
166
|
store.unpin(1);
|
|
@@ -172,7 +177,7 @@ test("a piece revived from disk is readable by offset again", async () => {
|
|
|
172
177
|
await put(store, 2, piece(2)); // pushes piece 0 out to disk
|
|
173
178
|
assert.equal(store.locate(0), null, "piece 0 should have left memory");
|
|
174
179
|
|
|
175
|
-
await
|
|
180
|
+
await store.reside(0); // brings it back, which is what a playback read does
|
|
176
181
|
const located = store.locate(0);
|
|
177
182
|
assert.ok(located, "piece 0 was not brought back into memory");
|
|
178
183
|
const view = Buffer.from(located.buffer, located.offset, located.length);
|
|
@@ -248,11 +253,18 @@ test("counts where reads were served from, so the budget can be judged", async (
|
|
|
248
253
|
const stats = store.stats();
|
|
249
254
|
assert.equal(stats.fromMemory, 2, "memory reads miscounted");
|
|
250
255
|
assert.equal(stats.fromDisk, 1, "disk reads miscounted");
|
|
251
|
-
//
|
|
252
|
-
//
|
|
253
|
-
//
|
|
254
|
-
|
|
255
|
-
|
|
256
|
+
// One: piece 0 goes out to make room for piece 2. The read that follows is
|
|
257
|
+
// the torrent client's, and since 2026-09-11 it is answered from the disk
|
|
258
|
+
// copy without taking a block — so nothing has to be written out for it and
|
|
259
|
+
// nothing is revived. A read for PLAYBACK still populates memory, and pays
|
|
260
|
+
// for it with a spill; that is the next assertion.
|
|
261
|
+
assert.equal(stats.spills, 1, "spills miscounted");
|
|
262
|
+
assert.equal(stats.revivals, 0, "the client's own read does not revive");
|
|
263
|
+
|
|
264
|
+
await store.reside(0);
|
|
265
|
+
const afterPlayback = store.stats();
|
|
266
|
+
assert.equal(afterPlayback.revivals, 1, "a read for playback revives");
|
|
267
|
+
assert.equal(afterPlayback.spills, 2, "and pays for its block with a spill");
|
|
256
268
|
assert.equal(stats.blockedByPins, 0);
|
|
257
269
|
assert.equal(stats.capacity, 2);
|
|
258
270
|
} finally {
|
|
@@ -268,9 +280,11 @@ test("counts a refusal caused by pinned pieces", async () => {
|
|
|
268
280
|
await put(store, 1, piece(1));
|
|
269
281
|
store.pin(0);
|
|
270
282
|
store.pin(1);
|
|
271
|
-
await
|
|
283
|
+
await put(store, 2, piece(2));
|
|
272
284
|
|
|
273
|
-
|
|
285
|
+
const stats = store.stats();
|
|
286
|
+
assert.equal(stats.blockedByPins, 1, "the store not being able to give a block went unrecorded");
|
|
287
|
+
assert.equal(stats.admittedWithoutSlot, 1, "and what it did instead went unrecorded");
|
|
274
288
|
} finally {
|
|
275
289
|
store.unpin(0);
|
|
276
290
|
store.unpin(1);
|
|
@@ -10,6 +10,9 @@
|
|
|
10
10
|
|
|
11
11
|
import test from "node:test";
|
|
12
12
|
import assert from "node:assert/strict";
|
|
13
|
+
import fs from "node:fs/promises";
|
|
14
|
+
import os from "node:os";
|
|
15
|
+
import path from "node:path";
|
|
13
16
|
import { handleStreamGet } from "../routes/stream/get.js";
|
|
14
17
|
|
|
15
18
|
/**
|
|
@@ -143,3 +146,41 @@ test("a ranged GET is reported as a real read position", async () => {
|
|
|
143
146
|
|
|
144
147
|
assert.deepEqual(state.prioritized, [{ byteStart: 4_390_000_000, wholeFileRead: false }]);
|
|
145
148
|
});
|
|
149
|
+
|
|
150
|
+
test("a file downloaded whole is served from disk without touching the torrent", async () => {
|
|
151
|
+
const root = await fs.mkdtemp(path.join(os.tmpdir(), "stream-whole-"));
|
|
152
|
+
const where = path.join(root, "0");
|
|
153
|
+
const bytes = Buffer.from("a film that is a file now", "utf8");
|
|
154
|
+
await fs.writeFile(where, bytes);
|
|
155
|
+
try {
|
|
156
|
+
const { req, reply, sent, deps } = harness({ method: "GET", range: "bytes=2-6" });
|
|
157
|
+
let asked = false;
|
|
158
|
+
deps.torrentPool.getTorrent = async () => {
|
|
159
|
+
asked = true;
|
|
160
|
+
throw new Error("the torrent was asked for, which is what this avoids");
|
|
161
|
+
};
|
|
162
|
+
deps.torrentPool.wholeFiles = new Map([
|
|
163
|
+
["abc/0", { path: where, length: bytes.length, name: "film.mkv" }]
|
|
164
|
+
]);
|
|
165
|
+
// The source key IS the identity — `torrent:<infohash>` — and it is all the
|
|
166
|
+
// route needs to find the file.
|
|
167
|
+
deps.sourceRegistry = { get: () => ({ sourceType: "torrent", source: "magnet:?xt=urn:btih:abc" }) };
|
|
168
|
+
req.query = { sourceKey: "torrent:abc", fileIndex: "0" };
|
|
169
|
+
|
|
170
|
+
await handleStreamGet(req, reply, deps);
|
|
171
|
+
|
|
172
|
+
assert.equal(asked, false, "the torrent was asked for");
|
|
173
|
+
assert.equal(sent.code, 206);
|
|
174
|
+
assert.equal(sent.headers["content-range"], `bytes 2-6/${bytes.length}`);
|
|
175
|
+
assert.equal(sent.headers["content-length"], "5");
|
|
176
|
+
} finally {
|
|
177
|
+
await fs.rm(root, { recursive: true, force: true, maxRetries: 10, retryDelay: 20 });
|
|
178
|
+
}
|
|
179
|
+
});
|
|
180
|
+
|
|
181
|
+
test("a file this proxy does not have whole still goes to the torrent", async () => {
|
|
182
|
+
const { req, reply, state, deps } = harness({ method: "GET", range: "bytes=0-99" });
|
|
183
|
+
deps.torrentPool.wholeFiles = new Map([["other/7", { path: "/nowhere", length: 1, name: "x" }]]);
|
|
184
|
+
await handleStreamGet(req, reply, deps);
|
|
185
|
+
assert.equal(state.claims, 1, "the ordinary path was not taken");
|
|
186
|
+
});
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file A proxy that needs nothing from a swarm is not in that swarm.
|
|
3
|
+
*
|
|
4
|
+
* WebTorrent enforces `maxConns` only on peers it dials (`_drain`), while
|
|
5
|
+
* `_addIncomingPeer` checks that the torrent is neither destroyed nor paused
|
|
6
|
+
* and registers the peer. A proxy with its port mapped is reachable, so
|
|
7
|
+
* connections arrive and are never turned away — field 2026-09-11: 249
|
|
8
|
+
* connected at the start of one viewing, 596 at the end, 15 862 more queued, on
|
|
9
|
+
* a file that had been complete for three quarters of an hour, each connection
|
|
10
|
+
* served by reading a 4 MB piece off the disk for every 16 KB sent.
|
|
11
|
+
*
|
|
12
|
+
* The rule is not a limit on connections. While anybody is reading, every
|
|
13
|
+
* connection is worth keeping: the one that has delivered nothing yet may
|
|
14
|
+
* deliver next. It is about a torrent nobody is reading at all.
|
|
15
|
+
*/
|
|
16
|
+
|
|
17
|
+
import test from "node:test";
|
|
18
|
+
import assert from "node:assert/strict";
|
|
19
|
+
import { TorrentPool } from "../services/torrent-pool.js";
|
|
20
|
+
import { demandFor, forgetTorrent } from "../services/download/registry.js";
|
|
21
|
+
|
|
22
|
+
/**
|
|
23
|
+
* A torrent that records what was done to it. Only the surface the rule
|
|
24
|
+
* touches: `paused` is the library's own flag, and the peers are what the pause
|
|
25
|
+
* does not close by itself.
|
|
26
|
+
*
|
|
27
|
+
* @param {number} peerCount
|
|
28
|
+
* @returns {object}
|
|
29
|
+
*/
|
|
30
|
+
function torrentWith(peerCount) {
|
|
31
|
+
const peers = new Map();
|
|
32
|
+
for (let index = 0; index < peerCount; index += 1) {
|
|
33
|
+
peers.set(String(index), {
|
|
34
|
+
wire: { downloaded: 0 },
|
|
35
|
+
destroy() {
|
|
36
|
+
peers.delete(String(index));
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
return {
|
|
41
|
+
infoHash: "f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0",
|
|
42
|
+
files: [{ length: 1024 }],
|
|
43
|
+
paused: false,
|
|
44
|
+
wires: [...peers.values()].map((peer) => peer.wire),
|
|
45
|
+
_peers: peers,
|
|
46
|
+
pause() {
|
|
47
|
+
this.paused = true;
|
|
48
|
+
},
|
|
49
|
+
resume() {
|
|
50
|
+
this.paused = false;
|
|
51
|
+
}
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/**
|
|
56
|
+
* @param {object} torrent
|
|
57
|
+
* @returns {TorrentPool}
|
|
58
|
+
*/
|
|
59
|
+
function poolWith(torrent) {
|
|
60
|
+
const pool = Object.create(TorrentPool.prototype);
|
|
61
|
+
pool.torrents = new Map([["source", torrent]]);
|
|
62
|
+
pool.fileUsageByTorrent = new WeakMap();
|
|
63
|
+
return pool;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
test("a torrent nobody is reading is let go of, and its data is not", () => {
|
|
67
|
+
const torrent = torrentWith(6);
|
|
68
|
+
const pool = poolWith(torrent);
|
|
69
|
+
try {
|
|
70
|
+
pool.followTheReaders(torrent);
|
|
71
|
+
|
|
72
|
+
assert.equal(torrent.paused, true, "the swarm was not left");
|
|
73
|
+
assert.equal(torrent._peers.size, 0, "the connections the pause does not close were not let go");
|
|
74
|
+
} finally {
|
|
75
|
+
forgetTorrent(torrent);
|
|
76
|
+
}
|
|
77
|
+
});
|
|
78
|
+
|
|
79
|
+
test("a torrent somebody is reading keeps every connection it has", () => {
|
|
80
|
+
const torrent = torrentWith(6);
|
|
81
|
+
const pool = poolWith(torrent);
|
|
82
|
+
pool.fileUsageByTorrent.set(torrent, new Map([[0, 1]]));
|
|
83
|
+
try {
|
|
84
|
+
pool.followTheReaders(torrent);
|
|
85
|
+
|
|
86
|
+
assert.equal(torrent.paused, false, "a torrent being read was taken out of its swarm");
|
|
87
|
+
assert.equal(torrent._peers.size, 6, "connections were closed while somebody was reading");
|
|
88
|
+
} finally {
|
|
89
|
+
forgetTorrent(torrent);
|
|
90
|
+
}
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
test("a stated window keeps the swarm even with no file held", () => {
|
|
94
|
+
// The register is what the download layer states; a reader that has declared
|
|
95
|
+
// a window but not yet taken a file hold is still a reader.
|
|
96
|
+
const torrent = torrentWith(2);
|
|
97
|
+
const pool = poolWith(torrent);
|
|
98
|
+
demandFor(torrent).register.state({
|
|
99
|
+
claimant: "read-1",
|
|
100
|
+
fileIndex: 0,
|
|
101
|
+
byteStart: 0,
|
|
102
|
+
byteEnd: 1023,
|
|
103
|
+
urgency: 0
|
|
104
|
+
});
|
|
105
|
+
try {
|
|
106
|
+
pool.followTheReaders(torrent);
|
|
107
|
+
assert.equal(torrent.paused, false, "a declared window did not count as somebody reading");
|
|
108
|
+
} finally {
|
|
109
|
+
forgetTorrent(torrent);
|
|
110
|
+
}
|
|
111
|
+
});
|
|
112
|
+
|
|
113
|
+
test("the swarm is rejoined when a reader comes back", () => {
|
|
114
|
+
const torrent = torrentWith(3);
|
|
115
|
+
const pool = poolWith(torrent);
|
|
116
|
+
try {
|
|
117
|
+
pool.followTheReaders(torrent);
|
|
118
|
+
assert.equal(torrent.paused, true);
|
|
119
|
+
|
|
120
|
+
pool.fileUsageByTorrent.set(torrent, new Map([[0, 1]]));
|
|
121
|
+
pool.followTheReaders(torrent);
|
|
122
|
+
assert.equal(torrent.paused, false, "the next reader was left with a torrent that fetches nothing");
|
|
123
|
+
} finally {
|
|
124
|
+
forgetTorrent(torrent);
|
|
125
|
+
}
|
|
126
|
+
});
|
package/test/swarm-reach.test.js
CHANGED
|
@@ -25,6 +25,7 @@ test("connected and known are separate numbers", () => {
|
|
|
25
25
|
const torrent = { wires: [{}, {}], _peersLength: 7, _numQueued: 4 };
|
|
26
26
|
assert.deepEqual(describeSwarmReach(torrent), {
|
|
27
27
|
connectedPeers: 2,
|
|
28
|
+
deliveringPeers: 0,
|
|
28
29
|
knownPeers: 7,
|
|
29
30
|
queuedPeers: 4
|
|
30
31
|
});
|
|
@@ -46,16 +47,19 @@ test("internals that are gone say nothing rather than breaking the poll", () =>
|
|
|
46
47
|
// cost the field and not the answer.
|
|
47
48
|
assert.deepEqual(describeSwarmReach({ wires: [{}] }), {
|
|
48
49
|
connectedPeers: 1,
|
|
50
|
+
deliveringPeers: 0,
|
|
49
51
|
knownPeers: null,
|
|
50
52
|
queuedPeers: null
|
|
51
53
|
});
|
|
52
54
|
assert.deepEqual(describeSwarmReach({}), {
|
|
53
55
|
connectedPeers: 0,
|
|
56
|
+
deliveringPeers: 0,
|
|
54
57
|
knownPeers: null,
|
|
55
58
|
queuedPeers: null
|
|
56
59
|
});
|
|
57
60
|
assert.deepEqual(describeSwarmReach(null), {
|
|
58
61
|
connectedPeers: 0,
|
|
62
|
+
deliveringPeers: 0,
|
|
59
63
|
knownPeers: null,
|
|
60
64
|
queuedPeers: null
|
|
61
65
|
});
|
|
@@ -67,6 +71,7 @@ test("internals that are gone say nothing rather than breaking the poll", () =>
|
|
|
67
71
|
};
|
|
68
72
|
assert.deepEqual(describeSwarmReach(throwing), {
|
|
69
73
|
connectedPeers: 0,
|
|
74
|
+
deliveringPeers: 0,
|
|
70
75
|
knownPeers: null,
|
|
71
76
|
queuedPeers: null
|
|
72
77
|
});
|
|
@@ -119,3 +119,30 @@ test("a torrent nobody is reading is not treated as starving", () => {
|
|
|
119
119
|
"a reader that IS waiting must still earn unchoke slots"
|
|
120
120
|
);
|
|
121
121
|
});
|
|
122
|
+
|
|
123
|
+
test("a torrent short of nothing is not worth uploading for", () => {
|
|
124
|
+
// Field 2026-09-11: the file being watched was complete, its windows all
|
|
125
|
+
// present, and the proxy went on offering 512 KB/s to 596 peers for
|
|
126
|
+
// forty-eight minutes — reading a 4 MB piece off the disk for every 16 KB it
|
|
127
|
+
// sent. Upload is bought with reciprocity, and reciprocity is only worth
|
|
128
|
+
// buying while somebody is still short of bytes.
|
|
129
|
+
const complete = {
|
|
130
|
+
name: "watched to the end",
|
|
131
|
+
hasActiveReader: true,
|
|
132
|
+
hasUnmetDemand: false,
|
|
133
|
+
done: false,
|
|
134
|
+
downloadSpeed: 0,
|
|
135
|
+
wires: [
|
|
136
|
+
{ amInterested: true, peerChoking: true },
|
|
137
|
+
{ amInterested: true, peerChoking: true },
|
|
138
|
+
{ amInterested: true, peerChoking: true }
|
|
139
|
+
]
|
|
140
|
+
};
|
|
141
|
+
const decided = decideUploadLimit([complete]);
|
|
142
|
+
assert.equal(decided.bytesPerSec, 8 * 1024, "a complete torrent is given the idle floor");
|
|
143
|
+
assert.match(decided.reason, /buys nothing/);
|
|
144
|
+
|
|
145
|
+
// And a torrent that IS short of something still earns its unchoke.
|
|
146
|
+
const short = { ...complete, hasUnmetDemand: true };
|
|
147
|
+
assert.ok(decideUploadLimit([short]).bytesPerSec > 8 * 1024, "a starving torrent still buys reciprocity");
|
|
148
|
+
});
|