bb-app 0.0.7 → 0.0.8

package/dist/bb-app.js

@@ -13970,6 +13970,8 @@ var HOST_AUTH_FILE_NAME = "auth.json";
 var HOST_ID_FILE_NAME = "host-id";
 var HEALTH_CHECK_TIMEOUT_MS = 15e3;
 var HEALTH_CHECK_INTERVAL_MS = 100;
+var MANAGED_PROCESS_TERMINATION_TIMEOUT_MS = 5e3;
+var MANAGED_PROCESS_KILL_TIMEOUT_MS = 1e3;
 var START_COMMAND = "start";
 var HOST_DAEMON_COMMAND = "host-daemon";
 var HOST_DAEMON_JOIN_COMMAND = "join";
@@ -14922,6 +14924,35 @@ function waitForProcessExit(childProcess) {
     });
   });
 }
+function waitForProcessExitWithTimeout(args) {
+  if (hasProcessExited(args.childProcess)) {
+    return Promise.resolve("exited");
+  }
+  return new Promise((resolvePromise) => {
+    let settled = false;
+    let timeout;
+    const finish = (result) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      clearTimeout(timeout);
+      args.childProcess.off("exit", exitHandler);
+      resolvePromise(result);
+    };
+    const exitHandler = () => {
+      finish("exited");
+    };
+    timeout = setTimeout(() => {
+      finish("timed-out");
+    }, args.timeoutMs);
+    timeout.unref();
+    args.childProcess.once("exit", exitHandler);
+    if (hasProcessExited(args.childProcess)) {
+      finish("exited");
+    }
+  });
+}
 async function waitForNamedProcessExit(args) {
   return {
     processName: args.processName,
@@ -14934,12 +14965,29 @@ function toExitCode(result) {
   }
   return result.signal === null ? 1 : 128;
 }
-async function terminateProcessIfRunning(childProcess, signal) {
-  if (hasProcessExited(childProcess)) {
+async function terminateProcessIfRunning(args) {
+  if (hasProcessExited(args.childProcess)) {
+    return;
+  }
+  args.childProcess.kill(args.signal);
+  const gracefulResult = await waitForProcessExitWithTimeout({
+    childProcess: args.childProcess,
+    timeoutMs: MANAGED_PROCESS_TERMINATION_TIMEOUT_MS
+  });
+  if (gracefulResult === "exited") {
     return;
   }
-  childProcess.kill(signal);
-  await waitForProcessExit(childProcess);
+  log(
+    yellow("!"),
+    `${args.processName} did not stop after ${MANAGED_PROCESS_TERMINATION_TIMEOUT_MS}ms - sending SIGKILL`
+  );
+  if (!hasProcessExited(args.childProcess)) {
+    args.childProcess.kill("SIGKILL");
+  }
+  await waitForProcessExitWithTimeout({
+    childProcess: args.childProcess,
+    timeoutMs: MANAGED_PROCESS_KILL_TIMEOUT_MS
+  });
 }
 function createSharedEnv(args) {
   return {
@@ -15097,7 +15145,11 @@ async function runHostDaemonOnly(args) {
     shuttingDown = true;
     process.stdout.write("\n");
     log(dim("\u25CF"), "Shutting down");
-    await terminateProcessIfRunning(daemonProcess, signal);
+    await terminateProcessIfRunning({
+      childProcess: daemonProcess,
+      processName: "daemon",
+      signal
+    });
   };
   const removeSignalForwarding = installTerminationSignalForwarding(
     (signal) => {
@@ -15264,11 +15316,19 @@ async function runBbApp(cliArgs = process.argv.slice(2)) {
     process.stdout.write("\n");
     log(dim("\u25CF"), "Shutting down");
     const terminationPromises = [
-      terminateProcessIfRunning(serverProcess, signal)
+      terminateProcessIfRunning({
+        childProcess: serverProcess,
+        processName: "server",
+        signal
+      })
     ];
     if (daemonProcess !== null) {
       terminationPromises.push(
-        terminateProcessIfRunning(daemonProcess, signal)
+        terminateProcessIfRunning({
+          childProcess: daemonProcess,
+          processName: "daemon",
+          signal
+        })
       );
     }
     await Promise.all(terminationPromises);
@@ -15338,15 +15398,17 @@ async function runBbApp(cliArgs = process.argv.slice(2)) {
     outputBuffer.flush();
     const firstExit = await Promise.race([serverExit, daemonExit]);
     if (firstExit.processName === "server") {
-      await terminateProcessIfRunning(
-        daemonProcess,
-        firstExit.result.signal ?? "SIGTERM"
-      );
+      await terminateProcessIfRunning({
+        childProcess: daemonProcess,
+        processName: "daemon",
+        signal: firstExit.result.signal ?? "SIGTERM"
+      });
     } else {
-      await terminateProcessIfRunning(
-        serverProcess,
-        firstExit.result.signal ?? "SIGTERM"
-      );
+      await terminateProcessIfRunning({
+        childProcess: serverProcess,
+        processName: "server",
+        signal: firstExit.result.signal ?? "SIGTERM"
+      });
     }
     process.exitCode = toExitCode(firstExit.result);
   } catch (error48) {

package/dist/bb-host-daemon.js

@@ -13970,6 +13970,8 @@ var HOST_AUTH_FILE_NAME = "auth.json";
 var HOST_ID_FILE_NAME = "host-id";
 var HEALTH_CHECK_TIMEOUT_MS = 15e3;
 var HEALTH_CHECK_INTERVAL_MS = 100;
+var MANAGED_PROCESS_TERMINATION_TIMEOUT_MS = 5e3;
+var MANAGED_PROCESS_KILL_TIMEOUT_MS = 1e3;
 var HOST_DAEMON_JOIN_COMMAND = "join";
 var MANAGED_CONFIG_KEYS = BB_APP_MANAGED_CONFIG_KEYS;
 var MANAGED_CONFIG_KEY_VALUES = new Set(MANAGED_CONFIG_KEYS);
@@ -14525,18 +14527,64 @@ function waitForProcessExit(childProcess) {
     });
   });
 }
+function waitForProcessExitWithTimeout(args) {
+  if (hasProcessExited(args.childProcess)) {
+    return Promise.resolve("exited");
+  }
+  return new Promise((resolvePromise) => {
+    let settled = false;
+    let timeout;
+    const finish = (result) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      clearTimeout(timeout);
+      args.childProcess.off("exit", exitHandler);
+      resolvePromise(result);
+    };
+    const exitHandler = () => {
+      finish("exited");
+    };
+    timeout = setTimeout(() => {
+      finish("timed-out");
+    }, args.timeoutMs);
+    timeout.unref();
+    args.childProcess.once("exit", exitHandler);
+    if (hasProcessExited(args.childProcess)) {
+      finish("exited");
+    }
+  });
+}
 function toExitCode(result) {
   if (result.code !== null) {
     return result.code;
   }
   return result.signal === null ? 1 : 128;
 }
-async function terminateProcessIfRunning(childProcess, signal) {
-  if (hasProcessExited(childProcess)) {
+async function terminateProcessIfRunning(args) {
+  if (hasProcessExited(args.childProcess)) {
+    return;
+  }
+  args.childProcess.kill(args.signal);
+  const gracefulResult = await waitForProcessExitWithTimeout({
+    childProcess: args.childProcess,
+    timeoutMs: MANAGED_PROCESS_TERMINATION_TIMEOUT_MS
+  });
+  if (gracefulResult === "exited") {
     return;
   }
-  childProcess.kill(signal);
-  await waitForProcessExit(childProcess);
+  log(
+    yellow("!"),
+    `${args.processName} did not stop after ${MANAGED_PROCESS_TERMINATION_TIMEOUT_MS}ms - sending SIGKILL`
+  );
+  if (!hasProcessExited(args.childProcess)) {
+    args.childProcess.kill("SIGKILL");
+  }
+  await waitForProcessExitWithTimeout({
+    childProcess: args.childProcess,
+    timeoutMs: MANAGED_PROCESS_KILL_TIMEOUT_MS
+  });
 }
 function resolveHostDaemonServerUrl(args) {
   return trimToUndefined(args.env.BB_SERVER_URL) ?? args.context.serverUrl;
@@ -14662,7 +14710,11 @@ async function runHostDaemonOnly(args) {
     shuttingDown = true;
     process.stdout.write("\n");
     log(dim("\u25CF"), "Shutting down");
-    await terminateProcessIfRunning(daemonProcess, signal);
+    await terminateProcessIfRunning({
+      childProcess: daemonProcess,
+      processName: "daemon",
+      signal
+    });
   };
   const removeSignalForwarding = installTerminationSignalForwarding(
     (signal) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bb-app",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "bb app launcher for npx",
   "keywords": [
     "bb",