@geekmidas/cli 10.0.0-alpha.89 → 10.0.0-alpha.90

package/dist/{seeds-perzdN81.mjs → seeds-odfgSCmu.mjs}

@@ -6,7 +6,7 @@ import { $ as RotationInProgress, B as LOGS_PORT, G as checkS3Config, H as provi
 import { ConfigNotFound, NotInAnApp, loadWorkspaceAppInfo, loadWorkspaceConfig } from "./config.mjs";
 import { a as telemetryArgs, c as startTelemetryCode, n as runtimeFor, u as writeTelemetryModule } from "./EndpointGenerator-CVc6Oi1Y.mjs";
 import { a as DEFAULT_STORAGE, i as DEFAULT_EVENTS$1, n as readFakes, o as holdsEveryCache, r as DEFAULT_CACHE, t as SubscriberGenerator } from "./SubscriberGenerator-BPqQf8fB.mjs";
-import { c as runtimeOf } from "./resolve-Dv_weZoh.mjs";
+import { c as runtimeOf } from "./resolve-DNg0icnh.mjs";
 import { basename, dirname, isAbsolute, join, parse, relative, resolve, sep } from "node:path";
 import { constants, existsSync, readFileSync } from "node:fs";
 import { appendFile, chmod, copyFile, mkdir, readFile, readdir, rm, stat, writeFile } from "node:fs/promises";
@@ -4085,8 +4085,9 @@ function carrierClient(port, credentials) {
 * what a developer runs by hand when something is wrong, so the two cannot
 * disagree, and it keeps Docker out of this package's dependencies.
 *
-* Every call is scoped to the generated compose file. Nothing here can touch a
-* container this project did not generate.
+* Every call that acts is scoped to the generated compose file. Nothing here
+* can touch a container this project did not generate; `publisher` only reads
+* who holds a port.
 */
 const run = promisify(execFile);
 /**
@@ -4144,6 +4145,20 @@ const dockerCli = {
 			return;
 		}
 	},
+	async publisher(port) {
+		try {
+			const { stdout } = await run("docker", [
+				"ps",
+				"--filter",
+				`publish=${port}`,
+				"--format",
+				"{{.Label \"com.docker.compose.project\"}}"
+			]);
+			return stdout.trim().split("\n")[0] || void 0;
+		} catch {
+			return;
+		}
+	},
 	async up(composePath, services, options = {}) {
 		const args = [
 			"compose",
@@ -4619,6 +4634,28 @@ function keptPorts(saved = {}, observed = {}) {
 	}
 	return kept;
 }
+/**
+* The kept ports, among those the plan publishes, that something other than
+* this project now holds.
+*
+* A saved port is only a memory of a free one. Another checkout's stack — the
+* same project name hashes to the same block — can bind it in the meantime,
+* and keeping it unchecked fails `docker compose up` with "port is already
+* allocated". An observed port is ours by definition and is never asked
+* about; neither is a saved one the plan no longer publishes, which is only
+* kept for when it returns.
+*/
+async function heldElsewhere(kept, keys, observed, probe, ours) {
+	const held = [];
+	for (const key of [...keys].sort()) {
+		const port = kept[key];
+		if (port === void 0 || key in observed) continue;
+		if (await probe(port)) continue;
+		if (await ours(port)) continue;
+		held.push(key);
+	}
+	return held;
+}
 /** The window was exhausted. */
 var NoPortAvailable = class extends Error {
 	/** Where the search started. */
@@ -4652,18 +4689,22 @@ async function nextFree(from, taken, probe) {
 * Binds rather than connects: a refused connection says nothing about whether
 * the port can be *published*, which is the question Docker will ask. Binds on
 * `0.0.0.0` for the same reason — a port free on loopback can still be taken on
-* the address Docker publishes to.
+* the address Docker publishes to — and then on `127.0.0.1`, because on macOS
+* a wildcard bind succeeds beside a listener on loopback alone.
 *
 * Inherently racy, and that is acceptable: Docker failing to bind stays the real
 * check. This exists so the common case surfaces as a message at reconcile
 * rather than as a connection failure ten minutes later.
 */
-function isPortFree(port) {
+async function isPortFree(port) {
+	return await canBind(port, "0.0.0.0") && await canBind(port, "127.0.0.1");
+}
+function canBind(port, host) {
 	return new Promise((resolve) => {
 		const server = createServer();
 		server.once("error", () => resolve(false));
 		server.once("listening", () => server.close(() => resolve(true)));
-		server.listen(port, "0.0.0.0");
+		server.listen(port, host);
 	});
 }
 //#endregion
@@ -5153,7 +5194,16 @@ async function reconcile(options) {
 	const running = exports ? plan.containers : plan.containers.filter((c) => c !== TELEMETRY_CONTAINER);
 	const composePath = join(root, COMPOSE_PATH);
 	const observed = await observedPorts(docker, composePath, plan.containers, plan.fakes);
-	const ports = await allocate(project, portKeys(plan.containers, plan.fakes), keptPorts(options.saved, observed), probe);
+	const keys = portKeys(plan.containers, plan.fakes);
+	const kept = keptPorts(options.saved, observed);
+	const composeProject = process.env.COMPOSE_PROJECT_NAME || project;
+	const held = await heldElsewhere(kept, keys, observed, probe, async (port) => await docker.publisher?.(port) === composeProject);
+	const ports = await allocate(project, keys, Object.fromEntries(Object.entries(kept).filter(([key]) => !held.includes(key))), probe);
+	const moved = held.map((key) => ({
+		key,
+		from: kept[key],
+		to: ports[key]
+	}));
 	const compose = composeFor(plan, {
 		project,
 		ports,
@@ -5190,6 +5240,7 @@ async function reconcile(options) {
 		plan,
 		compose,
 		ports,
+		moved,
 		services,
 		env: envWith(options.credentials),
 		credentials: options.credentials,
@@ -5778,6 +5829,7 @@ async function reconcileWorkspace(workspace, options) {
 		...options.progress ? { progress: options.progress } : {}
 	});
 	await savePortState(workspace.root, { ...result.ports });
+	for (const { key, from, to } of result.moved) console.log(`⚠️  Port ${from} (${key}) is held by another process; moved to ${to}.`);
 	if (result.credentials !== credentials) await saveLocalCredentials(workspace, result.credentials);
 	for (const outcome of result.logins) if (outcome.notice) console.log(outcome.notice);
 	return {
@@ -7215,17 +7267,17 @@ function isStateStore(value) {
 async function createStateStore(options) {
 	const { config, workspaceRoot, workspaceName } = options;
 	if (!config || config.provider === "local") {
-		const { LocalStateStore } = await import("./LocalStateStore-C_hYDv6I.mjs").then((n) => n.n);
+		const { LocalStateStore } = await import("./LocalStateStore-CU-O0SBp.mjs").then((n) => n.n);
 		return new LocalStateStore(workspaceRoot);
 	}
 	if (isStateStore(config.provider)) return config.provider;
 	if (isStateProvider(config.provider)) {
-		const { LegacyStateStore } = await import("./LegacyStateStore-CO7bzJCU.mjs");
+		const { LegacyStateStore } = await import("./LegacyStateStore-ZkdmiUFZ.mjs");
 		return new LegacyStateStore(config.provider, { warn: options.warn });
 	}
 	if (config.provider === "ssm") {
 		if (!workspaceName) throw new StateStoreNeedsWorkspaceName("ssm");
-		const { SSMStateStore } = await import("./SSMStateStore-IvcjTk8h.mjs");
+		const { SSMStateStore } = await import("./SSMStateStore-CsOS0W1y.mjs");
 		const ssm = config;
 		return SSMStateStore.create({
 			workspaceName,
@@ -7235,7 +7287,7 @@ async function createStateStore(options) {
 	}
 	if (config.provider === "s3") {
 		if (!workspaceName) throw new StateStoreNeedsWorkspaceName("s3");
-		const { S3StateStore } = await import("./S3StateStore-hIm8Rrmu.mjs");
+		const { S3StateStore } = await import("./S3StateStore-bwxcI_wQ.mjs");
 		const s3 = config;
 		return S3StateStore.create({
 			workspaceName,
@@ -7283,7 +7335,7 @@ async function createDnsProvider(options) {
 		});
 	}
 	if (provider === "godaddy") {
-		const { GoDaddyProvider } = await import("./GoDaddyProvider--36rw8cP.mjs");
+		const { GoDaddyProvider } = await import("./GoDaddyProvider-DSStJVAv.mjs");
 		return new GoDaddyProvider(options.godaddy ?? {});
 	}
 	if (provider === "cloudflare") throw new DnsProviderNotImplemented("cloudflare");
@@ -9483,4 +9535,4 @@ function reportPlannedSeeds(planned, log) {
 //#endregion
 export { externalServices as $, LOCAL_LOGS_EMAIL as $n, isImageBuild as $t, setApplicationId as A, prepareEntryCredentials as An, applyPolicies as At, StateStoreWithoutLocking as B, applicationName as Bn, appEnvKeys as Bt, orchestrateDns as C, createCredentialsPreload as Cn, redisService as Ct, getGeneratedSecret as D, loadEnvFiles as Dn, LOCAL_CA_PATH as Dt, getBackupState as E, isPortAvailable as En, withRedisPassword as Et, createDnsProvider as F, FileSecretsStore as Fn, quoteIdentifier as Ft, AllowDevServicesTakesNoValue as G, markerOf as Gn, localRolePassword as Gt, contentVersion as H, imageName as Hn, networkEnv as Ht, DocumentStateStore as I, getKeyPath as In, LEGACY_LOCAL_LOGIN as It, ExternalServicesNotConfigured as J, initStageSecrets as Jn, TURBO_VERSION as Jt, DEV_SERVICES as K, ownershipMarker as Kn, composeBuildPaths as Kt, StageStateMissing as L, keystoreProject as Ln, ensurePostgresLogin as Lt, setGeneratedSecret as M, secretsStoreFor as Mn, bucketPolicies as Mt, setPostgresBackupId as N, storeFromConfig as Nn, postgresDatabaseNames as Nt, recordRelease as O, loadPortState as On, forgetState as Ot, DnsRecordsUnreadable as P, store_exports as Pn, postgresStatements as Pt, devServicesUsed as Q, withCustomSecret as Qn, imageBuildCredentials as Qt, StateLocked as R, projectKey as Rn, bucketClient as Rt, normalizeDnsConfig as S, primaryPortKey as Sn, STACK_CACHE as St, createEmptyState as T, findAvailablePort as Tn, stackRedis as Tt, createStateStore as U, imageRef as Un, workerEnvKeys as Ut, StateVersionConflict as V, deployIdentity as Vn, dockerfileOf as Vt, newLockHolder as W, isOwnedBy as Wn, envFor as Wt, assertDevServicesFlag as X, storage_exports as Xn, detectPackageManager as Xt, STORAGE_KEY_PAIR as Y, maskPassword as Yn, WORKER_PORT as Yt, assertExternalServices as Z, toEmbeddableSecrets as Zn, findBuildRoot as Zt, workerDockerfile as _, DEFAULT_IMAGES as _n, loadLocalCredentials as _t, provisionStage as a, composeFor as an, NoDomainForStage as ar, WorkerGenerator as at, extractSubdomain as b, portKeys as bn, withGeneratedSecrets as bt, StageProviderDisabled as c, planFor as cn, QueueGenerator as ct, stageProviderNotes as d, appTelemetry as dn, backendsOf as dt, cacheBackendFor as en, LOGS_SERVICE as er, manifestServiceDeclarations as et, DockerBuildFailed as f, isTelemetryKey as fn, constructGlobs as ft, ensureDockerignore as g, usesTelemetry as gn, LOCAL_RABBITMQ_USER as gt, dockerCommand as h, telemetryOf as hn, workspace_exports as ht, assertNoStaleSecrets as i, CLUSTER_DATABASE as in, withLogsPassword as ir, workerUnits as it, setBackupState as j, isRemoteStore as jn, applyPostgres as jt, recordRollback as k, loadSecretsForApp as kn, applyBuckets as kt, assertStageProvidersEnabled as l, resourceName as ln, CronGenerator as lt, appDockerfile as m, surfaceClientTraced as mn, reconcileWorkspace as mt, reportDatabaseRuns as n, providerOf as nn, logsService as nr, requiredStageKeys as nt, verifyStageProviders as o, EMULATOR_ACCESS_KEY_ID as on, isMainFrontendApp as or, workerBundleName as ot, DockerPushFailed as p, scopeTelemetryEnv as pn, derivedContainers as pt, DevServicesNeedServerTarget as q, projectName as qn, imageLayout as qt, reportPlannedSeeds as r, storageBackendFor as rn, stackLogs as rr, suppliedOnly as rt, DeployJournal as s, TELEMETRY_CONTAINER as sn, resolveHost as sr, workerEntryDir as st, DeploySeedsFailed as t, eventsBackendFor as tn, logsAccess as tr, reportDevServices as tt, provisionCommand as u, hostFor as un, FAKE_ENV as ut, workerDockerfileOf as v, describeServices as vn, postgresSuperuser as vt, verifyDnsRecords as w, createEntryWrapper as wn, runsRedis as wt, findRootDomain as x, portsOf as xn, REDIS_SERVICE as xt, validateImageRef as y, fakeKey as yn, readLocalCredentials as yt, StateStoreBusy as z, readKey as zn, pgClient as zt };
 
-//# sourceMappingURL=seeds-perzdN81.mjs.map
+//# sourceMappingURL=seeds-odfgSCmu.mjs.map