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

@@ -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 { httpMultipartBodyParser } from '@middy/http-multipart-body-parser'
+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/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@middy/http-multipart-body-parser",
-  "version": "2.5.1",
+  "version": "3.0.0-alpha.0",
   "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.d.ts"
@@ -46,12 +46,11 @@
   },
   "homepage": "https://github.com/middyjs/middy#readme",
   "dependencies": {
-    "@middy/util": "^2.5.1",
-    "busboy": "0.3.1"
+    "@middy/util": "^3.0.0-alpha.0",
+    "busboy": "1.3.0"
   },
   "devDependencies": {
-    "@middy/core": "^2.5.1",
-    "http-errors": "^1.8.0"
+    "@middy/core": "^3.0.0-alpha.0"
   },
-  "gitHead": "df18e5eff7d73492a96a2ca4780a2eae45d1cedb"
+  "gitHead": "c533f62841c8a39d061d7b94f30ba178f002c8db"
 }

package/index.js

@@ -1,87 +0,0 @@
-"use strict";
-
-const BusBoy = require('busboy');
-
-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 options = { ...defaults,
-    ...opts
-  };
-
-  const httpMultipartBodyParserMiddlewareBefore = async request => {
-    var _headers$ContentType;
-
-    const {
-      headers
-    } = request.event;
-    const contentType = (_headers$ContentType = headers === null || headers === void 0 ? void 0 : headers['Content-Type']) !== null && _headers$ContentType !== void 0 ? _headers$ContentType : headers === null || headers === void 0 ? void 0 : headers['content-type'];
-    if (!mimePattern.test(contentType)) return;
-    return parseMultipartData(request.event, options.busboy).then(multipartData => {
-      request.event.body = multipartData;
-    }).catch(() => {
-      const {
-        createError
-      } = require('@middy/util'); // UnprocessableEntity
-
-
-      throw createError(422, 'Invalid or malformed multipart/form-data was provided');
-    });
-  };
-
-  return {
-    before: httpMultipartBodyParserMiddlewareBefore
-  };
-};
-
-const parseMultipartData = (event, options) => {
-  const multipartData = {};
-  const bb = BusBoy({ ...options,
-    headers: event.headers
-  });
-  return new Promise((resolve, reject) => {
-    bb.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);
-
-        if (!multipartData[fieldname]) {
-          multipartData[fieldname] = attachment;
-        } else {
-          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]] = [];
-        }
-
-        multipartData[matches[1]].push(value);
-      }
-    }).on('finish', () => resolve(multipartData)).on('error', err => reject(err));
-    bb.write(event.body, event.isBase64Encoded ? 'base64' : 'binary');
-    bb.end();
-  });
-};
-
-module.exports = httpMultipartBodyParserMiddleware;