@stacksjs/buddy 0.70.97 → 0.70.99

package/dist/commands/dev.js

@@ -187,7 +187,7 @@ export function dev(buddy) {
   onUnknownSubcommand(buddy, "dev");
 }
 export async function startDevelopmentServer(_options, _startTime) {
-  const options = _options, startedAt = _startTime, appUrl = process.env.APP_URL, nativeMode = options.native === !0, proxyManagedExternally = process.env.STACKS_PROXY_MANAGED === "1", frontendPort = Number(process.env.PORT) || 3000, apiPort = Number(process.env.PORT_API) || 3008, docsPort = Number(process.env.PORT_DOCS) || 3006, dashboardPort = Number(process.env.PORT_ADMIN) || 3002, includeDashboard = process.env.STACKS_DEV_DASHBOARD === "1", appLooksCustom = !nativeMode && appUrl && appUrl !== "localhost" && !appUrl.includes("localhost:"), domain = appLooksCustom ? appUrl.replace(/^https?:\/\//, "") : null, hasCustomDomain = appLooksCustom && !proxyManagedExternally, dashboardDomain = domain ? `dashboard.${domain}` : null, frontendUrl = domain ? `https://${domain}` : `http://localhost:${frontendPort}`, apiUrl = domain ? `https://${domain}/api` : `http://localhost:${apiPort}`, docsUrl = domain ? `https://${domain}/docs` : `http://localhost:${docsPort}`, dashboardUrl = dashboardDomain ? `https://${dashboardDomain}` : `http://localhost:${dashboardPort}`, managedPorts = [
+  const options = _options, startedAt = _startTime, appUrl = process.env.APP_URL, nativeMode = options.native === !0, proxyManagedExternally = process.env.STACKS_PROXY_MANAGED === "1", frontendPort = Number(process.env.PORT) || 3000, apiPort = Number(process.env.PORT_API) || 3008, docsPort = Number(process.env.PORT_DOCS) || 3006, dashboardPort = Number(process.env.PORT_ADMIN) || 3002, includeDashboard = process.env.STACKS_DEV_DASHBOARD === "1", appLooksCustom = !nativeMode && appUrl && appUrl !== "localhost" && !appUrl.includes("localhost:"), domain = appLooksCustom ? appUrl.replace(/^https?:\/\//, "") : null, isLocalDevTld = (host) => host === "localhost" || host.endsWith(".localhost") || host.endsWith(".test") || host.endsWith(".invalid"), domainIsPublic = Boolean(domain) && process.env.STACKS_DEV_ALLOW_PUBLIC_DOMAIN !== "1" && !isLocalDevTld(domain) && (await dns.resolve4(domain).catch(() => [])).some((address) => !address.startsWith("127.")), hasCustomDomain = appLooksCustom && !proxyManagedExternally && !domainIsPublic, dashboardDomain = domain ? `dashboard.${domain}` : null, frontendUrl = domain ? `https://${domain}` : `http://localhost:${frontendPort}`, apiUrl = domain ? `https://${domain}/api` : `http://localhost:${apiPort}`, docsUrl = domain ? `https://${domain}/docs` : `http://localhost:${docsPort}`, dashboardUrl = dashboardDomain ? `https://${dashboardDomain}` : `http://localhost:${dashboardPort}`, managedPorts = [
     frontendPort,
     apiPort,
     docsPort,
@@ -354,23 +354,21 @@ function printDevReadyBanner(input) {
     domain,
     dashboardPort,
     dashboardDomain
-  } = input, verbose = options.verbose ?? !1, showLocalUrls = verbose || options.withLocalhost === !0, useProxy = hasCustomDomain && proxyReachable, feUrl = useProxy ? frontendUrl : `http://localhost:${frontendPort}`, apUrl = useProxy ? apiUrl : `http://localhost:${apiPort}`, dcUrl = useProxy ? docsUrl : `http://localhost:${docsPort}`, blogUrl = `${feUrl.replace(/\/$/, "")}/blog`;
+  } = input, verbose = options.verbose ?? !1, useProxy = hasCustomDomain && proxyReachable, feUrl = `http://localhost:${frontendPort}`, apUrl = `http://localhost:${apiPort}`, dcUrl = `http://localhost:${docsPort}`, dbUrl = `http://localhost:${dashboardPort}`, blogUrl = `${feUrl}/blog`;
   console.log();
   console.log(`  ${green("\u279C")}  ${bold("Frontend")}:    ${cyan(feUrl)}`);
-  if (showLocalUrls && useProxy)
-    console.log(`  ${dim("\u279C")}  ${dim("Local")}:       ${dim(`http://localhost:${frontendPort}`)}`);
   if (nativeMode)
     console.log(`  ${green("\u279C")}  ${bold("Native")}:      ${cyan(`Craft \u2192 http://localhost:${frontendPort}`)}`);
   console.log(`  ${green("\u279C")}  ${bold("API")}:         ${cyan(apUrl)}`);
-  if (showLocalUrls && useProxy)
-    console.log(`  ${dim("\u279C")}  ${dim("Local API")}:   ${dim(`http://localhost:${apiPort}`)}`);
   console.log(`  ${green("\u279C")}  ${bold("Docs")}:        ${cyan(dcUrl)}`);
-  if (showLocalUrls && useProxy)
-    console.log(`  ${dim("\u279C")}  ${dim("Local docs")}:  ${dim(`http://localhost:${docsPort}`)}`);
   if (blogIsConfigured())
     console.log(`  ${green("\u279C")}  ${bold("Blog")}:        ${cyan(blogUrl)}`);
   if (includeDashboard)
-    console.log(`  ${green("\u279C")}  ${bold("Dashboard")}:   ${cyan(dashboardUrl)}`);
+    console.log(`  ${green("\u279C")}  ${bold("Dashboard")}:   ${cyan(dbUrl)}`);
+  if (useProxy && domain)
+    console.log(`  ${dim("\u279C")}  ${dim("Proxy")}:       ${dim(`${frontendUrl} (local HTTPS via rpx)`)}`);
+  if (useProxy && includeDashboard && dashboardDomain)
+    console.log(`  ${dim("\u279C")}  ${dim("Proxy")}:       ${dim(`${dashboardUrl} (local HTTPS via rpx)`)}`);
   if (isComingSoonMode()) {
     console.log();
     console.log(`  ${yellow("\u25CF")}  ${bold(yellow("Coming soon mode"))} ${dim("\u2014 visitors see the holding page; bypass with the coming-soon secret.")}`);
@@ -813,11 +811,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.97",
+  "version": "0.70.99",
   "description": "Meet Buddy. The Stacks runtime.",
   "author": "Chris Breuer",
   "contributors": [