sst 2.10.1 → 2.10.3

package/constructs/NextjsSite.js

@@ -267,6 +267,7 @@ export class NextjsSite extends SsrSite {
         });
     }
     buildServerBehaviorForRegional(serverOrigin, cachePolicy, originRequestPolicy) {
+        const { cdk } = this.props;
         return {
             viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
             functionAssociations: this.buildBehaviorFunctionAssociations(),
@@ -275,10 +276,12 @@ export class NextjsSite extends SsrSite {
             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(),
@@ -287,6 +290,7 @@ export class NextjsSite extends SsrSite {
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
             cachePolicy,
+            responseHeadersPolicy: cdk?.responseHeadersPolicy,
             originRequestPolicy,
             edgeLambdas: [
                 {
@@ -298,6 +302,7 @@ export class NextjsSite extends SsrSite {
         };
     }
     buildImageBehavior(cachePolicy) {
+        const { cdk } = this.props;
         const imageFn = this.createImageOptimizationFunction();
         const imageFnUrl = imageFn.addFunctionUrl({
             authType: FunctionUrlAuthType.NONE,
@@ -309,9 +314,11 @@ export class NextjsSite extends SsrSite {
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
             cachePolicy,
+            responseHeadersPolicy: cdk?.responseHeadersPolicy,
         };
     }
     buildStaticFileBehavior(s3Origin) {
+        const { cdk } = this.props;
         return {
             origin: s3Origin,
             viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
@@ -319,6 +326,7 @@ export class NextjsSite extends SsrSite {
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
             cachePolicy: CachePolicy.CACHING_OPTIMIZED,
+            responseHeadersPolicy: cdk?.responseHeadersPolicy,
         };
     }
     buildDefaultNextjsBehaviorForRegional(serverOrigin, s3Origin, cachePolicy, originRequestPolicy) {
@@ -339,6 +347,7 @@ export class NextjsSite extends SsrSite {
             functionAssociations: this.buildBehaviorFunctionAssociations(),
             compress: true,
             cachePolicy,
+            responseHeadersPolicy: cdk?.responseHeadersPolicy,
             originRequestPolicy,
             ...(cfDistributionProps.defaultBehavior || {}),
         };
@@ -354,6 +363,7 @@ export class NextjsSite extends SsrSite {
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
             cachePolicy,
+            responseHeadersPolicy: cdk?.responseHeadersPolicy,
             originRequestPolicy,
             ...(cfDistributionProps.defaultBehavior || {}),
             edgeLambdas: [

package/constructs/SsrSite.d.ts

@@ -2,7 +2,7 @@ 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 { IHostedZone } from "aws-cdk-lib/aws-route53";
-import { Distribution, ICachePolicy, BehaviorOptions, CachePolicy, Function as CfFunction, FunctionEventType as CfFunctionEventType } from "aws-cdk-lib/aws-cloudfront";
+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 { SSTConstruct } from "./Construct.js";
 import { NodeJSProps } from "./Function.js";
@@ -183,6 +183,11 @@ export interface SsrSiteProps {
          * is one that performs no caching of the server response.
          */
         serverCachePolicy?: ICachePolicy;
+        /**
+         * Override the CloudFront response headers policy properties for responses
+         * from the server rendering Lambda.
+         */
+        responseHeadersPolicy?: IResponseHeadersPolicy;
         server?: Pick<FunctionProps, "vpc" | "vpcSubnets" | "securityGroups" | "allowAllOutbound" | "allowPublicSubnet" | "architecture">;
     };
 }

package/constructs/SsrSite.js

@@ -547,6 +547,7 @@ function handler(event) {
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
             cachePolicy: cdk?.serverCachePolicy ?? this.buildServerCachePolicy(),
+            responseHeadersPolicy: cdk?.responseHeadersPolicy,
             originRequestPolicy: this.buildServerOriginRequestPolicy(),
             ...(cfDistributionProps.defaultBehavior || {}),
             functionAssociations: [
@@ -565,6 +566,7 @@ function handler(event) {
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
             cachePolicy: cdk?.serverCachePolicy ?? this.buildServerCachePolicy(),
+            responseHeadersPolicy: cdk?.responseHeadersPolicy,
             originRequestPolicy: this.buildServerOriginRequestPolicy(),
             ...(cfDistributionProps.defaultBehavior || {}),
             functionAssociations: [

package/package.json

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

package/support/nodejs-runtime/index.mjs

@@ -14,7 +14,7 @@ var file = [".js", ".jsx", ".mjs", ".cjs"].map((ext) => path.join(input.out, par
 var fn;
 function fetch(req) {
   return new Promise((resolve, reject) => {
-    const request = http.request(
+    const request2 = http.request(
       input.url + req.path,
       {
         headers: req.headers,
@@ -35,10 +35,10 @@ function fetch(req) {
         });
       }
     );
-    request.on("error", reject);
+    request2.on("error", reject);
     if (req.body)
-      request.write(req.body);
-    request.end();
+      request2.write(req.body);
+    request2.end();
   });
 }
 try {
@@ -67,15 +67,30 @@ try {
   process.exit(1);
 }
 var timeout;
+var request;
+var response;
+var context;
+async function error(ex) {
+  await fetch({
+    path: `/runtime/invocation/${context.awsRequestId}/error`,
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify({
+      errorType: "Error",
+      errorMessage: ex.message,
+      trace: ex.stack?.split("\n")
+    })
+  });
+}
+process.on("unhandledRejection", error);
 while (true) {
   if (timeout)
     clearTimeout(timeout);
   timeout = setTimeout(() => {
     process.exit(0);
   }, 1e3 * 60 * 15);
-  let request;
-  let response;
-  let context;
   try {
     const result = await fetch({
       path: `/runtime/invocation/next`,
@@ -130,18 +145,7 @@ while (true) {
   try {
     response = await fn(request, context);
   } catch (ex) {
-    await fetch({
-      path: `/runtime/invocation/${context.awsRequestId}/error`,
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({
-        errorType: "Error",
-        errorMessage: ex.message,
-        trace: ex.stack?.split("\n")
-      })
-    });
+    error(ex);
     continue;
   }
   while (true) {