@reporting-bi/cli 0.1.14 → 0.1.16

package/dist/index.js

@@ -9315,6 +9315,7 @@ var require_dist = __commonJS({
 // src/commands/login.ts
 var http = __toESM(require("node:http"));
 var import_node_child_process2 = require("node:child_process");
+var readline = __toESM(require("node:readline"));
 
 // src/config.ts
 var fs2 = __toESM(require("node:fs"));
@@ -10397,23 +10398,67 @@ var callback_default = `<!DOCTYPE html>
 function renderCallback(status6, title, message) {
   return callback_default.replace("{{status}}", status6).replace("{{title}}", title).replace("{{message}}", message);
 }
-function openBrowser(url2) {
+function canOpenBrowser() {
+  const env = process.env;
+  if (process.platform === "linux" || process.platform === "freebsd" || process.platform === "openbsd") {
+    return !!(env.DISPLAY || env.WAYLAND_DISPLAY);
+  }
+  return !(env.SSH_CONNECTION || env.SSH_TTY);
+}
+function openBrowser(url2, onError) {
   const platform = process.platform;
   const cmd = platform === "darwin" ? "open" : platform === "win32" ? 'start ""' : "xdg-open";
-  (0, import_node_child_process2.exec)(`${cmd} ${JSON.stringify(url2)}`);
+  (0, import_node_child_process2.exec)(`${cmd} ${JSON.stringify(url2)}`, (err) => {
+    if (err) onError();
+  });
+}
+function parsePastedCode(input) {
+  const text2 = input.trim();
+  if (!text2) return {};
+  if (/[?&](code|error)=/.test(text2)) {
+    const params3 = new URL(text2, "http://localhost").searchParams;
+    return { code: params3.get("code") || void 0, error: params3.get("error") || void 0 };
+  }
+  return { code: text2 };
+}
+async function resolveDomain(domain2) {
+  let origin = new URL(domain2).origin;
+  for (let i = 0; i < 5; i++) {
+    let res;
+    try {
+      res = await fetch(`${origin}/auth/info`, { method: "HEAD", redirect: "manual" });
+    } catch {
+      return origin;
+    }
+    const location = res.headers.get("location");
+    if (res.status < 300 || res.status >= 400 || !location) return origin;
+    const next = new URL(location, origin).origin;
+    if (next === origin) return origin;
+    origin = next;
+  }
+  return origin;
 }
 async function login(args) {
   const { positional, flags } = parseArgs(args);
-  const domain2 = positional[0] || "https://reporting.bi";
+  const requested = positional[0] || "https://bi.reporting.eu";
+  const domain2 = await resolveDomain(requested);
   const accounting2 = flags.accounting ? parseInt(flags.accounting) : void 0;
-  console.log(`Logging in to ${domain2}...`);
-  const code = await getAuthorizationCode(domain2);
+  const port = flags.port ? parseInt(flags.port) : 0;
+  const browser = flags["no-browser"] !== "true" && canOpenBrowser();
+  console.log(`Logging in to ${domain2}${domain2 !== requested.replace(/\/+$/, "") ? ` (redirected from ${requested})` : ""}...`);
+  const code = await getAuthorizationCode(domain2, port, browser);
   if (!code) {
     console.error("Login cancelled or timed out.");
     process.exit(1);
   }
   const client = createAuthClient(domain2);
-  await client.authorize(code);
+  try {
+    await client.authorize(code);
+  } catch (e) {
+    const data = e.data;
+    console.error(`Login failed: ${data?.error_description || data?.error || e.message}${data?.status ? ` (HTTP ${data.status})` : ""}`);
+    process.exit(1);
+  }
   const credentials = await client.readCredentials();
   if (!credentials?.access_token) {
     console.error("Failed to obtain tokens.");
@@ -10440,12 +10485,17 @@ async function login(args) {
     console.log('No accounting set. Use "rpbi use <domain> --accounting <id>" to set one.');
   }
 }
-function getAuthorizationCode(domain2) {
+function getAuthorizationCode(domain2, port, browser) {
   return new Promise((resolve8) => {
     let timeout;
+    let rl;
+    let finished = false;
     const done = (result) => {
+      if (finished) return;
+      finished = true;
       clearTimeout(timeout);
       server.close();
+      rl?.close();
       resolve8(result);
     };
     const server = http.createServer((req, res) => {
@@ -10463,17 +10513,57 @@ function getAuthorizationCode(domain2) {
         res.end("Waiting for authentication...");
       }
     });
-    server.listen(0, "localhost", () => {
+    server.on("error", (err) => {
+      console.error(`Cannot listen for the login callback: ${err.message}`);
+      done(null);
+    });
+    server.listen(port, "localhost", () => {
       const address = server.address();
       if (!address || typeof address === "string") {
         done(null);
         return;
       }
-      const port = address.port;
-      const redirectUri = `http://localhost:${port}`;
+      const redirectUri = `http://localhost:${address.port}`;
       const authUrl = `${domain2}/auth?client_id=${CLIENT_ID}&redirect_uri=${encodeURIComponent(redirectUri)}`;
-      console.log(`Opening browser for authentication...`);
-      openBrowser(authUrl);
+      const printManual = () => {
+        console.log("Open this URL in a browser and sign in:");
+        console.log("");
+        console.log(`  ${authUrl}`);
+        console.log("");
+        if (process.stdin.isTTY) {
+          console.log(`The browser then goes to ${redirectUri}/?code=... - if that page does not load`);
+          console.log("(the browser runs on another machine), copy its whole address from the address bar");
+          console.log("and paste it here.");
+        }
+      };
+      if (browser) {
+        console.log("Opening browser for authentication...");
+        console.log(`If it does not open, visit: ${authUrl}`);
+        openBrowser(authUrl, () => {
+          console.log("Could not open a browser.");
+          printManual();
+        });
+      } else {
+        printManual();
+      }
+      if (process.stdin.isTTY) {
+        rl = readline.createInterface({ input: process.stdin, output: process.stdout, terminal: false });
+        rl.on("line", (line) => {
+          let pasted;
+          try {
+            pasted = parsePastedCode(line);
+          } catch {
+            console.error("Not a valid address, paste the whole URL from the address bar.");
+            return;
+          }
+          if (pasted.error) {
+            console.error(`Login failed: ${pasted.error}`);
+            done(null);
+          } else if (pasted.code) {
+            done(pasted.code);
+          }
+        });
+      }
     });
     timeout = setTimeout(() => done(null), 5 * 60 * 1e3);
   });
