@everystack/cli 0.2.5 → 0.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everystack/cli",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "CLI and OTA updates for Expo apps on everystack",
   "license": "AGPL-3.0-only",
   "publishConfig": {
@@ -41,8 +41,8 @@
     "lint": "tsc --noEmit"
   },
   "dependencies": {
-    "@aws-sdk/client-cloudfront-keyvaluestore": "3.1045.0",
-    "@aws-sdk/signature-v4a": "3.1031.0",
+    "@aws-sdk/client-cloudfront-keyvaluestore": "3.1053.0",
+    "@aws-sdk/signature-v4a": "3.1048.0",
     "glob": "13.0.6",
     "node-forge": "1.4.0",
     "structured-headers": "1.0.1",
@@ -50,11 +50,11 @@
   },
   "peerDependencies": {
     "@everystack/server": ">=0.1.0",
-    "@aws-sdk/client-cloudfront": "3.1045.0",
-    "@aws-sdk/client-cloudwatch-logs": "3.1047.0",
-    "@aws-sdk/client-lambda": "3.1045.0",
-    "@aws-sdk/client-s3": "3.1045.0",
-    "@aws-sdk/s3-request-presigner": "3.1045.0",
+    "@aws-sdk/client-cloudfront": "3.1053.0",
+    "@aws-sdk/client-cloudwatch-logs": "3.1053.0",
+    "@aws-sdk/client-lambda": "3.1053.0",
+    "@aws-sdk/client-s3": "3.1053.0",
+    "@aws-sdk/s3-request-presigner": "3.1053.0",
     "drizzle-orm": "0.41.0",
     "expo-updates": "55.0.21",
     "react": "19.2.6",
@@ -90,11 +90,11 @@
     }
   },
   "devDependencies": {
-    "@aws-sdk/client-cloudfront": "3.1045.0",
-    "@aws-sdk/client-cloudwatch-logs": "3.1047.0",
-    "@aws-sdk/client-lambda": "3.1045.0",
-    "@aws-sdk/client-s3": "3.1045.0",
-    "@aws-sdk/s3-request-presigner": "3.1045.0",
+    "@aws-sdk/client-cloudfront": "3.1053.0",
+    "@aws-sdk/client-cloudwatch-logs": "3.1053.0",
+    "@aws-sdk/client-lambda": "3.1053.0",
+    "@aws-sdk/client-s3": "3.1053.0",
+    "@aws-sdk/s3-request-presigner": "3.1053.0",
     "@types/jest": "29.5.14",
     "@types/node": "22.19.18",
     "@types/node-forge": "1.3.14",

package/src/cli/commands/logs.ts

@@ -85,6 +85,42 @@ export async function logsErrorsCommand(flags: Record<string, string>): Promise<
   }
 }
 
+const VALID_LOG_ORIGINS = ['api', 'media', 'worker'] as const;
+
+/**
+ * Resolve a Lambda function name from the --origin flag.
+ * Defaults to 'api' if no origin is specified.
+ */
+function resolveFunctionForOrigin(
+  config: { apiFunctionName: string; imageFunctionName?: string; workerFunctionName?: string },
+  origin?: string,
+): string {
+  const resolved = origin || 'api';
+
+  if (!VALID_LOG_ORIGINS.includes(resolved as typeof VALID_LOG_ORIGINS[number])) {
+    throw new Error(`Invalid origin "${resolved}". Must be one of: ${VALID_LOG_ORIGINS.join(', ')}`);
+  }
+
+  switch (resolved) {
+    case 'media':
+      if (!config.imageFunctionName) {
+        throw new Error(
+          'No image function found. Add imageFunctionName to sst.config.ts outputs or use --stage for auto-discovery.',
+        );
+      }
+      return config.imageFunctionName;
+    case 'worker':
+      if (!config.workerFunctionName) {
+        throw new Error(
+          'No worker function found. Add workerFunctionName to sst.config.ts outputs or use --stage for auto-discovery.',
+        );
+      }
+      return config.workerFunctionName;
+    default:
+      return config.apiFunctionName;
+  }
+}
+
 export async function logsTailCommand(flags: Record<string, string>): Promise<void> {
   step('Resolving deployed config...');
   let config;
@@ -95,7 +131,15 @@ export async function logsTailCommand(flags: Record<string, string>): Promise<vo
     process.exit(1);
   }
 
