@belmonddev/catch-request-express-middleware 1.0.2 → 1.2.0

package/index.js

@@ -97,7 +97,18 @@ const overrideHttpModule = (httpModule, requestSentCb) => {
   });
 };
 
-const catchExpressReceivedRequest = (req, res, requestReceivedCb) => {
+const callResponseCb = (responseCb, res) => {
+  responseCb({
+    headers: res.getHeaders(),
+    statusCode: res.statusCode,
+    statusMessage: res.statusMessage,
+    body: /application\/json;?.*?$/.test(res.getHeaders()['content-type'])
+      ? JSON.parse(res.bodyWritten)
+      : res.bodyWritten,
+  });
+};
+
+const callReceivedCbs = (req, res, requestReceivedCb) => {
   const responseCb = requestReceivedCb({
     headers: req.headers,
     method: req.method,
@@ -108,26 +119,46 @@ const catchExpressReceivedRequest = (req, res, requestReceivedCb) => {
     body: req.body,
   });
   if (responseCb) {
-    let body = '';
-    let writeCount = 0;
-    override(req.socket, 'write', (result, data) => {
-      writeCount++;
-      if (writeCount === 2) {
-        body = data.toString();
+    req.socket.setMaxListeners(100);
+    if (req.socketClosed) {
+      callResponseCb(responseCb, res);
+    } else {
+      req.socket.on('close', () => {
+        callResponseCb(responseCb, res);
+      });
+    }
+  }
+};
+
+const catchExpressReceivedRequest = (req, res, requestReceivedCb) => {
+  // we override write method ASAP cause otherwise if the request finishes too fast the response callback is not called
+  let writeCount = 0;
+  let firstData = '';
+  override(req.socket, 'write', (result, data) => {
+    writeCount++;
+    if (writeCount === 1) {
+      firstData = data;
+    } else if (writeCount === 2) {
+      res.bodyWritten = data.toString();
+      if (!res.bodyWritten.length) {
+        res.bodyWritten = firstData.split('\r\n\r\n')?.[1];
       }
+      req.socketClosed = true;
+    }
+  });
+
+  if (req.headers['content-type'] !== 'application/json') {
+    let body = '';
+    req.on('data', function (data) {
+      body += data;
     });
 
-    req.socket.setMaxListeners(100);
-    req.socket.on('close', () => {
-      responseCb({
-        headers: res.getHeaders(),
-        statusCode: res.statusCode,
-        statusMessage: res.statusMessage,
-        body: /application\/json;?.*?$/.test(res.getHeaders()['content-type'])
-          ? JSON.parse(body)
-          : body,
-      });
+    req.on('end', function () {
+      req.body = body;
+      callReceivedCbs(req, res, requestReceivedCb);
     });
+  } else {
+    callReceivedCbs(req, res, requestReceivedCb);
   }
 };
 

package/package.json

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