sst 2.13.9 → 2.14.0

package/constructs/EdgeFunction.d.ts

@@ -31,6 +31,7 @@ export declare class EdgeFunction extends Construct {
     constructor(scope: Construct, id: string, props: EdgeFunctionProps);
     get currentVersion(): IVersion;
     attachPermissions(permissions: Permissions): void;
+    addEnvironment(key: string, value: string): void;
     private buildAssetFromHandler;
     private buildAssetFromBundle;
     private bind;

package/constructs/EdgeFunction.js

@@ -89,6 +89,17 @@ export class EdgeFunction extends Construct {
     attachPermissions(permissions) {
         attachPermissionsToRole(this.role, permissions);
     }
+    addEnvironment(key, value) {
+        // Note: addEnvironment currently only updates AssetReplacer's
+        //       "_SST_FUNCTION_ENVIRONMENT_" replacements
+        this.props.environment[key] = value;
+        const cfnReplacer = this.assetReplacer.node
+            .defaultChild;
+        cfnReplacer.addPropertyOverride("replacements.0.replace", JSON.stringify({
+            ...this.props.environment,
+            ...this.bindingEnvs,
+        }));
+    }
     buildAssetFromHandler(onBundled) {
         const { nodejs } = this.props;
         useFunctions().add(this.node.addr, {

package/constructs/NextjsSite.d.ts

@@ -42,11 +42,15 @@ export declare class NextjsSite extends SsrSite {
         waitForInvalidation: Exclude<NextjsSiteProps["waitForInvalidation"], undefined>;
     };
     constructor(scope: Construct, id: string, props?: NextjsSiteProps);
+    protected createRevalidation(): void;
     protected initBuildConfig(): {
         typesPath: string;
         serverBuildOutputFile: string;
         clientBuildOutputDir: string;
         clientBuildVersionedSubDir: string;
+        clientBuildS3KeyPrefix: string;
+        prerenderedBuildOutputDir: string;
+        prerenderedBuildS3KeyPrefix: string;
     };
     protected createFunctionForRegional(): CdkFunction;
     protected createFunctionForEdge(): EdgeFunction;

package/constructs/NextjsSite.js

@@ -8,6 +8,8 @@ import { Distribution, ViewerProtocolPolicy, AllowedMethods, LambdaEdgeEventType
 import { S3Origin, HttpOrigin, OriginGroup, } 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";
+import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
 import { Stack } from "./Stack.js";
 import { SsrFunction } from "./SsrFunction.js";
 import { EdgeFunction } from "./EdgeFunction.js";
@@ -28,10 +30,34 @@ import { toCdkDuration } from "./util/duration.js";
 export class NextjsSite extends SsrSite {
     constructor(scope, id, props) {
         super(scope, id, {
-            buildCommand: "npx --yes open-next@1.4.0 build",
+            buildCommand: "npx --yes open-next@2.0.0 build",
             ...props,
         });
+        if (this.doNotDeploy)
+            return;
         this.createWarmer();
+        this.createRevalidation();
+    }
+    createRevalidation() {
+        if (!this.serverLambdaForRegional && !this.serverLambdaForEdge)
+            return;
+        const queue = new Queue(this, "RevalidationQueue", {
+            fifo: true,
+            receiveMessageWaitTime: CdkDuration.seconds(20),
+        });
+        const consumer = new CdkFunction(this, "RevalidationFunction", {
+            description: "Next.js revalidator",
+            handler: "index.handler",
+            code: Code.fromAsset(path.join(this.props.path, ".open-next", "revalidation-function")),
+            runtime: Runtime.NODEJS_18_X,
+            timeout: CdkDuration.seconds(30),
+        });
+        consumer.addEventSource(new SqsEventSource(queue, { batchSize: 5 }));
+        // Allow server to send messages to the queue
+        const server = this.serverLambdaForRegional || this.serverLambdaForEdge;
+        server?.addEnvironment("REVALIDATION_QUEUE_URL", queue.queueUrl);
+        server?.addEnvironment("REVALIDATION_QUEUE_REGION", Stack.of(this).region);
+        queue.grantSendMessages(server?.role);
     }
     initBuildConfig() {
         return {
@@ -39,6 +65,9 @@ export class NextjsSite extends SsrSite {
             serverBuildOutputFile: ".open-next/server-function/index.mjs",
             clientBuildOutputDir: ".open-next/assets",
             clientBuildVersionedSubDir: "_next",
+            clientBuildS3KeyPrefix: "_assets",
+            prerenderedBuildOutputDir: ".open-next/cache",
+            prerenderedBuildS3KeyPrefix: "_cache",
         };
     }
     createFunctionForRegional() {
@@ -52,7 +81,12 @@ export class NextjsSite extends SsrSite {
             memorySize,
             bind,
             permissions,
-            environment,
+            environment: {
+                ...environment,
+                CACHE_BUCKET_NAME: this.bucket.bucketName,
+                CACHE_BUCKET_KEY_PREFIX: "_cache",
+                CACHE_BUCKET_REGION: Stack.of(this).region,
+            },
             ...cdk?.server,
         });
         return ssrFn.function;
@@ -67,7 +101,12 @@ export class NextjsSite extends SsrSite {
             memorySize,
             bind,
             permissions,
-            environment,
+            environment: {
+                ...environment,
+                CACHE_BUCKET_NAME: this.bucket.bucketName,
+                CACHE_BUCKET_KEY_PREFIX: "_cache",
+                CACHE_BUCKET_REGION: Stack.of(this).region,
+            },
         });
     }
     createImageOptimizationFunction() {
@@ -90,6 +129,7 @@ export class NextjsSite extends SsrSite {
             architecture: Architecture.ARM_64,
             environment: {
                 BUCKET_NAME: this.cdk.bucket.bucketName,
+                BUCKET_KEY_PREFIX: "_assets",
             },
             initialPolicy: [
                 new PolicyStatement({
@@ -201,7 +241,9 @@ export class NextjsSite extends SsrSite {
          */
         const { timeout, cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
-        const s3Origin = new S3Origin(this.cdk.bucket);
+        const s3Origin = new S3Origin(this.cdk.bucket, {
+            originPath: "/" + this.buildConfig.clientBuildS3KeyPrefix,
+        });
         const serverFnUrl = this.serverLambdaForRegional.addFunctionUrl({
             authType: FunctionUrlAuthType.NONE,
         });
@@ -240,7 +282,9 @@ export class NextjsSite extends SsrSite {
     createCloudFrontDistributionForEdge() {
         const { cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
-        const s3Origin = new S3Origin(this.cdk.bucket);
+        const s3Origin = new S3Origin(this.cdk.bucket, {
+            originPath: "/" + this.buildConfig.clientBuildS3KeyPrefix,
+        });
         const cachePolicy = cdk?.serverCachePolicy ??
             this.buildServerCachePolicy([
                 "accept",
@@ -249,7 +293,7 @@ export class NextjsSite extends SsrSite {
                 "next-router-state-tree",
             ]);
         const originRequestPolicy = this.buildServerOriginRequestPolicy();
-        const functionVersion = this.serverEdgeFunction.currentVersion;
+        const functionVersion = this.serverLambdaForEdge.currentVersion;
         const serverBehavior = this.buildServerBehaviorForEdge(functionVersion, s3Origin, cachePolicy, originRequestPolicy);
         return new Distribution(this, "Distribution", {
             // these values can be overwritten by cfDistributionProps

package/constructs/SsrSite.d.ts

@@ -1,6 +1,6 @@
 import { Construct } from "constructs";
 import { Bucket, BucketProps, IBucket } from "aws-cdk-lib/aws-s3";
-import { Function as CdkFunction, FunctionProps } from "aws-cdk-lib/aws-lambda";
+import { Function as CdkFunction, IFunction as ICdkFunction, FunctionProps } from "aws-cdk-lib/aws-lambda";
 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";
@@ -18,7 +18,9 @@ export type SsrBuildConfig = {
     serverCFFunctionInjection?: string;
     clientBuildOutputDir: string;
     clientBuildVersionedSubDir: string;
+    clientBuildS3KeyPrefix?: string;
     prerenderedBuildOutputDir?: string;
+    prerenderedBuildS3KeyPrefix?: string;
 };
 export interface SsrSiteNodeJSProps extends NodeJSProps {
 }
@@ -211,13 +213,13 @@ type SsrSiteNormalizedProps = SsrSiteProps & {
 export declare abstract class SsrSite extends Construct implements SSTConstruct {
     readonly id: string;
     protected props: SsrSiteNormalizedProps;
-    private doNotDeploy;
+    protected doNotDeploy: boolean;
     protected buildConfig: SsrBuildConfig;
-    protected serverEdgeFunction?: EdgeFunction;
-    private serverLambdaForEdge?;
+    private serverLambdaCdkFunctionForEdge?;
+    protected serverLambdaForEdge?: EdgeFunction;
     protected serverLambdaForRegional?: CdkFunction;
     private serverLambdaForDev?;
-    private bucket;
+    protected bucket: Bucket;
     private cfFunction;
     private distribution;
     private hostedZone?;
@@ -236,7 +238,7 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
      * The internally created CDK resources.
      */
     get cdk(): {
-        function: CdkFunction | undefined;
+        function: ICdkFunction | undefined;
         bucket: Bucket;
         distribution: Distribution;
         hostedZone: IHostedZone | undefined;
@@ -278,8 +280,8 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
     protected createFunctionForRegional(): CdkFunction;
     protected createFunctionForEdge(): EdgeFunction;
     protected createFunctionForDev(): CdkFunction;
-    private createFunctionPermissionsForRegional;
-    private createFunctionPermissionsForEdge;
+    private grantServerS3Permissions;
+    private grantServerCloudFrontPermissions;
     private validateCloudFrontDistributionSettings;
     private createCloudFrontFunction;
     protected createCloudFrontDistributionForRegional(): Distribution;

package/constructs/SsrSite.js

@@ -46,7 +46,7 @@ export class SsrSite extends Construct {
     props;
     doNotDeploy;
     buildConfig;
-    serverEdgeFunction;
+    serverLambdaCdkFunctionForEdge;
     serverLambdaForEdge;
     serverLambdaForRegional;
     serverLambdaForDev;
@@ -88,17 +88,16 @@ export class SsrSite extends Construct {
         this.bucket = this.createS3Bucket();
         // Create Server functions
         if (this.props.edge) {
-            this.serverEdgeFunction = this.createFunctionForEdge();
-            this.serverLambdaForEdge = CdkFunction.fromFunctionAttributes(this, "IEdgeFunction", {
-                functionArn: this.serverEdgeFunction.functionArn,
-                role: this.serverEdgeFunction.role,
+            this.serverLambdaForEdge = this.createFunctionForEdge();
+            this.serverLambdaCdkFunctionForEdge = CdkFunction.fromFunctionAttributes(this, "IEdgeFunction", {
+                functionArn: this.serverLambdaForEdge.functionArn,
+                role: this.serverLambdaForEdge.role,
             });
-            this.createFunctionPermissionsForEdge();
         }
         else {
             this.serverLambdaForRegional = this.createFunctionForRegional();
-            this.createFunctionPermissionsForRegional();
         }
+        this.grantServerS3Permissions();
         // Create Custom Domain
         this.validateCustomDomainSettings();
         this.hostedZone = this.lookupHostedZone();
@@ -114,6 +113,7 @@ export class SsrSite extends Construct {
             ? this.createCloudFrontDistributionForEdge()
             : this.createCloudFrontDistributionForRegional();
         this.distribution.node.addDependency(s3deployCR);
+        this.grantServerCloudFrontPermissions();
         // Invalidate CloudFront
         this.createCloudFrontInvalidation();
         // Connect Custom Domain to CloudFront Distribution
@@ -154,7 +154,7 @@ export class SsrSite extends Construct {
         if (this.doNotDeploy)
             return;
         return {
-            function: this.serverLambdaForEdge || this.serverLambdaForRegional,
+            function: this.serverLambdaCdkFunctionForEdge || this.serverLambdaForRegional,
             bucket: this.bucket,
             distribution: this.distribution,
             hostedZone: this.hostedZone,
@@ -174,7 +174,7 @@ export class SsrSite extends Construct {
      * ```
      */
     attachPermissions(permissions) {
-        const server = this.serverLambdaForEdge ||
+        const server = this.serverLambdaCdkFunctionForEdge ||
             this.serverLambdaForRegional ||
             this.serverLambdaForDev;
         attachPermissionsToRole(server?.role, permissions);
@@ -192,7 +192,7 @@ export class SsrSite extends Construct {
                 edge: this.props.edge,
                 server: (this.serverLambdaForDev ||
                     this.serverLambdaForRegional ||
-                    this.serverLambdaForEdge)?.functionArn,
+                    this.serverLambdaCdkFunctionForEdge)?.functionArn,
                 secrets: (this.props.bind || [])
                     .filter((c) => c instanceof Secret)
                     .map((c) => c.name),
@@ -298,14 +298,20 @@ export class SsrSite extends Construct {
             : 200;
         const result = spawn.sync("node", [
             script,
-            [
-                path.join(this.props.path, this.buildConfig.clientBuildOutputDir),
+            Buffer.from(JSON.stringify([
+                {
+                    src: path.join(this.props.path, this.buildConfig.clientBuildOutputDir),
+                    tar: this.buildConfig.clientBuildS3KeyPrefix || "",
+                },
                 ...(this.buildConfig.prerenderedBuildOutputDir
                     ? [
-                        path.join(this.props.path, this.buildConfig.prerenderedBuildOutputDir),
+                        {
+                            src: path.join(this.props.path, this.buildConfig.prerenderedBuildOutputDir),
+                            tar: this.buildConfig.prerenderedBuildS3KeyPrefix || "",
+                        },
                     ]
                     : []),
-            ].join(","),
+            ])).toString("base64"),
             zipOutDir,
             `${fileSizeLimit}`,
         ], {
@@ -452,11 +458,24 @@ export class SsrSite extends Construct {
         });
         return ssrFn.function;
     }
-    createFunctionPermissionsForRegional() {
-        this.bucket.grantReadWrite(this.serverLambdaForRegional.role);
+    grantServerS3Permissions() {
+        const server = this.serverLambdaCdkFunctionForEdge || this.serverLambdaForRegional;
+        this.bucket.grantReadWrite(server.role);
     }
-    createFunctionPermissionsForEdge() {
-        this.bucket.grantReadWrite(this.serverLambdaForEdge.role);
+    grantServerCloudFrontPermissions() {
+        const stack = Stack.of(this);
+        const server = this.serverLambdaCdkFunctionForEdge || this.serverLambdaForRegional;
+        const policy = new Policy(this, "ServerFunctionInvalidatorPolicy", {
+            statements: [
+                new PolicyStatement({
+                    actions: ["cloudfront:CreateInvalidation"],
+                    resources: [
+                        `arn:${stack.partition}:cloudfront::${stack.account}:distribution/${this.distribution.distributionId}`,
+                    ],
+                }),
+            ],
+        });
+        server?.role?.attachInlinePolicy(policy);
     }
     /////////////////////
     // CloudFront Distribution
@@ -585,7 +604,7 @@ function handler(event) {
                 {
                     includeBody: true,
                     eventType: LambdaEdgeEventType.ORIGIN_REQUEST,
-                    functionVersion: this.serverEdgeFunction.currentVersion,
+                    functionVersion: this.serverLambdaForEdge.currentVersion,
                 },
                 ...(cfDistributionProps.defaultBehavior?.edgeLambdas || []),
             ],

package/constructs/StaticSite.js

@@ -237,7 +237,13 @@ interface ImportMeta {
             force: true,
             recursive: true,
         });
-        const cmd = ["node", script, siteOutputPath, zipPath, fileSizeLimit].join(" ");
+        const cmd = [
+            "node",
+            script,
+            Buffer.from(JSON.stringify([{ src: siteOutputPath, tar: "" }])).toString("base64"),
+            zipPath,
+            fileSizeLimit,
+        ].join(" ");
         try {
             execSync(cmd, {
                 cwd: sitePath,

package/constructs/deprecated/NextjsSite.js

@@ -273,7 +273,12 @@ export class NextjsSite extends Construct {
             force: true,
             recursive: true,
         });
-        const result = spawn.sync("node", [script, siteOutputPath, zipPath, `${fileSizeLimit}`], {
+        const result = spawn.sync("node", [
+            script,
+            Buffer.from(JSON.stringify([{ src: siteOutputPath, tar: "" }])).toString("base64"),
+            zipPath,
+            `${fileSizeLimit}`,
+        ], {
             stdio: "inherit",
         });
         if (result.status !== 0) {

package/package.json

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