@middy/core 2.5.1 → 3.0.0-alpha.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2021 Luciano Mammino, will Farrell and the [Middy team](https://github.com/middyjs/middy/graphs/contributors)
+Copyright (c) 2017-2022 Luciano Mammino, will Farrell and the [Middy team](https://github.com/middyjs/middy/graphs/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -47,7 +47,7 @@ Everyone is very welcome to contribute to this repository. Feel free to [raise i
 
 ## License
 
-Licensed under [MIT License](LICENSE). Copyright (c) 2017-2021 Luciano Mammino, will Farrell, and the [Middy team](https://github.com/middyjs/middy/graphs/contributors).
+Licensed under [MIT License](LICENSE). Copyright (c) 2017-2022 Luciano Mammino, will Farrell, and the [Middy team](https://github.com/middyjs/middy/graphs/contributors).
 
 <a href="https://app.fossa.io/projects/git%2Bgithub.com%2Fmiddyjs%2Fmiddy?ref=badge_large">
   <img src="https://app.fossa.io/api/projects/git%2Bgithub.com%2Fmiddyjs%2Fmiddy.svg?type=large" alt="FOSSA Status"  style="max-width:100%;">

package/index.d.ts

@@ -6,14 +6,17 @@ import {
 
 declare type PluginHook = () => void
 declare type PluginHookWithMiddlewareName = (middlewareName: string) => void
-declare type PluginHookPromise = () => Promise<any>
+declare type PluginHookPromise = (request: Request) => Promise<unknown> | unknown
 
 interface PluginObject {
+  internal?: any
   beforePrefetch?: PluginHook
   requestStart?: PluginHook
   beforeMiddleware?: PluginHookWithMiddlewareName
   afterMiddleware?: PluginHookWithMiddlewareName
   beforeHandler?: PluginHook
+  timeoutEarlyInMillis?: number
+  timeoutEarlyResponse?: PluginHook
   afterHandler?: PluginHook
   requestEnd?: PluginHookPromise
 }
@@ -33,7 +36,7 @@ declare type MiddlewareFn<TEvent = any, TResult = any, TErr = Error, TContext ex
 export interface MiddlewareObj<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = LambdaContext> {
   before?: MiddlewareFn<TEvent, TResult, TErr, TContext>
   after?: MiddlewareFn<TEvent, TResult, TErr, TContext>
-  onError?: MiddlewareFn<TEvent, TResult, TErr>
+  onError?: MiddlewareFn<TEvent, TResult, TErr, TContext>
 }
 
 // The AWS provided Handler type uses void | Promise<TResult> so we have no choice but to follow and suppress the linter warning
@@ -42,15 +45,9 @@ type MiddyInputHandler<TEvent, TResult, TContext extends LambdaContext = LambdaC
 
 export interface MiddyfiedHandler<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = LambdaContext> extends MiddyInputHandler<TEvent, TResult, TContext> {
   use: UseFn<TEvent, TResult, TErr, TContext>
-  applyMiddleware: AttachMiddlewareObj<TEvent, TResult, TErr, TContext>
   before: AttachMiddlewareFn<TEvent, TResult, TErr, TContext>
   after: AttachMiddlewareFn<TEvent, TResult, TErr, TContext>
   onError: AttachMiddlewareFn<TEvent, TResult, TErr, TContext>
-  __middlewares: {
-    before: Array<MiddlewareFn<TEvent, TResult, TErr, TContext>>
-    after: Array<MiddlewareFn<TEvent, TResult, TErr, TContext>>
-    onError: Array<MiddlewareFn<TEvent, TResult, TErr, TContext>>
-  }
 }
 
 declare type AttachMiddlewareFn<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = LambdaContext> = (middleware: MiddlewareFn) => MiddyfiedHandler<TEvent, TResult, TErr, TContext>

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@middy/core",
-  "version": "2.5.1",
+  "version": "3.0.0-alpha.0",
   "description": "🛵 The stylish Node.js middleware engine for AWS Lambda (core package)",
-  "type": "commonjs",
+  "type": "module",
   "engines": {
-    "node": ">=12"
+    "node": ">=14"
   },
   "engineStrict": true,
   "publishConfig": {
     "access": "public"
   },
-  "main": "index.js",
+  "exports": "./index.js",
   "types": "index.d.ts",
   "files": [
     "index.d.ts"
@@ -43,7 +43,10 @@
   "homepage": "https://github.com/middyjs/middy#readme",
   "devDependencies": {
     "@types/aws-lambda": "^8.10.76",
-    "@types/node": "^16.0.0"
+    "@types/node": "^17.0.0"
   },
-  "gitHead": "df18e5eff7d73492a96a2ca4780a2eae45d1cedb"
+  "gitHead": "c533f62841c8a39d061d7b94f30ba178f002c8db",
+  "dependencies": {
+    "node-abort-controller": "3.0.1"
+  }
 }

package/index.js

@@ -1,130 +0,0 @@
-"use strict";
-
-const middy = (baseHandler = () => {}, plugin) => {
-  var _plugin$beforePrefetc;
-
-  plugin === null || plugin === void 0 ? void 0 : (_plugin$beforePrefetc = plugin.beforePrefetch) === null || _plugin$beforePrefetc === void 0 ? void 0 : _plugin$beforePrefetc.call(plugin);
-  const beforeMiddlewares = [];
-  const afterMiddlewares = [];
-  const onErrorMiddlewares = [];
-
-  const instance = (event = {}, context = {}) => {
-    var _plugin$requestStart;
-
-    plugin === null || plugin === void 0 ? void 0 : (_plugin$requestStart = plugin.requestStart) === null || _plugin$requestStart === void 0 ? void 0 : _plugin$requestStart.call(plugin);
-    const request = {
-      event,
-      context,
-      response: undefined,
-      error: undefined,
-      internal: {}
-    };
-    return runRequest(request, [...beforeMiddlewares], baseHandler, [...afterMiddlewares], [...onErrorMiddlewares], plugin);
-  };
-
-  instance.use = middlewares => {
-    if (Array.isArray(middlewares)) {
-      for (const middleware of middlewares) {
-        instance.applyMiddleware(middleware);
-      }
-
-      return instance;
-    }
-
-    return instance.applyMiddleware(middlewares);
-  };
-
-  instance.applyMiddleware = middleware => {
-    const {
-      before,
-      after,
-      onError
-    } = middleware;
-
-    if (!before && !after && !onError) {
-      throw new Error('Middleware must be an object containing at least one key among "before", "after", "onError"');
-    }
-
-    if (before) instance.before(before);
-    if (after) instance.after(after);
-    if (onError) instance.onError(onError);
-    return instance;
-  }; // Inline Middlewares
-
-
-  instance.before = beforeMiddleware => {
-    beforeMiddlewares.push(beforeMiddleware);
-    return instance;
-  };
-
-  instance.after = afterMiddleware => {
-    afterMiddlewares.unshift(afterMiddleware);
-    return instance;
-  };
-
-  instance.onError = onErrorMiddleware => {
-    onErrorMiddlewares.push(onErrorMiddleware);
-    return instance;
-  };
-
-  instance.__middlewares = {
-    before: beforeMiddlewares,
-    after: afterMiddlewares,
-    onError: onErrorMiddlewares
-  };
-  return instance;
-};
-
-const runRequest = async (request, beforeMiddlewares, baseHandler, afterMiddlewares, onErrorMiddlewares, plugin) => {
-  try {
-    await runMiddlewares(request, beforeMiddlewares, plugin); // Check if before stack hasn't exit early
-
-    if (request.response === undefined) {
-      var _plugin$beforeHandler, _plugin$afterHandler;
-
-      plugin === null || plugin === void 0 ? void 0 : (_plugin$beforeHandler = plugin.beforeHandler) === null || _plugin$beforeHandler === void 0 ? void 0 : _plugin$beforeHandler.call(plugin);
-      request.response = await baseHandler(request.event, request.context);
-      plugin === null || plugin === void 0 ? void 0 : (_plugin$afterHandler = plugin.afterHandler) === null || _plugin$afterHandler === void 0 ? void 0 : _plugin$afterHandler.call(plugin);
-      await runMiddlewares(request, afterMiddlewares, plugin);
-    }
-  } catch (e) {
-    // Reset response changes made by after stack before error thrown
-    request.response = undefined;
-    request.error = e;
-
-    try {
-      await runMiddlewares(request, onErrorMiddlewares, plugin);
-    } catch (e) {
-      // Save error that wasn't handled
-      e.originalError = request.error;
-      request.error = e;
-      throw request.error;
-    } // Catch if onError stack hasn't handled the error
-
-
-    if (request.response === undefined) throw request.error;
-  } finally {
-    var _plugin$requestEnd;
-
-    await (plugin === null || plugin === void 0 ? void 0 : (_plugin$requestEnd = plugin.requestEnd) === null || _plugin$requestEnd === void 0 ? void 0 : _plugin$requestEnd.call(plugin, request));
-  }
-
-  return request.response;
-};
-
-const runMiddlewares = async (request, middlewares, plugin) => {
-  for (const nextMiddleware of middlewares) {
-    var _plugin$beforeMiddlew, _plugin$afterMiddlewa;
-
-    plugin === null || plugin === void 0 ? void 0 : (_plugin$beforeMiddlew = plugin.beforeMiddleware) === null || _plugin$beforeMiddlew === void 0 ? void 0 : _plugin$beforeMiddlew.call(plugin, nextMiddleware === null || nextMiddleware === void 0 ? void 0 : nextMiddleware.name);
-    const res = await (nextMiddleware === null || nextMiddleware === void 0 ? void 0 : nextMiddleware(request));
-    plugin === null || plugin === void 0 ? void 0 : (_plugin$afterMiddlewa = plugin.afterMiddleware) === null || _plugin$afterMiddlewa === void 0 ? void 0 : _plugin$afterMiddlewa.call(plugin, nextMiddleware === null || nextMiddleware === void 0 ? void 0 : nextMiddleware.name); // short circuit chaining and respond early
-
-    if (res !== undefined) {
-      request.response = res;
-      return;
-    }
-  }
-};
-
-module.exports = middy;