@zuvo/cli 0.1.7 → 0.1.9

package/README.md

@@ -22,14 +22,19 @@ zuvo hosting apps
 zuvo hosting deploy --wait
 zuvo hosting deploy --commit abc1234 --app my-app
 zuvo hosting deployments
-zuvo hosting logs --since 6h
-zuvo hosting logs -f
+zuvo hosting logs --app sklive-events --since 6h
+zuvo hosting logs --app sklive-super-admin -f
+zuvo hosting logs --app all
 zuvo hosting deploy-logs
 zuvo hosting env list
 zuvo hosting env set API_KEY=secret FOO=bar
 zuvo hosting env set --env-file ./.env.hosting
 zuvo hosting env unset API_KEY
 zuvo hosting secrets list   # alias for hosting env
+zuvo hosting domains
+zuvo hosting domains add app.example.com --app sklive-admin
+zuvo hosting domains verify app.example.com
+zuvo hosting domains rm app.example.com
 ```
 
 Token: Studio → Account → Access Tokens, or `zuvo login --token zpat_…`.  
@@ -39,3 +44,4 @@ API override: `ZUVO_API_URL` / `--api-url` (default `https://api.zuvodev.com`).
 - Hosting env keys must be `UPPER_SNAKE` (`^[A-Z][A-Z0-9_]{0,127}$`).
 - After `hosting env set|unset`, run `zuvo hosting deploy --wait` so the container picks up new vars.
 - `zuvo secrets` = project Edge Function secrets; `zuvo hosting env` = App Hosting container env.
+- Custom domains: add TXT `_zuvo-hosting-challenge.<host>` + CNAME → `app.zuvodev.com` or `sin.app.zuvodev.com`, then `domains verify`. Requires plan `allow_custom_domains`.

package/dist/hosting.js

@@ -47,14 +47,39 @@ export function sortLogsChronological(rows) {
         return ta.localeCompare(tb);
     });
 }
