@middy/http-multipart-body-parser 3.0.0-alpha.2 → 3.0.0-alpha.3

package/index.js

@@ -1,79 +1,84 @@
-import BusBoy from 'busboy';
-import { createError } from '@middy/util';
-const mimePattern = /^multipart\/form-data(;.*)?$/;
-const fieldnamePattern = /(.+)\[(.*)]$/;
+import BusBoy from 'busboy'
+import { createError } from '@middy/util'
+
+const mimePattern = /^multipart\/form-data(;.*)?$/
+const fieldnamePattern = /(.+)\[(.*)]$/
+
+const defaults = {
+  // busboy options as per documentation: https://www.npmjs.com/package/busboy#busboy-methods
+  busboy: {}
+}
 
 const httpMultipartBodyParserMiddleware = (opts = {}) => {
-  const defaults = {
-    busboy: {}
-  };
-  const options = { ...defaults,
-    ...opts
-  };
+  const options = { ...defaults, ...opts }
+
+  const httpMultipartBodyParserMiddlewareBefore = async (request) => {
+    const { headers } = request.event
+
+    const contentType = headers['Content-Type'] ?? headers['content-type']
 
-  const httpMultipartBodyParserMiddlewareBefore = async request => {
-    const {
-      headers
-    } = request.event;
-    const contentType = headers['Content-Type'] ?? headers['content-type'];
-    if (!mimePattern.test(contentType)) return;
-    return parseMultipartData(request.event, options.busboy).then(multipartData => {
-      request.event.body = multipartData;
-    }).catch(e => {
-      throw createError(422, 'Invalid or malformed multipart/form-data was provided - ' + e.message);
-    });
-  };
+    if (!mimePattern.test(contentType)) return
+
+    return parseMultipartData(request.event, options.busboy)
+      .then((multipartData) => {
+        request.event.body = multipartData
+      })
+      .catch((e) => {
+        // UnprocessableEntity
+        throw createError(422, 'Invalid or malformed multipart/form-data was provided - ' + e.message)
+      })
+  }
 
   return {
     before: httpMultipartBodyParserMiddlewareBefore
-  };
-};
+  }
+}
 
 const parseMultipartData = (event, options) => {
-  const multipartData = {};
-  const bb = BusBoy({ ...options,
-    headers: {
-      'content-type': event.headers['Content-Type'] ?? event.headers['content-type']
-    }
-  });
+  const multipartData = {}
+  // 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,
         encoding
-      };
-      const chunks = [];
-      file.on('data', data => {
-        chunks.push(data);
-      });
-      file.on('end', () => {
-        attachment.truncated = file.truncated;
-        attachment.content = Buffer.concat(chunks);
+      }
+
+      const chunks = []
 
+      file.on('data', (data) => {
+        chunks.push(data)
+      })
+      file.on('end', () => {
+        attachment.truncated = file.truncated
+        attachment.content = Buffer.concat(chunks)
         if (!multipartData[fieldname]) {
-          multipartData[fieldname] = attachment;
+          multipartData[fieldname] = attachment
         } else {
-          const current = multipartData[fieldname];
-          multipartData[fieldname] = [attachment].concat(current);
+          const current = multipartData[fieldname]
+          multipartData[fieldname] = [attachment].concat(current)
         }
-      });
-    }).on('field', (fieldname, value) => {
-      const matches = fieldname.match(fieldnamePattern);
-
-      if (!matches) {
-        multipartData[fieldname] = value;
-      } else {
-        if (!multipartData[matches[1]]) {
-          multipartData[matches[1]] = [];
+      })
+    })
+      .on('field', (fieldname, value) => {
+        const matches = fieldname.match(fieldnamePattern)
+        if (!matches) {
+          multipartData[fieldname] = value
+        } else {
+          if (!multipartData[matches[1]]) {
+            multipartData[matches[1]] = []
+          }
+          multipartData[matches[1]].push(value)
         }
+      })
+      .on('close', () => resolve(multipartData))
+      .on('error', (e) => reject(e))
 
-        multipartData[matches[1]].push(value);
-      }
-    }).on('close', () => resolve(multipartData)).on('error', e => reject(e));
-    bb.write(event.body, event.isBase64Encoded ? 'base64' : 'utf8');
-    bb.end();
-  });
-};
-
-export default httpMultipartBodyParserMiddleware;
+    busboy.write(event.body, event.isBase64Encoded ? 'base64' : 'utf8')
+    busboy.end()
+  })
+}
+export default httpMultipartBodyParserMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-multipart-body-parser",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.3",
   "description": "Http event normalizer middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -18,7 +18,8 @@
   ],
   "scripts": {
     "test": "npm run test:unit",
-    "test:unit": "ava"
+    "test:unit": "ava",
+    "test:benchmark": "node __benchmarks__/index.js"
   },
   "license": "MIT",
   "keywords": [
@@ -47,11 +48,11 @@
   },
   "homepage": "https://github.com/middyjs/middy#readme",
   "dependencies": {
-    "@middy/util": "^3.0.0-alpha.2",
+    "@middy/util": "^3.0.0-alpha.3",
     "busboy": "1.3.0"
   },
   "devDependencies": {
-    "@middy/core": "^3.0.0-alpha.2"
+    "@middy/core": "^3.0.0-alpha.3"
   },
-  "gitHead": "de30419273ecbff08f367f47c7e320ec981cf145"
+  "gitHead": "1441158711580313765e6d156046ef0fade0d156"
 }