openzca 0.1.19 → 0.1.21

package/dist/cli.js

@@ -820,6 +820,66 @@ function isListenerAlreadyStarted(error) {
 function toErrorText(error) {
   return error instanceof Error ? error.message : String(error);
 }
+var SHUTDOWN_CALLBACKS = /* @__PURE__ */ new Set();
+var shutdownSignalReceived = null;
+var shutdownRunning = false;
+function signalExitCode(signal) {
+  if (signal === "SIGINT") return 130;
+  if (signal === "SIGTERM") return 143;
+  return 1;
+}
+function registerShutdownCallback(callback) {
+  SHUTDOWN_CALLBACKS.add(callback);
+  return () => {
+    SHUTDOWN_CALLBACKS.delete(callback);
+  };
+}
+async function runShutdownCallbacks(signal) {
+  if (shutdownRunning) return;
+  shutdownRunning = true;
+  const callbacks = Array.from(SHUTDOWN_CALLBACKS);
+  SHUTDOWN_CALLBACKS.clear();
+  writeDebugLine(
+    "process.signal",
+    {
+      signal,
+      callbackCount: callbacks.length
+    },
+    void 0
+  );
+  for (const callback of callbacks) {
+    try {
+      await Promise.resolve(callback());
+    } catch (error) {
+      writeDebugLine(
+        "process.signal.callback_error",
+        {
+          signal,
+          message: toErrorText(error)
+        },
+        void 0
+      );
+    }
+  }
+}
+function installSignalHandler(signal) {
+  process.on(signal, () => {
+    if (shutdownSignalReceived) return;
+    shutdownSignalReceived = signal;
+    const exitCode = signalExitCode(signal);
+    const forceExitMs = parsePositiveIntFromEnv("OPENZCA_SIGNAL_FORCE_EXIT_MS", 1500);
+    const forceTimer = setTimeout(() => {
+      process.exit(exitCode);
+    }, forceExitMs);
+    forceTimer.unref();
+    void runShutdownCallbacks(signal).finally(() => {
+      clearTimeout(forceTimer);
+      process.exit(exitCode);
+    });
+  });
+}
+installSignalHandler("SIGINT");
+installSignalHandler("SIGTERM");
 async function withTimeout(task, timeoutMs, message) {
   let timeoutId;
   try {
@@ -848,8 +908,14 @@ async function stopUploadListenerSafely(api, command, waitClosedMs = 1500) {
     api.listener.on("closed", onClosed);
     timeoutId = setTimeout(finish, waitClosedMs);
     try {
-      api.listener.stop();
-      writeDebugLine("msg.upload.listener.stop", void 0, command);
+      const internalWs = api.listener.ws;
+      if (internalWs && typeof internalWs.close === "function") {
+        internalWs.close(1e3);
+        writeDebugLine("msg.upload.listener.stop.ws_close", void 0, command);
+      } else {
+        api.listener.stop();
+        writeDebugLine("msg.upload.listener.stop", void 0, command);
+      }
     } catch {
       finish();
     }
@@ -865,6 +931,9 @@ async function withUploadListener(api, command, task) {
     12e4
   );
   let startedHere = false;
+  const unregisterSignalCleanup = registerShutdownCallback(async () => {
+    await stopUploadListenerSafely(api, command);
+  });
   const sinkError = (error) => {
     writeDebugLine(
       "msg.upload.listener.error",
@@ -955,6 +1024,7 @@ async function withUploadListener(api, command, task) {
     if (startedHere) {
       await stopUploadListenerSafely(api, command);
     }
+    unregisterSignalCleanup();
     api.listener.off("error", sinkError);
     api.listener.off("closed", sinkClosed);
   }
@@ -3252,6 +3322,8 @@ ${replyContextText}` : replyContextText;
         let recycleForceExitTimer = null;
         let heartbeatTimer = null;
         let recyclePendingExit = false;
+        let unregisterShutdown = () => {
+        };
         const finish = () => {
           if (settled) return;
           settled = true;
@@ -3267,6 +3339,9 @@ ${replyContextText}` : replyContextText;
             clearInterval(heartbeatTimer);
             heartbeatTimer = null;
           }
+          unregisterShutdown();
+          unregisterShutdown = () => {
+          };
           resolve();
         };
         api.listener.on("closed", (code, reason) => {
@@ -3289,13 +3364,14 @@ ${replyContextText}` : replyContextText;
             finish();
           }
         });
-        const onSigint = () => {
+        const onSignal = () => {
           try {
             api.listener.stop();
           } catch {
           }
           finish();
         };
+        unregisterShutdown = registerShutdownCallback(onSignal);
         if (lifecycleEventsEnabled && heartbeatMs > 0) {
           heartbeatTimer = setInterval(() => {
             emitLifecycle("heartbeat");
@@ -3330,7 +3406,6 @@ ${replyContextText}` : replyContextText;
             finish();
           }, recycleMs);
         }
-        process.once("SIGINT", onSigint);
         api.listener.start({ retryOnClose: supervised ? false : Boolean(opts.keepAlive) });
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzca",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "Open-source zca-compatible CLI to integrate Zalo with OpenClaw",
   "type": "module",
   "bin": {