@getmonoceros/workbench 1.38.7 → 1.38.9

package/dist/bin.js

@@ -9005,7 +9005,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.38.7" : "dev";
+    CLI_VERSION = true ? "1.38.9" : "dev";
   }
 });
 
@@ -12623,15 +12623,65 @@ var init_caddy = __esm({
   }
 });
 
-// src/share/run.ts
+// src/devcontainer/wsl-networking.ts
+import { spawn as spawn14 } from "child_process";
 import os4 from "os";
-import { spawn as spawn14, spawnSync as spawnSync2 } from "child_process";
+function capture(cmd, args) {
+  return new Promise((resolve) => {
+    let stdout = "";
+    const child = spawn14(cmd, args, {
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    child.stdout.on("data", (c) => stdout += c.toString());
+    child.on("error", () => resolve({ stdout: "", code: -1 }));
+    child.on("exit", (code) => resolve({ stdout, code: code ?? -1 }));
+  });
+}
+async function windowsLanIpv4() {
+  if (!isWsl()) return null;
+  const psScript = "(Get-NetIPConfiguration | Where-Object { $_.IPv4DefaultGateway -ne $null -and $_.NetAdapter.Status -eq 'Up' } | Select-Object -First 1 -ExpandProperty IPv4Address).IPAddress";
+  const r = await capture("powershell.exe", [
+    "-NoProfile",
+    "-NonInteractive",
+    "-Command",
+    psScript
+  ]);
+  const ip = r.stdout.replace(/\r/g, "").trim().split(/\s+/)[0] ?? "";
+  return IPV4_RE3.test(ip) ? ip : null;
+}
+function localInterfacesInclude(ip) {
+  for (const list of Object.values(os4.networkInterfaces())) {
+    for (const addr of list ?? []) {
+      if (addr.family === "IPv4" && addr.address === ip) return true;
+    }
+  }
+  return false;
+}
+async function wslLanTarget() {
+  const lanIp = await windowsLanIpv4();
+  return {
+    lanIp,
+    mirrored: lanIp !== null && localInterfacesInclude(lanIp)
+  };
+}
+var IPV4_RE3;
+var init_wsl_networking = __esm({
+  "src/devcontainer/wsl-networking.ts"() {
+    "use strict";
+    init_ssh_attach();
+    IPV4_RE3 = /^(\d{1,3}\.){3}\d{1,3}$/;
+  }
+});
+
+// src/share/run.ts
+import os5 from "os";
+import { spawn as spawn15, spawnSync as spawnSync2 } from "child_process";
 import { consola as consola35 } from "consola";
 import { promises as fs22 } from "fs";
 import path34 from "path";
 function realHostAddresses() {
   let ip;
-  for (const list of Object.values(os4.networkInterfaces())) {
+  for (const list of Object.values(os5.networkInterfaces())) {
     for (const addr of list ?? []) {
       if (addr.family === "IPv4" && !addr.internal) {
         ip = addr.address;
@@ -12650,19 +12700,19 @@ function mdnsHostName() {
     const name = res.status === 0 ? res.stdout.trim() : "";
     if (name) return `${name}.local`;
   }
-  const hn = os4.hostname();
+  const hn = os5.hostname();
   return hn.endsWith(".local") ? hn : `${hn}.local`;
 }
 async function defaultEnsureImage(image, log) {
   const present = await new Promise((resolve) => {
-    const c = spawn14("docker", ["image", "inspect", image], { stdio: "ignore" });
+    const c = spawn15("docker", ["image", "inspect", image], { stdio: "ignore" });
     c.on("error", () => resolve(false));
     c.on("exit", (code) => resolve(code === 0));
   });
   if (present) return;
   log.info(dim(`Pulling ${image} (first run, one-time)\u2026`));
   await new Promise((resolve, reject) => {
-    const c = spawn14("docker", ["pull", "-q", image], {
+    const c = spawn15("docker", ["pull", "-q", image], {
       stdio: ["ignore", "ignore", "pipe"]
     });
     let err = "";
@@ -12715,7 +12765,14 @@ async function runShare(opts) {
   for (const port of ports) {
     await preflight({ port, address: SHARE_ADDRESS });
   }
-  const { ip, mdnsName } = (opts.hostAddresses ?? realHostAddresses)();
+  const { ip: rawIp, mdnsName } = (opts.hostAddresses ?? realHostAddresses)();
+  let ip = rawIp;
+  let wslNatUnreachable = false;
+  if (isWsl()) {
+    const t = await wslLanTarget();
+    if (t.lanIp) ip = t.lanIp;
+    wslNatUnreachable = t.lanIp !== null && !t.mirrored;
+  }
   const sans = [mdnsName, ip, "localhost", "127.0.0.1"].filter(
     (s) => typeof s === "string" && s.length > 0
   );
@@ -12742,19 +12799,8 @@ async function runShare(opts) {
   );
   const ensureImage = opts.ensureImage ?? ((image) => defaultEnsureImage(image, log));
   await ensureImage(CADDY_IMAGE);
-  const dockerSpawn = opts.dockerSpawn ?? defaultDockerSpawn;
-  const handles = [
-    dockerSpawn(
-      buildCaddyDockerArgs({
-        localAddress: SHARE_ADDRESS,
-        ports,
-        network: base.network,
-        certDir: tls.certDir,
-        caddyfilePath
-      })
-    )
-  ];
   const host = mdnsName ?? ip ?? "<host-ip>";
+  const caPath = await caTrustDisplayPath(tls.caCertPath, home);
   log.info(
     `Sharing ${opts.name}/${opts.app} on the local network (Ctrl+C to stop):`
   );
@@ -12768,12 +12814,34 @@ async function runShare(opts) {
       )
     );
   }
-  const caPath = await caTrustDisplayPath(tls.caCertPath, home);
   log.info(
     dim(
       `  First device? Trust the local CA once so HTTPS is warning-free: ${caPath}`
     )
   );
+  if (wslNatUnreachable) {
+    const warn = log.warn ?? log.info;
+    warn(
+      "WSL is in NAT mode, so the URL above is not reachable from other devices yet."
+    );
+    warn("Enable mirrored networking once, then re-run this command:");
+    warn("  1. add to %USERPROFILE%\\.wslconfig:");
+    warn("       [wsl2]");
+    warn("       networkingMode=mirrored");
+    warn("  2. run  wsl --shutdown  in PowerShell (closes your WSL sessions)");
+  }
+  const dockerSpawn = opts.dockerSpawn ?? defaultDockerSpawn;
+  const handles = [
+    dockerSpawn(
+      buildCaddyDockerArgs({
+        localAddress: SHARE_ADDRESS,
+        ports,
+        network: base.network,
+        certDir: tls.certDir,
+        caddyfilePath
+      })
+    )
+  ];
   const installSignalHandler = opts.installSignalHandler ?? installSigintDefault;
   let stopping = false;
   const uninstall = installSignalHandler(() => {
@@ -12801,6 +12869,7 @@ var init_run4 = __esm({
     init_caddy();
     init_paths();
     init_ssh_attach();
+    init_wsl_networking();
     init_format();
     SHARE_ADDRESS = "0.0.0.0";
   }