@torrent-tv/proxy 2.62.0 → 2.63.0

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.
@@ -19,7 +19,7 @@
19
19
  * runtime already maintains.
20
20
  */
21
21
 
22
- import { readFile } from "node:fs/promises";
22
+ import { readFile, statfs } from "node:fs/promises";
23
23
  import os from "node:os";
24
24
 
25
25
  /** How often the reading is taken and written. */
@@ -86,6 +86,55 @@ export async function availableMemory() {
86
86
  return { bytes: os.freemem(), measured: false };
87
87
  }
88
88
 
89
+ /**
90
+ * Anonymous memory this process holds, from the kernel's own rollup.
91
+ *
92
+ * `process.memoryUsage()` sees what V8 knows about. It cannot see memory the
93
+ * allocator has taken and not returned, and on musl — which is what the addon
94
+ * runs on — a heavy churn of 8 MiB pieces leaves exactly that. The rollup's
95
+ * `Anonymous` counts every mapping backed by nothing but memory, which is
96
+ * where both a live `SharedArrayBuffer` and a freed-but-retained span sit, so
97
+ * the difference between it and what the isolates admit to is the size of what
98
+ * neither can explain (roadmap item 2, step 4).
99
+ *
100
+ * @returns {Promise<number | null>} Bytes, or null off Linux.
101
+ */
102
+ export async function readAnonymousMemory() {
103
+ try {
104
+ const text = await readFile("/proc/self/smaps_rollup", "utf8");
105
+ const match = /^Anonymous:\s+(\d+)\s+kB$/m.exec(text);
106
+ if (match) {
107
+ return Number(match[1]) * 1024;
108
+ }
109
+ } catch {
110
+ // silent-ok: not Linux, or the kernel is too old for the rollup. The line
111
+ // simply leaves the term out rather than printing a worse one.
112
+ }
113
+ return null;
114
+ }
115
+
116
+ /**
117
+ * How much room is left where this proxy spills pieces and writes segments.
118
+ *
119
+ * A budget for memory alone is half a budget: pieces evicted from memory go to
120
+ * disk, so a store that is well behaved about RAM can still fill the card an
121
+ * addon host boots from. Both limits are the machine's, and neither was
122
+ * measured before (roadmap item 2).
123
+ *
124
+ * @param {string} directory
125
+ * @returns {Promise<number | null>} Bytes free, or null where it cannot be read.
126
+ */
127
+ export async function readDiskFree(directory) {
128
+ try {
129
+ const stats = await statfs(directory);
130
+ return Number(stats.bavail) * Number(stats.bsize);
131
+ } catch {
132
+ // silent-ok: `statfs` is not everywhere, and a missing disk figure must not
133
+ // cost the memory reading beside it.
134
+ }
135
+ return null;
136
+ }
137
+
89
138
  /**
90
139
  * Render a size the way a person reads one.
91
140
  *
@@ -104,26 +153,61 @@ function megabytes(bytes) {
104
153
  * count is meaningless without the piece size, and the piece size differs per
105
154
  * torrent — on the film this proxy died under, 63 pieces meant 504 MB.
106
155
  *
156
+ * Two scopes, because two things are being asked and only one of them is
157
+ * per-thread. `rss` and the kernel's rollup belong to the PROCESS, so they are
158
+ * read once, on the main thread. The heap, external and arrayBuffer figures
159
+ * belong to an ISOLATE, and the torrent worker's are the ones that matter —
160
+ * the piece pool is a `SharedArrayBuffer` allocated there, which the main
161
+ * isolate cannot see at all. Reporting only the main thread's was half the
162
+ * reason 650 MB of a 893 MB process had no explanation on 2026-08-28.
163
+ *
107
164
  * @param {Object} reading
165
+ * @param {"process" | "thread"} [reading.scope]
166
+ * @param {string} [reading.label] - Which thread the isolate figures are of.
108
167
  * @param {{ rss: number, heapUsed: number, heapTotal: number, external: number, arrayBuffers: number }} reading.process
109
- * @param {number} reading.availableBytes
110
- * @param {boolean} reading.availableMeasured
111
- * @param {{ name: string, residentBytes: number, budgetBytes: number }[]} [reading.stores]
168
+ * @param {number} [reading.availableBytes]
169
+ * @param {boolean} [reading.availableMeasured]
170
+ * @param {number | null} [reading.anonymousBytes]
171
+ * @param {number | null} [reading.diskFreeBytes]
172
+ * @param {{ name: string, residentBytes: number, committedBytes: number, spilledBytes: number, budgetBytes: number }[]} [reading.stores]
112
173
  * @returns {string}
113
174
  */
