sst 2.36.5 → 2.36.7

package/constructs/ApiGatewayV1Api.d.ts

@@ -158,7 +158,7 @@ export interface ApiGatewayV1ApiProps<Authorizers extends Record<string, ApiGate
          */
         id?: string;
         /**
-         * Override the internally created rest api
+         * Override the internally created REST API.
          *
          * @example
          * ```js
@@ -195,9 +195,12 @@ export interface ApiGatewayV1ApiProps<Authorizers extends Record<string, ApiGate
          * ```
          *
          * API Gateway REST API is structured in a tree structure:
-         * - Each path part is a separate API Gateway resource object.
-         * - And a path part is a child resource of the preceding part.
-         * So the part path /notes, is a child resource of the root resource /. And /notes/{noteId} is a child resource of /notes. If /notes has been created in the imported API, you have to import it before creating the /notes/{noteId} child route.
+         *
+         * - Each path part is a separate API Gateway resource object
+         * - And a path part is a child resource of the preceding part
+         *
+         * So the part path `/notes`, is a child resource of the root resource `/`. And `/notes/{noteId}` is a child resource of `/notes`.
+         * If `/notes` has been created in the imported API, you have to import it before creating the `/notes/{noteId}` child route.
          */
         importedPaths?: {
             [path: string]: string;

package/constructs/AstroSite.d.ts

@@ -30,6 +30,7 @@ export declare class AstroSite extends SsrSite {
             type: "function";
             constructId: string;
             function: import("./SsrFunction.js").SsrFunctionProps;
+            injections?: string[] | undefined;
             streaming?: boolean | undefined;
         } | {
             type: "image-optimization-function";

package/constructs/NextjsSite.d.ts

@@ -1,11 +1,8 @@
 import { Construct } from "constructs";
-import { Duration as CdkDuration } from "aws-cdk-lib/core";
 import { Runtime, FunctionProps, Architecture } from "aws-cdk-lib/aws-lambda";
 import { SsrSite, SsrSiteNormalizedProps, SsrSiteProps } from "./SsrSite.js";
 import { Size } from "./util/size.js";
 import { Bucket } from "aws-cdk-lib/aws-s3";
-import { PolicyStatement } from "aws-cdk-lib/aws-iam";
-import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { CachePolicyProps } from "aws-cdk-lib/aws-cloudfront";
 export interface NextjsSiteProps extends Omit<SsrSiteProps, "nodejs"> {
     /**
@@ -148,78 +145,15 @@ export declare class NextjsSite extends SsrSite {
             edgeServer: {
                 constructId: string;
                 function: {
-                    layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
+                    description: string;
+                    bundle: string;
                     handler: string;
-                    bundle?: string | undefined;
-                    runtime?: "nodejs16.x" | "nodejs18.x" | "nodejs20.x" | undefined;
-                    timeout?: number | `${number} second` | `${number} seconds` | `${number} minute` | `${number} minutes` | `${number} hour` | `${number} hours` | `${number} day` | `${number} days` | undefined;
-                    memorySize?: number | `${number} MB` | `${number} GB` | undefined;
-                    permissions?: import("./index.js").Permissions | undefined;
-                    environment?: Record<string, string> | undefined;
-                    bind?: import("./Construct.js").SSTConstruct[] | undefined;
-                    nodejs?: import("./Function.js").NodeJSProps | undefined;
-                    copyFiles?: import("./Function.js").FunctionCopyFilesProps[] | undefined;
-                    logRetention?: RetentionDays | undefined;
-                    functionName?: string | undefined;
-                    tracing?: import("aws-cdk-lib/aws-lambda").Tracing | undefined;
-                    architecture?: Architecture | undefined;
-                    description?: string | undefined;
-                    ephemeralStorageSize?: import("aws-cdk-lib/core").Size | undefined;
-                    initialPolicy?: PolicyStatement[] | undefined;
-                    role?: import("aws-cdk-lib/aws-iam").IRole | undefined;
-                    vpc?: import("aws-cdk-lib/aws-ec2").IVpc | undefined;
-                    vpcSubnets?: import("aws-cdk-lib/aws-ec2").SubnetSelection | undefined;
-                    securityGroups?: import("aws-cdk-lib/aws-ec2").ISecurityGroup[] | undefined;
-                    allowAllOutbound?: boolean | undefined;
-                    deadLetterQueueEnabled?: boolean | undefined;
-                    deadLetterQueue?: import("aws-cdk-lib/aws-sqs").IQueue | undefined;
-                    deadLetterTopic?: import("aws-cdk-lib/aws-sns").ITopic | undefined;
-                    snapStart?: import("aws-cdk-lib/aws-lambda").SnapStartConf | undefined;
-                    profiling?: boolean | undefined;
-                    profilingGroup?: import("aws-cdk-lib/aws-codeguruprofiler").IProfilingGroup | undefined;
-                    insightsVersion?: import("aws-cdk-lib/aws-lambda").LambdaInsightsVersion | undefined;
-                    adotInstrumentation?: import("aws-cdk-lib/aws-lambda").AdotInstrumentationConfig | undefined;
-                    paramsAndSecrets?: import("aws-cdk-lib/aws-lambda").ParamsAndSecretsLayerVersion | undefined;
-                    reservedConcurrentExecutions?: number | undefined;
-                    events?: import("aws-cdk-lib/aws-lambda").IEventSource[] | undefined;
-                    logRetentionRole?: import("aws-cdk-lib/aws-iam").IRole | undefined;
-                    logRetentionRetryOptions?: import("aws-cdk-lib/aws-lambda").LogRetentionRetryOptions | undefined;
-                    currentVersionOptions?: import("aws-cdk-lib/aws-lambda").VersionOptions | undefined;
-                    filesystem?: import("aws-cdk-lib/aws-lambda").FileSystem | undefined;
-                    allowPublicSubnet?: boolean | undefined;
-                    environmentEncryption?: import("aws-cdk-lib/aws-kms").IKey | undefined;
-                    codeSigningConfig?: import("aws-cdk-lib/aws-lambda").ICodeSigningConfig | undefined;
-                    runtimeManagementMode?: import("aws-cdk-lib/aws-lambda").RuntimeManagementMode | undefined;
-                    logGroup?: import("aws-cdk-lib/aws-logs").ILogGroup | undefined;
-                    logFormat?: string | undefined;
-                    applicationLogLevel?: string | undefined;
-                    systemLogLevel?: string | undefined;
-                    onFailure?: import("aws-cdk-lib/aws-lambda").IDestination | undefined;
-                    onSuccess?: import("aws-cdk-lib/aws-lambda").IDestination | undefined;
-                    maxEventAge?: CdkDuration | undefined;
-                    retryAttempts?: number | undefined;
-                } | {
+                    environment: {
+                        CACHE_BUCKET_NAME: string;
+                        CACHE_BUCKET_KEY_PREFIX: string;
+                        CACHE_BUCKET_REGION: string;
+                    };
                     layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
-                    handler: string;
-                    bundle?: string | undefined;
-                    runtime?: "nodejs16.x" | "nodejs18.x" | "nodejs20.x" | undefined;
-                    timeout?: number | `${number} second` | `${number} seconds` | `${number} minute` | `${number} minutes` | `${number} hour` | `${number} hours` | `${number} day` | `${number} days` | undefined;
-                    memorySize?: number | `${number} MB` | `${number} GB` | undefined;
-                    permissions?: import("./index.js").Permissions | undefined;
-                    /**
-                     * How the logs are stored in CloudWatch
-                     * - "combined" - Logs from all routes are stored in the same log group.
-                     * - "per-route" - Logs from each route are stored in a separate log group.
-                     * @default "per-route"
-                     * @example
-                     * ```js
-                     * logging: "combined",
-                     * ```
-                     */
-                    environment?: Record<string, string> | undefined;
-                    bind?: import("./Construct.js").SSTConstruct[] | undefined;
-                    nodejs?: import("./Function.js").NodeJSProps | undefined;
-                    scopeOverride?: import("constructs").IConstruct | undefined;
                 };
             };
         } | undefined;
