vibelet 1.0.6 → 1.0.8

package/bin/vibelet.mjs

@@ -522,7 +522,9 @@ async function probeHealth(timeoutMs = 0) {
   const deadline = Date.now() + timeoutMs;
   do {
     try {
-      const response = await fetch(`http://127.0.0.1:${port}/health`);
+      const response = await fetch(`http://127.0.0.1:${port}/health`, {
+        signal: AbortSignal.timeout(1500),
+      });
       if (response.ok) {
         return await response.json();
       }
@@ -535,6 +537,16 @@ async function probeHealth(timeoutMs = 0) {
   return null;
 }
 
+async function waitForDaemonExit(timeoutMs) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    const health = await probeHealth(0);
+    if (!health) return true;
+    await new Promise((resolvePromise) => setTimeout(resolvePromise, 200));
+  }
+  return false;
+}
+
 async function waitForHealth(timeoutMs = 10_000) {
   const health = await probeHealth(timeoutMs);
   if (health) {
@@ -558,18 +570,15 @@ async function postJson(pathname, body = undefined) {
 
 async function requestShutdown() {
   try {
-    await fetch(`http://127.0.0.1:${port}/shutdown`, { method: 'POST' });
-    // Wait for daemon to actually stop
-    const deadline = Date.now() + 5_000;
-    while (Date.now() < deadline) {
-      const health = await probeHealth(0);
-      if (!health) return true;
-      await new Promise((r) => setTimeout(r, 200));
-    }
-    return false;
+    await fetch(`http://127.0.0.1:${port}/shutdown`, {
+      method: 'POST',
+      signal: AbortSignal.timeout(2000),
+    });
   } catch {
-    return true; // Already dead
+    // Request timed out or connection refused — daemon may be deadlocked or
+    // already gone. Either way, fall through to polling for actual exit.
   }
+  return waitForDaemonExit(5_000);
 }
 
 function isDaemonStartCommand(command) {
@@ -577,10 +586,11 @@ function isDaemonStartCommand(command) {
 }
 
 async function stopRunningDaemon(backend) {
-  await requestShutdown();
+  const gracefullyStopped = await requestShutdown();
   backend.stop();
-  const stillAlive = await probeHealth(5_000);
-  if (stillAlive) {
+  if (gracefullyStopped) return;
+  const died = await waitForDaemonExit(5_000);
+  if (!died) {
     fail('Daemon did not stop in time.');
   }
 }