@boxes-dev/dvb 1.0.682 → 1.0.684

package/dist/bin/dvb.cjs

@@ -3581,17 +3581,61 @@ var readProcessCommand = (pid) => {
   return command.length > 0 ? command : null;
 };
 var processCommandMentionsPath = (command, filePath) => command.split(/\s+/).includes(filePath);
+var processCommandLooksLikeUpdaterDaemon = (command, bootstrapPath) => {
+  const parts = command.split(/\s+/).filter((part) => part.length > 0);
+  if (!parts.includes("--daemon")) {
+    return false;
+  }
+  const expectedBootstrapPath = bootstrapPath?.trim();
+  if (expectedBootstrapPath) {
+    return parts.includes(expectedBootstrapPath);
+  }
+  return parts.some((part) => {
+    const baseName = import_node_path11.default.basename(part);
+    return baseName === "dvb-update" || baseName === "dvb-update.cjs";
+  });
+};
 var isReusableUpdaterDaemon = (record, expectedBootstrapPath, options = {}) => {
   const isProcessAliveFn = options.isProcessAliveFn ?? isProcessAlive;
   const readProcessCommandFn = options.readProcessCommandFn ?? readProcessCommand;
   if (!isProcessAliveFn(record.pid)) {
     return false;
   }
+  const command = readProcessCommandFn(record.pid);
+  if (!command) {
+    return false;
+  }
   if (typeof record.bootstrapPath === "string") {
-    return record.bootstrapPath === expectedBootstrapPath;
+    return record.bootstrapPath === expectedBootstrapPath && processCommandMentionsPath(command, expectedBootstrapPath);
+  }
+  return processCommandMentionsPath(command, expectedBootstrapPath);
+};
+var tryTerminateProcess = (pid, signal) => {
+  try {
+    process.kill(pid, signal);
+  } catch (error) {
+    const code = error?.code;
+    if (code !== "ESRCH") {
+      throw error;
+    }
+  }
+};
+var retireStaleUpdaterDaemon = (record, options = {}) => {
+  const isProcessAliveFn = options.isProcessAliveFn ?? isProcessAlive;
+  const readProcessCommandFn = options.readProcessCommandFn ?? readProcessCommand;
+  const killProcessFn = options.killProcessFn ?? tryTerminateProcess;
+  if (!isProcessAliveFn(record.pid)) {
+    return false;
   }
   const command = readProcessCommandFn(record.pid);
-  return command ? processCommandMentionsPath(command, expectedBootstrapPath) : false;
+  if (!command) {
+    return false;
+  }
+  if (!processCommandLooksLikeUpdaterDaemon(command, record.bootstrapPath)) {
+    return false;
+  }
+  killProcessFn(record.pid, "SIGTERM");
+  return true;
 };
 var readUpgradeSignal = async (signalPath) => {
   return await readJsonFileIfExists(signalPath);
@@ -3777,6 +3821,7 @@ var startBackgroundUpdater = async (homeDir = import_node_os2.default.homedir())
     return false;
   }
   if (existing) {
+    retireStaleUpdaterDaemon(existing);
     (0, import_node_fs7.rmSync)(daemonPath, { force: true });
   }
   const child = (0, import_node_child_process.spawn)(process.execPath, [updaterBinPath, "--daemon"], {
@@ -3794,8 +3839,10 @@ var launchRuntime = async (kind, args) => {
   const startBackgroundUpdaterFn = runtimeManagerTestHooks.startBackgroundUpdater ?? startBackgroundUpdater;
   const runRuntimeChildFn = runtimeManagerTestHooks.runRuntimeChild ?? runRuntimeChild;
   let runtime = await ensureBundledRuntimeStagedFn(homeDir);
-  void startBackgroundUpdaterFn(homeDir).catch(() => {
-  });
+  if (!(kind === "dvb" && args[0] === "upgrade")) {
+    void startBackgroundUpdaterFn(homeDir).catch(() => {
+    });
+  }
   const signalPath = import_node_path11.default.join(
     await ensureUpdaterDir(homeDir),
     `upgrade-required-${kind}-${process.pid}-${Date.now()}.json`