@zuvo/cli 0.1.8 → 0.1.9

package/README.md

@@ -22,8 +22,9 @@ 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

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 hostingLogsSql(limit) {
+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, 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) {

package/dist/index.js

@@ -27,7 +27,7 @@ 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>]
@@ -403,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();
@@ -414,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' },
@@ -429,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)) {
@@ -439,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);
@@ -454,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)) {

package/package.json

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