@faable/faable 1.5.23 → 1.5.25

package/dist/commands/deploy/check_environment.js

@@ -5,8 +5,7 @@ const check_environment = async () => {
         await cmd("docker ps");
     }
     catch (error) {
-        console.log(error);
-        throw new Error(`Docker is not running`);
+        throw new Error(`Docker is not running`, { cause: error });
     }
 };
 

package/dist/commands/deploy/index.js

@@ -59,8 +59,41 @@ const deploy = {
         // Upload to Faable registry
         const { upload_tagname } = await upload_tag({ app, api });
         // Create a deployment for this image
-        await api.createDeployment({ app_id: app.id, image: upload_tagname, type });
-        log.info(`🌍 Deployment created -> https://${app.url}`);
+        const deployment = await api.createDeployment({
+            app_id: app.id,
+            image: upload_tagname,
+            type
+        });
+        const dashboard_url = `https://dashboard.faable.com/deploy/${app.team}/app/${app.id}`;
+        log.info(`🌍 Deployment created (${deployment.id}) -> https://${app.url}`);
+        log.info(`📊 View it in the dashboard -> ${dashboard_url}`);
+        // Wait (up to 5 minutes) for the deployment to be promoted (live)
+        const wait = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+        const timeoutMs = 5 * 60 * 1000;
+        const intervalMs = 5000;
+        const start = Date.now();
+        log.info(`⏳ Waiting for deployment to be promoted...`);
+        let promoted = false;
+        while (Date.now() - start < timeoutMs) {
+            await wait(intervalMs);
+            try {
+                const current = await api.getApp(app.id);
+                if (current.status?.deployment === deployment.id) {
+                    promoted = true;
+                    break;
+                }
+            }
+            catch (error) {
+                // Ignore transient errors while polling and keep waiting
+                log.debug(`Polling app status failed, retrying...`);
+            }
+        }
+        if (promoted) {
+            log.info(`✅ Deployment promoted and live -> https://${app.url}`);
+        }
+        else {
+            log.warn(`⌛ Timed out after 5min waiting for promotion. The deployment is still rolling out, check the dashboard -> ${dashboard_url}`);
+        }
     }
 };
 

package/dist/commands/deploy/runtime-detect/strategies/docker.js

