sst 2.39.7 → 2.39.9

package/constructs/AstroSite.d.ts

@@ -60,12 +60,10 @@ export declare class AstroSite extends SsrSite {
             edgeFunction?: string | undefined;
         }[];
         errorResponses?: import("aws-cdk-lib/aws-cloudfront").ErrorResponse[] | undefined;
-        cachePolicyAllowedHeaders?: string[] | undefined;
-        buildId?: string | undefined;
-        warmerConfig?: {
-            function: string;
-            schedule?: import("aws-cdk-lib/aws-events").Schedule | undefined;
+        serverCachePolicy?: {
+            allowedHeaders?: string[] | undefined;
         } | undefined;
+        buildId?: string | undefined;
     };
     getConstructMetadata(): {
         data: {

package/constructs/NextjsSite.d.ts

@@ -217,12 +217,10 @@ export declare class NextjsSite extends SsrSite {
             edgeFunction?: "edgeServer" | undefined;
         }[];
         errorResponses?: import("aws-cdk-lib/aws-cloudfront").ErrorResponse[] | undefined;
-        cachePolicyAllowedHeaders?: string[] | undefined;
-        buildId?: string | undefined;
-        warmerConfig?: {
-            function: string;
-            schedule?: import("aws-cdk-lib/aws-events").Schedule | undefined;
+        serverCachePolicy?: {
+            allowedHeaders?: string[] | undefined;
         } | undefined;
+        buildId?: string | undefined;
     };
     private createRevalidationQueue;
     private createRevalidationTable;

package/constructs/NextjsSite.js

@@ -233,11 +233,10 @@ export class NextjsSite extends SsrSite {
                     origin: "s3",
                 })),
             ],
