weacpx 0.1.0 → 0.1.1

package/dist/cli.js

@@ -2911,10 +2911,18 @@ class DaemonController {
   paths;
   deps;
   statusStore;
+  startupPollIntervalMs;
+  startupTimeoutMs;
+  onStartupPoll;
   constructor(paths, deps) {
     this.paths = paths;
     this.deps = deps;
     this.statusStore = new DaemonStatusStore(paths.statusFile);
+    this.startupPollIntervalMs = deps.startupPollIntervalMs ?? 50;
+    this.startupTimeoutMs = deps.startupTimeoutMs ?? 5000;
+    this.onStartupPoll = deps.onStartupPoll ?? (async () => {
+      await new Promise((resolve) => setTimeout(resolve, this.startupPollIntervalMs));
+    });
   }
   async getStatus() {
     const pid = await this.loadPid();
@@ -2940,8 +2948,10 @@ class DaemonController {
     if (current.state === "running") {
       return { state: "already-running", pid: current.pid };
     }
+    await this.statusStore.clear();
     const pid = await this.deps.spawnDetached();
     await this.writePid(pid);
+    await this.waitForStartupMetadata(pid);
     return { state: "started", pid };
   }
   async stop() {
@@ -2976,6 +2986,21 @@ class DaemonController {
     await rm2(this.paths.pidFile, { force: true });
     await this.statusStore.clear();
   }
+  async waitForStartupMetadata(pid) {
+    const deadline = Date.now() + this.startupTimeoutMs;
+    while (Date.now() < deadline) {
+      const status = await this.statusStore.load();
+      if (status?.pid === pid) {
+        return;
+      }
+      if (!this.deps.isProcessRunning(pid)) {
+        await this.clearRuntimeFiles();
+        throw new Error(`weacpx daemon exited before reporting ready state (pid ${pid})`);
+      }
+      await this.onStartupPoll();
+    }
+    throw new Error(`weacpx daemon did not report ready state within ${this.startupTimeoutMs}ms (pid ${pid})`);
+  }
 }
 
 // src/daemon/create-daemon-controller.ts
@@ -2987,17 +3012,7 @@ function createDaemonController(paths, options) {
       const stdoutHandle = await open(paths.stdoutLog, "a");
       const stderrHandle = await open(paths.stderrLog, "a");
       try {
-        return await (options.spawnProcess ?? defaultSpawnProcess)({
-          command: options.processExecPath,
-          args: [options.cliEntryPath, "run"],
-          options: {
-            cwd: options.cwd,
-            detached: true,
-            env: options.env,
-            stdio: ["ignore", stdoutHandle.fd, stderrHandle.fd],
-            ...(options.platform ?? process.platform) === "win32" ? { windowsHide: true } : {}
-          }
-        });
+        return await (options.spawnProcess ?? defaultSpawnProcess)(buildSpawnRequest(paths, options, stdoutHandle.fd, stderrHandle.fd));
       } finally {
         await stdoutHandle.close();
         await stderrHandle.close();
@@ -3014,11 +3029,114 @@ function defaultIsProcessRunning(pid) {
     return false;
   }
 }
+function buildSpawnRequest(paths, options, stdoutFd, stderrFd) {
+  const platform = options.platform ?? process.platform;
+  if (platform === "win32") {
+    return {
+      mode: "windows-hidden",
+      command: "powershell.exe",
+      args: [
+        "-NoProfile",
+        "-NonInteractive",
+        "-EncodedCommand",
+        buildWindowsLauncherScript()
+      ],
+      options: {
+        cwd: options.cwd,
+        env: {
+          ...options.env,
+          WEACPX_DAEMON_COMMAND: options.processExecPath,
+          WEACPX_DAEMON_ARG0: options.cliEntryPath,
+          WEACPX_DAEMON_ARG1: "run",
+          WEACPX_DAEMON_CWD: options.cwd,
+          WEACPX_DAEMON_STDOUT: paths.stdoutLog,
+          WEACPX_DAEMON_STDERR: paths.stderrLog
+        },
+        stdio: ["ignore", "pipe", "ignore"],
+        windowsHide: true
+      }
+    };
+  }
+  return {
+    mode: "direct",
+    command: options.processExecPath,
+    args: [options.cliEntryPath, "run"],
+    options: {
+      cwd: options.cwd,
+      detached: true,
+      env: options.env,
+      stdio: ["ignore", stdoutFd, stderrFd]
+    }
+  };
+}
+function buildWindowsLauncherScript() {
+  const script = [
+    "$process = Start-Process -FilePath $env:WEACPX_DAEMON_COMMAND `",
+    "  -ArgumentList @($env:WEACPX_DAEMON_ARG0, $env:WEACPX_DAEMON_ARG1) `",
+    "  -WorkingDirectory $env:WEACPX_DAEMON_CWD `",
+    "  -RedirectStandardOutput $env:WEACPX_DAEMON_STDOUT `",
+    "  -RedirectStandardError $env:WEACPX_DAEMON_STDERR `",
+    "  -WindowStyle Hidden `",
+    "  -PassThru",
+    "[Console]::Out.WriteLine($process.Id)"
+  ].join(`
+`);
+  return Buffer.from(script, "utf16le").toString("base64");
+}
 async function defaultSpawnProcess(request) {
+  if (request.mode === "windows-hidden") {
+    return await spawnWindowsHiddenProcess(request);
+  }
   const child = spawn(request.command, request.args, request.options);
   child.unref();
   return child.pid ?? 0;
 }
+async function spawnWindowsHiddenProcess(request) {
+  return await new Promise((resolve, reject) => {
+    const child = spawn(request.command, request.args, request.options);
+    let stdout = "";
+    let settled = false;
+    child.stdout?.setEncoding("utf8");
+    child.stdout?.on("data", (chunk) => {
+      stdout += chunk;
+      if (settled) {
+        return;
+      }
+      const pid = Number.parseInt(stdout.trim(), 10);
+      if (!Number.isFinite(pid) || pid <= 0) {
+        return;
+      }
+      settled = true;
+      child.unref();
+      resolve(pid);
+    });
+    child.on("error", (error) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      reject(error);
+    });
+    child.on("close", (code) => {
+      if (settled) {
+        return;
+      }
+      if (code !== 0) {
+        settled = true;
+        reject(new Error(`Failed to launch hidden Windows daemon process (exit ${code ?? 1})`));
+        return;
+      }
+      const pid = Number.parseInt(stdout.trim(), 10);
+      if (!Number.isFinite(pid) || pid <= 0) {
+        settled = true;
+        reject(new Error("Failed to read daemon pid from hidden Windows launcher"));
+        return;
+      }
+      settled = true;
+      resolve(pid);
+    });
+  });
+}
 async function defaultTerminateProcess(pid) {
   await terminateProcessTree(pid);
 }

package/package.json

@@ -1,5 +1,28 @@
 {
   "name": "weacpx",
+  "description": "用微信远程控制 `acpx` 会话的控制台, 底层基于 `weixin-agent-sdk` 与 `acpx`",
+  "version": "0.1.1",
+  "main": "index.js",
+  "directories": {
+    "doc": "docs",
+    "test": "tests"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/gadzan/weacpx.git"
+  },
+  "keywords": [
+    "acpx",
+    "weixin-agent-sdk",
+    "openclaw",
+    "weixin"
+  ],
+  "author": "gadzan",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/gadzan/weacpx/issues"
+  },
+  "homepage": "https://github.com/gadzan/weacpx#readme",
   "type": "module",
   "bin": {
     "weacpx": "dist/cli.js"
@@ -27,28 +50,5 @@
     "node-pty": "^1.1.0",
     "qrcode-terminal": "^0.12.0",
     "weixin-agent-sdk": "^0.2.0"
-  },
-  "description": "用微信远程控制 `acpx` 会话的控制台, 底层基于 `weixin-agent-sdk` 与 `acpx`",
-  "version": "0.1.0",
-  "main": "index.js",
-  "directories": {
-    "doc": "docs",
-    "test": "tests"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/gadzan/weacpx.git"
-  },
-  "keywords": [
-    "acpx",
-    "weixin-agent-sdk",
-    "openclaw",
-    "weixin"
-  ],
-  "author": "gadzan",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/gadzan/weacpx/issues"
-  },
-  "homepage": "https://github.com/gadzan/weacpx#readme"
+  }
 }