@mesh-tech/mesh-cli 0.31.1 → 0.32.0

package/dist/bin/mesh.js

@@ -16931,6 +16931,31 @@ import * as net12 from "node:net";
 import * as os9 from "node:os";
 import * as path36 from "node:path";
 import chalk3 from "chalk";
+function hubSessionName(apiPort) {
+  return `${HUB_SESSION_PREFIX}-${apiPort}`;
+}
+function isHubSession(name) {
+  return HUB_SESSION_RE.test(name);
+}
+function listHubSessions() {
+  try {
+    return execFileSync24("tmux", ["list-sessions", "-F", "#{session_name}"], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"]
+    }).split("\n").map((line) => line.trim()).filter(isHubSession);
+  } catch {
+    return [];
+  }
+}
+function killTargets(live, named) {
+  return named ? live.filter((name) => name === named) : live;
+}
+function killInstructions(targets) {
+  return targets.map((name) => {
+    const port = name.slice(HUB_SESSION_PREFIX.length + 1);
+    return port ? `  ${name}: mesh hub dev --kill --api-port ${port}` : `  ${name}: tmux kill-session -t ${name}`;
+  });
+}
 function devSessionsDir() {
   return path36.join(os9.tmpdir(), "mesh-dev-sessions");
 }
@@ -17158,8 +17183,8 @@ function isPortListening2(port) {
     socket.once("error", () => done(false));
   });
 }
