@middy/http-multipart-body-parser 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

@@ -56,15 +56,19 @@ If you really have to deal with big files, then you might also want to consider
 
 ```javascript
 import middy from '@middy/core'
+import httpHeaderNormalizer from '@middy/http-header-normalizer'
 import httpMultipartBodyParser from '@middy/http-multipart-body-parser'
 const handler = middy((event, context) => {
   return {}
 })
-handler.use(httpMultipartBodyParser())
+handler
+  .use(httpHeaderNormalizer())
+  .use(httpMultipartBodyParser())
+
 // invokes the handler
 const event = {
   headers: {
-    'content-type': 'multipart/form-data; boundary=----WebKitFormBoundaryppsQEwf2BVJeCe0M'
+    'Content-Type': 'multipart/form-data; boundary=----WebKitFormBoundaryppsQEwf2BVJeCe0M'
   },
   body: 'LS0tLS0tV2ViS2l0Rm9ybUJvdW5kYXJ5cHBzUUV3ZjJCVkplQ2UwTQ0KQ29udGVudC1EaXNwb3NpdGlvbjogZm9ybS1kYXRhOyBuYW1lPSJmb28iDQoNCmJhcg0KLS0tLS0tV2ViS2l0Rm9ybUJvdW5kYXJ5cHBzUUV3ZjJCVkplQ2UwTS0t',
   isBase64Encoded: true
@@ -86,7 +90,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,19 +1,21 @@
-const BusBoy = require('busboy')
+import BusBoy from 'busboy'
+import { createError } from '@middy/util'
+
 const mimePattern = /^multipart\/form-data(;.*)?$/
 const fieldnamePattern = /(.+)\[(.*)]$/
 
-const httpMultipartBodyParserMiddleware = (opts = {}) => {
-  const defaults = {
-    // busboy options as per documentation: https://www.npmjs.com/package/busboy#busboy-methods
-    busboy: {}
-  }
+const defaults = {
+  // busboy options as per documentation: https://www.npmjs.com/package/busboy#busboy-methods
+  busboy: {}
+}
 
+const httpMultipartBodyParserMiddleware = (opts = {}) => {
   const options = { ...defaults, ...opts }
 
   const httpMultipartBodyParserMiddlewareBefore = async (request) => {
     const { headers } = request.event
 
-    const contentType = headers?.['Content-Type'] ?? headers?.['content-type']
+    const contentType = headers['Content-Type'] ?? headers['content-type']
 
     if (!mimePattern.test(contentType)) return
 
@@ -21,10 +23,9 @@ const httpMultipartBodyParserMiddleware = (opts = {}) => {
       .then((multipartData) => {
         request.event.body = multipartData
       })
-      .catch(() => {
-        const { createError } = require('@middy/util')
+      .catch((e) => {
         // UnprocessableEntity
-        throw createError(422, 'Invalid or malformed multipart/form-data was provided')
+        throw createError(422, 'Invalid or malformed multipart/form-data was provided - ' + e.message)
       })
   }
 
@@ -35,10 +36,11 @@ const httpMultipartBodyParserMiddleware = (opts = {}) => {
 
 const parseMultipartData = (event, options) => {
   const multipartData = {}
-  const bb = BusBoy({ ...options, headers: event.headers })
+  // header must be lowercase (content-type)
+  const busboy = BusBoy({ ...options, headers: { 'content-type': event.headers['Content-Type'] ?? event.headers['content-type'] } })
 
   return new Promise((resolve, reject) => {
-    bb.on('file', (fieldname, file, filename, encoding, mimetype) => {
+    busboy.on('file', (fieldname, file, filename, encoding, mimetype) => {
       const attachment = {
         filename,
         mimetype,
@@ -72,11 +74,11 @@ const parseMultipartData = (event, options) => {
           multipartData[matches[1]].push(value)
         }
       })
-      .on('finish', () => resolve(multipartData))
-      .on('error', (err) => reject(err))
+      .on('close', () => resolve(multipartData))
+      .on('error', (e) => reject(e))
 
-    bb.write(event.body, event.isBase64Encoded ? 'base64' : 'binary')
-    bb.end()
+    busboy.write(event.body, event.isBase64Encoded ? 'base64' : 'utf8')
+    busboy.end()
   })
 }
-module.exports = httpMultipartBodyParserMiddleware
+export default httpMultipartBodyParserMiddleware

package/package.json

@@ -1,23 +1,25 @@
 {
   "name": "@middy/http-multipart-body-parser",
-  "version": "2.5.6",
+  "version": "3.0.0-alpha.3",
   "description": "Http event normalizer 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": [
@@ -46,11 +48,11 @@
   },
   "homepage": "https://github.com/middyjs/middy#readme",
   "dependencies": {
-    "@middy/util": "^2.5.6",
-    "busboy": "0.3.1"
+    "@middy/util": "^3.0.0-alpha.3",
+    "busboy": "1.3.0"
   },
   "devDependencies": {
-    "@middy/core": "^2.5.6"
+    "@middy/core": "^3.0.0-alpha.3"
   },
-  "gitHead": "0c789f55b4adf691f977b0d9904d1a805bb3bb2b"
+  "gitHead": "1441158711580313765e6d156046ef0fade0d156"
 }