canopycms-cdk 0.0.68-int.97 → 0.0.68-int.98

package/dist/constructs/asset-support.js

@@ -88,10 +88,9 @@ const TRANSFORM_LAMBDA_TIMEOUT = Duration.seconds(30);
  *
  * A reservation is a CAP carved from the account's concurrency pool, not
  * pre-warmed capacity, so it costs nothing when idle (that is
- * `provisionedConcurrentExecutions`, which this is not). 10 mirrors the CMS
- * Lambda's own reservation: genuine demand is first-render misses only, since
- * every already-generated derivative is served by the S3 primary origin without
- * invoking this function at all.
+ * `provisionedConcurrentExecutions`, which this is not). Genuine demand is
+ * first-render misses only, since every already-generated derivative is served
+ * by the S3 primary origin without invoking this function at all.
  */
 const TRANSFORM_LAMBDA_RESERVED_CONCURRENCY = 10;
 /**

package/dist/constructs/cms-service.d.ts

@@ -21,6 +21,15 @@ import type { CanopyCmsAttachOptions } from './editor-routing.js';
  * than deploying a configuration that would 504.
  */
 export declare const DEFAULT_CMS_LAMBDA_TIMEOUT: Duration;
+/**
+ * The cap below which synth warns. With nothing cached, a cold editor load on
+ * the example app sends the Lambda about 25 requests, 14 of them chunks
+ * requested together, and each invocation holds an execution environment
+ * through its cold start.
+ */
+export declare const MIN_CMS_RESERVED_CONCURRENCY = 20;
+/** Default `reservedConcurrency`; see that prop for what it caps and costs. */
+export declare const DEFAULT_CMS_RESERVED_CONCURRENCY = 50;
 export interface CanopyCmsServiceProps {
     /** Docker image for the CMS Lambda function */
     cmsDockerImage: lambda.DockerImageCode;
@@ -30,7 +39,24 @@ export interface CanopyCmsServiceProps {
     memorySize?: number;
     /** Lambda timeout (default: 60 seconds) */
     timeout?: Duration;
-    /** Lambda reserved concurrency cap (default: 10) */
+    /**
+     * Cap on the CMS Lambda's concurrent invocations (default: 50).
+     *
+     * Everything the Lambda serves counts against it, including the editor's
+     * static chunks (`editorAssetPrefix` on `attachTo`, `/_next/static/*` on
+     * `CanopyCmsDistribution`) whenever CloudFront misses them. CloudFront caches
+     * per regional edge cache, so after a deploy the first editor load behind
+     * each one requests every chunk together, and an invocation over the cap is
+     * answered 429: the
+     * browser refuses that as a script and the editor fails with
+     * `ChunkLoadError`. Synth warns below {@link MIN_CMS_RESERVED_CONCURRENCY}.
+     *
+     * A reservation costs nothing while idle; it is a ceiling, and a share of
+     * the account's concurrency set aside so other functions cannot use it.
+     * Lambda keeps 100 of the account's limit unreserved, so this plus every
+     * other reservation (AssetSupport's transform Lambda reserves 10) must fit
+     * within the account limit minus 100.
+     */
     reservedConcurrency?: number;
     /**
      * Lambda architecture (default: `Architecture.ARM_64`, matching the EC2

package/dist/constructs/cms-service.js

@@ -1,7 +1,7 @@
 import * as path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { Construct } from 'constructs';
-import { Duration, RemovalPolicy, Stack, Token, aws_ec2 as ec2, aws_efs as efs, aws_iam as iam, aws_lambda as lambda, aws_autoscaling as autoscaling, aws_s3_assets as s3assets, aws_logs as logs, } from 'aws-cdk-lib';
+import { Annotations, Duration, RemovalPolicy, Stack, Token, aws_ec2 as ec2, aws_efs as efs, aws_iam as iam, aws_lambda as lambda, aws_autoscaling as autoscaling, aws_s3_assets as s3assets, aws_logs as logs, } from 'aws-cdk-lib';
 import { attachLambdaExecutionPolicies } from './lambda-execution-role.js';
 import { attachEditorBehaviors } from './editor-routing.js';
 // This package (`canopycms-cdk`) is `"type": "module"`, so its compiled output
@@ -465,6 +465,15 @@ function assertGitHubAuthProps(props) {
  * than deploying a configuration that would 504.
  */
 export const DEFAULT_CMS_LAMBDA_TIMEOUT = Duration.seconds(60);
+/**
+ * The cap below which synth warns. With nothing cached, a cold editor load on
+ * the example app sends the Lambda about 25 requests, 14 of them chunks
+ * requested together, and each invocation holds an execution environment
+ * through its cold start.
+ */
+export const MIN_CMS_RESERVED_CONCURRENCY = 20;
+/** Default `reservedConcurrency`; see that prop for what it caps and costs. */
+export const DEFAULT_CMS_RESERVED_CONCURRENCY = 50;
 /**
  * Core CDK construct for CanopyCMS deployment.
  *
@@ -686,6 +695,14 @@ export class CanopyCmsService extends Construct {
         // Silicon, amd64 on an x86 CI runner) while the function stays x86_64, and
         // the mismatch only shows at invoke. See `architecture`'s doc comment.
         const architecture = props.architecture ?? lambda.Architecture.ARM_64;
+        const reservedConcurrency = props.reservedConcurrency ?? DEFAULT_CMS_RESERVED_CONCURRENCY;
+        if (!Token.isUnresolved(reservedConcurrency) &&
+            reservedConcurrency < MIN_CMS_RESERVED_CONCURRENCY) {
+            Annotations.of(this).addWarningV2('canopycms:cms-reserved-concurrency-low', `reservedConcurrency is ${reservedConcurrency}, below ${MIN_CMS_RESERVED_CONCURRENCY}. ` +
+                `The editor's static chunks are served by this Lambda until CloudFront caches them, ` +
+                `and a cold editor load requests them together, so a throttled chunk fails the ` +
+                `editor with ChunkLoadError. See the reservedConcurrency prop.`);
+        }
         this.lambdaFunction = new lambda.DockerImageFunction(this, 'CmsFunction', {
             code: props.cmsDockerImage,
             // Default (unset) leaves CDK to create the execution role, with its own
@@ -693,7 +710,7 @@ export class CanopyCmsService extends Construct {
             role: props.lambdaRole,
             memorySize: props.memorySize ?? 2048,
             timeout: this.timeout,
-            reservedConcurrentExecutions: props.reservedConcurrency ?? 10,
+            reservedConcurrentExecutions: reservedConcurrency,
             architecture,
             vpc: this.vpc,
             vpcSubnets: { subnetType: ec2.SubnetType.PRIVATE_ISOLATED },

package/lambda/asset-transform/dist/handler.js

@@ -4522,7 +4522,7 @@ var init_config = __esm({
       title: external_exports.string().optional(),
       subtitle: external_exports.string().optional(),
       theme: external_exports.unknown().optional(),
-      previewBase: external_exports.record(external_exports.string()).optional(),
+      previewBase: external_exports.record(external_exports.union([external_exports.string(), external_exports.literal(false)])).optional(),
       previewPrefix: previewPrefixSchema.optional(),
       // UI handler functions (runtime only, don't serialize)
       onAccountClick: external_exports.function().returns(external_exports.void()).optional(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canopycms-cdk",
-  "version": "0.0.68-int.97",
+  "version": "0.0.68-int.98",
   "description": "AWS CDK constructs and EC2 worker for CanopyCMS deployment",
   "license": "MIT",
   "repository": {
@@ -31,7 +31,7 @@
   "peerDependencies": {
     "aws-cdk-lib": "^2.260.0",
     "constructs": "^10.0.0",
-    "canopycms": "0.0.68-int.97"
+    "canopycms": "0.0.68-int.98"
   },
   "peerDependenciesMeta": {
     "aws-cdk-lib": {
@@ -56,8 +56,8 @@
     "tsx": "^4.19.0",
     "typescript": "^5.6.3",
     "vitest": "^4.1.0",
-    "canopycms": "0.0.68-int.97",
-    "canopycms-auth-clerk": "0.0.68-int.97"
+    "canopycms": "0.0.68-int.98",
+    "canopycms-auth-clerk": "0.0.68-int.98"
   },
   "scripts": {
     "build": "rm -rf dist && tsc && node ../../scripts/add-js-extensions.mjs dist",

package/worker/dist/index.js

@@ -12515,7 +12515,7 @@ var init_config2 = __esm({
       title: external_exports.string().optional(),
       subtitle: external_exports.string().optional(),
       theme: external_exports.unknown().optional(),
-      previewBase: external_exports.record(external_exports.string()).optional(),
+      previewBase: external_exports.record(external_exports.union([external_exports.string(), external_exports.literal(false)])).optional(),
       previewPrefix: previewPrefixSchema.optional(),
       // UI handler functions (runtime only, don't serialize)
       onAccountClick: external_exports.function().returns(external_exports.void()).optional(),
@@ -48958,7 +48958,7 @@ async function writeWorkerStatus(taskDir, report) {
 }
 
 // ../canopycms/src/version.ts
-var CANOPYCMS_VERSION = "0.0.68-int.97";
+var CANOPYCMS_VERSION = "0.0.68-int.98";
 
 // ../canopycms/src/worker/log.ts
 init_logger();