@getmonoceros/workbench 1.39.2 → 1.39.3

package/dist/bin.js

@@ -9138,7 +9138,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.39.2" : "dev";
+    CLI_VERSION = true ? "1.39.3" : "dev";
   }
 });
 
@@ -9898,7 +9898,8 @@ var init_resolve = __esm({
         }
       },
       share: {
-        positionals: [containerName, appCandidates]
+        positionals: [containerName, appCandidates],
+        flags: { "--forward-ports": { type: "value" } }
       },
       completion: {
         positionals: [shellValues]
@@ -13031,8 +13032,8 @@ function renderCaddyfile(sites, certFile, keyFile) {
 }
 function buildCaddyDockerArgs(input) {
   const args = ["run", "--rm", "-i", `--network=${input.network}`];
-  for (const port of input.ports) {
-    args.push("-p", `${input.localAddress}:${port}:${port}`);
+  for (const { host, container } of input.ports) {
+    args.push("-p", `${input.localAddress}:${host}:${container}`);
   }
   args.push(
     "-v",
@@ -13057,6 +13058,31 @@ import { spawn as spawn14, spawnSync as spawnSync2 } from "child_process";
 import { consola as consola35 } from "consola";
 import { promises as fs22 } from "fs";
 import path34 from "path";
+function parseForwardPorts(raw) {
+  const out = [];
+  for (const entry2 of raw.split(",").map((s) => s.trim()).filter(Boolean)) {
+    const m = /^(\d+):(\d+)$/.exec(entry2);
+    if (!m) {
+      throw new Error(
+        `Invalid --forward-ports entry '${entry2}': expected host:container (e.g. 15173:5173).`
+      );
+    }
+    const host = Number(m[1]);
+    const container = Number(m[2]);
+    for (const [label, port] of [
+      ["host", host],
+      ["container", container]
+    ]) {
+      if (!Number.isInteger(port) || port < 1 || port > 65535) {
+        throw new Error(
+          `Invalid --forward-ports ${label} port '${port}': must be between 1 and 65535.`
+        );
+      }
+    }
+    out.push({ host, container });
+  }
+  return out;
+}
 function realHostAddresses() {
   let ip;
   for (const list of Object.values(os4.networkInterfaces())) {
@@ -13113,6 +13139,37 @@ async function caTrustDisplayPath(caCertPath, home) {
   const rel = path34.relative(home, caCertPath).split(path34.sep).join("\\");
   return `${prof.homeWin}\\.monoceros\\${rel}`;
 }
+async function findFreeHostPort(start, probe, taken) {
+  let port = start > 65535 ? 2e4 : start;
+  for (let i = 0; i < 200 && port <= 65535; i++, port++) {
+    if (taken.has(port)) continue;
+    const result = await probe(port, SHARE_ADDRESS);
+    if (result.ok) return port;
+  }
+  return start;
+}
+function formatShareCollision(input) {
+  const plural = input.busyHostPorts.length > 1;
+  const cmd = `monoceros share ${input.name} ${input.app} --forward-ports ${input.suggestions.join(",")}`;
+  return [
+    `Cannot share ${input.name}/${input.app}: host port${plural ? "s" : ""} ${input.busyHostPorts.join(", ")} already in use.`,
+    "",
+    "Your IDE forwards the container's ports to 127.0.0.1 (VS Code, Codium",
+    "and JetBrains auto-forward over Remote-SSH, and it cannot be reliably",
+    "turned off). That collides with share, which binds these ports on",
+    "0.0.0.0 to reach other devices.",
+    "",
+    "Resolve it one of two ways:",
+    "",
+    `  1. In the IDE's PORTS panel, right-click each port -> "Stop Forwarding`,
+    '     Port" (stays gone across reconnects), then re-run share unchanged.',
+    "",
+    "  2. Re-run share and publish the busy ports under different host ports",
+    "     (Docker order, host:container):",
+    "",
+    `       ${cmd}`
+  ].join("\n");
+}
 async function runShare(opts) {
   const log = opts.logger ?? {
     info: (m) => consola35.info(m),
@@ -13133,16 +13190,49 @@ async function runShare(opts) {
     );
   }
   const ports = [...new Set(ported.map((t) => t.port))];
+  const overrides = /* @__PURE__ */ new Map();
+  for (const fp of opts.forwardPorts ?? []) {
+    if (!ports.includes(fp.container)) {
+      throw new Error(
+        `--forward-ports maps container port ${fp.container}, but no shared target uses it. Shared ports: ${ports.join(", ")}.`
+      );
+    }
+    overrides.set(fp.container, fp.host);
+  }
+  const hostPortFor = (container) => overrides.get(container) ?? container;
+  const pairs = ports.map((container) => ({
+    host: hostPortFor(container),
+    container
+  }));
+  const probe = opts.probe ?? realPortProbe2;
+  const busy = [];
+  for (const pair of pairs) {
+    const result = await probe(pair.host, SHARE_ADDRESS);
+    if (!result.ok) busy.push(pair);
+  }
+  if (busy.length > 0) {
+    const taken = new Set(pairs.map((p) => p.host));
+    const suggestions = [];
+    for (const b of busy) {
+      const free = await findFreeHostPort(b.container + 1e4, probe, taken);
+      taken.add(free);
+      suggestions.push(`${free}:${b.container}`);
+    }
+    throw new Error(
+      formatShareCollision({
+        name: opts.name,
+        app: opts.app,
+        busyHostPorts: busy.map((b) => b.host),
+        suggestions
+      })
+    );
+  }
   const resolve = opts.resolve ?? resolveTunnelTarget;
   const base = await resolve({
     name: opts.name,
     target: String(ports[0]),
     ...opts.monocerosHome !== void 0 ? { monocerosHome: opts.monocerosHome } : {}
   });
-  const preflight = opts.preflight ?? preflightLocalPort;
-  for (const port of ports) {
-    await preflight({ port, address: SHARE_ADDRESS });
-  }
   const { ip: localIp, mdnsName } = (opts.hostAddresses ?? realHostAddresses)();
   const winLanIp = await (opts.resolveWindowsLanIp ?? resolveWindowsLanIp)();
   const ip = winLanIp ?? localIp;
@@ -13183,7 +13273,7 @@ async function runShare(opts) {
   for (const t of ported) {
     banner.push("", `    ${cyan2(t.name)}`);
     for (const addr of addresses) {
-      banner.push(`      https://${addr}:${t.port}`);
+      banner.push(`      https://${addr}:${hostPortFor(t.port)}`);
     }
   }
   banner.push(
@@ -13199,7 +13289,7 @@ async function runShare(opts) {
     dockerSpawn(
       buildCaddyDockerArgs({
         localAddress: SHARE_ADDRESS,
-        ports,
+        ports: pairs,
         network: base.network,
         certDir: tls.certDir,
         caddyfilePath
@@ -13262,11 +13352,21 @@ var init_share = __esm({
           type: "positional",
           description: "App to share (a path under projects/ with .monoceros/launch.json). Every target with a `port` is exposed on the LAN.",
           required: true
+        },
+        "forward-ports": {
+          type: "string",
+          description: "Publish busy container ports under different host ports. Docker `-p` order (host:container), comma-separated: --forward-ports 15173:5173,18000:8000. Use when an IDE already forwards the port to localhost. Unlisted ports keep parity.",
+          required: false
         }
       },
       async run({ args }) {
         try {
-          const exitCode = await runShare({ name: args.name, app: args.app });
+          const forwardPorts = args["forward-ports"] ? parseForwardPorts(String(args["forward-ports"])) : void 0;
+          const exitCode = await runShare({
+            name: args.name,
+            app: args.app,
+            ...forwardPorts ? { forwardPorts } : {}
+          });
           process.exit(exitCode);
         } catch (err) {
           consola36.error(err instanceof Error ? err.message : String(err));