@torrent-tv/proxy 2.80.13 → 2.80.14
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 +10 -0
- package/docs/download-architecture.md +42 -0
- package/docs/encode-architecture.md +22 -0
- package/package.json +1 -1
- package/routes/api/transcode-sessions/net-report/post.js +64 -53
- package/services/download/SwarmSelection.js +20 -4
- package/services/encode/SegmentStore.js +743 -718
- package/services/hls-session-manager.js +8 -13
- package/services/output/LiveOutputs.js +36 -0
- package/services/output/playlists.js +86 -11
- package/services/output/rates.js +95 -0
- package/services/piece-store/piece-lru.js +9 -1
- package/services/priority/PriorityOrchestrator.js +284 -278
- package/services/supply-margin.js +40 -1
- package/services/torrent-worker/piece-reader.js +9 -4
- package/services/torrent-worker/worker.js +5 -0
- package/services/viewer/Viewer.js +345 -297
- package/test/declared-rates.test.js +116 -0
- package/test/piece-lru.test.js +5 -1
- package/test/supply-margin.test.js +25 -8
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,13 @@
|
|
|
1
|
+
## 2.80.14
|
|
2
|
+
|
|
3
|
+
- **Fix**: What the master playlist declares a variant carries is MEASURED. It was `height * height * 3.2` — for 1080 exactly the 3 732 480 the field declared for a file carrying 18.4 Mbit/s, five times more — and the comment justifying it said no measurement existed before encoding starts. Both do: the average is the file's own length over its duration, exact at session creation, and the peak is the biggest piece produced over the span it covers, equal to the average until one exists. A re-encoded height is declared at the cap we impose; a smaller height at the pixel share of the source's rate. `BANDWIDTH` and `AVERAGE-BANDWIDTH` are both emitted, as the specification names them. This is not cosmetic: the browser sizes its cushion in BYTES from `BANDWIDTH`, so 120 s asked bought 56 MB — 26 s of that film — and the deepest it ever held was 17.1 s. One expression, no case analysis: absent measurements and absent caps are written as the identity of the operation that consumes them (`services/output/rates.js`, eight checks).
|
|
4
|
+
- **Fix**: How much faster than realtime a step must run is computed from the share of the reading's time that was lost, over whole cycles. The model is unchanged and was always right; the two quantities fed into it were not — the WORST single interruption over the MEDIAN gap between interruptions, a maximum over a median, from populations that need not be the same events. Field 2026-09-08: 0.79 s over 0.01 s gave **158.60x** on a file already downloaded whole, and the quality budget refused every step against it forty times in one session. The same measurements as a share of time lost give 1.00x. The field case the old formula was written for is still caught: 3.50x refuses the 1.5 step that ran at 1.05x and stalled.
|
|
5
|
+
- **Fix**: Only what a read is stopped on reaches MEMORY. `AHEAD` used to, and it is exactly the speculative lead the swarm is told about: the priority map states one claimant per zone, so a film with seven zones arrived at the piece store as five holders — one `NEAR` and four `AHEAD` — on a session with two reads. Field: `5 reader(s) want 24 piece(s) of 25 the store may hold`, so every admission had to evict a piece somebody had declared and 100 of 1395 did, beside 6565 spills and 7575 revivals in 44 minutes at a median 0.0 s on disk. Raising the allowance does not touch it — a lead stated over the rest of the film grows to fill whatever it is given.
|
|
6
|
+
- **New**: The piece store NAMES its holders instead of counting them. Five read as five encoders on a session that had two, and choosing between narrowing the windows and raising the allowance was guesswork without the names.
|
|
7
|
+
- **New**: Whether the page is on screen, and whether the picture was pulled out of it into picture-in-picture, travel with every viewer report and live on the viewer beside where it stands. A hidden tab has its timers throttled — 800 ms of event-loop lag measured — so it asks for nothing and looked exactly like a viewer holding a full cushion; delivery stood still for the last six minutes of the field session and nothing said the tab had gone. Two facts and not one, because picture-in-picture is watching WITH the tab hidden. A viewer who is not on screen consumes nothing, which is what a paused one already meant: no deadline, and their place in the priority map kept.
|
|
8
|
+
- **Chore**: `hls-session-manager.js` is 5 lines shorter: the shape of the film the master declares — which heights splice, how big the source is, how it is packaged, what it carries — moved to `LiveOutputs.masterFactsOf`, which is the layer that holds it.
|
|
9
|
+
- **Chore**: Both architecture documents carry the new arithmetic and how to read it.
|
|
10
|
+
|
|
1
11
|
## 2.80.13
|
|
2
12
|
|
|
3
13
|
- **New**: Whether the priority map is being served IN ITS OWN ORDER is measured, for both things that read it. Until now the map's ranks were built, published, and then thrown away by everyone who acted on them — a map read backwards would have looked identical in every line this proxy writes. The measure is one wait recorded against the rank the map gave the thing waited for at the moment it was asked for, on one scale for both layers (`services/priority/WaitLedger.js`, `SegmentDemand.rankOf`, eight checks). The encoding's own state line carries `served[now N wait(s) median Xms worst Yms, soon …, later …]` and each `[hold]` line names the band it belonged to; a band that never waited prints `none` rather than a zero, because silence is not a good result. Read: long waits at `now` mean the urgent zone is not being served first, long waits lower down with none at `now` mean the zones are the wrong width.
|
|
@@ -95,6 +95,48 @@ the map put its piece in, and the `supply` line carries the table. Long waits at
|
|
|
95
95
|
`blocked` mean the urgent zone is too narrow; long waits further out mean the
|
|
96
96
|
lead is.
|
|
97
97
|
|
|
98
|
+
## What reaches MEMORY is not what reaches the swarm
|
|
99
|
+
|
|
100
|
+
`BLOCKED` and `NEAR` only. Memory holds what will be READ soon; the swarm is
|
|
101
|
+
told what will be DOWNLOADED soon, and the map states the second over the whole
|
|
102
|
+
rest of the film.
|
|
103
|
+
|
|
104
|
+
`AHEAD` used to reach memory too, and it is exactly the speculative lead. The
|
|
105
|
+
map states one claimant per zone, so a film with seven zones arrived at the piece
|
|
106
|
+
store as five separate holders — one `NEAR` and four `AHEAD` — each covering tens
|
|
107
|
+
of megabytes. Field 2026-09-08: `5 reader(s) want 24 piece(s) of 25 the store may
|
|
108
|
+
hold (widest window 17)`, on a session with exactly two reads. The union of what
|
|
109
|
+
was declared equalled the whole capacity, so every admission had to evict a piece
|
|
110
|
+
somebody had declared, and 100 of 1395 evictions did; beside that, 6565 spills
|
|
111
|
+
and 7575 revivals in 44 minutes with a median 0.0 s on disk.
|
|
112
|
+
|
|
113
|
+
Raising the allowance does not touch it: a lead stated over the rest of the film
|
|
114
|
+
grows to fill whatever memory it is given, and the ratio is unchanged.
|
|
115
|
+
|
|
116
|
+
The store's own line now NAMES its holders (`[priority-map:22:0 read:…]`) rather
|
|
117
|
+
than counting them, because the count read as five encoders on a session that
|
|
118
|
+
had two, and choosing between "narrow the windows" and "raise the allowance" was
|
|
119
|
+
guesswork without the names.
|
|
120
|
+
|
|
121
|
+
## How much faster than realtime a step must run
|
|
122
|
+
|
|
123
|
+
`1 / (1 - the share of the reading's time that was lost to waiting)`, over whole
|
|
124
|
+
cycles: from the first interruption's start to the last one's, which holds
|
|
125
|
+
exactly one running stretch per interruption in it.
|
|
126
|
+
|
|
127
|
+
The model is unchanged and was always right — if a fraction `f` of the time
|
|
128
|
+
delivers nothing, producing one second of film takes `1/(1 - f)` seconds. What
|
|
129
|
+
was wrong were the two quantities fed into it: the WORST single interruption
|
|
130
|
+
divided by the MEDIAN gap between interruptions, a maximum over a median, from
|
|
131
|
+
populations that need not be the same events. It asks what would happen if the
|
|
132
|
+
worst interruption recurred at the typical rate — a compound case that never
|
|
133
|
+
occurs — and it divides by a gap that goes to zero whenever interruptions arrive
|
|
134
|
+
in a burst.
|
|
135
|
+
|
|
136
|
+
Field 2026-09-08: 0.79 s over 0.01 s gave **158.60x** on a file already
|
|
137
|
+
downloaded whole, and the quality budget refused every step against it forty
|
|
138
|
+
times in one session. The same measurements as a share of time lost give 1.00x.
|
|
139
|
+
|
|
98
140
|
## The five levels
|
|
99
141
|
|
|
100
142
|
| level | what it is | stated |
|
|
@@ -166,6 +166,28 @@ chosen for the table.
|
|
|
166
166
|
The download half is measured the same way and on the same scale, so the two are
|
|
167
167
|
comparable: `download-architecture.md`.
|
|
168
168
|
|
|
169
|
+
## What the master playlist declares, and why it is not cosmetic
|
|
170
|
+
|
|
171
|
+
`BANDWIDTH` and `AVERAGE-BANDWIDTH` per variant, both measured
|
|
172
|
+
(`services/output/rates.js`):
|
|
173
|
+
|
|
174
|
+
- the average is the file's own length over its duration, exact and known when
|
|
175
|
+
the session is created;
|
|
176
|
+
- the peak is the biggest piece produced over the span it covers, and equals the
|
|
177
|
+
average until a piece exists — a ratio invented meanwhile would be the
|
|
178
|
+
fabrication this replaced;
|
|
179
|
+
- a re-encoded height is declared at the cap we impose, which is exact;
|
|
180
|
+
- a smaller height at the pixel share of the source's rate, which errs high, and
|
|
181
|
+
high is the safe direction.
|
|
182
|
+
|
|
183
|
+
It used to be `height * height * 3.2`. **The browser sizes its cushion in BYTES
|
|
184
|
+
from `BANDWIDTH`**, so a figure five times low makes the cushion five times
|
|
185
|
+
shallow: field 2026-09-08, 3.73 Mbit/s declared for a file carrying 18.4, 120 s
|
|
186
|
+
asked bought 56 MB — 26 s of that film — and the deepest the browser ever held
|
|
187
|
+
was 17.1 s. Inflating it is not the answer either: hls.js compares it against
|
|
188
|
+
its own estimate of the link to decide a level is unplayable, and its recovery
|
|
189
|
+
then moves level by itself, which does not honour our pinning.
|
|
190
|
+
|
|
169
191
|
## What is checked
|
|
170
192
|
|
|
171
193
|
`test/one-authority.test.js` holds the shape: one caller of `#startEncodeRun`,
|
package/package.json
CHANGED
|
@@ -1,53 +1,64 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Accept a viewer link report for a transcode session (adaptive bitrate).
|
|
3
|
-
* The browser measures its own data-channel throughput per segment fetch and
|
|
4
|
-
* posts a rolling median + its buffered seconds; the session manager's budget
|
|
5
|
-
* loop uses the latest report as the link-deficit downshift trigger.
|
|
6
|
-
*
|
|
7
|
-
* POST /api/transcode-sessions/:sessionId/net-report
|
|
8
|
-
* Body: { linkMbps: number, bufferedAheadSec: number,
|
|
9
|
-
* consumerId?: string, positionSeconds?: number }
|
|
10
|
-
*
|
|
11
|
-
* `consumerId` and `positionSeconds` say WHO is reporting and WHERE they are.
|
|
12
|
-
* A copied picture is one session shared by every viewer of it, so without them
|
|
13
|
-
* the proxy could only act on whichever viewer reported last. Both are
|
|
14
|
-
* optional: a browser that sends neither is treated exactly as before.
|
|
15
|
-
*
|
|
16
|
-
* Best-effort telemetry: invalid body → 400, unknown session → 404, ok → 204.
|
|
17
|
-
*
|
|
18
|
-
* @param {import("fastify").FastifyRequest} req
|
|
19
|
-
* @param {import("fastify").FastifyReply} reply
|
|
20
|
-
* @param {{ hlsSessionManager: import("../../../../services/hls-session-manager.js").HlsSessionManager }} deps
|
|
21
|
-
* @returns {Promise<void>}
|
|
22
|
-
*/
|
|
23
|
-
export async function handleApiTranscodeSessionNetReportPost(req, reply, { hlsSessionManager }) {
|
|
24
|
-
const sessionId = typeof req.params.sessionId === "string" ? req.params.sessionId : "";
|
|
25
|
-
const body = req.body && typeof req.body === "object" && !Array.isArray(req.body) ? req.body : {};
|
|
26
|
-
const linkMbps = Number(body.linkMbps);
|
|
27
|
-
const bufferedAheadSec = Number(body.bufferedAheadSec);
|
|
28
|
-
if (!sessionId || !Number.isFinite(linkMbps) || linkMbps <= 0 || !Number.isFinite(bufferedAheadSec) || bufferedAheadSec < 0) {
|
|
29
|
-
return reply.code(400).send({ error: "linkMbps (>0) and bufferedAheadSec (>=0) are required." });
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
// Neither is required, and neither can make a report invalid: they are what
|
|
33
|
-
// the proxy uses to tell the viewers of one session apart, and a report
|
|
34
|
-
// without them is still a truthful reading of somebody's link.
|
|
35
|
-
const consumerId = typeof body.consumerId === "string" ? body.consumerId.trim() : "";
|
|
36
|
-
// Whether the picture is moving. Absent from a page that does not say, and
|
|
37
|
-
// then the viewer counts as playing, which is what every page meant before it
|
|
38
|
-
// could say otherwise.
|
|
39
|
-
const playing = typeof body.playing === "boolean" ? body.playing : undefined;
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
1
|
+
/**
|
|
2
|
+
* Accept a viewer link report for a transcode session (adaptive bitrate).
|
|
3
|
+
* The browser measures its own data-channel throughput per segment fetch and
|
|
4
|
+
* posts a rolling median + its buffered seconds; the session manager's budget
|
|
5
|
+
* loop uses the latest report as the link-deficit downshift trigger.
|
|
6
|
+
*
|
|
7
|
+
* POST /api/transcode-sessions/:sessionId/net-report
|
|
8
|
+
* Body: { linkMbps: number, bufferedAheadSec: number,
|
|
9
|
+
* consumerId?: string, positionSeconds?: number }
|
|
10
|
+
*
|
|
11
|
+
* `consumerId` and `positionSeconds` say WHO is reporting and WHERE they are.
|
|
12
|
+
* A copied picture is one session shared by every viewer of it, so without them
|
|
13
|
+
* the proxy could only act on whichever viewer reported last. Both are
|
|
14
|
+
* optional: a browser that sends neither is treated exactly as before.
|
|
15
|
+
*
|
|
16
|
+
* Best-effort telemetry: invalid body → 400, unknown session → 404, ok → 204.
|
|
17
|
+
*
|
|
18
|
+
* @param {import("fastify").FastifyRequest} req
|
|
19
|
+
* @param {import("fastify").FastifyReply} reply
|
|
20
|
+
* @param {{ hlsSessionManager: import("../../../../services/hls-session-manager.js").HlsSessionManager }} deps
|
|
21
|
+
* @returns {Promise<void>}
|
|
22
|
+
*/
|
|
23
|
+
export async function handleApiTranscodeSessionNetReportPost(req, reply, { hlsSessionManager }) {
|
|
24
|
+
const sessionId = typeof req.params.sessionId === "string" ? req.params.sessionId : "";
|
|
25
|
+
const body = req.body && typeof req.body === "object" && !Array.isArray(req.body) ? req.body : {};
|
|
26
|
+
const linkMbps = Number(body.linkMbps);
|
|
27
|
+
const bufferedAheadSec = Number(body.bufferedAheadSec);
|
|
28
|
+
if (!sessionId || !Number.isFinite(linkMbps) || linkMbps <= 0 || !Number.isFinite(bufferedAheadSec) || bufferedAheadSec < 0) {
|
|
29
|
+
return reply.code(400).send({ error: "linkMbps (>0) and bufferedAheadSec (>=0) are required." });
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
// Neither is required, and neither can make a report invalid: they are what
|
|
33
|
+
// the proxy uses to tell the viewers of one session apart, and a report
|
|
34
|
+
// without them is still a truthful reading of somebody's link.
|
|
35
|
+
const consumerId = typeof body.consumerId === "string" ? body.consumerId.trim() : "";
|
|
36
|
+
// Whether the picture is moving. Absent from a page that does not say, and
|
|
37
|
+
// then the viewer counts as playing, which is what every page meant before it
|
|
38
|
+
// could say otherwise.
|
|
39
|
+
const playing = typeof body.playing === "boolean" ? body.playing : undefined;
|
|
40
|
+
// Whether the page is on screen, and whether the picture was pulled out of
|
|
41
|
+
// it. A hidden tab has its timers throttled, so it asks for nothing and looks
|
|
42
|
+
// exactly like a viewer holding a full cushion; picture-in-picture is the case
|
|
43
|
+
// that makes the distinction necessary, because there the tab is hidden and
|
|
44
|
+
// the viewer is watching. Absent from a page that does not say, and then the
|
|
45
|
+
// viewer is on screen, as every page meant before it could say otherwise.
|
|
46
|
+
const onScreen = typeof body.onScreen === "boolean" ? body.onScreen : undefined;
|
|
47
|
+
const inPictureInPicture =
|
|
48
|
+
typeof body.inPictureInPicture === "boolean" ? body.inPictureInPicture : undefined;
|
|
49
|
+
const positionSeconds = Number(body.positionSeconds);
|
|
50
|
+
const recorded = hlsSessionManager.recordNetReport(sessionId, {
|
|
51
|
+
linkMbps,
|
|
52
|
+
bufferedAheadSec,
|
|
53
|
+
consumerId,
|
|
54
|
+
playing,
|
|
55
|
+
onScreen,
|
|
56
|
+
inPictureInPicture,
|
|
57
|
+
positionSeconds:
|
|
58
|
+
Number.isFinite(positionSeconds) && positionSeconds >= 0 ? positionSeconds : undefined
|
|
59
|
+
});
|
|
60
|
+
if (!recorded) {
|
|
61
|
+
return reply.code(404).send({ error: "Transcode session was not found." });
|
|
62
|
+
}
|
|
63
|
+
return reply.code(204).send();
|
|
64
|
+
}
|
|
@@ -206,9 +206,25 @@ export class SwarmSelection {
|
|
|
206
206
|
* rebuild the second. Now there is one statement and two views of it, both
|
|
207
207
|
* computed here.
|
|
208
208
|
*
|
|
209
|
-
*
|
|
210
|
-
* the
|
|
211
|
-
*
|
|
209
|
+
* WHAT WILL BE READ SOON, WHICH IS NOT WHAT WILL BE DOWNLOADED SOON. Memory
|
|
210
|
+
* holds the first; the swarm is told the second; and the priority map states
|
|
211
|
+
* the second, over the whole rest of the film.
|
|
212
|
+
*
|
|
213
|
+
* `AHEAD` used to reach memory, and it is exactly the speculative lead: the
|
|
214
|
+
* map states one claimant per zone, so on a film with seven zones one `NEAR`
|
|
215
|
+
* and four `AHEAD` arrived here as five separate holders, each covering tens
|
|
216
|
+
* of megabytes. Field 2026-09-08: the store reported `5 reader(s) want 24
|
|
217
|
+
* piece(s) of 25 the store may hold (widest window 17)` — the union of what
|
|
218
|
+
* was declared equalled the whole capacity, so every admission had to evict a
|
|
219
|
+
* piece somebody had declared, and 100 of 1395 evictions did. Beside that,
|
|
220
|
+
* 6565 spills and 7575 revivals in 44 minutes with a median 0.0 s on disk, and
|
|
221
|
+
* 2138 h264 parse errors on a picture that was being COPIED.
|
|
222
|
+
*
|
|
223
|
+
* Raising the allowance does not touch it: a lead stated over the rest of the
|
|
224
|
+
* film grows to fill whatever memory it is given, and the ratio is unchanged.
|
|
225
|
+
* What belongs in memory is what a READ is stopped on and the little in front
|
|
226
|
+
* of it — the levels a read itself states — and those are `BLOCKED` and
|
|
227
|
+
* `NEAR`.
|
|
212
228
|
*
|
|
213
229
|
* @returns {void}
|
|
214
230
|
*/
|
|
@@ -218,7 +234,7 @@ export class SwarmSelection {
|
|
|
218
234
|
return;
|
|
219
235
|
}
|
|
220
236
|
const holding = new Set();
|
|
221
|
-
for (const urgency of [Urgency.BLOCKED, Urgency.NEAR
|
|
237
|
+
for (const urgency of [Urgency.BLOCKED, Urgency.NEAR]) {
|
|
222
238
|
for (const window of this.#register.at(urgency)) {
|
|
223
239
|
const range = this.#piecesFor(window);
|
|
224
240
|
if (!range) {
|