@@ -259,80 +193,18 @@ export declare class NextjsSite extends SsrSite {
                 type: "function";
                 constructId: string;
                 function: {
-                    layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
+                    description: string;
+                    bundle: string;
                     handler: string;
-                    bundle?: string | undefined;
-                    runtime?: "nodejs16.x" | "nodejs18.x" | "nodejs20.x" | undefined;
-                    timeout?: number | `${number} second` | `${number} seconds` | `${number} minute` | `${number} minutes` | `${number} hour` | `${number} hours` | `${number} day` | `${number} days` | undefined;
-                    memorySize?: number | `${number} MB` | `${number} GB` | undefined;
-                    permissions?: import("./index.js").Permissions | undefined;
-                    environment?: Record<string, string> | undefined;
-                    bind?: import("./Construct.js").SSTConstruct[] | undefined;
-                    nodejs?: import("./Function.js").NodeJSProps | undefined;
-                    copyFiles?: import("./Function.js").FunctionCopyFilesProps[] | undefined;
-                    logRetention?: RetentionDays | undefined;
-                    functionName?: string | undefined;
-                    tracing?: import("aws-cdk-lib/aws-lambda").Tracing | undefined;
-                    architecture?: Architecture | undefined;
-                    description?: string | undefined;
-                    ephemeralStorageSize?: import("aws-cdk-lib/core").Size | undefined;
-                    initialPolicy?: PolicyStatement[] | undefined;
-                    role?: import("aws-cdk-lib/aws-iam").IRole | undefined;
-                    vpc?: import("aws-cdk-lib/aws-ec2").IVpc | undefined;
-                    vpcSubnets?: import("aws-cdk-lib/aws-ec2").SubnetSelection | undefined;
-                    securityGroups?: import("aws-cdk-lib/aws-ec2").ISecurityGroup[] | undefined;
-                    allowAllOutbound?: boolean | undefined;
-                    deadLetterQueueEnabled?: boolean | undefined;
-                    deadLetterQueue?: import("aws-cdk-lib/aws-sqs").IQueue | undefined;
-                    deadLetterTopic?: import("aws-cdk-lib/aws-sns").ITopic | undefined;
-                    snapStart?: import("aws-cdk-lib/aws-lambda").SnapStartConf | undefined;
-                    profiling?: boolean | undefined;
-                    profilingGroup?: import("aws-cdk-lib/aws-codeguruprofiler").IProfilingGroup | undefined;
-                    insightsVersion?: import("aws-cdk-lib/aws-lambda").LambdaInsightsVersion | undefined;
-                    adotInstrumentation?: import("aws-cdk-lib/aws-lambda").AdotInstrumentationConfig | undefined;
-                    paramsAndSecrets?: import("aws-cdk-lib/aws-lambda").ParamsAndSecretsLayerVersion | undefined;
-                    reservedConcurrentExecutions?: number | undefined;
-                    events?: import("aws-cdk-lib/aws-lambda").IEventSource[] | undefined;
-                    logRetentionRole?: import("aws-cdk-lib/aws-iam").IRole | undefined;
-                    logRetentionRetryOptions?: import("aws-cdk-lib/aws-lambda").LogRetentionRetryOptions | undefined;
-                    currentVersionOptions?: import("aws-cdk-lib/aws-lambda").VersionOptions | undefined;
-                    filesystem?: import("aws-cdk-lib/aws-lambda").FileSystem | undefined;
-                    allowPublicSubnet?: boolean | undefined;
-                    environmentEncryption?: import("aws-cdk-lib/aws-kms").IKey | undefined;
-                    codeSigningConfig?: import("aws-cdk-lib/aws-lambda").ICodeSigningConfig | undefined;
-                    runtimeManagementMode?: import("aws-cdk-lib/aws-lambda").RuntimeManagementMode | undefined;
-                    logGroup?: import("aws-cdk-lib/aws-logs").ILogGroup | undefined;
-                    logFormat?: string | undefined;
-                    applicationLogLevel?: string | undefined;
-                    systemLogLevel?: string | undefined;
-                    onFailure?: import("aws-cdk-lib/aws-lambda").IDestination | undefined;
-                    onSuccess?: import("aws-cdk-lib/aws-lambda").IDestination | undefined;
-                    maxEventAge?: CdkDuration | undefined;
-                    retryAttempts?: number | undefined;
-                } | {
+                    environment: {
+                        CACHE_BUCKET_NAME: string;
+                        CACHE_BUCKET_KEY_PREFIX: string;
+                        CACHE_BUCKET_REGION: string;
+                    };
                     layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
-                    handler: string;
-                    bundle?: string | undefined;
-                    runtime?: "nodejs16.x" | "nodejs18.x" | "nodejs20.x" | undefined;
-                    timeout?: number | `${number} second` | `${number} seconds` | `${number} minute` | `${number} minutes` | `${number} hour` | `${number} hours` | `${number} day` | `${number} days` | undefined;
-                    memorySize?: number | `${number} MB` | `${number} GB` | undefined;
-                    permissions?: import("./index.js").Permissions | undefined;
-                    /**
-                     * How the logs are stored in CloudWatch
-                     * - "combined" - Logs from all routes are stored in the same log group.
-                     * - "per-route" - Logs from each route are stored in a separate log group.
-                     * @default "per-route"
-                     * @example
-                     * ```js
-                     * logging: "combined",
-                     * ```
-                     */
-                    environment?: Record<string, string> | undefined;
-                    bind?: import("./Construct.js").SSTConstruct[] | undefined;
-                    nodejs?: import("./Function.js").NodeJSProps | undefined;
-                    scopeOverride?: import("constructs").IConstruct | undefined;
                 };
                 streaming: boolean | undefined;
+                injections: string[];
             } | undefined;
         };
         edge: boolean;
