@getmonoceros/workbench 1.38.6 → 1.38.8

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.6" : "dev";
+    CLI_VERSION = true ? "1.38.8" : "dev";
   }
 });
 
@@ -12587,6 +12587,12 @@ function renderCaddyfile(sites, certFile, keyFile) {
     "{",
     "	auto_https off",
     "	admin off",
+    // `share` is a foreground user command, not a server; Caddy's default
+    // info-level JSON (maxprocs, GOMEMLIMIT, "server running", autosave, …)
+    // is pure noise there. Keep only genuine errors.
+    "	log {",
+    "		level ERROR",
+    "	}",
     "	servers {",
     "		protocols h1 h2",
     "	}",
@@ -12619,7 +12625,7 @@ var init_caddy = __esm({
 
 // src/share/run.ts
 import os4 from "os";
-import { spawnSync as spawnSync2 } from "child_process";
+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";
@@ -12647,6 +12653,38 @@ function mdnsHostName() {
   const hn = os4.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" });
+    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], {
+      stdio: ["ignore", "ignore", "pipe"]
+    });
+    let err = "";
+    c.stderr?.on("data", (d) => err += d.toString());
+    c.on("error", reject);
+    c.on(
+      "exit",
+      (code) => code === 0 ? resolve() : reject(
+        new Error(
+          `docker pull ${image} failed: ${err.trim() || `exit ${code}`}`
+        )
+      )
+    );
+  });
+}
+async function caTrustDisplayPath(caCertPath, home) {
+  if (!isWsl()) return caCertPath;
+  const prof = await resolveWindowsProfile();
+  if (!prof) return caCertPath;
+  const rel = path34.relative(home, caCertPath).split(path34.sep).join("\\");
+  return `${prof.homeWin}\\.monoceros\\${rel}`;
+}
 async function runShare(opts) {
   const log = opts.logger ?? {
     info: (m) => consola35.info(m),
@@ -12702,19 +12740,10 @@ async function runShare(opts) {
     caddyfilePath,
     renderCaddyfile(sites, tls.certFile, tls.keyFile)
   );
-  const dockerSpawn = opts.dockerSpawn ?? defaultDockerSpawn;
-  const handles = [
-    dockerSpawn(
-      buildCaddyDockerArgs({
-        localAddress: SHARE_ADDRESS,
-        ports,
-        network: base.network,
-        certDir: tls.certDir,
-        caddyfilePath
-      })
-    )
-  ];
+  const ensureImage = opts.ensureImage ?? ((image) => defaultEnsureImage(image, log));
+  await ensureImage(CADDY_IMAGE);
   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):`
   );
@@ -12730,9 +12759,21 @@ async function runShare(opts) {
   }
   log.info(
     dim(
-      `  First device? Trust the local CA once so HTTPS is warning-free: ${tls.caCertPath}`
+      `  First device? Trust the local CA once so HTTPS is warning-free: ${caPath}`
     )
   );
+  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(() => {
@@ -12759,6 +12800,7 @@ var init_run4 = __esm({
     init_ca();
     init_caddy();
     init_paths();
+    init_ssh_attach();
     init_format();
     SHARE_ADDRESS = "0.0.0.0";
   }