sst 2.22.5 → 2.22.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.22.5",
+  "version": "2.22.6",
   "bin": {
     "sst": "cli/sst.js"
   },

package/runtime/handlers/node.js

@@ -1,3 +1,4 @@
+import os from "os";
 import path from "path";
 import fs from "fs/promises";
 import { exec } from "child_process";
@@ -11,12 +12,13 @@ import { useRuntimeWorkers } from "../workers.js";
 import { Context } from "../../context/context.js";
 import { VisibleError } from "../../error.js";
 import { Colors } from "../../cli/colors.js";
+import { Logger } from "../../logger.js";
 export const useNodeHandler = Context.memo(async () => {
     const workers = await useRuntimeWorkers();
     const handlers = useRuntimeHandlers();
-    const cache = {};
+    const rebuildCache = {};
     process.on("exit", () => {
-        for (const { ctx } of Object.values(cache)) {
+        for (const { ctx } of Object.values(rebuildCache)) {
             ctx.dispose();
         }
     });
@@ -24,14 +26,14 @@ export const useNodeHandler = Context.memo(async () => {
     const threads = new Map();
     handlers.register({
         shouldBuild: (input) => {
-            const result = cache[input.functionID];
-            if (!result)
+            const cache = rebuildCache[input.functionID];
+            if (!cache)
                 return false;
             const relative = path
                 .relative(project.paths.root, input.file)
                 .split(path.sep)
                 .join(path.posix.sep);
-            return Boolean(result.last.metafile?.inputs[relative]);
+            return Boolean(cache.result.metafile?.inputs[relative]);
         },
         canHandle: (input) => input.startsWith("nodejs"),
         startWorker: async (input) => {
@@ -62,7 +64,6 @@ export const useNodeHandler = Context.memo(async () => {
             await worker?.terminate();
         },
         build: async (input) => {
-            const exists = cache[input.functionID];
             const parsed = path.parse(input.props.handler);
             const file = [
                 ".ts",
@@ -94,11 +95,13 @@ export const useNodeHandler = Context.memo(async () => {
                 .relative(input.out, target.replace(extension, parsed.ext))
                 .split(path.sep)
                 .join(path.posix.sep);
+            // Rebuilt using existing esbuild context
+            const exists = rebuildCache[input.functionID];
             if (exists) {
                 const result = await exists.ctx.rebuild();
-                cache[input.functionID] = {
+                rebuildCache[input.functionID] = {
                     ctx: exists.ctx,
-                    last: result,
+                    result,
                 };
                 return {
                     type: "success",
@@ -211,10 +214,11 @@ export const useNodeHandler = Context.memo(async () => {
                     }
                     catch { }
                 }
-                cache[input.functionID] = {
-                    ctx,
-                    last: result,
-                };
+                // Cache esbuild result and context for rebuild
+                if (input.mode === "start") {
+                    rebuildCache[input.functionID] = { ctx, result };
+                }
+                logMemoryUsage(input.functionID, input.props.handler);
                 return {
                     type: "success",
                     handler,
@@ -240,3 +244,18 @@ export const useNodeHandler = Context.memo(async () => {
         },
     });
 });
+function logMemoryUsage(functionID, handler) {
+    const printInMB = (bytes) => `${Math.round(bytes / 1024 / 1024)} MB`;
+    const used = process.memoryUsage();
+    for (const key in used) {
+        // @ts-ignore
+        used[key] = printInMB(used[key]);
+    }
+    Logger.debug({
+        functionID,
+        handler,
+        freeMemory: printInMB(os.freemem()),
+        totalMemory: printInMB(os.totalmem()),
+        ...used,
+    });
+}

package/sst.mjs

@@ -5336,6 +5336,7 @@ var node_exports = {};
 __export(node_exports, {
   useNodeHandler: () => useNodeHandler
 });
+import os4 from "os";
 import path10 from "path";
 import fs9 from "fs/promises";
 import { exec as exec2 } from "child_process";
@@ -5343,6 +5344,20 @@ import fsSync2 from "fs";
 import esbuild2 from "esbuild";
 import url4 from "url";
 import { Worker } from "worker_threads";
+function logMemoryUsage(functionID, handler) {
+  const printInMB = (bytes) => `${Math.round(bytes / 1024 / 1024)} MB`;
+  const used = process.memoryUsage();
+  for (const key in used) {
+    used[key] = printInMB(used[key]);
+  }
+  Logger.debug({
+    functionID,
+    handler,
+    freeMemory: printInMB(os4.freemem()),
+    totalMemory: printInMB(os4.totalmem()),
+    ...used
+  });
+}
 var useNodeHandler;
 var init_node = __esm({
   "src/runtime/handlers/node.ts"() {
@@ -5353,12 +5368,13 @@ var init_node = __esm({
     init_context();
     init_error();
     init_colors();
+    init_logger();
     useNodeHandler = Context.memo(async () => {
       const workers = await useRuntimeWorkers();
       const handlers = useRuntimeHandlers();
-      const cache = {};
+      const rebuildCache = {};
       process.on("exit", () => {
-        for (const { ctx } of Object.values(cache)) {
+        for (const { ctx } of Object.values(rebuildCache)) {
           ctx.dispose();
         }
       });
@@ -5366,11 +5382,11 @@ var init_node = __esm({
       const threads = /* @__PURE__ */ new Map();
       handlers.register({
         shouldBuild: (input) => {
-          const result = cache[input.functionID];
-          if (!result)
+          const cache = rebuildCache[input.functionID];
+          if (!cache)
             return false;
           const relative = path10.relative(project.paths.root, input.file).split(path10.sep).join(path10.posix.sep);
-          return Boolean(result.last.metafile?.inputs[relative]);
+          return Boolean(cache.result.metafile?.inputs[relative]);
         },
         canHandle: (input) => input.startsWith("nodejs"),
         startWorker: async (input) => {
@@ -5406,7 +5422,6 @@ var init_node = __esm({
           await worker?.terminate();
         },
         build: async (input) => {
-          const exists = cache[input.functionID];
           const parsed = path10.parse(input.props.handler);
           const file = [
             ".ts",
@@ -5438,11 +5453,12 @@ var init_node = __esm({
             parsed.name + extension
           );
           const handler = path10.relative(input.out, target.replace(extension, parsed.ext)).split(path10.sep).join(path10.posix.sep);
+          const exists = rebuildCache[input.functionID];
           if (exists) {
             const result = await exists.ctx.rebuild();
-            cache[input.functionID] = {
+            rebuildCache[input.functionID] = {
               ctx: exists.ctx,
-              last: result
+              result
             };
             return {
               type: "success",
@@ -5562,10 +5578,10 @@ var init_node = __esm({
               } catch {
               }
             }
-            cache[input.functionID] = {
-              ctx,
-              last: result
-            };
+            if (input.mode === "start") {
+              rebuildCache[input.functionID] = { ctx, result };
+            }
+            logMemoryUsage(input.functionID, input.props.handler);
             return {
               type: "success",
               handler
@@ -5600,7 +5616,7 @@ __export(go_exports, {
 });
 import path11 from "path";
 import fs10 from "fs/promises";
-import os4 from "os";
+import os5 from "os";
 import { spawn as spawn2 } from "child_process";
 async function find(dir, target) {
   if (dir === "/")
@@ -5671,7 +5687,7 @@ var init_go = __esm({
           if (input.mode === "start") {
             try {
               const target = path11.join(input.out, handlerName);
-              const srcPath = os4.platform() === "win32" ? src.replaceAll("\\", "\\\\") : src;
+              const srcPath = os5.platform() === "win32" ? src.replaceAll("\\", "\\\\") : src;
               const result = await execAsync(
                 [
                   "go",
@@ -5698,7 +5714,7 @@ var init_go = __esm({
           if (input.mode === "deploy") {
             try {
               const target = path11.join(input.out, "bootstrap");
-              const srcPath = os4.platform() === "win32" ? src.replaceAll("\\", "\\\\") : src;
+              const srcPath = os5.platform() === "win32" ? src.replaceAll("\\", "\\\\") : src;
               await execAsync(
                 [
                   "go",
@@ -6208,7 +6224,7 @@ import path14 from "path";
 import { exec as exec5, spawn as spawn5 } from "child_process";
 import { promisify as promisify3 } from "util";
 import { Runtime } from "aws-cdk-lib/aws-lambda";
-import os5 from "os";
+import os6 from "os";
 import url6 from "url";
 var execAsync3, RUNTIME_MAP, usePythonHandler;
 var init_python = __esm({
@@ -6258,7 +6274,7 @@ var init_python = __esm({
           const parsed = path14.parse(path14.relative(src, input.handler));
           const target = [...parsed.dir.split(path14.sep), parsed.name].join(".");
           const proc = spawn5(
-            os5.platform() === "win32" ? "python.exe" : "python3",
+            os6.platform() === "win32" ? "python.exe" : "python3",
             [
               "-u",
               url6.fileURLToPath(
@@ -6333,7 +6349,7 @@ __export(java_exports, {
 });
 import path15 from "path";
 import fs13 from "fs/promises";
-import os6 from "os";
+import os7 from "os";
 import { spawn as spawn6 } from "child_process";
 import url7 from "url";
 import AdmZip from "adm-zip";
@@ -6378,7 +6394,7 @@ var init_java = __esm({
                 url7.fileURLToPath(
                   new URL("../../support/java-runtime/release/*", import.meta.url)
                 )
-              ].join(os6.platform() === "win32" ? ";" : ":"),
+              ].join(os7.platform() === "win32" ? ";" : ":"),
               "com.amazonaws.services.lambda.runtime.api.client.AWSLambda",
               input.handler
             ],