@genroc/eval-node 0.14.0 → 0.16.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.
- package/README.md +105 -298
- package/dist/eval.js +9 -17
- package/dist/import.js +46 -79
- package/dist/realm.js +8 -16
- package/dist/worker.js +30 -62
- package/eval.ts +13 -23
- package/import.ts +56 -88
- package/package.json +1 -1
- package/realm.ts +8 -16
- package/worker.ts +32 -65
package/import.ts
CHANGED
|
@@ -1,18 +1,12 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
// The code-phase resolver: manifest on stdin, `{"code": [...]}` on stdout,
|
|
3
|
-
// with
|
|
4
|
-
//
|
|
5
|
-
|
|
6
|
-
// Two modes, one binary: "types" writes the declarations an editor needs and returns no
|
|
7
|
-
// code; "build" typechecks and bundles. A separate types hook would mean a second `tsc`
|
|
8
|
-
// over the same project.
|
|
9
|
-
|
|
10
|
-
import { spawn } from "node:child_process";
|
|
2
|
+
// The code-phase resolver: manifest on stdin, `{"code": [...]}` on stdout, diagnostic on stderr
|
|
3
|
+
// with a non-zero exit (specs/source-resolution.md). Two modes share one `tsc` pass: "types"
|
|
4
|
+
// writes declarations only, "build" typechecks and bundles.
|
|
5
|
+
|
|
11
6
|
import { existsSync } from "node:fs";
|
|
12
|
-
import { access,
|
|
7
|
+
import { access, writeFile } from "node:fs/promises";
|
|
13
8
|
import { builtinModules } from "node:module";
|
|
14
|
-
import { dirname, join,
|
|
15
|
-
import { fileURLToPath } from "node:url";
|
|
9
|
+
import { dirname, join, resolve } from "node:path";
|
|
16
10
|
|
|
17
11
|
import commonjs from "@rollup/plugin-commonjs";
|
|
18
12
|
import json from "@rollup/plugin-json";
|
|
@@ -70,12 +64,6 @@ async function exists(path: string): Promise<boolean> {
|
|
|
70
64
|
}
|
|
71
65
|
}
|
|
72
66
|
|
|
73
|
-
/** Creates the parent directory, which `.genroc-cache/` relies on: nothing else makes it. */
|
|
74
|
-
async function write(path: string, content: string): Promise<void> {
|
|
75
|
-
await mkdir(dirname(path), { recursive: true });
|
|
76
|
-
await writeFile(path, content);
|
|
77
|
-
}
|
|
78
|
-
|
|
79
67
|
// ── JSON Schema → TypeScript ───────────────────────────────────────────────────
|
|
80
68
|
|
|
81
69
|
/** Only genroc's keyword set is handled; anything else its strict decoder would have
|
|
@@ -202,9 +190,8 @@ function typesPathFor(scriptPath: string): string {
|
|
|
202
190
|
|
|
203
191
|
// ── typecheck ──────────────────────────────────────────────────────────────────
|
|
204
192
|
|
|
205
|
-
/** The
|
|
206
|
-
*
|
|
207
|
-
* the project root: above it is not this project. */
|
|
193
|
+
/** The tsconfig the author's editor reads, so editor and apply agree. Stops at the project
|
|
194
|
+
* root. */
|
|
208
195
|
async function nearestTsconfig(
|
|
209
196
|
from: string,
|
|
210
197
|
root: string,
|
|
@@ -217,12 +204,7 @@ async function nearestTsconfig(
|
|
|
217
204
|
}
|
|
218
205
|
|
|
219
206
|
async function typecheck(sites: Located[]): Promise<void> {
|
|
220
|
-
//
|
|
221
|
-
// coexist with it. The suffix is what keeps the scratch area out of its way.
|
|
222
|
-
const dir = join(root, ".genroc-cache");
|
|
223
|
-
await write(join(dir, ".gitignore"), "*\n");
|
|
224
|
-
|
|
225
|
-
// One tsc per distinct base config: `extends` takes a single base, so merging two would
|
|
207
|
+
// One program per distinct base config: `extends` takes a single base, so merging two would
|
|
226
208
|
// check each script under the other author's options.
|
|
227
209
|
const groups = new Map<string, Located[]>();
|
|
228
210
|
for (const at of sites) {
|
|
@@ -232,10 +214,10 @@ async function typecheck(sites: Located[]): Promise<void> {
|
|
|
232
214
|
else groups.set(base, [at]);
|
|
233
215
|
}
|
|
234
216
|
|
|
235
|
-
|
|
217
|
+
const diagnostics: ts.Diagnostic[] = [];
|
|
236
218
|
for (const [base, group] of groups) {
|
|
237
219
|
const config: Record<string, unknown> = {
|
|
238
|
-
...(base ? { extends:
|
|
220
|
+
...(base ? { extends: base } : {}),
|
|
239
221
|
compilerOptions: {
|
|
240
222
|
noEmit: true,
|
|
241
223
|
strict: true,
|
|
@@ -246,46 +228,45 @@ async function typecheck(sites: Located[]): Promise<void> {
|
|
|
246
228
|
// `lib` DESCRIBES the realm and is written after `extends` so a base cannot widen it:
|
|
247
229
|
// a worker thread has no document, whatever an author's config claims.
|
|
248
230
|
lib: ["esnext", "webworker"],
|
|
249
|
-
// `types` is the author's
|
|
250
|
-
//
|
|
251
|
-
// base config there is nothing to opt in with, so the default stays none.
|
|
231
|
+
// `types` is the author's opt-in to node globals, which the realm has. With no base
|
|
232
|
+
// config there is nothing to opt in with, so it stays none.
|
|
252
233
|
...(base ? {} : { types: [] }),
|
|
253
234
|
},
|
|
254
|
-
files: group.flatMap((s) => [
|
|
255
|
-
relative(dir, s.file),
|
|
256
|
-
relative(dir, typesPathFor(s.file)),
|
|
257
|
-
]),
|
|
235
|
+
files: group.flatMap((s) => [s.file, typesPathFor(s.file)]),
|
|
258
236
|
// `files` overrides the base's, but a base `include` survives beside it and would
|
|
259
237
|
// drag the author's whole tree in, to be checked under the worker lib.
|
|
260
238
|
include: [],
|
|
261
239
|
};
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
240
|
+
// Never written; anchors `@types` lookup at the root. Not `tsconfig.json`: that is often the
|
|
241
|
+
// base it extends, and tsc refuses a circular extends.
|
|
242
|
+
const parsed = ts.parseJsonConfigFileContent(
|
|
243
|
+
config,
|
|
244
|
+
ts.sys,
|
|
245
|
+
root,
|
|
246
|
+
undefined,
|
|
247
|
+
join(root, "tsconfig.genroc.json"),
|
|
265
248
|
);
|
|
266
|
-
|
|
267
|
-
|
|
249
|
+
const program = ts.createProgram({
|
|
250
|
+
rootNames: parsed.fileNames,
|
|
251
|
+
options: parsed.options,
|
|
252
|
+
projectReferences: parsed.projectReferences,
|
|
253
|
+
configFileParsingDiagnostics: parsed.errors,
|
|
254
|
+
});
|
|
255
|
+
diagnostics.push(...parsed.errors, ...ts.getPreEmitDiagnostics(program));
|
|
268
256
|
}
|
|
269
|
-
}
|
|
270
257
|
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
proc.on("close", (c) => resolve(c ?? 1));
|
|
284
|
-
});
|
|
285
|
-
if (code !== 0) {
|
|
286
|
-
// tsc reports on stdout; the exit code IS the type check, so this is the diagnostic
|
|
287
|
-
// genctl surfaces and the reason a failed import never produces a string.
|
|
288
|
-
die([out, err].filter(Boolean).join("\n").trimEnd());
|
|
258
|
+
if (diagnostics.length > 0) {
|
|
259
|
+
// The diagnostics are the whole type check: this is what genctl surfaces, and the reason a
|
|
260
|
+
// failed import never produces a string.
|
|
261
|
+
die(
|
|
262
|
+
ts
|
|
263
|
+
.formatDiagnostics(diagnostics, {
|
|
264
|
+
getCanonicalFileName: (f) => f,
|
|
265
|
+
getCurrentDirectory: () => root,
|
|
266
|
+
getNewLine: () => "\n",
|
|
267
|
+
})
|
|
268
|
+
.trimEnd(),
|
|
269
|
+
);
|
|
289
270
|
}
|
|
290
271
|
}
|
|
291
272
|
|
|
@@ -315,11 +296,9 @@ const BUILTIN = new Set([
|
|
|
315
296
|
...builtinModules.map((m) => `node:${m}`),
|
|
316
297
|
]);
|
|
317
298
|
|
|
318
|
-
/** Resolves
|
|
319
|
-
*
|
|
320
|
-
*
|
|
321
|
-
* A package resolving to a `.d.ts` is declined — that is a type, not the implementation —
|
|
322
|
-
* which leaves node_modules to nodeResolve. */
|
|
299
|
+
/** Resolves through TYPESCRIPT under the typecheck's config, so a `paths` alias that compiles
|
|
300
|
+
* also bundles. A `.d.ts` resolution is declined (a type, not code), leaving node_modules to
|
|
301
|
+
* nodeResolve. */
|
|
323
302
|
function tsResolve(configPath: string | null): Plugin {
|
|
324
303
|
let options: ts.CompilerOptions = {};
|
|
325
304
|
if (configPath) {
|
|
@@ -349,14 +328,12 @@ function tsResolve(configPath: string | null): Plugin {
|
|
|
349
328
|
};
|
|
350
329
|
}
|
|
351
330
|
|
|
352
|
-
/**
|
|
353
|
-
*
|
|
354
|
-
* Bundling is entirely the importer's job, so a definition version pins its code forever. */
|
|
331
|
+
/** A self-contained ES module whose default export is the author's own, unwrapped. Bundling here
|
|
332
|
+
* means a definition version pins its code forever. */
|
|
355
333
|
async function bundle(at: Located): Promise<string> {
|
|
356
334
|
const site = at.site;
|
|
357
|
-
// Builtins are
|
|
358
|
-
//
|
|
359
|
-
// of a module that will not be there, which bundles clean and fails at runtime.
|
|
335
|
+
// Builtins are externalised; anything else unresolved is a REFUSAL, since rollup's default
|
|
336
|
+
// leaves an import that bundles clean and fails at runtime.
|
|
360
337
|
const built = await rollup({
|
|
361
338
|
input: at.file,
|
|
362
339
|
external: (id) => BUILTIN.has(id),
|
|
@@ -364,8 +341,7 @@ async function bundle(at: Located): Promise<string> {
|
|
|
364
341
|
tsResolve(await nearestTsconfig(dirname(at.file), root)),
|
|
365
342
|
nodeResolve({ extensions: [".ts", ".tsx", ".mjs", ".js", ".json"] }),
|
|
366
343
|
commonjs(),
|
|
367
|
-
//
|
|
368
|
-
// did natively; without it rollup hands the JSON to the JS parser.
|
|
344
|
+
// Inlines `.json` imports; without it rollup hands JSON to the JS parser.
|
|
369
345
|
json(),
|
|
370
346
|
transpile,
|
|
371
347
|
],
|
|
@@ -408,10 +384,8 @@ const root = process.cwd();
|
|
|
408
384
|
if (!manifest || !Array.isArray(manifest.processes))
|
|
409
385
|
die("stdin is not a genroc resolver manifest");
|
|
410
386
|
|
|
411
|
-
/**
|
|
412
|
-
*
|
|
413
|
-
* joining it to the definition's directory is this resolver's business: only it knows the
|
|
414
|
-
* argument is a path at all. */
|
|
387
|
+
/** Sites in manifest order, the order `code` must answer in. The argument is joined to the
|
|
388
|
+
* definition's directory here: only this resolver knows it is a path. */
|
|
415
389
|
type Located = { site: Site; where: ManifestProcess; file: string };
|
|
416
390
|
|
|
417
391
|
/** A pointer as the address it is, so a generated comment or an error can be pasted into
|
|
@@ -434,15 +408,10 @@ const located: Located[] = manifest.processes.flatMap((where) =>
|
|
|
434
408
|
})),
|
|
435
409
|
);
|
|
436
410
|
|
|
437
|
-
//
|
|
438
|
-
//
|
|
439
|
-
// `child` is the shape the scaffold uses — a call to a process that forwards to the evaluator —
|
|
440
|
-
// and `external` is the same request made directly.
|
|
411
|
+
// The `code`-field contract is this resolver's, not genctl's, so it checks the directive landed
|
|
412
|
+
// there: in a child call (the scaffold's shape) or an external task's input.
|
|
441
413
|
for (const at of located) {
|
|
442
|
-
//
|
|
443
|
-
// it the directive sits is the pointer. A child call is the shape the scaffold generates — to a
|
|
444
|
-
// process that forwards to the evaluator — and an external task is the same request made
|
|
445
|
-
// directly.
|
|
414
|
+
// The action's kind is a field; where in it the directive sits is the pointer.
|
|
446
415
|
const kind = at.site.level === "action" ? (at.site.action ?? "") : "";
|
|
447
416
|
const slot = at.site.pointer.slice(-2).join(".");
|
|
448
417
|
if ((kind !== "child" && kind !== "external") || slot !== "input.code") {
|
|
@@ -454,8 +423,7 @@ for (const at of located) {
|
|
|
454
423
|
}
|
|
455
424
|
}
|
|
456
425
|
|
|
457
|
-
// genctl
|
|
458
|
-
// does is the one that must say when it is not there.
|
|
426
|
+
// genctl does not know the argument is a file, so this resolver reports a missing one.
|
|
459
427
|
for (const at of located) {
|
|
460
428
|
if (!existsSync(at.file)) {
|
|
461
429
|
die(
|
|
@@ -484,7 +452,7 @@ for (const at of located) {
|
|
|
484
452
|
}
|
|
485
453
|
|
|
486
454
|
for (const at of byPath.values()) {
|
|
487
|
-
await
|
|
455
|
+
await writeFile(typesPathFor(at.file), declarations(at));
|
|
488
456
|
}
|
|
489
457
|
|
|
490
458
|
if (manifest.mode === "types") {
|
package/package.json
CHANGED
package/realm.ts
CHANGED
|
@@ -1,18 +1,13 @@
|
|
|
1
|
-
// The evaluation realm
|
|
2
|
-
//
|
|
3
|
-
// eval.ts owns the budget and does the killing; nothing here knows about time.
|
|
4
|
-
//
|
|
5
|
-
// Everything that touches the script's VALUE lives on this side of the boundary — loading,
|
|
6
|
-
// classifying, serialising — because this is the only realm the value exists in.
|
|
1
|
+
// The evaluation realm: one Worker per execution, killable mid-loop by eval.ts, which owns the
|
|
2
|
+
// budget. Everything touching the script's VALUE lives here, the only realm it exists in.
|
|
7
3
|
|
|
8
4
|
import { registerHooks } from "node:module";
|
|
9
5
|
import { parentPort } from "node:worker_threads";
|
|
10
6
|
|
|
11
7
|
import type { EvalFailure, FailureKind, WorkerReply, WorkerRequest } from "./eval.ts";
|
|
12
8
|
|
|
13
|
-
//
|
|
14
|
-
//
|
|
15
|
-
// the way it does everywhere else.
|
|
9
|
+
// IMPORTED under our own URL rather than compiled from a string, so frames carry the author's
|
|
10
|
+
// line numbers and builtin imports resolve normally.
|
|
16
11
|
const SCRIPT_URL = "script:main";
|
|
17
12
|
const STACK_BYTES = 2_048;
|
|
18
13
|
|
|
@@ -54,9 +49,8 @@ function safeText(v: unknown): string {
|
|
|
54
49
|
}
|
|
55
50
|
}
|
|
56
51
|
|
|
57
|
-
/**
|
|
58
|
-
*
|
|
59
|
-
* which is the script throwing. */
|
|
52
|
+
/** Unparseable code or an unresolvable import is broken code; anything else the import throws is
|
|
53
|
+
* the module's top level running, i.e. the script throwing. */
|
|
60
54
|
function unloadable(err: unknown): boolean {
|
|
61
55
|
const code = (err as { code?: unknown } | null)?.code;
|
|
62
56
|
return err instanceof SyntaxError || (typeof code === "string" && code.startsWith("ERR_MODULE"));
|
|
@@ -99,10 +93,8 @@ async function run(req: WorkerRequest): Promise<WorkerReply> {
|
|
|
99
93
|
}
|
|
100
94
|
}
|
|
101
95
|
|
|
102
|
-
//
|
|
103
|
-
//
|
|
104
|
-
// write's callback fires once the queue ahead of it has drained, which makes the reply a barrier
|
|
105
|
-
// for `console` and a direct process.stdout.write alike: both are this stream.
|
|
96
|
+
// eval.ts terminates this thread the moment the reply lands, while stdio may still be in the
|
|
97
|
+
// pipe. An empty write's callback fires once the queue drains, making the reply a barrier.
|
|
106
98
|
function flush(stream: NodeJS.WriteStream): Promise<void> {
|
|
107
99
|
return new Promise((resolve) => stream.write("", () => resolve()));
|
|
108
100
|
}
|
package/worker.ts
CHANGED
|
@@ -1,34 +1,21 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
// The queue worker: claims parked `external` script tasks
|
|
3
|
-
//
|
|
4
|
-
// nothing about the queue, which is what keeps the containment strategy swappable.
|
|
5
|
-
//
|
|
6
|
-
// See README.md for the contract, and specs/external-task-queue.md for the queue itself.
|
|
2
|
+
// The queue worker: claims parked `external` script tasks, evaluates each in its own realm, and
|
|
3
|
+
// answers. The only genroc-facing half (README.md; specs/external-task-queue.md).
|
|
7
4
|
|
|
8
5
|
import { readFileSync } from "node:fs";
|
|
9
6
|
import { Cancelled, evaluate, type EvalRequest, type FailureKind } from "./eval.ts";
|
|
10
7
|
|
|
11
8
|
const SERVER = (process.env.GENROC_SERVER ?? "http://localhost:8448").replace(/\/$/, "");
|
|
12
9
|
const WORKER_ID = process.env.WORKER_ID ?? `evaluator-${process.pid}`;
|
|
13
|
-
//
|
|
14
|
-
//
|
|
15
|
-
//
|
|
16
|
-
// trust least. specs/api-auth.md §5.
|
|
17
|
-
//
|
|
18
|
-
// Sent as a header rather than in the URL because Node's fetch REFUSES a URL carrying
|
|
19
|
-
// credentials ("Request cannot be constructed from a URL that includes credentials"), so the
|
|
20
|
-
// basic-auth-in-the-URL trick that works for genctl is not available here.
|
|
21
|
-
// GENROC_TOKEN_FILE is the mounted-secret shape: a credential in a file rather than an
|
|
22
|
-
// environment variable, so it stays out of `docker inspect` and out of the process environment
|
|
23
|
-
// any child inherits. The inline variable wins when both are set.
|
|
10
|
+
// Needs only the `worker` permission (specs/api-auth.md §5): this credential sits on the machine
|
|
11
|
+
// you trust least. A header, because Node's fetch refuses credentials in a URL. The file form
|
|
12
|
+
// keeps it out of `docker inspect` and child environments; the inline variable wins.
|
|
24
13
|
const TOKEN =
|
|
25
14
|
process.env.GENROC_TOKEN ??
|
|
26
15
|
(process.env.GENROC_TOKEN_FILE ? readFileSync(process.env.GENROC_TOKEN_FILE, "utf8").trim() : "");
|
|
27
16
|
const authHeaders: Record<string, string> = TOKEN ? { authorization: `Bearer ${TOKEN}` } : {};
|
|
28
|
-
//
|
|
29
|
-
//
|
|
30
|
-
// evaluator accepted every one of them. Here it claims what it can run and no more, so a
|
|
31
|
-
// backlog is a queue rather than 200 threads fighting over a core.
|
|
17
|
+
// The worker claims only what it can run, so a backlog is a queue rather than threads fighting
|
|
18
|
+
// over a core.
|
|
32
19
|
const CONCURRENCY = Number(process.env.CONCURRENCY ?? 4);
|
|
33
20
|
const POLL_MS = Number(process.env.POLL_MS ?? 250);
|
|
34
21
|
// The visibility timeout. Short, and renewed while work is in flight: a worker that dies
|
|
@@ -49,17 +36,15 @@ type QueueTask = {
|
|
|
49
36
|
raises?: Record<string, unknown>;
|
|
50
37
|
};
|
|
51
38
|
|
|
52
|
-
//
|
|
53
|
-
//
|
|
54
|
-
// into each task. A ref is a content hash, so it is immutable — the cache never invalidates.
|
|
39
|
+
// Large values arrive as refs; a bundle is one object per definition version, fetched once.
|
|
40
|
+
// Refs are content hashes, so the cache never invalidates.
|
|
55
41
|
const objectCache = new Map<string, unknown>();
|
|
56
42
|
|
|
57
43
|
async function fetchObject(ref: string): Promise<unknown> {
|
|
58
44
|
const cached = objectCache.get(ref);
|
|
59
45
|
if (cached !== undefined) return cached;
|
|
60
|
-
// Left to throw
|
|
61
|
-
//
|
|
62
|
-
// releases the claim, so the task returns to the queue.
|
|
46
|
+
// Left to throw: a task whose input cannot be fetched must not run against a missing value.
|
|
47
|
+
// The caller releases the claim.
|
|
63
48
|
const res = await fetch(`${SERVER}/api/objects/${encodeURIComponent(ref)}`, { headers: authHeaders });
|
|
64
49
|
if (!res.ok) throw new Error(`fetch object ${ref}: HTTP ${res.status}`);
|
|
65
50
|
const { data } = (await res.json()) as { data: string };
|
|
@@ -97,10 +82,8 @@ async function resolveObjects(job: QueueTask): Promise<unknown> {
|
|
|
97
82
|
}
|
|
98
83
|
|
|
99
84
|
async function call(path: string, body: unknown): Promise<{ ok: boolean; status: number; data: any }> {
|
|
100
|
-
// A network error is a REPLY
|
|
101
|
-
//
|
|
102
|
-
// unhandled rejection here kills it for a condition the next poll would clear. Status 0
|
|
103
|
-
// says "never reached the server", which is distinct from anything genroc answers.
|
|
85
|
+
// A network error is a REPLY (status 0, "never reached the server"), not a throw: a worker
|
|
86
|
+
// outlives restarts and deploys, and an unhandled rejection would kill it.
|
|
104
87
|
let res: Response;
|
|
105
88
|
try {
|
|
106
89
|
res = await fetch(SERVER + path, {
|
|
@@ -121,9 +104,8 @@ async function call(path: string, body: unknown): Promise<{ ok: boolean; status:
|
|
|
121
104
|
return { ok: res.ok, status: res.status, data };
|
|
122
105
|
}
|
|
123
106
|
|
|
124
|
-
/**
|
|
125
|
-
*
|
|
126
|
-
* as a compile_error — the nearest permanent kind, since no retry can fix the definition. */
|
|
107
|
+
/** A task input that is not an EvalRequest is the definition's fault, reported as compile_error:
|
|
108
|
+
* the nearest permanent kind, since no retry fixes the definition. */
|
|
127
109
|
function asEvalRequest(input: unknown): EvalRequest | string {
|
|
128
110
|
if (typeof input !== "object" || input === null) return "the task input is not an object";
|
|
129
111
|
const r = input as Record<string, unknown>;
|
|
@@ -135,18 +117,15 @@ function asEvalRequest(input: unknown): EvalRequest | string {
|
|
|
135
117
|
};
|
|
136
118
|
}
|
|
137
119
|
|
|
138
|
-
/**
|
|
139
|
-
*
|
|
140
|
-
* heartbeat and has to be delivered inward from there. */
|
|
120
|
+
/** genroc cannot call us, so a cancellation arrives on our own heartbeat and reaches the
|
|
121
|
+
* evaluation through the controller. */
|
|
141
122
|
type Running = { job: QueueTask; abort: AbortController };
|
|
142
123
|
|
|
143
124
|
const inFlight = new Map<string, Running>();
|
|
144
125
|
let running = true;
|
|
145
126
|
|
|
146
|
-
//
|
|
147
|
-
//
|
|
148
|
-
// buries the one line that mattered. Announce the TRANSITIONS instead: going away, and coming
|
|
149
|
-
// back. Silence in between is the report that nothing changed.
|
|
127
|
+
// Announce reachability TRANSITIONS only: polling several times a second would otherwise emit
|
|
128
|
+
// thousands of lines during a restart.
|
|
150
129
|
let serverReachable = true;
|
|
151
130
|
|
|
152
131
|
async function claim(n: number): Promise<QueueTask[]> {
|
|
@@ -158,9 +137,8 @@ async function claim(n: number): Promise<QueueTask[]> {
|
|
|
158
137
|
...(TASK_FILTER ? { task: TASK_FILTER } : {}),
|
|
159
138
|
});
|
|
160
139
|
if (!ok) {
|
|
161
|
-
// A credential problem is not transient, and polling through it looks like a healthy
|
|
162
|
-
// worker
|
|
163
|
-
// instead, so a supervisor restarts it and the failure is visible where it happened.
|
|
140
|
+
// A credential problem is not transient, and polling through it looks like a healthy idle
|
|
141
|
+
// worker. Exit, so a supervisor restarts it visibly.
|
|
164
142
|
if (status === 401 || status === 403) {
|
|
165
143
|
console.error(
|
|
166
144
|
`claim rejected (${status}): ${JSON.stringify(data)}\n` +
|
|
@@ -169,9 +147,7 @@ async function claim(n: number): Promise<QueueTask[]> {
|
|
|
169
147
|
);
|
|
170
148
|
process.exit(1);
|
|
171
149
|
}
|
|
172
|
-
// status 0
|
|
173
|
-
// network blip. Not an error to act on — the next poll clears it — so it is reported once
|
|
174
|
-
// and then waited out.
|
|
150
|
+
// status 0 (see call): a restart or blip the next poll clears, so it is reported once.
|
|
175
151
|
if (status === 0) {
|
|
176
152
|
if (serverReachable) {
|
|
177
153
|
serverReachable = false;
|
|
@@ -197,10 +173,8 @@ async function release(token: string): Promise<void> {
|
|
|
197
173
|
if (!ok) console.error(`release failed: ${JSON.stringify(data)}`);
|
|
198
174
|
}
|
|
199
175
|
|
|
200
|
-
/**
|
|
201
|
-
*
|
|
202
|
-
* not fit `raises`), and guessing again would only pick a second wrong answer. Release it, so
|
|
203
|
-
* the task returns to the queue and an operator sees it waiting rather than silently gone. */
|
|
176
|
+
/** A refused outcome is not retried with another: the worker does not satisfy the declared
|
|
177
|
+
* contract. Released, so an operator sees the task waiting rather than gone. */
|
|
204
178
|
async function answer(token: string, outcome: Record<string, unknown>): Promise<void> {
|
|
205
179
|
const { ok, data } = await call("/api/external-tasks/resolve", { token, ...outcome });
|
|
206
180
|
if (ok) return;
|
|
@@ -231,18 +205,15 @@ async function run(job: QueueTask, signal: AbortSignal): Promise<void> {
|
|
|
231
205
|
try {
|
|
232
206
|
result = await evaluate(req, signal);
|
|
233
207
|
} catch (err) {
|
|
234
|
-
// Cancelled is not a fault: the
|
|
235
|
-
//
|
|
236
|
-
// waiting out a lease nobody is serving.
|
|
208
|
+
// Cancelled is not a fault. Still released: the row is terminal so nothing re-claims it,
|
|
209
|
+
// but the release stops it waiting out a lease nobody serves.
|
|
237
210
|
if (err instanceof Cancelled) {
|
|
238
211
|
console.log(`cancelled: ${job.token}`);
|
|
239
212
|
await release(job.token);
|
|
240
213
|
return;
|
|
241
214
|
}
|
|
242
|
-
// The RUNNER faulted,
|
|
243
|
-
//
|
|
244
|
-
// it puts the task in front of a different worker instead of burning the definition's
|
|
245
|
-
// on_error budget on this one's bad day.
|
|
215
|
+
// The RUNNER faulted, the one retryable class. Releasing is how a queue spells "retryable",
|
|
216
|
+
// and it reaches another worker without spending the definition's on_error budget.
|
|
246
217
|
console.error(`evaluator fault on ${job.token}: ${err instanceof Error ? err.message : String(err)}`);
|
|
247
218
|
await release(job.token);
|
|
248
219
|
return;
|
|
@@ -278,17 +249,13 @@ async function renewLoop(): Promise<void> {
|
|
|
278
249
|
});
|
|
279
250
|
if (!ok) continue;
|
|
280
251
|
|
|
281
|
-
//
|
|
282
|
-
//
|
|
283
|
-
// keep burning a core on work an operator has already stopped. The release rides run()'s
|
|
284
|
-
// own catch, so nothing is released twice.
|
|
252
|
+
// Abort first rather than let a stopped script burn a core; the release rides run()'s
|
|
253
|
+
// catch, so nothing is released twice.
|
|
285
254
|
for (const token of (data?.cancelled ?? []) as string[]) {
|
|
286
255
|
inFlight.get(token)?.abort.abort();
|
|
287
256
|
}
|
|
288
|
-
// Lost:
|
|
289
|
-
//
|
|
290
|
-
// is too short for what these scripts actually take. Deliberately NOT released: the claim
|
|
291
|
-
// is the new holder's, and releasing would bump the epoch out from under it.
|
|
257
|
+
// Lost: another worker holds it now and our answer will be refused; logged as the sign that
|
|
258
|
+
// LEASE_MS is too short. NOT released: that would bump the epoch out from under the holder.
|
|
292
259
|
const lost = (data?.lost ?? []) as string[];
|
|
293
260
|
if (lost.length) {
|
|
294
261
|
console.error(`lost ${lost.length}/${tokens.length} claims; a lease lapsed under load`);
|