trainfabric 0.1.2 → 0.1.3

package/dist/index.cjs

@@ -3462,6 +3462,7 @@ var import_node_http = __toESM(require("node:http"), 1);
 var import_node_os2 = __toESM(require("node:os"), 1);
 var import_node_path3 = __toESM(require("node:path"), 1);
 var import_node_child_process = require("node:child_process");
+var import_promises2 = require("node:timers/promises");
 
 // ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/esm.mjs
 var import_index = __toESM(require_commander(), 1);
@@ -8890,11 +8891,61 @@ function buildComputeSpec(options) {
 
 // src/index.ts
 var DEFAULT_TRAINFABRIC_API_URL2 = "https://api.trainfabric.com";
-var CLI_VERSION = "0.1.2";
+var CLI_VERSION = "0.1.3";
 var CONFIG_DIR = import_node_path3.default.join(import_node_os2.default.homedir(), ".trainfabric");
 var CONFIG_PATH = import_node_path3.default.join(CONFIG_DIR, "config.json");
 var FALLBACK_SECRET_PATH = import_node_path3.default.join(CONFIG_DIR, "session.enc");
 var KEYCHAIN_SERVICE = "trainfabric-cli";
+function printLoginBanner() {
+  const logo = [
+    "  _______                __       _               _   _                ____    _____",
+    " |__   __|              [  |     (_)             | | (_)              / __ \\  |_   _|",
+    "    | |_ __ _   _ _ __  | | ____ _ _ __  _ __   | |_ _  __ _ _ __   | |  | |  | |  ",
+    "    | | '__| | | | '_ \\ | |/ / _` | '_ \\| '_ \\  | __| |/ _` | '_ \\  | |  | |  | |  ",
+    "    | | |  | |_| | | | ||   < (_| | |_) | |_) | | |_| | (_| | | | | | |__| |_ | |  ",
+    "    |_|_|   \\__,_|_| |_| |_|\\_\\| .__/| .__/   \\__|_|\\__,_|_| |_|  \\____/|_____|",
+    "                                  | |   | |                                     "
+  ];
+  console.log("");
+  for (const row of logo) {
+    console.log(row);
+  }
+  console.log("   TrainFabric CLI Login");
+  console.log("");
+}
+function sleep(ms) {
+  return (0, import_promises2.setTimeout)(ms);
+}
+async function runSpinnerUntil(label, action) {
+  const frames = ["/", "-", "\\", "|"];
+  let i = 0;
+  const timer = setInterval(() => {
+    process.stdout.write(`\r${frames[i++ % frames.length]} ${label}`);
+  }, 90);
+  try {
+    const result = await action();
+    clearInterval(timer);
+    process.stdout.write(`\r[ok] ${label}... done${" ".repeat(16)}
+`);
+    return result;
+  } catch (error) {
+    clearInterval(timer);
+    process.stdout.write(`\r[x] ${label} failed${" ".repeat(16)}
+`);
+    throw error;
+  }
+}
+function printLoginFallbackHint(baseUrl) {
+  console.error("\nCould not complete browser login (Unauthorized or callback failure).");
+  console.error("If this is due to a blocked browser flow, use an API key instead:");
+  console.error("");
+  console.error("  export TRAINFABRIC_API_KEY=<api-key>");
+  console.error(`  trainfabric config:set-api-key <api-key>`);
+  console.error(`  trainfabric --version`);
+  console.error("");
+  console.error(`To verify dashboard link and API route, run: trainfabric config:set-base-url ${baseUrl}`);
+  console.error("then run trainfabric login again.");
+}
 function ensureConfigDir() {
   import_node_fs2.default.mkdirSync(CONFIG_DIR, { recursive: true });
   import_node_fs2.default.chmodSync(CONFIG_DIR, 448);
@@ -9165,8 +9216,15 @@ function createClient(config) {
   });
 }
 async function login(config) {
-  const client = createClient(config);
+  printLoginBanner();
+  const loginClient = new TrainingClient({ baseUrl: config.baseUrl });
   const server = import_node_http.default.createServer();
+  const closeServer = () => {
+    try {
+      server.close();
+    } catch {
+    }
+  };
   const port = await new Promise((resolve) => {
     server.listen(0, "127.0.0.1", () => {
       const address = server.address();
@@ -9177,36 +9235,57 @@ async function login(config) {
     });
   });
   const callbackUrl = `http://127.0.0.1:${port}/callback`;
-  const loginUrl = await client.auth.browserLoginUrl(callbackUrl);
-  const tokenResult = await new Promise((resolve, reject) => {
-    server.on("request", (request, response) => {
-      const url = new URL(request.url ?? "/", callbackUrl);
-      const accessToken = url.searchParams.get("access_token");
-      const refreshToken = url.searchParams.get("refresh_token") ?? void 0;
-      const organizationId = url.searchParams.get("organization_id") ?? void 0;
-      if (!accessToken) {
-        response.statusCode = 400;
-        response.end("Missing access token.");
-        reject(new Error("Login callback did not contain an access token."));
-        return;
-      }
-      response.end("Authentication completed. You can close this window.");
-      resolve({ accessToken, refreshToken, organizationId });
+  const loginUrl = await runSpinnerUntil("Preparing browser login", () => loginClient.auth.browserLoginUrl(callbackUrl));
+  console.log("Waiting for authentication in your browser...");
+  console.log(`Callback URL: ${callbackUrl}`);
+  openBrowser(loginUrl.authorizationUrl);
+  try {
+    const tokenResult = await Promise.race([
+      new Promise((resolve, reject) => {
+        const timeoutId = setTimeout(() => {
+          reject(new Error("Login callback timed out after 5 minutes. Please retry."));
+        }, 5 * 60 * 1e3);
+        server.on("request", (request, response) => {
+          const url = new URL(request.url ?? "/", callbackUrl);
+          const accessToken = url.searchParams.get("access_token");
+          const refreshToken = url.searchParams.get("refresh_token") ?? void 0;
+          const organizationId = url.searchParams.get("organization_id") ?? void 0;
+          if (!accessToken) {
+            response.statusCode = 400;
+            response.end("Missing access token.");
+            clearTimeout(timeoutId);
+            reject(new Error("Login callback did not contain an access token."));
+            return;
+          }
+          response.end("Authentication completed. You can close this window.");
+          clearTimeout(timeoutId);
+          resolve({ accessToken, refreshToken, organizationId });
+        });
+      }),
+      (0, import_promises2.setTimeout)(5 * 60 * 1e3).then(() => {
+        throw new Error("Login callback timed out after 5 minutes. Please retry.");
+      })
+    ]);
+    const authedClient = new TrainingClient({
+      baseUrl: config.baseUrl,
+      accessToken: tokenResult.accessToken
     });
-    openBrowser(loginUrl.authorizationUrl);
-  });
-  server.close();
-  const authedClient = new TrainingClient({
-    baseUrl: config.baseUrl,
-    accessToken: tokenResult.accessToken
-  });
-  const session = await authedClient.auth.me();
-  config.accessToken = tokenResult.accessToken;
-  config.refreshToken = tokenResult.refreshToken;
-  config.orgId = tokenResult.organizationId ?? session.organizationId;
-  config.apiKey = void 0;
-  saveConfig(config);
-  console.log(`Logged in as ${session.user.email} for organization ${config.orgId}.`);
+    const session = await runSpinnerUntil("Finalizing login", async () => {
+      await sleep(100);
+      return authedClient.auth.me();
+    });
+    config.accessToken = tokenResult.accessToken;
+    config.refreshToken = tokenResult.refreshToken;
+    config.orgId = tokenResult.organizationId ?? session.organizationId;
+    config.apiKey = void 0;
+    saveConfig(config);
+    console.log(`Logged in as ${session.user.email} for organization ${config.orgId}.`);
+  } catch (error) {
+    printLoginFallbackHint(config.baseUrl);
+    throw error;
+  } finally {
+    closeServer();
+  }
 }
 var program2 = new Command();
 program2.name("trainfabric").description("Trainfabric CLI for launching and monitoring GPU training jobs").version(CLI_VERSION);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trainfabric",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Trainfabric CLI for launching GPU training jobs on the hosted Trainfabric backend.",
   "type": "module",
   "main": "dist/index.cjs",