@zuvo/cli 0.1.0 → 0.1.2

package/dist/login.js

@@ -12,11 +12,23 @@ const POLL_TIMEOUT_MS = 5 * 60 * 1000;
 async function openBrowser(url) {
     const platform = process.platform;
     if (platform === 'darwin') {
-        await execFileAsync('open', [url]);
-        return;
+        // `/usr/bin/open URL` can split on `&`, dropping `public_key`. `-u` treats
+        // the argument as one URL. AppleScript is the fallback on older macOS.
+        try {
+            await execFileAsync('open', ['-u', url]);
+            return;
+        }
+        catch {
+            await execFileAsync('osascript', [
+                '-e',
+                `open location ${JSON.stringify(url)}`,
+            ]);
+            return;
+        }
     }
     if (platform === 'win32') {
-        await execFileAsync('cmd', ['/c', 'start', '', url]);
+        // cmd.exe treats `&` as a command separator. Quote the URL as one argument.
+        await execFileAsync('cmd', ['/c', 'start', '', `"${url.replaceAll('"', '')}"`]);
         return;
     }
     await execFileAsync('xdg-open', [url]);
@@ -57,14 +69,29 @@ export async function loginWithToken(token) {
     }
     await saveAccessToken(trimmed);
 }
+export function packCliLoginPayload(opts) {
+    return Buffer.from(JSON.stringify({
+        session_id: opts.sessionId,
+        public_key: opts.publicKeyHex,
+        token_name: opts.tokenName,
+    }), 'utf8').toString('base64url');
+}
+export function buildCliLoginUrl(opts) {
+    const studio = opts.studioUrl.replace(/\/$/, '');
+    // A single query param so Windows `start`, macOS Terminal, and VS Code
+    // hyperlinks cannot truncate `public_key` at `&`.
+    return `${studio}/cli/login?p=${packCliLoginPayload(opts)}`;
+}
 export async function loginBrowser(opts) {
     const { ecdh, publicKeyHex } = generateLoginKeyPair();
     const sessionId = randomUUID();
     const tokenName = opts.tokenName || defaultTokenName();
-    const studio = studioUrlFromEnv(opts.studioUrl);
-    const loginUrl = `${studio}/cli/login?session_id=${encodeURIComponent(sessionId)}` +
-        `&public_key=${encodeURIComponent(publicKeyHex)}` +
-        `&token_name=${encodeURIComponent(tokenName)}`;
+    const loginUrl = buildCliLoginUrl({
+        studioUrl: studioUrlFromEnv(opts.studioUrl),
+        sessionId,
+        publicKeyHex,
+        tokenName,
+    });
     console.log('Open this URL to authorize the CLI:');
     console.log(loginUrl);
     if (opts.openBrowser) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuvo/cli",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "type": "module",
   "description": "Zuvo CLI — login, link, functions deploy, and db push",
   "license": "MIT",