@faable/faable 1.38.2 → 1.38.4

package/dist/commands/login/index.js

@@ -125,21 +125,37 @@ const login = {
         catch {
             log.warn("Could not open browser automatically.");
         }
+        const start = Date.now();
+        const timeoutMs = expires_in * 1000;
+        let currentInterval = interval;
+        // The user has a deadline and no way to see it: the code dies on the
+        // server whether or not they are still typing, and the only feedback used
+        // to be the spinner going quiet for minutes and then failing. Show what is
+        // left. See arch/auth/cli-device-code-first-login.md.
+        const remainingLabel = () => {
+            const left = Math.max(0, timeoutMs - (Date.now() - start));
+            const mins = Math.floor(left / 60000);
+            const secs = Math.floor((left % 60000) / 1000);
+            return `${mins}:${secs.toString().padStart(2, "0")}`;
+        };
+        const waitingText = (suffix = "") => `Waiting for confirmation in browser… (code expires in ${remainingLabel()})${suffix}`;
         const spinner = ora({
-            text: "Waiting for confirmation in browser…",
+            text: waitingText(),
             spinner: "dots",
         }).start();
+        const ticker = setInterval(() => {
+            spinner.text = waitingText(currentInterval > interval ? ` (slowed polling to ${currentInterval}s)` : "");
+        }, 1000);
+        ticker.unref?.();
         let cancelled = false;
         const onSigint = () => {
             cancelled = true;
+            clearInterval(ticker);
             spinner.stop();
             process.stderr.write("\nLogin cancelled.\n");
             process.exit(130);
         };
         process.once("SIGINT", onSigint);
-        const start = Date.now();
-        const timeoutMs = expires_in * 1000;
-        let currentInterval = interval;
         try {
             while (!cancelled && Date.now() - start < timeoutMs) {
                 await wait(currentInterval * 1000);
@@ -170,7 +186,6 @@ const login = {
                     }
                     if (error === "slow_down") {
                         currentInterval += 5;
-                        spinner.text = `Waiting for confirmation in browser… (slowing polling to ${currentInterval}s)`;
                         continue;
                     }
                     if (error === "access_denied") {
@@ -195,6 +210,7 @@ const login = {
             process.exit(1);
         }
         finally {
+            clearInterval(ticker);
             process.removeListener("SIGINT", onSigint);
         }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faable/faable",
-  "version": "1.38.2",
+  "version": "1.38.4",
   "main": "dist/index.js",
   "license": "MIT",
   "author": "Marc Pomar <marc@faable.com>",
@@ -27,7 +27,7 @@
   ],
   "dependencies": {
     "@actions/core": "^3.0.0",
-    "@faable/auth-sdk": "^2.5.18",
+    "@faable/auth-sdk": "^2.5.39",
     "axios": "^1.18.1",
     "fs-extra": "^11.3.2",
     "open": "^11.0.0",