@getmonoceros/workbench 1.7.1 → 1.7.3

package/dist/bin.js

@@ -824,22 +824,42 @@ function proxyUrlsFor(name, ports, hostPort = 80) {
 }
 
 // src/proxy/port-check.ts
-import { createServer } from "net";
+import { Socket } from "net";
+var CONNECT_TIMEOUT_MS = 750;
 var realPortProbe = (port) => {
   return new Promise((resolve) => {
-    const server = createServer();
-    server.unref();
-    server.once("error", (err) => {
-      resolve({
+    const socket = new Socket();
+    let settled = false;
+    const settle = (result) => {
+      if (settled) return;
+      settled = true;
+      socket.destroy();
+      resolve(result);
+    };
+    socket.setTimeout(CONNECT_TIMEOUT_MS);
+    socket.once("connect", () => {
+      settle({
         ok: false,
-        code: err.code ?? "UNKNOWN",
-        message: err.message
+        code: "EADDRINUSE",
+        message: `another process is listening on ${port}`
       });
     });
-    server.once("listening", () => {
-      server.close(() => resolve({ ok: true }));
+    socket.once("timeout", () => {
+      settle({ ok: true });
     });
-    server.listen(port, "0.0.0.0");
+    socket.once("error", (err) => {
+      const code = err.code ?? "UNKNOWN";
+      if (code === "ECONNREFUSED") {
+        settle({ ok: true });
+      } else {
+        settle({
+          ok: false,
+          code,
+          message: err.message
+        });
+      }
+    });
+    socket.connect(port, "127.0.0.1");
   });
 };
 async function preflightHostPort(hostPort, opts = {}) {
@@ -887,16 +907,16 @@ function formatHostPortHeldError(hostPort, code, systemMessage) {
     lines.push("");
     lines.push(`Aborting \u2014 re-run after the conflict is resolved.`);
   } else {
-    lines.push(`Cannot bind host port ${hostPort}: ${systemMessage}`);
+    lines.push(`Cannot reach host port ${hostPort}: ${systemMessage}`);
+    lines.push("");
+    lines.push(`This is not the typical "port already in use" case \u2014`);
+    lines.push(`Monoceros's pre-flight uses a TCP-connect probe (not a`);
+    lines.push(`bind), so EACCES / privileged-port errors normally don't`);
+    lines.push(`appear here. Most likely something on your host network`);
+    lines.push(`stack (firewall, network namespace, \u2026) is interfering with`);
+    lines.push(`loopback connects.`);
     lines.push("");
-    if (code === "EACCES") {
-      lines.push(`Port ${hostPort} is a privileged port (<1024) and your`);
-      lines.push(`current Docker setup can't bind it. For rootful Docker`);
-      lines.push(`(what Monoceros requires) this should normally work \u2014`);
-      lines.push(`check that the docker daemon is running as root.`);
-      lines.push("");
-    }
-    lines.push("You can also move Monoceros off this port by setting");
+    lines.push("Workaround: move Monoceros off this port by setting");
     lines.push("`routing.hostPort` in ~/.monoceros/monoceros-config.yml.");
     lines.push("");
     lines.push(`Aborting \u2014 re-run after the issue is resolved.`);
@@ -3611,7 +3631,7 @@ function warnOnDeprecatedFeatureRefs(containerFeatures, globalConfig, logger) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "1.7.1" : "dev";
+var CLI_VERSION = true ? "1.7.3" : "dev";
 
 // src/commands/_dispatch.ts
 import { consola as consola12 } from "consola";
@@ -4086,7 +4106,7 @@ function generateComposedYml(name, components, lookupManifest, repoUrls = [], po
     );
   }
   if (ports.length > 0) {
-    renderActiveRoutingBlock(lines, ports);
+    renderActiveRoutingBlock(lines, name, ports);
   }
   return ensureTrailingNewline(lines.join("\n"));
 }
@@ -4198,7 +4218,7 @@ function generateDocumentedYml(name, catalog, lookupManifest, repoUrls = [], por
     repoUrls.length === 0
   );
   if (ports.length > 0) {
-    renderActiveRoutingBlock(lines, ports);
+    renderActiveRoutingBlock(lines, name, ports);
   } else {
     renderRoutingHintBlock(lines);
   }
@@ -4327,19 +4347,21 @@ function renderRoutingHintBlock(out) {
   );
   out.push("");
 }
-function renderActiveRoutingBlock(out, ports) {
+function renderActiveRoutingBlock(out, name, ports) {
   out.push("# Routing \u2014 expose these container ports to the host through");
   out.push("# the shared Traefik singleton. First entry doubles as");
-  out.push("# http://<name>.localhost (the default route). See ADR 0007.");
+  out.push(`# http://${name}.localhost (the default route). See ADR 0007.`);
   out.push("routing:");
   out.push("  ports:");
   ports.forEach((port, idx) => {
     if (idx === 0) {
-      out.push(`    - ${port} # default \u2192 http://<name>.localhost`);
+      out.push(`    - ${port} # default \u2192 http://${name}.localhost`);
     } else {
       out.push(`    - ${port}`);
     }
   });
+  out.push("  # vscodeAutoForward: false   # set true to keep VS Code's");
+  out.push("  #                            # port-panel alongside Traefik");
   out.push("");
 }
 function deriveDefaultPath(url) {