@secondlayer/cli 13.0.0 → 13.0.1

package/dist/cli.js

@@ -34997,6 +34997,7 @@ import { spawn as spawn4, spawnSync as spawnSync5 } from "node:child_process";
 import { randomBytes as randomBytes4 } from "node:crypto";
 import { existsSync as existsSync11 } from "node:fs";
 import { writeFile as writeFile7 } from "node:fs/promises";
+import { createServer } from "node:net";
 import { join as join19, resolve as resolvePath2 } from "node:path";
 import { FLOORS, diskFloorGb } from "@secondlayer/shared/runtime";
 function parseSetupNodeMode(value) {
@@ -35024,6 +35025,7 @@ function resolveNonInteractiveConfig(flags) {
     nodeMode,
     apiPort: flags.apiPort ?? "127.0.0.1:3800",
     indexerPort: "127.0.0.1:3700",
+    postgresPort: "127.0.0.1:5432",
     dir,
     against: flags.against,
     skipBootstrap: !!flags.skipBootstrap,
@@ -35047,6 +35049,44 @@ async function checkDocker() {
   const probe = spawnSync5("docker", ["info"], { stdio: "ignore" });
   return !probe.error && probe.status === 0;
 }
+function isPortFree(host, port) {
+  return new Promise((resolvePromise) => {
+    const srv = createServer();
+    srv.once("error", () => resolvePromise(false));
+    srv.once("listening", () => srv.close(() => resolvePromise(true)));
+    srv.listen(port, host);
+  });
+}
+function parsePublishSpec(spec) {
+  const idx = spec.lastIndexOf(":");
+  if (idx === -1)
+    return { host: "127.0.0.1", port: Number(spec) };
+  return { host: spec.slice(0, idx), port: Number(spec.slice(idx + 1)) };
+}
+function dockerPublishedHostPorts() {
+  const probe = spawnSync5("docker", ["ps", "--format", "{{.Ports}}"], {
+    encoding: "utf8"
+  });
+  const ports = new Set;
+  if (probe.error || probe.status !== 0 || !probe.stdout)
+    return ports;
+  for (const match of probe.stdout.matchAll(/:(\d+)->/g)) {
+    ports.add(Number(match[1]));
+  }
+  return ports;
+}
+async function resolveAvailablePublishSpec(spec, claimedByDocker = new Set, maxAttempts = 20) {
+  const { host, port } = parsePublishSpec(spec);
+  for (let attempt = 0;attempt < maxAttempts; attempt++) {
+    const candidate = port + attempt;
+    if (claimedByDocker.has(candidate))
+      continue;
+    if (await isPortFree(host, candidate)) {
+      return { spec: `${host}:${candidate}`, remapped: attempt > 0 };
+    }
+  }
+  return { spec, remapped: false };
+}
 function randomHex(bytes) {
   return randomBytes4(bytes).toString("hex");
 }
@@ -35095,7 +35135,7 @@ function renderSetupEnv(config, secrets) {
     "POSTGRES_USER=secondlayer",
     `POSTGRES_PASSWORD=${secrets.postgresPassword}`,
     "POSTGRES_DB=secondlayer",
-    "POSTGRES_PORT=127.0.0.1:5432",
+    `POSTGRES_PORT=${config.postgresPort}`,
     "# The instance credential. The API validates bearer tokens against it,",
     "# and the CLI/SDK/MCP read it first when authenticating.",
     `INSTANCE_TOKEN=${i3.INSTANCE_TOKEN}`,
@@ -35255,7 +35295,8 @@ function buildSuccessSummary(config, secrets) {
   return lines2.join(`
 `);
 }
-async function runSetup(config, emit2) {
+async function runSetup(initialConfig, emit2) {
+  let config = initialConfig;
   emit2({ type: "step-start", step: "preflight" });
   if (!await checkDocker()) {
     emit2({
@@ -35265,6 +35306,31 @@ async function runSetup(config, emit2) {
     });
     return { ok: false, config };
   }
+  const claimedByDocker = dockerPublishedHostPorts();
+  const ports = {
+    api: await resolveAvailablePublishSpec(config.apiPort, claimedByDocker),
+    indexer: await resolveAvailablePublishSpec(config.indexerPort, claimedByDocker),
+    postgres: await resolveAvailablePublishSpec(config.postgresPort, claimedByDocker)
+  };
+  config = {
+    ...config,
+    apiPort: ports.api.spec,
+    indexerPort: ports.indexer.spec,
+    postgresPort: ports.postgres.spec
+  };
+  for (const [label, result] of [
+    ["api", ports.api],
+    ["indexer", ports.indexer],
+    ["postgres", ports.postgres]
+  ]) {
+    if (result.remapped) {
+      emit2({
+        type: "step-log",
+        step: "preflight",
+        line: `${label} port was already in use locally, using ${result.spec} instead`
+      });
+    }
+  }
   const floors = guardrailPreview(config.nodeMode, config.network);
   emit2({
     type: "step-done",
@@ -35512,6 +35578,7 @@ function App({ flags }) {
     nodeMode,
     apiPort: flags.apiPort ?? "127.0.0.1:3800",
     indexerPort: "127.0.0.1:3700",
+    postgresPort: "127.0.0.1:5432",
     dir: flags.dir ?? process.cwd(),
     against: skipBootstrap ? undefined : against,
     skipBootstrap,
@@ -36032,7 +36099,7 @@ var {
 // package.json
 var package_default = {
   name: "@secondlayer/cli",
-  version: "13.0.0",
+  version: "13.0.1",
   description: "Run a Stacks index on your own hardware — set it up, restore verified history, and keep it current.",
   repository: {
     type: "git",
@@ -41430,6 +41497,7 @@ async function promptSetupConfig(flags) {
     nodeMode,
     apiPort: flags.apiPort ?? "127.0.0.1:3800",
     indexerPort: "127.0.0.1:3700",
+    postgresPort: "127.0.0.1:5432",
     dir: flags.dir ?? process.cwd(),
     against: skipBootstrap ? undefined : against,
     skipBootstrap,
@@ -41650,5 +41718,5 @@ program.commandsGroup("Archive:");
 registerCreditsCommand(program);
 program.parse();
 
-//# debugId=9A62CC1B91BCEC2C64756E2164756E21
+//# debugId=E4B3B7874FAC14F764756E2164756E21
 //# sourceMappingURL=cli.js.map