sst 2.13.0 → 2.13.2

package/constructs/EventBus.js

@@ -355,7 +355,7 @@ export class EventBus extends Construct {
     subs = new Map();
     subscribe(type, target, props) {
         type = Array.isArray(type) ? type : [type];
-        const joined = type.join("_");
+        const joined = type.length > 1 ? "multi" : type.join("_");
         const count = this.subs.get(joined) || 0 + 1;
         this.subs.set(joined, count);
         const name = `${joined.replaceAll(/[^a-zA-Z_]/g, "_")}_${count}`;

package/constructs/NextjsSite.js

@@ -13,6 +13,7 @@ import { SsrFunction } from "./SsrFunction.js";
 import { EdgeFunction } from "./EdgeFunction.js";
 import { SsrSite } from "./SsrSite.js";
 import { toCdkSize } from "./util/size.js";
+import { toCdkDuration } from "./util/duration.js";
 /**
  * The `NextjsSite` construct is a higher level CDK construct that makes it easy to create a Next.js app.
  * @example
@@ -198,13 +199,17 @@ export class NextjsSite extends SsrSite {
          *    - Cache-Control: public, max-age=0, must-revalidate
          *    - x-vercel-cache: MISS
          */
-        const { cdk } = this.props;
+        const { timeout, cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
         const s3Origin = new S3Origin(this.cdk.bucket);
         const serverFnUrl = this.serverLambdaForRegional.addFunctionUrl({
             authType: FunctionUrlAuthType.NONE,
         });
-        const serverOrigin = new HttpOrigin(Fn.parseDomainName(serverFnUrl.url));
+        const serverOrigin = new HttpOrigin(Fn.parseDomainName(serverFnUrl.url), {
+            readTimeout: typeof timeout === "string"
+                ? toCdkDuration(timeout)
+                : CdkDuration.seconds(timeout),
+        });
         const cachePolicy = cdk?.serverCachePolicy ??
             this.buildServerCachePolicy([
                 "accept",
@@ -244,7 +249,7 @@ export class NextjsSite extends SsrSite {
                 "next-router-state-tree",
             ]);
         const originRequestPolicy = this.buildServerOriginRequestPolicy();
-        const functionVersion = this.serverLambdaForEdge.currentVersion;
+        const functionVersion = this.serverEdgeFunction.currentVersion;
         const serverBehavior = this.buildServerBehaviorForEdge(functionVersion, s3Origin, cachePolicy, originRequestPolicy);
         return new Distribution(this, "Distribution", {
             // these values can be overwritten by cfDistributionProps

package/constructs/SsrSite.d.ts

@@ -214,7 +214,8 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     protected props: SsrSiteNormalizedProps;
     private doNotDeploy;
     protected buildConfig: SsrBuildConfig;
-    protected serverLambdaForEdge?: EdgeFunction;
+    protected serverEdgeFunction?: EdgeFunction;
+    private serverLambdaForEdge?;
     protected serverLambdaForRegional?: CdkFunction;
     private serverLambdaForDev?;
     private bucket;
@@ -300,6 +301,7 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     protected createRoute53Records(): void;
     private getS3ContentReplaceValues;
     private validateSiteExists;
+    private validateTimeout;
     private writeTypesFile;
     protected generateBuildId(): string;
 }

package/constructs/SsrSite.js

@@ -25,6 +25,7 @@ import { SsrFunction } from "./SsrFunction.js";
 import { getBuildCmdEnvironment, } from "./BaseSite.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";
 import { useProject } from "../project.js";
@@ -45,6 +46,7 @@ export class SsrSite extends Construct {
     props;
     doNotDeploy;
     buildConfig;
+    serverEdgeFunction;
     serverLambdaForEdge;
     serverLambdaForRegional;
     serverLambdaForDev;
@@ -70,6 +72,7 @@ export class SsrSite extends Construct {
             !stack.isActive || (app.mode === "dev" && !this.props.dev?.deploy);
         this.buildConfig = this.initBuildConfig();
         this.validateSiteExists();
+        this.validateTimeout();
         this.writeTypesFile();
         useSites().add(id, this.constructor.name, this.props);
         if (this.doNotDeploy) {
@@ -85,7 +88,11 @@ export class SsrSite extends Construct {
         this.bucket = this.createS3Bucket();
         // Create Server functions
         if (this.props.edge) {
-            this.serverLambdaForEdge = this.createFunctionForEdge();
+            this.serverEdgeFunction = this.createFunctionForEdge();
+            this.serverLambdaForEdge = CdkFunction.fromFunctionAttributes(this, "IEdgeFunction", {
+                functionArn: this.serverEdgeFunction.functionArn,
+                role: this.serverEdgeFunction.role,
+            });
             this.createFunctionPermissionsForEdge();
         }
         else {
@@ -147,7 +154,7 @@ export class SsrSite extends Construct {
         if (this.doNotDeploy)
             return;
         return {
-            function: this.serverLambdaForRegional,
+            function: this.serverLambdaForEdge || this.serverLambdaForRegional,
             bucket: this.bucket,
             distribution: this.distribution,
             hostedZone: this.hostedZone,
@@ -167,13 +174,10 @@ export class SsrSite extends Construct {
      * ```
      */
     attachPermissions(permissions) {
-        this.serverLambdaForEdge?.attachPermissions(permissions);
-        if (this.serverLambdaForDev) {
-            attachPermissionsToRole(this.serverLambdaForDev.role, permissions);
-        }
-        if (this.serverLambdaForRegional) {
-            attachPermissionsToRole(this.serverLambdaForRegional.role, permissions);
-        }
+        const server = this.serverLambdaForEdge ||
+            this.serverLambdaForRegional ||
+            this.serverLambdaForDev;
+        attachPermissionsToRole(server?.role, permissions);
     }
     /** @internal */
     getConstructMetadata() {
@@ -535,14 +539,18 @@ function handler(event) {
         return domainNames;
     }
     buildDefaultBehaviorForRegional() {
-        const { cdk } = this.props;
+        const { timeout, cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
         const fnUrl = this.serverLambdaForRegional.addFunctionUrl({
             authType: FunctionUrlAuthType.NONE,
         });
         return {
             viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-            origin: new HttpOrigin(Fn.parseDomainName(fnUrl.url)),
+            origin: new HttpOrigin(Fn.parseDomainName(fnUrl.url), {
+                readTimeout: typeof timeout === "string"
+                    ? toCdkDuration(timeout)
+                    : CdkDuration.seconds(timeout),
+            }),
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
@@ -577,7 +585,7 @@ function handler(event) {
                 {
                     includeBody: true,
                     eventType: LambdaEdgeEventType.ORIGIN_REQUEST,
-                    functionVersion: this.serverLambdaForEdge.currentVersion,
+                    functionVersion: this.serverEdgeFunction.currentVersion,
                 },
                 ...(cfDistributionProps.defaultBehavior?.edgeLambdas || []),
             ],
@@ -817,6 +825,18 @@ function handler(event) {
             throw new Error(`No site found at "${path.resolve(sitePath)}"`);
         }
     }
+    validateTimeout() {
+        const { edge, timeout } = this.props;
+        const num = typeof timeout === "number"
+            ? timeout
+            : toCdkDuration(timeout).toSeconds();
+        const limit = edge ? 30 : 180;
+        if (num > limit) {
+            throw new Error(edge
+                ? `Timeout must be less than or equal to 30 seconds when the "edge" flag is enabled.`
+                : `Timeout must be less than or equal to 180 seconds.`);
+        }
+    }
     writeTypesFile() {
         const typesPath = path.resolve(this.props.path, this.buildConfig.typesPath, "sst-env.d.ts");
         // Do not override the types file if it already exists

package/node/future/auth/handler.d.ts

@@ -32,7 +32,8 @@ export declare function AuthHandler<Providers extends Record<string, Adapter<any
     clients: () => Promise<Record<string, string>>;
     onAuthorize?: (event: APIGatewayProxyEventV2) => Promise<void | keyof Providers>;
     onSuccess: (input: Result, response: typeof onSuccessResponse) => Promise<ReturnType<(typeof onSuccessResponse)[keyof typeof onSuccessResponse]>>;
-    onError: () => Promise<APIGatewayProxyStructuredResultV2>;
+    onIndex?: (event: APIGatewayProxyEventV2) => Promise<APIGatewayProxyStructuredResultV2>;
+    onError?: () => Promise<APIGatewayProxyStructuredResultV2>;
 }): (event: APIGatewayProxyEventV2, context: import("aws-lambda").Context) => Promise<APIGatewayProxyStructuredResultV2>;
 export type SessionCreateInput = SessionValue & Partial<SignerOptions>;
 export {};

package/node/future/auth/handler.js

@@ -36,6 +36,9 @@ export function AuthHandler(input) {
     return ApiHandler(async (evt) => {
         const step = usePathParam("step");
         if (!step) {
+            if (input.onIndex) {
+                return input.onIndex(evt);
+            }
             const clients = await input.clients();
             return {
                 statusCode: 200,
@@ -251,7 +254,12 @@ export function AuthHandler(input) {
             }
         }
         if (result.type === "error") {
-            return input.onError();
+            if (input.onError)
+                return input.onError();
+            return {
+                statusCode: 400,
+                body: "an error has occured",
+            };
         }
     });
 }

package/package.json

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

package/support/custom-resources/index.mjs

@@ -178694,6 +178694,7 @@ async function AuthKeys(cfnRequest) {
           new import_client_ssm.PutParameterCommand({
             Name: privatePath,
             Value: privateKey,
+            Overwrite: true,
             Type: "SecureString"
           })
         ),
@@ -178701,6 +178702,7 @@ async function AuthKeys(cfnRequest) {
           new import_client_ssm.PutParameterCommand({
             Name: publicPath,
             Value: publicKey,
+            Overwrite: true,
             Type: "SecureString"
           })
         )