@@ -1,4 +1,4 @@
-const strategy_docker = async (workdir) => {
+const strategy_docker = async (_workdir) => {
     return {
         runtime: {
             name: "docker",

package/dist/commands/deploy/runtime-detect/strategies/nodejs.js

@@ -30,7 +30,7 @@ const strategy_nodejs = async (workdir) => {
             runtime_version = out.stdout.toString().trim();
             log.info(`Using node@${runtime_version} from engines in package.json (${engines.node})`);
         }
-        catch (e) {
+        catch {
             log.info(`Node version defined in engines in package.json is not valid (${engines.node}), using current version ${runtime_version}`);
         }
     }

package/dist/commands/link/index.js

@@ -17,7 +17,7 @@ const getGitRemoteUrl = async (workdir) => {
         }
         return url;
     }
-    catch (error) {
+    catch {
         log.warn("Could not detect git remote origin URL.");
         return undefined;
     }

package/dist/commands/login/index.js

@@ -1,9 +1,29 @@
 import { FaableApi } from '../../api/FaableApi.js';
 import { getDeviceCode, getDeviceToken } from '../../api/auth.js';
 import { CredentialsStore } from '../../lib/CredentialsStore.js';
+import { bearer_strategy } from '../../api/strategies/bearer.strategy.js';
 import open from 'open';
+import ora from 'ora';
 import { log } from '../../log.js';
 
+const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+const renderUserCodeBlock = (code) => {
+    const padded = `   ${code}   `;
+    const border = "─".repeat(padded.length);
+    return [
+        "",
+        `  ┌${border}┐`,
+        `  │${padded}│`,
+        `  └${border}┘`,
+        "",
+    ].join("\n");
+};
+const extractOAuthError = (e) => {
+    const data = e?.response?.data || e?.cause?.response?.data || {};
+    if (typeof data === "object")
+        return data;
+    return {};
+};
 const login = {
     command: "login",
     describe: "Login to Faable",
@@ -22,7 +42,6 @@ const login = {
     handler: async (args) => {
         const { apikey, token } = args;
         const store = new CredentialsStore();
-        FaableApi.create(); // Base client for device flow
         if (apikey) {
             log.info("Logging in with API Key...");
             const tempApi = FaableApi.create({ auth: { apikey }, authStrategy: (await import('../../api/strategies/apikey.strategy.js')).apikey_strategy });
@@ -31,7 +50,7 @@ const login = {
                 await store.saveCredentials({ apikey, email: me.email });
                 log.info(`✅ Successfully logged in as ${me.email}`);
             }
-            catch (e) {
+            catch {
                 log.error("❌ Invalid API Key");
                 process.exit(1);
             }
@@ -45,33 +64,69 @@ const login = {
                 await store.saveCredentials({ token, email: me.email });
                 log.info(`✅ Successfully logged in as ${me.email}`);
             }
-            catch (e) {
+            catch {
                 log.error("❌ Invalid OIDC token");
                 process.exit(1);
             }
             return;
         }
-        // Interactive Device Flow
+        // Interactive Device Authorization Grant (RFC 8628)
         log.info("Starting browser-based authentication...");
+        let device_code;
+        let user_code;
+        let verification_uri;
+        let verification_uri_complete;
+        let interval;
+        let expires_in;
         try {
-            const { device_code, user_code, verification_uri, interval, expires_in } = await getDeviceCode();
-            log.info(`\nVerification code: ${user_code}\n`);
-            log.info(`If your browser doesn't open automatically, please visit:\n${verification_uri}\n`);
-            try {
-                await open(verification_uri);
-            }
-            catch (e) {
-                log.warn("Could not open browser automatically.");
-            }
-            // Polling
-            const start = Date.now();
-            const timeout = expires_in * 1000;
-            while (Date.now() - start < timeout) {
+            const dc = await getDeviceCode();
+            device_code = dc.device_code;
+            user_code = dc.user_code;
+            verification_uri = dc.verification_uri;
+            verification_uri_complete = dc.verification_uri_complete;
+            interval = dc.interval;
+            expires_in = dc.expires_in;
+        }
+        catch (e) {
+            log.error(`❌ Failed to start authentication: ${e.message}`);
+            process.exit(1);
+        }
+        process.stdout.write(renderUserCodeBlock(user_code));
+        log.info(`If your browser doesn't open automatically, visit: ${verification_uri}`);
+        try {
+            await open(verification_uri_complete);
+        }
+        catch {
+            log.warn("Could not open browser automatically.");
+        }
+        const spinner = ora({
+            text: "Waiting for confirmation in browser…",
+            spinner: "dots",
+        }).start();
+        let cancelled = false;
+        const onSigint = () => {
+            cancelled = true;
+            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);
+                if (cancelled)
+                    return;
                 try {
                     const { access_token } = await getDeviceToken(device_code);
                     if (access_token) {
-                        log.info("Token received!");
-                        const tempApi = FaableApi.create({ auth: { token: access_token }, authStrategy: () => ({ headers: async () => ({ Authorization: `Bearer ${access_token}` }) }) });
+                        spinner.stop();
+                        const tempApi = FaableApi.create({
+                            auth: { token: access_token },
+                            authStrategy: bearer_strategy,
+                        });
                         const me = await tempApi.getMe();
                         await store.saveCredentials({ token: access_token, email: me.email });
                         log.info(`✅ Successfully logged in as ${me.email}`);
@@ -79,27 +134,38 @@ const login = {
                     }
                 }
                 catch (e) {
-                    // Typically returns 400 with "authorization_pending"
-                    const errData = e.response?.data || e.cause?.response?.data;
-                    const errHeaders = e.response?.headers || e.cause?.response?.headers;
-                    if (errData?.error === "authorization_pending") {
-                        // Wait and continue
+                    const { error, error_description } = extractOAuthError(e);
+                    if (error === "authorization_pending") {
+                        continue;
                     }
-                    else if (errData?.error === "slow_down") {
-                        // Should increase interval but for now we just wait
+                    if (error === "slow_down") {
+                        currentInterval += 5;
+                        spinner.text = `Waiting for confirmation in browser… (slowing polling to ${currentInterval}s)`;
+                        continue;
                     }
-                    else if (errHeaders?.["content-type"]?.includes("application/json")) {
-                        // Other error
+                    if (error === "access_denied") {
+                        spinner.stop();
+                        log.error("❌ Authorization denied. Run `faable login` again to retry.");
+                        process.exit(1);
                     }
+                    if (error === "expired_token") {
+                        spinner.stop();
+                        log.error("❌ Code expired. Run `faable login` again to start over.");
+                        process.exit(1);
+                    }
+                    // Unknown OAuth error or non-OAuth failure
+                    spinner.stop();
+                    const detail = error_description || error || e?.message || "unknown error";
+                    log.error(`❌ Authentication failed: ${detail}`);
+                    process.exit(1);
                 }
-                await new Promise(resolve => setTimeout(resolve, interval * 1000));
             }
-            log.error("❌ Authentication timed out");
+            spinner.stop();
+            log.error("❌ Code expired. Run `faable login` again to start over.");
             process.exit(1);
         }
-        catch (e) {
-            log.error(`❌ Failed to start authentication: ${e.message}`);
-            process.exit(1);
+        finally {
+            process.removeListener("SIGINT", onSigint);
         }
     },
 };

package/dist/commands/whoami/index.js

@@ -14,7 +14,7 @@ const whoami = {
             const me = await api.getMe();
             log.info(`Logged in as: ${me.email}`);
         }
-        catch (e) {
+        catch {
             log.error("❌ Not logged in or session expired");
             process.exit(1);
         }

package/dist/lib/cmd.js

@@ -33,7 +33,7 @@ const cmd = async (cmd, config) => {
         if (output) {
             log.error(output);
         }
-        throw new Error(`Command error: ${cmd}`);
+        throw new Error(`Command error: ${cmd}`, { cause: error });
     }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faable/faable",
-  "version": "1.5.23",
+  "version": "1.5.25",
   "main": "dist/index.js",
   "license": "MIT",
   "author": "Marc Pomar <marc@faable.com>",
@@ -31,6 +31,7 @@
     "fs-extra": "^11.3.2",
     "handlebars": "^4.7.8",
     "open": "^11.0.0",
+    "ora": "^9.4.0",
     "pino": "^10.1.0",
     "pino-pretty": "^13.1.3",
     "promisify-child-process": "^4.1.2",