lakebed 0.0.21 → 0.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lakebed",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "Agent-native CLI and runtime for building and deploying Lakebed capsules.",
   "license": "UNLICENSED",
   "type": "module",
@@ -55,6 +55,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "scripts": {
+    "check": "node --check src/cli.js && node --check src/runtime.js && node --check src/server.js && node --check src/client.js && node --check src/source-store.js && node --check src/source-runtime.js && node --check src/source-runtime-worker.js && node --check src/source-runtime-loader.mjs && node --check src/anonymous.js && node --check src/anonymous-server.js && node --check src/auth.js && node --check src/version.js && node --check src/services/all-in-one.js && node --check src/services/api-dashboard.js && node --check src/services/capsule-runner.js"
+  },
   "dependencies": {
     "esbuild": "^0.27.1",
     "pg": "^8.16.3",
@@ -63,8 +66,5 @@
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"
-  },
-  "scripts": {
-    "check": "node --check src/cli.js && node --check src/runtime.js && node --check src/server.js && node --check src/client.js && node --check src/source-store.js && node --check src/source-runtime.js && node --check src/source-runtime-worker.js && node --check src/source-runtime-loader.mjs && node --check src/anonymous.js && node --check src/anonymous-server.js && node --check src/auth.js && node --check src/version.js && node --check src/services/all-in-one.js && node --check src/services/api-dashboard.js && node --check src/services/capsule-runner.js"
   }
-}
+}

package/src/anonymous-server.js

@@ -436,6 +436,48 @@ function isApiDashboardRoute(pathname) {
   );
 }
 
