@zixt/host 0.0.34 → 0.0.35

package/dist/index.js

@@ -31,7 +31,7 @@ import { homedir } from "node:os";
 // package.json
 var package_default = {
   name: "@zixt/host",
-  version: "0.0.34",
+  version: "0.0.35",
   type: "module",
   exports: {
     ".": "./src/client.ts",
@@ -19437,6 +19437,25 @@ var heartbeatActive = false;
 var heartbeatUsesIpc = false;
 var heartbeatHasDurableOwner = false;
 var readinessReporter = null;
+function createWorkerWatchdogSendDrain() {
+  let pending = 0;
+  const drained = [];
+  return {
+    begin: () => {
+      pending++;
+      let completed = false;
+      return () => {
+        if (completed) return;
+        completed = true;
+        pending--;
+        if (pending === 0) drained.splice(0).forEach((resolve14) => resolve14());
+      };
+    },
+    drain: async () => {
+      if (pending > 0) await new Promise((resolve14) => drained.push(resolve14));
+    }
+  };
+}
 function startWorkerWatchdogHeartbeat(env = process.env, argv = process.argv.slice(2)) {
   const ownership = consumeWorkerOwnershipArguments(argv, env);
   const nonce = env[WORKER_WATCHDOG_NONCE_ENV];
@@ -19445,7 +19464,7 @@ function startWorkerWatchdogHeartbeat(env = process.env, argv = process.argv.sli
     heartbeatUsesIpc = false;
     heartbeatHasDurableOwner = false;
     readinessReporter = null;
-    return { active: false, argv: ownership.argv, stop() {
+    return { active: false, argv: ownership.argv, async stop() {
     } };
   }
   const heartbeatFile = env[WORKER_WATCHDOG_FILE_ENV];
@@ -19456,7 +19475,7 @@ function startWorkerWatchdogHeartbeat(env = process.env, argv = process.argv.sli
     heartbeatUsesIpc = false;
     heartbeatHasDurableOwner = false;
     readinessReporter = null;
-    return { active: false, argv: ownership.argv, stop() {
+    return { active: false, argv: ownership.argv, async stop() {
     } };
   }
   const boundaryPidValue = !ipc ? env[WORKER_WATCHDOG_BOUNDARY_PID_ENV] : void 0;
@@ -19467,7 +19486,7 @@ function startWorkerWatchdogHeartbeat(env = process.env, argv = process.argv.sli
     heartbeatUsesIpc = false;
     heartbeatHasDurableOwner = false;
     readinessReporter = null;
-    return { active: false, argv: ownership.argv, stop() {
+    return { active: false, argv: ownership.argv, async stop() {
     } };
   }
   if (ipc && (!ownership.requested || !ownership.valid || !recordWorkerOwnership(env[WORKER_OWNERSHIP_FILE_ENV], nonce))) {
@@ -19475,11 +19494,12 @@ function startWorkerWatchdogHeartbeat(env = process.env, argv = process.argv.sli
     heartbeatUsesIpc = false;
     heartbeatHasDurableOwner = false;
     readinessReporter = null;
-    return { active: false, argv: ownership.argv, stop() {
+    return { active: false, argv: ownership.argv, async stop() {
     } };
   }
   let stopped = false;
   let sendPending = false;
+  const sendDrain = createWorkerWatchdogSendDrain();
   let sequence = 0;
   let readinessSequence = 0;
   const reportReadiness = () => {
@@ -19493,26 +19513,32 @@ function startWorkerWatchdogHeartbeat(env = process.env, argv = process.argv.sli
       sequence: ++readinessSequence,
       heartbeatSequence: sequence
     };
+    const sendComplete = sendDrain.begin();
     try {
       process.send(message, (error52) => {
+        sendComplete();
         if (error52) stop();
       });
       return true;
     } catch {
+      sendComplete();
       stop();
       return false;
     }
   };
-  const stop = () => {
-    if (stopped) return;
-    stopped = true;
-    heartbeatActive = false;
-    heartbeatUsesIpc = false;
-    heartbeatHasDurableOwner = false;
-    if (readinessReporter === reportReadiness) readinessReporter = null;
-    clearInterval(timer);
-    process.off("disconnect", stop);
+  const stop = async () => {
+    if (!stopped) {
+      stopped = true;
+      heartbeatActive = false;
+      heartbeatUsesIpc = false;
+      heartbeatHasDurableOwner = false;
+      if (readinessReporter === reportReadiness) readinessReporter = null;
+      clearInterval(timer);
+      process.off("disconnect", onDisconnect);
+    }
+    await sendDrain.drain();
   };
+  const onDisconnect = () => void stop();
   const send = () => {
     if (stopped || sendPending) return;
     sendPending = true;
@@ -19528,12 +19554,15 @@ function startWorkerWatchdogHeartbeat(env = process.env, argv = process.argv.sli
         stop();
         return;
       }
+      const sendComplete = sendDrain.begin();
       try {
         process.send(message, (error52) => {
+          sendComplete();
           sendPending = false;
           if (error52) stop();
         });
       } catch {
+        sendComplete();
         sendPending = false;
         stop();
       }
@@ -19550,9 +19579,9 @@ function startWorkerWatchdogHeartbeat(env = process.env, argv = process.argv.sli
   const timer = setInterval(send, WORKER_HEARTBEAT_MS);
   timer.unref?.();
   send();
-  if (stopped) return { active: false, argv: ownership.argv, stop() {
+  if (stopped) return { active: false, argv: ownership.argv, async stop() {
   } };
-  if (ipc) process.once("disconnect", stop);
+  if (ipc) process.once("disconnect", onDisconnect);
   heartbeatUsesIpc = ipc;
   heartbeatHasDurableOwner = ipc;
   heartbeatActive = true;
@@ -37451,7 +37480,7 @@ function shutdown(exitCode = 0) {
     },
     recoveringLiveRuns ? 3e4 : 2e3
   ).unref();
-  void client.stop().then(() => process.exit(exitCode));
+  void workerWatchdog.stop().then(() => client.stop()).then(() => process.exit(exitCode));
 }
 stopUpdateWatch = !packagedBuild ? () => {
 } : watchForUpdates({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zixt/host",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "type": "module",
   "exports": {
     ".": "./src/client.ts",