-function hubEnvDir() {
-  return path36.join(os9.tmpdir(), "mesh-dev-sessions", HUB_SESSION);
+function hubEnvDir(sessionName) {
+  return path36.join(os9.tmpdir(), "mesh-dev-sessions", sessionName);
 }
 function parsePort(raw, fallback, source) {
   if (raw === void 0) return fallback;
@@ -17181,17 +17206,28 @@ function redactEnv(env) {
 }
 async function hubDevAction(opts) {
   if (opts.kill) {
-    if (tmuxSessionExists(HUB_SESSION)) {
-      execFileSync24("tmux", ["kill-session", "-t", HUB_SESSION], { stdio: "ignore" });
-      fs29.rmSync(hubEnvDir(), { recursive: true, force: true });
-      logSuccess(`Killed Hub session '${HUB_SESSION}'.`);
-    } else {
-      logInfo(`No '${HUB_SESSION}' tmux session running.`);
+    const namedPort = opts.apiPort || process.env.MESH_HUB_DEV_API_PORT;
+    const named = namedPort ? hubSessionName(parsePort(namedPort, DEFAULT_HUB_API_PORT, opts.apiPort ? "--api-port" : "MESH_HUB_DEV_API_PORT")) : null;
+    const targets = killTargets(listHubSessions(), named);
+    if (targets.length === 0) {
+      logInfo(named ? `No '${named}' tmux session running.` : "No `mesh hub dev` session running.");
+      return;
     }
+    if (targets.length > 1) {
+      throw new MeshCliError(
+        `${targets.length} Hub sessions are running \u2014 name the one to stop.
+${killInstructions(targets).join("\n")}`,
+        { remediation: { command: "mesh hub dev --kill --api-port <port>   # the API port that Hub was started on" } }
+      );
+    }
+    const target = targets[0];
+    execFileSync24("tmux", ["kill-session", "-t", target], { stdio: "ignore" });
+    fs29.rmSync(hubEnvDir(target), { recursive: true, force: true });
+    logSuccess(`Killed Hub session '${target}'.`);
     return;
   }
   const uiPort = opts.port ? parsePort(opts.port, DEFAULT_HUB_UI_PORT, "--port") : parsePort(process.env.MESH_HUB_DEV_PORT, DEFAULT_HUB_UI_PORT, "MESH_HUB_DEV_PORT");
-  const apiPort = parsePort(opts.apiPort, DEFAULT_HUB_API_PORT, "--api-port");
+  const apiPort = opts.apiPort ? parsePort(opts.apiPort, DEFAULT_HUB_API_PORT, "--api-port") : parsePort(process.env.MESH_HUB_DEV_API_PORT, DEFAULT_HUB_API_PORT, "MESH_HUB_DEV_API_PORT");
   const platformDir = resolvePlatformDir(opts.platformDir, process.cwd());
   const cwdAppRoot = findAppRoot(process.cwd());
   const session = pickDevSession(listDevSessions(), { session: opts.session, cwdAppRoot });
@@ -17218,9 +17254,10 @@ async function hubDevAction(opts) {
     for (const [k, v] of Object.entries(redactEnv(assembled.uiEnv))) console.log(`  ${k}=${v}`);
     return;
   }
-  if (tmuxSessionExists(HUB_SESSION)) {
-    throw new MeshCliError(`A '${HUB_SESSION}' tmux session is already running.`, {
-      remediation: { command: "mesh hub dev --kill   # then re-run mesh hub dev" }
+  const hubSession = hubSessionName(apiPort);
+  if (tmuxSessionExists(hubSession)) {
+    throw new MeshCliError(`A '${hubSession}' tmux session is already running.`, {
+      remediation: { command: `mesh hub dev --kill --api-port ${apiPort}   # then re-run` }
     });
   }
   for (const [label, port, flag] of [
@@ -17245,20 +17282,20 @@ async function hubDevAction(opts) {
   for (const warning of assembled.warnings) logWarn(warning);
   const apiDir = path36.join(platformDir, "apps", "hub", "api");
   const uiDir = path36.join(platformDir, "apps", "hub", "ui");
-  execFileSync24("tmux", ["new-session", "-d", "-s", HUB_SESSION, "-n", "api", "-c", apiDir]);
+  execFileSync24("tmux", ["new-session", "-d", "-s", hubSession, "-n", "api", "-c", apiDir]);
   if (!assembled.apiEnv.DEV_USER_TOKEN_URL && assembled.apiEnv.DEV_USER_ID_TOKEN) {
     const platform = session.state.devOutput.platform;
     const credContext = `mesh.${platform.env}`;
     const tokenPort = await findFreePort4();
     const tokenUrl = `http://127.0.0.1:${tokenPort}`;
-    execFileSync24("tmux", ["new-window", "-t", HUB_SESSION, "-n", "token-server", "-c", platformDir]);
-    execFileSync24("tmux", ["set-option", "-t", `${HUB_SESSION}:token-server`, "remain-on-exit", "on"], {
+    execFileSync24("tmux", ["new-window", "-t", hubSession, "-n", "token-server", "-c", platformDir]);
+    execFileSync24("tmux", ["set-option", "-t", `${hubSession}:token-server`, "remain-on-exit", "on"], {
       stdio: "ignore"
     });
     execFileSync24("tmux", [
       "send-keys",
       "-t",
-      `${HUB_SESSION}:token-server`,
+      `${hubSession}:token-server`,
       `npx mesh dev __token-server ${tokenPort} ${credContext}`,
       "Enter"
     ]);
@@ -17270,15 +17307,15 @@ async function hubDevAction(opts) {
     logSuccess(`Dev-user token-server: ${tokenUrl} (context ${credContext})`);
   }
   const launch = (window, dir, env, cmd, createWindow) => {
-    const envFile = path36.join(hubEnvDir(), `${window}.env.sh`);
+    const envFile = path36.join(hubEnvDir(hubSession), `${window}.env.sh`);
     writeEnvFile(envFile, env);
     if (createWindow) {
-      execFileSync24("tmux", ["new-window", "-t", HUB_SESSION, "-n", window, "-c", dir]);
+      execFileSync24("tmux", ["new-window", "-t", hubSession, "-n", window, "-c", dir]);
     }
-    execFileSync24("tmux", ["set-option", "-t", `${HUB_SESSION}:${window}`, "remain-on-exit", "on"], {
+    execFileSync24("tmux", ["set-option", "-t", `${hubSession}:${window}`, "remain-on-exit", "on"], {
       stdio: "ignore"
     });
-    execFileSync24("tmux", ["send-keys", "-t", `${HUB_SESSION}:${window}`, buildLaunchCommand(envFile, dir, cmd), "Enter"]);
+    execFileSync24("tmux", ["send-keys", "-t", `${hubSession}:${window}`, buildLaunchCommand(envFile, dir, cmd), "Enter"]);
   };
   launch("api", apiDir, assembled.apiEnv, "pnpm dev", false);
   launch("ui", uiDir, assembled.uiEnv, `pnpm dev --port ${uiPort} --strictPort`, true);
@@ -17288,15 +17325,15 @@ async function hubDevAction(opts) {
   if (!apiUp || !uiUp) {
     throw new MeshCliError(
       `Hub ${apiUp ? "UI" : "API"} did not start listening (api :${apiPort}, ui :${uiPort}).`,
-      { remediation: { command: `tmux attach -t ${HUB_SESSION}   # inspect the ${apiUp ? "ui" : "api"} window` } }
+      { remediation: { command: `tmux attach -t ${hubSession}   # inspect the ${apiUp ? "ui" : "api"} window` } }
     );
   }
   console.log("");
   logSuccess(`Mesh Hub (dev-local scope ${assembled.scope.scopeTenants.join(",")} @ ${assembled.scope.scopeEnv})`);
   console.log(`  ${chalk3.bold.cyan(`http://localhost:${uiPort}`)}  (also reachable on your tailnet)`);
   console.log(`  api  http://localhost:${apiPort}`);
-  console.log(`  logs tmux attach -t ${HUB_SESSION}`);
-  console.log(`  stop mesh hub dev --kill`);
+  console.log(`  logs tmux attach -t ${hubSession}`);
+  console.log(`  stop mesh hub dev --kill --api-port ${apiPort}`);
 }
 function registerHubCommands(program2) {
   const hub = program2.command("hub").description("Local Hub over dev-local stacks");
@@ -17305,9 +17342,15 @@ function registerHubCommands(program2) {
   ).option("--session <name>", "dev session to observe (default: auto-detect from cwd)").option("--tenants <list>", "comma-separated HUB_SCOPE_TENANTS override (default: the session's tenant)").option(
     "--audience <who>",
     "who the Hub renders for: `operator` (platform staff \u2014 the default here) or `tenant` (a client's operators). Anything else reads as `tenant`"
-  ).option("--port <port>", `Hub UI host port (default: $MESH_HUB_DEV_PORT or ${DEFAULT_HUB_UI_PORT})`).option("--api-port <port>", `Hub API port (default: ${DEFAULT_HUB_API_PORT})`).option("--platform-dir <dir>", "mesh-platform checkout to run the Hub from (default: $MESH_PLATFORM_DIR or walk up from cwd)").option("--print-env", "print the assembled env (secrets redacted) and exit without launching").option("--kill", "tear down the running Hub session").action(hubDevAction);
-}
-var HUB_SESSION, DEFAULT_HUB_UI_PORT, DEFAULT_HUB_API_PORT, FORWARD_PREFIXES, localPlatformEnv2, SENSITIVE_RE;
+  ).option("--port <port>", `Hub UI host port (default: $MESH_HUB_DEV_PORT or ${DEFAULT_HUB_UI_PORT})`).option(
+    "--api-port <port>",
+    `Hub API port, and the key its tmux session is named after \u2014 several Hubs coexist on different ones (default: $MESH_HUB_DEV_API_PORT or ${DEFAULT_HUB_API_PORT})`
+  ).option("--platform-dir <dir>", "mesh-platform checkout to run the Hub from (default: $MESH_PLATFORM_DIR or walk up from cwd)").option("--print-env", "print the assembled env (secrets redacted) and exit without launching").option(
+    "--kill",
+    "tear down a running Hub session; with several up, name it with --api-port (or $MESH_HUB_DEV_API_PORT)"
+  ).action(hubDevAction);
+}
+var HUB_SESSION_PREFIX, HUB_SESSION_RE, DEFAULT_HUB_UI_PORT, DEFAULT_HUB_API_PORT, FORWARD_PREFIXES, localPlatformEnv2, SENSITIVE_RE;
 var init_hub = __esm({
   "libs/mesh-cli/src/commands/hub/index.ts"() {
     "use strict";
@@ -17317,7 +17360,8 @@ var init_hub = __esm({
     init_stack();
     init_log();
     init_pulumi();
-    HUB_SESSION = "mesh-hub-dev";
+    HUB_SESSION_PREFIX = "mesh-hub-dev";
+    HUB_SESSION_RE = new RegExp(`^${HUB_SESSION_PREFIX}(-\\d+)?$`);
     DEFAULT_HUB_UI_PORT = Number(DEFAULT_HUB_PORT);
     DEFAULT_HUB_API_PORT = 3002;
     FORWARD_PREFIXES = ["AWS_", "DEV_USER_"];