@belmonddev/catch-request-express-middleware 1.0.0 → 1.0.1

package/index.js

@@ -1,5 +1,6 @@
 import http from 'http';
 import https from 'https';
+import zlib from 'zlib';
 
 const override = (module, attr, fn) => {
   let original = module[attr];
@@ -15,20 +16,51 @@ const override = (module, attr, fn) => {
 
 const catchHttpResponse = (reqObject, responseCb) => {
   override(reqObject, 'emit', (result, eventName, response) => {
-    let body = '';
+    const chunks = [];
     switch (eventName) {
       case 'response': {
         response.on('data', (d) => {
-          body += d.toString('utf8');
+          chunks.push(d);
         });
 
         response.on('end', () => {
-          responseCb({
+          const responseObj = {
             headers: response.headers,
             statusCode: response.statusCode,
             statusMessage: response.statusMessage,
-            body,
-          });
+          };
+          if (
+            ['gzip', 'deflate'].indexOf(
+              response.headers['content-encoding']
+            ) !== -1
+          ) {
+            const buffer = Buffer.concat(chunks);
+            const zlibFunc =
+              response.headers['content-encoding'] === 'gzip'
+                ? zlib.gunzip
+                : zlib.inflate;
+            zlibFunc(buffer, (_, decoded) => {
+              const stringBody = decoded.toString('utf8');
+              responseCb({
+                ...responseObj,
+                body: /application\/json;?.*?$/.test(
+                  response.headers['content-type']
+                )
+                  ? JSON.parse(stringBody)
+                  : stringBody,
+              });
+            });
+          } else {
+            const stringBody = chunks.toString('utf8');
+            responseCb({
+              ...responseObj,
+              body: /application\/json;?.*?$/.test(
+                response.headers['content-type']
+              )
+                ? JSON.parse(stringBody)
+                : stringBody,
+            });
+          }
         });
       }
     }
@@ -38,17 +70,28 @@ const catchHttpResponse = (reqObject, responseCb) => {
 const overrideHttpModule = (httpModule, requestSentCb) => {
   override(httpModule, 'request', (reqObject, request) => {
     const requestHasBody = request.headers?.['Content-Length']?.[0] > 0;
+    const params = Object.fromEntries(
+      new URLSearchParams(request.query).entries()
+    );
 
     if (requestHasBody) {
       override(reqObject, 'write', (result, data) => {
         const body = data.toString();
-        const responseCb = requestSentCb({ ...request, body });
+        const responseCb = requestSentCb({
+          ...request,
+          params,
+          body: /application\/json;?.*?$/.test(
+            request.headers?.['Content-Type']?.[0]
+          )
+            ? JSON.parse(body)
+            : body,
+        });
         if (responseCb) {
           catchHttpResponse(reqObject, responseCb);
         }
       });
     } else {
-      const responseCb = requestSentCb({ ...request, body: null });
+      const responseCb = requestSentCb({ ...request, params, body: null });
       catchHttpResponse(reqObject, responseCb);
     }
   });
@@ -73,12 +116,15 @@ const catchExpressReceivedRequest = (req, res, requestReceivedCb) => {
         body = data.toString();
       }
     });
+
     req.socket.on('close', () => {
       responseCb({
         headers: res.getHeaders(),
         statusCode: res.statusCode,
         statusMessage: res.statusMessage,
-        body,
+        body: /application\/json;?.*?$/.test(res.getHeaders()['content-type'])
+          ? JSON.parse(body)
+          : body,
       });
     });
   }

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "@belmonddev/catch-request-express-middleware",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "index.js",
   "scripts": {
     "start": "nodemon -L --experimental-specifier-resolution=node ./src/index.js"
   },
   "author": "David Escalera",
   "license": "ISC",
-  "dependencies": {
-  },
+  "dependencies": {},
   "devDependencies": {
     "nodemon": "^2.0.7"
   },