sst 2.1.9 → 2.1.11

package/config.js

@@ -117,21 +117,32 @@ export var Config;
             .flat()
             .filter((f) => f.type === "Function")
             .filter((f) => f.data.secrets.includes(key));
-        await Promise.all(filtered.map(async (f) => {
-            const config = await lambda.send(new GetFunctionConfigurationCommand({
-                FunctionName: f.data.arn,
-            }));
-            await lambda.send(new UpdateFunctionConfigurationCommand({
-                FunctionName: f.data.arn,
-                Environment: {
-                    Variables: {
-                        ...(config.Environment?.Variables || {}),
-                        [SECRET_UPDATED_AT_ENV]: Date.now().toString(),
+        const restarted = await Promise.all(filtered.map(async (f) => {
+            // Note: in the case where the function is removed, but the metadata
+            //       is not updated, we ignore the Function not found error.
+            try {
+                const config = await lambda.send(new GetFunctionConfigurationCommand({
+                    FunctionName: f.data.arn,
+                }));
+                await lambda.send(new UpdateFunctionConfigurationCommand({
+                    FunctionName: f.data.arn,
+                    Environment: {
+                        Variables: {
+                            ...(config.Environment?.Variables || {}),
+                            [SECRET_UPDATED_AT_ENV]: Date.now().toString(),
+                        },
                     },
-                },
-            }));
+                }));
+                return true;
+            }
+            catch (e) {
+                if (e.name === "ResourceNotFoundException" &&
+                    e.message.startsWith("Function not found")) {
+                    return;
+                }
+            }
         }));
-        return filtered.length;
+        return restarted.filter(Boolean).length;
     }
     Config.restart = restart;
 })(Config || (Config = {}));

package/constructs/Function.d.ts

@@ -352,13 +352,11 @@ export interface NodeJSProps {
      *
      * @example
      * ```js
-     * new Function(stack, "Function", {
-     *   nodejs: {
-     *     loader: {
-     *      ".png": "file"
-     *     }
+     * nodejs: {
+     *   loader: {
+     *    ".png": "file"
      *   }
-     * })
+     * }
      * ```
      */
     loader?: Record<string, Loader>;
@@ -367,11 +365,9 @@ export interface NodeJSProps {
      *
      * @example
      * ```js
-     * new Function(stack, "Function", {
-     *   nodejs: {
-     *     install: ["pg"]
-     *   }
-     * })
+     * nodejs: {
+     *   install: ["pg"]
+     * }
      * ```
      */
     install?: string[];
@@ -380,11 +376,9 @@ export interface NodeJSProps {
      *
      * @example
      * ```js
-     * new Function(stack, "Function", {
-     *   nodejs: {
-     *     banner: "console.log('Function starting')"
-     *   }
-     * })
+     * nodejs: {
+     *   banner: "console.log('Function starting')"
+     * }
      * ```
      */
     banner?: string;
@@ -399,11 +393,9 @@ export interface NodeJSProps {
      *
      * @example
      * ```js
-     * new Function(stack, "Function", {
-     *   nodejs: {
-     *     minify: false
-     *   }
-     * })
+     * nodejs: {
+     *   minify: false
+     * }
      * ```
      */
     minify?: boolean;
@@ -414,11 +406,9 @@ export interface NodeJSProps {
      *
      * @example
      * ```js
-     * new Function(stack, "Function", {
-     *   nodejs: {
-     *     format: "esm"
-     *   }
-     * })
+     * nodejs: {
+     *   format: "esm"
+     * }
      * ```
      */
     format?: "cjs" | "esm";
@@ -429,11 +419,9 @@ export interface NodeJSProps {
      *
      * @example
      * ```js
-     * new Function(stack, "Function", {
-     *   nodejs: {
-     *     sourcemap: true
-     *   }
-     * })
+     * nodejs: {
+     *   sourcemap: true
+     * }
      * ```
      */
     sourcemap?: boolean;

package/constructs/Job.d.ts

@@ -1,11 +1,13 @@
 import { Construct } from "constructs";
 import { SSTConstruct } from "./Construct.js";
-import { Function } from "./Function.js";
+import { Function, NodeJSProps } from "./Function.js";
 import { Duration } from "./util/duration.js";
 import { Permissions } from "./util/permission.js";
 import { FunctionBindingProps } from "./util/functionBinding.js";
 import { IVpc } from "aws-cdk-lib/aws-ec2";
 export type JobMemorySize = "3 GB" | "7 GB" | "15 GB" | "145 GB";
+export interface JobNodeJSProps extends NodeJSProps {
+}
 export interface JobProps {
     /**
      * Path to the entry point and handler function. Of the format:
@@ -47,6 +49,10 @@ export interface JobProps {
      *```
      */
     timeout?: Duration;
+    /**
+     * Used to configure nodejs function properties
+     */
+    nodejs?: JobNodeJSProps;
     /**
      * Can be used to disable Live Lambda Development when using `sst start`. Useful for things like Custom Resources that need to execute during deployment.
      *

package/constructs/SsrSite.d.ts

@@ -249,8 +249,10 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     protected buildDistributionDomainNames(): string[];
     private buildDistributionDefaultBehaviorForRegional;
     private buildDistributionDefaultBehaviorForEdge;
+    private buildBehaviorFunctionAssociations;
     protected buildDistributionStaticFileBehaviors(origin: S3Origin): Record<string, BehaviorOptions>;
     protected createCloudFrontServerCachePolicy(): CachePolicy;
+    protected createCloudFrontServerOriginRequestPolicy(): import("aws-cdk-lib/aws-cloudfront").IOriginRequestPolicy;
     private createCloudFrontInvalidation;
     protected validateCustomDomainSettings(): void;
     protected lookupHostedZone(): IHostedZone | undefined;

package/constructs/SsrSite.js

@@ -12,7 +12,7 @@ import { Effect, Policy, 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 { 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 { 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";
@@ -484,11 +484,13 @@ export class SsrSite extends Construct {
         });
         return {
             viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            functionAssociations: this.buildBehaviorFunctionAssociations(),
             origin: new HttpOrigin(Fn.parseDomainName(fnUrl.url)),
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
             cachePolicy: cdk?.serverCachePolicy ?? this.createCloudFrontServerCachePolicy(),
+            originRequestPolicy: this.createCloudFrontServerOriginRequestPolicy(),
             ...(cfDistributionProps.defaultBehavior || {}),
         };
     }
@@ -497,11 +499,13 @@ export class SsrSite extends Construct {
         const cfDistributionProps = cdk?.distribution || {};
         return {
             viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            functionAssociations: this.buildBehaviorFunctionAssociations(),
             origin,
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
             cachePolicy: cdk?.serverCachePolicy ?? this.createCloudFrontServerCachePolicy(),
+            originRequestPolicy: this.createCloudFrontServerOriginRequestPolicy(),
             ...(cfDistributionProps.defaultBehavior || {}),
             // concatenate edgeLambdas
             edgeLambdas: [
@@ -514,6 +518,21 @@ export class SsrSite extends Construct {
             ],
         };
     }
+    buildBehaviorFunctionAssociations() {
+        return [
+            {
+                eventType: CfFunctionEventType.VIEWER_REQUEST,
+                function: new CfFunction(this, "CloudFrontFunction", {
+                    code: CfFunctionCode.fromInline(`
+function handler(event) {
+  var request = event.request;
+  request.headers["x-forwarded-host"] = request.headers.host;
+  return request;
+}`),
+                }),
+            },
+        ];
+    }
     buildDistributionStaticFileBehaviors(origin) {
         const { cdk } = this.props;
         // Create additional behaviours for statics
@@ -551,6 +570,10 @@ export class SsrSite extends Construct {
             comment: "SST server response cache policy",
         });
     }
+    createCloudFrontServerOriginRequestPolicy() {
+        // 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", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.1.9",
+  "version": "2.1.11",
   "bin": {
     "sst": "cli/sst.js"
   },

package/runtime/handlers/node.js

@@ -186,13 +186,19 @@ export const useNodeHandler = Context.memo(async () => {
             }
             catch (ex) {
                 const result = ex;
+                if ("errors" in result) {
+                    return {
+                        type: "error",
+                        errors: result.errors.flatMap((x) => [
+                            Colors.bold(x.text),
+                            x.location?.file || "",
+                            Colors.dim(x.location?.line, "│", x.location?.lineText),
+                        ]),
+                    };
+                }
                 return {
                     type: "error",
-                    errors: result.errors.flatMap((x) => [
-                        Colors.bold(x.text),
-                        x.location?.file || "",
-                        Colors.dim(x.location?.line, "│", x.location?.lineText),
-                    ]),
+                    errors: [ex.toString()],
                 };
             }
         },

package/runtime/handlers/python.js

@@ -133,7 +133,10 @@ export const usePythonHandler = Context.memo(async () => {
             */
             return {
                 type: "success",
-                handler: path.relative(src, path.resolve(input.props.handler)),
+                handler: path
+                    .relative(src, path.resolve(input.props.handler))
+                    .split(path.sep)
+                    .join(path.posix.sep),
             };
         },
     });

package/sst.mjs

@@ -5056,13 +5056,19 @@ var init_node = __esm({
             };
           } catch (ex) {
             const result = ex;
+            if ("errors" in result) {
+              return {
+                type: "error",
+                errors: result.errors.flatMap((x) => [
+                  Colors.bold(x.text),
+                  x.location?.file || "",
+                  Colors.dim(x.location?.line, "\u2502", x.location?.lineText)
+                ])
+              };
+            }
             return {
               type: "error",
-              errors: result.errors.flatMap((x) => [
-                Colors.bold(x.text),
-                x.location?.file || "",
-                Colors.dim(x.location?.line, "\u2502", x.location?.lineText)
-              ])
+              errors: [ex.toString()]
             };
           }
         }
@@ -5487,7 +5493,7 @@ var init_python = __esm({
           });
           return {
             type: "success",
-            handler: path14.relative(src, path14.resolve(input.props.handler))
+            handler: path14.relative(src, path14.resolve(input.props.handler)).split(path14.sep).join(path14.posix.sep)
           };
         }
       });
@@ -6566,27 +6572,34 @@ var init_config = __esm({
         const lambda = useAWSClient(LambdaClient);
         const metadata3 = await stacks_exports.metadata();
         const filtered = Object.values(metadata3).flat().filter((f) => f.type === "Function").filter((f) => f.data.secrets.includes(key));
-        await Promise.all(
+        const restarted = await Promise.all(
           filtered.map(async (f) => {
-            const config = await lambda.send(
-              new GetFunctionConfigurationCommand({
-                FunctionName: f.data.arn
-              })
-            );
-            await lambda.send(
-              new UpdateFunctionConfigurationCommand({
-                FunctionName: f.data.arn,
-                Environment: {
-                  Variables: {
-                    ...config.Environment?.Variables || {},
-                    [SECRET_UPDATED_AT_ENV]: Date.now().toString()
+            try {
+              const config = await lambda.send(
+                new GetFunctionConfigurationCommand({
+                  FunctionName: f.data.arn
+                })
+              );
+              await lambda.send(
+                new UpdateFunctionConfigurationCommand({
+                  FunctionName: f.data.arn,
+                  Environment: {
+                    Variables: {
+                      ...config.Environment?.Variables || {},
+                      [SECRET_UPDATED_AT_ENV]: Date.now().toString()
+                    }
                   }
-                }
-              })
-            );
+                })
+              );
+              return true;
+            } catch (e) {
+              if (e.name === "ResourceNotFoundException" && e.message.startsWith("Function not found")) {
+                return;
+              }
+            }
           })
         );
-        return filtered.length;
+        return restarted.filter(Boolean).length;
       }
       Config2.restart = restart;
     })(Config || (Config = {}));