@middy/core 3.0.0-alpha.3 → 3.0.0-alpha.7

package/README.md

@@ -1,26 +1,36 @@
-# Middy Core
-
-<div align="center">
-  <img alt="Middy logo" src="https://raw.githubusercontent.com/middyjs/middy/main/docs/img/middy-logo.png"/>
-</div>
-
 <div align="center">
+  <h1>Middy Core</h1>
+  <img alt="Middy logo" src="https://raw.githubusercontent.com/middyjs/middy/main/docs/img/middy-logo.svg"/>
   <p><strong>Core component of the middy framework, the stylish Node.js middleware engine for AWS Lambda</strong></p>
-</div>
-
-<div align="center">
 <p>
-  <a href="http://badge.fury.io/js/%40middy%2Fcore">
+  <a href="https://www.npmjs.com/package/@middy/core?activeTab=versions">
     <img src="https://badge.fury.io/js/%40middy%2Fcore.svg" alt="npm version" style="max-width:100%;">
   </a>
+  <a href="https://packagephobia.com/result?p=@middy/core">
+    <img src="https://packagephobia.com/badge?p=@middy/core" alt="npm install size" style="max-width:100%;">
+  </a>
+  <a href="https://github.com/middyjs/middy/actions">
+    <img src="https://github.com/middyjs/middy/workflows/Tests/badge.svg" alt="GitHub Actions test status badge" style="max-width:100%;">
+  </a>
+  <br/>
+   <a href="https://standardjs.com/">
+    <img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg" alt="Standard Code Style"  style="max-width:100%;">
+  </a>
   <a href="https://snyk.io/test/github/middyjs/middy">
     <img src="https://snyk.io/test/github/middyjs/middy/badge.svg" alt="Known Vulnerabilities" data-canonical-src="https://snyk.io/test/github/middyjs/middy" style="max-width:100%;">
   </a>
-  <a href="https://standardjs.com/">
-    <img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg" alt="Standard Code Style"  style="max-width:100%;">
+  <a href="https://lgtm.com/projects/g/middyjs/middy/context:javascript">
+    <img src="https://img.shields.io/lgtm/grade/javascript/g/middyjs/middy.svg?logo=lgtm&logoWidth=18" alt="Language grade: JavaScript" style="max-width:100%;">
+  </a>
+  <a href="https://bestpractices.coreinfrastructure.org/projects/5280">
+    <img src="https://bestpractices.coreinfrastructure.org/projects/5280/badge" alt="Core Infrastructure Initiative (CII) Best Practices"  style="max-width:100%;">
   </a>
+  <br/>
   <a href="https://gitter.im/middyjs/Lobby">
-    <img src="https://badges.gitter.im/gitterHQ/gitter.svg" alt="Chat on Gitter"  style="max-width:100%;">
+    <img src="https://badges.gitter.im/gitterHQ/gitter.svg" alt="Chat on Gitter" style="max-width:100%;">
+  </a>
+  <a href="https://stackoverflow.com/questions/tagged/middy?sort=Newest&uqlId=35052">
+    <img src="https://img.shields.io/badge/StackOverflow-[middy]-yellow" alt="Ask questions on StackOverflow" style="max-width:100%;">
   </a>
 </p>
 </div>

package/index.d.ts

@@ -42,7 +42,7 @@ export interface MiddlewareObj<TEvent = any, TResult = any, TErr = Error, TConte
 // The AWS provided Handler type uses void | Promise<TResult> so we have no choice but to follow and suppress the linter warning
 // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
 type MiddyInputHandler<TEvent, TResult, TContext extends LambdaContext = LambdaContext> = (event: TEvent, context: TContext, callback: LambdaCallback<TResult>) => void | Promise<TResult>
