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

package/index.js

@@ -98,13 +98,19 @@ const overrideHttpModule = (httpModule, requestSentCb) => {
 };
 
 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;
+  }
   responseCb({
     headers: res.getHeaders(),
     statusCode: res.statusCode,
     statusMessage: res.statusMessage,
-    body: /application\/json;?.*?$/.test(res.getHeaders()['content-type'])
-      ? JSON.parse(res.bodyWritten)
-      : res.bodyWritten,
+    body,
   });
 };
 
@@ -113,7 +119,7 @@ const callReceivedCbs = (req, res, requestReceivedCb) => {
     headers: req.headers,
     method: req.method,
     host: req.headers.host,
-    pathname: req.url,
+    pathname: req._parsedUrl.pathname,
     params: req.params,
     query: req.query,
     body: req.body,
@@ -162,11 +168,18 @@ const catchExpressReceivedRequest = (req, res, requestReceivedCb) => {
   }
 };
 
-const catchRequestExpressMiddleware = (requestReceivedCb, requestSentCb) => {
-  overrideHttpModule(http, requestSentCb);
-  overrideHttpModule(https, requestSentCb);
+const catchRequestExpressMiddleware = (
+  requestReceivedCb = null,
+  requestSentCb = null
+) => {
+  if (requestSentCb) {
+    overrideHttpModule(http, requestSentCb);
+    overrideHttpModule(https, requestSentCb);
+  }
   return (req, res, next) => {
-    catchExpressReceivedRequest(req, res, requestReceivedCb);
+    if (requestReceivedCb) {
+      catchExpressReceivedRequest(req, res, requestReceivedCb);
+    }
     next();
   };
 };

package/package.json

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