@ts-cloud/core 0.5.5 → 0.5.7

package/dist/index.js

@@ -45416,16 +45416,21 @@ function resolveServerlessRuntime(app) {
 }
 
 // src/serverless/composer.ts
-function resolveQueueNames(app, slug, env) {
+function resolveQueues(app, slug, env) {
   if (app.queues === false)
     return [];
   if (app.queues === undefined || app.queues === true)
-    return [`${slug}-${env}-default`];
+    return [{ name: `${slug}-${env}-default` }];
   return app.queues.map((q) => {
-    const name = typeof q === "string" ? q : Object.keys(q)[0];
-    return `${slug}-${env}-${name}`;
+    if (typeof q === "string")
+      return { name: `${slug}-${env}-${q}` };
+    const [name, concurrency] = Object.entries(q)[0];
+    return { name: `${slug}-${env}-${name}`, concurrency };
   });
 }
+function resolveQueueNames(app, slug, env) {
+  return resolveQueues(app, slug, env).map((q) => q.name);
+}
 function composeServerlessAppTemplate(opts) {
   const { app, environment, handlers } = opts;
   const slug = opts.config.project.slug;
@@ -45437,8 +45442,12 @@ function composeServerlessAppTemplate(opts) {
     queue: `${slug}-${environment}-queue`,
     cli: `${slug}-${environment}-cli`
   };
-  const queueNames = resolveQueueNames(app, slug, environment);
+  if (app.gatewayVersion === 1)
+    throw new Error("serverless app: `gatewayVersion: 1` (REST API) is not supported — ts-cloud uses API Gateway HTTP API (v2). Remove `gatewayVersion` or set it to 2.");
+  const queues = resolveQueues(app, slug, environment);
+  const queueNames = queues.map((q) => q.name);
   const hasQueue = queueNames.length > 0;
+  const logRetention = app.logRetention ?? 14;
   const imageMode = app.packaging === "image";
   const schedulerEnabled = (app.scheduler ?? "on") !== "off";
   const cacheEnabled = (app.cache?.driver ?? "dynamodb") === "dynamodb";
@@ -45554,7 +45563,7 @@ function composeServerlessAppTemplate(opts) {
   function addFunction(logicalId, name, handler8, mode, memory, timeout, reservedConcurrency, tmp = tmpStorage) {
     resources[`${logicalId}LogGroup`] = {
       Type: "AWS::Logs::LogGroup",
-      Properties: { LogGroupName: `/aws/lambda/${name}`, RetentionInDays: 14 }
+      Properties: { LogGroupName: `/aws/lambda/${name}`, RetentionInDays: logRetention }
     };
     const codeProps = imageMode ? {
       PackageType: "Image",
@@ -45695,19 +45704,21 @@ function composeServerlessAppTemplate(opts) {
         MessageRetentionPeriod: 1209600
       }
     };
-    queueNames.forEach((qName, i) => {
+    queues.forEach((q, i) => {
       const qId = `AppQueue${i}`;
+      const fnTimeout = app.queueTimeout ?? 120;
       resources[qId] = {
         Type: "AWS::SQS::Queue",
         Properties: {
-          QueueName: qName,
-          VisibilityTimeout: Math.max(app.queueTimeout ?? 120, app.queueTimeout ?? 120),
+          QueueName: q.name,
+          VisibilityTimeout: Math.min(43200, fnTimeout * 6),
           RedrivePolicy: {
             deadLetterTargetArn: Fn2.getAtt("AppQueueDlq", "Arn"),
             maxReceiveCount: app.queueTries ?? 3
           }
         }
       };
+      const concurrency = q.concurrency ?? app.queueConcurrency;
       resources[`${qId}Mapping`] = {
         Type: "AWS::Lambda::EventSourceMapping",
         Properties: {
@@ -45715,10 +45726,10 @@ function composeServerlessAppTemplate(opts) {
           FunctionName: Fn2.ref("QueueFunction"),
           BatchSize: 1,
           FunctionResponseTypes: ["ReportBatchItemFailures"],
-          ...app.queueConcurrency ? { ScalingConfig: { MaximumConcurrency: Math.max(2, app.queueConcurrency) } } : {}
+          ...concurrency ? { ScalingConfig: { MaximumConcurrency: Math.max(2, concurrency) } } : {}
         }
       };
-      outputs[`QueueUrl${i}`] = { Description: `Queue URL: ${qName}`, Value: Fn2.ref(qId) };
+      outputs[`QueueUrl${i}`] = { Description: `Queue URL: ${q.name}`, Value: Fn2.ref(qId) };
     });
   }
   if (schedulerEnabled) {
@@ -46031,7 +46042,10 @@ function composeServerlessAppTemplate(opts) {
         DatabaseName: "app",
         MasterUsername: Fn2.sub("{{resolve:secretsmanager:${DbSecret}:SecretString:username}}"),
         MasterUserPassword: Fn2.sub("{{resolve:secretsmanager:${DbSecret}:SecretString:password}}"),
-        ServerlessV2ScalingConfiguration: { MinCapacity: 0.5, MaxCapacity: 4 },
+        ServerlessV2ScalingConfiguration: {
+          MinCapacity: app.database?.minCapacity ?? 0.5,
+          MaxCapacity: app.database?.maxCapacity ?? 4
+        },
         DBSubnetGroupName: Fn2.ref("DbSubnetGroup"),
         VpcSecurityGroupIds: [Fn2.getAtt("DataSecurityGroup", "GroupId")]
       }
@@ -47111,6 +47125,7 @@ export {
   resolveServerlessArtifactBucketName,
   resolveServerlessAppStackName,
   resolveRegion,
+  resolveQueues,
   resolveQueueNames,
   resolveProjectStackName,
   resolveManagementDashboardSite,

package/dist/runtime-assets/octane-runtime.php

@@ -17,9 +17,6 @@ require $taskRoot . '/vendor/autoload.php';
 $app = require $taskRoot . '/bootstrap/app.php';
 $kernel = $app->make(\Illuminate\Contracts\Http\Kernel::class);
 
-$maintenance = getenv('MAINTENANCE_MODE') === '1';
-$bypassSecret = getenv('MAINTENANCE_BYPASS_SECRET') ?: '';
-
 while (true) {
     $ctx = nextInvocation($runtimeApi);
     if ($ctx === null) {
@@ -27,6 +24,11 @@ while (true) {
     }
     [$requestId, $event] = $ctx;
 
+    // Read maintenance state per-invocation so `cloud down`/`up` reaches warm
+    // containers (env is flipped via updateFunctionConfiguration).
+    $maintenance = getenv('MAINTENANCE_MODE') === '1';
+    $bypassSecret = getenv('MAINTENANCE_BYPASS_SECRET') ?: '';
+
     try {
         $response = handle($event, $kernel, $maintenance, $bypassSecret);
         postResponse($runtimeApi, $requestId, $response);

package/dist/runtime-assets/runtime.php

@@ -24,9 +24,6 @@ for ($i = 0; $i < 50 && !file_exists($socketPath); $i++) {
     usleep(100000); // 100ms
 }
 
-$maintenance = getenv('MAINTENANCE_MODE') === '1';
-$bypassSecret = getenv('MAINTENANCE_BYPASS_SECRET') ?: '';
-
 while (true) {
     // 1. Get the next invocation.
     $ctx = nextInvocation($runtimeApi);
@@ -35,6 +32,12 @@ while (true) {
     }
     [$requestId, $event] = $ctx;
 
+    // Read maintenance state per-invocation: `cloud down`/`up` flips the env via
+    // updateFunctionConfiguration, but warm containers would keep a cold-start
+    // value if cached outside the loop (the Node adapter reads it per-request too).
+    $maintenance = getenv('MAINTENANCE_MODE') === '1';
+    $bypassSecret = getenv('MAINTENANCE_BYPASS_SECRET') ?: '';
+
     try {
         $response = handle($event, $fpm, $docRoot, $maintenance, $bypassSecret);
         postResponse($runtimeApi, $requestId, $response);

package/dist/serverless/composer.d.ts

@@ -38,6 +38,17 @@ export interface ComposedTemplate {
     /** Count of resources by CloudFormation type (for deploy summaries). */
     resourceSummary: Record<string, number>;
 }
-/** Resolve the SQS queue names from the manifest. */
+/** A resolved queue: its full name plus an optional per-queue concurrency cap. */
+export interface ResolvedQueue {
+    name: string;
+    /** Per-queue max concurrency (`queues: [{ emails: 10 }]`), if specified. */
+    concurrency?: number;
+}
+/**
+ * Resolve the SQS queues from the manifest, preserving any per-queue concurrency
+ * (`queues: [{ emails: 10 }]` → `{ name: '…-emails', concurrency: 10 }`).
+ */
+export declare function resolveQueues(app: ServerlessAppConfig, slug: string, env: EnvironmentType): ResolvedQueue[];
+/** Resolve just the SQS queue names from the manifest. */
 export declare function resolveQueueNames(app: ServerlessAppConfig, slug: string, env: EnvironmentType): string[];
 export declare function composeServerlessAppTemplate(opts: ComposeOptions): ComposedTemplate;

package/dist/types.d.ts

@@ -1579,13 +1579,19 @@ export interface ServerlessAppConfig {
     timeout?: number;
     /** Reserved concurrency for the HTTP function. */
     concurrency?: number;
-    /** API Gateway version: 2 = HTTP API (cheaper, default), 1 = REST API. @default 2 */
+    /**
+     * API Gateway version. Only `2` (HTTP API — cheaper, faster) is supported;
+     * `1` (REST API) throws at compose time. @default 2
+     */
     gatewayVersion?: 1 | 2;
     /**
-     * Keep-warm count. Sets provisioned concurrency on the HTTP alias, or drives a
-     * scheduled warmer rule. 0/undefined disables warming.
+     * Keep-warm count. Drives a scheduled EventBridge warmer rule that pings the
+     * HTTP function every few minutes (the runtime short-circuits warmer pings).
+     * 0/undefined disables warming.
      */
     warm?: number;
+    /** CloudWatch log retention (days) for all function log groups. @default 14 */
+    logRetention?: number;
     /** CLI function memory in MB. @default 1024 */
     cliMemory?: number;
     /** CLI command timeout in seconds (allow room for migrations). @default 900 */
@@ -1653,6 +1659,10 @@ export interface ServerlessAppConfig {
     database?: {
         connection?: 'rds-proxy' | 'aurora-serverless' | 'rds';
         cluster?: string;
+        /** Aurora Serverless v2 minimum capacity (ACUs). @default 0.5 */
+        minCapacity?: number;
+        /** Aurora Serverless v2 maximum capacity (ACUs). @default 4 */
+        maxCapacity?: number;
     };
     /** Cache attachment. DynamoDB cache table is the zero-NAT default. */
     cache?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-cloud/core",
-  "version": "0.5.5",
+  "version": "0.5.7",
   "type": "module",
   "description": "Core CloudFormation generation library for ts-cloud",
   "author": "Chris Breuer <chris@stacksjs.com>",
@@ -31,7 +31,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@ts-cloud/aws-types": "0.5.5"
+    "@ts-cloud/aws-types": "0.5.7"
   },
   "devDependencies": {
     "typescript": "^5.9.3"