sst 2.0.3 → 2.0.5

package/constructs/Api.d.ts

@@ -164,7 +164,7 @@ export interface ApiAccessLogProps extends apigV2AccessLog.AccessLogProps {
 }
 export interface ApiProps<Authorizers extends Record<string, ApiAuthorizer> = Record<string, ApiAuthorizer>, AuthorizerKeys = keyof Authorizers> {
     /**
-     * Define the routes for the API. Can be a function, proxy to another API, or point to an ALB
+     * Define the routes for the API. Can be a function, proxy to another API, or point to an load balancer
      *
      * @example
      *
@@ -393,7 +393,7 @@ export interface ApiProps<Authorizers extends Record<string, ApiAuthorizer> = Re
         httpStages?: Omit<apig.HttpStageProps, "httpApi">[];
     };
 }
-export type ApiRouteProps<AuthorizerKeys> = FunctionInlineDefinition | ApiFunctionRouteProps<AuthorizerKeys> | ApiHttpRouteProps<AuthorizerKeys> | ApiAlbRouteProps<AuthorizerKeys> | ApiGraphQLRouteProps<AuthorizerKeys>;
+export type ApiRouteProps<AuthorizerKeys> = FunctionInlineDefinition | ApiFunctionRouteProps<AuthorizerKeys> | ApiHttpRouteProps<AuthorizerKeys> | ApiAlbRouteProps<AuthorizerKeys> | ApiNlbRouteProps<AuthorizerKeys> | ApiGraphQLRouteProps<AuthorizerKeys>;
 interface ApiBaseRouteProps<AuthorizerKeys = string> {
     authorizer?: "none" | "iam" | (string extends AuthorizerKeys ? Omit<AuthorizerKeys, "none" | "iam"> : AuthorizerKeys);
     authorizationScopes?: string[];
@@ -485,6 +485,31 @@ export interface ApiAlbRouteProps<AuthorizersKeys> extends ApiBaseRouteProps<Aut
         integration?: apigIntegrations.HttpAlbIntegrationProps;
     };
 }
+/**
+ * Specify a route handler that forwards to an NLB
+ *
+ * @example
+ * ```js
+ * api.addRoutes(stack, {
+ *   "GET /notes/{id}": {
+ *     type: "nlb",
+ *     cdk: {
+ *       nlbListener: listener,
+ *     }
+ *   }
+ * });
+ * ```
+ */
+export interface ApiNlbRouteProps<AuthorizersKeys> extends ApiBaseRouteProps<AuthorizersKeys> {
+    type: "nlb";
+    cdk: {
+        /**
+         * The listener to the application load balancer used for the integration.
+         */
+        nlbListener: elb.INetworkListener;
+        integration?: apigIntegrations.HttpNlbIntegrationProps;
+    };
+}
 /**
  * Specify a route handler that handles GraphQL queries using Pothos
  *
@@ -706,7 +731,7 @@ export declare class Api<Authorizers extends Record<string, ApiAuthorizer> = Rec
                 output: string | undefined;
                 commands: string[] | undefined;
             } | {
-                type: "lambda_function" | "url" | "alb";
+                type: "lambda_function" | "url" | "alb" | "nlb";
                 route: string;
                 fn?: undefined;
                 schema?: undefined;
@@ -731,6 +756,7 @@ export declare class Api<Authorizers extends Record<string, ApiAuthorizer> = Rec
     private addRoute;
     private createHttpIntegration;
     private createAlbIntegration;
+    private createNlbIntegration;
     protected createGraphQLIntegration(scope: Construct, routeKey: string, routeProps: ApiGraphQLRouteProps<keyof Authorizers>, postfixName: string): apig.HttpRouteIntegration;
     protected createCdkFunctionIntegration(scope: Construct, routeKey: string, routeProps: ApiFunctionRouteProps<keyof Authorizers>, postfixName: string): apig.HttpRouteIntegration;
     protected createFunctionIntegration(scope: Construct, routeKey: string, routeProps: ApiFunctionRouteProps<keyof Authorizers>, postfixName: string): apig.HttpRouteIntegration;

package/constructs/Api.js

@@ -444,6 +444,12 @@ export class Api extends Construct {
                     this.createAlbIntegration(scope, routeKey, routeValue, postfixName),
                 ];
             }
+            if (routeValue.type === "nlb") {
+                return [
+                    routeValue,
+                    this.createNlbIntegration(scope, routeKey, routeValue, postfixName),
+                ];
+            }
             if (routeValue.type === "url") {
                 return [
                     routeValue,
@@ -470,7 +476,7 @@ export class Api extends Construct {
             }
             if ("handler" in routeValue)
                 throw new Error(`Function definition must be nested under the "function" key in the route props for "${routeKey}". ie. { function: { handler: "myfunc.handler" } }`);
-            throw new Error(`Invalid route type for "${routeKey}". Must be one of: alb, url, function`);
+            throw new Error(`Invalid route type for "${routeKey}". Must be one of: alb, nlb, url, or function`);
         })();
         const { authorizationType, authorizer, authorizationScopes } = this.buildRouteAuth(routeProps);
         const route = new apig.HttpRoute(scope, `Route_${postfixName}`, {
@@ -520,6 +526,18 @@ export class Api extends Construct {
         };
         return integration;
     }
+    createNlbIntegration(scope, routeKey, routeProps, postfixName) {
+        ///////////////////
+        // Create integration
+        ///////////////////
+        const integration = new apigIntegrations.HttpNlbIntegration(`Integration_${postfixName}`, routeProps.cdk?.nlbListener, routeProps.cdk?.integration);
+        // Store route
+        this.routesData[routeKey] = {
+            type: "nlb",
+            nlb: routeProps.cdk?.nlbListener,
+        };
+        return integration;
+    }
     createGraphQLIntegration(scope, routeKey, routeProps, postfixName) {
         const result = this.createFunctionIntegration(scope, routeKey, {
             ...routeProps,

package/constructs/SsrSite.js

@@ -468,6 +468,11 @@ export class SsrSite extends Construct {
         }
         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;
     }

package/package.json

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

package/runtime/handlers/python.js

@@ -33,10 +33,10 @@ export const usePythonHandler = Context.memo(async () => {
         },
         canHandle: (input) => input.startsWith("python"),
         startWorker: async (input) => {
-            const src = "services";
+            const src = await findAbove(input.handler, "requirements.txt");
             const parsed = path.parse(path.relative(src, input.handler));
             const target = [...parsed.dir.split(path.sep), parsed.name].join(".");
-            const proc = spawn(os.platform() === "win32" ? "python.exe" : "python3.6".split(".")[0], [
+            const proc = spawn(os.platform() === "win32" ? "python.exe" : "python3", [
                 "-u",
                 url.fileURLToPath(new URL("../../support/python-runtime/runtime.py", import.meta.url)),
                 target,
@@ -51,7 +51,7 @@ export const usePythonHandler = Context.memo(async () => {
                     AWS_LAMBDA_RUNTIME_API: `localhost:${server.port}/${input.workerID}`,
                 },
                 shell: true,
-                cwd: path.join(process.cwd(), src),
+                cwd: src,
             });
             proc.on("exit", () => workers.exited(input.workerID));
             proc.stdout.on("data", (data) => {

package/sst.mjs

@@ -5013,11 +5013,11 @@ var init_python = __esm({
         },
         canHandle: (input) => input.startsWith("python"),
         startWorker: async (input) => {
-          const src = "services";
+          const src = await findAbove(input.handler, "requirements.txt");
           const parsed = path12.parse(path12.relative(src, input.handler));
           const target = [...parsed.dir.split(path12.sep), parsed.name].join(".");
           const proc = spawn4(
-            os3.platform() === "win32" ? "python.exe" : "python3.6".split(".")[0],
+            os3.platform() === "win32" ? "python.exe" : "python3",
             [
               "-u",
               url6.fileURLToPath(
@@ -5036,7 +5036,7 @@ var init_python = __esm({
                 AWS_LAMBDA_RUNTIME_API: `localhost:${server.port}/${input.workerID}`
               },
               shell: true,
-              cwd: path12.join(process.cwd(), src)
+              cwd: src
             }
           );
           proc.on("exit", () => workers.exited(input.workerID));