sst 2.42.0 → 2.43.1

package/constructs/SsrFunction.js

@@ -29,6 +29,7 @@ export class SsrFunction extends Construct {
     /** @internal */
     _doNotAllowOthersToBind = true;
     function;
+    functionUrl;
     assetReplacer;
     assetReplacerPolicy;
     missingSourcemap;
@@ -80,11 +81,15 @@ export class SsrFunction extends Construct {
     get functionName() {
         return this.function.functionName;
     }
+    get url() {
+        return this.functionUrl?.url;
+    }
     addEnvironment(key, value) {
         return this.function.addEnvironment(key, value);
     }
     addFunctionUrl(props) {
-        return this.function.addFunctionUrl(props);
+        this.functionUrl = this.function.addFunctionUrl(props);
+        return this.functionUrl;
     }
     grantInvoke(grantee) {
         return this.function.grantInvoke(grantee);

package/constructs/SsrSite.d.ts

@@ -1,7 +1,7 @@
 import { Construct } from "constructs";
 import { Bucket, BucketProps, IBucket } from "aws-cdk-lib/aws-s3";
 import { Function as CdkFunction, FunctionProps as CdkFunctionProps } from "aws-cdk-lib/aws-lambda";
-import { ICachePolicy, IResponseHeadersPolicy, ViewerProtocolPolicy, AllowedMethods, CachePolicyProps, ErrorResponse } from "aws-cdk-lib/aws-cloudfront";
+import { ICachePolicy, IResponseHeadersPolicy, ViewerProtocolPolicy, AllowedMethods, ErrorResponse } from "aws-cdk-lib/aws-cloudfront";
 import { S3OriginProps } from "aws-cdk-lib/aws-cloudfront-origins";
 import { DistributionDomainProps } from "./Distribution.js";
 import { SSTConstruct } from "./Construct.js";
@@ -13,26 +13,27 @@ import { Size } from "./util/size.js";
 import { Duration } from "./util/duration.js";
 import { Permissions } from "./util/permission.js";
 import { BindingResource, BindingProps } from "./util/binding.js";
-type CloudFrontFunctionConfig = {
+export type CloudFrontFunctionConfig = {
     constructId: string;
     injections: string[];
 };
-type EdgeFunctionConfig = {
+export type EdgeFunctionConfig = {
     constructId: string;
     function: EdgeFunctionProps;
 };
-type FunctionOriginConfig = {
+export type FunctionOriginConfig = {
     type: "function";
     constructId: string;
     function: SsrFunctionProps;
     injections?: string[];
     streaming?: boolean;
+    warm?: number;
 };
-type ImageOptimizationFunctionOriginConfig = {
+export type ImageOptimizationFunctionOriginConfig = {
     type: "image-optimization-function";
     function: CdkFunctionProps;
 };
-type S3OriginConfig = {
+export type S3OriginConfig = {
     type: "s3";
     originPath?: string;
     copy: {
@@ -42,7 +43,7 @@ type S3OriginConfig = {
         versionedSubDir?: string;
     }[];
 };
-type OriginGroupConfig = {
+export type OriginGroupConfig = {
     type: "group";
     primaryOriginName: string;
     fallbackOriginName: string;
@@ -424,11 +425,12 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
     protected doNotDeploy: boolean;
     protected bucket: Bucket;
     protected serverFunction?: EdgeFunction | SsrFunction;
+    protected serverFunctions: SsrFunction[];
+    protected edgeFunctions: Record<string, EdgeFunction>;
     private serverFunctionForDev?;
     private edge?;
     private distribution;
     constructor(scope: Construct, id: string, rawProps?: SsrSiteProps);
-    protected static buildDefaultServerCachePolicyProps(allowedHeaders: string[]): CachePolicyProps;
     /**
      * The CloudFront URL of the website.
      */
@@ -495,6 +497,9 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
             allowedHeaders?: string[];
         };
         buildId?: string;
+        warmer?: {
+            function: string;
+        };
     }): {
         cloudFrontFunctions?: CloudFrontFunctions | undefined;
         edgeFunctions?: EdgeFunctions | undefined;
@@ -513,6 +518,9 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
             allowedHeaders?: string[] | undefined;
         } | undefined;
         buildId?: string | undefined;
+        warmer?: {
+            function: string;
+        } | undefined;
     };
 }
 export declare const useSites: () => {

package/constructs/SsrSite.js

@@ -49,6 +49,8 @@ export class SsrSite extends Construct {
     doNotDeploy;
     bucket;
     serverFunction;
+    serverFunctions = [];
+    edgeFunctions = {};
     serverFunctionForDev;
     edge;
     distribution;
@@ -87,6 +89,7 @@ export class SsrSite extends Construct {
         }
         let s3DeployCRs = [];
         let ssrFunctions = [];
+        let warmConfig = [];
         let singletonUrlSigner;
         let singletonCachePolicy;
         let singletonOriginRequestPolicy;
@@ -107,6 +110,8 @@ export class SsrSite extends Construct {
         createWarmer();
         this.bucket = bucket;
         this.distribution = distribution;
+        this.serverFunctions = [...ssrFunctions];
+        this.edgeFunctions = { ...edgeFunctions };
         this.serverFunction = ssrFunctions[0] ?? Object.values(edgeFunctions)[0];
         this.edge = plan.edge;
         app.registerTypes(this);
@@ -213,27 +218,26 @@ export class SsrSite extends Construct {
             // note: Currently all sites have a single server function. When we add
             //       support for multiple server functions (ie. route splitting), we
             //       need to handle warming multiple functions.
-            if (!warm)
-                return;
-            if (warm && plan.edge) {
-                throw new VisibleError(`In the "${id}" Site, warming is currently supported only for the regional mode.`);
+            if (warm && ssrFunctions[0] instanceof SsrFunction) {
+                warmConfig.push({ concurrency: warm, function: ssrFunctions[0] });
             }
-            if (ssrFunctions.length === 0)
-                return;
+            const warmParams = warmConfig.map((config) => ({
+                concurrency: config.concurrency,
+                function: config.function.functionName,
+            }));
             // Create warmer function
             const warmer = new CdkFunction(self, "WarmerFunction", {
                 description: "SSR warmer",
-                code: Code.fromAsset(path.join(__dirname, "../support/ssr-warmer")),
+                code: Code.fromAsset(plan.warmer?.function ?? path.join(__dirname, "../support/ssr-warmer")),
                 runtime: Runtime.NODEJS_18_X,
                 handler: "index.handler",
                 timeout: CdkDuration.minutes(15),
                 memorySize: 128,
                 environment: {
-                    FUNCTION_NAME: ssrFunctions[0].functionName,
-                    CONCURRENCY: warm.toString(),
+                    WARM_PARAMS: JSON.stringify(warmParams),
                 },
             });
-            ssrFunctions[0].grantInvoke(warmer);
+            warmConfig.forEach((config) => config.function.grantInvoke(warmer));
             // Create cron job
             new Rule(self, "WarmerRule", {
                 schedule: Schedule.rate(CdkDuration.minutes(5)),
@@ -461,6 +465,9 @@ function handler(event) {
                 prefetchSecrets: regional?.prefetchSecrets,
             });
             ssrFunctions.push(fn);
+            if (props.warm) {
+                warmConfig.push({ concurrency: props.warm, function: fn });
+            }
             bucket.grantReadWrite(fn?.role);
             const fnUrl = fn.addFunctionUrl({
                 authType: regional?.enableServerUrlIamAuth
@@ -638,7 +645,19 @@ function handler(event) {
             const allowedHeaders = plan.serverCachePolicy?.allowedHeaders ?? [];
             singletonCachePolicy =
                 singletonCachePolicy ??
-                    new CachePolicy(self, "ServerCache", SsrSite.buildDefaultServerCachePolicyProps(allowedHeaders));
+                    new CachePolicy(self, "ServerCache", {
+                        queryStringBehavior: CacheQueryStringBehavior.all(),
+                        headerBehavior: allowedHeaders.length > 0
+                            ? CacheHeaderBehavior.allowList(...allowedHeaders)
+                            : CacheHeaderBehavior.none(),
+                        cookieBehavior: CacheCookieBehavior.none(),
+                        defaultTtl: CdkDuration.days(0),
+                        maxTtl: CdkDuration.days(365),
+                        minTtl: CdkDuration.days(0),
+                        enableAcceptEncodingBrotli: true,
+                        enableAcceptEncodingGzip: true,
+                        comment: "SST server response cache policy",
+                    });
             return singletonCachePolicy;
         }
         function useServerBehaviorOriginRequestPolicy() {
@@ -797,21 +816,6 @@ function handler(event) {
             });
         }
     }
-    static buildDefaultServerCachePolicyProps(allowedHeaders) {
-        return {
-            queryStringBehavior: CacheQueryStringBehavior.all(),
-            headerBehavior: allowedHeaders.length > 0
-                ? CacheHeaderBehavior.allowList(...allowedHeaders)
-                : CacheHeaderBehavior.none(),
-            cookieBehavior: CacheCookieBehavior.none(),
-            defaultTtl: CdkDuration.days(0),
-            maxTtl: CdkDuration.days(365),
-            minTtl: CdkDuration.days(0),
-            enableAcceptEncodingBrotli: true,
-            enableAcceptEncodingGzip: true,
-            comment: "SST server response cache policy",
-        };
-    }
     /**
      * The CloudFront URL of the website.
      */

package/constructs/SvelteKitSite.d.ts

@@ -103,6 +103,9 @@ export declare class SvelteKitSite extends SsrSite {
             allowedHeaders?: string[] | undefined;
         } | undefined;
         buildId?: string | undefined;
+        warmer?: {
+            function: string;
+        } | undefined;
     };
     getConstructMetadata(): {
         data: {

package/node/future/auth/adapter/apple.d.ts

@@ -1,6 +1,9 @@
-import { BaseClient } from "openid-client";
-import { OauthConfig } from "./oauth.js";
-export declare const AppleAdapter: (config: OauthConfig) => () => Promise<{
+import { BaseClient, Issuer } from "openid-client";
+import { OauthBasicConfig } from "./oauth.js";
+type AppleConfig = OauthBasicConfig & {
+    issuer?: Issuer;
+};
+export declare const AppleAdapter: (config: AppleConfig) => () => Promise<{
     type: "success";
     properties: {
         tokenset: import("openid-client").TokenSet;
@@ -15,3 +18,4 @@ export declare const AppleAdapter: (config: OauthConfig) => () => Promise<{
         };
     };
 } | undefined>;
+export {};

package/node/future/auth/adapter/apple.js

@@ -8,19 +8,15 @@ import { useBody, useCookie, useDomainName, usePathParam, useResponse, } from ".
 // Also note that Apple's discover uri does not work for the OAuth flow, as the
 // userinfo_endpoint are not included in the response.
 // await Issuer.discover("https://appleid.apple.com/.well-known/openid-configuration/");
-let realIssuer;
-const issuer = new Proxy({}, {
-    get: async function (target, prop) {
-        if (!realIssuer) {
-            realIssuer = await Issuer.discover("https://appleid.apple.com/.well-known/openid-configuration");
-        }
-        return realIssuer[prop];
-    },
-});
+let issuer;
 export const AppleAdapter = 
 /* @__PURE__ */
 (config) => {
     return async function () {
+        const doesConfigHasIssuer = config.issuer !== undefined;
+        if (!doesConfigHasIssuer && !issuer) {
+            issuer = await Issuer.discover("https://appleid.apple.com/.well-known/openid-configuration");
+        }
         const step = usePathParam("step");
         const callback = "https://" + useDomainName() + "/callback";
         console.log("callback", callback);

package/node/future/auth/adapter/google.d.ts

@@ -11,7 +11,7 @@ type GoogleConfig = (OauthBasicConfig & {
     mode: "oidc";
     prompt?: GooglePrompt;
 });
-export declare function GoogleAdapter(config: GoogleConfig): (() => Promise<{
+export declare function GoogleAdapter(config: GoogleConfig): () => Promise<{
     type: "success";
     properties: {
         tokenset: import("openid-client").TokenSet;
@@ -25,24 +25,9 @@ export declare function GoogleAdapter(config: GoogleConfig): (() => Promise<{
             location: string;
         };
     };
-}>) | (() => Promise<{
-    type: "success";
-    properties: {
-        tokenset: import("openid-client").TokenSet;
-        client: BaseClient;
-    };
-} | {
-    type: "step";
-    properties: {
-        statusCode: number;
-        headers: {
-            location: string;
-        };
-    };
-    error?: undefined;
 } | {
     type: "error";
     error: import("./oauth.js").OauthError;
     properties?: undefined;
-} | undefined>);
+} | undefined>;
 export {};

package/node/future/auth/adapter/google.js

@@ -1,30 +1,27 @@
 import { Issuer } from "openid-client";
 import { OidcAdapter } from "./oidc.js";
 import { OauthAdapter } from "./oauth.js";
-let realIssuer;
-const issuer = new Proxy({}, {
-    get: async function (target, prop) {
-        if (!realIssuer) {
-            realIssuer = await Issuer.discover("https://accounts.google.com");
-        }
-        return realIssuer[prop];
-    },
-});
+let issuer;
 export function GoogleAdapter(config) {
     /* @__PURE__ */
-    if (config.mode === "oauth") {
-        return OauthAdapter({
+    return async function () {
+        if (!issuer) {
+            issuer = await Issuer.discover("https://accounts.google.com");
+        }
+        if (config.mode === "oauth") {
+            return OauthAdapter({
+                issuer: issuer,
+                ...config,
+                params: {
+                    ...(config.accessType && { access_type: config.accessType }),
+                    ...config.params,
+                },
+            })();
+        }
+        return OidcAdapter({
             issuer: issuer,
+            scope: "openid email profile",
             ...config,
-            params: {
-                ...(config.accessType && { access_type: config.accessType }),
-                ...config.params,
-            },
-        });
-    }
-    return OidcAdapter({
-        issuer: issuer,
-        scope: "openid email profile",
-        ...config,
-    });
+        })();
+    };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.42.0",
+  "version": "2.43.1",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -118,7 +118,7 @@
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
-    "astro-sst": "2.42.0",
+    "astro-sst": "2.43.1",
     "async": "^3.2.4",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",

package/support/dotnet8-bootstrap/Program.cs

@@ -0,0 +1,17 @@
+using System.Reflection;
+using System.Threading.Tasks;
+using Amazon.Lambda.RuntimeSupport;
+
+namespace dotnet_bootstrap
+{
+    class Program
+    {
+        static async Task Main(string[] args)
+        {
+            Assembly asm = Assembly.LoadFrom(args[0]);
+            var r = new RuntimeSupportInitializer(args[1]);
+            await r.RunLambdaBootstrap();
+        }
+    }
+}
+

package/support/dotnet8-bootstrap/dotnet-bootstrap.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <RootNamespace>dotnet_bootstrap</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.10.0" />
+  </ItemGroup>
+
+</Project>

package/support/dotnet8-bootstrap/release/dotnet-bootstrap.deps.json

@@ -0,0 +1,59 @@
+{
+  "runtimeTarget": {
+    "name": ".NETCoreApp,Version=v8.0",
+    "signature": ""
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETCoreApp,Version=v8.0": {
+      "dotnet-bootstrap/1.0.0": {
+        "dependencies": {
+          "Amazon.Lambda.RuntimeSupport": "1.10.0"
+        },
+        "runtime": {
+          "dotnet-bootstrap.dll": {}
+        }
+      },
+      "Amazon.Lambda.Core/2.2.0": {
+        "runtime": {
+          "lib/net8.0/Amazon.Lambda.Core.dll": {
+            "assemblyVersion": "1.0.0.0",
+            "fileVersion": "1.0.0.0"
+          }
+        }
+      },
+      "Amazon.Lambda.RuntimeSupport/1.10.0": {
+        "dependencies": {
+          "Amazon.Lambda.Core": "2.2.0"
+        },
+        "runtime": {
+          "lib/net8.0/Amazon.Lambda.RuntimeSupport.dll": {
+            "assemblyVersion": "1.10.0.0",
+            "fileVersion": "1.10.0.0"
+          }
+        }
+      }
+    }
+  },
+  "libraries": {
+    "dotnet-bootstrap/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
+    "Amazon.Lambda.Core/2.2.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-DHqKeD1CYocP0t1dJC/NaXfu+5k6AoqnQ1Hlu/J2mXpLpCyeJfY+tIqT5fpruDarUlU0NtdIH8zSkCjeinyb1A==",
+      "path": "amazon.lambda.core/2.2.0",
+      "hashPath": "amazon.lambda.core.2.2.0.nupkg.sha512"
+    },
+    "Amazon.Lambda.RuntimeSupport/1.10.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-J1NdaUV24sWALmCjzJJ6vezskeeH2NxJU7ao86rgdzW+AcgnhYjIULuKQNAx6fTl8AP/8acFsq7Jp7k156hh4A==",
+      "path": "amazon.lambda.runtimesupport/1.10.0",
+      "hashPath": "amazon.lambda.runtimesupport.1.10.0.nupkg.sha512"
+    }
+  }
+}

package/support/dotnet8-bootstrap/release/dotnet-bootstrap.runtimeconfig.json

@@ -0,0 +1,13 @@
+{
+  "runtimeOptions": {
+    "tfm": "net8.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "8.0.0"
+    },
+    "configProperties": {
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false,
+      "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false
+    }
+  }
+}

package/support/ssr-warmer/index.mjs

@@ -30914,62 +30914,65 @@ var require_dist_cjs59 = __commonJS({
 // support/ssr-warmer/index.ts
 var import_client_lambda = __toESM(require_dist_cjs59(), 1);
 var lambda = new import_client_lambda.LambdaClient({});
-var FUNCTION_NAME = process.env.FUNCTION_NAME;
-var CONCURRENCY = parseInt(process.env.CONCURRENCY);
+var warmParams = JSON.parse(process.env.WARM_PARAMS);
 function generateUniqueId() {
   return Math.random().toString(36).slice(2, 8);
 }
 async function handler(_event, context) {
   const warmerId = `warmer-${generateUniqueId()}`;
-  console.log({
-    event: "warmer invoked",
-    functionName: FUNCTION_NAME,
-    concurrency: CONCURRENCY,
-    warmerId
-  });
-  const ret = await Promise.all(
-    Array.from({ length: CONCURRENCY }, (_v, i) => i).map((i) => {
-      try {
-        return lambda.send(
-          new import_client_lambda.InvokeCommand({
-            FunctionName: FUNCTION_NAME,
-            InvocationType: "RequestResponse",
-            Payload: JSON.stringify({
-              type: "warmer",
-              warmerId,
-              index: i,
-              concurrency: CONCURRENCY,
-              delay: 75
+  for (const warmParam of warmParams) {
+    const { concurrency: CONCURRENCY, function: FUNCTION_NAME } = warmParam;
+    console.log({
+      event: "warmer invoked",
+      functionName: FUNCTION_NAME,
+      concurrency: CONCURRENCY,
+      warmerId
+    });
+    const ret = await Promise.all(
+      Array.from({ length: CONCURRENCY }, (_v, i) => i).map((i) => {
+        try {
+          return lambda.send(
+            new import_client_lambda.InvokeCommand({
+              FunctionName: FUNCTION_NAME,
+              InvocationType: "RequestResponse",
+              Payload: JSON.stringify({
+                type: "warmer",
+                warmerId,
+                index: i,
+                concurrency: CONCURRENCY,
+                delay: 75
+              })
             })
-          })
+          );
+        } catch (e) {
+          console.error(`failed to warm up #${i}`, e);
+        }
+      })
+    );
+    const warmedServerIds = [];
+    ret.forEach((r, i) => {
+      if (r?.StatusCode !== 200 || !r?.Payload) {
+        console.error(`failed to warm up #${i}:`, r?.Payload?.toString());
+        return;
+      }
+      const payloadString = r.Payload.transformToString();
+      if (payloadString) {
+        const payload = JSON.parse(
+          r.Payload.transformToString()
         );
-      } catch (e) {
-        console.error(`failed to warm up #${i}`, e);
-      }
-    })
-  );
-  const warmedServerIds = [];
-  ret.forEach((r, i) => {
-    if (r?.StatusCode !== 200 || !r?.Payload) {
-      console.error(`failed to warm up #${i}:`, r?.Payload?.toString());
-      return;
-    }
-    const payloadString = r.Payload.transformToString();
-    if (payloadString) {
-      const payload = JSON.parse(
-        r.Payload.transformToString()
-      );
-      warmedServerIds.push(payload.serverId);
-    } else {
-      warmedServerIds.push("unknown");
-    }
-  });
-  console.log({
-    event: "warmer result",
-    sent: CONCURRENCY,
-    success: warmedServerIds.length,
-    uniqueServersWarmed: [...new Set(warmedServerIds)].length
-  });
+        warmedServerIds.push(payload.serverId);
+      } else {
+        warmedServerIds.push("unknown");
+      }
+    });
+    console.log({
+      event: "warmer result",
+      sent: CONCURRENCY,
+      name: FUNCTION_NAME,
+      success: warmedServerIds.length,
+      uniqueServersWarmed: [...new Set(warmedServerIds)].length
+    });
+  }
 }
 export {
   handler