sst 2.16.2 → 2.16.4

package/cli/ui/deploy.js

@@ -111,10 +111,16 @@ function logicalIdToCdkPath(assembly, stack, logicalId) {
     return found.split("/").filter(Boolean).slice(1, -1).join("/");
 }
 function getHelper(error) {
-    return (getApiAccessLogPermissionsHelper(error) ||
+    return (getCloudFrontBehaviorLimitHelper(error) ||
+        getApiAccessLogPermissionsHelper(error) ||
         getAppSyncMultiResolverHelper(error) ||
         getApiLogRoleHelper(error));
 }
+function getCloudFrontBehaviorLimitHelper(error) {
+    if (error.indexOf("Your request contains more CacheBehaviors than are allowed per distribution.") > -1) {
+        return `This error often occurs when deploying a frontend with a large number of top-level files and folders in the assets directory. Check out this doc on how to resolve the issue - https://docs.sst.dev/known-issues#cloudfront-cachebehaviors-limit-exceeded`;
+    }
+}
 function getApiAccessLogPermissionsHelper(error) {
     // Can run into this issue when enabling access logs for API Gateway
     // note: this should be handled in SST as access log group names are now

package/constructs/Construct.js

@@ -8,7 +8,7 @@ export function getFunctionRef(fn) {
         return undefined;
     return {
         node: fn.node.addr,
-        stack: Stack.of(fn).node.id,
+        stack: Stack.of(fn).stackName,
     };
 }
 export function isConstruct(construct) {

package/constructs/NextjsSite.d.ts

@@ -1,5 +1,5 @@
 import { Construct } from "constructs";
-import { Function as CdkFunction } from "aws-cdk-lib/aws-lambda";
+import { Function as CdkFunction, FunctionProps } from "aws-cdk-lib/aws-lambda";
 import { Distribution } from "aws-cdk-lib/aws-cloudfront";
 import { EdgeFunction } from "./EdgeFunction.js";
 import { SsrSite, SsrSiteProps } from "./SsrSite.js";
@@ -21,6 +21,9 @@ export interface NextjsSiteProps extends Omit<SsrSiteProps, "nodejs"> {
      * @default Server function is not kept warm
      */
     warm?: number;
+    cdk?: SsrSiteProps["cdk"] & {
+        revalidation?: Pick<FunctionProps, "vpc" | "vpcSubnets">;
+    };
 }
 /**
  * The `NextjsSite` construct is a higher level CDK construct that makes it easy to create a Next.js app.
@@ -58,12 +61,8 @@ export declare class NextjsSite extends SsrSite {
     private createWarmer;
     protected createCloudFrontDistributionForRegional(): Distribution;
     protected createCloudFrontDistributionForEdge(): Distribution;
-    private buildServerBehaviorForRegional;
-    private buildServerBehaviorForEdge;
     private buildImageBehavior;
     private buildStaticFileBehavior;
-    private buildDefaultNextjsBehaviorForRegional;
-    private buildDefaultNextjsBehaviorForEdge;
     protected generateBuildId(): string;
     getConstructMetadata(): {
         data: {

package/constructs/NextjsSite.js

@@ -4,8 +4,8 @@ import { Fn, Duration as CdkDuration, RemovalPolicy, CustomResource, } from "aws
 import { Effect, Policy, PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { Function as CdkFunction, Code, Runtime, Architecture, FunctionUrlAuthType, } from "aws-cdk-lib/aws-lambda";
-import { Distribution, ViewerProtocolPolicy, AllowedMethods, LambdaEdgeEventType, CachedMethods, CachePolicy, } from "aws-cdk-lib/aws-cloudfront";
-import { S3Origin, HttpOrigin, OriginGroup, } from "aws-cdk-lib/aws-cloudfront-origins";
+import { Distribution, ViewerProtocolPolicy, AllowedMethods, CachedMethods, CachePolicy, } from "aws-cdk-lib/aws-cloudfront";
+import { S3Origin, HttpOrigin } from "aws-cdk-lib/aws-cloudfront-origins";
 import { Rule, Schedule } from "aws-cdk-lib/aws-events";
 import { LambdaFunction } from "aws-cdk-lib/aws-events-targets";
 import { Queue } from "aws-cdk-lib/aws-sqs";
@@ -15,7 +15,6 @@ import { SsrFunction } from "./SsrFunction.js";
 import { EdgeFunction } from "./EdgeFunction.js";
 import { SsrSite } from "./SsrSite.js";
 import { toCdkSize } from "./util/size.js";
-import { toCdkDuration } from "./util/duration.js";
 /**
  * The `NextjsSite` construct is a higher level CDK construct that makes it easy to create a Next.js app.
  * @example
@@ -41,6 +40,7 @@ export class NextjsSite extends SsrSite {
     createRevalidation() {
         if (!this.serverLambdaForRegional && !this.serverLambdaForEdge)
             return;
+        const { cdk } = this.props;
         const queue = new Queue(this, "RevalidationQueue", {
             fifo: true,
             receiveMessageWaitTime: CdkDuration.seconds(20),
@@ -51,6 +51,7 @@ export class NextjsSite extends SsrSite {
             code: Code.fromAsset(path.join(this.props.path, ".open-next", "revalidation-function")),
             runtime: Runtime.NODEJS_18_X,
             timeout: CdkDuration.seconds(30),
+            ...cdk?.revalidation,
         });
         consumer.addEventSource(new SqsEventSource(queue, { batchSize: 5 }));
         // Allow server to send messages to the queue
@@ -239,19 +240,11 @@ export class NextjsSite extends SsrSite {
          *    - Cache-Control: public, max-age=0, must-revalidate
          *    - x-vercel-cache: MISS
          */
-        const { timeout, cdk } = this.props;
+        const { cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
         const s3Origin = new S3Origin(this.cdk.bucket, {
             originPath: "/" + this.buildConfig.clientBuildS3KeyPrefix,
         });
-        const serverFnUrl = this.serverLambdaForRegional.addFunctionUrl({
-            authType: FunctionUrlAuthType.NONE,
-        });
-        const serverOrigin = new HttpOrigin(Fn.parseDomainName(serverFnUrl.url), {
-            readTimeout: typeof timeout === "string"
-                ? toCdkDuration(timeout)
-                : CdkDuration.seconds(timeout),
-        });
         const cachePolicy = cdk?.serverCachePolicy ??
             this.buildServerCachePolicy([
                 "accept",
@@ -259,8 +252,7 @@ export class NextjsSite extends SsrSite {
                 "next-router-prefetch",
                 "next-router-state-tree",
             ]);
-        const originRequestPolicy = this.buildServerOriginRequestPolicy();
-        const serverBehavior = this.buildServerBehaviorForRegional(serverOrigin, cachePolicy, originRequestPolicy);
+        const serverBehavior = this.buildDefaultBehaviorForRegional(cachePolicy);
         return new Distribution(this, "Distribution", {
             // these values can be overwritten by cfDistributionProps
             defaultRootObject: "",
@@ -269,12 +261,13 @@ export class NextjsSite extends SsrSite {
             // these values can NOT be overwritten by cfDistributionProps
             domainNames: this.buildDistributionDomainNames(),
             certificate: this.cdk.certificate,
-            defaultBehavior: this.buildDefaultNextjsBehaviorForRegional(serverOrigin, s3Origin, cachePolicy, originRequestPolicy),
+            defaultBehavior: serverBehavior,
             additionalBehaviors: {
                 "api/*": serverBehavior,
                 "_next/data/*": serverBehavior,
                 "_next/image*": this.buildImageBehavior(cachePolicy),
                 "_next/*": this.buildStaticFileBehavior(s3Origin),
+                ...this.buildStaticFileBehaviors(s3Origin),
                 ...(cfDistributionProps.additionalBehaviors || {}),
             },
         });
@@ -292,9 +285,7 @@ export class NextjsSite extends SsrSite {
                 "next-router-prefetch",
                 "next-router-state-tree",
             ]);
-        const originRequestPolicy = this.buildServerOriginRequestPolicy();
-        const functionVersion = this.serverLambdaForEdge.currentVersion;
-        const serverBehavior = this.buildServerBehaviorForEdge(functionVersion, s3Origin, cachePolicy, originRequestPolicy);
+        const serverBehavior = this.buildDefaultBehaviorForEdge(s3Origin, cachePolicy);
         return new Distribution(this, "Distribution", {
             // these values can be overwritten by cfDistributionProps
             defaultRootObject: "",
@@ -303,51 +294,17 @@ export class NextjsSite extends SsrSite {
             // these values can NOT be overwritten by cfDistributionProps
             domainNames: this.buildDistributionDomainNames(),
             certificate: this.cdk.certificate,
-            defaultBehavior: this.buildDefaultNextjsBehaviorForEdge(functionVersion, s3Origin, cachePolicy, originRequestPolicy),
+            defaultBehavior: serverBehavior,
             additionalBehaviors: {
                 "api/*": serverBehavior,
                 "_next/data/*": serverBehavior,
                 "_next/image*": this.buildImageBehavior(cachePolicy),
                 "_next/*": this.buildStaticFileBehavior(s3Origin),
+                ...this.buildStaticFileBehaviors(s3Origin),
                 ...(cfDistributionProps.additionalBehaviors || {}),
             },
         });
     }
-    buildServerBehaviorForRegional(serverOrigin, cachePolicy, originRequestPolicy) {
-        const { cdk } = this.props;
-        return {
-            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-            functionAssociations: this.buildBehaviorFunctionAssociations(),
-            origin: serverOrigin,
-            allowedMethods: AllowedMethods.ALLOW_ALL,
-            cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
-            compress: true,
-            cachePolicy,
-            responseHeadersPolicy: cdk?.responseHeadersPolicy,
-            originRequestPolicy,
-        };
-    }
-    buildServerBehaviorForEdge(functionVersion, s3Origin, cachePolicy, originRequestPolicy) {
-        const { cdk } = this.props;
-        return {
-            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-            functionAssociations: this.buildBehaviorFunctionAssociations(),
-            origin: s3Origin,
-            allowedMethods: AllowedMethods.ALLOW_ALL,
-            cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
-            compress: true,
-            cachePolicy,
-            responseHeadersPolicy: cdk?.responseHeadersPolicy,
-            originRequestPolicy,
-            edgeLambdas: [
-                {
-                    includeBody: true,
-                    eventType: LambdaEdgeEventType.ORIGIN_REQUEST,
-                    functionVersion,
-                },
-            ],
-        };
-    }
     buildImageBehavior(cachePolicy) {
         const { cdk } = this.props;
         const imageFn = this.createImageOptimizationFunction();
@@ -376,53 +333,6 @@ export class NextjsSite extends SsrSite {
             responseHeadersPolicy: cdk?.responseHeadersPolicy,
         };
     }
-    buildDefaultNextjsBehaviorForRegional(serverOrigin, s3Origin, cachePolicy, originRequestPolicy) {
-        // Create default behavior
-        // default handler for requests that don't match any other path:
-        //   - try lambda handler first
-        //   - if failed, fall back to S3
-        const { cdk } = this.props;
-        const cfDistributionProps = cdk?.distribution || {};
-        const fallbackOriginGroup = new OriginGroup({
-            primaryOrigin: serverOrigin,
-            fallbackOrigin: s3Origin,
-            fallbackStatusCodes: [503],
-        });
-        return {
-            origin: fallbackOriginGroup,
-            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-            functionAssociations: this.buildBehaviorFunctionAssociations(),
-            compress: true,
-            cachePolicy,
-            responseHeadersPolicy: cdk?.responseHeadersPolicy,
-            originRequestPolicy,
-            ...(cfDistributionProps.defaultBehavior || {}),
-        };
-    }
-    buildDefaultNextjsBehaviorForEdge(functionVersion, s3Origin, cachePolicy, originRequestPolicy) {
-        const { cdk } = this.props;
-        const cfDistributionProps = cdk?.distribution || {};
-        return {
-            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-            functionAssociations: this.buildBehaviorFunctionAssociations(),
-            origin: s3Origin,
-            allowedMethods: AllowedMethods.ALLOW_ALL,
-            cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
-            compress: true,
-            cachePolicy,
-            responseHeadersPolicy: cdk?.responseHeadersPolicy,
-            originRequestPolicy,
-            ...(cfDistributionProps.defaultBehavior || {}),
-            edgeLambdas: [
-                {
-                    includeBody: true,
-                    eventType: LambdaEdgeEventType.ORIGIN_REQUEST,
-                    functionVersion,
-                },
-                ...(cfDistributionProps.defaultBehavior?.edgeLambdas || []),
-            ],
-        };
-    }
     generateBuildId() {
         const filePath = path.join(this.props.path, ".next/BUILD_ID");
         return fs.readFileSync(filePath).toString();

package/constructs/SsrSite.d.ts

@@ -4,6 +4,7 @@ import { Function as CdkFunction, IFunction as ICdkFunction, FunctionProps } fro
 import { IHostedZone } from "aws-cdk-lib/aws-route53";
 import { Distribution, ICachePolicy, IResponseHeadersPolicy, BehaviorOptions, CachePolicy, Function as CfFunction, FunctionEventType as CfFunctionEventType } from "aws-cdk-lib/aws-cloudfront";
 import { ICertificate } from "aws-cdk-lib/aws-certificatemanager";
+import { S3Origin } from "aws-cdk-lib/aws-cloudfront-origins";
 import { SSTConstruct } from "./Construct.js";
 import { NodeJSProps } from "./Function.js";
 import { EdgeFunction } from "./EdgeFunction.js";
@@ -287,13 +288,13 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
     protected createCloudFrontDistributionForRegional(): Distribution;
     protected createCloudFrontDistributionForEdge(): Distribution;
     protected buildDistributionDomainNames(): string[];
-    protected buildDefaultBehaviorForRegional(): BehaviorOptions;
-    private buildDefaultBehaviorForEdge;
+    protected buildDefaultBehaviorForRegional(cachePolicy: ICachePolicy): BehaviorOptions;
+    protected buildDefaultBehaviorForEdge(origin: S3Origin, cachePolicy: ICachePolicy): BehaviorOptions;
     protected buildBehaviorFunctionAssociations(): {
         eventType: CfFunctionEventType;
         function: CfFunction;
     }[];
-    private buildStaticFileBehaviors;
+    protected buildStaticFileBehaviors(origin: S3Origin): Record<string, BehaviorOptions>;
     protected buildServerCachePolicy(allowedHeaders?: string[]): CachePolicy;
     protected buildServerOriginRequestPolicy(): import("aws-cdk-lib/aws-cloudfront").IOriginRequestPolicy;
     private createCloudFrontInvalidation;

package/constructs/SsrSite.js

@@ -504,6 +504,7 @@ function handler(event) {
         const { cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
         const s3Origin = new S3Origin(this.bucket);
+        const cachePolicy = cdk?.serverCachePolicy ?? this.buildServerCachePolicy();
         return new Distribution(this, "Distribution", {
             // these values can be overwritten by cfDistributionProps
             defaultRootObject: "",
@@ -512,7 +513,7 @@ function handler(event) {
             // these values can NOT be overwritten by cfDistributionProps
             domainNames: this.buildDistributionDomainNames(),
             certificate: this.certificate,
-            defaultBehavior: this.buildDefaultBehaviorForRegional(),
+            defaultBehavior: this.buildDefaultBehaviorForRegional(cachePolicy),
             additionalBehaviors: {
                 ...this.buildStaticFileBehaviors(s3Origin),
                 ...(cfDistributionProps.additionalBehaviors || {}),
@@ -523,6 +524,7 @@ function handler(event) {
         const { cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
         const s3Origin = new S3Origin(this.bucket);
+        const cachePolicy = cdk?.serverCachePolicy ?? this.buildServerCachePolicy();
         return new Distribution(this, "Distribution", {
             // these values can be overwritten by cfDistributionProps
             defaultRootObject: "",
@@ -531,7 +533,7 @@ function handler(event) {
             // these values can NOT be overwritten by cfDistributionProps
             domainNames: this.buildDistributionDomainNames(),
             certificate: this.certificate,
-            defaultBehavior: this.buildDefaultBehaviorForEdge(s3Origin),
+            defaultBehavior: this.buildDefaultBehaviorForEdge(s3Origin, cachePolicy),
             additionalBehaviors: {
                 ...this.buildStaticFileBehaviors(s3Origin),
                 ...(cfDistributionProps.additionalBehaviors || {}),
@@ -557,7 +559,7 @@ function handler(event) {
         }
         return domainNames;
     }
-    buildDefaultBehaviorForRegional() {
+    buildDefaultBehaviorForRegional(cachePolicy) {
         const { timeout, cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
         const fnUrl = this.serverLambdaForRegional.addFunctionUrl({
@@ -573,7 +575,7 @@ function handler(event) {
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
-            cachePolicy: cdk?.serverCachePolicy ?? this.buildServerCachePolicy(),
+            cachePolicy,
             responseHeadersPolicy: cdk?.responseHeadersPolicy,
             originRequestPolicy: this.buildServerOriginRequestPolicy(),
             ...(cfDistributionProps.defaultBehavior || {}),
@@ -583,7 +585,7 @@ function handler(event) {
             ],
         };
     }
-    buildDefaultBehaviorForEdge(origin) {
+    buildDefaultBehaviorForEdge(origin, cachePolicy) {
         const { cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
         return {
@@ -592,7 +594,7 @@ function handler(event) {
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
-            cachePolicy: cdk?.serverCachePolicy ?? this.buildServerCachePolicy(),
+            cachePolicy,
             responseHeadersPolicy: cdk?.responseHeadersPolicy,
             originRequestPolicy: this.buildServerOriginRequestPolicy(),
             ...(cfDistributionProps.defaultBehavior || {}),

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.16.2",
+  "version": "2.16.4",
   "bin": {
     "sst": "cli/sst.js"
   },

package/sst.mjs

@@ -6222,7 +6222,14 @@ function logicalIdToCdkPath(assembly, stack, logicalId) {
   return found.split("/").filter(Boolean).slice(1, -1).join("/");
 }
 function getHelper(error2) {
-  return getApiAccessLogPermissionsHelper(error2) || getAppSyncMultiResolverHelper(error2) || getApiLogRoleHelper(error2);
+  return getCloudFrontBehaviorLimitHelper(error2) || getApiAccessLogPermissionsHelper(error2) || getAppSyncMultiResolverHelper(error2) || getApiLogRoleHelper(error2);
+}
+function getCloudFrontBehaviorLimitHelper(error2) {
+  if (error2.indexOf(
+    "Your request contains more CacheBehaviors than are allowed per distribution."
+  ) > -1) {
+    return `This error often occurs when deploying a frontend with a large number of top-level files and folders in the assets directory. Check out this doc on how to resolve the issue - https://docs.sst.dev/known-issues#cloudfront-cachebehaviors-limit-exceeded`;
+  }
 }
 function getApiAccessLogPermissionsHelper(error2) {
   if (error2.indexOf("Insufficient permissions to enable logging") > -1) {