@lesscap/baton-cli 0.2.6 → 0.2.8

package/dist/baton.mjs

@@ -700,6 +700,7 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 var PROJECT_CONFIG_NAME = ".baton.json";
 var projectConfigPath = (cwd = process.cwd()) => join(cwd, PROJECT_CONFIG_NAME);
+var configPathFromArgs = (args, cwd) => args.config ?? projectConfigPath(cwd);
 var loadProjectConfig = (path) => {
   try {
     return JSON.parse(readFileSync(path, "utf8"));
@@ -768,10 +769,17 @@ var common = {
   },
   json: { type: "boolean", description: "output JSON" }
 };
+var resolveAuth = (env, fileToken) => {
+  const envBearer = env.BATON_TOKEN ?? env.BATON_WORKER_TOKEN;
+  if (envBearer) return { bearer: envBearer };
+  if (env.BATON_USER && env.BATON_PASS) return "cookie";
+  return fileToken ? { bearer: fileToken } : void 0;
+};
 var clientFor = (args) => {
-  const envAuth = process.env.BATON_TOKEN ?? (process.env.BATON_USER && process.env.BATON_PASS);
-  const cfgToken = envAuth ? void 0 : loadProjectConfigOrNull(projectConfigPath())?.worker?.apiToken;
-  return createClient(resolveBaseUrl(args.url), cfgToken ? { bearer: cfgToken } : void 0);
+  const baseUrl = resolveBaseUrl(args.url);
+  const fileToken = loadProjectConfigOrNull(projectConfigPath())?.worker?.apiToken;
+  const auth = resolveAuth(process.env, fileToken);
+  return createClient(baseUrl, auth && auth !== "cookie" ? auth : void 0);
 };
 var resolveProjectId = (args) => {
   if (args.project !== void 0 && args.project !== "") return Number(args.project);
@@ -2645,11 +2653,35 @@ var runWorkerDaemon = async (cfg, client, signal) => {
   const worktreeDir = defaultWorktreeDir();
   const children = /* @__PURE__ */ new Map();
   const log = (m) => console.log(`[worker #${cfg.workerId} ${cfg.name}] ${m}`);
-  const ping = () => {
-    void client.workers.heartbeat(cfg.machineId).catch((e) => log(`heartbeat failed: ${String(e)}`));
+  const HEARTBEAT_MS = 3e4;
+  const HEARTBEAT_TIMEOUT_MS = 15e3;
+  const MAX_HEARTBEAT_FAILURES = 5;
+  let heartbeatFailures = 0;
+  let fatal = false;
+  let stop = () => {
+  };
+  const ping = async () => {
+    try {
+      await Promise.race([
+        client.workers.heartbeat(cfg.machineId),
+        new Promise(
+          (_, reject) => setTimeout(() => reject(new Error("heartbeat timeout")), HEARTBEAT_TIMEOUT_MS)
+        )
+      ]);
+      heartbeatFailures = 0;
+    } catch (e) {
+      heartbeatFailures += 1;
+      log(`heartbeat failed (${heartbeatFailures}/${MAX_HEARTBEAT_FAILURES}): ${String(e)}`);
+      if (heartbeatFailures >= MAX_HEARTBEAT_FAILURES) {
+        const downSec = MAX_HEARTBEAT_FAILURES * HEARTBEAT_MS / 1e3;
+        log(`heartbeat down ~${downSec}s \u2014 exiting so the supervisor restarts a clean worker`);
+        fatal = true;
+        stop();
+      }
+    }
   };
-  ping();
-  const hb = setInterval(ping, 3e4);
+  void ping();
+  const hb = setInterval(() => void ping(), HEARTBEAT_MS);
   const killChild = (child) => {
     if (child.pid === void 0) return;
     try {
@@ -2769,12 +2801,14 @@ var runWorkerDaemon = async (cfg, client, signal) => {
   es.onerror = () => log("command stream error (eventsource will retry)");
   log(`listening for commands (server ${cfg.server}, repo ${repo})`);
   await new Promise((resolve2) => {
+    stop = resolve2;
     if (signal.aborted) return resolve2();
     signal.addEventListener("abort", () => resolve2(), { once: true });
   });
   es.close();
   clearInterval(hb);
   for (const { child } of children.values()) killChild(child);
+  if (fatal) process.exit(1);
 };
 
 // src/worker/machine-id.ts
@@ -2837,6 +2871,10 @@ var worker = defineCommand({
       args: {
         project: { type: "string", description: "project id (overrides .baton.json)" },
         name: { type: "string", description: "worker display name (default: hostname)" },
+        config: {
+          type: "string",
+          description: "path to the worker config file (default: ./.baton.json)"
+        },
         ...common
       },
       run: async ({ args }) => {
@@ -2850,13 +2888,17 @@ var worker = defineCommand({
         const hostname = osHostname();
         const machineId = readOrCreateMachineId();
         const name = args.name ?? hostname;
-        const { out, configPath } = await registerWorker(c, {
-          projectId: resolveProjectId(args),
-          name,
-          server,
-          hostname,
-          machineId
-        });
+        const { out, configPath } = await registerWorker(
+          c,
+          {
+            projectId: resolveProjectId(args),
+            name,
+            server,
+            hostname,
+            machineId
+          },
+          configPathFromArgs(args)
+        );
         if (args.json) {
           console.log(toJson({ ...out, configPath, machineIdPath: machineIdPath() }));
           return;
@@ -2873,9 +2915,15 @@ var worker = defineCommand({
         name: "run",
         description: "run the persistent worker daemon (listens for session create/delete commands)"
       },
-      args: { ...common },
-      run: async () => {
-        const cfg = viewWorker(loadProjectConfig(projectConfigPath()));
+      args: {
+        config: {
+          type: "string",
+          description: "path to the worker config file (default: ./.baton.json)"
+        },
+        ...common
+      },
+      run: async ({ args }) => {
+        const cfg = viewWorker(loadProjectConfig(configPathFromArgs(args)));
         const client = createClient(cfg.server, { bearer: cfg.apiToken });
         const ac = new AbortController();
         const stop = () => ac.abort();
@@ -2944,11 +2992,17 @@ var worker = defineCommand({
     }),
     whoami: defineCommand({
       meta: { name: "whoami", description: "show local worker config from .baton.json" },
-      args: { ...common },
+      args: {
+        config: {
+          type: "string",
+          description: "path to the worker config file (default: ./.baton.json)"
+        },
+        ...common
+      },
       run: ({ args }) => {
         const cfg = (() => {
           try {
-            return loadProjectConfig(projectConfigPath());
+            return loadProjectConfig(configPathFromArgs(args));
           } catch {
             return null;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lesscap/baton-cli",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "license": "MIT",
   "type": "module",
   "description": "baton CLI — register/run a worker, manage projects/requirements/tasks/sessions",