sst 2.27.0 → 2.28.1

package/cli/local/server.js

@@ -288,7 +288,7 @@ export async function useLocalServer(opts) {
                 id: invocation.id,
                 error: evt.properties.errorType,
                 message: evt.properties.errorMessage,
-                stack: evt.properties.trace.map((t) => ({
+                stack: (evt.properties.trace || []).map((t) => ({
                     raw: t,
                 })),
             });

package/constructs/AstroSite.d.ts

@@ -11,6 +11,7 @@ export interface AstroSiteProps extends SsrSiteProps {
          *   - "?" matches exactly 1 character.
          *
          * Matched routes will be handled directly by the server function.
+         * @deprecated Define `serverRoutes` in `astro.config.mjs` instead.
          * @default true
          * @example
          * ```js
@@ -25,17 +26,6 @@ export interface AstroSiteProps extends SsrSiteProps {
          * ```
          */
         serverRoutes?: string[];
-        /**
-         * Supports [streaming](https://docs.astro.build/en/guides/server-side-rendering/#using-streaming-to-improve-page-performance) responses.
-         * @default true
-         * @example
-         * ```js
-         * regional: {
-         *   streaming: false,
-         * }
-         * ```
-         */
-        streaming?: boolean;
     };
 }
 type AstroSiteNormalizedProps = AstroSiteProps & SsrSiteNormalizedProps;

package/constructs/AstroSite.js

@@ -1,8 +1,8 @@
 import { readFileSync, existsSync, readdirSync, statSync } from "fs";
 import { join } from "path";
-import { BUILD_META_FILE_NAME } from "astro-sst/build-meta";
 import { SsrSite, } from "./SsrSite.js";
 import { AllowedMethods } from "aws-cdk-lib/aws-cloudfront";
+const BUILD_META_FILE_NAME = "sst.buildMeta.json";
 /**
  * The `AstroSite` construct is a higher level CDK construct that makes it easy to create a Astro app.
  * @example
@@ -40,7 +40,6 @@ export class AstroSite extends SsrSite {
                 },
             ],
             regional: {
-                streaming: props?.regional?.streaming ?? true,
                 ...props?.regional,
             },
         });
@@ -158,7 +157,7 @@ export class AstroSite extends SsrSite {
                 type: "function",
                 constructId: "ServerFunction",
                 function: serverConfig,
-                streaming: regional?.streaming,
+                streaming: buildMeta.responseMode === "stream",
             };
             plan.origins.fallthroughServer = {
                 type: "group",
@@ -175,7 +174,7 @@ export class AstroSite extends SsrSite {
                 cacheType: "static",
                 pattern: `${buildMeta.clientBuildVersionedSubDir}/*`,
                 origin: "staticsServer",
-            }, ...(regional?.serverRoutes ?? []).map((route) => ({
+            }, ...(buildMeta.serverRoutes ?? regional?.serverRoutes ?? []).map((route) => ({
                 cacheType: "server",
                 pattern: route,
                 origin: "regionalServer",

package/constructs/Function.d.ts

@@ -270,7 +270,7 @@ export interface FunctionProps extends Omit<FunctionOptions, "functionName" | "m
      *
      * Note that, if a Layer is created in a stack (say `stackA`) and is referenced in another stack (say `stackB`), SST automatically creates an SSM parameter in `stackA` with the Layer's ARN. And in `stackB`, SST reads the ARN from the SSM parameter, and then imports the Layer.
      *
-     *  This is to get around the limitation that a Lambda Layer ARN cannot be referenced across stacks via a stack export. The Layer ARN contains a version number that is incremented everytime the Layer is modified. When you refer to a Layer's ARN across stacks, a CloudFormation export is created. However, CloudFormation does not allow an exported value to be updated. Once exported, if you try to deploy the updated layer, the CloudFormation update will fail. You can read more about this issue here - https://github.com/sst/sst/issues/549.
+     * This is to get around the limitation that a Lambda Layer ARN cannot be referenced across stacks via a stack export. The Layer ARN contains a version number that is incremented everytime the Layer is modified. When you refer to a Layer's ARN across stacks, a CloudFormation export is created. However, CloudFormation does not allow an exported value to be updated. Once exported, if you try to deploy the updated layer, the CloudFormation update will fail. You can read more about this issue here - https://github.com/sst/sst/issues/549.
      *
      * @default no layers
      *
@@ -282,6 +282,21 @@ export interface FunctionProps extends Omit<FunctionOptions, "functionName" | "m
      * ```
      */
     layers?: (string | ILayerVersion)[];
+    /**
+     * Disable sending function logs to CloudWatch Logs.
+     *
+     * Note that, logs will still appear locally when running `sst dev`.
+     * @default false
+     * @example
+     * ```js
+     * new Function(stack, "Function", {
+     *   handler: "src/function.handler",
+     *   disableCloudWatchLogs: true
+     * })
+     * ```
+     *
+     */
+    disableCloudWatchLogs?: boolean;
     /**
      * The duration function logs are kept in CloudWatch Logs.
      *
@@ -662,6 +677,7 @@ export declare class Function extends CDKFunction implements SSTConstruct {
     /** @internal */
     getFunctionBinding(): FunctionBindingProps;
     private createUrl;
+    private disableCloudWatchLogs;
     private isNodeRuntime;
     static validateHandlerSet(id: string, props: FunctionProps): void;
     static validateVpcSettings(id: string, props: FunctionProps): void;

package/constructs/Function.js

@@ -294,7 +294,6 @@ export class Function extends CDKFunction {
                 removeInEdge: true,
             });
         }