-type MiddyInputPromiseHandler<TEvent, TResult, TContext extends LambdaContext = LambdaContext> = ( event: TEvent, context: TContext, ) => Promise<TResult>;
+type MiddyInputPromiseHandler<TEvent, TResult, TContext extends LambdaContext = LambdaContext> = (event: TEvent, context: TContext,) => Promise<TResult>
 
 export interface MiddyfiedHandler<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = LambdaContext> extends MiddyInputHandler<TEvent, TResult, TContext>,
   MiddyInputPromiseHandler<TEvent, TResult, TContext> {

package/index.js

@@ -1,250 +1,3 @@
-const defaultLambdaHandler = () => {}
-const defaultPlugin = {
-  timeoutEarlyInMillis: 5,
-  timeoutEarlyResponse: () => { throw new Error('Timeout') }
-}
+import{EventEmitter}from'events';const defaultLambdaHandler=()=>{};const defaultPlugin={timeoutEarlyInMillis:5,timeoutEarlyResponse:()=>{throw new Error('Timeout')}};const middy=(lambdaHandler=defaultLambdaHandler,plugin={})=>{if(typeof lambdaHandler!=='function'){plugin=lambdaHandler;lambdaHandler=defaultLambdaHandler}plugin={...defaultPlugin,...plugin};plugin.timeoutEarly=plugin.timeoutEarlyInMillis>0;plugin.beforePrefetch?.();const beforeMiddlewares=[];const afterMiddlewares=[];const onErrorMiddlewares=[];const middy1=(event={},context={})=>{plugin.requestStart?.();const request={event,context,response:undefined,error:undefined,internal:plugin.internal??{}};return runRequest(request,[...beforeMiddlewares],lambdaHandler,[...afterMiddlewares],[...onErrorMiddlewares],plugin)};middy1.use=middlewares=>{if(!Array.isArray(middlewares)){middlewares=[middlewares]}for(const middleware of middlewares){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)middy1.before(before);if(after)middy1.after(after);if(onError)middy1.onError(onError)}return middy1};middy1.before=beforeMiddleware=>{beforeMiddlewares.push(beforeMiddleware);return middy1};middy1.after=afterMiddleware=>{afterMiddlewares.unshift(afterMiddleware);return middy1};middy1.onError=onErrorMiddleware=>{onErrorMiddlewares.unshift(onErrorMiddleware);return middy1};middy1.handler=replaceLambdaHandler=>{lambdaHandler=replaceLambdaHandler;return middy1};return middy1};const runRequest=async(request,beforeMiddlewares,lambdaHandler,afterMiddlewares,onErrorMiddlewares,plugin)=>{const timeoutEarly=plugin.timeoutEarly&&request.context.getRemainingTimeInMillis;try{await runMiddlewares(request,beforeMiddlewares,plugin);if(request.response===undefined){plugin.beforeHandler?.();const handlerAbort=new AbortController();let timeoutAbort;if(timeoutEarly)timeoutAbort=new AbortController();request.response=await Promise.race([lambdaHandler(request.event,request.context,{signal:handlerAbort.signal}),timeoutEarly?setTimeoutPromise(request.context.getRemainingTimeInMillis()-plugin.timeoutEarlyInMillis,{signal:timeoutAbort.signal}).then(()=>{handlerAbort.abort();return plugin.timeoutEarlyResponse()}):Promise.race([])]);if(timeoutEarly)timeoutAbort.abort();plugin.afterHandler?.();await runMiddlewares(request,afterMiddlewares,plugin)}}catch(e){request.response=undefined;request.error=e;try{await runMiddlewares(request,onErrorMiddlewares,plugin)}catch(e){e.originalError=request.error;request.error=e;throw request.error}if(request.response===undefined)throw request.error}finally{await plugin.requestEnd?.(request)}return request.response};const runMiddlewares=async(request,middlewares,plugin)=>{for(const nextMiddleware of middlewares){plugin.beforeMiddleware?.(nextMiddleware.name);const res=await nextMiddleware(request);plugin.afterMiddleware?.(nextMiddleware.name);if(res!==undefined){request.response=res;return}}};const polyfillAbortController=()=>{if(process.version<'v15.0.0'){var tmp=Symbol.toStringTag;class AbortSignal{toString(){return'[object AbortSignal]'}get[tmp](){return'AbortSignal'}removeEventListener(name,handler){this.eventEmitter.removeListener(name,handler)}addEventListener(name,handler){this.eventEmitter.on(name,handler)}dispatchEvent(type){const event={type,target:this};const handlerName=`on${type}`;if(typeof this[handlerName]==='function')this[handlerName](event);this.eventEmitter.emit(type,event)}constructor(){this.eventEmitter=new EventEmitter();this.onabort=null;this.aborted=false}}return(function(){var tmp=Symbol.toStringTag;class AbortController{abort(){if(this.signal.aborted)return;this.signal.aborted=true;this.signal.dispatchEvent('abort')}toString(){return'[object AbortController]'}get[tmp](){return'AbortController'}constructor(){this.signal=new AbortSignal()}}return AbortController})()}else{return AbortController}};global.AbortController=polyfillAbortController();const polyfillSetTimeoutPromise=()=>{return(ms,{signal})=>{if(signal.aborted){return Promise.reject(new Error('Aborted','AbortError'))}return new Promise((resolve,reject)=>{const abortHandler=()=>{clearTimeout(timeout);reject(new Error('Aborted','AbortError'))};const timeout=setTimeout(()=>{resolve();signal.removeEventListener('abort',abortHandler)},ms);signal.addEventListener('abort',abortHandler)})}};const setTimeoutPromise=polyfillSetTimeoutPromise();export default middy
 
