@overscore/cli 0.11.2 → 0.11.4

package/dist/index.js

@@ -74,7 +74,7 @@ async function loadEnv() {
     process.exit(0);
 }
 async function apiRequest(method, urlPath, body, command) {
-    const { apiUrl, apiKey } = await loadEnv();
+    const { apiUrl, apiKey, projectSlug } = await loadEnv();
     const baseUrl = apiUrl.replace(/\/api$/, "");
     const url = `${baseUrl}${urlPath}`;
     const headers = {
@@ -92,6 +92,23 @@ async function apiRequest(method, urlPath, body, command) {
         body: body !== undefined ? JSON.stringify(body) : undefined,
     });
     const data = await res.json();
+    if (res.status === 401 && projectSlug) {
+        console.log("\n  API key expired. Refreshing...\n");
+        const newKey = await refreshApiKey(projectSlug);
+        if (newKey) {
+            const retryRes = await fetch(url, {
+                method,
+                headers: { ...headers, Authorization: `Bearer ${newKey}` },
+                body: body !== undefined ? JSON.stringify(body) : undefined,
+            });
+            const retryData = await retryRes.json();
+            if (!retryRes.ok) {
+                console.error(`\n  Error: ${retryData.error || `HTTP ${retryRes.status}`}\n`);
+                process.exit(1);
+            }
+            return retryData;
+        }
+    }
     if (!res.ok) {
         console.error(`\n  Error: ${data.error || `HTTP ${res.status}`}\n`);
         process.exit(1);
@@ -116,6 +133,58 @@ function prompt(message) {
         });
     });
 }
+async function refreshApiKey(projectSlug) {
+    const configDir = path.join(process.env.HOME || "", ".overscore");
+    const configPath = path.join(configDir, "config");
+    let cfg = fs.existsSync(configPath)
+        ? parseEnv(fs.readFileSync(configPath, "utf-8"))
+        : {};
+    let deviceToken = cfg.OVERSCORE_DEVICE_TOKEN;
+    if (!deviceToken) {
+        console.log("\n  No session found. Launching browser login...\n");
+        await authLogin();
+        cfg = parseEnv(fs.readFileSync(configPath, "utf-8"));
+        deviceToken = cfg.OVERSCORE_DEVICE_TOKEN;
+        if (!deviceToken)
+            return null;
+    }
+    for (let attempt = 0; attempt < 2; attempt++) {
+        const keyRes = await fetch(`${HUB_URL}/api/projects/${projectSlug}/api-keys`, {
+            method: "POST",
+            headers: { Authorization: `Bearer ${deviceToken}`, "Content-Type": "application/json" },
+            body: JSON.stringify({ name: `cli-${Date.now()}` }),
+        });
+        if (keyRes.ok) {
+            const data = (await keyRes.json());
+            const newKey = data.raw_key;
+            if (!newKey)
+                return null;
+            // Update local .env if present
+            const envPath = path.resolve(process.cwd(), ".env");
+            if (fs.existsSync(envPath)) {
+                const envContent = fs.readFileSync(envPath, "utf-8");
+                fs.writeFileSync(envPath, envContent.replace(/^VITE_OVERSCORE_API_KEY=.*/m, `VITE_OVERSCORE_API_KEY=${newKey}`));
+            }
+            // Update global config
+            cfg.OVERSCORE_API_KEY = newKey;
+            fs.mkdirSync(configDir, { recursive: true });
+            fs.writeFileSync(configPath, Object.entries(cfg).map(([k, v]) => `${k}=${v}`).join("\n") + "\n", { mode: 0o600 });
+            console.log("  API key refreshed.\n");
+            return newKey;
+        }
+        if ((keyRes.status === 401 || keyRes.status === 403) && attempt === 0) {
+            console.log("\n  Session expired. Launching browser login...\n");
+            await authLogin();
+            cfg = parseEnv(fs.readFileSync(configPath, "utf-8"));
+            deviceToken = cfg.OVERSCORE_DEVICE_TOKEN;
+            if (!deviceToken)
+                return null;
+            continue;
+        }
+        return null;
+    }
+    return null;
+}
 const SOURCE_EXCLUDE = new Set([
     "node_modules",
     "dist",
@@ -2001,7 +2070,7 @@ async function authLogin() {
         resolveCallback({ token, project });
     });
     server.listen(chosenPort, "127.0.0.1");
-    const loginUrl = `${HUB_URL}/login?next=${encodeURIComponent(`/api/cli/auth/finalize?port=${chosenPort}&state=${state}`)}&mode=signin`;
+    const loginUrl = `${HUB_URL}/login?next=${encodeURIComponent(`/api/cli/auth/finalize?port=${chosenPort}&state=${state}`)}&mode=signin&switch=1`;
     console.log(`\n  Opening browser to authenticate...`);
     console.log(`\n  If your browser doesn't open automatically, visit:\n  ${loginUrl}\n`);
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@overscore/cli",
-  "version": "0.11.2",
+  "version": "0.11.4",
   "description": "CLI for deploying Overscore dashboards and publishing analyses",
   "bin": {
     "overscore": "dist/index.js"