npm - @getmonoceros/workbench - Versions diffs - 1.19.1 → 1.19.2 - Mend

@getmonoceros/workbench 1.19.1 → 1.19.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/bin.js CHANGED Viewed

@@ -3259,8 +3259,8 @@ function removeRepoFromDoc(doc, urlOrPath) {
     if (!isMap2(item)) return false;
     const url = item.get("url");
     if (url === urlOrPath) return true;
-    const path24 = item.get("path");
-    const effectivePath = typeof path24 === "string" ? path24 : typeof url === "string" ? deriveRepoName(url) : void 0;
+    const path25 = item.get("path");
+    const effectivePath = typeof path25 === "string" ? path25 : typeof url === "string" ? deriveRepoName(url) : void 0;
     return effectivePath === urlOrPath;
   });
   if (idx < 0) return false;
@@ -3372,7 +3372,7 @@ async function runAddRepo(input) {
       "Missing repo URL. Usage: monoceros add-repo <containername> <url>."
     );
   }
-  const path24 = (input.path ?? deriveRepoName(url)).trim();
+  const path25 = (input.path ?? deriveRepoName(url)).trim();
   const hasName = typeof input.gitName === "string" && input.gitName.trim().length > 0;
   const hasEmail = typeof input.gitEmail === "string" && input.gitEmail.trim().length > 0;
   if (hasName !== hasEmail) {
@@ -3409,7 +3409,7 @@ async function runAddRepo(input) {
   const providerToWrite = !canonical && explicitProvider ? explicitProvider : void 0;
   const entry2 = {
     url,
-    path: path24,
+    path: path25,
     ...hasName && hasEmail ? {
       gitUser: {
         name: input.gitName.trim(),
@@ -6407,7 +6407,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.19.1" : "dev";
+    CLI_VERSION = true ? "1.19.2" : "dev";
   }
 });
@@ -9004,7 +9004,118 @@ var init_remove_service = __esm({
   }
 });
+// src/devcontainer/browser-bridge.ts
+import { spawn as spawn10 } from "child_process";
+import { existsSync as existsSync15, promises as fsp3, readFileSync as readFileSync7 } from "fs";
+import http2 from "http";
+import path23 from "path";
+function openInBrowser2(url) {
+  const platform = process.platform;
+  const [cmd, args] = platform === "darwin" ? ["open", [url]] : platform === "win32" ? ["cmd", ["/c", "start", "", url]] : ["xdg-open", [url]];
+  try {
+    const child = spawn10(cmd, args, {
+      stdio: "ignore",
+      detached: true
+    });
+    child.on("error", () => {
+    });
+    child.unref();
+  } catch {
+  }
+}
+async function startBrowserBridge(opts) {
+  const relayDir = path23.join(opts.root, RELAY_DIRNAME2);
+  const relayScript = path23.join(relayDir, "xdg-open");
+  const urlFile = path23.join(relayDir, "url");
+  await fsp3.mkdir(relayDir, { recursive: true });
+  await fsp3.rm(urlFile, { force: true });
+  await fsp3.writeFile(
+    relayScript,
+    `#!/bin/sh
+printf '%s\\n' "$1" > "$(dirname "$0")/url"
+exit 0
+`,
+    { mode: 493 }
+  );
+  await fsp3.chmod(relayScript, 493);
+  const servers = [];
+  let handled = false;
+  const onUrl = (url) => {
+    openInBrowser2(url);
+    const target = parseCallbackTarget(url);
+    if (!target) return;
+    const server = http2.createServer((req, res) => {
+      const reqUrl = req.url ?? target.pathname;
+      res.writeHead(200, { "content-type": "text/html; charset=utf-8" });
+      res.end(
+        '<html><body style="font-family:sans-serif;padding:3rem">You are signed in. You can close this tab and return to the terminal.</body></html>'
+      );
+      void opts.spawn(
+        [
+          "exec",
+          "--workspace-folder",
+          opts.root,
+          "--mount-workspace-git-root=false",
+          "curl",
+          "-fsS",
+          `http://localhost:${target.port}${reqUrl}`
+        ],
+        opts.root,
+        { quiet: true }
+      );
+    });
+    server.on("error", () => {
+    });
+    server.listen(target.port, "127.0.0.1");
+    servers.push(server);
+  };
+  const poll = setInterval(() => {
+    if (handled || !existsSync15(urlFile)) return;
+    let content = "";
+    try {
+      content = readFileSync7(urlFile, "utf8");
+    } catch {
+      return;
+    }
+    if (!content.trim()) return;
+    handled = true;
+    onUrl(content.trim());
+  }, 250);
+  return {
+    relayDirInContainer: `/workspaces/${opts.name}/${RELAY_DIRNAME2}`,
+    async dispose() {
+      clearInterval(poll);
+      for (const s of servers) s.close();
+      await fsp3.rm(relayDir, { recursive: true, force: true });
+    }
+  };
+}
+var RELAY_DIRNAME2;
+var init_browser_bridge = __esm({
+  "src/devcontainer/browser-bridge.ts"() {
+    "use strict";
+    init_services();
+    RELAY_DIRNAME2 = ".monoceros-bridge";
+  }
+});
 // src/devcontainer/run.ts
+function wrapExec(command, opts) {
+  const leading = [];
+  const stmts = [];
+  if (opts.pathPrepend) {
+    leading.push(opts.pathPrepend);
+    stmts.push(`export PATH="$${leading.length}:$PATH"`);
+  }
+  if (opts.cwd) {
+    leading.push(opts.cwd);
+    stmts.push(`cd -- "$${leading.length}"`);
+  }
+  if (leading.length === 0) return command;
+  const shift = leading.length === 1 ? "shift" : `shift ${leading.length}`;
+  const script = `${stmts.join(" && ")} && ${shift} && exec "$@"`;
+  return ["bash", "-lc", script, "bash", ...leading, ...command];
+}
 async function runInContainer(opts) {
   if (opts.command.length === 0) {
     throw new Error(
@@ -9019,29 +9130,35 @@ async function runInContainer(opts) {
     { quiet: true }
   );
   if (upCode !== 0) return upCode;
-  const innerExec = opts.cwd ? [
-    "bash",
-    "-lc",
-    'cd -- "$1" && shift && exec "$@"',
-    "bash",
-    opts.cwd,
-    ...opts.command
-  ] : opts.command;
-  return spawnFn(
-    [
-      "exec",
-      "--workspace-folder",
+  const bridge = opts.name && process.stdout.isTTY ? await startBrowserBridge({
+    name: opts.name,
+    root: opts.root,
+    spawn: spawnFn
+  }) : null;
+  try {
+    const innerExec = wrapExec(opts.command, {
+      ...bridge ? { pathPrepend: bridge.relayDirInContainer } : {},
+      ...opts.cwd ? { cwd: opts.cwd } : {}
+    });
+    return await spawnFn(
+      [
+        "exec",
+        "--workspace-folder",
+        opts.root,
+        "--mount-workspace-git-root=false",
+        ...innerExec
+      ],
       opts.root,
-      "--mount-workspace-git-root=false",
-      ...innerExec
-    ],
-    opts.root,
-    { interactive: true }
-  );
+      { interactive: true }
+    );
+  } finally {
+    if (bridge) await bridge.dispose();
+  }
 }
 var init_run = __esm({
   "src/devcontainer/run.ts"() {
     "use strict";
+    init_browser_bridge();
     init_cli();
     init_shell();
   }
@@ -9085,6 +9202,7 @@ var init_run2 = __esm({
         try {
           const exitCode = await runInContainer({
             root: containerDir(args.name),
+            name: args.name,
             command,
             ...args.in ? { cwd: args.in } : {}
           });
@@ -9276,11 +9394,11 @@ var init_stop = __esm({
 });
 // src/tunnel/resolve.ts
-import { existsSync as existsSync15 } from "fs";
-import path23 from "path";
+import { existsSync as existsSync16 } from "fs";
+import path24 from "path";
 async function resolveTunnelTarget(opts) {
   const ymlPath = containerConfigPath(opts.name, opts.monocerosHome);
-  if (!existsSync15(ymlPath)) {
+  if (!existsSync16(ymlPath)) {
     throw new Error(
       `No yml profile for '${opts.name}' at ${ymlPath}. Run \`monoceros init ${opts.name}\` first.`
     );
@@ -9288,13 +9406,13 @@ async function resolveTunnelTarget(opts) {
   const parsed = await readConfig(ymlPath);
   const config = parsed.config;
   const containerRoot = containerDir(opts.name, opts.monocerosHome);
-  if (!existsSync15(containerRoot)) {
+  if (!existsSync16(containerRoot)) {
     throw new Error(
       `Container '${opts.name}' is not materialised at ${containerRoot}. Run \`monoceros apply ${opts.name}\` first.`
     );
   }
-  const composePath = path23.join(containerRoot, ".devcontainer", "compose.yaml");
-  const isCompose = existsSync15(composePath);
+  const composePath = path24.join(containerRoot, ".devcontainer", "compose.yaml");
+  const isCompose = existsSync16(composePath);
   const parsedTarget = parseTargetArg(opts.target, config);
   const docker = opts.docker ?? defaultDockerExec;
   if (isCompose) {
@@ -9529,7 +9647,7 @@ var init_port_check2 = __esm({
 });
 // src/tunnel/run.ts
-import { spawn as spawn10 } from "child_process";
+import { spawn as spawn11 } from "child_process";
 import { consola as consola34 } from "consola";
 function signalNumber(signal) {
   switch (signal) {
@@ -9619,7 +9737,7 @@ var init_run3 = __esm({
     init_port_check2();
     SOCAT_IMAGE = "alpine/socat:1.8.0.3";
     defaultDockerSpawn = (args) => {
-      const child = spawn10("docker", args, {
+      const child = spawn11("docker", args, {
         stdio: "inherit"
       });
       const exited = new Promise((resolve, reject) => {
@@ -9713,7 +9831,7 @@ var init_tunnel = __esm({
 });
 // src/upgrade/index.ts
-import { existsSync as existsSync16, promises as fs17 } from "fs";
+import { existsSync as existsSync17, promises as fs17 } from "fs";
 import { consola as consola36 } from "consola";
 async function fetchRuntimeVersions() {
   const tokenUrl = `https://ghcr.io/token?service=ghcr.io&scope=repository:${RUNTIME_REPO}:pull`;
@@ -9772,7 +9890,7 @@ async function runUpgrade(opts) {
     );
   }
   const ymlPath = containerConfigPath(opts.name, home);
-  if (!existsSync16(ymlPath)) {
+  if (!existsSync17(ymlPath)) {
     throw new Error(
       `No such config: ${ymlPath}. Run \`monoceros init <template> ${opts.name}\` first.`
     );
@@ -10204,25 +10322,25 @@ function detectHelpRequest(argv, main2) {
   const separatorIdx = argv.indexOf("--");
   if (helpIdx === -1) return null;
   if (separatorIdx !== -1 && separatorIdx < helpIdx) return null;
-  const path24 = [];
+  const path25 = [];
   const tokens = argv.slice(
     0,
     separatorIdx === -1 ? argv.length : separatorIdx
   );
   let cursor = main2;
   const mainName = (main2.meta ?? {}).name ?? "monoceros";
-  path24.push(mainName);
+  path25.push(mainName);
   for (const tok of tokens) {
     if (tok.startsWith("-")) continue;
     const subs = cursor.subCommands ?? {};
     if (tok in subs) {
       cursor = subs[tok];
-      path24.push(tok);
+      path25.push(tok);
       continue;
     }
     break;
   }
-  return { path: path24, cmd: cursor };
+  return { path: path25, cmd: cursor };
 }
 async function maybeRenderHelp(argv, main2) {
   const hit = detectHelpRequest(argv, main2);