+export function hostingAppSlugFromLog(row) {
+    const meta = row.metadata && typeof row.metadata.app_slug === 'string' ? row.metadata.app_slug : '';
+    if (meta)
+        return meta;
+    const container = row.metadata && typeof row.metadata.app_container === 'string' ? row.metadata.app_container : '';
+    const match = String(container)
+        .replace(/^\//, '')
+        .match(/^app_([a-z0-9][a-z0-9-]*)(?:_[a-z0-9-]+)?$/);
+    return match?.[1] || '';
+}
 export function formatHostingLogLine(row) {
     const ts = formatLogTimestamp(row.timestamp);
+    const slug = hostingAppSlugFromLog(row);
     const msg = row.event_message ?? '';
-    return ts ? `${ts}  ${msg}` : msg;
+    const bits = [ts, slug ? `[${slug}]` : '', msg].filter(Boolean);
+    return bits.join('  ');
+}
+export function assertSafeHostingSlug(key) {
+    const trimmed = key.trim();
+    if (trimmed === 'all')
+        return trimmed;
+    if (!/^[a-z0-9][a-z0-9-]{0,62}$/.test(trimmed)) {
+        throw new Error(`Invalid app slug: ${key} (use letters, digits, hyphen)`);
+    }
+    return trimmed;
 }
-export function hostingLogsSql(limit) {
+export function hostingLogsSql(limit, appSlug) {
     const safe = Math.min(Math.max(1, Math.floor(limit)), 5_000);
-    return `select id, timestamp, event_message from hosting_logs order by timestamp desc limit ${safe}`;
+    if (!appSlug || appSlug === 'all') {
+        return `select id, timestamp, event_message, metadata from hosting_logs order by timestamp desc limit ${safe}`;
+    }
+    const slug = assertSafeHostingSlug(appSlug);
+    return `select id, timestamp, event_message, metadata from hosting_logs where metadata.app_slug = '${slug}' order by timestamp desc limit ${safe}`;
 }
 /** Slug or UUID safe to embed in analytics SQL. */
 export function assertSafeFunctionKey(key) {
@@ -86,3 +111,35 @@ export function formatFunctionLogLine(row) {
     ].filter(Boolean);
     return bits.join('  ');
 }
+export function normalizeHostnameInput(raw) {
+    return String(raw || '')
+        .trim()
+        .toLowerCase()
+        .replace(/^https?:\/\//, '')
+        .replace(/\/.*$/, '')
+        .replace(/\.$/, '');
+}
+export function formatDomainDnsInstructions(domain) {
+    const hostname = domain.hostname || '';
+    const txtName = domain.challenge_name || `_zuvo-hosting-challenge.${hostname}`;
+    const txtValue = domain.challenge_value || domain.verification_token || '';
+    const cnameTarget = domain.dns_cname_target || 'app.zuvodev.com';
+    return [
+        `Hostname: ${hostname}`,
+        `Status:   ${domain.status || 'unknown'}`,
+        '',
+        'Add these DNS records at your registrar:',
+        '',
+        `  TXT   ${txtName}`,
+        `        ${txtValue}`,
+        '',
+        `  CNAME ${hostname}`,
+        `        ${cnameTarget}`,
+        '',
+        'Then run: zuvo hosting domains verify ' + (hostname || '<hostname>'),
+    ].join('\n');
+}
+export function formatDomainListLine(domain) {
+    return [domain.id || '', domain.hostname || '', domain.status || '', domain.tls_status || '']
+        .join('\t');
+}

package/dist/index.js

@@ -4,7 +4,7 @@ import { apiRequest, ApiError } from './api.js';
 import { argvAfterCommand } from './argv.js';
 import { apiUrlFromEnv, deleteAccessToken, isAccessToken, requireLinkedRef, saveLinkedRef, } from './config.js';
 import { encodeFunctionForm, listFunctionSlugs, loadFunctionBundle } from './functions.js';
-import { formatFunctionLogLine, formatHostingLogLine, formatLogTimestamp, functionLogsSql, hostingLogsSql, parseSince, sortLogsChronological, } from './hosting.js';
+import { formatDomainDnsInstructions, formatDomainListLine, formatFunctionLogLine, formatHostingLogLine, formatLogTimestamp, functionLogsSql, hostingLogsSql, normalizeHostnameInput, parseSince, sortLogsChronological, } from './hosting.js';
 import { loginBrowser, loginWithToken } from './login.js';
 import { loadLocalMigrations, pendingMigrations } from './migrations.js';
 import { loadSecretsEnvFile, parseSecretArgs } from './secrets.js';
@@ -27,12 +27,16 @@ Commands:
   hosting apps
   hosting deployments [--app <appId|slug>]
   hosting deploy [--app <appId|slug>] [--commit <sha>] [--wait]
-  hosting logs [--limit N] [--since 1h|30m|ISO] [-f|--follow]
+  hosting logs [--app <appId|slug|all>] [--limit N] [--since 1h|30m|ISO] [-f|--follow]
   hosting deploy-logs [deploymentId] [--app <appId|slug>]
   hosting env list [--app <appId|slug>]
   hosting env set NAME=VALUE [...] [--env-file <path>] [--app <appId|slug>]
   hosting env unset NAME [...] [--app <appId|slug>]
   hosting secrets …          Alias for hosting env …
+  hosting domains [list] [--app <appId|slug>]
+  hosting domains add <hostname> [--app <appId|slug>]
+  hosting domains verify <hostname|id> [--app <appId|slug>]
+  hosting domains rm <hostname|id> [--app <appId|slug>]
 
 Global:
   --api-url <url>     Default https://api.zuvodev.com (or ZUVO_API_URL)
@@ -399,7 +403,7 @@ async function cmdHostingDeployments(apiUrl, argv) {
 }
 async function fetchHostingRuntimeLogs(apiUrl, ref, opts) {
     const body = {
-        sql: hostingLogsSql(opts.limit),
+        sql: hostingLogsSql(opts.limit, opts.appSlug),
     };
     if (opts.since)
         body.iso_timestamp_start = opts.since.toISOString();
@@ -410,6 +414,7 @@ async function cmdHostingLogs(apiUrl, argv) {
     const { values } = parseArgs({
         args: argv,
         options: {
+            app: { type: 'string' },
             limit: { type: 'string' },
             since: { type: 'string' },
             follow: { type: 'boolean', short: 'f' },
@@ -425,6 +430,19 @@ async function cmdHostingLogs(apiUrl, argv) {
         ? parseSince(values.since)
         : parseSince('1h');
     const follow = Boolean(values.follow);
+    const appArg = typeof values.app === 'string' ? values.app.trim() : '';
+    let appSlug;
+    if (appArg === 'all') {
+        appSlug = 'all';
+    }
+    else if (appArg) {
+        const app = await resolveHostingApp(apiUrl, ref, appArg);
+        appSlug = app.slug || app.id;
+    }
+    else {
+        const app = await resolveHostingApp(apiUrl, ref, undefined);
+        appSlug = app.slug || app.id;
+    }
     const seen = new Set();
     const printNew = (rows) => {
         for (const row of sortLogsChronological(rows)) {
@@ -435,9 +453,9 @@ async function cmdHostingLogs(apiUrl, argv) {
             console.log(formatHostingLogLine(row));
         }
     };
-    const initial = await fetchHostingRuntimeLogs(apiUrl, ref, { limit, since });
+    const initial = await fetchHostingRuntimeLogs(apiUrl, ref, { limit, since, appSlug });
     if (!initial.length && !follow) {
-        console.log('No hosting logs in range.');
+        console.log(`No hosting logs in range${appSlug && appSlug !== 'all' ? ` for ${appSlug}` : ''}.`);
         return;
     }
     printNew(initial);
@@ -450,13 +468,14 @@ async function cmdHostingLogs(apiUrl, argv) {
         if (parsed && !Number.isNaN(parsed.getTime()) && parsed > cursor)
             cursor = parsed;
     }
-    console.error('Following hosting logs… (Ctrl+C to stop)');
+    console.error(`Following hosting logs${appSlug && appSlug !== 'all' ? ` for ${appSlug}` : ''}… (Ctrl+C to stop)`);
     for (;;) {
         await new Promise((r) => setTimeout(r, 2_500));
         const nextSince = new Date(Math.max(0, cursor.getTime() - 1_000));
         const rows = await fetchHostingRuntimeLogs(apiUrl, ref, {
             limit: Math.max(limit, 200),
             since: nextSince,
+            appSlug,
         });
         printNew(rows);
         for (const row of sortLogsChronological(rows)) {
@@ -656,6 +675,124 @@ async function cmdHostingEnv(apiUrl, argv) {
         throw new Error('Usage: zuvo hosting env list|set|unset … (alias: zuvo hosting secrets …)');
     }
 }
+async function fetchHostingDomains(apiUrl, ref, appId) {
+    return apiRequest(apiUrl, 'GET', `/platform/projects/${ref}/hosting/apps/${appId}/domains`);
+}
+function resolveDomain(domains, key) {
+    const needle = normalizeHostnameInput(key);
+    const match = domains.find((d) => d.id === key || (d.hostname && normalizeHostnameInput(d.hostname) === needle));
+    if (!match)
+        throw new Error(`Domain not found: ${key}`);
+    return match;
+}
+async function cmdHostingDomainsList(apiUrl, argv) {
+    const { values } = parseArgs({
+        args: argv,
+        options: {
+            app: { type: 'string' },
+            'api-url': { type: 'string' },
+        },
+        allowPositionals: true,
+        strict: false,
+    });
+    const ref = await requireLinkedRef();
+    const app = await resolveHostingApp(apiUrl, ref, typeof values.app === 'string' ? values.app : undefined);
+    const data = await fetchHostingDomains(apiUrl, ref, app.id);
+    if (data.platform_url)
+        console.error(`Platform URL: ${data.platform_url}`);
+    if (data.allow_custom_domains === false) {
+        console.error('Custom domains are not enabled for this organization plan.');
+    }
+    const domains = Array.isArray(data.domains) ? data.domains : [];
+    if (!domains.length) {
+        console.log('No custom domains.');
+        return;
+    }
+    for (const domain of domains)
+        console.log(formatDomainListLine(domain));
+}
+async function cmdHostingDomainsAdd(apiUrl, argv) {
+    const { values, positionals } = parseArgs({
+        args: argv,
+        options: {
+            app: { type: 'string' },
+            'api-url': { type: 'string' },
+        },
+        allowPositionals: true,
+        strict: false,
+    });
+    const hostname = normalizeHostnameInput(positionals[0] || '');
+    if (!hostname) {
+        throw new Error('Usage: zuvo hosting domains add <hostname> [--app <id|slug>]');
+    }
+    const ref = await requireLinkedRef();
+    const app = await resolveHostingApp(apiUrl, ref, typeof values.app === 'string' ? values.app : undefined);
+    const data = await apiRequest(apiUrl, 'POST', `/platform/projects/${ref}/hosting/apps/${app.id}/domains`, { json: { hostname } });
+    console.log(formatDomainDnsInstructions(data.domain || { hostname }));
+}
+async function cmdHostingDomainsVerify(apiUrl, argv) {
+    const { values, positionals } = parseArgs({
+        args: argv,
+        options: {
+            app: { type: 'string' },
+            'api-url': { type: 'string' },
+        },
+        allowPositionals: true,
+        strict: false,
+    });
+    const key = positionals[0];
+    if (!key) {
+        throw new Error('Usage: zuvo hosting domains verify <hostname|id> [--app <id|slug>]');
+    }
+    const ref = await requireLinkedRef();
+    const app = await resolveHostingApp(apiUrl, ref, typeof values.app === 'string' ? values.app : undefined);
+    const listed = await fetchHostingDomains(apiUrl, ref, app.id);
+    const domain = resolveDomain(listed.domains || [], key);
+    const data = await apiRequest(apiUrl, 'POST', `/platform/projects/${ref}/hosting/apps/${app.id}/domains/${domain.id}/verify`, { json: {} });
+    const updated = data.domain || domain;
+    console.log([updated.id, updated.hostname, updated.status, updated.tls_status || '']
+        .filter(Boolean)
+        .join('\t'));
+    if (updated.status && !['active', 'provisioning', 'verified'].includes(updated.status)) {
+        console.log(formatDomainDnsInstructions(updated));
+    }
+}
+async function cmdHostingDomainsRm(apiUrl, argv) {
+    const { values, positionals } = parseArgs({
+        args: argv,
+        options: {
+            app: { type: 'string' },
+            'api-url': { type: 'string' },
+        },
+        allowPositionals: true,
+        strict: false,
+    });
+    const key = positionals[0];
+    if (!key) {
+        throw new Error('Usage: zuvo hosting domains rm <hostname|id> [--app <id|slug>]');
+    }
+    const ref = await requireLinkedRef();
+    const app = await resolveHostingApp(apiUrl, ref, typeof values.app === 'string' ? values.app : undefined);
+    const listed = await fetchHostingDomains(apiUrl, ref, app.id);
+    const domain = resolveDomain(listed.domains || [], key);
+    await apiRequest(apiUrl, 'DELETE', `/platform/projects/${ref}/hosting/apps/${app.id}/domains/${domain.id}`);
+    console.log(`Removed ${domain.hostname || domain.id}`);
+}
+async function cmdHostingDomains(apiUrl, argv) {
+    const [action, ...rest] = argv;
+    if (!action || action === 'list' || action.startsWith('-')) {
+        await cmdHostingDomainsList(apiUrl, action?.startsWith('-') ? argv : rest);
+    }
+    else if (action === 'add')
+        await cmdHostingDomainsAdd(apiUrl, rest);
+    else if (action === 'verify')
+        await cmdHostingDomainsVerify(apiUrl, rest);
+    else if (action === 'rm' || action === 'remove' || action === 'delete')
+        await cmdHostingDomainsRm(apiUrl, rest);
+    else {
+        throw new Error('Usage: zuvo hosting domains [list|add|verify|rm] …');
+    }
+}
 async function main() {
     const argv = process.argv.slice(2);
     const global = parseGlobal(argv);
@@ -700,6 +837,8 @@ async function main() {
             await cmdHostingDeployLogs(apiUrl, argvAfterCommand(argv, 'hosting', sub));
         else if (command === 'hosting' && (sub === 'env' || sub === 'secrets'))
             await cmdHostingEnv(apiUrl, argvAfterCommand(argv, 'hosting', sub));
+        else if (command === 'hosting' && (sub === 'domains' || sub === 'domain'))
+            await cmdHostingDomains(apiUrl, argvAfterCommand(argv, 'hosting', sub));
         else {
             console.error(usage());
             process.exit(command ? 1 : 0);

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@zuvo/cli",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "type": "module",
-  "description": "Zuvo CLI — login, link, functions/hosting deploy, secrets, env, db push, and logs",
+  "description": "Zuvo CLI — login, link, functions/hosting deploy, secrets, env, domains, db push, and logs",
   "license": "MIT",
   "bin": {
     "zuvo": "bin/zuvo.js"