@adunne09/waldo 0.0.0-dev-202603160033 → 0.0.0-dev-202603161554

package/bin/waldo

@@ -6,8 +6,41 @@ import os from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 
+function findNodeModulesRoot(target) {
+  let current = path.dirname(target);
+
+  for (;;) {
+    if (path.basename(current) === "node_modules") {
+      return current;
+    }
+
+    const parent = path.dirname(current);
+    if (parent === current) {
+      return undefined;
+    }
+
+    current = parent;
+  }
+}
+
+function createRuntimeEnv(target) {
+  const nodeModulesRoot = findNodeModulesRoot(target);
+  if (!nodeModulesRoot) {
+    return process.env;
+  }
+
+  const existingNodePath = process.env.NODE_PATH;
+  return {
+    ...process.env,
+    NODE_PATH: existingNodePath
+      ? `${nodeModulesRoot}${path.delimiter}${existingNodePath}`
+      : nodeModulesRoot,
+  };
+}
+
 function run(target) {
   const result = childProcess.spawnSync(target, process.argv.slice(2), {
+    env: createRuntimeEnv(target),
     stdio: "inherit",
   });
 
@@ -19,10 +52,10 @@ function run(target) {
   process.exit(typeof result.status === "number" ? result.status : 0);
 }
 
-const envPath = process.env.WALDO_BIN_PATH;
-if (envPath) {
-  run(envPath);
-}
+const internalAutoUpdateFlag = "WALDO_INTERNAL_AUTOUPDATE";
+const internalAutoUpdateCurrentVersionKey = "WALDO_INTERNAL_AUTOUPDATE_CURRENT_VERSION";
+const internalAutoUpdateMethodKey = "WALDO_INTERNAL_AUTOUPDATE_METHOD";
+const internalAutoUpdateReleaseTagKey = "WALDO_INTERNAL_AUTOUPDATE_RELEASE_TAG";
 
 const scriptPath = fs.realpathSync(fileURLToPath(import.meta.url));
 const scriptDir = path.dirname(scriptPath);
@@ -34,6 +67,11 @@ const defaultNpmRegistry = "https://registry.npmjs.org";
 const publicPackageName = "@adunne09/waldo";
 const defaultReleaseTag = "latest";
 
+const envPath = process.env.WALDO_BIN_PATH;
+if (envPath && process.env[internalAutoUpdateFlag] !== "1") {
+  run(envPath);
+}
+
 let cachedPackageMetadata;
 
 function readPackageMetadata() {
@@ -303,6 +341,45 @@ function formatAutoUpdateSuccessMessage(current, latest) {
   return `Updated Waldo from ${current} to ${latest}. Restart to apply changes.`;
 }
 
+function startAutoUpdateInBackground(method, current, releaseTag) {
+  const child = childProcess.spawn(process.execPath, [scriptPath], {
+    cwd: os.homedir(),
+    detached: true,
+    env: {
+      ...process.env,
+      [internalAutoUpdateFlag]: "1",
+      [internalAutoUpdateCurrentVersionKey]: current,
+      [internalAutoUpdateMethodKey]: method,
+      [internalAutoUpdateReleaseTagKey]: releaseTag,
+    },
+    stdio: ["ignore", "inherit", "inherit"],
+  });
+
+  child.unref();
+}
+
+async function runAutoUpdateInBackgroundProcess() {
+  const current = process.env[internalAutoUpdateCurrentVersionKey] || resolveCurrentVersion();
+  const method = process.env[internalAutoUpdateMethodKey] || resolveInstallMethod();
+  const releaseTag = process.env[internalAutoUpdateReleaseTagKey] || resolveReleaseTag();
+
+  if (method === "unknown") {
+    return;
+  }
+
+  try {
+    const latest = await resolveLatestVersion(releaseTag);
+    if (current === latest) {
+      return;
+    }
+
+    runGlobalUpgrade(method, latest);
+    console.log(formatAutoUpdateSuccessMessage(current, latest));
+  } catch {
+    console.error(`Waldo update failed; continuing with ${current}.`);
+  }
+}
+
 const platformMap = {
   darwin: "darwin",
   linux: "linux",
@@ -362,19 +439,18 @@ async function maybeAutoUpdate() {
   try {
     const current = resolveCurrentVersion();
     const releaseTag = resolveReleaseTag();
-    const latest = await resolveLatestVersion(releaseTag);
-    if (current === latest) {
-      return;
-    }
-
-    runGlobalUpgrade(method, latest);
-    console.error(formatAutoUpdateSuccessMessage(current, latest));
+    startAutoUpdateInBackground(method, current, releaseTag);
   } catch {
     const current = resolveCurrentVersion();
     console.error(`Waldo update failed; continuing with ${current}.`);
   }
 }
 
+if (process.env[internalAutoUpdateFlag] === "1") {
+  await runAutoUpdateInBackgroundProcess();
+  process.exit(0);
+}
+
 await maybeAutoUpdate();
 
 const resolved = resolveBinary();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adunne09/waldo",
-  "version": "0.0.0-dev-202603160033",
+  "version": "0.0.0-dev-202603161554",
   "waldoReleaseTag": "dev",
   "type": "module",
   "bin": {
@@ -13,10 +13,10 @@
     "postinstall": "bun ./postinstall.mjs || node ./postinstall.mjs"
   },
   "optionalDependencies": {
-    "@adunne09/waldo-darwin-arm64": "0.0.0-dev-202603160033",
-    "@adunne09/waldo-darwin-x64": "0.0.0-dev-202603160033",
-    "@adunne09/waldo-linux-arm64": "0.0.0-dev-202603160033",
-    "@adunne09/waldo-linux-x64": "0.0.0-dev-202603160033",
-    "@adunne09/waldo-windows-x64": "0.0.0-dev-202603160033"
+    "@adunne09/waldo-darwin-arm64": "0.0.0-dev-202603161554",
+    "@adunne09/waldo-darwin-x64": "0.0.0-dev-202603161554",
+    "@adunne09/waldo-linux-arm64": "0.0.0-dev-202603161554",
+    "@adunne09/waldo-linux-x64": "0.0.0-dev-202603161554",
+    "@adunne09/waldo-windows-x64": "0.0.0-dev-202603161554"
   }
 }