@boxes-dev/dvb 1.0.451 → 1.0.458

package/dist/bin/dvbd.cjs

@@ -3051,6 +3051,11 @@ var VALIDATION_TIMEOUT_MS = 5e3;
 var UPGRADE_REQUIRED_EXIT_CODE = 86;
 var UPDATER_INTERVAL_MS = 15 * 60 * 1e3;
 var MAX_UPDATER_ERROR_LENGTH = 2e3;
+var runtimeManagerTestHooks = {
+  ensureBundledRuntimeStaged: void 0,
+  startBackgroundUpdater: void 0,
+  runRuntimeChild: void 0
+};
 var assertNodeVersion = () => {
   const version = process.versions.node;
   const major = Number(version.split(".")[0]);
@@ -3311,6 +3316,39 @@ var waitForHealthyRuntime = async (socketPath, child, readStdout, readStderr) =>
     `Runtime validation timed out. ${readStderr() || readStdout()}`.trim()
   );
 };
+var waitForChildExit = async (child, readStdout, readStderr, timeoutMessage) => {
+  await new Promise((resolve, reject) => {
+    const timeout = setTimeout(() => {
+      reject(
+        new Error(`${timeoutMessage}. ${readStderr() || readStdout()}`.trim())
+      );
+    }, VALIDATION_TIMEOUT_MS);
+    child.once("error", (error) => {
+      clearTimeout(timeout);
+      reject(error);
+    });
+    child.once("exit", (code, signal) => {
+      clearTimeout(timeout);
+      if (signal) {
+        reject(
+          new Error(
+            `Runtime validation CLI exited via ${signal}. ${readStderr() || readStdout()}`.trim()
+          )
+        );
+        return;
+      }
+      if (code !== 0) {
+        reject(
+          new Error(
+            `Runtime validation CLI exited with ${String(code)}. ${readStderr() || readStdout()}`.trim()
+          )
+        );
+        return;
+      }
+      resolve();
+    });
+  });
+};
 var terminateChild = async (child) => {
   if (child.exitCode !== null) return;
   child.kill("SIGTERM");
@@ -3333,12 +3371,16 @@ var validateRuntimeStage = async (stageDir, expectedVersion) => {
     `dvb-runtime-validate-${process.pid}-${(0, import_node_crypto2.randomUUID)().slice(0, 8)}`
   );
   const socketPath = import_node_path11.default.join(socketDir, "devboxd.sock");
-  const binPath = resolveRuntimeBinPath(stageDir, "dvbd");
-  if (!(0, import_node_fs7.existsSync)(binPath)) {
-    throw new Error(`Runtime stage is missing ${binPath}.`);
+  const daemonBinPath = resolveRuntimeBinPath(stageDir, "dvbd");
+  if (!(0, import_node_fs7.existsSync)(daemonBinPath)) {
+    throw new Error(`Runtime stage is missing ${daemonBinPath}.`);
+  }
+  const cliBinPath = resolveRuntimeBinPath(stageDir, "dvb");
+  if (!(0, import_node_fs7.existsSync)(cliBinPath)) {
+    throw new Error(`Runtime stage is missing ${cliBinPath}.`);
   }
   await import_promises2.default.mkdir(socketDir, { recursive: true, mode: 448 });
-  const child = (0, import_node_child_process.spawn)(process.execPath, [binPath], {
+  const child = (0, import_node_child_process.spawn)(process.execPath, [daemonBinPath], {
     env: {
       ...process.env,
       DEVBOX_SOCKET_PATH: socketPath
@@ -3359,6 +3401,27 @@ var validateRuntimeStage = async (stageDir, expectedVersion) => {
         `Runtime stage reported version ${validated.version}; expected ${expectedVersion}.`
       );
     }
+    const cliHomeDir = import_node_path11.default.join(socketDir, "home");
+    await import_promises2.default.mkdir(cliHomeDir, { recursive: true, mode: 448 });
+    const cliChild = (0, import_node_child_process.spawn)(process.execPath, [cliBinPath, "--help"], {
+      env: {
+        ...process.env,
+        HOME: cliHomeDir
+      },
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    const readCliStdout = collectStreamOutput(cliChild, "stdout");
+    const readCliStderr = collectStreamOutput(cliChild, "stderr");
+    try {
+      await waitForChildExit(
+        cliChild,
+        readCliStdout,
+        readCliStderr,
+        "Runtime validation CLI timed out"
+      );
+    } finally {
+      await terminateChild(cliChild);
+    }
   } finally {
     await terminateChild(child);
     await import_promises2.default.rm(socketDir, { recursive: true, force: true });
@@ -3573,9 +3636,12 @@ var startBackgroundUpdater = async (homeDir = import_node_os2.default.homedir())
 var launchRuntime = async (kind, args) => {
   assertNodeVersion();
   const homeDir = process.env.HOME?.trim() || import_node_os2.default.homedir();
-  void startBackgroundUpdater(homeDir).catch(() => {
+  const ensureBundledRuntimeStagedFn = runtimeManagerTestHooks.ensureBundledRuntimeStaged ?? ensureBundledRuntimeStaged;
+  const startBackgroundUpdaterFn = runtimeManagerTestHooks.startBackgroundUpdater ?? startBackgroundUpdater;
+  const runRuntimeChildFn = runtimeManagerTestHooks.runRuntimeChild ?? runRuntimeChild;
+  let runtime = await ensureBundledRuntimeStagedFn(homeDir);
+  void startBackgroundUpdaterFn(homeDir).catch(() => {
   });
-  let runtime = await ensureBundledRuntimeStaged(homeDir);
   const signalPath = import_node_path11.default.join(
     await ensureUpdaterDir(homeDir),
     `upgrade-required-${kind}-${process.pid}-${Date.now()}.json`
@@ -3583,7 +3649,7 @@ var launchRuntime = async (kind, args) => {
   try {
     for (let attempt = 0; attempt < 2; attempt += 1) {
       await import_promises2.default.rm(signalPath, { force: true });
-      const result = await runRuntimeChild(
+      const result = await runRuntimeChildFn(
         resolveRuntimeBinPath(runtime.runtimeDir, kind),
         args,
         signalPath