@belmonddev/catch-request-express-middleware 1.2.4 → 2.0.0

package/index.js

@@ -14,6 +14,9 @@ const override = (module, attr, fn) => {
   module[attr] = wrapper;
 };
 
+export const getHeaderValue = (headers, key) =>
+  Object.entries(headers).find(([k]) => k.toLowerCase() === key)?.[1];
+
 const catchHttpResponse = (reqObject, responseCb) => {
   override(reqObject, 'emit', (result, eventName, response) => {
     const chunks = [];
@@ -29,26 +32,17 @@ const catchHttpResponse = (reqObject, responseCb) => {
             statusCode: response.statusCode,
             statusMessage: response.statusMessage,
           };
-          if (
-            ['gzip', 'deflate'].indexOf(
-              response.headers['content-encoding']
-            ) !== -1
-          ) {
+          const contentEncoding = getHeaderValue(
+            response.headers,
+            'content-encoding'
+          );
+          if (['gzip', 'deflate'].indexOf(contentEncoding) !== -1) {
             const buffer = Buffer.concat(chunks);
             const zlibFunc =
-              response.headers['content-encoding'] === 'gzip'
-                ? zlib.gunzip
-                : zlib.inflate;
+              contentEncoding === 'gzip' ? zlib.gunzip : zlib.inflate;
             zlibFunc(buffer, (_, decoded) => {
               const stringBody = decoded.toString('utf8');
-              const request = {
-                ...responseObj,
-                body: /application\/json;?.*?$/.test(
-                  response.headers['content-type']
-                )
-                  ? JSON.parse(stringBody)
-                  : stringBody,
-              };
+              const request = { ...responseObj, body: stringBody };
               if (responseCb?.then) {
                 responseCb.then(() => request);
               } else {
@@ -57,14 +51,7 @@ const catchHttpResponse = (reqObject, responseCb) => {
             });
           } else {
             const stringBody = chunks.map((c) => c.toString('utf8')).join('');
-            const request = {
-              ...responseObj,
-              body: /application\/json;?.*?$/.test(
-                response.headers['content-type']
-              )
-                ? JSON.parse(stringBody)
-                : stringBody,
-            };
+            const request = { ...responseObj, body: stringBody };
             if (responseCb?.then) {
               responseCb.then(() => request);
             } else {
@@ -79,7 +66,8 @@ const catchHttpResponse = (reqObject, responseCb) => {
 
 const overrideHttpModule = (httpModule, requestSentCb) => {
   override(httpModule, 'request', (reqObject, request) => {
-    const requestHasBody = request.headers?.['Content-Length']?.[0] > 0;
+    const contentLength = getHeaderValue(request.headers, 'content-length');
+    const requestHasBody = !!contentLength;
     const params = Object.fromEntries(
       new URLSearchParams(request.query).entries()
     );
@@ -90,11 +78,7 @@ const overrideHttpModule = (httpModule, requestSentCb) => {
         const responseCb = requestSentCb({
           ...request,
           params,
-          body: /application\/json;?.*?$/.test(
-            request.headers?.['Content-Type']?.[0]
-          )
-            ? JSON.parse(body)
-            : body,
+          body,
         });
         if (responseCb) {
           catchHttpResponse(reqObject, responseCb);
@@ -102,26 +86,19 @@ const overrideHttpModule = (httpModule, requestSentCb) => {
       });
     } else {
       const responseCb = requestSentCb({ ...request, params, body: null });
-      catchHttpResponse(reqObject, responseCb);
+      if (responseCb) {
+        catchHttpResponse(reqObject, responseCb);
+      }
     }
   });
 };
 
 const callResponseCb = (responseCb, res) => {
-  let body;
-  try {
-    body = /application\/json;?.*?$/.test(res.getHeaders()['content-type'])
-      ? JSON.parse(res.bodyWritten)
-      : res.bodyWritten;
-  } catch (e) {
-    body = res.bodyWritten;
-  }
-
   const response = {
     headers: res.getHeaders(),
     statusCode: res.statusCode,
     statusMessage: res.statusMessage,
-    body,
+    body: res.bodyWritten,
   };
   if (responseCb?.then) {
     responseCb.then(() => response);
@@ -130,15 +107,16 @@ const callResponseCb = (responseCb, res) => {
   }
 };
 
-const callReceivedCbs = (req, res, requestReceivedCb) => {
+const callReceivedCbs = (req, res, requestReceivedCb, body) => {
   const responseCb = requestReceivedCb({
+    originalRequest: req,
     headers: req.headers,
     method: req.method,
     host: req.headers.host,
     pathname: req._parsedUrl.pathname,
     params: req.params,
     query: req.query,
-    body: req.body,
+    body,
   });
 
   if (responseCb) {
@@ -170,17 +148,21 @@ const catchExpressReceivedRequest = (req, res, requestReceivedCb) => {
     }
   });
 
-  if (req.headers['content-type'] !== 'application/json') {
-    let body = '';
-    req.on('data', function (data) {
-      body += data;
-    });
-    req.on('end', function () {
-      req.body = body;
-      callReceivedCbs(req, res, requestReceivedCb);
-    });
+  if (req.body !== undefined) {
+    callReceivedCbs(req, res, requestReceivedCb, req.body);
   } else {
-    callReceivedCbs(req, res, requestReceivedCb);
+    const contentLength = getHeaderValue(req.headers, 'content-length');
+    if (contentLength) {
+      let body = '';
+      req.on('data', function (data) {
+        body += data;
+      });
+      req.on('end', function () {
+        callReceivedCbs(req, res, requestReceivedCb, body);
+      });
+    } else {
+      callReceivedCbs(req, res, requestReceivedCb, '');
+    }
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@belmonddev/catch-request-express-middleware",
-  "version": "1.2.4",
+  "version": "2.0.0",
   "main": "index.js",
   "scripts": {
     "start": "nodemon -L --experimental-specifier-resolution=node ./src/index.js"