@nlxai/cli 1.2.2-alpha.9 → 1.2.3-alpha.0

package/lib/commands/auth/login.js

@@ -4,22 +4,28 @@ import open from "open";
 import * as os from "os";
 import * as path from "path";
 import { consola } from "consola";
+import { singleton } from "../../utils/index.js";
 export const ACCOUNTS_PATH = path.join(os.homedir(), ".nlx-cli-auth.json");
 let _keytar;
-async function getKeytar() {
+export async function getKeytar() {
     if (_keytar)
         return _keytar;
-    _keytar = await import("keytar");
+    _keytar = (await import("keytar")).default;
     return _keytar;
 }
 async function saveTokens(account, tokenData) {
-    const keytar = await getKeytar();
-    await keytar.setPassword("nlx-cli", account, JSON.stringify(tokenData));
+    if (!process.env.NLX_ACCESS_TOKEN) {
+        const keytar = await getKeytar();
+        await keytar.setPassword("nlx-cli", account, JSON.stringify(tokenData));
+    }
+    else {
+        process.env.NLX_ACCESS_TOKEN = btoa(JSON.stringify([account, tokenData]));
+    }
 }
 async function loadTokens() {
     if (process.env.NLX_ACCESS_TOKEN) {
         try {
-            console.log("Using access token from NLX_ACCESS_TOKEN environment variable");
+            consola.info("Using access token from NLX_ACCESS_TOKEN environment variable");
             return JSON.parse(atob(process.env.NLX_ACCESS_TOKEN));
         }
         catch (error) {
@@ -41,7 +47,7 @@ async function loadTokens() {
         throw new Error("Failed to load tokens");
     }
 }
-async function refreshTokenIfNeeded() {
+const refreshTokenIfNeeded = singleton(async function () {
     let account, tokens;
     try {
         [account, tokens] = await loadTokens();
@@ -79,7 +85,7 @@ async function refreshTokenIfNeeded() {
         return newTokens.access_token;
     }
     return null;
-}
+});
 const AUTH0_DOMAIN = process.env.AUTH0_DOMAIN || "nlxdev.us.auth0.com"; // e.g. 'dev-xxxxxx.us.auth0.com'
 const CLIENT_ID = process.env.AUTH0_CLIENT_ID || "A0qluq7wJQjFjMLle9pvrWWaVHM1QHE3";
 const AUDIENCE = process.env.AUTH0_AUDIENCE || "https://nlxdev.us.auth0.com/api/v2/";
@@ -151,11 +157,10 @@ export const loginCommand = new Command("login")
     tokenData.obtained_at = Math.floor(Date.now() / 1000);
     await saveTokens(userData.email, tokenData);
     if (opts.printToken) {
-        console.log("Access token", btoa(JSON.stringify([userData.email, tokenData])));
+        consola.success("Access token", btoa(JSON.stringify([userData.email, tokenData])));
     }
     consola.success("Login successful! Access token stored securely.");
 });
-// Example usage: get a valid access token
 export async function ensureToken() {
     const accessToken = await refreshTokenIfNeeded();
     if (!accessToken) {

package/lib/commands/auth/logout.js

@@ -1,7 +1,6 @@
 import { Command } from "commander";
 import { consola } from "consola";
-import { ACCOUNTS_PATH } from "./login.js";
-import keytar from "keytar";
+import { ACCOUNTS_PATH, getKeytar } from "./login.js";
 import * as fs from "fs";
 export const logoutCommand = new Command("logout")
     .description("Clear stored authentication tokens")
@@ -13,6 +12,7 @@ export const logoutCommand = new Command("logout")
             accounts = JSON.parse(data);
         }
         if (accounts.currentAccount) {
+            const keytar = await getKeytar();
             await keytar.deletePassword("nlx-cli", accounts.currentAccount);
             accounts.accounts = accounts.accounts.filter((acc) => acc !== accounts.currentAccount);
             if (accounts.accounts.length > 0) {

package/lib/utils/index.js

@@ -20,3 +20,14 @@ export const fetchManagementApi = async (path, method = "GET", body) => {
     consola.debug("Response:", JSON.stringify(result));
     return result;
 };
+export const singleton = (fn) => {
+    let running = null;
+    return async () => {
+        if (!running) {
+            running = fn().finally(() => {
+                running = null;
+            });
+        }
+        return running;
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nlxai/cli",
-  "version": "1.2.2-alpha.9",
+  "version": "1.2.3-alpha.0",
   "description": "Tools for integrating with NLX apps",
   "keywords": [
     "NLX",
@@ -58,5 +58,5 @@
     "@vitest/ui": "^3.2.4",
     "vitest": "^3.2.4"
   },
-  "gitHead": "690c384cd98ec1fba1811e6913c8c5a5b498bd59"
+  "gitHead": "2e39f684bb39b0ccbed58486a4f82f93693218ca"
 }