@@ -374,7 +246,6 @@ export declare class NextjsSite extends SsrSite {
             secrets: string[];
         };
     };
-    private wrapServerFunction;
     private removeSourcemaps;
     private useRoutes;
     private useRoutesManifest;
@@ -382,6 +253,7 @@ export declare class NextjsSite extends SsrSite {
     private useAppPathsManifest;
     private usePagesManifest;
     private usePrerenderManifest;
+    private useServerFunctionPerRouteLoggingInjection;
     private getBuildId;
     private getSourcemapForAppRoute;
     private getSourcemapForPagesRoute;

package/constructs/NextjsSite.js

@@ -89,8 +89,9 @@ export class NextjsSite extends SsrSite {
         return super.buildDefaultServerCachePolicyProps(DEFAULT_CACHE_POLICY_ALLOWED_HEADERS);
     }
     plan(bucket) {
-        const { path: sitePath, edge, experimental, imageOptimization, } = this.props;
-        const serverConfig = this.wrapServerFunction({
+        const { path: sitePath, edge, experimental, imageOptimization, cdk, } = this.props;
+        const stack = Stack.of(this);
+        const serverConfig = {
             description: "Next.js server",
             bundle: path.join(sitePath, ".open-next", "server-function"),
             handler: "index.handler",
@@ -99,7 +100,14 @@ export class NextjsSite extends SsrSite {
                 CACHE_BUCKET_KEY_PREFIX: "_cache",
                 CACHE_BUCKET_REGION: Stack.of(this).region,
             },
-        });
+            layers: this.isPerRouteLoggingEnabled()
+                ? [
+                    LayerVersion.fromLayerVersionArn(this, "SSTExtension", cdk?.server?.architecture?.name === Architecture.X86_64.name
+                        ? `arn:aws:lambda:${stack.region}:226609089145:layer:sst-extension-amd64:${LAYER_VERSION}`
+                        : `arn:aws:lambda:${stack.region}:226609089145:layer:sst-extension-arm64:${LAYER_VERSION}`),
+                ]
+                : undefined,
+        };
         this.removeSourcemaps();
         return this.validatePlan({
             edge: edge ?? false,
@@ -126,6 +134,9 @@ export class NextjsSite extends SsrSite {
                             constructId: "ServerFunction",
                             function: serverConfig,
                             streaming: experimental?.streaming,
+                            injections: this.isPerRouteLoggingEnabled()
+                                ? [this.useServerFunctionPerRouteLoggingInjection()]
+                                : [],
                         },
                     }),
                 imageOptimizer: {
@@ -331,56 +342,6 @@ export class NextjsSite extends SsrSite {
             },
         };
     }
-    wrapServerFunction(config) {
-        const { path: sitePath, experimental, cdk } = this.props;
-        const stack = Stack.of(this);
-        const wrapperName = "nextjssite-index";
-        const serverPath = path.join(sitePath, ".open-next", "server-function");
-        const injections = [];
-        if (this.isPerRouteLoggingEnabled()) {
-            injections.push(`
-      if (event.rawPath) {
-        const routeData = ${JSON.stringify(this.useRoutes().map(({ regex, logGroupPath }) => ({
-                regex,
-                logGroupPath,
-            })))}.find(({ regex }) => event.rawPath.match(new RegExp(regex)));
-        if (routeData) {
-          console.log("::sst::" + JSON.stringify({
-            action:"log.split",
-            properties: {
-              logGroupName:"/sst/lambda/" + context.functionName + routeData.logGroupPath,
-            },
-          }));
-        }
-      }`);
-        }
-        fs.writeFileSync(path.join(serverPath, `${wrapperName}.mjs`), experimental?.streaming
-            ? [
-                `export const handler = awslambda.streamifyResponse(async (event, context) => {`,
-                ...injections,
-                `  const { handler: rawHandler} = await import("./index.mjs");`,
-                `  return rawHandler(event, context);`,
-                `});`,
-            ].join("\n")
-            : [
-                `export const handler = async (event, context) => {`,
-                ...injections,
-                `  const { handler: rawHandler} = await import("./index.mjs");`,
-                `  return rawHandler(event, context);`,
-                `};`,
-            ].join("\n"));
-        return {
-            ...config,
-            layers: this.isPerRouteLoggingEnabled()
-                ? [
-                    LayerVersion.fromLayerVersionArn(this, "SSTExtension", cdk?.server?.architecture?.name === Architecture.X86_64.name
-                        ? `arn:aws:lambda:${stack.region}:226609089145:layer:sst-extension-amd64:${LAYER_VERSION}`
-                        : `arn:aws:lambda:${stack.region}:226609089145:layer:sst-extension-arm64:${LAYER_VERSION}`),
-                ]
-                : undefined,
-            handler: `${wrapperName}.handler`,
-        };
-    }
     removeSourcemaps() {
         const { path: sitePath } = this.props;
         const files = globSync("**/*.js.map", {
@@ -506,6 +467,23 @@ export class NextjsSite extends SsrSite {
             Logger.debug("Failed to load prerender-manifest.json", e);
         }
     }
+    useServerFunctionPerRouteLoggingInjection() {
+        return `
+if (event.rawPath) {
+  const routeData = ${JSON.stringify(this.useRoutes().map(({ regex, logGroupPath }) => ({
+            regex,
+            logGroupPath,
+        })))}.find(({ regex }) => event.rawPath.match(new RegExp(regex)));
+  if (routeData) {
+    console.log("::sst::" + JSON.stringify({
+      action:"log.split",
+      properties: {
+        logGroupName:"/sst/lambda/" + context.functionName + routeData.logGroupPath,
+      },
+    }));
+  }
+}`;
+    }
     getBuildId() {
         const { path: sitePath } = this.props;
         return fs.readFileSync(path.join(sitePath, ".next/BUILD_ID")).toString();

package/constructs/SsrFunction.d.ts

@@ -19,6 +19,8 @@ export interface SsrFunctionProps extends Omit<FunctionOptions, "memorySize" | "
     nodejs?: NodeJSProps;
     copyFiles?: FunctionCopyFilesProps[];
     logRetention?: RetentionDays;
+    streaming?: boolean;
+    injections?: string[];
 }
 export declare class SsrFunction extends Construct implements SSTConstruct {
     readonly id: string;
@@ -43,6 +45,7 @@ export declare class SsrFunction extends Construct implements SSTConstruct {
     private bind;
     private buildAssetFromHandler;
     private buildAssetFromBundle;
+    private writeWrapperFile;
     private updateCodeReplacer;
     private updateFunction;
     /** @internal */

package/constructs/SsrFunction.js

@@ -38,6 +38,8 @@ export class SsrFunction extends Construct {
         this.props = {
             timeout: 10,
             memorySize: 1024,
+            streaming: false,
+            injections: [],
             ...props,
             environment: props.environment || {},
             permissions: props.permissions || [],
@@ -53,15 +55,15 @@ export class SsrFunction extends Construct {
         this.assetReplacer = assetReplacer;
         this.assetReplacerPolicy = assetReplacerPolicy;
         useDeferredTasks().add(async () => {
-            const { bundle } = props;
-            const code = bundle
+            const { bundle } = this.props;
+            const { code, handler } = bundle
                 ? await this.buildAssetFromBundle(bundle)
                 : await this.buildAssetFromHandler();
             const codeConfig = code.bind(this.function);
             const assetBucket = codeConfig.s3Location?.bucketName;
             const assetKey = codeConfig.s3Location?.objectKey;
             this.updateCodeReplacer(assetBucket, assetKey);
-            this.updateFunction(code, assetBucket, assetKey);
+            this.updateFunction(code, assetBucket, assetKey, handler);
         });
         const app = this.node.root;
         app.registerTypes(this);
@@ -171,11 +173,12 @@ export class SsrFunction extends Construct {
         });
     }
     async buildAssetFromHandler() {
+        const { handler, runtime, nodejs, copyFiles, injections } = this.props;
         useFunctions().add(this.node.addr, {
-            handler: this.props.handler,
-            runtime: this.props.runtime,
-            nodejs: this.props.nodejs,
-            copyFiles: this.props.copyFiles,
+            handler,
+            runtime,
+            nodejs,
+            copyFiles,
         });
         // build function
         const result = await useRuntimeHandlers().build(this.node.addr, "deploy");
@@ -185,6 +188,7 @@ export class SsrFunction extends Construct {
                 `There was a problem bundling the SSR function for the "${this.node.id}" Site.`,
                 ...result.errors,
             ].join("\n"));
+        const newHandler = await this.writeWrapperFile(result.out, result.handler);
         // upload sourcemap
         const stack = Stack.of(this);
         if (result.sourcemap) {
@@ -200,9 +204,11 @@ export class SsrFunction extends Construct {
             });
         }
         this.missingSourcemap = !result.sourcemap;
-        return AssetCode.fromAsset(result.out);
+        return { code: AssetCode.fromAsset(result.out), handler: newHandler };
     }
     async buildAssetFromBundle(bundle) {
+        const { handler } = this.props;
+        const newHandler = await this.writeWrapperFile(bundle, handler);
         // Note: cannot point the bundle to the `.open-next/server-function`
         //       b/c the folder contains node_modules. And pnpm node_modules
         //       contains symlinks. CDK cannot zip symlinks correctly.
@@ -214,7 +220,35 @@ export class SsrFunction extends Construct {
         if (result.status !== 0) {
             throw new Error(`There was a problem generating the assets package.`);
         }
-        return AssetCode.fromAsset(path.join(outputPath, "server-function.zip"));
+        return {
+            code: AssetCode.fromAsset(path.join(outputPath, "server-function.zip")),
+            handler: newHandler,
+        };
+    }
+    async writeWrapperFile(bundle, handler) {
+        const { streaming, injections } = this.props;
+        if (injections.length === 0)
+            return handler;
+        const { dir: handlerDir, name: oldHandlerName, ext: oldHandlerExt, } = path.posix.parse(handler);
+        const oldHandlerFunction = oldHandlerExt.replace(/^\./, "");
+        const newHandlerName = "server-index";
+        const newHandlerFunction = "handler";
+        await fs.writeFile(path.join(bundle, handlerDir, `${newHandlerName}.mjs`), streaming
+            ? [
+                `export const ${newHandlerFunction} = awslambda.streamifyResponse(async (event, context) => {`,
+                ...injections,
+                `  const { ${oldHandlerFunction}: rawHandler} = await import("./${oldHandlerName}.mjs");`,
+                `  return rawHandler(event, context);`,
+                `});`,
+            ].join("\n")
+            : [
+                `export const ${newHandlerFunction} = async (event, context) => {`,
+                ...injections,
+                `  const { ${oldHandlerFunction}: rawHandler} = await import("./${oldHandlerName}.mjs");`,
+                `  return rawHandler(event, context);`,
+                `};`,
+            ].join("\n"));
+        return path.posix.join(handlerDir, `${newHandlerName}.${newHandlerFunction}`);
     }
     updateCodeReplacer(assetBucket, assetKey) {
         const stack = Stack.of(this);
@@ -225,8 +259,9 @@ export class SsrFunction extends Construct {
         const cfnPolicy = this.assetReplacerPolicy.node.defaultChild;
         cfnPolicy.addPropertyOverride("PolicyDocument.Statement.0.Resource", `arn:${stack.partition}:s3:::${assetBucket}/*`);
     }
-    updateFunction(code, assetBucket, assetKey) {
+    updateFunction(code, assetBucket, assetKey, handler) {
         const cfnFunction = this.function.node.defaultChild;
+        cfnFunction.handler = handler;
         cfnFunction.code = {
             s3Bucket: assetBucket,
             s3Key: assetKey,

package/constructs/SsrSite.d.ts

@@ -26,6 +26,7 @@ type FunctionOriginConfig = {
     type: "function";
     constructId: string;
     function: SsrFunctionProps;
+    injections?: string[];
     streaming?: boolean;
 };
 type ImageOptimizationFunctionOriginConfig = {

package/constructs/SsrSite.js

@@ -443,6 +443,11 @@ function handler(event) {
                     ...props.function.environment,
                 },
                 ...cdk?.server,
+                streaming: props.streaming,
+                injections: [
+                    ...(warm ? [useServerFunctionWarmingInjection()] : []),
+                    ...(props.injections || []),
+                ],
             });
             ssrFunctions.push(fn);
             bucket.grantReadWrite(fn?.role);
@@ -632,6 +637,16 @@ 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 getS3FileOptions(copy) {
             const fileOptions = [];
             const nonVersionedFilesTTL = typeof assets?.nonVersionedFilesTTL === "number"

package/node/util/loader.js

@@ -9,10 +9,11 @@ export function createLoader(batchFn) {
         const batch = current;
         if (!batch)
             return;
-        const result = await batchFn(batch.keys);
-        for (let i = 0; i < result.length; i++) {
-            batch.promises[i](result[i]);
-        }
+        batchFn(batch.keys).then((result) => {
+            for (let i = 0; i < result.length; i++) {
+                batch.promises[i](result[i]);
+            }
+        });
         current = undefined;
     }
     function getBatch() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.36.5",
+  "version": "2.36.7",
   "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.36.5",
+    "astro-sst": "2.36.7",
     "async": "^3.2.4",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",