@rudderhq/cli 0.3.5-canary.16 → 0.3.5-canary.17

package/dist/index.js

@@ -13055,7 +13055,7 @@ init_install2();
 init_install();
 import * as p15 from "@clack/prompts";
 import { spawn as spawn2, spawnSync as spawnSync3 } from "node:child_process";
-import { createHash } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import { createWriteStream, constants as fsConstants, mkdirSync, readFileSync as readFileSync2 } from "node:fs";
 import { access, chmod, copyFile, cp, mkdir as mkdir3, mkdtemp, readdir as readdir3, readFile as readFile6, rm as rm2, stat as stat4, utimes, writeFile as writeFile3 } from "node:fs/promises";
 import { homedir, tmpdir } from "node:os";
@@ -13191,6 +13191,8 @@ var DEFAULT_DESKTOP_ASSET_CACHE_MAX_ENTRIES = 2;
 var DEFAULT_DESKTOP_ASSET_CACHE_MAX_AGE_MS = 14 * 24 * 60 * 60 * 1e3;
 var DEFAULT_DESKTOP_ASSET_CACHE_MAX_BYTES = 768 * 1024 * 1024;
 var DEFAULT_DESKTOP_ASSET_CACHE_KEEP_PREVIOUS = 1;
+var DESKTOP_INSTALL_LOCK_TIMEOUT_MS = 60 * 60 * 1e3;
+var DESKTOP_INSTALL_LOCK_POLL_MS = 250;
 function normalizeProgressTotal(totalBytes) {
   return typeof totalBytes === "number" && Number.isFinite(totalBytes) && totalBytes > 0 ? totalBytes : null;
 }
@@ -13834,6 +13836,70 @@ async function pathExists2(targetPath) {
     return false;
   }
 }