-const middy = (lambdaHandler = defaultLambdaHandler, plugin = {}) => {
-  // Allow base handler to be set using .handler()
-  if (typeof lambdaHandler !== 'function') {
-    plugin = lambdaHandler
-    lambdaHandler = defaultLambdaHandler
-  }
-  plugin = { ...defaultPlugin, ...plugin }
-  plugin.timeoutEarly = plugin.timeoutEarlyInMillis > 0
-
-  plugin.beforePrefetch?.()
-  const beforeMiddlewares = []
-  const afterMiddlewares = []
-  const onErrorMiddlewares = []
-
-  const middy = (event = {}, context = {}) => {
-    plugin.requestStart?.()
-    const request = {
-      event,
-      context,
-      response: undefined,
-      error: undefined,
-      internal: plugin.internal ?? {}
-    }
-
-    return runRequest(
-      request,
-      [...beforeMiddlewares],
-      lambdaHandler,
-      [...afterMiddlewares],
-      [...onErrorMiddlewares],
-      plugin
-    )
-  }
-
-  middy.use = (middlewares) => {
-    if (!Array.isArray(middlewares)) {
-      middlewares = [middlewares]
-    }
-    for (const middleware of middlewares) {
-      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) middy.before(before)
-      if (after) middy.after(after)
-      if (onError) middy.onError(onError)
-    }
-    return middy
-  }
-
-  // Inline Middlewares
-  middy.before = (beforeMiddleware) => {
-    beforeMiddlewares.push(beforeMiddleware)
-    return middy
-  }
-  middy.after = (afterMiddleware) => {
-    afterMiddlewares.unshift(afterMiddleware)
-    return middy
-  }
-  middy.onError = (onErrorMiddleware) => {
-    onErrorMiddlewares.unshift(onErrorMiddleware)
-    return middy
-  }
-  middy.handler = (replaceLambdaHandler) => {
-    lambdaHandler = replaceLambdaHandler
-  }
-
-  return middy
-}
-
-const runRequest = async (
-  request,
-  beforeMiddlewares,
-  lambdaHandler,
-  afterMiddlewares,
-  onErrorMiddlewares,
-  plugin
-) => {
-  const { timeoutEarly } = plugin
-  try {
-    await runMiddlewares(request, beforeMiddlewares, plugin)
-    // Check if before stack hasn't exit early
-    if (request.response === undefined) {
-      plugin.beforeHandler?.()
-
-      const handlerAbort = new AbortController()
-      let timeoutAbort
-      if (timeoutEarly) timeoutAbort = new AbortController()
-      request.response = await Promise.race([
-        lambdaHandler(request.event, request.context, { signal: handlerAbort.signal }),
-        timeoutEarly
-          ? setTimeoutPromise(request.context.getRemainingTimeInMillis() - plugin.timeoutEarlyInMillis, { signal: timeoutAbort.signal })
-            .then(() => {
-              handlerAbort.abort()
-              return plugin.timeoutEarlyResponse()
-            })
-          : Promise.race([])
-      ])
-      if (timeoutEarly) timeoutAbort.abort() // lambdaHandler may not be a promise
-
-      plugin.afterHandler?.()
-      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 {
-    await plugin.requestEnd?.(request)
-  }
-
-  return request.response
-}
-
-const runMiddlewares = async (request, middlewares, plugin) => {
-  for (const nextMiddleware of middlewares) {
-    plugin.beforeMiddleware?.(nextMiddleware.name)
-    const res = await nextMiddleware(request)
-    plugin.afterMiddleware?.(nextMiddleware.name)
-    // short circuit chaining and respond early
-    if (res !== undefined) {
-      request.response = res
-      return
-    }
-  }
-}
-
-// Start Polyfill (Nodejs v14)
-/*
-MIT License
-
-Copyright (c) 2019 Steve Faulkner
-
-node-abort-controller
- */
-const polyfillAbortController = async () => {
-  if (process.version < 'v15.0.0') {
-    const events = await import('events')
-    const { EventEmitter } = events
-
-    class AbortSignal {
-      constructor () {
-        this.eventEmitter = new EventEmitter()
-        this.onabort = null
-        this.aborted = false
-      }
-
-      toString () {
-        return '[object AbortSignal]'
-      }
-
-      get [Symbol.toStringTag] () {
-        return 'AbortSignal'
-      }
-
-      removeEventListener (name, handler) {
-        this.eventEmitter.removeListener(name, handler)
-      }
-
-      addEventListener (name, handler) {
-        this.eventEmitter.on(name, handler)
-      }
-
-      dispatchEvent (type) {
-        const event = { type, target: this }
-        const handlerName = `on${type}`
-
-        if (typeof this[handlerName] === 'function') this[handlerName](event)
-
-        this.eventEmitter.emit(type, event)
-      }
-    }
-
-    return class AbortController {
-      constructor () {
-        this.signal = new AbortSignal()
-      }
-
-      abort () {
-        if (this.signal.aborted) return
-
-        this.signal.aborted = true
-        this.signal.dispatchEvent('abort')
-      }
-
-      toString () {
-        return '[object AbortController]'
-      }
-
-      get [Symbol.toStringTag] () {
-        return 'AbortController'
-      }
-    }
-  } else {
-    return AbortController
-  }
-}
-global.AbortController = await polyfillAbortController()
-
-const polyfillSetTimeoutPromise = async () => {
-
-  if (process.version < 'v15.0.0') {
-    return (ms, { signal }) => {
-      if (signal.aborted) {
-        return Promise.reject(new Error('Aborted', 'AbortError'))
-      }
-      return new Promise((resolve, reject) => {
-        const abortHandler = () => {
-          clearTimeout(timeout)
-          reject(new Error('Aborted', 'AbortError'))
-        }
-        // start async operation
-        const timeout = setTimeout(() => {
-          resolve()
-          signal.removeEventListener('abort', abortHandler)
-        }, ms)
-        signal.addEventListener('abort', abortHandler)
-      })
-    }
-  } else {
-    const timers = await import('timers/promises')
-    return timers.setTimeout
-  }
-}
-global.setTimeoutPromise = await polyfillSetTimeoutPromise()
-// import { setTimeout as setTimeoutPromise } from 'timers/promises'
-// End Polyfill
-
-export default middy
+//# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/core",
-  "version": "3.0.0-alpha.3",
+  "version": "3.0.0-alpha.7",
   "description": "🛵 The stylish Node.js middleware engine for AWS Lambda (core package)",
   "type": "module",
   "engines": {
@@ -47,5 +47,5 @@
     "@types/aws-lambda": "^8.10.76",
     "@types/node": "^17.0.0"
   },
-  "gitHead": "1441158711580313765e6d156046ef0fade0d156"
+  "gitHead": "5cef39ebe49c201f97d71bb0680004de4b82cb91"
 }