updated dependencies

use ESM to import defineConfig

export more types for Router

README.md

@@ -513,7 +513,7 @@ functions:
       - http: ANY /visitor
 ```
 
-| 200 + 200 executions                                                                    | Time (in seconds)                        | Memory used (mb)          | CPU (core) usage           | last invoke response | info                                |
+| 200 + 200 executions                                                                    | Time (in seconds)                        | Memory used (mb)          | CPU (core) usage           | last invoke response | note                                |
 | --------------------------------------------------------------------------------------- | ---------------------------------------- | ------------------------- | -------------------------- | -------------------- | ----------------------------------- |
 | serverless-aws-lambda <br/> cmd: `serverless aws-lambda`                                | sequential: 0.644<br/> concurrent: 0.414 | idle: 125<br/> peak: 169  | idle: 0,1%<br/> peak: 15%  | Visit count 400      |                                     |
 | serverless-offline + serverless-esbuild <br/> cmd: `serverless offline --reloadHandler` | sequential: 10.4<br/> concurrent: 2.8    | idle: 110<br/> peak: 3960 | idle: 0,1%<br/> peak: 537% | Visit count 1        | most of concurrent invocations fail |

build.mjs

@@ -10,7 +10,7 @@ const compileDeclarations = () => {
     console.log(error.output?.[1]?.toString());
   }
 };
-const external = ["esbuild", "archiver", "serve-static", "@aws-sdk/eventstream-codec"];
+const external = ["esbuild", "archiver", "serve-static", "@smithy/eventstream-codec"];
 const watchPlugin = {
   name: "watch-plugin",
   setup: (build) => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-aws-lambda",
-  "version": "4.6.0",
+  "version": "4.6.1",
   "description": "AWS Application Load Balancer and API Gateway - Lambda dev tool for Serverless. Allows Express synthax in handlers. Supports packaging, local invoking and offline ALB, APG, S3, SNS, SQS, DynamoDB Stream server mocking.",
   "author": "Inqnuam",
   "license": "MIT",
@@ -58,17 +58,17 @@
     }
   },
   "dependencies": {
-    "@aws-sdk/eventstream-codec": "^3.347.0",
-    "@types/serverless": "^3.12.12",
+    "@smithy/eventstream-codec": "^2.0.2",
+    "@types/serverless": "^3.12.13",
     "archiver": "^5.3.1",
-    "esbuild": "^0.18.4",
+    "esbuild": "^0.19.0",
     "serve-static": "^1.15.0"
   },
   "devDependencies": {
     "@types/archiver": "^5.3.2",
     "@types/node": "^14.14.31",
-    "@types/serve-static": "^1.15.1",
-    "typescript": "^5.1.3"
+    "@types/serve-static": "^1.15.2",
+    "typescript": "^5.1.6"
   },
   "keywords": [
     "aws",

src/index.ts

@@ -25,6 +25,9 @@ const isLocalEnv = {
   IS_LOCAL: true,
   AWS_SAM_LOCAL: true,
 };
+const osRootPath = cwd.split(path.sep)[0];
+const NsReg = new RegExp(`^.*:${osRootPath}`);
+const isNamespacedPath = (p: string) => NsReg.test(p);
 
 interface PluginUtils {
   log: Function;
@@ -446,20 +449,31 @@ class ServerlessAwsLambda extends Daemon {
     const outputNames = Object.keys(outputs)
       .filter((x) => !x.endsWith(".map") && outputs[x].entryPoint)
       .map((x) => {
-        const element = outputs[x];
-        if (element.entryPoint) {
-          const lastPointIndex = element.entryPoint.lastIndexOf(".");
-          const entryPoint = path.join(cwd, element.entryPoint.slice(0, lastPointIndex));
-          const esOutputPath = path.join(cwd, x);
-
-          const ext = path.extname(element.entryPoint);
-
-          return {
-            esOutputPath,
-            entryPoint,
-            ext,
-          };
+        const element = outputs[x] as Metafile["outputs"]["happy typescript"] & { entryPoint: string };
+
+        let actuelEntryPoint = element.entryPoint;
+        let ext = "";
+
+        if (isNamespacedPath(actuelEntryPoint)) {
+          actuelEntryPoint = actuelEntryPoint.split(":").slice(1).join(":");
+        }
+
+        if (!path.isAbsolute(actuelEntryPoint)) {
+          actuelEntryPoint = path.resolve(actuelEntryPoint);
         }
+
+        const lastPointIndex = actuelEntryPoint.lastIndexOf(".");
+
+        if (lastPointIndex != -1) {
+          ext = path.extname(actuelEntryPoint);
+          actuelEntryPoint = actuelEntryPoint.slice(0, lastPointIndex);
+        }
+
+        return {
+          esOutputPath: path.join(cwd, x),
+          entryPoint: actuelEntryPoint,
+          ext,
+        };
       });
 
     this.#lambdas.forEach((x) => {

src/lambda/express/request.ts

@@ -1,4 +1,4 @@
-type HttpMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "HEAD" | "OPTIONS" | "ANY";
+type HttpMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "HEAD" | "OPTIONS";
 
 export interface RawAPIResponseContent {
   cookies?: string[];
@@ -13,7 +13,7 @@ export interface RawResponseContent {
   [key: string]: any;
 }
 
-interface KnownRequestProperties {
+export interface KnownRequestProperties {
   requestContext: { [key: string]: any };
   httpMethod: HttpMethod;
   queryStringParameters: { [key: string]: string };

src/lambda/express/response.ts

@@ -24,6 +24,7 @@ export interface IResponse {
   sendStatus: (code: number) => void;
   send: (content?: string | Buffer) => void;
   end: (rawContent: any) => void;
+  type(contentType: string): this;
   json: (content: Stringifiable) => void;
   set: (header: string | { [key: string]: string }, value?: string) => this;
   setHeader: (header: string | { [key: string]: string }, value?: string) => this;
@@ -218,7 +219,7 @@ export class _Response implements IResponse {
     let resContent = undefined;
     if (Array.isArray(rawContent)) {
       resContent = [...rawContent];
-    } else if (typeof rawContent == "object") {
+    } else if (rawContent && typeof rawContent == "object") {
       resContent = { ...rawContent };
     } else {
       resContent = rawContent;

src/lambda/router.ts

@@ -22,8 +22,8 @@ const getMiddleware = (controllers: (RouteController | RouteMiddleware | Functio
     return controllers[0]?.length < 4 ? controllers[0] : undefined;
   }
 };
-const { IS_LOCAL, NODE_ENV } = process.env;
-const isProd = NODE_ENV == "production";
+const { IS_LOCAL } = process.env;
+const isProd = process.env.NODE_ENV == "production";
 
 class Route extends Function {
   controllers: (RouteController | RouteMiddleware | Function)[] = [];

src/lib/esbuild/knownCjs.ts

@@ -7,6 +7,7 @@ export const knownCjs: string[] = [
   "@middy/*",
   "@hapi/joi",
   "@opensearch-project/opensearch",
+  "@smithy/*",
   "axios",
   "axios-retry",
   "axios-cache-interceptor",

src/lib/esbuild/mergeEsbuildConfig.ts

@@ -2,7 +2,7 @@ import type { BuildOptions } from "esbuild";
 
 export const mergeEsbuildConfig = (esBuildConfig: BuildOptions, customEsBuildConfig: BuildOptions) => {
   if (Array.isArray(customEsBuildConfig.plugins)) {
-    esBuildConfig.plugins!.push(...customEsBuildConfig.plugins);
+    esBuildConfig.plugins!.unshift(...customEsBuildConfig.plugins);
   }
 
   if (Array.isArray(customEsBuildConfig.external)) {
@@ -203,5 +203,13 @@ export const mergeEsbuildConfig = (esBuildConfig: BuildOptions, customEsBuildCon
     esBuildConfig.packages = customEsBuildConfig.packages;
   }
 
+  if (customEsBuildConfig.logOverride && typeof customEsBuildConfig.logOverride == "object") {
+    if (esBuildConfig.logOverride) {
+      esBuildConfig.logOverride = { ...esBuildConfig.logOverride, ...customEsBuildConfig.logOverride };
+    } else {
+      esBuildConfig.logOverride = customEsBuildConfig.logOverride;
+    }
+  }
+
   return esBuildConfig;
 };

src/lib/esbuild/parseCustomEsbuild.ts

@@ -198,5 +198,8 @@ export const parseCustomEsbuild = (customConfig: BuildOptions) => {
     customEsBuild.packages = customConfig.packages;
   }
 
+  if (customConfig.logOverride && typeof customConfig.logOverride == "object") {
+    customEsBuild.logOverride = customConfig.logOverride;
+  }
   return customEsBuild;
 };

src/lib/utils/readDefineConfig.ts

@@ -1,50 +1,36 @@
 import path from "path";
 import { log } from "./colorize";
 import esbuild from "esbuild";
-import { createRequire } from "node:module";
-import vm from "vm";
-import { fileURLToPath, pathToFileURL } from "url";
+import { rm } from "fs/promises";
 
 const jsExt = ["js", "mjs", "cjs", "ts", "cts", "mts"];
 
 const readFromPath = async (sourcefile: string) => {
-  const { href } = pathToFileURL(sourcefile);
-  const filename = fileURLToPath(href);
-  const exports = {};
-  const context = {
-    require: createRequire(href),
-    exports,
-    module: {
-      exports,
-    },
-    __filename: filename,
-    __dirname: path.dirname(filename),
-  };
-  const tt = await esbuild.build({
-    write: false,
+  const dir = path.dirname(sourcefile);
+  const fname = path.basename(sourcefile, path.extname(sourcefile));
+  const outfile = `${dir}/__${fname}.mjs`;
+
+  await esbuild.build({
+    outfile,
     entryPoints: [sourcefile],
     bundle: true,
     packages: "external",
     platform: "node",
-    format: "cjs",
+    format: "esm",
     target: "ES2018",
-    // supported: {
-    //   "top-level-await": true, // TODO: esbuild ask for cjs + top-level-await support
-    // },
     banner: {
-      js: `async (${Object.keys(context).join(",")})=>{`,
+      js: `import { createRequire } from 'module';const require = createRequire(import.meta.url);const __filename = "${outfile}";const __dirname = "${dir}";`,
     },
-    footer: {
-      js: "\nreturn module}",
-    },
-  });
-  const fn = vm.runInThisContext(tt.outputFiles[0].text, {
-    filename: sourcefile,
   });
 
-  const res = await fn(...Object.values(context));
-
-  return res.exports;
+  try {
+    const config = await import(outfile);
+    return config;
+  } catch (error) {
+    throw error;
+  } finally {
+    await rm(outfile);
+  }
 };
 
 export const readDefineConfig = async (config: string) => {

src/plugins/lambda/streamEncoder.ts

@@ -1,7 +1,7 @@
 import type { ServerResponse } from "http";
-import { EventStreamCodec } from "@aws-sdk/eventstream-codec";
+import { EventStreamCodec } from "@smithy/eventstream-codec";
 
-import type { MessageHeaders } from "@aws-sdk/eventstream-codec";
+import type { MessageHeaders } from "@smithy/eventstream-codec";
 import { CommonEventGenerator } from "./events/common";
 
 interface ErrorMessage {