tthr 0.3.16 → 0.3.18

package/dist/index.js

@@ -59,7 +59,7 @@ async function deployCommand(options) {
     process.exit(1);
   }
   const environment = options.env || config.environment || await resolveEnvironmentFromApiKey() || "development";
-  const API_URL2 = `${getApiUrl(config)}/api/v1`;
+  const API_URL2 = `${await resolveApiUrl(config)}/api/v1`;
   console.log(chalk.bold("\n\u26A1 Deploying to Tether\n"));
   console.log(chalk.dim(`  Project: ${projectId}`));
   console.log(chalk.dim(`  Environment: ${environment}`));
@@ -2072,6 +2072,8 @@ async function loginCommand() {
     console.log(chalk4.dim("\nRun `tthr logout` to sign out\n"));
     return;
   }
+  console.log(chalk4.dim(`  URL: ${API_URL}
+`));
   const spinner = ora4("Generating authentication code...").start();
   try {
     const deviceCode = await requestDeviceCode();
@@ -2082,10 +2084,13 @@ async function loginCommand() {
 `));
     console.log(chalk4.dim(`Your code: ${chalk4.white.bold(deviceCode.userCode)}
 `));
-    await waitForEnter(chalk4.dim("Press Enter to open in browser..."));
-    openBrowser(authUrl);
-    console.log();
-    const credentials = await pollForApproval(deviceCode.deviceCode, deviceCode.interval, deviceCode.expiresIn);
+    const pollPromise = pollForApproval(deviceCode.deviceCode, deviceCode.interval, deviceCode.expiresIn);
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    rl.question(chalk4.dim("Press Enter to open in browser..."), () => {
+      openBrowser(authUrl);
+    });
+    const credentials = await pollPromise;
+    rl.close();
     await saveCredentials(credentials);
     console.log(chalk4.green("\u2713") + ` Logged in as ${chalk4.cyan(credentials.email)}`);
     console.log();
@@ -2188,9 +2193,12 @@ async function pollForApproval(deviceCode, interval, expiresIn) {
     while (Date.now() < expiresAt) {
       await sleep(interval * 1e3);
       spinner.text = `Checking... ${chalk4.dim(`(${Math.ceil((expiresAt - Date.now()) / 1e3)}s remaining)`)}`;
-      const response = await fetch(`${API_URL}/auth/device/${deviceCode}`, {
-        method: "GET"
-      }).catch(() => null);
+      let response = null;
+      try {
+        response = await fetch(`${API_URL}/auth/device/${deviceCode}`);
+      } catch (err) {
+        spinner.text = `Waiting for approval... ${chalk4.dim(`(connection error, retrying)`)}`;
+      }
       updateCountdown();
       if (response?.ok) {
         const data = await response.json();
@@ -2206,6 +2214,8 @@ async function pollForApproval(deviceCode, interval, expiresIn) {
           spinner.fail("Authentication expired");
           throw new Error("Authentication request expired");
         }
+      } else if (response) {
+        spinner.text = `Waiting for approval... ${chalk4.dim(`(server: ${response.status})`)}`;
       }
     }
     spinner.fail("Authentication timed out");
@@ -2233,18 +2243,6 @@ function openBrowser(url) {
     }
   });
 }
-function waitForEnter(prompt) {
-  return new Promise((resolve) => {
-    const rl = readline.createInterface({
-      input: process.stdin,
-      output: process.stdout
-    });
-    rl.question(prompt, () => {
-      rl.close();
-      resolve();
-    });
-  });
-}
 
 // src/commands/update.ts
 import chalk5 from "chalk";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tthr",
-  "version": "0.3.16",
+  "version": "0.3.18",
   "description": "Tether CLI - project scaffolding and deployment",
   "type": "module",
   "bin": {