sst 2.38.4 → 2.38.5

package/cli/commands/bind.js

@@ -21,7 +21,7 @@ export const bind = (program) => program
     const { useProject } = await import("../../project.js");
     const { Stacks } = await import("../../stacks/index.js");
     const { useBus } = await import("../../bus.js");
-    const { useIOT } = await import("../../iot.js");
+    const { useIOT, isSupported } = await import("../../iot.js");
     const { Colors } = await import("../colors.js");
     const { Logger } = await import("../../logger.js");
     const [{ useServices }, { useSites: useSsrSites }, { useSites: useStaticSites }, { useSites: useSlsNextjsSites }, { Parameter }, { getEnvironmentKey },] = await Promise.all([
@@ -42,7 +42,9 @@ export const bind = (program) => program
         if (!command) {
             throw new VisibleError("Command is required, e.g. sst bind npm run script");
         }
-        useIOT();
+        if (isSupported()) {
+            useIOT();
+        }
         const bus = useBus();
         const project = useProject();
         let p;

package/cli/commands/dev.js

@@ -1,3 +1,4 @@
+import { VisibleError } from "../../error.js";
 export const dev = (program) => program.command(["dev", "start"], "Work on your app locally", (yargs) => yargs.option("increase-timeout", {
     type: "boolean",
     description: "Increase function timeout",
@@ -20,11 +21,15 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     const { getCiInfo } = await import("../ci-info.js");
     const { useMetadataCache } = await import("../../stacks/metadata.js");
     const { lazy } = await import("../../util/lazy.js");
+    const { useIOT, isSupported } = await import("../../iot.js");
     try {
         if (args._[0] === "start") {
             console.log(yellow(`Warning: ${bold(`sst start`)} has been renamed to ${bold(`sst dev`)}`));
         }
         const project = useProject();
+        if (!isSupported()) {
+            throw new VisibleError(`Live Lambda is not currently supported in the "${project.config.region}" region. To fix this, you can pick an alternative region just for your local environment - https://docs.sst.dev/live-lambda-development#supported-regions`);
+        }
         const useFunctionLogger = lazy(async () => {
             const { useFunctions } = await import("../../constructs/Function.js");
             const bus = useBus();
@@ -296,7 +301,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         });
         const useDisconnector = lazy(async () => {
             const bus = useBus();
-            const iot = await import("../../iot.js").then((mod) => mod.useIOT());
+            const iot = await useIOT();
             bus.subscribe("cli.dev", async (evt) => {
                 const topic = `${iot.prefix}/events`;
                 iot.publish(topic, "cli.dev", evt.properties);

package/constructs/Function.js

@@ -151,6 +151,7 @@ export class Function extends CDKFunction {
                 ...props,
                 ...(props.runtime === "container"
                     ? {
+                        description: "SST Live Lambda handler",
                         code: Code.fromAssetImage(path.resolve(__dirname, "../support/bridge"), {
                             ...(architecture?.dockerPlatform
                                 ? { platform: Platform.custom(architecture.dockerPlatform) }
@@ -161,9 +162,10 @@ export class Function extends CDKFunction {
                         layers: undefined,
                     }
                     : {
+                        description: "SST Live Lambda handler",
                         runtime: CDKRuntime.NODEJS_18_X,
                         code: Code.fromAsset(path.resolve(__dirname, "../support/bridge")),
-                        handler: "bridge.handler",
+                        handler: "live-lambda.handler",
                         layers: [],
                     }),
                 architecture,

package/credentials.js

@@ -53,10 +53,22 @@ export function useAWSClient(client, force = false) {
     const [project, credentials] = [useProject(), useAWSCredentialsProvider()];
     const printNoInternet = (() => {
         let lastPrinted = 0;
-        return () => {
+        return (message) => {
+            const isIotUnreachable = message.includes(`iot.${project.config.region}.amazonaws.com`);
             const now = Date.now();
             if (now - lastPrinted > 5000) {
-                console.log("Waiting for internet connection...");
+                if (isIotUnreachable) {
+                    console.log("\nConnecting to Live Lambda...");
+                    if (lastPrinted === 0) {
+                        console.log("");
+                        console.log("Connecting to Live Lambda is taking long:");
+                        console.log("  - Check if your machine is able to connect to AWS.");
+                        console.log("  - Or, if you're connecting to a new AWS account for the first time, give it 10 minutes.");
+                    }
+                }
+                else {
+                    console.log("\nWaiting for internet connection...");
+                }
                 lastPrinted = now;
             }
         };
@@ -68,7 +80,7 @@ export function useAWSClient(client, force = false) {
             retryDecider: (e) => {
                 // Handle no internet connection => retry
                 if (e.code === "ENOTFOUND") {
-                    printNoInternet();
+                    printNoInternet(e.message);
                     return true;
                 }
                 // Handle throttling errors => retry

package/iot.d.ts

@@ -4,3 +4,4 @@ export declare const useIOT: () => Promise<{
     prefix: string;
     publish<Type extends keyof Events>(topic: string, type: Type, properties: Events[Type]): Promise<void>;
 }>;
+export declare const isSupported: () => boolean;

package/iot.js

@@ -161,3 +161,28 @@ export const useIOT = lazy(async () => {
         },
     };
 });
+export const isSupported = () => [
+    "eu-central-1",
+    "eu-west-1",
+    "eu-west-2",
+    "eu-west-3",
+    "eu-north-1",
+    "ap-south-1",
+    "ap-northeast-2",
+    "ap-northeast-1",
+    "me-south-1",
+    "me-central-1",
+    "sa-east-1",
+    "ca-central-1",
+    "ap-east-1",
+    "ap-southeast-1",
+    "ap-southeast-2",
+    "us-east-1",
+    "us-east-2",
+    "us-west-1",
+    "us-west-2",
+    "us-gov-east-1",
+    "us-gov-west-1",
+    "cn-north-1",
+    "cn-northwest-1",
+].includes(useProject().config.region);

package/package.json

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

package/runtime/handlers/container.js

@@ -1,3 +1,5 @@
+import process from "process";
+import { release, networkInterfaces } from "os";
 import http from "http";
 import { spawn } from "child_process";
 import { useRuntimeWorkers } from "../workers.js";
@@ -50,10 +52,11 @@ export const useContainerHandler = () => {
         const server = await useRuntimeServerConfig();
         const workers = await useRuntimeWorkers();
         const fn = useFunctions().fromID(input.functionID);
+        const host = isWSL() ? getInternalHost() : "host.docker.internal";
         dockerRun(input, {
             cmd: fn?.container?.cmd,
             envs: {
-                AWS_LAMBDA_RUNTIME_API: `host.docker.internal:${server.port}/${input.workerID}`,
+                AWS_LAMBDA_RUNTIME_API: `${host}:${server.port}/${input.workerID}`,
             },
         }, () => {
             workers.exited(input.workerID);
@@ -261,3 +264,12 @@ export const useContainerHandler = () => {
         },
     };
 };
+function isWSL() {
+    return (process.platform == "linux" && release().toLowerCase().includes("microsoft"));
+}
+function getInternalHost() {
+    const host = []
+        .concat(...Object.values(networkInterfaces()))
+        .find((x) => !x?.internal && x?.family === "IPv4")?.address;
+    return host ?? "host.docker.internal";
+}

package/runtime/handlers/node.js

@@ -87,7 +87,9 @@ export const useNodeHandler = () => {
             const extension = isESM ? ".mjs" : ".cjs";
             const target = path.join(input.out, !relative.startsWith("..") && !path.isAbsolute(input.props.handler)
                 ? relative
-                : "", parsed.name + extension);
+                : "", 
+            // Lambda handler can only contain 1 dot separating the file name and function name
+            parsed.name.replace(".", "-") + extension);
             const handler = path
                 .relative(input.out, target.replace(extension, parsed.ext))
                 .split(path.sep)

package/support/bridge/Dockerfile

@@ -1,3 +1,3 @@
 FROM public.ecr.aws/lambda/nodejs:18
-COPY bridge.mjs ${LAMBDA_TASK_ROOT}
-CMD ["bridge.handler"]
+COPY live-lambda.mjs ${LAMBDA_TASK_ROOT}
+CMD ["live-lambda.handler"]

package/util/wsl.d.ts

@@ -0,0 +1,2 @@
+export declare const isWSL: () => boolean;
+export declare const getInternalHost: () => string | undefined;

package/util/wsl.js

@@ -0,0 +1,10 @@
+import process from "process";
+import { release, networkInterfaces } from "os";
+export const isWSL = () => {
+    return (process.platform == "linux" && release().toLowerCase().includes("microsoft"));
+};
+export const getInternalHost = () => {
+    return []
+        .concat(...Object.values(networkInterfaces()))
+        .find((x) => !x?.internal && x?.family === "IPv4")?.address;
+};