@faable/faable 4.5.2 → 4.5.4

package/dist/api/FaableApi.js

@@ -130,12 +130,19 @@ class FaableApi {
     async issueAuthAccountToken(account_id) {
         return data(this.client.post(`/auth-accounts/${account_id}/token`));
     }
-    // Every app the caller can see, across projects. Used to match the working
-    // directory's repository to its app: the link is global, so a repo whose
-    // app lives outside the active project must still resolve.
+    // Every app the caller can see, across projects (`faable link` offers them
+    // to pick from).
     async list() {
         return allPages(next => this.listApps({ pageSize: 200, next }, null));
     }
+    // The apps linked to `repository` (the `org/repo` slug), across projects —
+    // filtered (and indexed) server side, so a staff session doesn't page
+    // through the whole platform to match one repository.
+    async appsByRepository(repository) {
+        return allPages(next => data(this.client.get(`/app`, {
+            params: { repository, ...page_params({ pageSize: 200, next }) }
+        })));
+    }
     // One page of apps, scoped to `project` (default: the active project).
     // `null` = unscoped. The api filters by the header, so an admin session
     // doesn't page through the whole platform.
@@ -293,9 +300,10 @@ class FaableApi {
     async listDomains(app_id, team) {
         return firstPage(this.listDomainsPage(app_id, team));
     }
+    // Without `app_id`, every domain of the project.
     async listDomainsPage(app_id, team, params = {}) {
         return data(this.client.get(`/domain`, {
-            params: { app_id, ...page_params(params) },
+            params: { ...(app_id ? { app_id } : {}), ...page_params(params) },
             headers: projectHeader(team)
         }));
     }

package/dist/commands/deploy/domains/list.js

@@ -1,23 +1,26 @@
 import { requireApi } from '../../../api/context.js';
 import { fetch_page, print_json, print, more_hint, list_options } from '../../../lib/listing.js';
 import { log } from '../../../log.js';
-import { resolve_app_id } from '../resolve_app_id.js';
+import { requireProject } from '../../../api/project.js';
+import { find_app_id } from '../resolve_app_id.js';
 import { dns_badge, cname_target } from './format.js';
 
 const domains_list = {
     command: 'list',
-    describe: 'List custom domains of the app',
+    describe: 'List custom domains of the app (or of the project, outside a linked repo)',
     builder: yargs => list_options(yargs)
         .option('app', {
         alias: 'a',
         type: 'string',
         description: 'App id, name or slug (defaults to the linked app)'
     })
-        .example('$0 deploy domains list', 'Domains of the linked app')
+        .example('$0 deploy domains list', 'Domains of the linked app, or of the active project when there is none')
         .showHelpOnFail(false),
     handler: async (args) => {
         const ctx = await requireApi();
-        const app_id = await resolve_app_id(args.app, ctx.appId, ctx.api);
+        const app_id = await find_app_id(args.app, ctx.appId, ctx.api);
+        if (!app_id)
+            return list_project_domains(ctx.api, args);
         const app = await ctx.api.getApp(app_id);
         const page = await fetch_page(p => ctx.api.listDomainsPage(app_id, app.team, p), args);
         if (args.json)
@@ -48,5 +51,35 @@ const domains_list = {
         }
     }
 };
+// No app here (an unlinked directory): the domains of the active project,
+// each with the app it routes to.
+const list_project_domains = async (api, args) => {
+    const { id: project } = await requireProject(api);
+    const page = await fetch_page(p => api.listDomainsPage(undefined, project, p), args);
+    if (args.json)
+        return print_json(page);
+    const domains = page.data;
+    if (domains.length === 0) {
+        log.info(`🌐 No custom domains in ${project}.`);
+        log.info(`Add one with: faable deploy domains add <yourdomain.com> --app <app>.`);
+        return;
+    }
+    const apps = await fetch_page(p => api.listApps(p, project), {
+        limit: 200,
+        all: true
+    });
+    const app_name = new Map(apps.data.map(a => [a.id, a.name]));
+    const label = (d) => d.app_id ? app_name.get(d.app_id) ?? d.app_id : '(no app)';
+    log.info(`🌐 ${domains.length} domain(s) in ${project}:`);
+    const width = Math.max(...domains.map(d => d.fqdn.length));
+    const app_width = Math.max(...domains.map(d => label(d).length));
+    for (const domain of domains) {
+        const tls = domain.tls ? 'tls' : 'no-tls';
+        print(`  ${domain.fqdn.padEnd(width)}  ${label(domain).padEnd(app_width)}  ${dns_badge(domain)}  (${tls})`);
+    }
+    const hint = more_hint(page);
+    if (hint)
+        log.info(hint);
+};
 
 export { domains_list };

package/dist/commands/deploy/resolve_app_id.js

@@ -57,8 +57,7 @@ const find_app_id = async (explicit, ctxAppId, api, workdir = process.cwd()) =>
         return app_id;
     const repository = await getGitRemoteUrl(workdir);
     if (repository) {
-        const apps = await api.list();
-        const matches = apps.filter(app => app.repository === repository);
+        const matches = await api.appsByRepository(repository);
         if (matches.length === 1) {
             const app = matches[0];
             log.info(`🔎 Detected app "${app.name}" (${app.id}) from repository ${repository}`);

package/dist/commands/upgrade/index.js

@@ -23,12 +23,12 @@ const upgrade = {
         }
         const spinner = ora(`Upgrading ${CLI_PACKAGE} ${version} → ${latest}`).start();
         try {
-            await cmd(`npm install -g ${CLI_PACKAGE}@latest`, { timeout: 180_000 });
+            await cmd(`npm install -g --prefer-online ${CLI_PACKAGE}@latest`, { timeout: 180_000 });
             spinner.succeed(`Upgraded to ${latest}`);
         }
         catch {
             spinner.fail("Upgrade failed");
-            log.error(`❌ Could not upgrade automatically. Try manually: npm install -g ${CLI_PACKAGE}@latest`);
+            log.error(`❌ Could not upgrade automatically. Try manually: npm install -g --prefer-online ${CLI_PACKAGE}@latest`);
             process.exit(1);
         }
     },

package/dist/lib/CredentialsStore.js

@@ -23,7 +23,6 @@ class CredentialsStore {
         await fs.ensureDir(this.faable_home);
         await fs.writeJSON(this.credentials_path, config, { spaces: 2 });
         await fs.chmod(this.credentials_path, 0o600);
-        this.log.info(`Stored credentials`);
     }
     async loadCredentials() {
         const old_path = path__default.join(this.faable_home, 'credentials');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faable/faable",
-  "version": "4.5.2",
+  "version": "4.5.4",
   "main": "dist/index.js",
   "license": "MIT",
   "author": "Marc Pomar <marc@faable.com>",