@belmonddev/catch-request-express-middleware 3.3.3 → 3.3.5

package/index.js

@@ -17,6 +17,24 @@ const override = (module, attr, fn) => {
 export const getHeaderValue = (headers, key) =>
   Object.entries(headers || {}).find(([k]) => k.toLowerCase() === key)?.[1];
 
+function tryDecompress(buffer) {
+  if (zlib.brotliDecompressSync) {
+    try {
+      return zlib.brotliDecompressSync(buffer);
+    } catch {
+      try {
+        return zlib.gunzipSync(buffer);
+      } catch {
+        try {
+          return zlib.inflateSync(buffer);
+        } catch {
+          return buffer;
+        }
+      }
+    }
+  }
+}
+
 const catchHttpResponse = (reqObject, responseCb) => {
   override(reqObject, 'emit', (result, eventName, response) => {
     const chunks = [];
@@ -32,24 +50,10 @@ const catchHttpResponse = (reqObject, responseCb) => {
             statusCode: response.statusCode,
             statusMessage: response.statusMessage,
           };
-          const contentEncoding = getHeaderValue(
-            response.headers,
-            'content-encoding'
-          );
-          if (['gzip', 'deflate'].indexOf(contentEncoding) !== -1) {
-            const buffer = Buffer.concat(chunks);
-            const zlibFunc =
-              contentEncoding === 'gzip' ? zlib.gunzip : zlib.inflate;
-            zlibFunc(buffer, (_, decoded) => {
-              const stringBody = decoded.toString('utf8');
-              const request = { ...responseObj, body: stringBody };
-              responseCb(request);
-            });
-          } else {
-            const stringBody = chunks.map((c) => c.toString('utf8')).join('');
-            const request = { ...responseObj, body: stringBody };
-            responseCb(request);
-          }
+          const buffer = Buffer.concat(chunks);
+          const stringBody = tryDecompress(buffer).toString('utf8');
+          const request = { ...responseObj, body: stringBody };
+          responseCb(request);
         });
       }
     }
@@ -165,6 +169,7 @@ const catchExpressIncomingRequest = (req, res, incomingRequestCb) => {
   // we override write method ASAP cause otherwise if the request finishes too fast the response callback is not called
   let writeCount = 0;
   let firstData = '';
+  res.bodyWritten = '';
   override(req.socket, 'write', (result, data) => {
     writeCount++;
     if (writeCount === 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@belmonddev/catch-request-express-middleware",
-  "version": "3.3.3",
+  "version": "3.3.5",
   "main": "index.js",
   "author": "David Escalera",
   "license": "ISC",