@genroc/eval-node 0.21.0 → 0.23.0

package/README.md

@@ -89,7 +89,7 @@ The worker connects to genroc, not the other way round, so it only needs outboun
 |---|---|---|
 | `GENROC_SERVER` | `http://localhost:8448` | the genroc server |
 | `GENROC_TOKEN` / `GENROC_TOKEN_FILE` | *(none)* | token, or a file holding it, when the server uses `--auth token` |
-| `PROCESS` / `TASK` | `script-node` / `eval_node` | claim only this process / task id; the defaults are script-node's. Set `PROCESS` for a renamed copy, or `""` to drop a filter; **with both `""`, the worker claims every external task.** |
+| `PROCESS` / `TASK` | `script-node` / `eval_node` | the process and task id this worker claims; the defaults are script-node's. Set `PROCESS` for a renamed copy. Neither may be empty. |
 | `CONCURRENCY` | `4` | scripts run at once |
 | `LEASE_MS` | `30000` | claim lease, renewed every third of it |
 | `POLL_MS` | `250` | idle poll interval |

package/dist/worker.js

@@ -22,10 +22,14 @@ const RENEW_MS = Math.max(1_000, Math.floor(LEASE_MS / 3));
 // The answer has to land before the task's deadline fires, or a script that overran surfaces as
 // external.timeout ("nobody answered") rather than as its own `timeout`.
 const ANSWER_MARGIN_MS = 250;
-// script-node's names. A renamed copy needs PROCESS set; an explicit "" drops that filter, and
-// both "" claims every external task, other runtimes' included.
+// script-node's names; a renamed copy sets PROCESS. The claim requires both: this worker answers
+// one task's contract, so it must never be handed another's.
 const PROCESS_FILTER = process.env.PROCESS ?? "script-node";
 const TASK_FILTER = process.env.TASK ?? "eval_node";
+if (!PROCESS_FILTER || !TASK_FILTER) {
+    console.error("PROCESS and TASK must both name the queue this worker serves; neither may be empty.");
+    process.exit(1);
+}
 // Large values arrive as refs; a bundle is one object per definition version, fetched once.
 // Refs are content hashes, so the cache never invalidates.
 const objectCache = new Map();
@@ -117,8 +121,8 @@ async function claim(n) {
         worker_id: WORKER_ID,
         limit: n,
         lease_ms: LEASE_MS,
-        ...(PROCESS_FILTER ? { process: PROCESS_FILTER } : {}),
-        ...(TASK_FILTER ? { task: TASK_FILTER } : {}),
+        process: PROCESS_FILTER,
+        task: TASK_FILTER,
     });
     if (!ok) {
         // A credential problem is not transient, and polling through it looks like a healthy idle
@@ -162,9 +166,9 @@ async function answer(token, outcome) {
     await release(token);
 }
 async function run(job, signal) {
-    // The task's own timeout is the script's budget. Taken on arrival, because fetching the
-    // objects below spends the same deadline.
-    const due = job.deadline_in_ms === undefined ? undefined : performance.now() + job.deadline_in_ms;
+    // The task's own timeout is the script's budget, moved onto the monotonic clock so a wall-clock
+    // step mid-run cannot stretch it. Fetching the objects below spends the same deadline.
+    const due = job.deadline === undefined ? undefined : performance.now() + (Date.parse(job.deadline) - Date.now());
     let resolved;
     try {
         resolved = await resolveObjects(job);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genroc/eval-node",
-  "version": "0.21.0",
+  "version": "0.23.0",
   "type": "module",
   "engines": {
     "node": ">=24"

package/worker.ts

@@ -25,10 +25,14 @@ const RENEW_MS = Math.max(1_000, Math.floor(LEASE_MS / 3));
 // The answer has to land before the task's deadline fires, or a script that overran surfaces as
 // external.timeout ("nobody answered") rather than as its own `timeout`.
 const ANSWER_MARGIN_MS = 250;
-// script-node's names. A renamed copy needs PROCESS set; an explicit "" drops that filter, and
-// both "" claims every external task, other runtimes' included.
+// script-node's names; a renamed copy sets PROCESS. The claim requires both: this worker answers
+// one task's contract, so it must never be handed another's.
 const PROCESS_FILTER = process.env.PROCESS ?? "script-node";
 const TASK_FILTER = process.env.TASK ?? "eval_node";
+if (!PROCESS_FILTER || !TASK_FILTER) {
+  console.error("PROCESS and TASK must both name the queue this worker serves; neither may be empty.");
+  process.exit(1);
+}
 
 type ObjectEntry = { path: (string | number)[]; ref: string; size: number };
 
@@ -38,8 +42,7 @@ type QueueTask = {
   task: string;
   external_input: unknown;
   objects?: ObjectEntry[];
-  raises?: Record<string, unknown>;
-  deadline_in_ms?: number;
+  deadline?: string;
 };
 
 // Large values arrive as refs; a bundle is one object per definition version, fetched once.
@@ -135,8 +138,8 @@ async function claim(n: number): Promise<QueueTask[]> {
     worker_id: WORKER_ID,
     limit: n,
     lease_ms: LEASE_MS,
-    ...(PROCESS_FILTER ? { process: PROCESS_FILTER } : {}),
-    ...(TASK_FILTER ? { task: TASK_FILTER } : {}),
+    process: PROCESS_FILTER,
+    task: TASK_FILTER,
   });
   if (!ok) {
     // A credential problem is not transient, and polling through it looks like a healthy idle
@@ -185,9 +188,9 @@ async function answer(token: string, outcome: Record<string, unknown>): Promise<
 }
 
 async function run(job: QueueTask, signal: AbortSignal): Promise<void> {
-  // The task's own timeout is the script's budget. Taken on arrival, because fetching the
-  // objects below spends the same deadline.
-  const due = job.deadline_in_ms === undefined ? undefined : performance.now() + job.deadline_in_ms;
+  // The task's own timeout is the script's budget, moved onto the monotonic clock so a wall-clock
+  // step mid-run cannot stretch it. Fetching the objects below spends the same deadline.
+  const due = job.deadline === undefined ? undefined : performance.now() + (Date.parse(job.deadline) - Date.now());
   let resolved: unknown;
   try {
     resolved = await resolveObjects(job);