sst 2.22.10 → 2.23.0

package/constructs/SsrSite.js

@@ -8,15 +8,14 @@ import { execSync } from "child_process";
 import { Construct } from "constructs";
 import { Fn, Token, Duration as CdkDuration, RemovalPolicy, CustomResource, } from "aws-cdk-lib/core";
 import { BlockPublicAccess, Bucket, } from "aws-cdk-lib/aws-s3";
-import { Role, Effect, Policy, PolicyStatement, AccountPrincipal, ServicePrincipal, CompositePrincipal, } from "aws-cdk-lib/aws-iam";
-import { Function as CdkFunction, Code, Runtime, FunctionUrlAuthType, } from "aws-cdk-lib/aws-lambda";
-import { HostedZone, ARecord, AaaaRecord, RecordTarget, } from "aws-cdk-lib/aws-route53";
+import { Role, Policy, PolicyStatement, AccountPrincipal, ServicePrincipal, CompositePrincipal, } from "aws-cdk-lib/aws-iam";
+import { Function as CdkFunction, Code, Runtime, FunctionUrlAuthType, InvokeMode, } from "aws-cdk-lib/aws-lambda";
 import { Asset } from "aws-cdk-lib/aws-s3-assets";
-import { Distribution, ViewerProtocolPolicy, AllowedMethods, CachedMethods, LambdaEdgeEventType, CachePolicy, CacheQueryStringBehavior, CacheHeaderBehavior, CacheCookieBehavior, OriginRequestPolicy, Function as CfFunction, FunctionCode as CfFunctionCode, FunctionEventType as CfFunctionEventType, } from "aws-cdk-lib/aws-cloudfront";
+import { ViewerProtocolPolicy, AllowedMethods, CachedMethods, LambdaEdgeEventType, CachePolicy, CacheQueryStringBehavior, CacheHeaderBehavior, CacheCookieBehavior, OriginRequestPolicy, Function as CfFunction, FunctionCode as CfFunctionCode, FunctionEventType as CfFunctionEventType, } from "aws-cdk-lib/aws-cloudfront";
 import { AwsCliLayer } from "aws-cdk-lib/lambda-layer-awscli";
 import { S3Origin, HttpOrigin } from "aws-cdk-lib/aws-cloudfront-origins";
-import { CloudFrontTarget } from "aws-cdk-lib/aws-route53-targets";
 import { Stack } from "./Stack.js";
+import { Distribution } from "./Distribution.js";
 import { Logger } from "../logger.js";
 import { createAppContext } from "./context.js";
 import { isCDKConstruct } from "./Construct.js";
@@ -24,8 +23,6 @@ import { Secret } from "./Secret.js";
 import { SsrFunction } from "./SsrFunction.js";
 import { getBuildCmdEnvironment, } from "./BaseSite.js";
 import { useDeferredTasks } from "./deferred_task.js";
-import { HttpsRedirect } from "./cdk/website-redirect.js";
-import { DnsValidatedCertificate } from "./cdk/dns-validated-certificate.js";
 import { toCdkDuration } from "./util/duration.js";
 import { attachPermissionsToRole } from "./util/permission.js";
 import { getParameterPath, } from "./util/functionBinding.js";