-  info(`Region: ${config.region}, Function: ${config.apiFunctionName}`);
+  let functionName: string;
+  try {
+    functionName = resolveFunctionForOrigin(config, flags.origin);
+  } catch (err: any) {
+    fail(err.message);
+    process.exit(1);
+  }
+
+  info(`Region: ${config.region}, Function: ${functionName}`);
 
   const filterPattern = flags.filter;
   const since = flags.since || '5m'; // 5m, 1h, 1d
@@ -110,7 +154,7 @@ export async function logsTailCommand(flags: Record<string, string>): Promise<vo
     const client = new CloudWatchLogsClient({ region: config.region });
 
     // Resolve actual log group from Lambda config (handles SST name changes)
-    const logGroupName = await resolveLogGroup(config.region, config.apiFunctionName);
+    const logGroupName = await resolveLogGroup(config.region, functionName);
 
     // Parse since duration to milliseconds
     const sinceMs = parseDuration(since);

package/src/cli/config.ts

@@ -15,6 +15,8 @@ export interface CliConfig {
   baseUrl: string;
   region: string;
   apiFunctionName: string;
+  imageFunctionName?: string;
+  workerFunctionName?: string;
   updatesBucket: string;
   clientBundlesBucket: string;
   kvsArn?: string;
@@ -26,6 +28,8 @@ interface SstOutputs {
   apiUrl?: string;
   imageUrl?: string;
   apiFunctionName?: string;
+  imageFunctionName?: string;
+  workerFunctionName?: string;
   updatesBucket?: string;
   clientBundlesBucket?: string;
   kvsArn?: string;
@@ -93,6 +97,8 @@ export async function resolveConfig(stage?: string): Promise<CliConfig> {
     baseUrl: outputs.routerUrl,
     region,
     apiFunctionName: outputs.apiFunctionName,
+    imageFunctionName: outputs.imageFunctionName,
+    workerFunctionName: outputs.workerFunctionName,
     updatesBucket: outputs.updatesBucket,
     clientBundlesBucket: outputs.clientBundlesBucket,
     kvsArn: outputs.kvsArn,

package/src/cli/discover.ts

@@ -14,11 +14,13 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-/** Mirrors DiscoveredConfig from config.ts — defined locally to avoid circular imports. */
+/** Mirrors CliConfig from config.ts — defined locally to avoid circular imports. */
 interface DiscoveredConfig {
   baseUrl: string;
   region: string;
   apiFunctionName: string;
+  imageFunctionName?: string;
+  workerFunctionName?: string;
   updatesBucket: string;
   clientBundlesBucket: string;
   kvsArn?: string;
@@ -129,24 +131,23 @@ interface LambdaResult {
 }
 
 /**
- * Find the API Lambda function for a stage.
- * Optionally extracts CDN_URL from environment variables.
+ * Find a Lambda function by SST resource name prefix.
+ * Returns the function name if found, undefined if not.
  */
-export async function discoverLambda(
+export async function discoverFunction(
   region: string,
   prefix: string,
-): Promise<LambdaResult> {
+  resourceName: string,
+): Promise<string | undefined> {
   const {
     LambdaClient,
     ListFunctionsCommand,
-    GetFunctionConfigurationCommand,
   } = await import('@aws-sdk/client-lambda');
 
   const client = new LambdaClient({ region });
-  const needle = `${prefix}ApiFunction-`.toLowerCase();
+  const needle = `${prefix}${resourceName}-`.toLowerCase();
 
   let marker: string | undefined;
-  let matchName: string | undefined;
 
   do {
     const res = await client.send(
@@ -155,14 +156,25 @@ export async function discoverLambda(
     const items = res.Functions || [];
     for (const fn of items) {
       if (fn.FunctionName && fn.FunctionName.toLowerCase().startsWith(needle)) {
-        matchName = fn.FunctionName;
-        break;
+        return fn.FunctionName;
       }
     }
-    if (matchName) break;
     marker = res.NextMarker;
   } while (marker);
 
+  return undefined;
+}
+
+/**
+ * Find the API Lambda function for a stage.
+ * Extracts CDN_URL from environment variables for routerUrl.
+ */
+export async function discoverLambda(
+  region: string,
+  prefix: string,
+): Promise<LambdaResult> {
+  const matchName = await discoverFunction(region, prefix, 'ApiFunction');
+
   if (!matchName) {
     throw new Error(
       `No API Lambda found for prefix "${prefix}ApiFunction-*". ` +
@@ -171,6 +183,12 @@ export async function discoverLambda(
   }
 
   // Get env vars for routerUrl (CDN_URL)
+  const {
+    LambdaClient,
+    GetFunctionConfigurationCommand,
+  } = await import('@aws-sdk/client-lambda');
+
+  const client = new LambdaClient({ region });
   const config = await client.send(
     new GetFunctionConfigurationCommand({ FunctionName: matchName }),
   );
@@ -236,10 +254,12 @@ export async function discoverConfig(
   const prefix = `${appName}-${stage}-`;
 
   // Run CF function + Lambda + S3 discovery in parallel
-  const [cfResult, lambdaResult, bucketsResult] = await Promise.all([
+  const [cfResult, lambdaResult, bucketsResult, imageFn, workerFn] = await Promise.all([
     discoverCfFunction(region, prefix),
     discoverLambda(region, prefix),
     discoverBuckets(region, prefix),
+    discoverFunction(region, prefix, 'ImageFunction').catch(() => undefined),
+    discoverFunction(region, prefix, 'WorkerFunction').catch(() => undefined),
   ]);
 
   // Distribution discovery is best-effort (not critical for most CLI operations)
@@ -269,6 +289,8 @@ export async function discoverConfig(
     baseUrl: lambdaResult.routerUrl || '',
     region,
     apiFunctionName: lambdaResult.functionName,
+    imageFunctionName: imageFn,
+    workerFunctionName: workerFn,
     updatesBucket: bucketsResult.updatesBucket,
     clientBundlesBucket: bucketsResult.clientBundlesBucket,
     kvsArn: cfResult.kvsArn,
@@ -286,6 +308,8 @@ interface CachedOutputs {
   _cachedAt: number;
   routerUrl?: string;
   apiFunctionName?: string;
+  imageFunctionName?: string;
+  workerFunctionName?: string;
   updatesBucket?: string;
   clientBundlesBucket?: string;
   kvsArn?: string;
@@ -308,6 +332,8 @@ export async function getCachedConfig(stage: string): Promise<DiscoveredConfig |
       baseUrl: cached.routerUrl || '',
       region: process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION || 'us-east-1',
       apiFunctionName: cached.apiFunctionName,
+      imageFunctionName: cached.imageFunctionName,
+      workerFunctionName: cached.workerFunctionName,
       updatesBucket: cached.updatesBucket,
       clientBundlesBucket: cached.clientBundlesBucket,
       kvsArn: cached.kvsArn,
@@ -323,6 +349,8 @@ export async function setCachedConfig(stage: string, config: DiscoveredConfig):
     _cachedAt: Date.now(),
     routerUrl: config.baseUrl,
     apiFunctionName: config.apiFunctionName,
+    imageFunctionName: config.imageFunctionName,
+    workerFunctionName: config.workerFunctionName,
     updatesBucket: config.updatesBucket,
     clientBundlesBucket: config.clientBundlesBucket,
     kvsArn: config.kvsArn,

package/src/cli/index.ts

@@ -167,7 +167,7 @@ Usage:
   everystack diag              [url] --hydration  Analyze SSR hydration issues (fetches full HTML)
   everystack analyze:ssr       [--app ./app]      Scan app code for SSR anti-patterns
   everystack logs:errors       [--stage <name>] [--limit 20] [--level error|fatal] [--source <name>]
-  everystack logs:tail         [--stage <name>] [--filter <pattern>] [--since 5m]
+  everystack logs:tail         [--stage <name>] [--origin api|media|worker] [--filter <pattern>] [--since 5m]
   everystack logs:query        [--stage <name>] [--level <level>] [--source <name>] [--traceId <id>] [--search <text>]
   everystack branches list
   everystack branches create   --name <name>