@malloydata/malloyyo 0.2.39 → 0.2.40

package/dist/index.js

@@ -2881,7 +2881,7 @@ function clearCreds(url6) {
 }
 
 // package.json
-var version = "0.2.39";
+var version = "0.2.40";
 
 // src/http.ts
 var USER_AGENT = `malloyyo/${version}`;
@@ -2928,15 +2928,34 @@ async function registerClient(registrationEndpoint, redirectUri) {
   if (!res.ok) throw new Error(`client registration failed: ${res.status} ${await res.text()}`);
   return (await res.json()).client_id;
 }
+function browserless(platform = process.platform, env = process.env) {
+  if (platform === "darwin" || platform === "win32") return false;
+  return !env.DISPLAY && !env.WAYLAND_DISPLAY;
+}
 function openBrowser(url6) {
   const [cmd, args] = process.platform === "darwin" ? ["open", [url6]] : process.platform === "win32" ? ["cmd", ["/c", "start", "", url6]] : ["xdg-open", [url6]];
   try {
-    spawn(cmd, args, { stdio: "ignore", detached: true }).unref();
+    const child = spawn(cmd, args, { stdio: "ignore", detached: true });
+    child.on("error", () => {
+    });
+    child.unref();
   } catch {
   }
 }
+function listenTarget(env = process.env) {
+  const raw = env.MALLOYYO_OAUTH_PORT;
+  let port = 0;
+  if (raw !== void 0 && raw !== "") {
+    port = Number(raw);
+    if (!Number.isInteger(port) || port < 1 || port > 65535) {
+      throw new Error(`MALLOYYO_OAUTH_PORT must be a port number between 1 and 65535, got "${raw}"`);
+    }
+  }
+  return { host: env.MALLOYYO_OAUTH_HOST || "127.0.0.1", port };
+}
 function awaitRedirect(state) {
-  return new Promise((resolveServer) => {
+  return new Promise((resolveServer, rejectServer) => {
+    const { host, port: wanted } = listenTarget();
     let resolveCode;
     let rejectCode;
     const code = new Promise((res, rej) => {
@@ -2961,13 +2980,33 @@ function awaitRedirect(state) {
       if (ok) resolveCode(got);
       else rejectCode(new Error(err ?? "state mismatch or missing code"));
     });
-    server.listen(0, "127.0.0.1", () => {
+    let listening = false;
+    server.on("error", (err) => {
+      clearTimeout(timer);
+      const detail = err.code === "EADDRINUSE" ? `${host}:${wanted} is already in use \u2014 set MALLOYYO_OAUTH_PORT to a free port` : err.message;
+      const failure = new Error(`could not start the sign-in listener: ${detail}`);
+      rejectCode(failure);
+      if (!listening) {
+        void code.catch(() => {
+        });
+        rejectServer(failure);
+      }
+    });
+    server.listen(wanted, host, () => {
+      listening = true;
       const port = server.address().port;
-      resolveServer({ port, code, close: () => server.close() });
+      resolveServer({
+        port,
+        code,
+        close: () => {
+          clearTimeout(timer);
+          server.close();
+        }
+      });
     });
   });
 }
-async function login(baseUrl) {
+async function login(baseUrl, opts = {}) {
   const ep = await discover(baseUrl);
   const { verifier, challenge } = pkce();
   const state = crypto.randomBytes(16).toString("base64url");
@@ -2985,11 +3024,24 @@ async function login(baseUrl) {
       scope: "mcp",
       state
     }).toString();
-    console.log("Opening your browser to sign in\u2026");
-    console.log(`If it doesn't open, visit:
+    if (opts.noBrowser || browserless()) {
+      console.log(`Visit this URL to sign in:
+
   ${authUrl.toString()}
 `);
-    openBrowser(authUrl.toString());
+      if (!process.env.MALLOYYO_OAUTH_PORT) {
+        console.log(
+          "Note: sign-in redirects back to this machine on a random port.\n  In a container, set MALLOYYO_OAUTH_PORT and MALLOYYO_OAUTH_HOST=0.0.0.0,\n  and publish that port, so the browser can reach the redirect.\n"
+        );
+      }
+      console.log("Waiting for sign-in to complete\u2026");
+    } else {
+      console.log("Opening your browser to sign in\u2026");
+      console.log(`If it doesn't open, visit:
+  ${authUrl.toString()}
+`);
+      openBrowser(authUrl.toString());
+    }
     const authCode = await code;
     const res = await apiFetch(ep.token_endpoint, {
       method: "POST",
@@ -5389,9 +5441,9 @@ async function status(target, opts) {
   console.log(`  version ${s.version ?? "?"}` + (git?.sha ? `  ${git.branch}@${shortSha(git.sha)}` : ""));
   console.log(`  ${s.compileError ? `\u2717 ${s.compileError}` : `\u2713 compiled ${s.compiledAt ?? ""}`}`);
 }
-async function loginCmd(target) {
+async function loginCmd(target, opts) {
   const inst = resolveInstance(resolve3("."), target);
-  await login(inst.url);
+  await login(inst.url, { noBrowser: opts.browser === false });
   console.log(`\u2713 logged in to ${inst.name} (${inst.url})`);
 }
 async function logoutCmd(target) {
@@ -5400,7 +5452,7 @@ async function logoutCmd(target) {
 }
 var program = new Command();
 program.name("malloyyo").description("Publish Malloy models to a Malloyyo instance").version(version);
-program.command("login").argument("[target]", "target name or instance URL (optional if the config has one target)").description("sign in to an instance in your browser (stores a token)").action(loginCmd);
+program.command("login").argument("[target]", "target name or instance URL (optional if the config has one target)").option("--no-browser", "print the sign-in URL instead of launching a browser").description("sign in to an instance in your browser (stores a token)").action(loginCmd);
 program.command("logout").argument("[target]", "target name or instance URL (optional if the config has one target)").description("forget the stored token for an instance").action(logoutCmd);
 program.command("publish").argument(
   "[target]",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloyyo",
-  "version": "0.2.39",
+  "version": "0.2.40",
   "description": "Publish Malloy models to a Malloyyo instance",
   "license": "MIT",
   "repository": {