@@ -36588,7 +36678,7 @@ async function mcp() {
   setMcpMode();
   const server = new McpServer({
     name: "reporting-bi",
-    version: "0.1.14"
+    version: "0.1.16"
   });
   server.tool(
     "status",
@@ -37129,8 +37219,8 @@ async function checkForUpdate() {
     saveUpdateCheck({ lastCheck: now });
     const latest = await fetchLatestVersion();
     if (!latest) return;
-    if (!isNewer(latest, "0.1.14")) return;
-    console.error(`\x1B[33mUpdating ${PACKAGE_NAME} ${"0.1.14"} \u2192 ${latest}...\x1B[0m`);
+    if (!isNewer(latest, "0.1.16")) return;
+    console.error(`\x1B[33mUpdating ${PACKAGE_NAME} ${"0.1.16"} \u2192 ${latest}...\x1B[0m`);
     (0, import_node_child_process3.execSync)(npmInstallCmd(latest), { stdio: ["ignore", 2, 2] });
     console.error(`\x1B[32mUpdated to ${latest}.\x1B[0m`);
   } catch {
@@ -37142,11 +37232,11 @@ async function forceUpdate() {
     console.error("Could not fetch latest version from npm.");
     process.exit(1);
   }
-  if (!isNewer(latest, "0.1.14")) {
-    console.log(`Already up to date (${"0.1.14"}).`);
+  if (!isNewer(latest, "0.1.16")) {
+    console.log(`Already up to date (${"0.1.16"}).`);
     return;
   }
-  console.log(`Updating ${PACKAGE_NAME} ${"0.1.14"} \u2192 ${latest}...`);
+  console.log(`Updating ${PACKAGE_NAME} ${"0.1.16"} \u2192 ${latest}...`);
   (0, import_node_child_process3.execSync)(npmInstallCmd(latest), { stdio: "inherit" });
   console.log(`\x1B[32mUpdated to ${latest}.\x1B[0m`);
   saveUpdateCheck({ lastCheck: Date.now() });
@@ -37167,7 +37257,10 @@ pull removes local files deleted on the server (a locally modified file is kept)
 deletes on the server what was deleted locally \u2014 single files or whole folders.
 
 Commands:
-  login [domain] [--accounting <id>]    Login to a Reporting.bi instance (opens browser)
+  login [domain] [--accounting <id>] [--no-browser] [--port <n>]
+                                        Login to a Reporting.bi instance (opens browser; without a
+                                        display prints the URL - paste back the address the browser
+                                        ends at, or forward --port over SSH)
   logout [domain]                       Logout and revoke tokens (default: active connection)
   use <domain> [--accounting <id>]      Switch active connection and/or set accounting
   status [--json]                       Show all connections, token and session expiry
@@ -37284,12 +37377,12 @@ Global options:
   --filter <expression>                 Filter results (server-side where clause)
   --verbose                             Show API request URLs for debugging
 
-Default domain: https://reporting.bi
+Default domain: https://bi.reporting.eu
 Default language: cs
 
 Examples:
-  rpbi login https://reporting.bi --accounting 100000
-  rpbi use https://reporting.bi --accounting 100000
+  rpbi login https://bi.reporting.eu --accounting 100000
+  rpbi use https://bi.reporting.eu --accounting 100000
   rpbi status
 
   rpbi etl list
@@ -37337,7 +37430,7 @@ Examples:
 (async () => {
   const [command, ...args] = process.argv.slice(2);
   if (command === "--version" || command === "-v") {
-    console.log("0.1.14");
+    console.log("0.1.16");
     return;
   }
   await checkForUpdate();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reporting-bi/cli",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "license": "UNLICENSED",
   "description": "Reporting.bi CLI — command-line interface for the Reporting.bi platform",
   "main": "./dist/index.js",