trainfabric 0.1.4 → 0.1.5

package/dist/index.cjs

@@ -3458,11 +3458,11 @@ var require_commander = __commonJS({
 
 // src/index.ts
 var import_node_fs2 = __toESM(require("node:fs"), 1);
-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_promises2 = __toESM(require("node:readline/promises"), 1);
 var import_node_child_process = require("node:child_process");
-var import_promises2 = require("node:timers/promises");
+var import_promises3 = require("node:timers/promises");
 
 // ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/esm.mjs
 var import_index = __toESM(require_commander(), 1);
@@ -8891,7 +8891,7 @@ function buildComputeSpec(options) {
 
 // src/index.ts
 var DEFAULT_TRAINFABRIC_API_URL2 = "https://api.trainfabric.com";
-var CLI_VERSION = "0.1.4";
+var CLI_VERSION = "0.1.5";
 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");
@@ -8914,6 +8914,9 @@ function scrambleLine(line, progress) {
     return LOGIN_BANNER_POOL[Math.floor(Math.random() * LOGIN_BANNER_POOL.length)];
   }).join("");
 }
+function renderLoginBanner(progress) {
+  return LOGIN_BANNER_LINES.map((row) => scrambleLine(row, progress));
+}
 async function printLoginBanner() {
   console.log("");
   if (!process.stdout.isTTY) {
@@ -8925,16 +8928,18 @@ async function printLoginBanner() {
     return;
   }
   process.stdout.write("\x1B[?25l");
-  for (let frame = 0; frame <= 20; frame += 1) {
+  const frameCount = 40;
+  const totalFrames = frameCount * 3;
+  for (let frame = 0; frame <= totalFrames; frame += 1) {
     if (frame > 0) {
       process.stdout.write(`\x1B[${LOGIN_BANNER_LINES.length}A`);
     }
-    const progress = frame / 20;
-    for (const row of LOGIN_BANNER_LINES) {
-      process.stdout.write(`${scrambleLine(row, progress)}
+    const progress = frame % frameCount / frameCount;
+    for (const row of renderLoginBanner(progress)) {
+      process.stdout.write(`${row}
 `);
     }
-    await (0, import_promises2.setTimeout)(frame < 14 ? 32 : 18);
+    await (0, import_promises3.setTimeout)(85);
   }
   process.stdout.write("\x1B[?25h");
   console.log("   TrainFabric CLI Login");
@@ -8949,7 +8954,79 @@ function printStaticLoginBanner() {
   console.log("");
 }
 function sleep(ms) {
-  return (0, import_promises2.setTimeout)(ms);
+  return (0, import_promises3.setTimeout)(ms);
+}
+async function promptApiKey() {
+  if (!process.stdin.isTTY || !process.stdout.isTTY || !process.stdin.setRawMode) {
+    const rl = import_promises2.default.createInterface({ input: process.stdin, output: process.stdout });
+    try {
+      return (await rl.question("Paste your TrainFabric API key: ")).trim();
+    } finally {
+      rl.close();
+    }
+  }
+  let apiKey = "";
+  let frame = 0;
+  let closed = false;
+  const totalLines = LOGIN_BANNER_LINES.length + 4;
+  const redraw = () => {
+    const progress = frame % 48 / 48;
+    process.stdout.write(`\x1B[${totalLines}A`);
+    for (const row of renderLoginBanner(progress)) {
+      process.stdout.write(`\x1B[2K${row}
+`);
+    }
+    process.stdout.write("\x1B[2K   TrainFabric CLI Login\n");
+    process.stdout.write("\x1B[2K\n");
+    process.stdout.write(`\x1B[2KPaste your TrainFabric API key: ${"*".repeat(apiKey.length)}
+`);
+    process.stdout.write("\x1B[2KPress Enter to continue.\n");
+    frame += 1;
+  };
+  return await new Promise((resolve, reject) => {
+    const cleanup = () => {
+      if (closed) {
+        return;
+      }
+      closed = true;
+      clearInterval(timer);
+      process.stdin.off("data", onData);
+      process.stdin.setRawMode(false);
+      process.stdout.write("\x1B[?25h\n");
+    };
+    const onData = (chunk) => {
+      const value = chunk.toString("utf8");
+      if (value === "") {
+        cleanup();
+        reject(new Error("Login cancelled."));
+        return;
+      }
+      if (value === "\r" || value === "\n") {
+        cleanup();
+        resolve(apiKey.trim());
+        return;
+      }
+      if (value === "\x7F" || value === "\b") {
+        apiKey = apiKey.slice(0, -1);
+        redraw();
+        return;
+      }
+      apiKey += value.replace(/[\r\n]/g, "");
+      redraw();
+    };
+    for (const row of LOGIN_BANNER_LINES) {
+      console.log(row);
+    }
+    console.log("   TrainFabric CLI Login");
+    console.log("");
+    console.log("Paste your TrainFabric API key: ");
+    console.log("Press Enter to continue.");
+    process.stdout.write("\x1B[?25l");
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+    process.stdin.on("data", onData);
+    const timer = setInterval(redraw, 160);
+  });
 }
 async function runSpinnerUntil(label, action) {
   const frames = ["/", "-", "\\", "|"];
@@ -8971,15 +9048,15 @@ async function runSpinnerUntil(label, action) {
   }
 }
 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("\nCould not verify that API key with TrainFabric.");
+  console.error("");
+  console.error("Check that the key is active in the dashboard, then retry:");
+  console.error("  trainfabric login");
   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("You can also set it directly:");
+  console.error("  trainfabric config:set-api-key <api-key>");
   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.");
+  console.error(`Current API base URL: ${baseUrl}`);
 }
 function ensureConfigDir() {
   import_node_fs2.default.mkdirSync(CONFIG_DIR, { recursive: true });
@@ -9153,15 +9230,6 @@ function visibleConfig(config) {
     refreshToken: config.refreshToken ? "<stored>" : void 0
   };
 }
-function openBrowser(url) {
-  const command = process.platform === "darwin" ? "open" : process.platform === "win32" ? "cmd" : "xdg-open";
-  const args = process.platform === "win32" ? ["/c", "start", "", url] : [url];
-  const child = (0, import_node_child_process.spawn)(command, args, {
-    detached: true,
-    stdio: "ignore"
-  });
-  child.unref();
-}
 function buildRunInput(options) {
   const sourceOptions = buildSourceOptions(options);
   return {
@@ -9251,82 +9319,34 @@ function createClient(config) {
   });
 }
 async function login(config) {
-  await printLoginBanner().catch(() => {
-    printStaticLoginBanner();
-  });
-  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();
-      if (!address || typeof address === "string") {
-        throw new Error("Failed to bind callback server.");
-      }
-      resolve(address.port);
-    });
-  });
+  await printLoginBanner().catch(() => printStaticLoginBanner());
+  const apiKey = await promptApiKey();
+  if (!apiKey) {
+    throw new Error("API key is required.");
+  }
   try {
-    const callbackUrl = `http://127.0.0.1:${port}/callback`;
-    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);
-    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({
+    const client = new TrainingClient({
       baseUrl: config.baseUrl,
-      accessToken: tokenResult.accessToken
+      apiKey
     });
     const session = await runSpinnerUntil("Finalizing login", async () => {
       await sleep(100);
-      return authedClient.auth.me();
+      return client.auth.me();
     });
-    config.accessToken = tokenResult.accessToken;
-    config.refreshToken = tokenResult.refreshToken;
-    config.orgId = tokenResult.organizationId ?? session.organizationId;
-    config.apiKey = void 0;
+    config.accessToken = void 0;
+    config.refreshToken = void 0;
+    config.orgId = session.organizationId;
+    config.apiKey = apiKey;
     saveConfig(config);
-    console.log(`Logged in as ${session.user.email} for organization ${config.orgId}.`);
+    console.log(`Logged in with API key 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);
-program2.command("login").description("Authenticate in the browser and store CLI credentials").action(async () => {
+program2.command("login").description("Paste and store a TrainFabric API key").action(async () => {
   await login(loadConfig());
 });
 program2.command("logout").description("Remove stored credentials").action(() => {

package/package.json

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