-            cachePolicyAllowedHeaders: DEFAULT_CACHE_POLICY_ALLOWED_HEADERS,
-            buildId: this.getBuildId(),
-            warmerConfig: {
-                function: path.join(sitePath, ".open-next", "warmer-function"),
+            serverCachePolicy: {
+                allowedHeaders: DEFAULT_CACHE_POLICY_ALLOWED_HEADERS,
             },
+            buildId: this.getBuildId(),
         });
     }
     createRevalidationQueue() {

package/constructs/RemixSite.d.ts

@@ -86,12 +86,10 @@ export declare class RemixSite extends SsrSite {
             edgeFunction?: "edgeServer" | undefined;
         }[];
         errorResponses?: import("aws-cdk-lib/aws-cloudfront").ErrorResponse[] | undefined;
-        cachePolicyAllowedHeaders?: string[] | undefined;
-        buildId?: string | undefined;
-        warmerConfig?: {
-            function: string;
-            schedule?: import("aws-cdk-lib/aws-events").Schedule | undefined;
+        serverCachePolicy?: {
+            allowedHeaders?: string[] | undefined;
         } | undefined;
+        buildId?: string | undefined;
     };
     protected getServerModuleFormat(): "cjs" | "esm";
     private createServerLambdaBundle;

package/constructs/SolidStartSite.d.ts

@@ -68,12 +68,10 @@ export declare class SolidStartSite extends SsrSite {
             edgeFunction?: "edgeServer" | undefined;
         }[];
         errorResponses?: import("aws-cdk-lib/aws-cloudfront").ErrorResponse[] | undefined;
-        cachePolicyAllowedHeaders?: string[] | undefined;
-        buildId?: string | undefined;
-        warmerConfig?: {
-            function: string;
-            schedule?: import("aws-cdk-lib/aws-events").Schedule | undefined;
+        serverCachePolicy?: {
+            allowedHeaders?: string[] | undefined;
         } | undefined;
+        buildId?: string | undefined;
     };
     getConstructMetadata(): {
         data: {

package/constructs/SsrFunction.js

@@ -274,10 +274,10 @@ export class SsrFunction extends Construct {
         const newHandlerFunction = "handler";
         await fs.writeFile(path.join(bundle, handlerDir, `${newHandlerName}.mjs`), streaming
             ? [
-                `export const ${newHandlerFunction} = awslambda.streamifyResponse(async (event, context) => {`,
+                `export const ${newHandlerFunction} = awslambda.streamifyResponse(async (event, responseStream, context) => {`,
                 ...injections,
                 `  const { ${oldHandlerFunction}: rawHandler} = await import("./${oldHandlerName}.mjs");`,
-                `  return rawHandler(event, context);`,
+                `  return rawHandler(event, responseStream);`,
                 `});`,
             ].join("\n")
             : [

package/constructs/SsrSite.d.ts

@@ -3,7 +3,6 @@ import { Bucket, BucketProps, IBucket } from "aws-cdk-lib/aws-s3";
 import { Function as CdkFunction, FunctionProps as CdkFunctionProps } from "aws-cdk-lib/aws-lambda";
 import { ICachePolicy, IResponseHeadersPolicy, ViewerProtocolPolicy, AllowedMethods, CachePolicyProps, ErrorResponse } from "aws-cdk-lib/aws-cloudfront";
 import { S3OriginProps } from "aws-cdk-lib/aws-cloudfront-origins";
-import { Schedule } from "aws-cdk-lib/aws-events";
 import { DistributionDomainProps } from "./Distribution.js";
 import { SSTConstruct } from "./Construct.js";
 import { NodeJSProps, FunctionProps } from "./Function.js";
@@ -391,6 +390,10 @@ export interface SsrSiteProps {
          */
         viewerProtocolPolicy?: ViewerProtocolPolicy;
         server?: Pick<CdkFunctionProps, "layers" | "vpc" | "vpcSubnets" | "securityGroups" | "allowAllOutbound" | "allowPublicSubnet" | "architecture" | "logRetention"> & Pick<FunctionProps, "copyFiles">;
+        /**
+         * @hidden Need to fix tsdoc generation to support the `Plan` type
+         */
+        transform?: (args: Plan) => void;
     };
 }
 type SsrSiteInvalidationNormalizedProps = Exclude<SsrSiteProps["invalidation"], undefined>;
@@ -488,12 +491,10 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
             edgeFunction?: keyof EdgeFunctions;
         }[];
         errorResponses?: ErrorResponse[];
-        cachePolicyAllowedHeaders?: string[];
-        buildId?: string;
-        warmerConfig?: {
-            function: string;
-            schedule?: Schedule;
+        serverCachePolicy?: {
+            allowedHeaders?: string[];
         };
+        buildId?: string;
     }): {
         cloudFrontFunctions?: CloudFrontFunctions | undefined;
         edgeFunctions?: EdgeFunctions | undefined;
@@ -508,12 +509,10 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
             edgeFunction?: keyof EdgeFunctions;
         }[];
         errorResponses?: ErrorResponse[] | undefined;
-        cachePolicyAllowedHeaders?: string[] | undefined;
-        buildId?: string | undefined;
-        warmerConfig?: {
-            function: string;
-            schedule?: Schedule | undefined;
+        serverCachePolicy?: {
+            allowedHeaders?: string[] | undefined;
         } | undefined;
+        buildId?: string | undefined;
     };
 }
 export declare const useSites: () => {

package/constructs/SsrSite.js

@@ -95,6 +95,7 @@ export class SsrSite extends Construct {
         // Build app
         buildApp();
         const plan = this.plan(bucket);
+        transformPlan();
         validateTimeout();
         // Create CloudFront
         const cfFunctions = createCloudFrontFunctions();
@@ -186,6 +187,9 @@ export class SsrSite extends Construct {
                 ...cdk?.bucket,
             });
         }
+        function transformPlan() {
+            cdk?.transform?.(plan);
+        }
         function createServerFunctionForDev() {
             const role = new Role(self, "ServerFunctionRole", {
                 assumedBy: new CompositePrincipal(new AccountPrincipal(app.account), new ServicePrincipal("lambda.amazonaws.com")),
@@ -219,8 +223,7 @@ export class SsrSite extends Construct {
             // Create warmer function
             const warmer = new CdkFunction(self, "WarmerFunction", {
                 description: "SSR warmer",
-                code: Code.fromAsset(plan.warmerConfig?.function ??
-                    path.join(__dirname, "../support/ssr-warmer")),
+                code: Code.fromAsset(path.join(__dirname, "../support/ssr-warmer")),
                 runtime: Runtime.NODEJS_18_X,
                 handler: "index.handler",
                 timeout: CdkDuration.minutes(15),
@@ -233,7 +236,7 @@ export class SsrSite extends Construct {
             ssrFunctions[0].grantInvoke(warmer);
             // Create cron job
             new Rule(self, "WarmerRule", {
-                schedule: plan.warmerConfig?.schedule ?? Schedule.rate(CdkDuration.minutes(5)),
+                schedule: Schedule.rate(CdkDuration.minutes(5)),
                 targets: [new LambdaFunction(warmer, { retryAttempts: 0 })],
             });
             // Create custom resource to prewarm on deploy
@@ -452,7 +455,7 @@ function handler(event) {
                 ...cdk?.server,
                 streaming: props.streaming,
                 injections: [
-                    ...(warm ? [useServerFunctionWarmingInjection()] : []),
+                    ...(warm ? [useServerFunctionWarmingInjection(props.streaming)] : []),
                     ...(props.injections || []),
                 ],
                 prefetchSecrets: regional?.prefetchSecrets,
@@ -632,7 +635,7 @@ function handler(event) {
             return singletonUrlSigner;
         }
         function useServerBehaviorCachePolicy() {
-            const allowedHeaders = plan.cachePolicyAllowedHeaders || [];
+            const allowedHeaders = plan.serverCachePolicy?.allowedHeaders ?? [];
             singletonCachePolicy =
                 singletonCachePolicy ??
                     new CachePolicy(self, "ServerCache", SsrSite.buildDefaultServerCachePolicyProps(allowedHeaders));
@@ -645,15 +648,24 @@ function handler(event) {
                     OriginRequestPolicy.fromOriginRequestPolicyId(self, "ServerOriginRequestPolicy", "b689b0a8-53d0-40ab-baf2-68738e2966ac");
             return singletonOriginRequestPolicy;
         }
-        function useServerFunctionWarmingInjection() {
-            return `
-if (event.type === "warmer") {
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      resolve({ serverId: "server-" + Math.random().toString(36).slice(2, 8) });
-    }, event.delay);
-  });
-}`;
+        function useServerFunctionWarmingInjection(streaming) {
+            return [
+                `if (event.type === "warmer") {`,
+                `  const p = new Promise((resolve) => {`,
+                `    setTimeout(() => {`,
+                `      resolve({ serverId: "server-" + Math.random().toString(36).slice(2, 8) });`,
+                `    }, event.delay);`,
+                `  });`,
+                ...(streaming
+                    ? [
+                        `  const response = await p;`,
+                        `  responseStream.write(JSON.stringify(response));`,
+                        `  responseStream.end();`,
+                        `  return;`,
+                    ]
+                    : [`  return p;`]),
+                `}`,
+            ].join("\n");
         }
         function getS3FileOptions(copy) {
             const fileOptions = [];

package/constructs/SvelteKitSite.d.ts

@@ -99,12 +99,10 @@ export declare class SvelteKitSite extends SsrSite {
             edgeFunction?: "edgeServer" | undefined;
         }[];
         errorResponses?: import("aws-cdk-lib/aws-cloudfront").ErrorResponse[] | undefined;
-        cachePolicyAllowedHeaders?: string[] | undefined;
-        buildId?: string | undefined;
-        warmerConfig?: {
-            function: string;
-            schedule?: import("aws-cdk-lib/aws-events").Schedule | undefined;
+        serverCachePolicy?: {
+            allowedHeaders?: string[] | undefined;
         } | undefined;
+        buildId?: string | undefined;
     };
     getConstructMetadata(): {
         data: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.39.7",
+  "version": "2.39.9",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -120,7 +120,7 @@
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
-    "astro-sst": "2.39.7",
+    "astro-sst": "2.39.9",
     "async": "^3.2.4",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",