wawesome 0.1.0 → 0.3.0

package/dist/index.mjs

@@ -720,7 +720,7 @@ async function buildJs(entryInput, options) {
 * that has to name this version — `--version`, the dependency a scaffolded
 * project pins — reads it here, so a release bumps one file.
 */
-const CLI_VERSION = "0.1.0";
+const CLI_VERSION = "0.3.0";
 //#endregion
 //#region src/prompt.ts
 /**
@@ -1326,18 +1326,85 @@ function manifestOf(assets) {
 //#endregion
 //#region ../shared/public-address.ts
 const INVOCATION_PREFIX = "/x";
+const SLUG_SEPARATOR = "--";
+const SURFACE_ROUTE = "/v1/invocation-surface";
 const SUBTREE_NOTE = "Every path beneath this address reaches the Function.";
-function mountBase(origin, tenantSlug) {
-	return `${origin.replace(/\/+$/, "")}${INVOCATION_PREFIX}/${encodeURIComponent(tenantSlug)}`;
+/**
+* A gateway that serves no form of the address — and the value a client uses for
+* one that did not answer at all, deliberately the same: both name no address,
+* and there is nothing else either could honestly do.
+*/
+const NO_INVOCATION_SURFACE = {
+	contentOrigin: null,
+	pathFormOrigin: null
+};
+async function fetchInvocationSurface(gatewayUrl) {
+	const origin = trimTrailingSlashes(gatewayUrl);
+	const res = await fetch(`${origin}${SURFACE_ROUTE}`);
+	if (!res.ok) throw new Error(`Failed to read the gateway's address forms (HTTP ${res.status}).`);
+	const body = await res.json();
+	return {
+		contentOrigin: body.content_origin ?? null,
+		pathFormOrigin: body.path_form ? origin : null
+	};
 }
-function publicAddress(origin, tenantSlug, appSlug, functionSlug) {
-	const base = `${mountBase(origin, tenantSlug)}/${encodeURIComponent(appSlug)}`;
+/** The one address the Function answers at, `null` where it has none. */
+function publicAddress(surface, tenantSlug, appSlug, functionSlug) {
+	const base = appBase(surface, tenantSlug, appSlug);
+	if (base === null) return null;
 	if (functionSlug === "root") return base;
 	return `${base}/${encodeURIComponent(functionSlug)}`;
 }
 /** The same address with the app and function still to be chosen. */
-function publicAddressTemplate(origin, tenantSlug) {
-	return `${mountBase(origin, tenantSlug)}/<app>/<function>`;
+function publicAddressTemplate(surface, tenantSlug) {
+	if (surface.contentOrigin) {
+		if (!isLegalDnsLabel(tenantSlug)) return null;
+		const hostname = appHostname(surface.contentOrigin, `${tenantSlug}${SLUG_SEPARATOR}<app>`);
+		return hostname === null ? null : `${hostname}/<function>`;
+	}
+	if (surface.pathFormOrigin) return `${pathFormBase(surface.pathFormOrigin, tenantSlug)}/<app>/<function>`;
+	return null;
+}
+function appBase(surface, tenantSlug, appSlug) {
+	if (surface.contentOrigin) {
+		if (!isLegalDnsLabel(tenantSlug) || !isLegalDnsLabel(appSlug)) return null;
+		return appHostname(surface.contentOrigin, `${tenantSlug}${SLUG_SEPARATOR}${appSlug}`);
+	}
+	if (surface.pathFormOrigin) return `${pathFormBase(surface.pathFormOrigin, tenantSlug)}/${encodeURIComponent(appSlug)}`;
+	return null;
+}
+/**
+* The App's own hostname, built the way the gateway rebuilds it from its own
+* configuration: the label one level beneath the content domain. Callers check
+* the slugs the label is made of, since a slug the gateway would refuse to read
+* a `Host` for names no App there.
+*/
+function appHostname(contentOrigin, label) {
+	let origin;
+	try {
+		origin = new URL(contentOrigin);
+	} catch {
+		return null;
+	}
+	return `${origin.protocol}//${label}.${origin.host}`;
+}
+/** The surface, or none where the gateway did not answer. */
+async function invocationSurfaceOrNone(gatewayUrl) {
+	try {
+		return await fetchInvocationSurface(gatewayUrl);
+	} catch {
+		return NO_INVOCATION_SURFACE;
+	}
+}
+function pathFormBase(origin, tenantSlug) {
+	return `${trimTrailingSlashes(origin)}${INVOCATION_PREFIX}/${encodeURIComponent(tenantSlug)}`;
+}
+/** Must match `dns_label::is_legal` in `server/crates/core/src/value_objects.rs`. */
+function isLegalDnsLabel(candidate) {
+	return candidate.length > 0 && candidate.length <= 63 && !candidate.startsWith("-") && !candidate.endsWith("-") && !candidate.includes("--") && /^[a-z0-9-]+$/.test(candidate);
+}
+function trimTrailingSlashes(origin) {
+	return origin.replace(/\/+$/, "");
 }
 //#endregion
 //#region src/deploy.ts
@@ -1451,9 +1518,11 @@ async function deploy(entryInput, options) {
 		process.exit(1);
 	}
 	let address = null;
+	let surface = null;
 	try {
 		const { slug } = await resolveWorkspace(creds);
-		address = publicAddress(creds.gateway_url, slug, app, funcName);
+		surface = await fetchInvocationSurface(creds.gateway_url);
+		address = publicAddress(surface, slug, app, funcName);
 	} catch (err) {
 		if (isVerbose) console.log(`[wawesome:verbose] Could not resolve the workspace address: ${err instanceof Error ? err.message : err}`);
 	}
@@ -1473,6 +1542,10 @@ async function deploy(entryInput, options) {
 	if (address) {
 		console.log(`\n  URL:      \x1b[36m${address}\x1b[0m`);
 		console.log(`            ${SUBTREE_NOTE}`);
+	} else if (surface) {
+		console.log("\n  URL:      none — this gateway serves no public address form.");
+		console.log("            Set CONTENT_ORIGIN on it, or ALLOW_PATH_INVOCATION_FORM");
+		console.log("            for local development.");
 	}
 	if (headroom) {
 		console.log("");
@@ -2413,9 +2486,11 @@ async function ensureSession(options) {
 /** Bound on the rename loop, so a name the gateway keeps refusing ends the offer. */
 const MAX_RENAME_ATTEMPTS = 3;
 /** Show the address the Function will answer on, once it is deployed. */
-function announceUrl(creds, slug, appSlug, functionName) {
+function announceUrl(surface, slug, appSlug, functionName) {
+	const address = publicAddress(surface, slug, appSlug, functionName);
+	if (!address) return;
 	console.log("\n[wawesome] Your Function will answer on:\n");
-	console.log(`    \x1b[36m${publicAddress(creds.gateway_url, slug, appSlug, functionName)}\x1b[0m`);
+	console.log(`    \x1b[36m${address}\x1b[0m`);
 	console.log(`    ${SUBTREE_NOTE}\n`);
 }
 /**
@@ -2435,7 +2510,8 @@ function announceUrl(creds, slug, appSlug, functionName) {
 async function offerWorkspaceAddress(session, creds, tenant, appSlug, functionName) {
 	const current = tenant?.tenant_slug ?? creds.tenant_slug;
 	if (!current) return;
-	announceUrl(creds, current, appSlug, functionName);
+	const surface = await invocationSurfaceOrNone(creds.gateway_url);
+	announceUrl(surface, current, appSlug, functionName);
 	if (!tenant) {
 		console.log(`  '${current}' is your workspace address. Whether it can still be changed`);
 		console.log("  is a question for the gateway, which did not answer.\n");
@@ -2459,7 +2535,7 @@ async function offerWorkspaceAddress(session, creds, tenant, appSlug, functionNa
 		try {
 			const renamed = await renameTenantSlug(creds, answer);
 			console.log(`\n[wawesome] ✅ Workspace renamed to '${renamed.tenant_slug}'.`);
-			announceUrl(creds, renamed.tenant_slug, appSlug, functionName);
+			announceUrl(surface, renamed.tenant_slug, appSlug, functionName);
 			return;
 		} catch (err) {
 			console.log(`[wawesome] ${errorText(err)}`);
@@ -2739,6 +2815,8 @@ export default {
 }
 //#endregion
 //#region src/version.ts
+/** How both surfaces name a version nobody can switch to. */
+const RECLAIMED = "⚠ [assets reclaimed]";
 async function fetchVersions(gatewayUrl, tenantJwt, app, funcName, env, isVerbose) {
 	const url = `${gatewayUrl}/v1/apps/${encodeURIComponent(app)}/functions/${encodeURIComponent(funcName)}/versions?environment=${encodeURIComponent(env)}`;
 	if (isVerbose) console.log(`[wawesome:verbose] GET ${url}`);
@@ -2788,7 +2866,8 @@ async function listVersions(options) {
 		const hashStr = v.cwasm_hash.slice(0, 8).padEnd(8);
 		const dateStr = new Date(v.created_at).toISOString().replace("T", " ").slice(0, 19).padEnd(20);
 		const statusStr = v.status.padEnd(9);
-		console.log(`${verStr} | ${hashStr} | ${dateStr} | ${statusStr} | ${isActive ? "\x1B[32m★ [active]\x1B[0m" : ""}`);
+		const badge = isActive ? "\x1B[32m★ [active]\x1B[0m" : v.rollbackable === false ? `\x1b[33m${RECLAIMED}\x1b[0m` : "";
+		console.log(`${verStr} | ${hashStr} | ${dateStr} | ${statusStr} | ${badge}`);
 	}
 	console.log("");
 }
@@ -2836,7 +2915,7 @@ async function switchVersion(targetInput, options) {
 			const isActive = v.version_number === data.active_version_number;
 			const hashShort = v.cwasm_hash.slice(0, 8);
 			const dateStr = new Date(v.created_at).toISOString().replace("T", " ").slice(0, 19);
-			const badge = isActive ? " ★ [active]" : "";
+			const badge = isActive ? " ★ [active]" : v.rollbackable === false ? ` ${RECLAIMED}` : "";
 			return {
 				name: `v${v.version_number} (${hashShort}) • ${dateStr}${badge}`,
 				value: v.version_number
@@ -2867,9 +2946,9 @@ async function switchVersion(targetInput, options) {
 		})
 	});
 	if (!deployRes.ok) {
-		const errorBody = await deployRes.text();
-		console.error(`[wawesome] Error: Failed to set active version (HTTP ${deployRes.status}).`);
-		if (isVerbose) console.error(`[wawesome:verbose] Response: ${errorBody}`);
+		const rejection = await asGatewayError(deployRes, `Failed to set active version (HTTP ${deployRes.status}).`);
+		console.error(`[wawesome] Error: ${rejection.message}`);
+		if (isVerbose) console.error(`[wawesome:verbose] Response: ${rejection.body}`);
 		process.exit(1);
 	}
 	console.log(`\n======================================================`);
@@ -3395,8 +3474,11 @@ async function showWorkspace(options) {
 	console.log(`  Address:  ${tenant.tenant_slug}`);
 	console.log(`  Tenant:   ${tenant.id}`);
 	if (options.verbose) {
-		console.log(`  URLs:     ${publicAddressTemplate(creds.gateway_url, tenant.tenant_slug)}`);
-		console.log(`            ${SUBTREE_NOTE}`);
+		const template = publicAddressTemplate(await invocationSurfaceOrNone(creds.gateway_url), tenant.tenant_slug);
+		if (template) {
+			console.log(`  URLs:     ${template}`);
+			console.log(`            ${SUBTREE_NOTE}`);
+		}
 	}
 	if (tenant.slug_locked) console.log("\n  🔒 The address is fixed — a Function version has been promoted and live URLs carry it.");
 	else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wawesome",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "CLI tool for building and deploying serverless functions on wawesome.io platform",
   "type": "module",
   "bin": {