@rudderhq/cli 0.3.6-canary.5 → 0.3.6-canary.7

package/dist/index.js

@@ -13788,6 +13788,7 @@ function createByteProgress(label, options = {}) {
 init_version();
 var DEFAULT_DESKTOP_RELEASE_REPO = "Undertone0809/rudder";
 var DESKTOP_UPDATE_QUIT_ARG = "--rudder-update-quit";
+var DESKTOP_UPDATE_FORCE_ARG = "--rudder-update-force";
 var STABLE_SEMVER_RE = /^[0-9]+\.[0-9]+\.[0-9]+$/;
 var CANARY_SEMVER_RE = /^[0-9]+\.[0-9]+\.[0-9]+-canary\.[0-9]+$/;
 var CLI_REGISTRY_LATEST_URL = "https://registry.npmjs.org/@rudderhq%2fcli/latest";
@@ -13871,7 +13872,7 @@ function createDesktopProgressFactory() {
 async function waitForDesktopApplySignal() {
   process.stdin.setEncoding("utf8");
   process.stdin.resume();
-  await new Promise((resolve, reject) => {
+  return await new Promise((resolve, reject) => {
     let buffer = "";
     const cleanup = () => {
       process.stdin.off("data", onData);
@@ -13882,9 +13883,15 @@ async function waitForDesktopApplySignal() {
       buffer += chunk;
       const lines = buffer.split(/\r?\n/);
       buffer = lines.pop() ?? "";
-      if (lines.some((line) => line.trim() === "apply")) {
+      const commands = lines.map((line) => line.trim());
+      if (commands.includes("force-apply")) {
         cleanup();
-        resolve();
+        resolve({ force: true });
+        return;
+      }
+      if (commands.includes("apply")) {
+        cleanup();
+        resolve({ force: false });
       }
     };
     const onEnd = () => {
@@ -14597,14 +14604,6 @@ function isInstalledDesktopCurrent(metadata, releaseTag, assetName, assetChecksu
     metadata && metadata.releaseTag === releaseTag && metadata.assetName === assetName && metadata.assetChecksum === assetChecksum
   );
 }
-function buildForceQuitCommand(target) {
-  if (target.platform === "windows") return { command: "taskkill.exe", args: ["/IM", `${DESKTOP_APP_NAME}.exe`, "/T", "/F"] };
-  return { command: "pkill", args: ["-x", DESKTOP_APP_NAME] };
-}
-function forceQuitDesktopProcesses(target) {
-  const command = buildForceQuitCommand(target);
-  spawnSync3(command.command, command.args, { stdio: "ignore" });
-}
 function forceQuitDesktopProcess(pid, target) {
   if (target.platform === "windows") {
     spawnSync3("taskkill.exe", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore" });
@@ -14615,6 +14614,36 @@ function forceQuitDesktopProcess(pid, target) {
   } catch {
   }
 }
+function quotePowerShellString(value) {
+  return `'${value.replaceAll("'", "''")}'`;
+}
+function findDesktopExecutablePids(executablePath, target) {
+  if (target.platform === "windows") {
+    const result2 = spawnSync3("powershell.exe", [
+      "-NoProfile",
+      "-Command",
+      `Get-CimInstance Win32_Process | Where-Object { $_.ExecutablePath -eq ${quotePowerShellString(executablePath)} } | Select-Object -ExpandProperty ProcessId`
+    ], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    if (result2.status !== 0) return [];
+    return result2.stdout.split(/\r?\n/).map((line) => Number.parseInt(line.trim(), 10)).filter((pid) => Number.isInteger(pid) && pid > 0 && pid !== process.pid);
+  }
+  const result = spawnSync3("ps", ["-eo", "pid=,args="], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "ignore"]
+  });
+  if (result.status !== 0) return [];
+  return result.stdout.split(/\r?\n/).flatMap((line) => {
+    const match = line.match(/^\s*(\d+)\s+(.+)$/);
+    if (!match) return [];
+    const pid = Number.parseInt(match[1], 10);
+    const commandLine = match[2];
+    const matchesExecutable = commandLine === executablePath || commandLine.startsWith(`${executablePath} `);
+    return matchesExecutable && pid !== process.pid ? [pid] : [];
+  });
+}
 function isRunningInsideDesktopExecutable() {
   return path21.basename(process.execPath).toLowerCase().startsWith(DESKTOP_APP_NAME.toLowerCase());
 }
@@ -14628,10 +14657,13 @@ async function waitForUpdateQuitResponse(responsePath, timeoutMs = 8e3) {
   }
   return null;
 }
-async function requestDesktopQuit(executablePath, target) {
+async function requestDesktopQuit(executablePath, target, options = {}) {
   if (!await pathExists2(executablePath)) return { ok: true, status: "not_running" };
   const responsePath = path21.join(tmpdir(), `rudder-update-quit-${process.pid}-${Date.now()}.json`);
-  const result = spawnSync3(executablePath, [`${DESKTOP_UPDATE_QUIT_ARG}=${responsePath}`], {
+  const result = spawnSync3(executablePath, [
+    `${DESKTOP_UPDATE_QUIT_ARG}=${responsePath}`,
+    ...options.forceUpdate ? [DESKTOP_UPDATE_FORCE_ARG] : []
+  ], {
     stdio: "ignore",
     timeout: 5e3
   });
@@ -14639,7 +14671,7 @@ async function requestDesktopQuit(executablePath, target) {
     return null;
   }
   try {
-    return await waitForUpdateQuitResponse(responsePath);
+    return await waitForUpdateQuitResponse(responsePath, options.responseTimeoutMs);
   } finally {
     await rm2(responsePath, { force: true });
   }
@@ -14668,6 +14700,12 @@ async function waitForProcessExit(pid, timeoutMs = 2e4, intervalMs = 250) {
   }
   return !processExists(pid);
 }
+async function waitForProcessesExit(pids, waitForExit) {
+  const uniquePids = [...new Set(pids)];
+  if (uniquePids.length === 0) return true;
+  const results = await Promise.all(uniquePids.map((pid) => waitForExit(pid)));
+  return results.every(Boolean);
+}
 async function removePathWithRetry(targetPath, attempts = 5) {
   for (let attempt = 0; attempt < attempts; attempt += 1) {
     try {
@@ -14680,50 +14718,100 @@ async function removePathWithRetry(targetPath, attempts = 5) {
   return false;
 }
 async function prepareForDesktopReplace(paths, target, options = {}) {
-  const forceQuit = options.forceQuitDesktopProcesses ?? forceQuitDesktopProcesses;
   const forceQuitPid = options.forceQuitDesktopProcess ?? forceQuitDesktopProcess;
   const waitForExit = options.waitForDesktopProcessExit ?? waitForProcessExit;
+  const findPids = options.findDesktopExecutablePids ?? findDesktopExecutablePids;
+  async function forceQuitPidAndConfirm(pid) {
+    forceQuitPid(pid, target);
+    await delay2(options.updateQuitForceDelayMs ?? UPDATE_QUIT_FORCE_DELAY_MS);
+    if (!await waitForExit(pid)) {
+      throw new Error(`Rudder Desktop process ${pid} did not exit after force-quit fallback. Close Rudder and rerun start.`);
+    }
+  }
+  async function forceQuitPidsAndConfirm(pids) {
+    const uniquePids = [...new Set(pids)];
+    for (const pid of uniquePids) {
+      forceQuitPid(pid, target);
+    }
+    await delay2(options.updateQuitForceDelayMs ?? UPDATE_QUIT_FORCE_DELAY_MS);
+    if (!await waitForProcessesExit(uniquePids, waitForExit)) {
+      throw new Error(`Rudder Desktop process${uniquePids.length === 1 ? "" : "es"} ${uniquePids.join(", ")} did not exit after force-quit fallback. Close Rudder and rerun start.`);
+    }
+  }
+  let quitPid = null;
+  let managedExecutablePids = [];
   const hasManagedExecutable = await pathExists2(paths.executablePath);
   if (hasManagedExecutable) {
-    let quitResponse = await requestDesktopQuit(paths.executablePath, target);
-    while (quitResponse && !quitResponse.ok && quitResponse.status === "active_runs" && options.waitForActiveRuns) {
+    managedExecutablePids = findPids(paths.executablePath, target);
+    const requestQuit = () => requestDesktopQuit(paths.executablePath, target, {
+      forceUpdate: options.forceUpdate,
+      responseTimeoutMs: options.updateQuitResponseTimeoutMs
+    });
+    let quitResponse = await requestQuit();
+    while (quitResponse && !quitResponse.ok && quitResponse.status === "active_runs" && options.waitForActiveRuns && !options.forceUpdate) {
       p15.log.warn(
         `Rudder Desktop has ${quitResponse.totalRuns} active run${quitResponse.totalRuns === 1 ? "" : "s"}; waiting before replacing Desktop.`
       );
       await delay2(options.activeRunPollIntervalMs ?? 15e3);
-      quitResponse = await requestDesktopQuit(paths.executablePath, target);
+      quitResponse = await requestQuit();
     }
     if (quitResponse && !quitResponse.ok && quitResponse.status === "active_runs") {
+      if (!options.forceUpdate) {
+        throw new Error(
+          `Rudder Desktop has ${quitResponse.totalRuns} active run${quitResponse.totalRuns === 1 ? "" : "s"}. Stop active work, then rerun start.`
+        );
+      }
       throw new Error(
-        `Rudder Desktop has ${quitResponse.totalRuns} active run${quitResponse.totalRuns === 1 ? "" : "s"}. Stop active work, then rerun start.`
+        `Rudder Desktop still has ${quitResponse.totalRuns} active run${quitResponse.totalRuns === 1 ? "" : "s"} after the force-update request. Stop active work, then rerun start.`
       );
     }
-    const quitPid = readUpdateQuitPid(quitResponse);
+    if (quitResponse && !quitResponse.ok && quitResponse.status === "failed") {
+      throw new Error(quitResponse.message);
+    }
+    quitPid = readUpdateQuitPid(quitResponse);
     if (quitPid) {
       p15.log.info(`Waiting for existing Rudder Desktop process ${quitPid} to exit before replacing it.`);
       if (!await waitForExit(quitPid)) {
         p15.log.warn(`Rudder Desktop process ${quitPid} did not exit in time; attempting force-quit fallback.`);
-        forceQuitPid(quitPid, target);
-        await delay2(options.updateQuitForceDelayMs ?? UPDATE_QUIT_FORCE_DELAY_MS);
+        await forceQuitPidAndConfirm(quitPid);
       }
     } else if (isLegacyUnconfirmedUpdateQuit(quitResponse)) {
       const graceMs = options.legacyUpdateQuitGraceMs ?? LEGACY_UPDATE_QUIT_GRACE_MS;
       p15.log.warn(
-        `Existing Rudder Desktop acknowledged update quit without a process id; waiting ${Math.ceil(graceMs / 1e3)}s before force-quit fallback.`
+        `Existing Rudder Desktop acknowledged update quit without a process id; waiting ${Math.ceil(graceMs / 1e3)}s before replacement.`
       );
       await delay2(graceMs);
-      forceQuit(target);
-      await delay2(options.updateQuitForceDelayMs ?? UPDATE_QUIT_FORCE_DELAY_MS);
+      if (managedExecutablePids.length > 0 && !await waitForProcessesExit(managedExecutablePids, waitForExit)) {
+        p15.log.warn(
+          `Existing Rudder Desktop did not exit after acknowledging update quit; attempting path-scoped force-quit for process${managedExecutablePids.length === 1 ? "" : "es"} ${managedExecutablePids.join(", ")}.`
+        );
+        await forceQuitPidsAndConfirm(managedExecutablePids);
+      }
+    } else if (!quitResponse) {
+      if (options.forceUpdate && managedExecutablePids.length > 0) {
+        p15.log.warn(
+          `Existing Rudder Desktop did not respond to the update quit request; attempting path-scoped force-quit for process${managedExecutablePids.length === 1 ? "" : "es"} ${managedExecutablePids.join(", ")}.`
+        );
+        await forceQuitPidsAndConfirm(managedExecutablePids);
+      } else {
+        throw new Error("Existing Rudder Desktop did not respond to the update quit request. Close Rudder and rerun start.");
+      }
     } else {
       await delay2(options.updateQuitForceDelayMs ?? UPDATE_QUIT_FORCE_DELAY_MS);
     }
   } else if (!isRunningInsideDesktopExecutable()) {
-    forceQuit(target);
+    throw new Error("Cannot find the managed Rudder Desktop executable to request a safe update quit. Close Rudder and rerun start.");
   }
   const replacePath = target.platform === "windows" ? paths.installRoot : paths.appPath;
   if (await removePathWithRetry(replacePath)) return;
-  forceQuit(target);
-  await delay2(options.updateQuitForceDelayMs ?? UPDATE_QUIT_FORCE_DELAY_MS);
+  if (!quitPid) {
+    if (managedExecutablePids.length > 0) {
+      await forceQuitPidsAndConfirm(managedExecutablePids);
+      if (await removePathWithRetry(replacePath, 6)) return;
+    }
+    throw new Error(`Failed to replace existing Rudder Desktop at ${replacePath}. Close Rudder and rerun start.`);
+  }
+  await forceQuitPidAndConfirm(quitPid);
   if (await removePathWithRetry(replacePath, 6)) return;
   throw new Error(`Failed to replace existing Rudder Desktop at ${replacePath}. Close Rudder and rerun start.`);
 }
@@ -15056,22 +15144,26 @@ async function startCommand(opts) {
           () => assertChecksumMatch(cachedAsset.path, expectedChecksum),
           desktopProgressJson ? "verifying_checksum" : null
         );
+        let applySignal = null;
         if (desktopProgressJson && opts.desktopWaitForApply === true) {
           writeDesktopProgress({
             phase: "ready_to_install",
             message: "Desktop update is downloaded and verified.",
             percent: 100
           });
-          await waitForDesktopApplySignal();
+          applySignal = await waitForDesktopApplySignal();
           writeDesktopProgress({
             phase: "preparing_restart",
-            message: "Applying Desktop update..."
+            message: applySignal.force ? "Applying Desktop update and quitting active runs..." : "Applying Desktop update..."
           });
         }
         await runStartPhase(
           "Replacing existing Rudder Desktop if needed...",
           "Existing Desktop install is ready for replacement.",
-          () => prepareForDesktopReplace(installPaths, target, { waitForActiveRuns: opts.waitForActiveRuns === true }),
+          () => prepareForDesktopReplace(installPaths, target, {
+            waitForActiveRuns: opts.waitForActiveRuns === true,
+            forceUpdate: applySignal?.force === true
+          }),
           desktopProgressJson ? opts.waitForActiveRuns === true ? "waiting_for_active_runs" : "preparing_restart" : null
         );
         await runStartPhase(