sst 2.0.23 → 2.0.25

package/cli/commands/dev.js

@@ -57,7 +57,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
             pending.delete(requestID);
         }
         bus.subscribe("function.invoked", async (evt) => {
-            Colors.line(prefix(evt.properties.requestID), Colors.dim.bold("Invoked"), Colors.dim(useFunctions().fromID(evt.properties.functionID).handler));
+            Colors.line(prefix(evt.properties.requestID), Colors.dim.bold("Invoked"), Colors.dim(useFunctions().fromID(evt.properties.functionID)?.handler));
         });
         bus.subscribe("worker.stdout", async (evt) => {
             prefix(evt.properties.requestID);

package/cli/telemetry/post-payload.js

@@ -1,18 +1,23 @@
 import https from "https";
 export function postPayload(endpoint, body) {
     return new Promise((resolve, reject) => {
-        const req = https.request(endpoint, {
-            method: "POST",
-            headers: { "content-type": "application/json" },
-            timeout: 5000,
-        }, (resp) => {
-            if (resp.statusCode !== 200) {
-                reject(new Error(`Unexpected status code: ${resp.statusCode}`));
-                return;
-            }
+        try {
+            const req = https.request(endpoint, {
+                method: "POST",
+                headers: { "content-type": "application/json" },
+                timeout: 5000,
+            }, (resp) => {
+                if (resp.statusCode !== 200) {
+                    reject(new Error(`Unexpected status code: ${resp.statusCode}`));
+                    return;
+                }
+                resolve();
+            });
+            req.write(JSON.stringify(body));
+            req.end();
+        }
+        catch {
             resolve();
-        });
-        req.write(JSON.stringify(body));
-        req.end();
+        }
     });
 }

package/constructs/Function.d.ts

@@ -33,6 +33,7 @@ declare const supportedRuntimes: {
     java8: cdk.aws_lambda.Runtime;
     java11: cdk.aws_lambda.Runtime;
     "go1.x": cdk.aws_lambda.Runtime;
+    go: cdk.aws_lambda.Runtime;
 };
 export type Runtime = keyof typeof supportedRuntimes;
 export type FunctionInlineDefinition = string | Function;

package/constructs/Function.js

@@ -19,6 +19,7 @@ import { useDeferredTasks } from "./deferred_task.js";
 import { useProject } from "../project.js";
 import { useRuntimeHandlers } from "../runtime/handlers.js";
 import { createAppContext } from "./context.js";
+import { useWarning } from "./util/warning.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 const supportedRuntimes = {
     rust: lambda.Runtime.PROVIDED_AL2,
@@ -43,7 +44,8 @@ const supportedRuntimes = {
     dotnet6: lambda.Runtime.DOTNET_6,
     java8: lambda.Runtime.JAVA_8,
     java11: lambda.Runtime.JAVA_11,
-    "go1.x": lambda.Runtime.GO_1_X,
+    "go1.x": lambda.Runtime.PROVIDED_AL2,
+    go: lambda.Runtime.PROVIDED_AL2,
 };
 /**
  * The `Function` construct is a higher level CDK construct that makes it easy to create a Lambda Function with support for Live Lambda Development.
@@ -77,6 +79,8 @@ export class Function extends lambda.Function {
             props = Function.mergeProps(per, props);
         });
         props.runtime = props.runtime || "nodejs16.x";
+        if (props.runtime === "go1.x")
+            useWarning().add("go.deprecated");
         // Set defaults
         const functionName = props.functionName &&
             (typeof props.functionName === "string"

package/constructs/util/warning.d.ts

@@ -1,6 +1,7 @@
 declare const WARNINGS: {
     "config.deprecated": string;
     "permissions.noConstructs": string;
+    "go.deprecated": string;
 };
 export declare const useWarning: () => {
     add(message: keyof typeof WARNINGS): void;

package/constructs/util/warning.js

@@ -2,6 +2,7 @@ import { createAppContext } from "../context.js";
 const WARNINGS = {
     "config.deprecated": `WARNING: The "config" prop is deprecated, and will be removed in SST v2. Pass Parameters and Secrets in through the "bind" prop. Read more about how to upgrade here — https://docs.serverless-stack.com/upgrade-guide#upgrade-to-v116`,
     "permissions.noConstructs": `WARNING: Passing SST constructs into "permissions" is deprecated, and will be removed in SST v2. Pass them into the "bind" prop. Read more about how to upgrade here — https://docs.serverless-stack.com/upgrade-guide#upgrade-to-v116`,
+    "go.deprecated": `WARNING: The "go1.x" runtime is deprecated and replaced by the "go" runtime`,
 };
 export const useWarning = createAppContext(() => {
     const set = new Set();

package/credentials.js

@@ -24,8 +24,10 @@ export const useAWSCredentialsProvider = Context.memo(() => {
                         resolve(input.trim());
                         rl.close();
                     }
-                    // prompt again if no input
-                    prompt();
+                    else {
+                        // prompt again if no input
+                        prompt();
+                    }
                 });
                 prompt();
             });

package/package.json

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

package/runtime/handlers/go.js

@@ -15,7 +15,7 @@ export const useGoHandler = Context.memo(async () => {
     const handlers = useRuntimeHandlers();
     const processes = new Map();
     const sources = new Map();
-    const handlerName = process.platform === "win32" ? `handler.exe` : `handler`;
+    const handlerName = process.platform === "win32" ? `bootstrap.exe` : `bootstrap`;
     handlers.register({
         shouldBuild: (input) => {
             const parent = sources.get(input.functionID);
@@ -71,13 +71,13 @@ export const useGoHandler = Context.memo(async () => {
             }
             if (input.mode === "deploy") {
                 try {
-                    const target = path.join(input.out, "handler");
-                    const result = await execAsync(`go build -ldflags '-s -w' -o ${target} ./${src}`, {
+                    const target = path.join(input.out, "bootstrap");
+                    await execAsync(`go build -ldflags '-s -w' -o ${target} ./${src}`, {
                         cwd: project,
                         env: {
                             ...process.env,
                             CGO_ENABLED: "0",
-                            GOARCH: "amd64",
+                            GOARCH: input.props.architecture === "arm_64" ? "arm64" : "amd64",
                             GOOS: "linux",
                         },
                     });
@@ -88,7 +88,7 @@ export const useGoHandler = Context.memo(async () => {
             }
             return {
                 type: "success",
-                handler: "handler",
+                handler: "bootstrap",
             };
         },
     });

package/runtime/handlers/node.js

@@ -104,6 +104,7 @@ export const useNodeHandler = Context.memo(async () => {
                     ...(nodejs.install || []),
                     ...(external || []),
                 ],
+                loader: nodejs.loader,
                 keepNames: true,
                 bundle: true,
                 logLevel: "silent",

package/runtime/handlers/python.js

@@ -5,7 +5,7 @@ import { Context } from "../../context/context.js";
 import { exec, spawn } from "child_process";
 import { promisify } from "util";
 import { useRuntimeServerConfig } from "../server.js";
-import { findAbove, isChild } from "../../util/fs.js";
+import { existsAsync, findAbove, isChild } from "../../util/fs.js";
 import { Runtime } from "aws-cdk-lib/aws-lambda";
 import fs from "fs/promises";
 const execAsync = promisify(exec);
@@ -24,6 +24,14 @@ export const usePythonHandler = Context.memo(async () => {
     const handlers = useRuntimeHandlers();
     const processes = new Map();
     const sources = new Map();
+    async function findSrc(input) {
+        const hints = ["requirements.txt", "Pipfile", "poetry.lock"];
+        for (const hint of hints) {
+            const result = await findAbove(input, hint);
+            if (result)
+                return result;
+        }
+    }
     handlers.register({
         shouldBuild: (input) => {
             const parent = sources.get(input.functionID);
@@ -33,7 +41,9 @@ export const usePythonHandler = Context.memo(async () => {
         },
         canHandle: (input) => input.startsWith("python"),
         startWorker: async (input) => {
-            const src = await findAbove(input.handler, "requirements.txt");
+            const src = await findSrc(input.handler);
+            if (!src)
+                throw new Error(`Could not find src for ${input.handler}`);
             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", [
@@ -75,7 +85,21 @@ export const usePythonHandler = Context.memo(async () => {
                     type: "success",
                     handler: input.props.handler,
                 };
-            const src = await findAbove(input.props.handler, "requirements.txt");
+            const src = await findSrc(input.props.handler);
+            if (!src)
+                return {
+                    type: "error",
+                    errors: [`Could not find src for ${input.props.handler}`],
+                };
+            if (await existsAsync(path.join(src, "Pipfile"))) {
+                await execAsync("pipenv requirements > requirements.txt");
+            }
+            if (await existsAsync(path.join(src, "poetry.lock"))) {
+                await execAsync("poetry export --with-credentials --format requirements.txt --output requirements.txt");
+            }
+            if (await existsAsync(path.join(src, "requirements.txt"))) {
+                await execAsync("pip install -r requirements.txt");
+            }
             await fs.cp(src, input.out, {
                 recursive: true,
                 filter: (src) => !src.includes(".sst"),

package/sst.mjs

@@ -455,23 +455,27 @@ var init_project = __esm({
 import https from "https";
 function postPayload(endpoint, body) {
   return new Promise((resolve, reject) => {
-    const req = https.request(
-      endpoint,
-      {
-        method: "POST",
-        headers: { "content-type": "application/json" },
-        timeout: 5e3
-      },
-      (resp) => {
-        if (resp.statusCode !== 200) {
-          reject(new Error(`Unexpected status code: ${resp.statusCode}`));
-          return;
+    try {
+      const req = https.request(
+        endpoint,
+        {
+          method: "POST",
+          headers: { "content-type": "application/json" },
+          timeout: 5e3
+        },
+        (resp) => {
+          if (resp.statusCode !== 200) {
+            reject(new Error(`Unexpected status code: ${resp.statusCode}`));
+            return;
+          }
+          resolve();
         }
-        resolve();
-      }
-    );
-    req.write(JSON.stringify(body));
-    req.end();
+      );
+      req.write(JSON.stringify(body));
+      req.end();
+    } catch {
+      resolve();
+    }
   });
 }
 var init_post_payload = __esm({
@@ -1550,8 +1554,9 @@ var init_credentials = __esm({
               if (input.trim() !== "") {
                 resolve(input.trim());
                 rl.close();
+              } else {
+                prompt();
               }
-              prompt();
             });
             prompt();
           });
@@ -4844,6 +4849,7 @@ var init_node = __esm({
               ...nodejs.install || [],
               ...external || []
             ],
+            loader: nodejs.loader,
             keepNames: true,
             bundle: true,
             logLevel: "silent",
@@ -4971,7 +4977,7 @@ var init_go = __esm({
       const handlers = useRuntimeHandlers();
       const processes = /* @__PURE__ */ new Map();
       const sources = /* @__PURE__ */ new Map();
-      const handlerName = process.platform === "win32" ? `handler.exe` : `handler`;
+      const handlerName = process.platform === "win32" ? `bootstrap.exe` : `bootstrap`;
       handlers.register({
         shouldBuild: (input) => {
           const parent = sources.get(input.functionID);
@@ -5029,26 +5035,23 @@ var init_go = __esm({
           }
           if (input.mode === "deploy") {
             try {
-              const target = path11.join(input.out, "handler");
-              const result = await execAsync2(
-                `go build -ldflags '-s -w' -o ${target} ./${src}`,
-                {
-                  cwd: project,
-                  env: {
-                    ...process.env,
-                    CGO_ENABLED: "0",
-                    GOARCH: "amd64",
-                    GOOS: "linux"
-                  }
+              const target = path11.join(input.out, "bootstrap");
+              await execAsync2(`go build -ldflags '-s -w' -o ${target} ./${src}`, {
+                cwd: project,
+                env: {
+                  ...process.env,
+                  CGO_ENABLED: "0",
+                  GOARCH: input.props.architecture === "arm_64" ? "arm64" : "amd64",
+                  GOOS: "linux"
                 }
-              );
+              });
             } catch {
               throw new VisibleError("Failed to build");
             }
           }
           return {
             type: "success",
-            handler: "handler"
+            handler: "bootstrap"
           };
         }
       });
@@ -5203,6 +5206,14 @@ var init_python = __esm({
       const handlers = useRuntimeHandlers();
       const processes = /* @__PURE__ */ new Map();
       const sources = /* @__PURE__ */ new Map();
+      async function findSrc(input) {
+        const hints = ["requirements.txt", "Pipfile", "poetry.lock"];
+        for (const hint of hints) {
+          const result = await findAbove(input, hint);
+          if (result)
+            return result;
+        }
+      }
       handlers.register({
         shouldBuild: (input) => {
           const parent = sources.get(input.functionID);
@@ -5212,7 +5223,9 @@ var init_python = __esm({
         },
         canHandle: (input) => input.startsWith("python"),
         startWorker: async (input) => {
-          const src = await findAbove(input.handler, "requirements.txt");
+          const src = await findSrc(input.handler);
+          if (!src)
+            throw new Error(`Could not find src for ${input.handler}`);
           const parsed = path13.parse(path13.relative(src, input.handler));
           const target = [...parsed.dir.split(path13.sep), parsed.name].join(".");
           const proc = spawn5(
@@ -5260,7 +5273,23 @@ var init_python = __esm({
               type: "success",
               handler: input.props.handler
             };
-          const src = await findAbove(input.props.handler, "requirements.txt");
+          const src = await findSrc(input.props.handler);
+          if (!src)
+            return {
+              type: "error",
+              errors: [`Could not find src for ${input.props.handler}`]
+            };
+          if (await existsAsync(path13.join(src, "Pipfile"))) {
+            await execAsync4("pipenv requirements > requirements.txt");
+          }
+          if (await existsAsync(path13.join(src, "poetry.lock"))) {
+            await execAsync4(
+              "poetry export --with-credentials --format requirements.txt --output requirements.txt"
+            );
+          }
+          if (await existsAsync(path13.join(src, "requirements.txt"))) {
+            await execAsync4("pip install -r requirements.txt");
+          }
           await fs13.cp(src, input.out, {
             recursive: true,
             filter: (src2) => !src2.includes(".sst")
@@ -6566,7 +6595,7 @@ var dev = (program2) => program2.command(
           prefix(evt.properties.requestID),
           Colors2.dim.bold("Invoked"),
           Colors2.dim(
-            useFunctions3().fromID(evt.properties.functionID).handler
+            useFunctions3().fromID(evt.properties.functionID)?.handler
           )
         );
       });