@@ -55,8 +52,6 @@ export class SsrSite extends Construct {
     cfFunction;
     s3Origin;
     distribution;
-    hostedZone;
-    certificate;
     constructor(scope, id, props) {
         super(scope, props?.cdk?.id || id);
         const app = scope.node.root;
@@ -76,7 +71,7 @@ export class SsrSite extends Construct {
         this.validateSiteExists();
         this.validateTimeout();
         this.writeTypesFile();
-        useSites().add(id, this.constructor.name, this.props);
+        useSites().add(stack.stackName, id, this.constructor.name, this.props);
         if (this.doNotDeploy) {
             // @ts-ignore
             this.cfFunction = this.bucket = this.s3Origin = this.distribution = null;
@@ -93,20 +88,13 @@ export class SsrSite extends Construct {
             this.serverLambdaForRegional = this.createFunctionForRegional();
         }
         this.grantServerS3Permissions();
-        // Create Custom Domain
-        this.validateCustomDomainSettings();
-        this.hostedZone = this.lookupHostedZone();
-        this.certificate = this.createCertificate();
         // Create CloudFront
-        this.validateCloudFrontDistributionSettings();
         this.s3Origin = this.createCloudFrontS3Origin();
         this.cfFunction = this.createCloudFrontFunction();
         this.distribution = this.props.edge
             ? this.createCloudFrontDistributionForEdge()
             : this.createCloudFrontDistributionForRegional();
         this.grantServerCloudFrontPermissions();
-        // Connect Custom Domain to CloudFront Distribution
-        this.createRoute53Records();
         useDeferredTasks().add(async () => {
             // Build app
             this.buildApp();
@@ -122,7 +110,7 @@ export class SsrSite extends Construct {
             // Add static file behaviors
             this.addStaticFileBehaviors();
             // Invalidate CloudFront
-            this.createCloudFrontInvalidation();
+            this.distribution.createInvalidation(this.generateBuildId());
             for (const task of this.deferredTaskCallbacks) {
                 await task();
             }
@@ -137,7 +125,7 @@ export class SsrSite extends Construct {
     get url() {
         if (this.doNotDeploy)
             return this.props.dev?.url;
-        return `https://${this.distribution.distributionDomainName}`;
+        return this.distribution.url;
     }
     /**
      * If the custom domain is enabled, this is the URL of the website with the
@@ -146,15 +134,7 @@ export class SsrSite extends Construct {
     get customDomainUrl() {
         if (this.doNotDeploy)
             return;
-        const { customDomain } = this.props;
-        if (!customDomain)
-            return;
-        if (typeof customDomain === "string") {
-            return `https://${customDomain}`;
-        }
-        else {
-            return `https://${customDomain.domainName}`;
-        }
+        return this.distribution.customDomainUrl;
     }
     /**
      * The internally created CDK resources.
@@ -166,9 +146,9 @@ export class SsrSite extends Construct {
             function: this.serverLambdaForEdge?.function ||
                 this.serverLambdaForRegional?.function,
             bucket: this.bucket,
-            distribution: this.distribution,
-            hostedZone: this.hostedZone,
-            certificate: this.certificate,
+            distribution: this.distribution.cdk.distribution,
+            hostedZone: this.distribution.cdk.hostedZone,
+            certificate: this.distribution.cdk.certificate,
         };
     }
     /////////////////////
@@ -487,7 +467,7 @@ export class SsrSite extends Construct {
                 new PolicyStatement({
                     actions: ["cloudfront:CreateInvalidation"],
                     resources: [
-                        `arn:${stack.partition}:cloudfront::${stack.account}:distribution/${this.distribution.distributionId}`,
+                        `arn:${stack.partition}:cloudfront::${stack.account}:distribution/${this.distribution.cdk.distribution.distributionId}`,
                     ],
                 }),
             ],
@@ -497,15 +477,6 @@ export class SsrSite extends Construct {
     /////////////////////
     // CloudFront Distribution
     /////////////////////
-    validateCloudFrontDistributionSettings() {
-        const { cdk } = this.props;
-        if (cdk?.distribution?.certificate) {
-            throw new Error(`Do not configure the "cfDistribution.certificate". Use the "customDomain" to configure the domain certificate.`);
-        }
-        if (cdk?.distribution?.domainNames) {
-            throw new Error(`Do not configure the "cfDistribution.domainNames". Use the "customDomain" to configure the domain name.`);
-        }
-    }
     createCloudFrontS3Origin() {
         return new S3Origin(this.bucket, {
             originPath: "/" + (this.buildConfig.clientBuildS3KeyPrefix ?? ""),
@@ -523,65 +494,57 @@ function handler(event) {
         });
     }
     createCloudFrontDistributionForRegional() {
-        const { cdk } = this.props;
+        const { customDomain, cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
         const cachePolicy = cdk?.serverCachePolicy ?? this.buildServerCachePolicy();
-        return new Distribution(this, "Distribution", {
-            // these values can be overwritten by cfDistributionProps
-            defaultRootObject: "",
-            // Override props.
-            ...cfDistributionProps,
-            // these values can NOT be overwritten by cfDistributionProps
-            domainNames: this.buildDistributionDomainNames(),
-            certificate: this.certificate,
-            defaultBehavior: this.buildDefaultBehaviorForRegional(cachePolicy),
-            additionalBehaviors: {
-                ...(cfDistributionProps.additionalBehaviors || {}),
+        return new Distribution(this, "CDN", {
+            scopeOverride: this,
+            customDomain,
+            cdk: {
+                distribution: {
+                    // these values can be overwritten by cfDistributionProps
+                    defaultRootObject: "",
+                    // Override props.
+                    ...cfDistributionProps,
+                    // these values can NOT be overwritten by cfDistributionProps
+                    defaultBehavior: this.buildDefaultBehaviorForRegional(cachePolicy),
+                    additionalBehaviors: {
+                        ...(cfDistributionProps.additionalBehaviors || {}),
+                    },
+                },
             },
         });
     }
     createCloudFrontDistributionForEdge() {
-        const { cdk } = this.props;
+        const { customDomain, cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
         const cachePolicy = cdk?.serverCachePolicy ?? this.buildServerCachePolicy();
-        return new Distribution(this, "Distribution", {
-            // these values can be overwritten by cfDistributionProps
-            defaultRootObject: "",
-            // Override props.
-            ...cfDistributionProps,
-            // these values can NOT be overwritten by cfDistributionProps
-            domainNames: this.buildDistributionDomainNames(),
-            certificate: this.certificate,
-            defaultBehavior: this.buildDefaultBehaviorForEdge(cachePolicy),
-            additionalBehaviors: {
-                ...(cfDistributionProps.additionalBehaviors || {}),
+        return new Distribution(this, "CDN", {
+            scopeOverride: this,
+            customDomain,
+            cdk: {
+                distribution: {
+                    // these values can be overwritten by cfDistributionProps
+                    defaultRootObject: "",
+                    // Override props.
+                    ...cfDistributionProps,
+                    // these values can NOT be overwritten by cfDistributionProps
+                    defaultBehavior: this.buildDefaultBehaviorForEdge(cachePolicy),
+                    additionalBehaviors: {
+                        ...(cfDistributionProps.additionalBehaviors || {}),
+                    },
+                },
             },
         });
     }
-    buildDistributionDomainNames() {
-        const { customDomain } = this.props;
-        const domainNames = [];
-        if (!customDomain) {
-            // no domain
-        }
-        else if (typeof customDomain === "string") {
-            domainNames.push(customDomain);
-        }
-        else {
-            domainNames.push(customDomain.domainName);
-            if (customDomain.alternateNames) {
-                if (!customDomain.cdk?.certificate)
-                    throw new Error("Certificates for alternate domains cannot be automatically created. Please specify certificate to use");
-                domainNames.push(...customDomain.alternateNames);
-            }
-        }
-        return domainNames;
-    }
     buildDefaultBehaviorForRegional(cachePolicy) {
         const { timeout, cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
         const fnUrl = this.serverLambdaForRegional.addFunctionUrl({
             authType: FunctionUrlAuthType.NONE,
+            invokeMode: this.supportsStreaming()
+                ? InvokeMode.RESPONSE_STREAM
+                : undefined,
         });
         return {
             viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
@@ -644,7 +607,7 @@ function handler(event) {
         const publicDir = path.join(this.props.path, this.buildConfig.clientBuildOutputDir);
         for (const item of fs.readdirSync(publicDir)) {
             const isDir = fs.statSync(path.join(publicDir, item)).isDirectory();
-            this.distribution.addBehavior(isDir ? `${item}/*` : item, this.s3Origin, {
+            this.distribution.cdk.distribution.addBehavior(isDir ? `${item}/*` : item, this.s3Origin, {
                 viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
                 allowedMethods: AllowedMethods.ALLOW_GET_HEAD_OPTIONS,
                 cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
@@ -673,158 +636,6 @@ function handler(event) {
         // CloudFront's Managed-AllViewerExceptHostHeader policy
         return OriginRequestPolicy.fromOriginRequestPolicyId(this, "ServerOriginRequestPolicy", "b689b0a8-53d0-40ab-baf2-68738e2966ac");
     }
-    createCloudFrontInvalidation() {
-        const stack = Stack.of(this);
-        const policy = new Policy(this, "CloudFrontInvalidatorPolicy", {
-            statements: [
-                new PolicyStatement({
-                    effect: Effect.ALLOW,
-                    actions: [
-                        "cloudfront:GetInvalidation",
-                        "cloudfront:CreateInvalidation",
-                    ],
-                    resources: [
-                        `arn:${stack.partition}:cloudfront::${stack.account}:distribution/${this.distribution.distributionId}`,
-                    ],
-                }),
-            ],
-        });
-        stack.customResourceHandler.role?.attachInlinePolicy(policy);
-        const resource = new CustomResource(this, "CloudFrontInvalidator", {
-            serviceToken: stack.customResourceHandler.functionArn,
-            resourceType: "Custom::CloudFrontInvalidator",
-            properties: {
-                buildId: this.generateBuildId(),
-                distributionId: this.distribution.distributionId,
-                paths: ["/*"],
-                waitForInvalidation: this.props.waitForInvalidation,
-            },
-        });
-        resource.node.addDependency(policy);
-        return resource;
-    }
-    /////////////////////
-    // Custom Domain
-    /////////////////////
-    validateCustomDomainSettings() {
-        const { customDomain } = this.props;
-        if (!customDomain) {
-            return;
-        }
-        if (typeof customDomain === "string") {
-            return;
-        }
-        if (customDomain.isExternalDomain === true) {
-            if (!customDomain.cdk?.certificate) {
-                throw new Error(`A valid certificate is required when "isExternalDomain" is set to "true".`);
-            }
-            if (customDomain.domainAlias) {
-                throw new Error(`Domain alias is only supported for domains hosted on Amazon Route 53. Do not set the "customDomain.domainAlias" when "isExternalDomain" is enabled.`);
-            }
-            if (customDomain.hostedZone) {
-                throw new Error(`Hosted zones can only be configured for domains hosted on Amazon Route 53. Do not set the "customDomain.hostedZone" when "isExternalDomain" is enabled.`);
-            }
-        }
-    }
-    lookupHostedZone() {
-        const { customDomain } = this.props;
-        // Skip if customDomain is not configured
-        if (!customDomain) {
-            return;
-        }
-        let hostedZone;
-        if (typeof customDomain === "string") {
-            hostedZone = HostedZone.fromLookup(this, "HostedZone", {
-                domainName: customDomain,
-            });
-        }
-        else if (customDomain.cdk?.hostedZone) {
-            hostedZone = customDomain.cdk.hostedZone;
-        }
-        else if (typeof customDomain.hostedZone === "string") {
-            hostedZone = HostedZone.fromLookup(this, "HostedZone", {
-                domainName: customDomain.hostedZone,
-            });
-        }
-        else if (typeof customDomain.domainName === "string") {
-            // Skip if domain is not a Route53 domain
-            if (customDomain.isExternalDomain === true) {
-                return;
-            }
-            hostedZone = HostedZone.fromLookup(this, "HostedZone", {
-                domainName: customDomain.domainName,
-            });
-        }
-        else {
-            hostedZone = customDomain.hostedZone;
-        }
-        return hostedZone;
-    }
-    createCertificate() {
-        const { customDomain } = this.props;
-        if (!customDomain) {
-            return;
-        }
-        let acmCertificate;
-        // HostedZone is set for Route 53 domains
-        if (this.hostedZone) {
-            if (typeof customDomain === "string") {
-                acmCertificate = new DnsValidatedCertificate(this, "Certificate", {
-                    domainName: customDomain,
-                    hostedZone: this.hostedZone,
-                    region: "us-east-1",
-                });
-            }
-            else if (customDomain.cdk?.certificate) {
-                acmCertificate = customDomain.cdk.certificate;
-            }
-            else {
-                acmCertificate = new DnsValidatedCertificate(this, "Certificate", {
-                    domainName: customDomain.domainName,
-                    hostedZone: this.hostedZone,
-                    region: "us-east-1",
-                });
-            }
-        }
-        // HostedZone is NOT set for non-Route 53 domains
-        else {
-            if (typeof customDomain !== "string") {
-                acmCertificate = customDomain.cdk?.certificate;
-            }
-        }
-        return acmCertificate;
-    }
-    createRoute53Records() {
-        const { customDomain } = this.props;
-        if (!customDomain || !this.hostedZone) {
-            return;
-        }
-        let recordName;
-        let domainAlias;
-        if (typeof customDomain === "string") {
-            recordName = customDomain;
-        }
-        else {
-            recordName = customDomain.domainName;
-            domainAlias = customDomain.domainAlias;
-        }
-        // Create DNS record
-        const recordProps = {
-            recordName,
-            zone: this.hostedZone,
-            target: RecordTarget.fromAlias(new CloudFrontTarget(this.distribution)),
-        };
-        new ARecord(this, "AliasRecord", recordProps);
-        new AaaaRecord(this, "AliasRecordAAAA", recordProps);
-        // Create Alias redirect record
-        if (domainAlias) {
-            new HttpsRedirect(this, "Redirect", {
-                zone: this.hostedZone,
-                recordNames: [domainAlias],
-                targetDomain: recordName,
-            });
-        }
-    }
     /////////////////////
     // Helper Functions
     /////////////////////
@@ -898,12 +709,15 @@ function handler(event) {
         Logger.debug(`Generated build ID ${buildId}`);
         return buildId;
     }
+    supportsStreaming() {
+        return false;
+    }
 }
 export const useSites = createAppContext(() => {
     const sites = [];
     return {
-        add(name, type, props) {
-            sites.push({ name, type, props });
+        add(stack, name, type, props) {
+            sites.push({ stack, name, type, props });
         },
         get all() {
             return sites;

package/constructs/StaticSite.d.ts

@@ -1,9 +1,8 @@
 import { Construct } from "constructs";
 import { Bucket, BucketProps, IBucket } from "aws-cdk-lib/aws-s3";
-import { ICertificate } from "aws-cdk-lib/aws-certificatemanager";
-import { IHostedZone } from "aws-cdk-lib/aws-route53";
-import { Distribution, IDistribution } from "aws-cdk-lib/aws-cloudfront";
-import { BaseSiteDomainProps, BaseSiteFileOptions, BaseSiteReplaceProps, BaseSiteCdkDistributionProps } from "./BaseSite.js";
+import { IDistribution } from "aws-cdk-lib/aws-cloudfront";
+import { DistributionDomainProps } from "./Distribution.js";
+import { BaseSiteFileOptions, BaseSiteReplaceProps, BaseSiteCdkDistributionProps } from "./BaseSite.js";
 import { SSTConstruct } from "./Construct.js";
 import { FunctionBindingProps } from "./util/functionBinding.js";
 export interface StaticSiteProps {
@@ -266,7 +265,7 @@ export interface StaticSiteProps {
         distribution?: IDistribution | StaticSiteCdkDistributionProps;
     };
 }
-export interface StaticSiteDomainProps extends BaseSiteDomainProps {
+export interface StaticSiteDomainProps extends DistributionDomainProps {
 }
 export interface StaticSiteFileOptions extends BaseSiteFileOptions {
 }
@@ -274,6 +273,9 @@ export interface StaticSiteReplaceProps extends BaseSiteReplaceProps {
 }
 export interface StaticSiteCdkDistributionProps extends BaseSiteCdkDistributionProps {
 }
+type StaticSiteNormalizedProps = StaticSiteProps & {
+    path: Exclude<StaticSiteProps["path"], undefined>;
+};
 /**
  * The `StaticSite` construct is a higher level CDK construct that makes it easy to create a static website.
  *
@@ -295,8 +297,6 @@ export declare class StaticSite extends Construct implements SSTConstruct {
     private doNotDeploy;
     private bucket;
     private distribution;
-    private hostedZone?;
-    private certificate?;
     constructor(scope: Construct, id: string, props?: StaticSiteProps);
     /**
      * The CloudFront URL of the website.
@@ -311,9 +311,9 @@ export declare class StaticSite extends Construct implements SSTConstruct {
      */
     get cdk(): {
         bucket: Bucket;
-        distribution: Distribution;
-        hostedZone: IHostedZone | undefined;
-        certificate: ICertificate | undefined;
+        distribution: IDistribution;
+        hostedZone: import("aws-cdk-lib/aws-route53").IHostedZone | undefined;
+        certificate: import("aws-cdk-lib/aws-certificatemanager").ICertificate | undefined;
     } | undefined;
     getConstructMetadata(): {
         type: "StaticSite";
@@ -333,12 +333,16 @@ export declare class StaticSite extends Construct implements SSTConstruct {
     private createS3Bucket;
     private createS3Deployment;
     private createCfDistribution;
-    private createCloudFrontInvalidation;
-    protected buildDistributionDomainNames(): string[];
+    private generateInvalidationId;
     private buildDistributionBehavior;
-    protected validateCustomDomainSettings(): void;
-    protected lookupHostedZone(): IHostedZone | undefined;
-    private createCertificate;
-    protected createRoute53Records(): void;
     private getS3ContentReplaceValues;
 }
+export declare const useSites: () => {
+    add(stack: string, name: string, props: StaticSiteNormalizedProps): void;
+    readonly all: {
+        stack: string;
+        name: string;
+        props: StaticSiteNormalizedProps;
+    }[];
+};
+export {};