@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/dist/import.js
CHANGED
|
@@ -1,17 +1,11 @@
|
|
|
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
|
-
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.
|
|
10
5
|
import { existsSync } from "node:fs";
|
|
11
|
-
import { access,
|
|
6
|
+
import { access, writeFile } from "node:fs/promises";
|
|
12
7
|
import { builtinModules } from "node:module";
|
|
13
|
-
import { dirname, join,
|
|
14
|
-
import { fileURLToPath } from "node:url";
|
|
8
|
+
import { dirname, join, resolve } from "node:path";
|
|
15
9
|
import commonjs from "@rollup/plugin-commonjs";
|
|
16
10
|
import json from "@rollup/plugin-json";
|
|
17
11
|
import { nodeResolve } from "@rollup/plugin-node-resolve";
|
|
@@ -30,11 +24,6 @@ async function exists(path) {
|
|
|
30
24
|
return false;
|
|
31
25
|
}
|
|
32
26
|
}
|
|
33
|
-
/** Creates the parent directory, which `.genroc-cache/` relies on: nothing else makes it. */
|
|
34
|
-
async function write(path, content) {
|
|
35
|
-
await mkdir(dirname(path), { recursive: true });
|
|
36
|
-
await writeFile(path, content);
|
|
37
|
-
}
|
|
38
27
|
// ── JSON Schema → TypeScript ───────────────────────────────────────────────────
|
|
39
28
|
/** Only genroc's keyword set is handled; anything else its strict decoder would have
|
|
40
29
|
* refused before this ran (internal/schema, allowedKeywords). */
|
|
@@ -144,9 +133,8 @@ function typesPathFor(scriptPath) {
|
|
|
144
133
|
return scriptPath.replace(/\.[^.\/]+$/, "") + ".genroc.d.ts";
|
|
145
134
|
}
|
|
146
135
|
// ── typecheck ──────────────────────────────────────────────────────────────────
|
|
147
|
-
/** The
|
|
148
|
-
*
|
|
149
|
-
* the project root: above it is not this project. */
|
|
136
|
+
/** The tsconfig the author's editor reads, so editor and apply agree. Stops at the project
|
|
137
|
+
* root. */
|
|
150
138
|
async function nearestTsconfig(from, root) {
|
|
151
139
|
for (let dir = from;; dir = dirname(dir)) {
|
|
152
140
|
const candidate = join(dir, "tsconfig.json");
|
|
@@ -157,11 +145,7 @@ async function nearestTsconfig(from, root) {
|
|
|
157
145
|
}
|
|
158
146
|
}
|
|
159
147
|
async function typecheck(sites) {
|
|
160
|
-
//
|
|
161
|
-
// coexist with it. The suffix is what keeps the scratch area out of its way.
|
|
162
|
-
const dir = join(root, ".genroc-cache");
|
|
163
|
-
await write(join(dir, ".gitignore"), "*\n");
|
|
164
|
-
// One tsc per distinct base config: `extends` takes a single base, so merging two would
|
|
148
|
+
// One program per distinct base config: `extends` takes a single base, so merging two would
|
|
165
149
|
// check each script under the other author's options.
|
|
166
150
|
const groups = new Map();
|
|
167
151
|
for (const at of sites) {
|
|
@@ -172,10 +156,10 @@ async function typecheck(sites) {
|
|
|
172
156
|
else
|
|
173
157
|
groups.set(base, [at]);
|
|
174
158
|
}
|
|
175
|
-
|
|
159
|
+
const diagnostics = [];
|
|
176
160
|
for (const [base, group] of groups) {
|
|
177
161
|
const config = {
|
|
178
|
-
...(base ? { extends:
|
|
162
|
+
...(base ? { extends: base } : {}),
|
|
179
163
|
compilerOptions: {
|
|
180
164
|
noEmit: true,
|
|
181
165
|
strict: true,
|
|
@@ -186,42 +170,36 @@ async function typecheck(sites) {
|
|
|
186
170
|
// `lib` DESCRIBES the realm and is written after `extends` so a base cannot widen it:
|
|
187
171
|
// a worker thread has no document, whatever an author's config claims.
|
|
188
172
|
lib: ["esnext", "webworker"],
|
|
189
|
-
// `types` is the author's
|
|
190
|
-
//
|
|
191
|
-
// base config there is nothing to opt in with, so the default stays none.
|
|
173
|
+
// `types` is the author's opt-in to node globals, which the realm has. With no base
|
|
174
|
+
// config there is nothing to opt in with, so it stays none.
|
|
192
175
|
...(base ? {} : { types: [] }),
|
|
193
176
|
},
|
|
194
|
-
files: group.flatMap((s) => [
|
|
195
|
-
relative(dir, s.file),
|
|
196
|
-
relative(dir, typesPathFor(s.file)),
|
|
197
|
-
]),
|
|
177
|
+
files: group.flatMap((s) => [s.file, typesPathFor(s.file)]),
|
|
198
178
|
// `files` overrides the base's, but a base `include` survives beside it and would
|
|
199
179
|
// drag the author's whole tree in, to be checked under the worker lib.
|
|
200
180
|
include: [],
|
|
201
181
|
};
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
182
|
+
// Never written; anchors `@types` lookup at the root. Not `tsconfig.json`: that is often the
|
|
183
|
+
// base it extends, and tsc refuses a circular extends.
|
|
184
|
+
const parsed = ts.parseJsonConfigFileContent(config, ts.sys, root, undefined, join(root, "tsconfig.genroc.json"));
|
|
185
|
+
const program = ts.createProgram({
|
|
186
|
+
rootNames: parsed.fileNames,
|
|
187
|
+
options: parsed.options,
|
|
188
|
+
projectReferences: parsed.projectReferences,
|
|
189
|
+
configFileParsingDiagnostics: parsed.errors,
|
|
190
|
+
});
|
|
191
|
+
diagnostics.push(...parsed.errors, ...ts.getPreEmitDiagnostics(program));
|
|
205
192
|
}
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
proc.stderr.on("data", (c) => (err += c));
|
|
217
|
-
const code = await new Promise((resolve, reject) => {
|
|
218
|
-
proc.on("error", reject);
|
|
219
|
-
proc.on("close", (c) => resolve(c ?? 1));
|
|
220
|
-
});
|
|
221
|
-
if (code !== 0) {
|
|
222
|
-
// tsc reports on stdout; the exit code IS the type check, so this is the diagnostic
|
|
223
|
-
// genctl surfaces and the reason a failed import never produces a string.
|
|
224
|
-
die([out, err].filter(Boolean).join("\n").trimEnd());
|
|
193
|
+
if (diagnostics.length > 0) {
|
|
194
|
+
// The diagnostics are the whole type check: this is what genctl surfaces, and the reason a
|
|
195
|
+
// failed import never produces a string.
|
|
196
|
+
die(ts
|
|
197
|
+
.formatDiagnostics(diagnostics, {
|
|
198
|
+
getCanonicalFileName: (f) => f,
|
|
199
|
+
getCurrentDirectory: () => root,
|
|
200
|
+
getNewLine: () => "\n",
|
|
201
|
+
})
|
|
202
|
+
.trimEnd());
|
|
225
203
|
}
|
|
226
204
|
}
|
|
227
205
|
// ── bundle ─────────────────────────────────────────────────────────────────────
|
|
@@ -248,11 +226,9 @@ const BUILTIN = new Set([
|
|
|
248
226
|
...builtinModules,
|
|
249
227
|
...builtinModules.map((m) => `node:${m}`),
|
|
250
228
|
]);
|
|
251
|
-
/** Resolves
|
|
252
|
-
*
|
|
253
|
-
*
|
|
254
|
-
* A package resolving to a `.d.ts` is declined — that is a type, not the implementation —
|
|
255
|
-
* which leaves node_modules to nodeResolve. */
|
|
229
|
+
/** Resolves through TYPESCRIPT under the typecheck's config, so a `paths` alias that compiles
|
|
230
|
+
* also bundles. A `.d.ts` resolution is declined (a type, not code), leaving node_modules to
|
|
231
|
+
* nodeResolve. */
|
|
256
232
|
function tsResolve(configPath) {
|
|
257
233
|
let options = {};
|
|
258
234
|
if (configPath) {
|
|
@@ -273,14 +249,12 @@ function tsResolve(configPath) {
|
|
|
273
249
|
},
|
|
274
250
|
};
|
|
275
251
|
}
|
|
276
|
-
/**
|
|
277
|
-
*
|
|
278
|
-
* Bundling is entirely the importer's job, so a definition version pins its code forever. */
|
|
252
|
+
/** A self-contained ES module whose default export is the author's own, unwrapped. Bundling here
|
|
253
|
+
* means a definition version pins its code forever. */
|
|
279
254
|
async function bundle(at) {
|
|
280
255
|
const site = at.site;
|
|
281
|
-
// Builtins are
|
|
282
|
-
//
|
|
283
|
-
// of a module that will not be there, which bundles clean and fails at runtime.
|
|
256
|
+
// Builtins are externalised; anything else unresolved is a REFUSAL, since rollup's default
|
|
257
|
+
// leaves an import that bundles clean and fails at runtime.
|
|
284
258
|
const built = await rollup({
|
|
285
259
|
input: at.file,
|
|
286
260
|
external: (id) => BUILTIN.has(id),
|
|
@@ -288,8 +262,7 @@ async function bundle(at) {
|
|
|
288
262
|
tsResolve(await nearestTsconfig(dirname(at.file), root)),
|
|
289
263
|
nodeResolve({ extensions: [".ts", ".tsx", ".mjs", ".js", ".json"] }),
|
|
290
264
|
commonjs(),
|
|
291
|
-
//
|
|
292
|
-
// did natively; without it rollup hands the JSON to the JS parser.
|
|
265
|
+
// Inlines `.json` imports; without it rollup hands JSON to the JS parser.
|
|
293
266
|
json(),
|
|
294
267
|
transpile,
|
|
295
268
|
],
|
|
@@ -339,15 +312,10 @@ const located = manifest.processes.flatMap((where) => where.sites.map((site) =>
|
|
|
339
312
|
where,
|
|
340
313
|
file: resolve(where.dir, site.argument),
|
|
341
314
|
})));
|
|
342
|
-
//
|
|
343
|
-
//
|
|
344
|
-
// `child` is the shape the scaffold uses — a call to a process that forwards to the evaluator —
|
|
345
|
-
// and `external` is the same request made directly.
|
|
315
|
+
// The `code`-field contract is this resolver's, not genctl's, so it checks the directive landed
|
|
316
|
+
// there: in a child call (the scaffold's shape) or an external task's input.
|
|
346
317
|
for (const at of located) {
|
|
347
|
-
//
|
|
348
|
-
// it the directive sits is the pointer. A child call is the shape the scaffold generates — to a
|
|
349
|
-
// process that forwards to the evaluator — and an external task is the same request made
|
|
350
|
-
// directly.
|
|
318
|
+
// The action's kind is a field; where in it the directive sits is the pointer.
|
|
351
319
|
const kind = at.site.level === "action" ? (at.site.action ?? "") : "";
|
|
352
320
|
const slot = at.site.pointer.slice(-2).join(".");
|
|
353
321
|
if ((kind !== "child" && kind !== "external") || slot !== "input.code") {
|
|
@@ -356,8 +324,7 @@ for (const at of located) {
|
|
|
356
324
|
`${kind ? `a ${kind} task's ` : ""}\`${slot}\`.`);
|
|
357
325
|
}
|
|
358
326
|
}
|
|
359
|
-
// genctl
|
|
360
|
-
// does is the one that must say when it is not there.
|
|
327
|
+
// genctl does not know the argument is a file, so this resolver reports a missing one.
|
|
361
328
|
for (const at of located) {
|
|
362
329
|
if (!existsSync(at.file)) {
|
|
363
330
|
die(`${join(at.where.dir, at.where.file)}: ${address(at.site.pointer)}: ` +
|
|
@@ -378,7 +345,7 @@ for (const at of located) {
|
|
|
378
345
|
byPath.set(at.file, at);
|
|
379
346
|
}
|
|
380
347
|
for (const at of byPath.values()) {
|
|
381
|
-
await
|
|
348
|
+
await writeFile(typesPathFor(at.file), declarations(at));
|
|
382
349
|
}
|
|
383
350
|
if (manifest.mode === "types") {
|
|
384
351
|
console.log(JSON.stringify(manifest, null, 2));
|
package/dist/realm.js
CHANGED
|
@@ -1,9 +1,5 @@
|
|
|
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
|
var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
|
|
8
4
|
if (typeof path === "string" && /^\.\.?\//.test(path)) {
|
|
9
5
|
return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
|
|
@@ -14,9 +10,8 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
|
|
|
14
10
|
};
|
|
15
11
|
import { registerHooks } from "node:module";
|
|
16
12
|
import { parentPort } from "node:worker_threads";
|
|
17
|
-
//
|
|
18
|
-
//
|
|
19
|
-
// the way it does everywhere else.
|
|
13
|
+
// IMPORTED under our own URL rather than compiled from a string, so frames carry the author's
|
|
14
|
+
// line numbers and builtin imports resolve normally.
|
|
20
15
|
const SCRIPT_URL = "script:main";
|
|
21
16
|
const STACK_BYTES = 2_048;
|
|
22
17
|
// The only channel a load hook has to the source. Written per request and read once — a realm
|
|
@@ -54,9 +49,8 @@ function safeText(v) {
|
|
|
54
49
|
return String(v);
|
|
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) {
|
|
61
55
|
const code = err?.code;
|
|
62
56
|
return err instanceof SyntaxError || (typeof code === "string" && code.startsWith("ERR_MODULE"));
|
|
@@ -97,10 +91,8 @@ async function run(req) {
|
|
|
97
91
|
return { ok: false, failure: describe(err, "nonserializable") };
|
|
98
92
|
}
|
|
99
93
|
}
|
|
100
|
-
//
|
|
101
|
-
//
|
|
102
|
-
// write's callback fires once the queue ahead of it has drained, which makes the reply a barrier
|
|
103
|
-
// for `console` and a direct process.stdout.write alike: both are this stream.
|
|
94
|
+
// eval.ts terminates this thread the moment the reply lands, while stdio may still be in the
|
|
95
|
+
// pipe. An empty write's callback fires once the queue drains, making the reply a barrier.
|
|
104
96
|
function flush(stream) {
|
|
105
97
|
return new Promise((resolve) => stream.write("", () => resolve()));
|
|
106
98
|
}
|
package/dist/worker.js
CHANGED
|
@@ -1,31 +1,18 @@
|
|
|
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
|
import { readFileSync } from "node:fs";
|
|
8
5
|
import { Cancelled, evaluate } from "./eval.js";
|
|
9
6
|
const SERVER = (process.env.GENROC_SERVER ?? "http://localhost:8448").replace(/\/$/, "");
|
|
10
7
|
const WORKER_ID = process.env.WORKER_ID ?? `evaluator-${process.pid}`;
|
|
11
|
-
//
|
|
12
|
-
//
|
|
13
|
-
//
|
|
14
|
-
// trust least. specs/api-auth.md §5.
|
|
15
|
-
//
|
|
16
|
-
// Sent as a header rather than in the URL because Node's fetch REFUSES a URL carrying
|
|
17
|
-
// credentials ("Request cannot be constructed from a URL that includes credentials"), so the
|
|
18
|
-
// basic-auth-in-the-URL trick that works for genctl is not available here.
|
|
19
|
-
// GENROC_TOKEN_FILE is the mounted-secret shape: a credential in a file rather than an
|
|
20
|
-
// environment variable, so it stays out of `docker inspect` and out of the process environment
|
|
21
|
-
// any child inherits. The inline variable wins when both are set.
|
|
8
|
+
// Needs only the `worker` permission (specs/api-auth.md §5): this credential sits on the machine
|
|
9
|
+
// you trust least. A header, because Node's fetch refuses credentials in a URL. The file form
|
|
10
|
+
// keeps it out of `docker inspect` and child environments; the inline variable wins.
|
|
22
11
|
const TOKEN = process.env.GENROC_TOKEN ??
|
|
23
12
|
(process.env.GENROC_TOKEN_FILE ? readFileSync(process.env.GENROC_TOKEN_FILE, "utf8").trim() : "");
|
|
24
13
|
const authHeaders = TOKEN ? { authorization: `Bearer ${TOKEN}` } : {};
|
|
25
|
-
//
|
|
26
|
-
//
|
|
27
|
-
// evaluator accepted every one of them. Here it claims what it can run and no more, so a
|
|
28
|
-
// backlog is a queue rather than 200 threads fighting over a core.
|
|
14
|
+
// The worker claims only what it can run, so a backlog is a queue rather than threads fighting
|
|
15
|
+
// over a core.
|
|
29
16
|
const CONCURRENCY = Number(process.env.CONCURRENCY ?? 4);
|
|
30
17
|
const POLL_MS = Number(process.env.POLL_MS ?? 250);
|
|
31
18
|
// The visibility timeout. Short, and renewed while work is in flight: a worker that dies
|
|
@@ -34,17 +21,15 @@ const LEASE_MS = Number(process.env.LEASE_MS ?? 30_000);
|
|
|
34
21
|
const RENEW_MS = Math.max(1_000, Math.floor(LEASE_MS / 3));
|
|
35
22
|
const PROCESS_FILTER = process.env.PROCESS ?? "";
|
|
36
23
|
const TASK_FILTER = process.env.TASK ?? "";
|
|
37
|
-
//
|
|
38
|
-
//
|
|
39
|
-
// into each task. A ref is a content hash, so it is immutable — the cache never invalidates.
|
|
24
|
+
// Large values arrive as refs; a bundle is one object per definition version, fetched once.
|
|
25
|
+
// Refs are content hashes, so the cache never invalidates.
|
|
40
26
|
const objectCache = new Map();
|
|
41
27
|
async function fetchObject(ref) {
|
|
42
28
|
const cached = objectCache.get(ref);
|
|
43
29
|
if (cached !== undefined)
|
|
44
30
|
return cached;
|
|
45
|
-
// Left to throw
|
|
46
|
-
//
|
|
47
|
-
// releases the claim, so the task returns to the queue.
|
|
31
|
+
// Left to throw: a task whose input cannot be fetched must not run against a missing value.
|
|
32
|
+
// The caller releases the claim.
|
|
48
33
|
const res = await fetch(`${SERVER}/api/objects/${encodeURIComponent(ref)}`, { headers: authHeaders });
|
|
49
34
|
if (!res.ok)
|
|
50
35
|
throw new Error(`fetch object ${ref}: HTTP ${res.status}`);
|
|
@@ -84,10 +69,8 @@ async function resolveObjects(job) {
|
|
|
84
69
|
return input;
|
|
85
70
|
}
|
|
86
71
|
async function call(path, body) {
|
|
87
|
-
// A network error is a REPLY
|
|
88
|
-
//
|
|
89
|
-
// unhandled rejection here kills it for a condition the next poll would clear. Status 0
|
|
90
|
-
// says "never reached the server", which is distinct from anything genroc answers.
|
|
72
|
+
// A network error is a REPLY (status 0, "never reached the server"), not a throw: a worker
|
|
73
|
+
// outlives restarts and deploys, and an unhandled rejection would kill it.
|
|
91
74
|
let res;
|
|
92
75
|
try {
|
|
93
76
|
res = await fetch(SERVER + path, {
|
|
@@ -109,9 +92,8 @@ async function call(path, body) {
|
|
|
109
92
|
}
|
|
110
93
|
return { ok: res.ok, status: res.status, data };
|
|
111
94
|
}
|
|
112
|
-
/**
|
|
113
|
-
*
|
|
114
|
-
* as a compile_error — the nearest permanent kind, since no retry can fix the definition. */
|
|
95
|
+
/** A task input that is not an EvalRequest is the definition's fault, reported as compile_error:
|
|
96
|
+
* the nearest permanent kind, since no retry fixes the definition. */
|
|
115
97
|
function asEvalRequest(input) {
|
|
116
98
|
if (typeof input !== "object" || input === null)
|
|
117
99
|
return "the task input is not an object";
|
|
@@ -126,10 +108,8 @@ function asEvalRequest(input) {
|
|
|
126
108
|
}
|
|
127
109
|
const inFlight = new Map();
|
|
128
110
|
let running = true;
|
|
129
|
-
//
|
|
130
|
-
//
|
|
131
|
-
// buries the one line that mattered. Announce the TRANSITIONS instead: going away, and coming
|
|
132
|
-
// back. Silence in between is the report that nothing changed.
|
|
111
|
+
// Announce reachability TRANSITIONS only: polling several times a second would otherwise emit
|
|
112
|
+
// thousands of lines during a restart.
|
|
133
113
|
let serverReachable = true;
|
|
134
114
|
async function claim(n) {
|
|
135
115
|
const { ok, status, data } = await call("/api/external-tasks/claim", {
|
|
@@ -140,18 +120,15 @@ async function claim(n) {
|
|
|
140
120
|
...(TASK_FILTER ? { task: TASK_FILTER } : {}),
|
|
141
121
|
});
|
|
142
122
|
if (!ok) {
|
|
143
|
-
// A credential problem is not transient, and polling through it looks like a healthy
|
|
144
|
-
// worker
|
|
145
|
-
// instead, so a supervisor restarts it and the failure is visible where it happened.
|
|
123
|
+
// A credential problem is not transient, and polling through it looks like a healthy idle
|
|
124
|
+
// worker. Exit, so a supervisor restarts it visibly.
|
|
146
125
|
if (status === 401 || status === 403) {
|
|
147
126
|
console.error(`claim rejected (${status}): ${JSON.stringify(data)}\n` +
|
|
148
127
|
`The server requires authentication. Set GENROC_TOKEN to a token with the 'worker' ` +
|
|
149
128
|
`permission — mint one with: genctl token create --perms worker --label evaluator -q`);
|
|
150
129
|
process.exit(1);
|
|
151
130
|
}
|
|
152
|
-
// status 0
|
|
153
|
-
// network blip. Not an error to act on — the next poll clears it — so it is reported once
|
|
154
|
-
// and then waited out.
|
|
131
|
+
// status 0 (see call): a restart or blip the next poll clears, so it is reported once.
|
|
155
132
|
if (status === 0) {
|
|
156
133
|
if (serverReachable) {
|
|
157
134
|
serverReachable = false;
|
|
@@ -174,10 +151,8 @@ async function release(token) {
|
|
|
174
151
|
if (!ok)
|
|
175
152
|
console.error(`release failed: ${JSON.stringify(data)}`);
|
|
176
153
|
}
|
|
177
|
-
/**
|
|
178
|
-
*
|
|
179
|
-
* not fit `raises`), and guessing again would only pick a second wrong answer. Release it, so
|
|
180
|
-
* the task returns to the queue and an operator sees it waiting rather than silently gone. */
|
|
154
|
+
/** A refused outcome is not retried with another: the worker does not satisfy the declared
|
|
155
|
+
* contract. Released, so an operator sees the task waiting rather than gone. */
|
|
181
156
|
async function answer(token, outcome) {
|
|
182
157
|
const { ok, data } = await call("/api/external-tasks/resolve", { token, ...outcome });
|
|
183
158
|
if (ok)
|
|
@@ -209,18 +184,15 @@ async function run(job, signal) {
|
|
|
209
184
|
result = await evaluate(req, signal);
|
|
210
185
|
}
|
|
211
186
|
catch (err) {
|
|
212
|
-
// Cancelled is not a fault: the
|
|
213
|
-
//
|
|
214
|
-
// waiting out a lease nobody is serving.
|
|
187
|
+
// Cancelled is not a fault. Still released: the row is terminal so nothing re-claims it,
|
|
188
|
+
// but the release stops it waiting out a lease nobody serves.
|
|
215
189
|
if (err instanceof Cancelled) {
|
|
216
190
|
console.log(`cancelled: ${job.token}`);
|
|
217
191
|
await release(job.token);
|
|
218
192
|
return;
|
|
219
193
|
}
|
|
220
|
-
// The RUNNER faulted,
|
|
221
|
-
//
|
|
222
|
-
// it puts the task in front of a different worker instead of burning the definition's
|
|
223
|
-
// on_error budget on this one's bad day.
|
|
194
|
+
// The RUNNER faulted, the one retryable class. Releasing is how a queue spells "retryable",
|
|
195
|
+
// and it reaches another worker without spending the definition's on_error budget.
|
|
224
196
|
console.error(`evaluator fault on ${job.token}: ${err instanceof Error ? err.message : String(err)}`);
|
|
225
197
|
await release(job.token);
|
|
226
198
|
return;
|
|
@@ -255,17 +227,13 @@ async function renewLoop() {
|
|
|
255
227
|
});
|
|
256
228
|
if (!ok)
|
|
257
229
|
continue;
|
|
258
|
-
//
|
|
259
|
-
//
|
|
260
|
-
// keep burning a core on work an operator has already stopped. The release rides run()'s
|
|
261
|
-
// own catch, so nothing is released twice.
|
|
230
|
+
// Abort first rather than let a stopped script burn a core; the release rides run()'s
|
|
231
|
+
// catch, so nothing is released twice.
|
|
262
232
|
for (const token of (data?.cancelled ?? [])) {
|
|
263
233
|
inFlight.get(token)?.abort.abort();
|
|
264
234
|
}
|
|
265
|
-
// Lost:
|
|
266
|
-
//
|
|
267
|
-
// is too short for what these scripts actually take. Deliberately NOT released: the claim
|
|
268
|
-
// is the new holder's, and releasing would bump the epoch out from under it.
|
|
235
|
+
// Lost: another worker holds it now and our answer will be refused; logged as the sign that
|
|
236
|
+
// LEASE_MS is too short. NOT released: that would bump the epoch out from under the holder.
|
|
269
237
|
const lost = (data?.lost ?? []);
|
|
270
238
|
if (lost.length) {
|
|
271
239
|
console.error(`lost ${lost.length}/${tokens.length} claims; a lease lapsed under load`);
|
package/eval.ts
CHANGED
|
@@ -1,11 +1,6 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
3
|
-
//
|
|
4
|
-
// the containment stays swappable.
|
|
5
|
-
//
|
|
6
|
-
// The containment is a Worker per execution (realm.ts). It is what makes the budget real:
|
|
7
|
-
// a synchronous busy loop never yields, so no in-process timer can interrupt it, and only a
|
|
8
|
-
// thread the host can kill bounds it.
|
|
1
|
+
// Imports a script module in its own realm (a Worker per execution, realm.ts), calls its default
|
|
2
|
+
// export, and classifies every outcome (README.md). Only a killable thread bounds a synchronous
|
|
3
|
+
// busy loop, which is what makes the budget real. Knows nothing of genroc; worker.ts does.
|
|
9
4
|
|
|
10
5
|
import { Worker } from "node:worker_threads";
|
|
11
6
|
|
|
@@ -16,9 +11,8 @@ export type EvalRequest = {
|
|
|
16
11
|
timeout_ms?: number;
|
|
17
12
|
};
|
|
18
13
|
|
|
19
|
-
/** Every kind
|
|
20
|
-
*
|
|
21
|
-
* faults releases its claim and lets another worker take the task. */
|
|
14
|
+
/** Every kind is PERMANENT: a retry fails identically. A faulting runner is not an outcome; it
|
|
15
|
+
* releases its claim. */
|
|
22
16
|
export type FailureKind = "compile_error" | "threw" | "timeout" | "nonserializable" | "exited";
|
|
23
17
|
|
|
24
18
|
export type EvalFailure = {
|
|
@@ -28,9 +22,8 @@ export type EvalFailure = {
|
|
|
28
22
|
stack?: string;
|
|
29
23
|
};
|
|
30
24
|
|
|
31
|
-
/**
|
|
32
|
-
*
|
|
33
|
-
* crosses the worker boundary — structured clone would refuse a different set of values. */
|
|
25
|
+
/** JSON TEXT serialised in the realm, so a nonserializable return is a script fault, not a 500,
|
|
26
|
+
* and structured clone (which refuses a different set of values) never sees the value. */
|
|
34
27
|
export type EvalResult =
|
|
35
28
|
| { ok: true; body: string }
|
|
36
29
|
| { ok: false; failure: EvalFailure };
|
|
@@ -47,9 +40,8 @@ const REALM_URL = new URL(
|
|
|
47
40
|
import.meta.url,
|
|
48
41
|
);
|
|
49
42
|
|
|
50
|
-
/** Thrown, not returned: a realm that fails to start is the
|
|
51
|
-
* answers by releasing the claim
|
|
52
|
-
* return value. */
|
|
43
|
+
/** Thrown, not returned: a realm that fails to start is the runner faulting, which worker.ts
|
|
44
|
+
* answers by releasing the claim. */
|
|
53
45
|
class RealmFault extends Error {
|
|
54
46
|
constructor(message: string) {
|
|
55
47
|
super(message);
|
|
@@ -57,9 +49,8 @@ class RealmFault extends Error {
|
|
|
57
49
|
}
|
|
58
50
|
}
|
|
59
51
|
|
|
60
|
-
/** Thrown when `signal` aborts: the
|
|
61
|
-
*
|
|
62
|
-
* runner did not fault -- nothing is wrong, the answer is simply no longer wanted. */
|
|
52
|
+
/** Thrown when `signal` aborts: the answer is no longer wanted, so worker.ts releases rather
|
|
53
|
+
* than answers. Not a RealmFault: nothing is wrong. */
|
|
63
54
|
export class Cancelled extends Error {
|
|
64
55
|
constructor() {
|
|
65
56
|
super("cancelled");
|
|
@@ -84,9 +75,8 @@ export async function evaluate(req: EvalRequest, signal?: AbortSignal): Promise<
|
|
|
84
75
|
signal.addEventListener("abort", onAbort, { once: true });
|
|
85
76
|
}
|
|
86
77
|
worker.once("message", (reply: WorkerReply) => resolve(reply));
|
|
87
|
-
// A script may
|
|
88
|
-
//
|
|
89
|
-
// this too, by which time the promise has settled and the first result stands.
|
|
78
|
+
// A script may `process.exit()`, which would otherwise look like a hang until the budget.
|
|
79
|
+
// Our own terminate() fires this too, after the promise has settled.
|
|
90
80
|
worker.once("exit", (code: number) => resolve(exited(code)));
|
|
91
81
|
worker.once("error", (err: Error) => reject(new RealmFault(errorText(err))));
|
|
92
82
|
worker.postMessage({ code: req.code, input: req.input } satisfies WorkerRequest);
|