@belmonddev/catch-request-express-middleware 1.2.3 → 1.2.5

package/index.js

@@ -41,25 +41,35 @@ const catchHttpResponse = (reqObject, responseCb) => {
                 : zlib.inflate;
             zlibFunc(buffer, (_, decoded) => {
               const stringBody = decoded.toString('utf8');
-              responseCb({
+              const request = {
                 ...responseObj,
                 body: /application\/json;?.*?$/.test(
                   response.headers['content-type']
                 )
                   ? JSON.parse(stringBody)
                   : stringBody,
-              });
+              };
+              if (responseCb?.then) {
+                responseCb.then(() => request);
+              } else {
+                responseCb(request);
+              }
             });
           } else {
             const stringBody = chunks.map((c) => c.toString('utf8')).join('');
-            responseCb({
+            const request = {
               ...responseObj,
               body: /application\/json;?.*?$/.test(
                 response.headers['content-type']
               )
                 ? JSON.parse(stringBody)
                 : stringBody,
-            });
+            };
+            if (responseCb?.then) {
+              responseCb.then(() => request);
+            } else {
+              responseCb(request);
+            }
           }
         });
       }
@@ -106,16 +116,23 @@ const callResponseCb = (responseCb, res) => {
   } catch (e) {
     body = res.bodyWritten;
   }
-  responseCb({
+
+  const response = {
     headers: res.getHeaders(),
     statusCode: res.statusCode,
     statusMessage: res.statusMessage,
     body,
-  });
+  };
+  if (responseCb?.then) {
+    responseCb.then(() => response);
+  } else {
+    responseCb(response);
+  }
 };
 
 const callReceivedCbs = (req, res, requestReceivedCb) => {
   const responseCb = requestReceivedCb({
+    originalRequest: req,
     headers: req.headers,
     method: req.method,
     host: req.headers.host,
@@ -124,6 +141,7 @@ const callReceivedCbs = (req, res, requestReceivedCb) => {
     query: req.query,
     body: req.body,
   });
+
   if (responseCb) {
     req.socket.setMaxListeners(100);
     if (req.socketClosed) {
@@ -158,7 +176,6 @@ const catchExpressReceivedRequest = (req, res, requestReceivedCb) => {
     req.on('data', function (data) {
       body += data;
     });
-
     req.on('end', function () {
       req.body = body;
       callReceivedCbs(req, res, requestReceivedCb);

package/package.json

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