-        // Attach permissions
         this.attachPermissions(props.permissions || []);
         // Add config
         this.addEnvironment("SST_APP", app.name, { removeInEdge: true });
@@ -303,6 +302,7 @@ export class Function extends CDKFunction {
             removeInEdge: true,
         });
         this.bind(props.bind || []);
+        this.disableCloudWatchLogs();
         this.createUrl();
         this._isLiveDevEnabled = isLiveDevEnabled;
         useFunctions().add(this.node.addr, props);
@@ -415,6 +415,22 @@ export class Function extends CDKFunction {
             cors: functionUrlCors.buildCorsConfig(cors),
         });
     }
+    disableCloudWatchLogs() {
+        const disableCloudWatchLogs = this.props.disableCloudWatchLogs ?? false;
+        if (!disableCloudWatchLogs)
+            return;
+        this.attachPermissions([
+            new PolicyStatement({
+                effect: Effect.DENY,
+                actions: [
+                    "logs:CreateLogGroup",
+                    "logs:CreateLogStream",
+                    "logs:PutLogEvents",
+                ],
+                resources: ["*"],
+            }),
+        ]);
+    }
     isNodeRuntime() {
         const { runtime } = this.props;
         return runtime.startsWith("nodejs");

package/constructs/NextjsSite.d.ts

@@ -10,11 +10,49 @@ export interface NextjsSiteProps extends Omit<SsrSiteProps, "nodejs"> {
          * @default 1024 MB
          * @example
          * ```js
-         * memorySize: "512 MB",
+         * imageOptimization: {
+         *   memorySize: "512 MB",
+         * }
          * ```
          */
         memorySize?: number | Size;
     };
+    experimental?: {
+        /**
+         * Enable streaming. Currently an experimental feature in OpenNext.
+         * @default false
+         * @example
+         * ```js
+         * experimental: {
+         *   streaming: true,
+         * }
+         * ```
+         */
+        streaming?: boolean;
+        /**
+         * Disabling incremental cache will cause the entire page to be revalidated on each request. This can result in ISR and SSG pages to be in an inconsistent state. Specify this option if you are using SSR pages only.
+         *
+         * Note that it is possible to disable incremental cache while leaving on-demand revalidation enabled.
+         * @default false
+         * @example
+         * ```js
+         * experimental: {
+         *   disableIncrementalCache: true,
+         * }
+         */
+        disableIncrementalCache?: boolean;
+        /**
+         * Disabling DynamoDB cache will cause on-demand revalidation by path (`revalidatePath`) and by cache tag (`revalidateTag`) to fail silently.
+         * @default false
+         * @example
+         * ```js
+         * experimental: {
+         *   disableDynamoDBCache: true,
+         * }
+         * ```
+         */
+        disableDynamoDBCache?: boolean;
+    };
     cdk?: SsrSiteProps["cdk"] & {
         revalidation?: Pick<FunctionProps, "vpc" | "vpcSubnets">;
         /**
@@ -129,6 +167,7 @@ export declare class NextjsSite extends SsrSite {
                         CACHE_BUCKET_REGION: string;
                     };
                 };
+                streaming: boolean | undefined;
             } | undefined;
         };
         behaviors: {
@@ -147,7 +186,8 @@ export declare class NextjsSite extends SsrSite {
             schedule?: import("aws-cdk-lib/aws-events").Schedule | undefined;
         } | undefined;
     };
-    protected createRevalidation(): void;
+    private createRevalidationQueue;
+    private createRevalidationTable;
     getConstructMetadata(): {
         data: {
             mode: "placeholder" | "deployed";

package/constructs/NextjsSite.js

@@ -1,12 +1,16 @@
 import fs from "fs";
 import path from "path";
-import { Duration as CdkDuration } from "aws-cdk-lib/core";
+import { Duration as CdkDuration, RemovalPolicy, CustomResource, } from "aws-cdk-lib/core";
 import { Code, Runtime, Function as CdkFunction, Architecture, } from "aws-cdk-lib/aws-lambda";
+import { AttributeType, Billing, TableV2 as Table, } from "aws-cdk-lib/aws-dynamodb";
+import { Provider } from "aws-cdk-lib/custom-resources";
 import { Queue } from "aws-cdk-lib/aws-sqs";
 import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
 import { Stack } from "./Stack.js";
 import { SsrSite } from "./SsrSite.js";
 import { toCdkSize } from "./util/size.js";
+import { PolicyStatement } from "aws-cdk-lib/aws-iam";
+import { RetentionDays } from "aws-cdk-lib/aws-logs";
 /**
  * The `NextjsSite` construct is a higher level CDK construct that makes it easy to create a Next.js app.
  * @example
@@ -20,14 +24,34 @@ import { toCdkSize } from "./util/size.js";
  */
 export class NextjsSite extends SsrSite {
     constructor(scope, id, props) {
+        const { streaming, disableDynamoDBCache, disableIncrementalCache } = {
+            streaming: false,
+            disableDynamoDBCache: false,
+            disableIncrementalCache: false,
+            ...props?.experimental,
+        };
         super(scope, id, {
-            buildCommand: "npx --yes open-next@2.1.5 build",
+            buildCommand: [
+                "npx --yes open-next@2.2.1 build",
+                ...(streaming ? ["--streaming"] : []),
+                ...(disableDynamoDBCache
+                    ? ["--dangerously-disable-dynamodb-cache"]
+                    : []),
+                ...(disableIncrementalCache
+                    ? ["--dangerously-disable-incremental-cache"]
+                    : []),
+            ].join(" "),
             ...props,
         });
-        this.createRevalidation();
+        if (!disableIncrementalCache) {
+            this.createRevalidationQueue();
+            if (!disableDynamoDBCache) {
+                this.createRevalidationTable();
+            }
+        }
     }
     plan(bucket) {
-        const { path: sitePath, edge, imageOptimization } = this.props;
+        const { path: sitePath, edge, experimental, imageOptimization, } = this.props;
         const serverConfig = {
             description: "Next.js server",
             bundle: path.join(sitePath, ".open-next", "server-function"),
@@ -61,6 +85,7 @@ export class NextjsSite extends SsrSite {
                             type: "function",
                             constructId: "ServerFunction",
                             function: serverConfig,
+                            streaming: experimental?.streaming,
                         },
                     }),
                 imageOptimizer: {
@@ -172,10 +197,11 @@ export class NextjsSite extends SsrSite {
             },
         });
     }
-    createRevalidation() {
+    createRevalidationQueue() {
         if (!this.serverFunction)
             return;
         const { cdk } = this.props;
+        const server = this.serverFunction;
         const queue = new Queue(this, "RevalidationQueue", {
             fifo: true,
             receiveMessageWaitTime: CdkDuration.seconds(20),
@@ -190,10 +216,64 @@ export class NextjsSite extends SsrSite {
         });
         consumer.addEventSource(new SqsEventSource(queue, { batchSize: 5 }));
         // Allow server to send messages to the queue
+        server.addEnvironment("REVALIDATION_QUEUE_URL", queue.queueUrl);
+        server.addEnvironment("REVALIDATION_QUEUE_REGION", Stack.of(this).region);
+        queue.grantSendMessages(server.role);
+    }
+    createRevalidationTable() {
+        if (!this.serverFunction)
+            return;
+        const { path: sitePath } = this.props;
         const server = this.serverFunction;
-        server?.addEnvironment("REVALIDATION_QUEUE_URL", queue.queueUrl);
-        server?.addEnvironment("REVALIDATION_QUEUE_REGION", Stack.of(this).region);
-        queue.grantSendMessages(server?.role);
+        const table = new Table(this, "RevalidationTable", {
+            partitionKey: { name: "tag", type: AttributeType.STRING },
+            sortKey: { name: "path", type: AttributeType.STRING },
+            pointInTimeRecovery: true,
+            billing: Billing.onDemand(),
+            globalSecondaryIndexes: [
+                {
+                    indexName: "revalidate",
+                    partitionKey: { name: "path", type: AttributeType.STRING },
+                    sortKey: { name: "revalidatedAt", type: AttributeType.NUMBER },
+                },
+            ],
+            removalPolicy: RemovalPolicy.DESTROY,
+        });
+        server?.addEnvironment("CACHE_DYNAMO_TABLE", table.tableName);
+        table.grantReadWriteData(server.role);
+        const dynamodbProviderPath = path.join(sitePath, ".open-next", "dynamodb-provider");
+        if (fs.existsSync(dynamodbProviderPath)) {
+            const insertFn = new CdkFunction(this, "RevalidationInsertFunction", {
+                description: "Next.js revalidation data insert",
+                handler: "index.handler",
+                code: Code.fromAsset(dynamodbProviderPath),
+                runtime: Runtime.NODEJS_18_X,
+                timeout: CdkDuration.minutes(15),
+                initialPolicy: [
+                    new PolicyStatement({
+                        actions: [
+                            "dynamodb:BatchWriteItem",
+                            "dynamodb:PutItem",
+                            "dynamodb:DescribeTable",
+                        ],
+                        resources: [table.tableArn],
+                    }),
+                ],
+                environment: {
+                    CACHE_DYNAMO_TABLE: table.tableName,
+                },
+            });
+            const provider = new Provider(this, "RevalidationProvider", {
+                onEventHandler: insertFn,
+                logRetention: RetentionDays.ONE_DAY,
+            });
+            new CustomResource(this, "RevalidationResource", {
+                serviceToken: provider.serviceToken,
+                properties: {
+                    version: Date.now().toString(),
+                },
+            });
+        }
     }
     getConstructMetadata() {
         return {

package/constructs/Service.d.ts

@@ -1,4 +1,5 @@
 import { Construct } from "constructs";
+import { DistributionProps } from "aws-cdk-lib/aws-cloudfront";
 import { DistributionDomainProps } from "./Distribution.js";
 import { SSTConstruct } from "./Construct.js";
 import { Permissions } from "./util/permission.js";
@@ -18,6 +19,8 @@ declare const supportedCpus: {
 };
 export interface ServiceDomainProps extends DistributionDomainProps {
 }
+export interface ServiceCdkDistributionProps extends Omit<DistributionProps, "defaultBehavior"> {
+}
 export interface ServiceProps {
     /**
      * Path to the directory where the app is located.
@@ -272,7 +275,7 @@ export interface ServiceProps {
     };
     cdk?: {
         /**
-         * By default, SST creates a CloudFront distribution. Set this to `false` to skip creating the distribution.
+         * By default, SST creates a CloudFront distribution. Pass in a value to override the default settings this construct uses to create the CDK `Distribution` internally. Alternatively, set this to `false` to skip creating the distribution.
          * @default true
          * @example
          * ```js
@@ -283,7 +286,7 @@ export interface ServiceProps {
          * }
          * ```
          */
-        cloudfrontDistribution?: boolean;
+        cloudfrontDistribution?: boolean | ServiceCdkDistributionProps;
         /**
          * By default, SST creates an Application Load Balancer to distribute requests across containers. Set this to `false` to skip creating the load balancer.
          * @default true

package/constructs/Service.js

@@ -517,6 +517,9 @@ export class Service extends Construct {
                         cachePolicy,
                         originRequestPolicy: OriginRequestPolicy.ALL_VIEWER,
                     },
+                    ...(cdk?.cloudfrontDistribution === true
+                        ? {}
+                        : cdk?.cloudfrontDistribution),
                 },
             },
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.27.0",
+  "version": "2.28.1",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -119,7 +119,7 @@
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
-    "astro-sst": "2.27.0",
+    "astro-sst": "2.28.1",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",
     "vitest": "^0.33.0"

package/support/custom-resources/index.mjs

@@ -35794,7 +35794,7 @@ var require_DeleteParameterCommand = __commonJS({
       return smithy_client_1.Command;
     } });
     var Aws_json1_1_1 = require_Aws_json1_1();
-    var DeleteParameterCommand2 = class _DeleteParameterCommand extends smithy_client_1.Command {
+    var DeleteParameterCommand = class _DeleteParameterCommand extends smithy_client_1.Command {
       static getEndpointParameterInstructions() {
         return {
           UseFIPS: { type: "builtInParams", name: "useFipsEndpoint" },
@@ -35831,7 +35831,7 @@ var require_DeleteParameterCommand = __commonJS({
         return (0, Aws_json1_1_1.de_DeleteParameterCommand)(output, context);
       }
     };
-    exports.DeleteParameterCommand = DeleteParameterCommand2;
+    exports.DeleteParameterCommand = DeleteParameterCommand;
   }
 });
 
@@ -35848,7 +35848,7 @@ var require_DeleteParametersCommand = __commonJS({
       return smithy_client_1.Command;
     } });
     var Aws_json1_1_1 = require_Aws_json1_1();
-    var DeleteParametersCommand = class _DeleteParametersCommand extends smithy_client_1.Command {
+    var DeleteParametersCommand2 = class _DeleteParametersCommand extends smithy_client_1.Command {
       static getEndpointParameterInstructions() {
         return {
           UseFIPS: { type: "builtInParams", name: "useFipsEndpoint" },
@@ -35885,7 +35885,7 @@ var require_DeleteParametersCommand = __commonJS({
         return (0, Aws_json1_1_1.de_DeleteParametersCommand)(output, context);
       }
     };
-    exports.DeleteParametersCommand = DeleteParametersCommand;
+    exports.DeleteParametersCommand = DeleteParametersCommand2;
   }
 });
 
@@ -179506,18 +179506,11 @@ async function AuthKeys(cfnRequest) {
       }
       break;
     case "Delete":
-      await Promise.all([
-        client.send(
-          new import_client_ssm.DeleteParameterCommand({
-            Name: privatePath
-          })
-        ),
-        client.send(
-          new import_client_ssm.DeleteParameterCommand({
-            Name: publicPath
-          })
-        )
-      ]);
+      await client.send(
+        new import_client_ssm.DeleteParametersCommand({
+          Names: [publicPath, privatePath]
+        })
+      );
       break;
     default:
       throw new Error("Unsupported request type");