gm-plugkit 2.0.1227 → 2.0.1229

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-plugkit",
-  "version": "2.0.1227",
+  "version": "2.0.1229",
   "description": "Bootstrap and daemon-spawn tool for gm plugkit binary. Downloads the correct platform binary, verifies SHA256, and starts the spool watcher daemon. Includes plugkit-wasm-wrapper for WASM-based spool watching.",
   "main": "index.js",
   "bin": {

package/plugkit-wasm-wrapper.js

@@ -736,6 +736,24 @@ function cleanDeadProfileFragments(cwd) {
   }
 }
 
+function resolveWindowsExeLocal(cmd) {
+  if (process.platform !== 'win32') return cmd;
+  try {
+    const out = spawnSync('where', [cmd], {
+      encoding: 'utf-8',
+      stdio: ['ignore', 'pipe', 'ignore'],
+      windowsHide: true,
+      timeout: 800,
+    });
+    if (out.status !== 0) return cmd;
+    const lines = (out.stdout || '').split(/\r?\n/).map(l => l.trim()).filter(Boolean);
+    const exe = lines.find(l => /\.exe$/i.test(l));
+    return exe || lines[0] || cmd;
+  } catch {
+    return cmd;
+  }
+}
+
 function isPortReachableSync(host, port, timeoutMs) {
   const r = spawnSync(process.execPath, ['-e', `
     const net = require('net');
@@ -744,24 +762,45 @@ function isPortReachableSync(host, port, timeoutMs) {
     s.on('connect', () => { done = true; s.destroy(); process.exit(0); });
     s.on('error', () => { if (!done) process.exit(1); });
     setTimeout(() => { if (!done) { s.destroy(); process.exit(1); } }, ${timeoutMs || 800});
-  `], { timeout: (timeoutMs || 800) + 2000 });
+  `], { timeout: (timeoutMs || 800) + 2000, windowsHide: true });
   return r.status === 0;
 }
 
-let _acptoapiBoot = { spawned_at: 0, pid: null };
+let _acptoapiBoot = { spawned_at: 0, pid: null, last_check_ts: 0, last_check_ok: false };
 function ensureAcptoapi() {
   const host = '127.0.0.1';
   const port = 4800;
   try {
-    if (isPortReachableSync(host, port, 500)) {
-      _acptoapiBoot = { spawned_at: 0, pid: null, status: 'already-running' };
+    // Two-strike port check: localhost connect can race against node cold-
+    // start on Windows. If the first check fails, retry once with a longer
+    // timeout before declaring the port dead. iter9 sniff reported 29
+    // bootstrap.acptoapi.spawned events in 30m despite acptoapi being alive
+    // on :4800 (HTTP 200) — the check flaked under heartbeat-tick load.
+    let reachable = isPortReachableSync(host, port, 1500);
+    if (!reachable) {
+      reachable = isPortReachableSync(host, port, 3000);
+    }
+    if (reachable) {
+      const wasDown = _acptoapiBoot.spawned_at > 0 || !_acptoapiBoot.last_check_ok;
+      _acptoapiBoot = { spawned_at: 0, pid: null, status: 'already-running', last_check_ts: Date.now(), last_check_ok: true };
+      // Only log on transitions (down → up) so the heartbeat doesn't spam
+      // bootstrap.jsonl every 60s with redundant "alive" events.
+      if (wasDown) {
+        logEvent('bootstrap', 'acptoapi.heartbeat-ok', { port, transition: 'down-to-up' });
+      }
       return;
     }
+    _acptoapiBoot.last_check_ok = false;
+    _acptoapiBoot.last_check_ts = Date.now();
     if (_acptoapiBoot.spawned_at && Date.now() - _acptoapiBoot.spawned_at < 30000) {
       return;
     }
-    const isWindows = process.platform === 'win32';
-    const cmd = isWindows ? 'bun.exe' : 'bun';
+    // Resolve `bun` to its actual .exe on Windows so the spawned daemon
+    // doesn't enter conhost via a bun.cmd shim. See
+    // [[windows-spawn-cmd-shim-flash]] — cmd.exe + .cmd chain re-enters
+    // conhost even with windowsHide:true on the parent. Falls back to
+    // the bare name on non-Windows / when `where` can't resolve.
+    const cmd = resolveWindowsExeLocal('bun');
     const child = spawn(cmd, ['x', 'acptoapi@latest'], {
       detached: true,
       stdio: 'ignore',
@@ -769,7 +808,9 @@ function ensureAcptoapi() {
       shell: false,
     });
     child.unref();
-    _acptoapiBoot = { spawned_at: Date.now(), pid: child.pid, status: 'spawned' };
+    _acptoapiBoot.spawned_at = Date.now();
+    _acptoapiBoot.pid = child.pid;
+    _acptoapiBoot.status = 'spawned';
     logEvent('bootstrap', 'acptoapi.spawned', { pid: child.pid, port });
   } catch (e) {
     logEvent('bootstrap', 'acptoapi.spawn-failed', { error: e && e.message });