@pushpalsdev/cli 1.1.39 → 1.1.40

package/dist/pushpals-cli.js

@@ -58,11 +58,13 @@ function shouldRestartService(attempts, maxAttempts = DEFAULT_SERVICE_MANAGER_MA
   return normalizedAttempts < normalizedMax;
 }
 function pipeProcessStreamToLines(stream, onLine) {
-  if (!stream || typeof stream === "number" || typeof stream.getReader !== "function")
-    return;
+  if (!stream || typeof stream === "number" || typeof stream.getReader !== "function") {
+    return { cancel: () => {} };
+  }
   const reader = stream.getReader();
   const decoder = new TextDecoder;
   let pending = "";
+  let cancelled = false;
   (async () => {
     try {
       while (true) {
@@ -86,9 +88,21 @@ function pipeProcessStreamToLines(stream, onLine) {
       if (tail)
         onLine?.(tail);
     } catch {} finally {
-      reader.releaseLock();
+      try {
+        reader.releaseLock();
+      } catch {}
     }
   })();
+  return {
+    cancel: () => {
+      if (cancelled)
+        return;
+      cancelled = true;
+      try {
+        reader.cancel().catch(() => {});
+      } catch {}
+    }
+  };
 }
 function spawnManagedService(spec) {
   const env = { ...spec.env ?? {} };
@@ -98,8 +112,8 @@ function spawnManagedService(spec) {
     stdout: "pipe",
     stderr: "pipe"
   });
-  pipeProcessStreamToLines(proc.stdout, spec.onStdoutLine);
-  pipeProcessStreamToLines(proc.stderr, spec.onStderrLine);
+  const stdoutPipe = pipeProcessStreamToLines(proc.stdout, spec.onStdoutLine);
+  const stderrPipe = pipeProcessStreamToLines(proc.stderr, spec.onStderrLine);
   const service = {
     name: spec.name,
     proc,
@@ -109,7 +123,11 @@ function spawnManagedService(spec) {
     exited: false,
     exitCode: null,
     launchedAtMs: Date.now(),
-    logPath: spec.logPath
+    logPath: spec.logPath,
+    stopOutputPipes: () => {
+      stdoutPipe.cancel();
+      stderrPipe.cancel();
+    }
   };
   proc.exited.then((code) => {
     service.exited = true;
@@ -161,6 +179,7 @@ class ServiceManager {
     const existing = this.services.get(spec.name);
     if (existing && !existing.exited) {
       try {
+        existing.stopOutputPipes?.();
         const pid = existing.proc.pid;
         if (process.platform === "win32" && typeof pid === "number" && pid > 0) {
           Bun.spawnSync(["taskkill", "/PID", String(pid), "/T", "/F"], {
@@ -224,6 +243,7 @@ class ServiceManager {
     this.stopped = true;
     for (const service of this.services.values()) {
       try {
+        service.stopOutputPipes?.();
         const pid = service.proc.pid;
         if (process.platform === "win32" && typeof pid === "number" && pid > 0) {
           Bun.spawnSync(["taskkill", "/PID", String(pid), "/T", "/F"], {
@@ -3221,6 +3241,7 @@ function buildServiceStopCommand(pid, platform = process.platform) {
 function stopRuntimeServices(services) {
   for (const service of services) {
     try {
+      service.stopOutputPipes?.();
       const stopCommand = buildServiceStopCommand(service.proc.pid, process.platform);
       if (stopCommand) {
         Bun.spawnSync(stopCommand, {
@@ -3236,6 +3257,52 @@ function stopRuntimeServices(services) {
     } catch {}
   }
 }
+async function runWindowsServiceStopCommand(command, timeoutMs) {
+  const proc = Bun.spawn(command, {
+    stdin: "ignore",
+    stdout: "ignore",
+    stderr: "ignore"
+  });
+  let timeout = null;
+  let timedOut = false;
+  const exitCode = await Promise.race([
+    proc.exited,
+    new Promise((resolveTimeout) => {
+      timeout = setTimeout(() => {
+        timedOut = true;
+        try {
+          proc.kill("SIGKILL");
+        } catch {}
+        resolveTimeout(-1);
+      }, Math.max(250, timeoutMs));
+    })
+  ]);
+  if (timeout) {
+    clearTimeout(timeout);
+    timeout = null;
+  }
+  if (timedOut) {
+    await Promise.race([proc.exited.catch(() => -1), Bun.sleep(250)]);
+    return false;
+  }
+  return exitCode === 0;
+}
+async function stopRuntimeServicesOnWindows(services, timeoutMs) {
+  const deadline = Date.now() + Math.max(1000, timeoutMs);
+  for (const service of services) {
+    service.stopOutputPipes?.();
+    const stopCommand = buildServiceStopCommand(service.proc.pid, "win32");
+    if (stopCommand) {
+      const remainingMs = Math.max(250, deadline - Date.now());
+      const stopped = await runWindowsServiceStopCommand(stopCommand, Math.min(WINDOWS_TASKKILL_TIMEOUT_MS2, remainingMs));
+      if (stopped)
+        continue;
+    }
+    try {
+      service.proc.kill("SIGKILL");
+    } catch {}
+  }
+}
 function resolveGracefulShutdownPriority(name) {
   if (name === "source_control_manager")
     return 0;
@@ -3264,7 +3331,7 @@ async function stopRuntimeServicesGracefully(services, timeoutMs = 1e4) {
     return;
   const ordered = [...running].sort((a, b) => resolveGracefulShutdownPriority(a.name) - resolveGracefulShutdownPriority(b.name));
   if (process.platform === "win32") {
-    stopRuntimeServices(ordered);
+    await stopRuntimeServicesOnWindows(ordered, timeoutMs);
     await waitForRuntimeServicesExit(ordered, Math.min(1000, timeoutMs));
     return;
   }
@@ -3295,6 +3362,7 @@ async function shutdownEmbeddedServiceManagerGracefully(options) {
     reason,
     requestShutdown = requestLocalRuntimeShutdown,
     shutdownAcceptedDelayMs = 1500,
+    serviceStopTimeoutMs = 1e4,
     onLog = (line) => console.log(line),
     onWarn = (line) => console.warn(line),
     cleanupTasks = []
@@ -3310,7 +3378,7 @@ async function shutdownEmbeddedServiceManagerGracefully(options) {
   } else if (shutdown.detail) {
     onWarn(`[pushpals] ${shutdown.detail}`);
   }
-  await stopRuntimeServicesGracefully(services);
+  await stopRuntimeServicesGracefully(services, serviceStopTimeoutMs);
   for (const task of cleanupTasks) {
     await task();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushpalsdev/cli",
-  "version": "1.1.39",
+  "version": "1.1.40",
   "description": "PushPals terminal CLI for LocalBuddy -> RemoteBuddy orchestration",
   "license": "MIT",
   "repository": {