@geekmidas/cli 10.0.0-alpha.49 → 10.0.0-alpha.50

package/dist/{workspace-cb6U29EL.mjs → workspace-BsbxbqV-.mjs}

@@ -10,7 +10,7 @@ import { existsSync } from "node:fs";
 import { mkdir, readFile, readdir, rm, writeFile } from "node:fs/promises";
 import { networkInterfaces } from "node:os";
 import { dirname, join, resolve } from "node:path";
-import { execFile } from "node:child_process";
+import { execFile, spawn } from "node:child_process";
 import { DEFAULT_POSTGRES_VERSION, cacheTable, cookieDomain, dependenciesOf, dependentsOf, externalApiUrl, kebabCase, mobileOrigins, provideKey, providedKeyFor, provisionOrder, publicEnvFor, schemeBase } from "@geekmidas/manifest";
 import { createServer } from "node:net";
 import { config } from "dotenv";
@@ -213,6 +213,20 @@ async function prepareEntryCredentials(options) {
 		workspace = await loadWorkspaceConfig(cwd).then((loaded) => loaded.workspace).catch(() => void 0);
 		secretsRoot = workspace?.root ?? findSecretsRoot(cwd);
 	}
+	if (appName && workspace && options.explicitPort === void 0) {
+		const { assignAppPorts, describeHolder, holderOf, withAppPorts } = await import("./index.mjs").then((n) => n.a);
+		const assigned = await assignAppPorts(workspace, [appName], {
+			free: isPortAvailable,
+			holder: holderOf
+		});
+		for (const { app, from, to, holder } of assigned.moved) logger.log(`↪️  ${app}: ${from} is held by ${describeHolder(holder)}, which is not this workspace's — using ${to}`);
+		workspace = withAppPorts(workspace, assigned.ports);
+		workspaceAppPort = assigned.ports[appName] ?? workspaceAppPort;
+	}
+	if (appName) {
+		const { APP_TAG_ENV, appTag } = await import("./index.mjs").then((n) => n.a);
+		process.env[APP_TAG_ENV] = appTag(secretsRoot, appName);
+	}
 	const resolvedPort = options.explicitPort ?? workspaceAppPort ?? 3e3;
 	const stage = options.stage ?? workspace?.stages.local;
 	const store = stage ? workspace ? await secretsStoreFor(workspace, stage) : new FileSecretsStore(secretsRoot) : void 0;
@@ -1970,6 +1984,29 @@ function composeFiles(composePath) {
 }
 /** How long to wait for containers to pass their health checks. */
 const HEALTH_TIMEOUT_MS = 12e4;
+/** `docker compose up` exited unsuccessfully; its own output said why. */
+var ComposeUpFailed = class extends Error {
+	services;
+	code;
+	constructor(services, code) {
+		super(`docker compose could not start ${services.join(", ")} (exit ${code ?? "signal"}). Its output above names the container; \`docker compose logs <service>\` shows why it stopped.`);
+		this.services = services;
+		this.code = code;
+		this.name = "ComposeUpFailed";
+	}
+};
+/** Run compose with its output on this terminal rather than captured. */
+function shown(args, services) {
+	return new Promise((resolve, reject) => {
+		const child = spawn("docker", args, { stdio: [
+			"ignore",
+			"inherit",
+			"inherit"
+		] });
+		child.on("error", reject);
+		child.on("close", (code) => code === 0 ? resolve() : reject(new ComposeUpFailed(services, code)));
+	});
+}
 const dockerCli = {
 	async publishedPort(composePath, service, inside) {
 		try {
@@ -1986,8 +2023,8 @@ const dockerCli = {
 			return;
 		}
 	},
-	async up(composePath, services) {
-		await run("docker", [
+	async up(composePath, services, options = {}) {
+		const args = [
 			"compose",
 			...composeFiles(composePath),
 			"up",
@@ -1996,7 +2033,9 @@ const dockerCli = {
 			"--wait",
 			`--wait-timeout=${Math.floor(HEALTH_TIMEOUT_MS / 1e3)}`,
 			...services
-		]);
+		];
+		if (options.show) return shown(args, services);
+		await run("docker", args);
 	},
 	async copyOut(composePath, service, from, to) {
 		await mkdir(dirname(to), { recursive: true });
@@ -2744,9 +2783,13 @@ async function reconcile(options) {
 			TEST_STAGE
 		]);
 	}
-	if (start && plan.containers.length > 0) await docker.up(composePath, plan.containers);
+	if (start && plan.containers.length > 0) {
+		options.progress?.(`🐳 Starting ${plan.containers.join(", ")} — the first start pulls each image, which can take a few minutes`);
+		await docker.up(composePath, plan.containers, options.progress ? { show: true } : {});
+	}
 	if (start && plan.containers.includes("caddy")) await docker.reload(composePath, "caddy").catch(() => {});
 	if (start && plan.containers.includes("caddy")) await docker.copyOut(composePath, "caddy", CADDY_ROOT_IN_CONTAINER, join(root, LOCAL_CA_PATH)).catch(() => {});
+	if (start && provision) options.progress?.("🗄️  Creating what the constructs declare — databases, roles, buckets, topics");
 	const provisioned = start && provision ? await create(plan, ports, sql, buckets, carriers, project) : [];
 	await saveState(root, {
 		hash,
@@ -2918,7 +2961,8 @@ async function reconcileWorkspace(workspace, options) {
 		metroPorts: metroPorts(workspace, manifest),
 		fakes,
 		apps: (containers) => appServices(workspace, manifest, containers, runnables, fakes),
-		...options.start === void 0 ? {} : { start: options.start }
+		...options.start === void 0 ? {} : { start: options.start },
+		...options.progress ? { progress: options.progress } : {}
 	});
 	await savePortState(workspace.root, { ...result.ports });
 	return result;
@@ -2970,4 +3014,4 @@ function localAddress(port) {
 //#endregion
 export { loadEnvFiles as C, isPortAvailable as S, prepareEntryCredentials as T, fakeKey as _, reconcileWorkspace as a, createEntryWrapper as b, LOCAL_CA_PATH as c, postgresDatabaseNames as d, quoteIdentifier as f, describeServices as g, rootSite as h, derivedContainers as i, forgetState as l, resourceName as m, backendsOf as n, workspace_exports as o, pgClient as p, constructGlobs as r, COMPOSE_PATH as s, FAKE_ENV as t, applyPostgres as u, primaryPortKey as v, loadSecretsForApp as w, findAvailablePort as x, createCredentialsPreload as y };
 
-//# sourceMappingURL=workspace-cb6U29EL.mjs.map
+//# sourceMappingURL=workspace-BsbxbqV-.mjs.map