@ricsam/r5d-worker 0.0.18 → 0.0.20

package/dist/cjs/main.cjs

@@ -44,6 +44,7 @@ var import_node_crypto = require("node:crypto");
 var import_node_os = __toESM(require("node:os"), 1);
 var import_node_child_process = require("node:child_process");
 var import_git_identity = require("./git-identity.cjs");
+var import_heartbeat = require("./heartbeat.cjs");
 const import_meta = {};
 const DEFAULT_BASE_URL = "https://r5d.dev";
 const WORKER_PACKAGE_NAME = "@ricsam/r5d-worker";
@@ -2170,8 +2171,26 @@ async function startWorker(options) {
       Authorization: `Bearer ${token}`
     }
   });
+  let lastServerHeartbeatAt = null;
+  let heartbeatTimedOut = false;
+  let heartbeatWatchdog;
+  const stopHeartbeatWatchdog = () => {
+    if (heartbeatWatchdog) {
+      clearInterval(heartbeatWatchdog);
+      heartbeatWatchdog = void 0;
+    }
+  };
   ws.addEventListener("open", () => {
     currentWorkerSocket = ws;
+    heartbeatWatchdog = setInterval(() => {
+      if (heartbeatTimedOut || !(0, import_heartbeat.hasWorkerHeartbeatTimedOut)(lastServerHeartbeatAt)) {
+        return;
+      }
+      heartbeatTimedOut = true;
+      stopHeartbeatWatchdog();
+      process.stderr.write("[r5d-worker] server heartbeat timed out; reconnecting\n");
+      ws.terminate();
+    }, import_heartbeat.WORKER_HEARTBEAT_INTERVAL_MS);
     const hello = {
       type: "hello",
       hostInfo: {
@@ -2243,6 +2262,7 @@ async function startWorker(options) {
         return;
       }
       if (message.type === "ping") {
+        lastServerHeartbeatAt = Date.now();
         ws.send(JSON.stringify({ type: "pong" }));
         return;
       }
@@ -2391,6 +2411,7 @@ async function startWorker(options) {
     });
   });
   ws.addEventListener("close", (event) => {
+    stopHeartbeatWatchdog();
     if (currentWorkerSocket === ws) {
       currentWorkerSocket = null;
     }

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "type": "commonjs"
 }

package/dist/mjs/main.mjs

@@ -5,6 +5,7 @@ import { createHash } from "node:crypto";
 import os, { hostname } from "node:os";
 import { spawn as spawnChildProcess } from "node:child_process";
 import { configureVisibleGitIdentity } from "./git-identity.mjs";
+import { hasWorkerHeartbeatTimedOut, WORKER_HEARTBEAT_INTERVAL_MS } from "./heartbeat.mjs";
 const DEFAULT_BASE_URL = "https://r5d.dev";
 const WORKER_PACKAGE_NAME = "@ricsam/r5d-worker";
 const LABEL_RE = /^[A-Za-z0-9][A-Za-z0-9_.-]{0,62}$/;
@@ -2130,8 +2131,26 @@ async function startWorker(options) {
       Authorization: `Bearer ${token}`
     }
   });
+  let lastServerHeartbeatAt = null;
+  let heartbeatTimedOut = false;
+  let heartbeatWatchdog;
+  const stopHeartbeatWatchdog = () => {
+    if (heartbeatWatchdog) {
+      clearInterval(heartbeatWatchdog);
+      heartbeatWatchdog = void 0;
+    }
+  };
   ws.addEventListener("open", () => {
     currentWorkerSocket = ws;
+    heartbeatWatchdog = setInterval(() => {
+      if (heartbeatTimedOut || !hasWorkerHeartbeatTimedOut(lastServerHeartbeatAt)) {
+        return;
+      }
+      heartbeatTimedOut = true;
+      stopHeartbeatWatchdog();
+      process.stderr.write("[r5d-worker] server heartbeat timed out; reconnecting\n");
+      ws.terminate();
+    }, WORKER_HEARTBEAT_INTERVAL_MS);
     const hello = {
       type: "hello",
       hostInfo: {
@@ -2203,6 +2222,7 @@ async function startWorker(options) {
         return;
       }
       if (message.type === "ping") {
+        lastServerHeartbeatAt = Date.now();
         ws.send(JSON.stringify({ type: "pong" }));
         return;
       }
@@ -2351,6 +2371,7 @@ async function startWorker(options) {
     });
   });
   ws.addEventListener("close", (event) => {
+    stopHeartbeatWatchdog();
     if (currentWorkerSocket === ws) {
       currentWorkerSocket = null;
     }

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "type": "module"
 }

package/dist/types/heartbeat.d.ts

@@ -0,0 +1,3 @@
+export declare const WORKER_HEARTBEAT_INTERVAL_MS = 15000;
+export declare const WORKER_HEARTBEAT_TIMEOUT_MS = 45000;
+export declare function hasWorkerHeartbeatTimedOut(lastHeartbeatAt: number | null, now?: number, timeoutMs?: number): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "type": "module",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/mjs/main.mjs",