@middy/http-cors 2.5.6 → 3.0.0-alpha.3

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

@@ -59,7 +59,7 @@ import httpErrorHandler from '@middy/http-error-handler'
 import cors from '@middy/http-cors'
 
 const handler = middy((event, context) => {
-  throw createError(422)
+  throw new createError.UnprocessableEntity()
 })
 handler.use(httpErrorHandler())
        .use(cors())
@@ -105,7 +105,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.js

@@ -1,7 +1,7 @@
-const { normalizeHttpResponse } = require('@middy/util')
+import { normalizeHttpResponse } from '@middy/util'
 
-const getOrigin = (incomingOrigin, options) => {
-  if (options?.origins.length > 0) {
+const getOrigin = (incomingOrigin, options = {}) => {
+  if (options.origins.length > 0) {
     if (incomingOrigin && options.origins.includes(incomingOrigin)) {
       return incomingOrigin
     } else {
@@ -33,10 +33,7 @@ const httpCorsMiddleware = (opts = {}) => {
   const options = { ...defaults, ...opts }
 
   const httpCorsMiddlewareAfter = async (request) => {
-    // API Gateway v1 & v2
-    if (!request.event?.httpMethod && !request.event?.requestContext?.http?.method) return
-
-    request.response = normalizeHttpResponse(request.response)
+    normalizeHttpResponse(request)
 
     const existingHeaders = Object.keys(request.response.headers)
 
@@ -69,7 +66,7 @@ const httpCorsMiddleware = (opts = {}) => {
 
     // Check if already setup the header Access-Control-Allow-Origin
     if (!existingHeaders.includes('Access-Control-Allow-Origin')) {
-      const eventHeaders = request.event?.headers ?? {}
+      const eventHeaders = request.event.headers ?? {}
       const incomingOrigin = eventHeaders.origin ?? eventHeaders.Origin
       request.response.headers[
         'Access-Control-Allow-Origin'
@@ -102,23 +99,35 @@ const httpCorsMiddleware = (opts = {}) => {
 
     // Check if already setup Access-Control-Request-Methods
     if (
-      options?.requestMethods &&
+      options.requestMethods &&
       !existingHeaders.includes('Access-Control-Request-Methods')
     ) {
-      request.response.headers['Access-Control-Request-Methods'] =
-        options.requestMethods
+      request.response.headers['Access-Control-Request-Methods'] = options.requestMethods
     }
 
-    if (request.event.httpMethod === 'OPTIONS') {
+    const httpMethod = getVersionHttpMethod[request.event.version ?? '1.0']?.(request.event)
+    if (!httpMethod) {
+      throw new Error('Unknown API Gateway Payload format')
+    }
+    if (httpMethod === 'OPTIONS') {
       if (options.cacheControl && !existingHeaders.includes('Cache-Control')) {
         request.response.headers['Cache-Control'] = String(options.cacheControl)
       }
     }
   }
-  const httpCorsMiddlewareOnError = httpCorsMiddlewareAfter
+  const httpCorsMiddlewareOnError = async (request) => {
+    if (request.response === undefined) return
+    return httpCorsMiddlewareAfter(request)
+  }
   return {
     after: httpCorsMiddlewareAfter,
     onError: httpCorsMiddlewareOnError
   }
 }
-module.exports = httpCorsMiddleware
+
+const getVersionHttpMethod = {
+  '1.0': (event) => event.httpMethod,
+  '2.0': (event) => event.requestContext.http.method
+}
+
+export default httpCorsMiddleware

package/package.json

@@ -1,23 +1,25 @@
 {
   "name": "@middy/http-cors",
-  "version": "2.5.6",
+  "version": "3.0.0-alpha.3",
   "description": "CORS (Cross-Origin Resource Sharing) middleware for the middy framework",
-  "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.js",
     "index.d.ts"
   ],
   "scripts": {
     "test": "npm run test:unit",
-    "test:unit": "ava"
+    "test:unit": "ava",
+    "test:benchmark": "node __benchmarks__/index.js"
   },
   "license": "MIT",
   "keywords": [
@@ -44,11 +46,11 @@
     "url": "https://github.com/middyjs/middy/issues"
   },
   "homepage": "https://github.com/middyjs/middy#readme",
-  "gitHead": "0c789f55b4adf691f977b0d9904d1a805bb3bb2b",
+  "gitHead": "1441158711580313765e6d156046ef0fade0d156",
   "dependencies": {
-    "@middy/util": "^2.5.6"
+    "@middy/util": "^3.0.0-alpha.3"
   },
   "devDependencies": {
-    "@middy/core": "^2.5.6"
+    "@middy/core": "^3.0.0-alpha.3"
   }
 }