+function resolveDesktopInstallLockPath(paths) {
+  const installRootHash = createHash("sha256").update(path21.resolve(paths.installRoot)).digest("hex").slice(0, 16);
+  return path21.join(path21.dirname(paths.appPath), `.rudder-desktop-install-${installRootHash}.lock`);
+}
+async function readDesktopInstallLock(lockPath) {
+  try {
+    const parsed = JSON.parse(await readFile6(lockPath, "utf8"));
+    if (typeof parsed.pid !== "number" || !Number.isInteger(parsed.pid) || parsed.pid <= 0 || typeof parsed.lockId !== "string" || typeof parsed.installRoot !== "string" || typeof parsed.createdAt !== "string") {
+      return null;
+    }
+    return {
+      lockId: parsed.lockId,
+      pid: parsed.pid,
+      installRoot: parsed.installRoot,
+      createdAt: parsed.createdAt
+    };
+  } catch {
+    return null;
+  }
+}
+async function withDesktopInstallLock(paths, fn, options = {}) {
+  const lockPath = resolveDesktopInstallLockPath(paths);
+  const lockDir = path21.dirname(lockPath);
+  const timeoutMs = options.timeoutMs ?? DESKTOP_INSTALL_LOCK_TIMEOUT_MS;
+  const pollMs = options.pollMs ?? DESKTOP_INSTALL_LOCK_POLL_MS;
+  const startedAt = Date.now();
+  const payload = {
+    lockId: randomUUID(),
+    pid: process.pid,
+    installRoot: path21.resolve(paths.installRoot),
+    createdAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  await mkdir3(lockDir, { recursive: true });
+  while (true) {
+    try {
+      await writeFile3(lockPath, `${JSON.stringify(payload, null, 2)}
+`, { encoding: "utf8", flag: "wx" });
+      break;
+    } catch (error) {
+      const err = error;
+      if (err.code !== "EEXIST") throw error;
+      const existing = await readDesktopInstallLock(lockPath);
+      const stale = !existing || !processExists(existing.pid);
+      if (stale) {
+        await rm2(lockPath, { force: true });
+        continue;
+      }
+      if (Date.now() - startedAt >= timeoutMs) {
+        throw new Error(
+          `Timed out waiting for Rudder Desktop install lock for ${paths.appPath}. Held by pid ${existing.pid} for ${existing.installRoot}.`
+        );
+      }
+      await delay2(pollMs);
+    }
+  }
+  try {
+    return await fn();
+  } finally {
+    const existing = await readDesktopInstallLock(lockPath);
+    if (existing?.lockId === payload.lockId) {
+      await rm2(lockPath, { force: true });
+    }
+  }
+}
 function runChecked(command, args, options = {}) {
   const result = spawnSync3(command, args, {
     encoding: "utf8",
@@ -14286,152 +14352,154 @@ async function startCommand(opts) {
       p15.outro(pc15.green("Dry run complete."));
       return;
     }
-    const directReleaseVersion = resolveDesktopReleaseVersion(tag);
-    const progressFactory = desktopProgressJson ? createDesktopProgressFactory() : createByteProgress;
-    let release = null;
-    try {
-      release = await runStartPhase(
-        "Resolving Desktop release...",
-        "Desktop release resolved.",
-        () => fetchGithubRelease(repo, tag),
-        desktopProgressJson ? "resolving_release" : null
-      );
-    } catch (error) {
-      if (!directReleaseVersion) throw error;
-      p15.log.warn(
-        `Desktop release metadata could not be resolved; falling back to deterministic download URLs. ${formatFetchError(error)}`
-      );
-    }
-    const releaseTag = release?.tag_name ?? (directReleaseVersion ? tag : null);
-    if (!releaseTag) {
-      throw new Error(`Unable to resolve Rudder Desktop release tag for ${repo}@${tag}.`);
-    }
-    const assetCandidates = resolveDesktopAssetCandidates({
-      releaseAssets: release?.assets ?? [],
-      target,
-      repo,
-      tag,
-      directReleaseVersion,
-      allowShellAssets: runtimeSupportsShellAssets
-    });
-    if (assetCandidates.length === 0) {
-      throw new Error(`No Rudder Desktop portable asset found for ${target.platform}/${target.arch} in ${repo}@${releaseTag}.`);
-    }
-    const checksumAsset = selectChecksumAsset(release?.assets ?? []) ?? (directReleaseVersion ? buildGithubReleaseAsset(repo, tag, DESKTOP_CHECKSUM_ASSET_NAME) : null);
-    const checksums = await downloadChecksums(checksumAsset, outputDir, progressFactory);
-    let selectedCandidate;
-    try {
-      selectedCandidate = selectChecksummedDesktopAssetCandidate(assetCandidates, checksums);
-    } catch (error) {
-      throw new Error(`No checksummed Rudder Desktop asset found for ${target.platform}/${target.arch} in ${repo}@${releaseTag}.`);
-    }
-    for (const warning of selectedCandidate.warnings) p15.log.warn(warning);
-    let selectedAsset = selectedCandidate.asset;
-    let selectedAssetKind = selectedCandidate.kind;
-    let expectedChecksum = selectedCandidate.expectedChecksum;
-    const metadata = await readInstallMetadata(installPaths.metadataPath);
-    if (isInstalledDesktopCurrent(metadata, releaseTag, selectedAsset.name, expectedChecksum) && await pathExists2(installPaths.executablePath)) {
-      p15.log.success(`Rudder Desktop is already installed at ${pc15.cyan(installPaths.appPath)}.`);
-      await runStartPhase(
-        "Refreshing Desktop launchers...",
-        "Desktop launchers ready.",
-        async () => {
-          await removeMacQuarantine(installPaths, target);
-          await createPlatformLaunchers(installPaths, target);
-        },
-        desktopProgressJson ? "preparing_restart" : null
-      );
-    } else {
-      let cachedAsset;
+    await withDesktopInstallLock(installPaths, async () => {
+      const directReleaseVersion = resolveDesktopReleaseVersion(tag);
+      const progressFactory = desktopProgressJson ? createDesktopProgressFactory() : createByteProgress;
+      let release = null;
       try {
-        cachedAsset = await downloadDesktopAssetWithCache(selectedAsset, expectedChecksum, {
-          outputDir,
-          progressFactory
-        });
+        release = await runStartPhase(
+          "Resolving Desktop release...",
+          "Desktop release resolved.",
+          () => fetchGithubRelease(repo, tag),
+          desktopProgressJson ? "resolving_release" : null
+        );
       } catch (error) {
-        const fullCandidate = assetCandidates.find((candidate) => candidate.kind === "full");
-        if (selectedAssetKind !== "shell" || !fullCandidate) throw error;
+        if (!directReleaseVersion) throw error;
         p15.log.warn(
-          `Layered Desktop shell asset download failed; falling back to the full portable asset. ${formatFetchError(error)}`
+          `Desktop release metadata could not be resolved; falling back to deterministic download URLs. ${formatFetchError(error)}`
         );
-        selectedAsset = fullCandidate.asset;
-        selectedAssetKind = fullCandidate.kind;
-        expectedChecksum = resolveAssetChecksum(checksums, selectedAsset.name);
-        cachedAsset = await downloadDesktopAssetWithCache(selectedAsset, expectedChecksum, {
-          outputDir,
-          progressFactory
-        });
       }
-      if (cachedAsset.cacheStatus === "hit") {
-        p15.log.success(`Desktop asset cache hit at ${pc15.cyan(cachedAsset.path)}.`);
-        if (desktopProgressJson) {
+      const releaseTag = release?.tag_name ?? (directReleaseVersion ? tag : null);
+      if (!releaseTag) {
+        throw new Error(`Unable to resolve Rudder Desktop release tag for ${repo}@${tag}.`);
+      }
+      const assetCandidates = resolveDesktopAssetCandidates({
+        releaseAssets: release?.assets ?? [],
+        target,
+        repo,
+        tag,
+        directReleaseVersion,
+        allowShellAssets: runtimeSupportsShellAssets
+      });
+      if (assetCandidates.length === 0) {
+        throw new Error(`No Rudder Desktop portable asset found for ${target.platform}/${target.arch} in ${repo}@${releaseTag}.`);
+      }
+      const checksumAsset = selectChecksumAsset(release?.assets ?? []) ?? (directReleaseVersion ? buildGithubReleaseAsset(repo, tag, DESKTOP_CHECKSUM_ASSET_NAME) : null);
+      const checksums = await downloadChecksums(checksumAsset, outputDir, progressFactory);
+      let selectedCandidate;
+      try {
+        selectedCandidate = selectChecksummedDesktopAssetCandidate(assetCandidates, checksums);
+      } catch (error) {
+        throw new Error(`No checksummed Rudder Desktop asset found for ${target.platform}/${target.arch} in ${repo}@${releaseTag}.`);
+      }
+      for (const warning of selectedCandidate.warnings) p15.log.warn(warning);
+      let selectedAsset = selectedCandidate.asset;
+      let selectedAssetKind = selectedCandidate.kind;
+      let expectedChecksum = selectedCandidate.expectedChecksum;
+      const metadata = await readInstallMetadata(installPaths.metadataPath);
+      if (isInstalledDesktopCurrent(metadata, releaseTag, selectedAsset.name, expectedChecksum) && await pathExists2(installPaths.executablePath)) {
+        p15.log.success(`Rudder Desktop is already installed at ${pc15.cyan(installPaths.appPath)}.`);
+        await runStartPhase(
+          "Refreshing Desktop launchers...",
+          "Desktop launchers ready.",
+          async () => {
+            await removeMacQuarantine(installPaths, target);
+            await createPlatformLaunchers(installPaths, target);
+          },
+          desktopProgressJson ? "preparing_restart" : null
+        );
+      } else {
+        let cachedAsset;
+        try {
+          cachedAsset = await downloadDesktopAssetWithCache(selectedAsset, expectedChecksum, {
+            outputDir,
+            progressFactory
+          });
+        } catch (error) {
+          const fullCandidate = assetCandidates.find((candidate) => candidate.kind === "full");
+          if (selectedAssetKind !== "shell" || !fullCandidate) throw error;
+          p15.log.warn(
+            `Layered Desktop shell asset download failed; falling back to the full portable asset. ${formatFetchError(error)}`
+          );
+          selectedAsset = fullCandidate.asset;
+          selectedAssetKind = fullCandidate.kind;
+          expectedChecksum = resolveAssetChecksum(checksums, selectedAsset.name);
+          cachedAsset = await downloadDesktopAssetWithCache(selectedAsset, expectedChecksum, {
+            outputDir,
+            progressFactory
+          });
+        }
+        if (cachedAsset.cacheStatus === "hit") {
+          p15.log.success(`Desktop asset cache hit at ${pc15.cyan(cachedAsset.path)}.`);
+          if (desktopProgressJson) {
+            writeDesktopProgress({
+              phase: "downloading_asset",
+              message: `Desktop asset cache hit for ${selectedAsset.name}.`,
+              percent: 100
+            });
+          }
+        }
+        const checksum = await runStartPhase(
+          "Verifying Desktop checksum...",
+          `Verified ${pc15.cyan(path21.basename(cachedAsset.path))}.`,
+          () => assertChecksumMatch(cachedAsset.path, expectedChecksum),
+          desktopProgressJson ? "verifying_checksum" : null
+        );
+        if (desktopProgressJson && opts.desktopWaitForApply === true) {
           writeDesktopProgress({
-            phase: "downloading_asset",
-            message: `Desktop asset cache hit for ${selectedAsset.name}.`,
+            phase: "ready_to_install",
+            message: "Desktop update is downloaded and verified.",
             percent: 100
           });
+          await waitForDesktopApplySignal();
+          writeDesktopProgress({
+            phase: "preparing_restart",
+            message: "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 }),
+          desktopProgressJson ? opts.waitForActiveRuns === true ? "waiting_for_active_runs" : "preparing_restart" : null
+        );
+        await runStartPhase(
+          "Installing portable Desktop app...",
+          `Installed Rudder Desktop to ${pc15.cyan(installPaths.appPath)}.`,
+          () => installPortableDesktop(cachedAsset.path, installPaths, target),
+          desktopProgressJson ? "preparing_restart" : null
+        );
+        await runStartPhase(
+          "Preparing Desktop launchers...",
+          "Desktop launchers ready.",
+          async () => {
+            await removeMacQuarantine(installPaths, target);
+            await createPlatformLaunchers(installPaths, target);
+          },
+          desktopProgressJson ? "preparing_restart" : null
+        );
+        await writeInstallMetadata(installPaths, releaseTag, selectedAsset.name, checksum, selectedAssetKind);
       }
-      const checksum = await runStartPhase(
-        "Verifying Desktop checksum...",
-        `Verified ${pc15.cyan(path21.basename(cachedAsset.path))}.`,
-        () => assertChecksumMatch(cachedAsset.path, expectedChecksum),
-        desktopProgressJson ? "verifying_checksum" : null
-      );
-      if (desktopProgressJson && opts.desktopWaitForApply === true) {
-        writeDesktopProgress({
-          phase: "ready_to_install",
-          message: "Desktop update is downloaded and verified.",
-          percent: 100
-        });
-        await waitForDesktopApplySignal();
-        writeDesktopProgress({
-          phase: "preparing_restart",
-          message: "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 }),
-        desktopProgressJson ? opts.waitForActiveRuns === true ? "waiting_for_active_runs" : "preparing_restart" : null
-      );
-      await runStartPhase(
-        "Installing portable Desktop app...",
-        `Installed Rudder Desktop to ${pc15.cyan(installPaths.appPath)}.`,
-        () => installPortableDesktop(cachedAsset.path, installPaths, target),
-        desktopProgressJson ? "preparing_restart" : null
-      );
-      await runStartPhase(
-        "Preparing Desktop launchers...",
-        "Desktop launchers ready.",
-        async () => {
-          await removeMacQuarantine(installPaths, target);
-          await createPlatformLaunchers(installPaths, target);
-        },
-        desktopProgressJson ? "preparing_restart" : null
-      );
-      await writeInstallMetadata(installPaths, releaseTag, selectedAsset.name, checksum, selectedAssetKind);
-    }
-    const desktopAssetPrune = await maybePruneDesktopAssetCache({
-      protectedChecksums: [expectedChecksum]
-    });
-    if (desktopAssetPrune) {
-      if (desktopAssetPrune.deleted.length > 0) {
-        p15.log.success(
-          `Pruned ${desktopAssetPrune.deleted.length} old Desktop asset cache(s), freed ${formatBytes(desktopAssetPrune.freedBytes)}.`
+      const desktopAssetPrune = await maybePruneDesktopAssetCache({
+        protectedChecksums: [expectedChecksum]
+      });
+      if (desktopAssetPrune) {
+        if (desktopAssetPrune.deleted.length > 0) {
+          p15.log.success(
+            `Pruned ${desktopAssetPrune.deleted.length} old Desktop asset cache(s), freed ${formatBytes(desktopAssetPrune.freedBytes)}.`
+          );
+        }
+        for (const warning of desktopAssetPrune.warnings) p15.log.warn(warning);
+      }
+      if (opts.open !== false) {
+        await runStartPhase(
+          "Launching Rudder Desktop...",
+          "Rudder Desktop launched.",
+          () => launchDesktop(installPaths, target),
+          desktopProgressJson ? "closing" : null
         );
       }
-      for (const warning of desktopAssetPrune.warnings) p15.log.warn(warning);
-    }
-    if (opts.open !== false) {
-      await runStartPhase(
-        "Launching Rudder Desktop...",
-        "Rudder Desktop launched.",
-        () => launchDesktop(installPaths, target),
-        desktopProgressJson ? "closing" : null
-      );
-    }
+    });
   }
   p15.outro(pc15.green("Rudder start complete."));
 }