@geekmidas/cli 10.0.0-alpha.34 → 10.0.0-alpha.36

package/dist/{workspace-LKFnEBX8.cjs → workspace-C0X8xSXV.cjs}

@@ -1,10 +1,11 @@
 const require_rolldown_runtime = require("./rolldown-runtime-C0BPl7ul.cjs");
 const require_discover = require("./discover-CroTIm0K.cjs");
-const require_config = require("./config-DMpzmsQL.cjs");
+const require_config = require("./config-DgAHy8nY.cjs");
 const require_workspace = require("./workspace-CAJk6UmC.cjs");
 const require_storage = require("./storage-C2JC31V9.cjs");
 let node_fs = require("node:fs");
 let node_fs_promises = require("node:fs/promises");
+let node_os = require("node:os");
 let node_path = require("node:path");
 let node_child_process = require("node:child_process");
 let _geekmidas_manifest = require("@geekmidas/manifest");
@@ -210,6 +211,7 @@ async function prepareEntryCredentials(options) {
 	const stage = options.stage ?? workspace?.stages.local;
 	const credentials = stage ? await loadSecretsForApp(secretsRoot, stage, appName) : {};
 	credentials.PORT = String(resolvedPort);
+	if (appInfo?.app.type === "mobile") credentials.RCT_METRO_PORT = String(resolvedPort);
 	const declaredKeys = [];
 	if (workspace) {
 		const { reconcileWorkspace } = await Promise.resolve().then(() => workspace_exports);
@@ -689,7 +691,8 @@ const CONTAINERLESS = {
 	secret: true,
 	credential: true,
 	"rest-api": true,
-	site: true
+	site: true,
+	"mobile-app": true
 };
 /**
 * Containers that cannot run alone.
@@ -709,7 +712,8 @@ const REQUIRES = { "redis-http": ["redis"] };
 const ROLES = {
 	queue: "publisherConnectionString",
 	topic: "publisherConnectionString",
-	credential: "credential"
+	credential: "credential",
+	"mobile-app": "scheme"
 };
 /** The kinds whose container is the events backend's rather than their own. */
 const EVENT_KINDS = {
@@ -820,6 +824,10 @@ function planFor(manifest, stage, order, options = {}) {
 			provisions: PROVISIONS[declaration.kind] === true,
 			...declaration.kind === "rest-api" ? { callers: (0, _geekmidas_manifest.dependentsOf)(manifest, id) } : {},
 			...declaration.kind === "site" ? { publicEnv: (0, _geekmidas_manifest.publicEnvFor)(declaration, manifest) } : {},
+			...declaration.kind === "mobile-app" ? {
+				publicEnv: (0, _geekmidas_manifest.publicEnvFor)(declaration, manifest),
+				...declaration.scheme ? { scheme: declaration.scheme } : {}
+			} : {},
 			...declaration.kind === "file-server" && declaration.open?.length ? { open: declaration.open } : {},
 			..."of" in declaration ? { of: declaration.of } : {},
 			..."schema" in declaration && declaration.schema ? { schema: declaration.schema } : {},
@@ -969,7 +977,12 @@ function envFor(plan, options) {
 	}
 	for (const resource of plan.resources) {
 		const url = resolved[resource.id];
-		if (resource.kind === "rest-api") Object.assign(env, surfaceEnv(resource, url, resolved));
+		if (resource.kind === "rest-api") Object.assign(env, surfaceEnv(resource, url, resolved, {
+			plan,
+			...options.addresses ? { addresses: options.addresses } : {},
+			...options.lanAddress ? { lanAddress: options.lanAddress } : {},
+			...options.metroPorts ? { metroPorts: options.metroPorts } : {}
+		}));
 		if (url) env[resource.envKey] = url;
 		if (isDatabase(resource.kind) && resource.roles !== false) {
 			const owner = ownerUrl(resource, plan, options.ports, options.project ?? "");
@@ -981,7 +994,7 @@ function envFor(plan, options) {
 			if (inbox !== void 0) env[(0, _geekmidas_manifest.provideKey)(resource.id, "inboxUrl")] = `http://${LOCAL_HOST}:${inbox}`;
 		}
 	}
-	Object.assign(env, publicEnv(plan, env));
+	Object.assign(env, publicEnv(plan, env, options.addresses));
 	Object.assign(env, brokerEnv(plan, options.ports));
 	if (plan.resources.some((r) => r.kind === "objects" && env[r.envKey])) Object.assign(env, STORAGE_CREDENTIALS);
 	return env;
@@ -999,10 +1012,11 @@ function envFor(plan, options) {
 * against `http:///`, where a missing variable fails at build with the name of
 * the thing that is missing.
 */
-function publicEnv(plan, resolved) {
+function publicEnv(plan, resolved, addresses = {}) {
 	const env = {};
+	const owners = new Map(plan.resources.map((r) => [r.envKey, r.id]));
 	for (const resource of plan.resources) for (const [key, source] of Object.entries(resource.publicEnv ?? {})) {
-		const value = resolved[source];
+		const value = (resource.kind === "mobile-app" ? addresses[owners.get(source) ?? ""] : void 0) ?? resolved[source];
 		if (value) env[key] = value;
 	}
 	return env;
@@ -1022,13 +1036,26 @@ function publicEnv(plan, resolved) {
 * means it is not running in this stage, and keys belong with the address they
 * describe.
 */
-function surfaceEnv(resource, url, resolved = {}) {
+function surfaceEnv(resource, url, resolved = {}, local = {}) {
 	if (!url) return {};
 	const origins = [...new Set((resource.callers ?? []).map((caller) => resolved[caller]).filter((address) => Boolean(address)).map(originOf).filter((origin) => Boolean(origin)))].sort();
 	const domain = (0, _geekmidas_manifest.cookieDomain)([url, ...origins]);
+	const mobile = (resource.callers ?? []).map((caller) => local.plan?.resources.find((r) => r.id === caller && r.kind === "mobile-app")).filter((caller) => Boolean(caller));
+	const hosts = [...local.lanAddress ? [local.lanAddress] : [], LOCAL_HOST];
+	const schemes = mobile.flatMap((caller) => {
+		const scheme = resolved[caller.id];
+		const port = local.metroPorts?.[caller.id];
+		return scheme ? (0, _geekmidas_manifest.mobileOrigins)(scheme, {
+			hosts,
+			...port ? { port } : {}
+		}) : [];
+	});
+	const own = local.addresses?.[resource.id];
+	const device = mobile.length > 0 && local.lanAddress && own ? own.replace(/\/\/(localhost|127\.0\.0\.1)(?=[:/]|$)/, `//${local.lanAddress}`) : void 0;
 	return {
-		[(0, _geekmidas_manifest.provideKey)(resource.id, "trustedOrigins")]: origins.join(","),
-		...domain ? { [(0, _geekmidas_manifest.provideKey)(resource.id, "cookieDomain")]: domain } : {}
+		[(0, _geekmidas_manifest.provideKey)(resource.id, "trustedOrigins")]: [...origins, ...new Set(schemes)].join(","),
+		...domain ? { [(0, _geekmidas_manifest.provideKey)(resource.id, "cookieDomain")]: domain } : {},
+		...device ? { [(0, _geekmidas_manifest.provideKey)(resource.id, "deviceUrl")]: device } : {}
 	};
 }
 /** An address reduced to the origin a browser compares against. */
@@ -1108,6 +1135,7 @@ function workerBroker(plan, ports) {
 */
 function urlFor(resource, plan, ports, project, addresses = {}) {
 	if (resource.kind === "secret") return localSecret(project, plan, resource);
+	if (resource.kind === "mobile-app") return (0, _geekmidas_manifest.schemeBase)(project, resource.scheme);
 	if (resource.kind === "credential") return void 0;
 	if (resource.kind === "rest-api" || resource.kind === "site") {
 		const address = addresses[resource.id];
@@ -1352,7 +1380,7 @@ function inNetworkEnv(workspace, manifest) {
 * port.
 */
 function appEnvKeys(manifest, appName, runnables = {}) {
-	const entry = Object.entries(manifest).find(([id, d]) => (d.kind === "rest-api" || d.kind === "site") && require_config.appKey(id) === appName);
+	const entry = Object.entries(manifest).find(([id, d]) => (d.kind === "rest-api" || d.kind === "site" || d.kind === "mobile-app") && require_config.appKey(id) === appName);
 	if (!entry) return void 0;
 	const [id, declaration] = entry;
 	const keys = /* @__PURE__ */ new Set([
@@ -1381,7 +1409,7 @@ function appEnvKeys(manifest, appName, runnables = {}) {
 			keys.add("AWS_REGION");
 		}
 	}
-	if (declaration.kind === "site") for (const key of Object.keys((0, _geekmidas_manifest.publicEnvFor)(declaration, manifest))) keys.add(key);
+	if (declaration.kind === "site" || declaration.kind === "mobile-app") for (const key of Object.keys((0, _geekmidas_manifest.publicEnvFor)(declaration, manifest))) keys.add(key);
 	return keys;
 }
 /** One compose service per app the workspace runs, behind the apps profile. */
@@ -1881,6 +1909,30 @@ const dockerCli = {
 	}
 };
 //#endregion
+//#region src/reconcile/lan.ts
+/**
+* This machine's address on the local network — what a phone running the app
+* reaches it on.
+*/
+/**
+* The first private IPv4 address of an interface that is up and not loopback.
+*
+* Private ranges only (`10/8`, `172.16/12`, `192.168/16`): a public address
+* would mean listening for a phone on the open internet, and a link-local one
+* (`169.254/16`) is what an interface has when it found no network at all.
+* Undefined when there is none — a laptop on no network still runs, its mobile
+* app reaching only a simulator.
+*/
+function lanAddress(interfaces = (0, node_os.networkInterfaces)()) {
+	for (const entries of Object.values(interfaces)) for (const entry of entries ?? []) {
+		if (entry.family !== "IPv4" || entry.internal) continue;
+		if (isPrivate(entry.address)) return entry.address;
+	}
+}
+function isPrivate(address) {
+	return /^10\./.test(address) || /^192\.168\./.test(address) || /^172\.(1[6-9]|2\d|3[01])\./.test(address);
+}
+//#endregion
 //#region src/reconcile/ports.ts
 /**
 * Port allocation — why two projects can run at once.
@@ -2431,13 +2483,19 @@ async function reconcile(options) {
 		...options.apps ? { apps: options.apps(plan.containers) } : {}
 	});
 	const caddyfile = toCaddyfile(sitesFor(plan, project, options.addresses));
-	const hash = planHash(plan, compose, { caddyfile });
+	const hash = planHash(plan, compose, {
+		caddyfile,
+		postgres: postgresStatements(plan, project).map((statement) => statement.create).join(";\n")
+	});
 	const addresses = addressesFor(plan.containers, ports);
+	const lan = plan.resources.some((r) => r.kind === "mobile-app") ? options.lanAddress === void 0 ? lanAddress() : options.lanAddress ?? void 0 : void 0;
 	const env = envFor(plan, {
 		ports,
 		project,
 		...options.mailFrom ? { mailFrom: options.mailFrom } : {},
-		...options.addresses ? { addresses: options.addresses } : {}
+		...options.addresses ? { addresses: options.addresses } : {},
+		...lan ? { lanAddress: lan } : {},
+		...options.metroPorts ? { metroPorts: options.metroPorts } : {}
 	});
 	if (plan.containers.includes("caddy")) env.NODE_EXTRA_CA_CERTS = (0, node_path.join)(root, LOCAL_CA_PATH);
 	const result = {
@@ -2564,6 +2622,7 @@ var workspace_exports = /* @__PURE__ */ require_rolldown_runtime.__exportAll({
 	backendsOf: () => backendsOf,
 	constructGlobs: () => constructGlobs,
 	derivedContainers: () => derivedContainers,
+	metroPorts: () => metroPorts,
 	reconcileWorkspace: () => reconcileWorkspace,
 	surfaceAddresses: () => surfaceAddresses
 });
@@ -2627,6 +2686,7 @@ async function reconcileWorkspace(workspace, options) {
 		...backendsOf(workspace),
 		saved: await loadPortState(workspace.root),
 		addresses: surfaceAddresses(workspace, manifest),
+		metroPorts: metroPorts(workspace, manifest),
 		apps: (containers) => appServices(workspace, manifest, containers, runnables),
 		...options.start === void 0 ? {} : { start: options.start }
 	});
@@ -2634,6 +2694,20 @@ async function reconcileWorkspace(workspace, options) {
 	return result;
 }
 /**
+* Where each mobile app's Metro runs: its app's port, which `gkm exec` hands
+* Expo as `RCT_METRO_PORT`. Kept apart from the surfaces' addresses — a phone
+* reaches Metro by `exp://`, not through the edge.
+*/
+function metroPorts(workspace, manifest) {
+	const ports = {};
+	for (const [id, declaration] of Object.entries(manifest)) {
+		if (declaration.kind !== "mobile-app") continue;
+		const port = workspace.apps[require_config.appKey(id)]?.port;
+		if (port) ports[id] = port;
+	}
+	return ports;
+}
+/**
 * Where each declared surface and site answers locally.
 *
 * The addresses come from the ports the workspace already assigns; which
@@ -2791,4 +2865,4 @@ Object.defineProperty(exports, "workspace_exports", {
 	}
 });
 
-//# sourceMappingURL=workspace-LKFnEBX8.cjs.map
+//# sourceMappingURL=workspace-C0X8xSXV.cjs.map