@middy/http-multipart-body-parser 5.0.3 → 5.2.0

package/index.js

@@ -1,93 +1,107 @@
-import BusBoy from 'busboy';
-import { createError } from '@middy/util';
-const mimePattern = /^multipart\/form-data(;.*)?$/;
-const fieldnamePattern = /(.+)\[(.*)]$/;
+import BusBoy from '@fastify/busboy'
+import { createError } from '@middy/util'
+
+const mimePattern = /^multipart\/form-data(;.*)?$/
+const fieldnamePattern = /(.+)\[(.*)]$/
+
 const defaults = {
-    busboy: {},
-    charset: 'utf8',
-    disableContentTypeError: false
-};
-const httpMultipartBodyParserMiddleware = (opts = {})=>{
-    const options = {
-        ...defaults,
-        ...opts
-    };
-    const httpMultipartBodyParserMiddlewareBefore = async (request)=>{
-        const { headers } = request.event;
-        const contentType = headers?.['Content-Type'] ?? headers?.['content-type'];
-        if (!mimePattern.test(contentType)) {
-            if (options.disableContentTypeError) {
-                return;
-            }
-            throw createError(415, 'Unsupported Media Type', {
-                cause: {
-                    package: '@middy/multipart-body-parser',
-                    data: contentType
-                }
-            });
+  // busboy options as per documentation: https://www.npmjs.com/package/busboy#busboy-methods
+  busboy: {},
+  charset: 'utf8',
+  disableContentTypeError: false
+}
+
+const httpMultipartBodyParserMiddleware = (opts = {}) => {
+  const options = { ...defaults, ...opts }
+
+  const httpMultipartBodyParserMiddlewareBefore = async (request) => {
+    const { headers } = request.event
+
+    const contentType = headers?.['Content-Type'] ?? headers?.['content-type']
+
+    if (!mimePattern.test(contentType)) {
+      if (options.disableContentTypeError) {
+        return
+      }
+      throw createError(415, 'Unsupported Media Type', {
+        cause: { package: '@middy/multipart-body-parser', data: contentType }
+      })
+    }
+
+    return parseMultipartData(request.event, options)
+      .then((multipartData) => {
+        // request.event.rawBody = body
+        request.event.body = multipartData
+      })
+      .catch((err) => {
+        // UnprocessableEntity
+        throw createError(
+          415,
+          'Invalid or malformed multipart/form-data was provided',
+          { cause: { package: '@middy/multipart-body-parser', data: err } }
+        )
+      })
+  }
+
+  return {
+    before: httpMultipartBodyParserMiddlewareBefore
+  }
+}
+
+const parseMultipartData = (event, options) => {
+  const multipartData = {}
+  const charset = event.isBase64Encoded ? 'base64' : options.charset
+  // header must be lowercase (content-type)
+  const busboy = BusBoy({
+    ...options.busboy,
+    headers: {
+      'content-type':
+        event.headers?.['Content-Type'] ?? event.headers?.['content-type']
+    }
+  })
+
+  return new Promise((resolve, reject) => {
+    busboy
+      .on('file', (fieldname, file, info) => {
+        const { filename, encoding, mimeType: mimetype } = info
+        const attachment = {
+          filename,
+          mimetype,
+          encoding
         }
-        return parseMultipartData(request.event, options).then((multipartData)=>{
-            request.event.body = multipartData;
-        }).catch((err)=>{
-            throw createError(415, 'Invalid or malformed multipart/form-data was provided', {
-                cause: {
-                    package: '@middy/multipart-body-parser',
-                    data: err
-                }
-            });
-        });
-    };
-    return {
-        before: httpMultipartBodyParserMiddlewareBefore
-    };
-};
-const parseMultipartData = (event, options)=>{
-    const multipartData = {};
-    const charset = event.isBase64Encoded ? 'base64' : options.charset;
-    const busboy = BusBoy({
-        ...options.busboy,
-        headers: {
-            'content-type': event.headers?.['Content-Type'] ?? event.headers?.['content-type']
+
+        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)
         }
-    });
-    return new Promise((resolve, reject)=>{
-        busboy.on('file', (fieldname, file, info)=>{
-            const { filename, encoding, mimeType: mimetype } = info;
-            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('close', ()=>resolve(multipartData)).on('error', (e)=>reject(e));
-        busboy.write(event.body, charset);
-        busboy.end();
-    });
-};
-export default httpMultipartBodyParserMiddleware;
+      })
+      .on('finish', () => resolve(multipartData))
+      .on('error', (e) => reject(e))
 
+    busboy.write(event.body, charset)
+    busboy.end()
+  })
+}
+export default httpMultipartBodyParserMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-multipart-body-parser",
-  "version": "5.0.3",
+  "version": "5.2.0",
   "description": "Http event normalizer middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -60,13 +60,13 @@
     "url": "https://github.com/sponsors/willfarrell"
   },
   "dependencies": {
-    "@middy/util": "5.0.3",
-    "busboy": "1.6.0"
+    "@fastify/busboy": "2.1.0",
+    "@middy/util": "5.2.0"
   },
   "devDependencies": {
-    "@middy/core": "5.0.3",
+    "@middy/core": "5.2.0",
     "@types/aws-lambda": "^8.10.101",
     "type-fest": "^4.0.0"
   },
-  "gitHead": "87660575a7ac2b52e4153c407a4c63c9449dcd0d"
+  "gitHead": "2d9096a49cd8fb62359517be96d6c93609df41f0"
 }