@getmonoceros/workbench 1.38.15 → 1.38.17

package/dist/bin.js

@@ -1977,17 +1977,19 @@ async function ensureProxy(opts = {}) {
 async function maybeStopProxy(opts = {}) {
   const docker = opts.docker ?? realDocker;
   const logger = opts.logger;
-  const inspect = await docker([
-    "network",
-    "inspect",
-    PROXY_NETWORK_NAME,
-    "--format",
-    "{{range $k, $v := .Containers}}{{$v.Name}}\n{{end}}"
-  ]);
+  const inspect = await docker(["network", "inspect", PROXY_NETWORK_NAME]);
   if (inspect.exitCode !== 0) {
     return;
   }
-  const others = inspect.stdout.split("\n").map((n) => n.trim()).filter((n) => n.length > 0 && n !== PROXY_CONTAINER_NAME);
+  const attached = await docker([
+    "ps",
+    "-a",
+    "--filter",
+    `network=${PROXY_NETWORK_NAME}`,
+    "--format",
+    "{{.Names}}"
+  ]);
+  const others = attached.stdout.split("\n").map((n) => n.trim()).filter((n) => n.length > 0 && n !== PROXY_CONTAINER_NAME);
   if (others.length > 0) return;
   await docker(["rm", "-f", PROXY_CONTAINER_NAME]);
   const netRm = await docker(["network", "rm", PROXY_NETWORK_NAME]);
@@ -2859,6 +2861,21 @@ async function resolveWindowsProfile() {
     return null;
   }
 }
+async function resolveWindowsLanIp() {
+  if (!isWsl()) return null;
+  try {
+    const r = await runCapture("powershell.exe", [
+      "-NoProfile",
+      "-Command",
+      '(Get-NetIPConfiguration | ? { $_.IPv4DefaultGateway -and $_.NetAdapter.Status -eq "Up" } | Select-Object -First 1 -ExpandProperty IPv4Address).IPAddress'
+    ]);
+    if (r.exitCode !== 0) return null;
+    const ip = r.stdout.replace(/\r/g, "").trim();
+    return /^\d{1,3}(\.\d{1,3}){3}$/.test(ip) ? ip : null;
+  } catch {
+    return null;
+  }
+}
 async function realLockWindowsKey(winKeyPath, user) {
   await runCapture("icacls.exe", [
     winKeyPath,
@@ -9053,7 +9070,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.38.15" : "dev";
+    CLI_VERSION = true ? "1.38.17" : "dev";
   }
 });
 
@@ -12763,7 +12780,9 @@ async function runShare(opts) {
   for (const port of ports) {
     await preflight({ port, address: SHARE_ADDRESS });
   }
-  const { ip, mdnsName } = (opts.hostAddresses ?? realHostAddresses)();
+  const { ip: localIp, mdnsName } = (opts.hostAddresses ?? realHostAddresses)();
+  const winLanIp = await (opts.resolveWindowsLanIp ?? resolveWindowsLanIp)();
+  const ip = winLanIp ?? localIp;
   const sans = [mdnsName, ip, "localhost", "127.0.0.1"].filter(
     (s) => typeof s === "string" && s.length > 0
   );
@@ -12790,20 +12809,18 @@ async function runShare(opts) {
   );
   const ensureImage = opts.ensureImage ?? ((image) => defaultEnsureImage(image, log));
   await ensureImage(CADDY_IMAGE);
-  const host = mdnsName ?? ip ?? "<host-ip>";
+  const addresses = [ip, mdnsName].filter(
+    (a) => typeof a === "string" && a.length > 0
+  );
+  if (addresses.length === 0) addresses.push("<host-ip>");
   const caPath = await caTrustDisplayPath(tls.caCertPath, home);
   log.info(
     `Sharing ${opts.name}/${opts.app} on the local network (Ctrl+C to stop):`
   );
   for (const t of ported) {
-    log.info(`  ${cyan2(t.name)}  https://${host}:${t.port}`);
-  }
-  if (mdnsName && ip) {
-    log.info(
-      dim(
-        `  also reachable as https://${ip}:<port> if .local does not resolve`
-      )
-    );
+    for (const addr of addresses) {
+      log.info(`  ${cyan2(t.name)}  https://${addr}:${t.port}`);
+    }
   }
   log.info(
     dim(