114
- export function describeMemory({ process: usage, availableBytes, availableMeasured, stores = [] }) {
115
- const storeResident = stores.reduce((total, store) => total + (store.residentBytes || 0), 0);
116
- const storeBudget = stores.reduce((total, store) => total + (store.budgetBytes || 0), 0);
175
+ export function describeMemory({
176
+ scope = "process",
177
+ label = "",
178
+ process: usage,
179
+ availableBytes,
180
+ availableMeasured,
181
+ anonymousBytes = null,
182
+ diskFreeBytes = null,
183
+ stores = []
184
+ }) {
185
+ const total = (field) => stores.reduce((sum, store) => sum + (store[field] || 0), 0);
186
+ const storeResident = total("residentBytes");
187
+ const storeCommitted = total("committedBytes");
188
+ const storeSpilled = total("spilledBytes");
189
+ const storeBudget = total("budgetBytes");
190
+ // Holding and having taken are different quantities, and the gap between
191
+ // them is the whole of the growth this series exists to find: the pool only
192
+ // grows, so a spilled piece frees a slot and no memory.
117
193
  const storesPart = stores.length === 0
118
194
  ? "no torrent stores"
119
- : `${stores.length} torrent store(s) holding ${megabytes(storeResident)} ` +
120
- `of ${megabytes(storeBudget)} allowed`;
195
+ : `${stores.length} torrent store(s) holding ${megabytes(storeResident)}, ` +
196
+ `committed ${megabytes(storeCommitted)} of ${megabytes(storeBudget)} allowed, ` +
197
+ `${megabytes(storeSpilled)} spilled to disk`;
198
+ const isolate =
199
+ `heap=${megabytes(usage.heapUsed)}/${megabytes(usage.heapTotal)} ` +
200
+ `external=${megabytes(usage.external)} arrayBuffers=${megabytes(usage.arrayBuffers)}`;
201
+ if (scope === "thread") {
202
+ return `memory (${label || "thread"}): ${isolate}; ${storesPart}`;
203
+ }
121
204
  return (
122
- `memory: rss=${megabytes(usage.rss)} heap=${megabytes(usage.heapUsed)}/${megabytes(usage.heapTotal)} ` +
123
- `external=${megabytes(usage.external)} arrayBuffers=${megabytes(usage.arrayBuffers)}; ` +
205
+ `memory: rss=${megabytes(usage.rss)} ${isolate}` +
206
+ `${anonymousBytes === null ? "" : ` anon=${megabytes(anonymousBytes)}`}; ` +
124
207
  `${storesPart}; ` +
125
- `machine has ${megabytes(availableBytes)} available` +
126
- `${availableMeasured ? "" : " (estimated — /proc/meminfo could not be read)"}`
208
+ `machine has ${megabytes(availableBytes ?? 0)} available` +
209
+ `${availableMeasured ? "" : " (estimated — /proc/meminfo could not be read)"}` +
210
+ `${diskFreeBytes === null ? "" : `, ${megabytes(diskFreeBytes)} free on disk`}`
127
211
  );
128
212
  }
129
213
 
@@ -133,13 +217,25 @@ export function describeMemory({ process: usage, availableBytes, availableMeasur
133
217
  * @param {Object} options
134
218
  * @param {(message: string) => void} options.log
135
219
  * @param {() => { name: string, residentBytes: number, budgetBytes: number }[]} [options.readStores]
220
+ * @param {"process" | "thread"} [options.scope] - `thread` leaves out the
221
+ * process-wide figures, so the torrent worker can report its own isolate
222
+ * without reading /proc twice.
223
+ * @param {string} [options.label] - Which thread the isolate figures are of.
224
+ * @param {string} [options.diskPath] - Where pieces spill, for the free-space
225
+ * reading. Omitted, the disk term is left out rather than guessed.
136
226
  * @param {number} [options.intervalMs]
137
227
  * @returns {{ stop: () => void }}
138
228
  */
139
- export function startMemoryReport({ log, readStores, intervalMs = MEMORY_REPORT_INTERVAL_MS }) {
229
+ export function startMemoryReport({
230
+ log,
231
+ readStores,
232
+ scope = "process",
233
+ label = "",
234
+ diskPath = "",
235
+ intervalMs = MEMORY_REPORT_INTERVAL_MS
236
+ }) {
140
237
  const tick = async () => {
141
238
  try {
142
- const { bytes, measured } = await availableMemory();
143
239
  let stores = [];
144
240
  try {
145
241
  stores = typeof readStores === "function" ? readStores() ?? [] : [];
@@ -147,10 +243,19 @@ export function startMemoryReport({ log, readStores, intervalMs = MEMORY_REPORT_
147
243
  // silent-ok: a store list that cannot be read must not stop the reading
148
244
  // that matters, which is the process's own.
149
245
  }
246
+ if (scope === "thread") {
247
+ log(describeMemory({ scope, label, process: readProcessMemory(), stores }));
248
+ return;
249
+ }
250
+ const { bytes, measured } = await availableMemory();
150
251
  log(describeMemory({
252
+ scope,
253
+ label,
151
254
  process: readProcessMemory(),
152
255
  availableBytes: bytes,
153
256
  availableMeasured: measured,
257
+ anonymousBytes: await readAnonymousMemory(),
258
+ diskFreeBytes: diskPath ? await readDiskFree(diskPath) : null,
154
259
  stores
155
260
  }));
156
261
  } catch {