sst 2.0.6 → 2.0.7

package/cli/commands/dev.js

@@ -96,6 +96,9 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
             setTimeout(() => {
                 Colors.line(prefix(evt.properties.requestID), Colors.danger.bold("Error:"), Colors.danger.bold(evt.properties.errorMessage));
                 for (const line of evt.properties.trace || []) {
+                    // Skip double printing error message
+                    if (line.includes(evt.properties.errorMessage))
+                        continue;
                     Colors.line("  ", `${dim(line)}`);
                 }
                 end(evt.properties.requestID);

package/package.json

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

package/runtime/handlers/node.js

@@ -72,7 +72,10 @@ export const useNodeHandler = Context.memo(async () => {
                 return fsSync.existsSync(file);
             });
             if (!file)
-                throw new Error(`Cannot find a handler file for "${input.props.handler}"`);
+                return {
+                    type: "error",
+                    errors: [`Could not find file for handler ${input.props.handler}`],
+                };
             const nodejs = input.props.nodejs || {};
             const isESM = (nodejs.format || "esm") === "esm";
             const relative = path.relative(project.paths.root, path.resolve(parsed.dir));

package/sst.mjs

@@ -4724,9 +4724,10 @@ var init_node = __esm({
             return fsSync2.existsSync(file2);
           });
           if (!file)
-            throw new Error(
-              `Cannot find a handler file for "${input.props.handler}"`
-            );
+            return {
+              type: "error",
+              errors: [`Could not find file for handler ${input.props.handler}`]
+            };
           const nodejs = input.props.nodejs || {};
           const isESM = (nodejs.format || "esm") === "esm";
           const relative = path10.relative(
@@ -6410,6 +6411,8 @@ var dev = (program2) => program2.command(
             Colors.danger.bold(evt.properties.errorMessage)
           );
           for (const line of evt.properties.trace || []) {
+            if (line.includes(evt.properties.errorMessage))
+              continue;
             Colors.line("  ", `${dim2(line)}`);
           }
           end(evt.properties.requestID);

package/support/nodejs-runtime/index.mjs

@@ -13,8 +13,8 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
     return require.apply(this, arguments);
   throw new Error('Dynamic require of "' + x + '" is not supported');
 });
-var __commonJS = (cb, mod2) => function __require2() {
-  return mod2 || (0, cb[__getOwnPropNames(cb)[0]])((mod2 = { exports: {} }).exports, mod2), mod2.exports;
+var __commonJS = (cb, mod) => function __require2() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
@@ -24,9 +24,9 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod2, isNodeMode, target) => (target = mod2 != null ? __create(__getProtoOf(mod2)) : {}, __copyProps(
-  isNodeMode || !mod2 || !mod2.__esModule ? __defProp(target, "default", { value: mod2, enumerable: true }) : target,
-  mod2
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
 ));
 var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -7685,13 +7685,13 @@ var require_client = __commonJS({
     var EMPTY_BUF = Buffer.alloc(0);
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
-      let mod2;
+      let mod;
       try {
-        mod2 = await WebAssembly.compile(Buffer.from(require_llhttp_simd_wasm(), "base64"));
+        mod = await WebAssembly.compile(Buffer.from(require_llhttp_simd_wasm(), "base64"));
       } catch (e) {
-        mod2 = await WebAssembly.compile(Buffer.from(llhttpWasmData || require_llhttp_wasm(), "base64"));
+        mod = await WebAssembly.compile(Buffer.from(llhttpWasmData || require_llhttp_wasm(), "base64"));
       }
-      return await WebAssembly.instantiate(mod2, {
+      return await WebAssembly.instantiate(mod, {
         env: {
           wasm_on_url: (p, at, len) => {
             return 0;
@@ -14347,12 +14347,12 @@ var require_filereader = __commonJS({
         }
         return this[kEvents].loadend;
       }
-      set onloadend(fn) {
+      set onloadend(fn2) {
         if (!(this instanceof FileReader)) {
           throw new TypeError("Illegal invocation");
         }
-        if (typeof fn === "function") {
-          this[kEvents].loadend = fn;
+        if (typeof fn2 === "function") {
+          this[kEvents].loadend = fn2;
         } else {
           this[kEvents].loadend = null;
         }
@@ -14363,12 +14363,12 @@ var require_filereader = __commonJS({
         }
         return this[kEvents].error;
       }
-      set onerror(fn) {
+      set onerror(fn2) {
         if (!(this instanceof FileReader)) {
           throw new TypeError("Illegal invocation");
         }
-        if (typeof fn === "function") {
-          this[kEvents].error = fn;
+        if (typeof fn2 === "function") {
+          this[kEvents].error = fn2;
         } else {
           this[kEvents].error = null;
         }
@@ -14379,12 +14379,12 @@ var require_filereader = __commonJS({
         }
         return this[kEvents].loadstart;
       }
-      set onloadstart(fn) {
+      set onloadstart(fn2) {
         if (!(this instanceof FileReader)) {
           throw new TypeError("Illegal invocation");
         }
-        if (typeof fn === "function") {
-          this[kEvents].loadstart = fn;
+        if (typeof fn2 === "function") {
+          this[kEvents].loadstart = fn2;
         } else {
           this[kEvents].loadstart = null;
         }
@@ -14395,12 +14395,12 @@ var require_filereader = __commonJS({
         }
         return this[kEvents].progress;
       }
-      set onprogress(fn) {
+      set onprogress(fn2) {
         if (!(this instanceof FileReader)) {
           throw new TypeError("Illegal invocation");
         }
-        if (typeof fn === "function") {
-          this[kEvents].progress = fn;
+        if (typeof fn2 === "function") {
+          this[kEvents].progress = fn2;
         } else {
           this[kEvents].progress = null;
         }
@@ -14411,12 +14411,12 @@ var require_filereader = __commonJS({
         }
         return this[kEvents].load;
       }
-      set onload(fn) {
+      set onload(fn2) {
         if (!(this instanceof FileReader)) {
           throw new TypeError("Illegal invocation");
         }
-        if (typeof fn === "function") {
-          this[kEvents].load = fn;
+        if (typeof fn2 === "function") {
+          this[kEvents].load = fn2;
         } else {
           this[kEvents].load = null;
         }
@@ -14427,12 +14427,12 @@ var require_filereader = __commonJS({
         }
         return this[kEvents].abort;
       }
-      set onabort(fn) {
+      set onabort(fn2) {
         if (!(this instanceof FileReader)) {
           throw new TypeError("Illegal invocation");
         }
-        if (typeof fn === "function") {
-          this[kEvents].abort = fn;
+        if (typeof fn2 === "function") {
+          this[kEvents].abort = fn2;
         } else {
           this[kEvents].abort = null;
         }
@@ -14515,7 +14515,7 @@ var require_undici = __commonJS({
     module.exports.createRedirectInterceptor = createRedirectInterceptor;
     module.exports.buildConnector = buildConnector;
     module.exports.errors = errors;
-    function makeDispatcher(fn) {
+    function makeDispatcher(fn2) {
       return (url2, opts, handler) => {
         if (typeof opts === "function") {
           handler = opts;
@@ -14546,7 +14546,7 @@ var require_undici = __commonJS({
         if (agent) {
           throw new InvalidArgumentError("unsupported opts.agent. Did you mean opts.client?");
         }
-        return fn.call(dispatcher, {
+        return fn2.call(dispatcher, {
           ...opts,
           origin: url2.origin,
           path: url2.search ? `${url2.pathname}${url2.search}` : url2.pathname,
@@ -14602,10 +14602,17 @@ var parsed = path.parse(input.handler);
 var file = [".js", ".jsx", ".mjs", ".cjs"].map((ext) => path.join(input.out, parsed.dir, parsed.name + ext)).find((file2) => {
   return fs.existsSync(file2);
 });
-var mod;
+var fn;
 try {
   const { href } = url.pathToFileURL(file);
-  mod = await import(href);
+  const mod = await import(href);
+  const handler = parsed.ext.substring(1);
+  fn = mod[handler];
+  if (!fn) {
+    throw new Error(
+      `Function "${handler}" not found in "${input.handler}". Found ${Object.keys(mod).join(", ")}`
+    );
+  }
 } catch (ex) {
   await (0, import_undici.fetch)(`${input.url}/runtime/init/error`, {
     method: "POST",
@@ -14644,7 +14651,7 @@ while (true) {
   }
   global[Symbol.for("aws.lambda.runtime.requestId")] = context.awsRequestId;
   try {
-    response = await mod[parsed.ext.substring(1)](request, context);
+    response = await fn(request, context);
   } catch (ex) {
     await (0, import_undici.fetch)(
       `${input.url}/runtime/invocation/${context.awsRequestId}/error`,