+function isDashboardBrowserRoute(pathname) {
+  return (
+    pathname === "/" ||
+    pathname === "/deploys" ||
+    pathname === "/dashboard" ||
+    pathname === "/auth" ||
+    pathname.startsWith("/auth/") ||
+    pathname === "/admin" ||
+    pathname.startsWith("/admin/") ||
+    pathname.startsWith("/claim/")
+  );
+}
+
+function normalizedUrlHost(value) {
+  try {
+    return new URL(value).host.toLowerCase();
+  } catch {
+    return "";
+  }
+}
+
+function dashboardRedirectLocation({ dashboardRootUrl, requestUrl }) {
+  const pathname = requestUrl.pathname === "/" ? "/deploys" : requestUrl.pathname;
+  const target = new URL(pathname, dashboardRootUrl);
+  target.search = requestUrl.search;
+  return target.href;
+}
+
+function shouldRedirectToDashboardHost({ dashboardRootUrl, host, publicRootUrl, requestUrl }) {
+  if (!isDashboardBrowserRoute(requestUrl.pathname)) {
+    return false;
+  }
+
+  const publicHost = normalizedUrlHost(publicRootUrl);
+  const dashboardHost = normalizedUrlHost(dashboardRootUrl);
+  if (!publicHost || !dashboardHost || publicHost === dashboardHost) {
+    return false;
+  }
+
+  return String(host).toLowerCase() === publicHost;
+}
+
 function appUrlForSlug({ appBaseDomain, slug }) {
   if (!appBaseDomain) {
     throw new Error("LAKEBED_APP_BASE_DOMAIN is required to create hosted deploy URLs.");
@@ -6217,6 +6259,19 @@ export async function startAnonymousServer({
         return;
       }
 
+      if (
+        servesApiDashboard &&
+        shouldRedirectToDashboardHost({
+          dashboardRootUrl: resolvedDashboardRootUrl,
+          host,
+          publicRootUrl: resolvedPublicRootUrl,
+          requestUrl
+        })
+      ) {
+        redirect(res, dashboardRedirectLocation({ dashboardRootUrl: resolvedDashboardRootUrl, requestUrl }));
+        return;
+      }
+
       if (servesApiDashboard && req.method === "GET" && (requestUrl.pathname === "/deploys" || requestUrl.pathname === "/dashboard")) {
         const authConfigured = developerAuthConfigured(resolvedGithubOAuth, resolvedDeveloperSessionSecret);
         const user = authConfigured ? currentDeveloper(req) : null;

package/src/cli.js

@@ -31,6 +31,7 @@ const packageDir = resolve(dirname(fileURLToPath(import.meta.url)), "..");
 const packageNodeModules = resolve(packageDir, "node_modules");
 const sourceNamespace = "lakebed-source";
 const defaultDeployApiUrl = "https://api.lakebed.dev";
+const legacyDeployApiUrl = "https://api.lakebed.app";
 const execFileAsync = promisify(execFile);
 const endpointBodyMaxBytes = 2 * 1024 * 1024;
 
@@ -1193,12 +1194,12 @@ function claimTokenFromDeployResponse(deployed) {
   return null;
 }
 
-function claimUrlFromDeployMetadata(metadata) {
+function claimUrlFromDeployMetadata(metadata, api = metadata?.api) {
   if (!metadata?.api || !metadata?.deployId || !metadata?.claimToken) {
     return null;
   }
 
-  return `${String(metadata.api).replace(/\/+$/g, "")}/claim/${encodeURIComponent(metadata.deployId)}/${encodeURIComponent(metadata.claimToken)}`;
+  return `${normalizeHostedUrl(api)}/claim/${encodeURIComponent(metadata.deployId)}/${encodeURIComponent(metadata.claimToken)}`;
 }
 
 function claimCommandText({ api, capsuleArg }) {
@@ -1330,6 +1331,15 @@ function normalizeHostedUrl(value) {
   }
 }
 
+function canonicalDeployApiUrl(value) {
+  const normalized = normalizeHostedUrl(value);
+  return normalized === legacyDeployApiUrl ? defaultDeployApiUrl : normalized;
+}
+
+function deployApiUrlsMatch(left, right) {
+  return canonicalDeployApiUrl(left) === canonicalDeployApiUrl(right);
+}
+
 async function readResponseJson(response) {
   const body = await response.text();
   if (!response.ok) {
@@ -1354,7 +1364,7 @@ async function deployCommand(args) {
   const inspectPolicy = hasFlag(args, "--public-inspect") ? "public" : undefined;
   const metadata = await readDeployMetadata(capsuleDir);
   const canUpdate =
-    metadata?.api === api && typeof metadata?.deployId === "string" && typeof metadata?.claimToken === "string";
+    deployApiUrlsMatch(metadata?.api, api) && typeof metadata?.deployId === "string" && typeof metadata?.claimToken === "string";
   let currentDeploy = null;
   if (canUpdate) {
     const currentResponse = await fetch(`${api}/v1/deploys/${encodeURIComponent(metadata.deployId)}`);
@@ -1498,11 +1508,11 @@ async function claimCommand(args) {
     throw new Error(`No Lakebed deploy metadata found at ${deployMetadataPath(capsuleDir)}. Run npx lakebed deploy from this project first.`);
   }
 
-  if (metadata.api !== api) {
+  if (!deployApiUrlsMatch(metadata.api, api)) {
     throw new Error(`Saved deploy metadata is for ${metadata.api}, but this command is using ${api}. Pass --api ${metadata.api} to claim it.`);
   }
 
-  const claimUrl = claimUrlFromDeployMetadata(metadata);
+  const claimUrl = claimUrlFromDeployMetadata(metadata, api);
   if (!claimUrl) {
     throw new Error("This project does not have a saved claim token. Redeploy to create a new claim URL.");
   }
@@ -1561,7 +1571,7 @@ async function domainsCommand(args) {
   if (!metadata) {
     throw new Error(`No Lakebed deploy metadata found at ${deployMetadataPath(capsuleDir)}. Run npx lakebed deploy from this project first.`);
   }
-  if (metadata.api !== api) {
+  if (!deployApiUrlsMatch(metadata.api, api)) {
     throw new Error(`Saved deploy metadata is for ${metadata.api}, but this command is using ${api}. Pass --api ${metadata.api} to use it.`);
   }
   if (!metadata.deployId || !metadata.claimToken) {
@@ -1603,7 +1613,7 @@ async function anonymousServerCommand(args) {
 
 function deployLookupApiUrl(target, args, metadata) {
   if (!hasExplicitOption(args, "--api") && metadata?.api && metadata.deployId === target) {
-    return String(metadata.api).replace(/\/+$/g, "");
+    return canonicalDeployApiUrl(metadata.api);
   }
 
   return deployApiUrl(args);

package/src/version.js

@@ -1 +1 @@
-export const LAKEBED_VERSION = "0.0.21";
+export const LAKEBED_VERSION = "0.0.22";