@boxes-dev/dvb 1.0.663 → 1.0.665

package/dist/bin/dvb.cjs

@@ -3111,6 +3111,17 @@ var readJsonFileIfExists = async (filePath) => {
     throw error;
   }
 };
+var readJsonFileIfExistsSync = (filePath) => {
+  try {
+    const raw = (0, import_node_fs7.readFileSync)(filePath, "utf8");
+    return JSON.parse(raw);
+  } catch (error) {
+    if (error instanceof Error && "code" in error && error.code === "ENOENT") {
+      return null;
+    }
+    throw error;
+  }
+};
 var writeJsonFileAtomic = async (filePath, value) => {
   const tempPath = `${filePath}.tmp-${process.pid}-${Date.now()}`;
   await import_promises2.default.mkdir(import_node_path11.default.dirname(filePath), { recursive: true, mode: 448 });
@@ -3254,6 +3265,15 @@ var ensureUpdaterDir = async (homeDir = import_node_os2.default.homedir()) => {
   }
   return updaterDir;
 };
+var ensureUpdaterDirSync = (homeDir = import_node_os2.default.homedir()) => {
+  const updaterDir = resolveUpdaterDir(homeDir);
+  (0, import_node_fs7.mkdirSync)(updaterDir, { recursive: true, mode: 448 });
+  try {
+    (0, import_node_fs7.chmodSync)(updaterDir, 448);
+  } catch {
+  }
+  return updaterDir;
+};
 var trimUpdaterError = (error) => {
   const message = error instanceof Error ? error.message : String(error);
   return message.length > MAX_UPDATER_ERROR_LENGTH ? `${message.slice(0, MAX_UPDATER_ERROR_LENGTH)}...` : message;
@@ -3550,6 +3570,29 @@ var resolveBootstrapBinPath = (name) => {
   const basePath = resolveBasePath();
   return import_node_path11.default.join(import_node_path11.default.dirname(basePath), `${name}.cjs`);
 };
+var readProcessCommand = (pid) => {
+  const ps2 = (0, import_node_child_process.spawnSync)("ps", ["-p", String(pid), "-o", "command="], {
+    encoding: "utf8"
+  });
+  if (ps2.error || ps2.status !== 0 || typeof ps2.stdout !== "string") {
+    return null;
+  }
+  const command = ps2.stdout.trim();
+  return command.length > 0 ? command : null;
+};
+var processCommandMentionsPath = (command, filePath) => command.split(/\s+/).includes(filePath);
+var isReusableUpdaterDaemon = (record, expectedBootstrapPath, options = {}) => {
+  const isProcessAliveFn = options.isProcessAliveFn ?? isProcessAlive;
+  const readProcessCommandFn = options.readProcessCommandFn ?? readProcessCommand;
+  if (!isProcessAliveFn(record.pid)) {
+    return false;
+  }
+  if (typeof record.bootstrapPath === "string") {
+    return record.bootstrapPath === expectedBootstrapPath;
+  }
+  const command = readProcessCommandFn(record.pid);
+  return command ? processCommandMentionsPath(command, expectedBootstrapPath) : false;
+};
 var readUpgradeSignal = async (signalPath) => {
   return await readJsonFileIfExists(signalPath);
 };
@@ -3726,14 +3769,16 @@ var runUpdaterPass = async (homeDir = import_node_os2.default.homedir()) => {
   }
 };
 var startBackgroundUpdater = async (homeDir = import_node_os2.default.homedir()) => {
-  await ensureUpdaterDir(homeDir);
-  const existing = await readJsonFileIfExists(
-    resolveUpdaterDaemonPath(homeDir)
-  );
-  if (existing && isProcessAlive(existing.pid)) {
+  ensureUpdaterDirSync(homeDir);
+  const updaterBinPath = resolveBootstrapBinPath("dvb-update");
+  const daemonPath = resolveUpdaterDaemonPath(homeDir);
+  const existing = readJsonFileIfExistsSync(daemonPath);
+  if (existing && isReusableUpdaterDaemon(existing, updaterBinPath)) {
     return false;
   }
-  const updaterBinPath = resolveBootstrapBinPath("dvb-update");
+  if (existing) {
+    (0, import_node_fs7.rmSync)(daemonPath, { force: true });
+  }
   const child = (0, import_node_child_process.spawn)(process.execPath, [updaterBinPath, "--daemon"], {
     env: withBootstrapInstallOwnerEnv(process.env),
     stdio: "ignore",