sst 2.0.0-rc.57 → 2.0.0-rc.60

package/constructs/AstroSite.js

@@ -35,7 +35,7 @@ export class AstroSite extends SsrSite {
         super.validateBuildOutput();
     }
     createFunctionForRegional() {
-        const { defaults, environment, bind } = this.props;
+        const { memorySize, timeout, environment, bind, cdk } = this.props;
         // Create function
         const fn = new Function(this, `ServerFunction`, {
             description: "Server handler",
@@ -43,19 +43,19 @@ export class AstroSite extends SsrSite {
             bind,
             logRetention: "three_days",
             runtime: "nodejs16.x",
-            memorySize: defaults?.function?.memorySize || "512 MB",
-            timeout: defaults?.function?.timeout || "10 seconds",
+            memorySize,
+            timeout,
             nodejs: {
                 format: "esm",
             },
-            enableLiveDev: false,
             environment,
+            ...cdk?.server,
         });
         fn._disableBind = true;
         return fn;
     }
     createFunctionForEdge() {
-        const { defaults, environment } = this.props;
+        const { timeout, memorySize, permissions, environment } = this.props;
         // Create a directory that we will use to create the bundled version
         // of the "core server build" along with our custom Lamba server handler.
         const outputPath = path.resolve(path.join(useProject().paths.artifacts, `AstroSiteFunction-${this.node.id}-${this.node.addr}`));
@@ -89,9 +89,9 @@ export class AstroSite extends SsrSite {
             scopeOverride: this,
             bundlePath: outputPath,
             handler: "entry.handler",
-            timeout: defaults?.function?.timeout,
-            memory: defaults?.function?.memorySize,
-            permissions: defaults?.function?.permissions,
+            timeout,
+            memorySize,
+            permissions,
             environment,
             format: "esm",
         });

package/constructs/EdgeFunction.d.ts

@@ -1,14 +1,16 @@
 import { Construct, IConstruct } from "constructs";
 import * as iam from "aws-cdk-lib/aws-iam";
 import * as lambda from "aws-cdk-lib/aws-lambda";
+import { Size } from "./util/size.js";
+import { Duration } from "./util/duration.js";
 import { Permissions } from "./util/permission.js";
 export interface EdgeFunctionProps {
     bundlePath: string;
     handler: string;
-    timeout?: number;
-    memory?: number;
+    timeout: number | Duration;
+    memorySize: number | Size;
     permissions?: Permissions;
-    format?: "cjs" | "esm";
+    format: "cjs" | "esm";
     environment?: Record<string, string>;
     /**
      * This is intended to be used internally by SST to make constructs

package/constructs/EdgeFunction.js

@@ -6,8 +6,10 @@ import { Construct } from "constructs";
 import * as iam from "aws-cdk-lib/aws-iam";
 import * as lambda from "aws-cdk-lib/aws-lambda";
 import * as s3Assets from "aws-cdk-lib/aws-s3-assets";
-import { Lazy, Duration, CustomResource } from "aws-cdk-lib";
+import { Lazy, Duration as CdkDuration, CustomResource, } from "aws-cdk-lib";
 import { Stack } from "./Stack.js";
+import { toCdkSize } from "./util/size.js";
+import { toCdkDuration } from "./util/duration.js";
 import { attachPermissionsToRole } from "./util/permission.js";
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 /////////////////////
@@ -106,7 +108,7 @@ ${exports}
         return role;
     }
     createFunction(asset) {
-        const { timeout, memory, bundlePath } = this.props;
+        const { timeout, memorySize } = this.props;
         const name = this.node.id;
         // Create a S3 bucket in us-east-1 to store Lambda code. Create
         // 1 bucket for all Edge functions.
@@ -121,8 +123,12 @@ ${exports}
                 S3Key: asset.s3ObjectKey,
             },
             Runtime: lambda.Runtime.NODEJS_18_X.name,
-            MemorySize: memory || 512,
-            Timeout: Duration.seconds(timeout || 10).toSeconds(),
+            MemorySize: typeof memorySize === "string"
+                ? toCdkSize(memorySize).toMebibytes()
+                : memorySize,
+            Timeout: typeof timeout === "string"
+                ? toCdkDuration(timeout).toSeconds()
+                : timeout,
             Role: this.role.roleArn,
         });
         const functionArn = functionCR.getAttString("FunctionArn");
@@ -170,7 +176,7 @@ ${exports}
             code: lambda.Code.fromAsset(path.join(__dirname, "../support/edge-function")),
             handler: "s3-bucket.handler",
             runtime: lambda.Runtime.NODEJS_16_X,
-            timeout: Duration.minutes(15),
+            timeout: CdkDuration.minutes(15),
             memorySize: 1024,
             initialPolicy: [
                 new iam.PolicyStatement({
@@ -202,7 +208,7 @@ ${exports}
                 code: lambda.Code.fromAsset(path.join(__dirname, "../support/edge-function")),
                 handler: "edge-lambda.handler",
                 runtime: lambda.Runtime.NODEJS_16_X,
-                timeout: Duration.minutes(15),
+                timeout: CdkDuration.minutes(15),
                 memorySize: 1024,
                 initialPolicy: [
                     new iam.PolicyStatement({
@@ -240,7 +246,7 @@ ${exports}
                 code: lambda.Code.fromAsset(path.join(__dirname, "../support/edge-function")),
                 handler: "edge-lambda-version.handler",
                 runtime: lambda.Runtime.NODEJS_16_X,
-                timeout: Duration.minutes(15),
+                timeout: CdkDuration.minutes(15),
                 memorySize: 1024,
                 initialPolicy: [
                     new iam.PolicyStatement({

package/constructs/Job.d.ts

@@ -98,29 +98,28 @@ export interface JobProps {
      * ```
      */
     permissions?: Permissions;
-    cdk?: JobCDKProps;
-}
-export interface JobCDKProps {
-    /**
-     * Allows you to override default id for this construct.
-     */
-    id?: string;
-    /**
-     * Runs codebuild job in the specified VPC. Note this will only work once deployed.
-     *
-     * @example
-     * ```js
-     * new Job(stack, "MyJob", {
-     *   handler: "src/job.handler",
-     *   cdk: {
-     *     vpc: Vpc.fromLookup(stack, "VPC", {
-     *       vpcId: "vpc-xxxxxxxxxx",
-     *     }),
-     *   }
-     * })
-     * ```
-     */
-    vpc?: IVpc;
+    cdk?: {
+        /**
+         * Allows you to override default id for this construct.
+         */
+        id?: string;
+        /**
+         * Runs codebuild job in the specified VPC. Note this will only work once deployed.
+         *
+         * @example
+         * ```js
+         * new Job(stack, "MyJob", {
+         *   handler: "src/job.handler",
+         *   cdk: {
+         *     vpc: Vpc.fromLookup(stack, "VPC", {
+         *       vpcId: "vpc-xxxxxxxxxx",
+         *     }),
+         *   }
+         * })
+         * ```
+         */
+        vpc?: IVpc;
+    };
 }
 /**
  * The `Cron` construct is a higher level CDK construct that makes it easy to create a cron job.

package/constructs/NextjsSite.d.ts

@@ -2,7 +2,20 @@ import { Construct } from "constructs";
 import * as lambda from "aws-cdk-lib/aws-lambda";
 import * as cloudfront from "aws-cdk-lib/aws-cloudfront";
 import { SsrSite, SsrSiteProps } from "./SsrSite.js";
+import { Size } from "./util/size.js";
+import { Duration } from "./util/duration.js";
 export interface NextjsSiteProps extends Omit<SsrSiteProps, "edge"> {
+    imageOptimization?: {
+        /**
+         * The amount of memory in MB allocated for image optimization function.
+         * @default 1024 MB
+         * @example
+         * ```js
+         * memorySize: "512 MB",
+         * ```
+         */
+        memorySize?: number | Size;
+    };
 }
 /**
  * The `NextjsSite` construct is a higher level CDK construct that makes it easy to create a Next.js app.
@@ -16,6 +29,11 @@ export interface NextjsSiteProps extends Omit<SsrSiteProps, "edge"> {
  * ```
  */
 export declare class NextjsSite extends SsrSite {
+    protected props: Omit<NextjsSiteProps, "path"> & {
+        path: string;
+        timeout: number | Duration;
+        memorySize: number | Size;
+    };
     constructor(scope: Construct, id: string, props?: NextjsSiteProps);
     protected initBuildConfig(): {
         serverBuildOutputFile: string;

package/constructs/NextjsSite.js

@@ -1,7 +1,7 @@
 import fs from "fs";
 import url from "url";
 import path from "path";
-import { Fn, Duration, RemovalPolicy } from "aws-cdk-lib";
+import { Fn, Duration as CdkDuration, RemovalPolicy } from "aws-cdk-lib";
 import * as logs from "aws-cdk-lib/aws-logs";
 import * as lambda from "aws-cdk-lib/aws-lambda";
 import * as cloudfront from "aws-cdk-lib/aws-cloudfront";
@@ -9,6 +9,7 @@ import * as origins from "aws-cdk-lib/aws-cloudfront-origins";
 import { SsrFunction } from "./SsrFunction.js";
 import { EdgeFunction } from "./EdgeFunction.js";
 import { SsrSite } from "./SsrSite.js";
+import { toCdkSize } from "./util/size.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /**
  * The `NextjsSite` construct is a higher level CDK construct that makes it easy to create a Next.js app.
@@ -36,20 +37,20 @@ export class NextjsSite extends SsrSite {
         };
     }
     createFunctionForRegional() {
-        const { defaults, environment } = this.props;
+        const { timeout, memorySize, permissions, environment } = this.props;
         const ssrFn = new SsrFunction(this, `ServerFunction`, {
             description: "Server handler for Next.js",
             bundlePath: path.join(this.props.path, ".open-next", "server-function"),
             handler: "index.handler",
-            timeout: defaults?.function?.timeout,
-            memory: defaults?.function?.memorySize,
-            permissions: defaults?.function?.permissions,
+            timeout,
+            memorySize,
+            permissions,
             environment,
         });
         return ssrFn.function;
     }
     createImageOptimizationFunctionForRegional() {
-        const { defaults, path: sitePath } = this.props;
+        const { imageOptimization, path: sitePath, cdk } = this.props;
         return new lambda.Function(this, `ImageFunction`, {
             description: "Image optimization handler for Next.js",
             handler: "index.handler",
@@ -59,15 +60,20 @@ export class NextjsSite extends SsrSite {
             logRetention: logs.RetentionDays.THREE_DAYS,
             code: lambda.Code.fromAsset(path.join(sitePath, ".open-next/image-optimization-function")),
             runtime: lambda.Runtime.NODEJS_18_X,
-            memorySize: defaults?.function?.memorySize || 512,
-            timeout: Duration.seconds(defaults?.function?.timeout || 10),
+            memorySize: imageOptimization?.memorySize
+                ? typeof imageOptimization.memorySize === "string"
+                    ? toCdkSize(imageOptimization.memorySize).toMebibytes()
+                    : imageOptimization.memorySize
+                : 512,
+            timeout: CdkDuration.seconds(25),
             environment: {
                 BUCKET_NAME: this.cdk.bucket.bucketName,
             },
+            ...cdk?.server,
         });
     }
     createMiddlewareEdgeFunctionForRegional() {
-        const { defaults, environment, path: sitePath } = this.props;
+        const { permissions, environment, path: sitePath } = this.props;
         const middlewarePath = path.resolve(sitePath, ".open-next/middleware-function");
         const isMiddlewareEnabled = fs.existsSync(middlewarePath);
         let bundlePath, handler;
@@ -82,9 +88,9 @@ export class NextjsSite extends SsrSite {
         const fn = new EdgeFunction(this, "Middleware", {
             bundlePath,
             handler,
-            timeout: 5,
-            memory: 128,
-            permissions: defaults?.function?.permissions,
+            timeout: 10,
+            memorySize: 512,
+            permissions,
             environment,
             format: "esm",
         });
@@ -230,9 +236,9 @@ export class NextjsSite extends SsrSite {
             // required by server request
             "x-op-middleware-request-headers", "x-op-middleware-response-headers", "x-nextjs-data", "x-middleware-prefetch"),
             cookieBehavior: cloudfront.CacheCookieBehavior.all(),
-            defaultTtl: Duration.days(0),
-            maxTtl: Duration.days(365),
-            minTtl: Duration.days(0),
+            defaultTtl: CdkDuration.days(0),
+            maxTtl: CdkDuration.days(365),
+            minTtl: CdkDuration.days(0),
             enableAcceptEncodingBrotli: true,
             enableAcceptEncodingGzip: true,
             comment: "SST server response cache policy",

package/constructs/RemixSite.js

@@ -4,13 +4,15 @@ import path from "path";
 import * as esbuild from "esbuild";
 import { createRequire } from "module";
 const require = createRequire(import.meta.url);
-import { Duration, RemovalPolicy } from "aws-cdk-lib";
+import { Duration as CdkDuration, RemovalPolicy } from "aws-cdk-lib";
 import * as logs from "aws-cdk-lib/aws-logs";
 import * as lambda from "aws-cdk-lib/aws-lambda";
 import { Logger } from "../logger.js";
 import { SsrSite } from "./SsrSite.js";
 import { useProject } from "../project.js";
 import { EdgeFunction } from "./EdgeFunction.js";
+import { toCdkSize } from "./util/size.js";
+import { toCdkDuration } from "./util/duration.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /**
  * The `RemixSite` construct is a higher level CDK construct that makes it easy to create a Remix app.
@@ -110,7 +112,7 @@ export class RemixSite extends SsrSite {
         return outputPath;
     }
     createFunctionForRegional() {
-        const { defaults, environment } = this.props;
+        const { timeout, memorySize, environment, cdk } = this.props;
         const bundlePath = this.createServerLambdaBundle("regional-server.js");
         return new lambda.Function(this, `ServerFunction`, {
             description: "Server handler for Remix",
@@ -121,21 +123,27 @@ export class RemixSite extends SsrSite {
             logRetention: logs.RetentionDays.THREE_DAYS,
             code: lambda.Code.fromAsset(bundlePath),
             runtime: lambda.Runtime.NODEJS_16_X,
-            memorySize: defaults?.function?.memorySize || 512,
-            timeout: Duration.seconds(defaults?.function?.timeout || 10),
+            memorySize: typeof memorySize === "string"
+                ? toCdkSize(memorySize).toMebibytes()
+                : memorySize,
+            timeout: typeof timeout === "string"
+                ? toCdkDuration(timeout)
+                : CdkDuration.seconds(timeout),
             environment,
+            ...cdk?.server,
         });
     }
     createFunctionForEdge() {
-        const { defaults, environment } = this.props;
+        const { timeout, memorySize, permissions, environment } = this.props;
         const bundlePath = this.createServerLambdaBundle("edge-server.js");
         return new EdgeFunction(this, `Server`, {
             scopeOverride: this,
+            format: "cjs",
             bundlePath,
             handler: "server.handler",
-            timeout: defaults?.function?.timeout,
-            memory: defaults?.function?.memorySize,
-            permissions: defaults?.function?.permissions,
+            timeout,
+            memorySize,
+            permissions,
             environment,
         });
     }

package/constructs/SolidStartSite.js

@@ -27,7 +27,7 @@ export class SolidStartSite extends SsrSite {
         };
     }
     createFunctionForRegional() {
-        const { defaults, environment } = this.props;
+        const { timeout, memorySize, environment, cdk } = this.props;
         // Bundle code
         const handler = path.join(this.props.path, "dist", "server", "index.handler");
         // Create function
@@ -36,19 +36,19 @@ export class SolidStartSite extends SsrSite {
             handler,
             logRetention: "three_days",
             runtime: "nodejs16.x",
-            memorySize: defaults?.function?.memorySize || "512 MB",
-            timeout: defaults?.function?.timeout || "10 seconds",
+            memorySize,
+            timeout,
             nodejs: {
                 format: "esm",
             },
-            enableLiveDev: false,
             environment,
+            ...cdk?.server,
         });
         fn._disableBind = true;
         return fn;
     }
     createFunctionForEdge() {
-        const { defaults, environment } = this.props;
+        const { timeout, memorySize, permissions, environment } = this.props;
         // Create a directory that we will use to create the bundled version
         // of the "core server build" along with our custom Lamba server handler.
         const outputPath = path.resolve(path.join(useProject().paths.artifacts, `SolidStartSiteFunction-${this.node.id}-${this.node.addr}`));
@@ -83,9 +83,9 @@ export class SolidStartSite extends SsrSite {
             scopeOverride: this,
             bundlePath: outputPath,
             handler: "server.handler",
-            timeout: defaults?.function?.timeout,
-            memory: defaults?.function?.memorySize,
-            permissions: defaults?.function?.permissions,
+            timeout,
+            memorySize,
+            permissions,
             environment,
             format: "esm",
         });

package/constructs/SsrFunction.d.ts

@@ -1,12 +1,14 @@
 import { Construct } from "constructs";
 import * as lambda from "aws-cdk-lib/aws-lambda";
 import { Permissions } from "./util/permission.js";
+import { Size } from "./util/size.js";
+import { Duration } from "./util/duration.js";
 export interface SsrFunctionProps {
     description?: string;
     bundlePath: string;
     handler: string;
-    timeout?: number;
-    memory?: number;
+    timeout: number | Duration;
+    memorySize: number | Size;
     permissions?: Permissions;
     environment?: Record<string, string>;
 }

package/constructs/SsrFunction.js

@@ -6,10 +6,12 @@ import * as iam from "aws-cdk-lib/aws-iam";
 import * as logs from "aws-cdk-lib/aws-logs";
 import * as lambda from "aws-cdk-lib/aws-lambda";
 import * as s3Assets from "aws-cdk-lib/aws-s3-assets";
-import { Duration, CustomResource } from "aws-cdk-lib";
+import { Duration as CdkDuration, CustomResource } from "aws-cdk-lib";
 import { Stack } from "./Stack.js";
 import { useProject } from "../project.js";
 import { attachPermissionsToRole } from "./util/permission.js";
+import { toCdkSize } from "./util/size.js";
+import { toCdkDuration } from "./util/duration.js";
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 /////////////////////
 // Construct
@@ -28,7 +30,7 @@ export class SsrFunction extends Construct {
         attachPermissionsToRole(this.function.role, permissions);
     }
     createFunction() {
-        const { timeout, memory, handler, bundlePath, environment } = this.props;
+        const { timeout, memorySize, handler, bundlePath, environment } = this.props;
         // Note: cannot point the bundlePath to the `.open-next/server-function`
         //       b/c the folder contains node_modules. And pnpm node_modules
         //       contains symlinks. CDK cannot zip symlinks correctly.
@@ -56,8 +58,12 @@ export class SsrFunction extends Construct {
             logRetention: logs.RetentionDays.THREE_DAYS,
             code: lambda.Code.fromBucket(asset.bucket, asset.s3ObjectKey),
             runtime: lambda.Runtime.NODEJS_18_X,
-            memorySize: memory || 512,
-            timeout: Duration.seconds(timeout || 10),
+            memorySize: typeof memorySize === "string"
+                ? toCdkSize(memorySize).toMebibytes()
+                : memorySize,
+            timeout: typeof timeout === "string"
+                ? toCdkDuration(timeout)
+                : CdkDuration.seconds(timeout),
             environment,
         });
         fn.node.addDependency(replacer);

package/constructs/SsrSite.d.ts

@@ -1,13 +1,15 @@
 import { Construct } from "constructs";
-import * as s3 from "aws-cdk-lib/aws-s3";
-import * as lambda from "aws-cdk-lib/aws-lambda";
-import * as route53 from "aws-cdk-lib/aws-route53";
-import * as cloudfront from "aws-cdk-lib/aws-cloudfront";
-import * as acm from "aws-cdk-lib/aws-certificatemanager";
-import * as origins from "aws-cdk-lib/aws-cloudfront-origins";
+import { Bucket, BucketProps, IBucket } from "aws-cdk-lib/aws-s3";
+import { Function, FunctionProps } from "aws-cdk-lib/aws-lambda";
+import { IHostedZone } from "aws-cdk-lib/aws-route53";
+import { Distribution, ICachePolicy, BehaviorOptions, CachePolicy } 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 { EdgeFunction } from "./EdgeFunction.js";
 import { BaseSiteDomainProps, BaseSiteReplaceProps, BaseSiteCdkDistributionProps } from "./BaseSite.js";
+import { Size } from "./util/size.js";
+import { Duration } from "./util/duration.js";
 import { Permissions } from "./util/permission.js";
 import { FunctionBindingProps } from "./util/functionBinding.js";
 export type SsrBuildConfig = {
@@ -34,11 +36,6 @@ export interface SsrSiteProps {
      * ```
      */
     bind?: SSTConstruct[];
-    /**
-     * The SSR function is deployed to Lambda in a single region. Alternatively, you can enable this option to deploy to Lambda@Edge.
-     * @default false
-     */
-    edge?: boolean;
     /**
      * Path to the directory where the app is located.
      * @default "."
@@ -74,6 +71,37 @@ export interface SsrSiteProps {
      * ```
      */
     customDomain?: string | SsrDomainProps;
+    /**
+     * The SSR function is deployed to Lambda in a single region. Alternatively, you can enable this option to deploy to Lambda@Edge.
+     * @default false
+     */
+    edge?: boolean;
+    /**
+     * The execution timeout in seconds for SSR function.
+     * @default 10 seconds
+     * @example
+     * ```js
+     * timeout: "5 seconds",
+     * ```
+     */
+    timeout?: number | Duration;
+    /**
+     * The amount of memory in MB allocated for SSR function.
+     * @default 1024 MB
+     * @example
+     * ```js
+     * memorySize: "512 MB",
+     * ```
+     */
+    memorySize?: number | Size;
+    /**
+     * Attaches the given list of permissions to the SSR function. Configuring this property is equivalent to calling `attachPermissions()` after the site is created.
+     * @example
+     * ```js
+     * permissions: ["ses"]
+     * ```
+     */
+    permissions?: Permissions;
     /**
      * An object with the key being the environment variable name.
      *
@@ -99,13 +127,6 @@ export interface SsrSiteProps {
          */
         deploy?: boolean;
     };
-    defaults?: {
-        function?: {
-            timeout?: number;
-            memorySize?: number;
-            permissions?: Permissions;
-        };
-    };
     /**
      * While deploying, SST waits for the CloudFront cache invalidation process to finish. This ensures that the new content will be served once the deploy command finishes. However, this process can sometimes take more than 5 mins. For non-prod environments it might make sense to pass in `false`. That'll skip waiting for the cache to invalidate and speed up the deploy process.
      * @default false
@@ -119,7 +140,7 @@ export interface SsrSiteProps {
         /**
          * Allows you to override default settings this construct uses internally to ceate the bucket
          */
-        bucket?: s3.BucketProps | s3.IBucket;
+        bucket?: BucketProps | IBucket;
         /**
          * Pass in a value to override the default settings this construct uses to
          * create the CDK `Distribution` internally.
@@ -136,8 +157,9 @@ export interface SsrSiteProps {
              * @note The default cache policy that is used in the abscene of this property
              * is one that performs no caching of the server response.
              */
-            serverRequests?: cloudfront.ICachePolicy;
+            serverRequests?: ICachePolicy;
         };
+        server?: Pick<FunctionProps, "vpc" | "vpcSubnets" | "securityGroups" | "allowAllOutbound" | "allowPublicSubnet">;
     };
 }
 /**
@@ -155,11 +177,13 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     readonly id: string;
     protected props: Omit<SsrSiteProps, "path"> & {
         path: string;
+        timeout: number | Duration;
+        memorySize: number | Size;
     };
     private doNotDeploy;
     protected buildConfig: SsrBuildConfig;
     private serverLambdaForEdge?;
-    protected serverLambdaForRegional?: lambda.Function;
+    protected serverLambdaForRegional?: Function;
     private bucket;
     private distribution;
     private hostedZone?;
@@ -178,11 +202,11 @@ export declare class SsrSite extends Construct implements SSTConstruct {
      * The internally created CDK resources.
      */
     get cdk(): {
-        function: lambda.Function | undefined;
-        bucket: s3.Bucket;
-        distribution: cloudfront.Distribution;
-        hostedZone: route53.IHostedZone | undefined;
-        certificate: acm.ICertificate | undefined;
+        function: Function | undefined;
+        bucket: Bucket;
+        distribution: Distribution;
+        hostedZone: IHostedZone | undefined;
+        certificate: ICertificate | undefined;
     };
     /**
      * Attaches the given list of permissions to allow the Astro server side
@@ -211,21 +235,21 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     private createS3AssetFileOptions;
     private createS3Bucket;
     private createS3Deployment;
-    protected createFunctionForRegional(): lambda.Function;
+    protected createFunctionForRegional(): Function;
     protected createFunctionForEdge(): EdgeFunction;
     private createFunctionPermissionsForRegional;
     private createFunctionPermissionsForEdge;
     private validateCloudFrontDistributionSettings;
-    protected createCloudFrontDistributionForRegional(): cloudfront.Distribution;
+    protected createCloudFrontDistributionForRegional(): Distribution;
     private createCloudFrontDistributionForEdge;
     protected buildDistributionDomainNames(): string[];
     private buildDistributionDefaultBehaviorForRegional;
     private buildDistributionDefaultBehaviorForEdge;
-    protected buildDistributionStaticFileBehaviors(origin: origins.S3Origin): Record<string, cloudfront.BehaviorOptions>;
-    protected createCloudFrontServerCachePolicy(): cloudfront.CachePolicy;
+    protected buildDistributionStaticFileBehaviors(origin: S3Origin): Record<string, BehaviorOptions>;
+    protected createCloudFrontServerCachePolicy(): CachePolicy;
     private createCloudFrontInvalidation;
     protected validateCustomDomainSettings(): void;
-    protected lookupHostedZone(): route53.IHostedZone | undefined;
+    protected lookupHostedZone(): IHostedZone | undefined;
     private createCertificate;
     protected createRoute53Records(): void;
     private getS3ContentReplaceValues;

package/constructs/SsrSite.js

@@ -6,18 +6,18 @@ import crypto from "crypto";
 import spawn from "cross-spawn";
 import { execSync } from "child_process";
 import { Construct } from "constructs";
-import { Fn, Token, Duration, CfnOutput, RemovalPolicy, CustomResource, } from "aws-cdk-lib";
-import * as s3 from "aws-cdk-lib/aws-s3";
-import * as iam from "aws-cdk-lib/aws-iam";
-import * as lambda from "aws-cdk-lib/aws-lambda";
-import * as route53 from "aws-cdk-lib/aws-route53";
-import * as s3Assets from "aws-cdk-lib/aws-s3-assets";
-import * as cloudfront from "aws-cdk-lib/aws-cloudfront";
-import * as acm from "aws-cdk-lib/aws-certificatemanager";
+import { Fn, Token, Duration as CdkDuration, CfnOutput, RemovalPolicy, CustomResource, } from "aws-cdk-lib";
+import { Bucket } from "aws-cdk-lib/aws-s3";
+import { Effect, PolicyStatement } from "aws-cdk-lib/aws-iam";
+import { Function, Code, Runtime, FunctionUrlAuthType, } from "aws-cdk-lib/aws-lambda";
+import { HostedZone, ARecord, AaaaRecord, RecordTarget, } from "aws-cdk-lib/aws-route53";
+import { Asset } from "aws-cdk-lib/aws-s3-assets";
+import { Distribution, ViewerProtocolPolicy, AllowedMethods, CachedMethods, LambdaEdgeEventType, CachePolicy, CacheQueryStringBehavior, CacheHeaderBehavior, CacheCookieBehavior, } from "aws-cdk-lib/aws-cloudfront";
+import { DnsValidatedCertificate, } from "aws-cdk-lib/aws-certificatemanager";
 import { AwsCliLayer } from "aws-cdk-lib/lambda-layer-awscli";
-import * as origins from "aws-cdk-lib/aws-cloudfront-origins";
-import * as route53Targets from "aws-cdk-lib/aws-route53-targets";
-import * as route53Patterns from "aws-cdk-lib/aws-route53-patterns";
+import { S3Origin, HttpOrigin } from "aws-cdk-lib/aws-cloudfront-origins";
+import { CloudFrontTarget } from "aws-cdk-lib/aws-route53-targets";
+import { HttpsRedirect } from "aws-cdk-lib/aws-route53-patterns";
 import { Stack } from "./Stack.js";
 import { Logger } from "../logger.js";
 import { isCDKConstruct } from "./Construct.js";
@@ -57,6 +57,8 @@ export class SsrSite extends Construct {
         this.props = {
             path: ".",
             waitForInvalidation: false,
+            timeout: "10 seconds",
+            memorySize: "1024 MB",
             ...props,
         };
         this.doNotDeploy = (app.local || app.skipBuild) && !this.props.dev?.deploy;
@@ -186,7 +188,7 @@ export class SsrSite extends Construct {
                     // depend on the Site. B/c often the site depends on the Api, causing
                     // a CloudFormation circular dependency if the Api and the Site belong
                     // to different stacks.
-                    environment: ENVIRONMENT_PLACEHOLDER,
+                    environment: this.doNotDeploy ? "" : ENVIRONMENT_PLACEHOLDER,
                     parameter: this.customDomainUrl || this.url,
                 },
             },
@@ -283,7 +285,7 @@ export class SsrSite extends Construct {
             if (!fs.existsSync(zipFilePath)) {
                 break;
             }
-            assets.push(new s3Assets.Asset(this, `Asset${partId}`, {
+            assets.push(new Asset(this, `Asset${partId}`, {
                 path: zipFilePath,
             }));
         }
@@ -327,7 +329,7 @@ export class SsrSite extends Construct {
         // cdk.bucket is a prop
         else {
             const bucketProps = cdk?.bucket;
-            return new s3.Bucket(this, "S3Bucket", {
+            return new Bucket(this, "S3Bucket", {
                 publicReadAccess: true,
                 autoDeleteObjects: true,
                 removalPolicy: RemovalPolicy.DESTROY,
@@ -337,23 +339,23 @@ export class SsrSite extends Construct {
     }
     createS3Deployment(cliLayer, assets, fileOptions) {
         // Create a Lambda function that will be doing the uploading
-        const uploader = new lambda.Function(this, "S3Uploader", {
-            code: lambda.Code.fromAsset(path.join(__dirname, "../support/base-site-custom-resource")),
+        const uploader = new Function(this, "S3Uploader", {
+            code: Code.fromAsset(path.join(__dirname, "../support/base-site-custom-resource")),
             layers: [cliLayer],
-            runtime: lambda.Runtime.PYTHON_3_7,
+            runtime: Runtime.PYTHON_3_7,
             handler: "s3-upload.handler",
-            timeout: Duration.minutes(15),
+            timeout: CdkDuration.minutes(15),
             memorySize: 1024,
         });
         this.bucket.grantReadWrite(uploader);
         assets.forEach((asset) => asset.grantRead(uploader));
         // Create the custom resource function
-        const handler = new lambda.Function(this, "S3Handler", {
-            code: lambda.Code.fromAsset(path.join(__dirname, "../support/base-site-custom-resource")),
+        const handler = new Function(this, "S3Handler", {
+            code: Code.fromAsset(path.join(__dirname, "../support/base-site-custom-resource")),
             layers: [cliLayer],
-            runtime: lambda.Runtime.PYTHON_3_7,
+            runtime: Runtime.PYTHON_3_7,
             handler: "s3-handler.handler",
-            timeout: Duration.minutes(15),
+            timeout: CdkDuration.minutes(15),
             memorySize: 1024,
             environment: {
                 UPLOADER_FUNCTION_NAME: uploader.functionName,
@@ -395,10 +397,10 @@ export class SsrSite extends Construct {
         return {};
     }
     createFunctionPermissionsForRegional() {
-        const { defaults } = this.props;
+        const { permissions } = this.props;
         this.bucket.grantReadWrite(this.serverLambdaForRegional.role);
-        if (defaults?.function?.permissions) {
-            attachPermissionsToRole(this.serverLambdaForRegional.role, defaults.function.permissions);
+        if (permissions) {
+            attachPermissionsToRole(this.serverLambdaForRegional.role, permissions);
         }
     }
     createFunctionPermissionsForEdge() {
@@ -420,8 +422,8 @@ export class SsrSite extends Construct {
     createCloudFrontDistributionForRegional() {
         const { cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
-        const s3Origin = new origins.S3Origin(this.bucket);
-        return new cloudfront.Distribution(this, "Distribution", {
+        const s3Origin = new S3Origin(this.bucket);
+        return new Distribution(this, "Distribution", {
             // these values can be overwritten by cfDistributionProps
             defaultRootObject: "",
             // Override props.
@@ -439,8 +441,8 @@ export class SsrSite extends Construct {
     createCloudFrontDistributionForEdge() {
         const { cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
-        const s3Origin = new origins.S3Origin(this.bucket);
-        return new cloudfront.Distribution(this, "Distribution", {
+        const s3Origin = new S3Origin(this.bucket);
+        return new Distribution(this, "Distribution", {
             // these values can be overwritten by cfDistributionProps
             defaultRootObject: "",
             // Override props.
@@ -473,13 +475,13 @@ export class SsrSite extends Construct {
         const { cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
         const fnUrl = this.serverLambdaForRegional.addFunctionUrl({
-            authType: lambda.FunctionUrlAuthType.NONE,
+            authType: FunctionUrlAuthType.NONE,
         });
         return {
-            viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-            origin: new origins.HttpOrigin(Fn.parseDomainName(fnUrl.url)),
-            allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
-            cachedMethods: cloudfront.CachedMethods.CACHE_GET_HEAD_OPTIONS,
+            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            origin: new HttpOrigin(Fn.parseDomainName(fnUrl.url)),
+            allowedMethods: AllowedMethods.ALLOW_ALL,
+            cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
             cachePolicy: cdk?.cachePolicies?.serverRequests ??
                 this.createCloudFrontServerCachePolicy(),
@@ -490,10 +492,10 @@ export class SsrSite extends Construct {
         const { cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
         return {
-            viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
             origin,
-            allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
-            cachedMethods: cloudfront.CachedMethods.CACHE_GET_HEAD_OPTIONS,
+            allowedMethods: AllowedMethods.ALLOW_ALL,
+            cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
             cachePolicy: cdk?.cachePolicies?.serverRequests ??
                 this.createCloudFrontServerCachePolicy(),
@@ -502,7 +504,7 @@ export class SsrSite extends Construct {
             edgeLambdas: [
                 {
                     includeBody: true,
-                    eventType: cloudfront.LambdaEdgeEventType.ORIGIN_REQUEST,
+                    eventType: LambdaEdgeEventType.ORIGIN_REQUEST,
                     functionVersion: this.serverLambdaForEdge.currentVersion,
                 },
                 ...(cfDistributionProps.defaultBehavior?.edgeLambdas || []),
@@ -513,12 +515,12 @@ export class SsrSite extends Construct {
         const { cdk } = this.props;
         // Create additional behaviours for statics
         const staticBehaviourOptions = {
-            viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
             origin,
-            allowedMethods: cloudfront.AllowedMethods.ALLOW_GET_HEAD_OPTIONS,
-            cachedMethods: cloudfront.CachedMethods.CACHE_GET_HEAD_OPTIONS,
+            allowedMethods: AllowedMethods.ALLOW_GET_HEAD_OPTIONS,
+            cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
-            cachePolicy: cloudfront.CachePolicy.CACHING_OPTIMIZED,
+            cachePolicy: CachePolicy.CACHING_OPTIMIZED,
         };
         // Add behaviour for public folder statics (excluding build)
         const staticsBehaviours = {};
@@ -534,13 +536,13 @@ export class SsrSite extends Construct {
         return staticsBehaviours;
     }
     createCloudFrontServerCachePolicy() {
-        return new cloudfront.CachePolicy(this, "ServerCache", {
-            queryStringBehavior: cloudfront.CacheQueryStringBehavior.all(),
-            headerBehavior: cloudfront.CacheHeaderBehavior.none(),
-            cookieBehavior: cloudfront.CacheCookieBehavior.all(),
-            defaultTtl: Duration.days(0),
-            maxTtl: Duration.days(365),
-            minTtl: Duration.days(0),
+        return new CachePolicy(this, "ServerCache", {
+            queryStringBehavior: CacheQueryStringBehavior.all(),
+            headerBehavior: CacheHeaderBehavior.none(),
+            cookieBehavior: CacheCookieBehavior.all(),
+            defaultTtl: CdkDuration.days(0),
+            maxTtl: CdkDuration.days(365),
+            minTtl: CdkDuration.days(0),
             enableAcceptEncodingBrotli: true,
             enableAcceptEncodingGzip: true,
             comment: "SST server response cache policy",
@@ -548,17 +550,17 @@ export class SsrSite extends Construct {
     }
     createCloudFrontInvalidation(cliLayer) {
         // Create a Lambda function that will be doing the invalidation
-        const invalidator = new lambda.Function(this, "CloudFrontInvalidator", {
-            code: lambda.Code.fromAsset(path.join(__dirname, "../support/base-site-custom-resource")),
+        const invalidator = new Function(this, "CloudFrontInvalidator", {
+            code: Code.fromAsset(path.join(__dirname, "../support/base-site-custom-resource")),
             layers: [cliLayer],
-            runtime: lambda.Runtime.PYTHON_3_7,
+            runtime: Runtime.PYTHON_3_7,
             handler: "cf-invalidate.handler",
-            timeout: Duration.minutes(15),
+            timeout: CdkDuration.minutes(15),
             memorySize: 1024,
         });
         // Grant permissions to invalidate CF Distribution
-        invalidator.addToRolePolicy(new iam.PolicyStatement({
-            effect: iam.Effect.ALLOW,
+        invalidator.addToRolePolicy(new PolicyStatement({
+            effect: Effect.ALLOW,
             actions: [
                 "cloudfront:GetInvalidation",
                 "cloudfront:CreateInvalidation",
@@ -608,7 +610,7 @@ export class SsrSite extends Construct {
         }
         let hostedZone;
         if (typeof customDomain === "string") {
-            hostedZone = route53.HostedZone.fromLookup(this, "HostedZone", {
+            hostedZone = HostedZone.fromLookup(this, "HostedZone", {
                 domainName: customDomain,
             });
         }
@@ -616,7 +618,7 @@ export class SsrSite extends Construct {
             hostedZone = customDomain.cdk.hostedZone;
         }
         else if (typeof customDomain.hostedZone === "string") {
-            hostedZone = route53.HostedZone.fromLookup(this, "HostedZone", {
+            hostedZone = HostedZone.fromLookup(this, "HostedZone", {
                 domainName: customDomain.hostedZone,
             });
         }
@@ -625,7 +627,7 @@ export class SsrSite extends Construct {
             if (customDomain.isExternalDomain === true) {
                 return;
             }
-            hostedZone = route53.HostedZone.fromLookup(this, "HostedZone", {
+            hostedZone = HostedZone.fromLookup(this, "HostedZone", {
                 domainName: customDomain.domainName,
             });
         }
@@ -643,7 +645,7 @@ export class SsrSite extends Construct {
         // HostedZone is set for Route 53 domains
         if (this.hostedZone) {
             if (typeof customDomain === "string") {
-                acmCertificate = new acm.DnsValidatedCertificate(this, "Certificate", {
+                acmCertificate = new DnsValidatedCertificate(this, "Certificate", {
                     domainName: customDomain,
                     hostedZone: this.hostedZone,
                     region: "us-east-1",
@@ -653,7 +655,7 @@ export class SsrSite extends Construct {
                 acmCertificate = customDomain.cdk.certificate;
             }
             else {
-                acmCertificate = new acm.DnsValidatedCertificate(this, "Certificate", {
+                acmCertificate = new DnsValidatedCertificate(this, "Certificate", {
                     domainName: customDomain.domainName,
                     hostedZone: this.hostedZone,
                     region: "us-east-1",
@@ -686,13 +688,13 @@ export class SsrSite extends Construct {
         const recordProps = {
             recordName,
             zone: this.hostedZone,
-            target: route53.RecordTarget.fromAlias(new route53Targets.CloudFrontTarget(this.distribution)),
+            target: RecordTarget.fromAlias(new CloudFrontTarget(this.distribution)),
         };
-        new route53.ARecord(this, "AliasRecord", recordProps);
-        new route53.AaaaRecord(this, "AliasRecordAAAA", recordProps);
+        new ARecord(this, "AliasRecord", recordProps);
+        new AaaaRecord(this, "AliasRecordAAAA", recordProps);
         // Create Alias redirect record
         if (domainAlias) {
-            new route53Patterns.HttpsRedirect(this, "Redirect", {
+            new HttpsRedirect(this, "Redirect", {
                 zone: this.hostedZone,
                 recordNames: [domainAlias],
                 targetDomain: recordName,

package/constructs/StaticSite.js

@@ -155,7 +155,7 @@ export class StaticSite extends Construct {
                     // depend on the Site. B/c often the site depends on the Api, causing
                     // a CloudFormation circular dependency if the Api and the Site belong
                     // to different stacks.
-                    environment: ENVIRONMENT_PLACEHOLDER,
+                    environment: this.doNotDeploy ? "" : ENVIRONMENT_PLACEHOLDER,
                     parameter: this.customDomainUrl || this.url,
                 },
             },

package/constructs/util/functionBinding.js

@@ -19,7 +19,7 @@ export function bindParameters(c) {
     }
     const app = c.node.root;
     Object.entries(binding.variables)
-        .filter(([, variable]) => variable.parameter)
+        .filter(([, variable]) => variable.parameter !== undefined)
         .forEach(([prop, variable]) => {
         const resId = `Parameter_${prop}`;
         if (!c.node.tryFindChild(resId)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.0-rc.57",
+  "version": "2.0.0-rc.60",
   "bin": {
     "sst": "cli/sst.js"
   },

package/runtime/server.js

@@ -58,6 +58,8 @@ export const useRuntimeServer = Context.memo(async () => {
     }), async (req, res) => {
         const worker = workers.fromID(req.params.workerID);
         bus.publish("function.error", {
+            requestID: workers.getCurrentRequestID(worker.workerID),
+            workerID: worker.workerID,
             functionID: worker.functionID,
             ...req.body,
         });
@@ -66,7 +68,6 @@ export const useRuntimeServer = Context.memo(async () => {
     app.get(`/:workerID/${cfg.API_VERSION}/runtime/invocation/next`, async (req, res) => {
         Logger.debug("Worker", req.params.workerID, "is waiting for next invocation");
         const payload = await next(req.params.workerID);
-        workers.setCurrentRequestID(req.params.workerID, payload.context.awsRequestId);
         Logger.debug("Worker", req.params.workerID, "sending next payload");
         res.set({
             "Lambda-Runtime-Aws-Request-Id": payload.context.awsRequestId,

package/runtime/workers.d.ts

@@ -26,6 +26,7 @@ interface Worker {
 }
 export declare const useRuntimeWorkers: () => Promise<{
     fromID(workerID: string): Worker;
+    getCurrentRequestID(workerID: string): string | undefined;
     setCurrentRequestID(workerID: string, requestID: string): void;
     stdout(workerID: string, message: string): void;
     exited(workerID: string): void;

package/runtime/workers.js

@@ -35,6 +35,7 @@ export const useRuntimeWorkers = Context.memo(async () => {
         const build = await builder.artifact(evt.properties.functionID);
         if (!build)
             return;
+        lastRequestId.set(evt.properties.workerID, evt.properties.requestID);
         await handler.startWorker({
             ...build,
             workerID: evt.properties.workerID,
@@ -54,6 +55,9 @@ export const useRuntimeWorkers = Context.memo(async () => {
         fromID(workerID) {
             return workers.get(workerID);
         },
+        getCurrentRequestID(workerID) {
+            return lastRequestId.get(workerID);
+        },
         setCurrentRequestID(workerID, requestID) {
             lastRequestId.set(workerID, requestID);
         },

package/sst.mjs

@@ -1366,7 +1366,7 @@ async function monitor(stack) {
         if (resource.ResourceStatusReason?.includes(
           "Resource creation cancelled"
         ) || resource.ResourceStatusReason?.includes(
-          "Resource updated cancelled"
+          "Resource update cancelled"
         ) || resource.ResourceStatusReason?.includes("Resource creation Initiated"))
           continue;
         if (resource.ResourceStatusReason)
@@ -3041,6 +3041,8 @@ var init_server = __esm({
         async (req, res) => {
           const worker = workers.fromID(req.params.workerID);
           bus.publish("function.error", {
+            requestID: workers.getCurrentRequestID(worker.workerID),
+            workerID: worker.workerID,
             functionID: worker.functionID,
             ...req.body
           });
@@ -3056,10 +3058,6 @@ var init_server = __esm({
             "is waiting for next invocation"
           );
           const payload = await next(req.params.workerID);
-          workers.setCurrentRequestID(
-            req.params.workerID,
-            payload.context.awsRequestId
-          );
           Logger.debug("Worker", req.params.workerID, "sending next payload");
           res.set({
             "Lambda-Runtime-Aws-Request-Id": payload.context.awsRequestId,
@@ -3209,6 +3207,7 @@ var init_workers = __esm({
         const build2 = await builder.artifact(evt.properties.functionID);
         if (!build2)
           return;
+        lastRequestId.set(evt.properties.workerID, evt.properties.requestID);
         await handler.startWorker({
           ...build2,
           workerID: evt.properties.workerID,
@@ -3228,6 +3227,9 @@ var init_workers = __esm({
         fromID(workerID) {
           return workers.get(workerID);
         },
+        getCurrentRequestID(workerID) {
+          return lastRequestId.get(workerID);
+        },
         setCurrentRequestID(workerID, requestID) {
           lastRequestId.set(workerID, requestID);
         },

package/stacks/monitor.js

@@ -89,7 +89,7 @@ export async function monitor(stack) {
             });
             for (const resource of resources.StackResources || []) {
                 if (resource.ResourceStatusReason?.includes("Resource creation cancelled") ||
-                    resource.ResourceStatusReason?.includes("Resource updated cancelled") ||
+                    resource.ResourceStatusReason?.includes("Resource update cancelled") ||
                     resource.ResourceStatusReason?.includes("Resource creation Initiated"))
                     continue;
                 if (resource.ResourceStatusReason)

package/support/nodejs-runtime/index.mjs

@@ -14618,6 +14618,7 @@ try {
       trace: ex.stack?.split("\n")
     })
   });
+  process.exit(1);
 }
 var timeout;
 while (true) {