@getmonoceros/workbench 1.7.2 → 1.7.4

package/dist/bin.js

@@ -365,7 +365,7 @@ var GitUserSchema = z.object({
 var RepoEntrySchema = z.object({
   url: z.string().regex(
     REPO_URL_RE,
-    "Invalid repo URL. Only HTTPS URLs are supported (https://...). SSH-style URLs (git@host:..., ssh://...) are not in scope \u2014 see ADR 0006."
+    "Invalid repo URL. Only HTTPS URLs are supported (https://...). SSH-style URLs (git@host:..., ssh://...) are not supported."
   ),
   path: z.string().regex(
     REPO_PATH_RE,
@@ -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.`);
@@ -3303,8 +3323,7 @@ function formatRootlessNotSupportedError() {
     `shell. Otherwise new terminals keep pointing at the rootless`,
     `socket and Monoceros's auto-recovery has nothing to fall back to.`,
     ``,
-    `Then re-run. Background: see ${cyan2("docs/docker-on-linux.md")} in`,
-    `the workbench repo.`
+    `Then re-run.`
   ].join("\n");
 }
 
@@ -3611,7 +3630,7 @@ function warnOnDeprecatedFeatureRefs(containerFeatures, globalConfig, logger) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "1.7.2" : "dev";
+var CLI_VERSION = true ? "1.7.4" : "dev";
 
 // src/commands/_dispatch.ts
 import { consola as consola12 } from "consola";
@@ -4041,10 +4060,9 @@ var SCHEMA_HEADER = [
   "# Monoceros solution-config. Edit freely, then run",
   "# `monoceros apply <name>` to materialize a dev-container.",
   "#",
-  "# Schema reference: see the workbench `templates/components/README.md`",
-  "# and `docs/konzept.md` for what each section does. Each feature",
-  "# under `features:` also accepts options not shown here \u2014 check",
-  "# the feature's `devcontainer-feature.json` for the full list."
+  "# Each section below carries inline comments for the options it",
+  "# accepts. Features expose additional knobs as commented hints",
+  "# under their `options:` block \u2014 un-comment what you need."
 ];
 function generateComposedYml(name, components, lookupManifest, repoUrls = [], ports = []) {
   const merged = mergeComponents(components);
@@ -4259,7 +4277,7 @@ function emitHint(out, hint, description, linePrefix) {
 }
 function renderReposBlock(out, urls, commented) {
   out.push("# Repos \u2014 git repositories cloned into projects/ during");
-  out.push("# post-create. HTTPS-only (ADR 0006). Provider auto-detected");
+  out.push("# post-create. HTTPS URLs only. Provider auto-detected");
   out.push("# for github.com, gitlab.com, bitbucket.org; for any other host");
   out.push("# (self-hosted GitLab, Bitbucket Data Center, Gitea/Forgejo,");
   out.push("# GitHub Enterprise, \u2026) declare provider explicitly.");
@@ -4330,7 +4348,7 @@ function renderRoutingHintBlock(out) {
 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).`);
   out.push("routing:");
   out.push("  ports:");
   ports.forEach((port, idx) => {