@stacksjs/buddy 0.70.96 → 0.70.98

package/dist/commands/dev.js

@@ -813,11 +813,40 @@ async function unregisterRpxProxies(ids) {
       await removeEntry(id).catch(() => {});
   } catch {}
 }
+async function removeStalePublicDomainOverrides(domain, includeDashboard, verbose) {
+  const { checkHosts, removeHosts, resolverFilePath, contentLooksLikeRpxResolver } = await importDevelopmentRpx(), hosts = [domain, ...includeDashboard ? [`dashboard.${domain}`] : []], present = await checkHosts(hosts, verbose).catch(() => hosts.map(() => !1)), staleHosts = hosts.filter((_, i) => present[i] === !0);
+  if (staleHosts.length > 0) {
+    await removeHosts(staleHosts, verbose).catch(() => {});
+    if ((await checkHosts(staleHosts, verbose).catch(() => staleHosts.map(() => !0))).some(Boolean))
+      log.warn(`Stale /etc/hosts entries still point ${staleHosts.join(", ")} at loopback. Remove them with: sudo nano /etc/hosts`);
+    else
+      log.info(`Removed stale /etc/hosts entries for ${staleHosts.join(", ")} (left by a previous dev session)`);
+  }
+  if (process.platform !== "darwin")
+    return;
+  const labels = domain.split("."), basename = labels.length >= 2 ? labels.slice(-2).join(".") : domain, resolverPath = resolverFilePath(basename);
+  let isRpxManaged = !1;
+  try {
+    isRpxManaged = contentLooksLikeRpxResolver(readFileSync(resolverPath, "utf8"));
+  } catch {}
+  if (!isRpxManaged)
+    return;
+  const quotedPath = `'${resolverPath.replace(/'/g, "'\\''")}'`, rm = process.env.SUDO_PASSWORD ? `printf '%s
+' "$SUDO_PASSWORD" | sudo -S rm -f ${quotedPath}` : `sudo -n rm -f ${quotedPath}`;
+  try {
+    execSync(rm, { stdio: ["pipe", "ignore", "ignore"] });
+    log.info(`Removed stale rpx DNS resolver ${resolverPath} (left by a previous dev session)`);
+    execSync("sudo -n dscacheutil -flushcache; sudo -n killall -HUP mDNSResponder; true", { stdio: ["pipe", "ignore", "ignore"] });
+  } catch {
+    log.warn(`A stale rpx DNS resolver still hijacks ${domain}. Remove it with: sudo rm ${resolverPath}`);
+  }
+}
 async function prepareRpxTlsForDev(input) {
   const { domain, includeDashboard, options } = input, verbose = options.verbose ?? !1;
   if (process.env.STACKS_DEV_ALLOW_PUBLIC_DOMAIN !== "1") {
     if ((await dns.resolve4(domain).catch(() => [])).some((address) => !address.startsWith("127."))) {
       log.warn(`Skipping local DNS override for public domain ${domain}; use a .localhost/.test domain for development`);
+      await removeStalePublicDomainOverrides(domain, includeDashboard, verbose);
       return;
     }
   }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/buddy",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.96",
+  "version": "0.70.98",
   "description": "Meet Buddy. The Stacks runtime.",
   "author": "Chris Breuer",
   "contributors": [