@kiki_agent/daemon 0.1.3 → 0.1.4

package/dist/cli.cjs

@@ -71770,149 +71770,178 @@ async function executeRemoteJob(input) {
     signal: abortController.signal
   });
 }
-async function runRemoteDaemonLoop(input) {
-  const wsUrl = toWsUrl(input.serverUrl, input.apiKey);
-  appendRuntimeDaemonLog(`\u8FDC\u7A0B daemon \u8FDE\u63A5 ${wsUrl}`);
-  const connect = () => new Promise((resolve, reject) => {
-    const socket2 = new wrapper_default(wsUrl, { perMessageDeflate: false });
-    socket2.once("open", () => resolve(socket2));
-    socket2.once("error", reject);
-  });
-  const socket = await connect();
-  let boundUserId = null;
-  socket.send(
-    JSON.stringify({
-      type: "register",
-      machineId: "pending",
-      os: osFingerprint(),
-      daemonVersion: "0.1.3",
-      fingerprint: osFingerprint()
-    })
-  );
-  const heartbeat = setInterval(() => {
-    if (socket.readyState !== wrapper_default.OPEN) return;
-    socket.send(JSON.stringify({ type: "heartbeat", ts: (/* @__PURE__ */ new Date()).toISOString() }));
-  }, 15e3);
-  socket.on("message", (raw) => {
-    let message = null;
-    try {
-      message = JSON.parse(String(raw));
-    } catch {
-      return;
-    }
-    if (message.type === "registered") {
-      boundUserId = message.userId;
-      provisionUserWorkspace(message.userId);
-      enterUserContext(message.userId);
-      appendRuntimeDaemonLog(`machine \u5DF2\u6CE8\u518C\uFF1A${message.machineId}\uFF08\u7528\u6237 ${message.userId}\uFF09`);
-      return;
-    }
-    if (message.type === "discover_runtimes") {
+var DAEMON_VERSION = "0.1.4";
+var RECONNECT_DELAY_MS = 5e3;
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function runOneConnection(wsUrl) {
+  return new Promise((resolve) => {
+    let settled = false;
+    const done = () => {
+      if (settled) return;
+      settled = true;
+      resolve();
+    };
+    const socket = new wrapper_default(wsUrl, { perMessageDeflate: false });
+    let boundUserId = null;
+    let heartbeat = null;
+    socket.on("open", () => {
+      socket.send(
+        JSON.stringify({
+          type: "register",
+          machineId: "pending",
+          os: osFingerprint(),
+          daemonVersion: DAEMON_VERSION,
+          fingerprint: osFingerprint()
+        })
+      );
+      heartbeat = setInterval(() => {
+        if (socket.readyState !== wrapper_default.OPEN) return;
+        socket.send(JSON.stringify({ type: "heartbeat", ts: (/* @__PURE__ */ new Date()).toISOString() }));
+      }, 15e3);
+    });
+    socket.on("message", (raw) => {
+      let message = null;
+      try {
+        message = JSON.parse(String(raw));
+      } catch {
+        return;
+      }
+      if (message.type === "registered") {
+        boundUserId = message.userId;
+        provisionUserWorkspace(message.userId);
+        enterUserContext(message.userId);
+        appendRuntimeDaemonLog(`machine \u5DF2\u6CE8\u518C\uFF1A${message.machineId}\uFF08\u7528\u6237 ${message.userId}\uFF09`);
+        return;
+      }
+      if (message.type === "discover_runtimes") {
+        void (async () => {
+          try {
+            const result = await discoverLocalRuntimes();
+            socket.send(
+              JSON.stringify({
+                type: "discover_runtimes_result",
+                requestId: message.requestId,
+                ok: true,
+                items: result.items,
+                workingDirectory: import_os2.default.homedir()
+              })
+            );
+          } catch (error) {
+            socket.send(
+              JSON.stringify({
+                type: "discover_runtimes_result",
+                requestId: message.requestId,
+                ok: false,
+                error: error instanceof Error ? error.message : "\u626B\u63CF\u5931\u8D25"
+              })
+            );
+          }
+        })();
+        return;
+      }
+      if (message.type === "check_runtime") {
+        void (async () => {
+          try {
+            const result = await validateRuntimeEnvironment(message.payload);
+            socket.send(
+              JSON.stringify({
+                type: "check_runtime_result",
+                requestId: message.requestId,
+                ok: result.ok,
+                result
+              })
+            );
+          } catch (error) {
+            socket.send(
+              JSON.stringify({
+                type: "check_runtime_result",
+                requestId: message.requestId,
+                ok: false,
+                error: error instanceof Error ? error.message : "\u68C0\u6D4B\u5931\u8D25"
+              })
+            );
+          }
+        })();
+        return;
+      }
+      if (message.type !== "execute") return;
       void (async () => {
         try {
-          const result = await discoverLocalRuntimes();
-          socket.send(
-            JSON.stringify({
-              type: "discover_runtimes_result",
+          const raw2 = message.payload;
+          if (!raw2.goal || !raw2.subGoal || !raw2.task || !raw2.instance || !raw2.runtimeEnv) {
+            throw new Error("execute payload \u4E0D\u5B8C\u6574");
+          }
+          const payload = {
+            goal: raw2.goal,
+            subGoal: raw2.subGoal,
+            task: raw2.task,
+            instance: raw2.instance,
+            runtimeEnv: raw2.runtimeEnv,
+            resumeContext: raw2.resumeContext
+          };
+          const initialTrajectory = Array.isArray(raw2.trajectory) ? raw2.trajectory : [];
+          if (!boundUserId) {
+            throw new Error("machine \u5C1A\u672A\u5B8C\u6210\u6CE8\u518C");
+          }
+          await runWithUserContext(
+            boundUserId,
+            () => executeRemoteJob({
+              jobId: message.jobId,
               requestId: message.requestId,
-              ok: true,
-              items: result.items,
-              workingDirectory: import_os2.default.homedir()
+              payload,
+              initialTrajectory
             })
           );
-        } catch (error) {
           socket.send(
             JSON.stringify({
-              type: "discover_runtimes_result",
-              requestId: message.requestId,
-              ok: false,
-              error: error instanceof Error ? error.message : "\u626B\u63CF\u5931\u8D25"
-            })
-          );
-        }
-      })();
-      return;
-    }
-    if (message.type === "check_runtime") {
-      void (async () => {
-        try {
-          const result = await validateRuntimeEnvironment(message.payload);
-          socket.send(
-            JSON.stringify({
-              type: "check_runtime_result",
-              requestId: message.requestId,
-              ok: result.ok,
-              result
+              type: "execute_result",
+              jobId: message.jobId,
+              ok: true
             })
           );
         } catch (error) {
           socket.send(
             JSON.stringify({
-              type: "check_runtime_result",
-              requestId: message.requestId,
+              type: "execute_result",
+              jobId: message.jobId,
               ok: false,
-              error: error instanceof Error ? error.message : "\u68C0\u6D4B\u5931\u8D25"
+              error: error instanceof Error ? error.message : "\u6267\u884C\u5931\u8D25"
             })
           );
         }
       })();
-      return;
-    }
-    if (message.type !== "execute") return;
-    void (async () => {
+    });
+    socket.on("unexpected-response", (_req, res) => {
+      appendRuntimeDaemonLog(`Tunnel \u63E1\u624B\u88AB\u62D2\u7EDD\uFF08HTTP ${res.statusCode}\uFF09\uFF0C${RECONNECT_DELAY_MS / 1e3}s \u540E\u91CD\u8FDE\u2026`);
       try {
-        const raw2 = message.payload;
-        if (!raw2.goal || !raw2.subGoal || !raw2.task || !raw2.instance || !raw2.runtimeEnv) {
-          throw new Error("execute payload \u4E0D\u5B8C\u6574");
-        }
-        const payload = {
-          goal: raw2.goal,
-          subGoal: raw2.subGoal,
-          task: raw2.task,
-          instance: raw2.instance,
-          runtimeEnv: raw2.runtimeEnv,
-          resumeContext: raw2.resumeContext
-        };
-        const initialTrajectory = Array.isArray(raw2.trajectory) ? raw2.trajectory : [];
-        if (!boundUserId) {
-          throw new Error("machine \u5C1A\u672A\u5B8C\u6210\u6CE8\u518C");
-        }
-        await runWithUserContext(
-          boundUserId,
-          () => executeRemoteJob({
-            jobId: message.jobId,
-            requestId: message.requestId,
-            payload,
-            initialTrajectory
-          })
-        );
-        socket.send(
-          JSON.stringify({
-            type: "execute_result",
-            jobId: message.jobId,
-            ok: true
-          })
-        );
-      } catch (error) {
-        socket.send(
-          JSON.stringify({
-            type: "execute_result",
-            jobId: message.jobId,
-            ok: false,
-            error: error instanceof Error ? error.message : "\u6267\u884C\u5931\u8D25"
-          })
-        );
+        socket.terminate();
+      } catch {
       }
-    })();
-  });
-  socket.on("close", () => {
-    clearInterval(heartbeat);
-    appendRuntimeDaemonLog("Tunnel \u8FDE\u63A5\u65AD\u5F00\uFF0C5s \u540E\u91CD\u8FDE\u2026");
-    setTimeout(() => {
-      void runRemoteDaemonLoop(input);
-    }, 5e3);
+      done();
+    });
+    socket.on("error", (error) => {
+      appendRuntimeDaemonLog(
+        `Tunnel \u8FDE\u63A5\u9519\u8BEF\uFF1A${error instanceof Error ? error.message : String(error)}\uFF0C${RECONNECT_DELAY_MS / 1e3}s \u540E\u91CD\u8FDE\u2026`
+      );
+      done();
+    });
+    socket.on("close", () => {
+      if (heartbeat) clearInterval(heartbeat);
+      appendRuntimeDaemonLog(`Tunnel \u8FDE\u63A5\u65AD\u5F00\uFF0C${RECONNECT_DELAY_MS / 1e3}s \u540E\u91CD\u8FDE\u2026`);
+      done();
+    });
   });
 }
+async function runRemoteDaemonLoop(input) {
+  const wsUrl = toWsUrl(input.serverUrl, input.apiKey);
+  appendRuntimeDaemonLog(`\u8FDC\u7A0B daemon \u8FDE\u63A5 ${wsUrl}`);
+  for (; ; ) {
+    await runOneConnection(wsUrl);
+    await sleep(RECONNECT_DELAY_MS);
+  }
+}
 
 // src/pathEnv.ts
 var import_fs13 = __toESM(require("fs"));
@@ -72340,6 +72369,12 @@ async function main() {
   }
   const { serverUrl, apiKey } = requireConnectionArgs();
   console.log(`[kiki-daemon] \u524D\u53F0\u8FD0\u884C\uFF0C\u8FDE\u63A5 ${serverUrl}`);
+  process.on("unhandledRejection", (reason) => {
+    console.error("[kiki-daemon] unhandledRejection:", reason instanceof Error ? reason.message : reason);
+  });
+  process.on("uncaughtException", (error) => {
+    console.error("[kiki-daemon] uncaughtException:", error instanceof Error ? error.message : error);
+  });
   await runRemoteDaemonLoop({ serverUrl, apiKey });
 }
 void main().catch((error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kiki_agent/daemon",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Kiki 本地执行节点 daemon：连接云端编排器并在本机运行任务。",
   "license": "MIT",
   "type": "commonjs",