@belmonddev/catch-request-express-middleware 3.2.4 → 3.3.0

package/index.js

@@ -56,36 +56,28 @@ const catchHttpResponse = (reqObject, responseCb) => {
   });
 };
 
-const transformHeaderValues = (headers = {}) => {
-  let transformedHeaders = {};
-  const headerEntries = Object.entries(headers);
-  headerEntries.forEach(([key, value]) => {
-    transformedHeaders[key] = typeof value === 'string' ? [value] : value;
-  });
-
-  return transformedHeaders;
-};
-
-const overrideHttpModule = (httpModule, requestSentCb) => {
-  override(httpModule, 'request', (reqObject, urlOrRequest, request) => {
+const overrideHttpModule = (httpModule, outgoingRequestCb) => {
+  override(httpModule, 'request', async (reqObject, urlOrRequest, request) => {
     // node-fetch v3+ will return the 2nd arg as url, so correctly identify the request object
     request = typeof urlOrRequest === 'string' ? request : urlOrRequest;
 
-    // transform headers to use array values instead of string
-    const headers = transformHeaderValues(request.headers);
-    const contentLength = getHeaderValue(headers, 'content-length');
+    const contentLength = getHeaderValue(request.headers, 'content-length');
     const requestHasBody = !!contentLength;
 
-    const [pathname, query] = request.path.split('?');
-    const params = Object.fromEntries(new URLSearchParams(query).entries());
+    const [pathname, search] = request.path.split('?');
+    const query = search
+      ? Object.fromEntries(new URLSearchParams(search).entries())
+      : {};
 
     // add values not included in node-fetch v3+
     request = {
-      ...request,
-      href: `${reqObject.protocol}//${reqObject.host}${request.path}`,
-      protocol: reqObject.protocol,
+      requestDirection: 'outgoing',
+      originalRequest: request,
+      headers: request.headers,
+      protocol: reqObject.protocol?.replace(':', ''),
+      method: request.method,
       host: reqObject.host,
-      search: `&${query}`,
+      search: search ? `?${search}` : null,
       pathname,
       query,
     };
@@ -98,10 +90,9 @@ const overrideHttpModule = (httpModule, requestSentCb) => {
         requestBody += body;
       });
 
-      override(reqObject, 'end', () => {
-        responseCb = requestSentCb({
+      override(reqObject, 'end', async () => {
+        responseCb = await outgoingRequestCb({
           ...request,
-          params,
           body: requestBody,
         });
 
@@ -110,7 +101,7 @@ const overrideHttpModule = (httpModule, requestSentCb) => {
         }
       });
     } else {
-      responseCb = requestSentCb({ ...request, params, body: null });
+      responseCb = await outgoingRequestCb({ ...request, body: {} });
       if (responseCb) {
         catchHttpResponse(reqObject, responseCb);
       }
@@ -140,14 +131,16 @@ const callResponseCb = (responseCb, res) => {
   responseCb(response);
 };
 
-const callReceivedCbs = (req, res, requestReceivedCb, body) => {
-  const responseCb = requestReceivedCb({
+const callIncomingRequestsCbs = (req, res, incomingRequestsCb, body) => {
+  const responseCb = incomingRequestsCb({
+    requestDirection: 'incoming',
     originalRequest: req,
     headers: req.headers,
+    protocol: req.protocol,
     method: req.method,
     host: req.headers.host,
+    search: req._parsedUrl.search,
     pathname: req._parsedUrl.pathname,
-    params: req.params,
     query: req.query,
     body,
   });
@@ -164,7 +157,7 @@ const callReceivedCbs = (req, res, requestReceivedCb, body) => {
   }
 };
 
-const catchExpressReceivedRequest = (req, res, requestReceivedCb) => {
+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 = '';
@@ -182,7 +175,7 @@ const catchExpressReceivedRequest = (req, res, requestReceivedCb) => {
   });
 
   if (req.body !== undefined) {
-    callReceivedCbs(req, res, requestReceivedCb, req.body);
+    callIncomingRequestsCbs(req, res, incomingRequestCb, req.body);
   } else {
     const contentLength = getHeaderValue(req.headers, 'content-length');
     if (contentLength) {
@@ -191,25 +184,25 @@ const catchExpressReceivedRequest = (req, res, requestReceivedCb) => {
         body += data;
       });
       req.on('end', function () {
-        callReceivedCbs(req, res, requestReceivedCb, body);
+        callIncomingRequestsCbs(req, res, incomingRequestCb, body);
       });
     } else {
-      callReceivedCbs(req, res, requestReceivedCb, '');
+      callIncomingRequestsCbs(req, res, incomingRequestCb, '');
     }
   }
 };
 
 const catchRequestExpressMiddleware = (
-  requestReceivedCb = null,
-  requestSentCb = null
+  incomingRequestCb = null,
+  outgoingRequestCb = null
 ) => {
-  if (requestSentCb) {
-    overrideHttpModule(http, requestSentCb);
-    overrideHttpModule(https, requestSentCb);
+  if (outgoingRequestCb) {
+    overrideHttpModule(http, outgoingRequestCb);
+    overrideHttpModule(https, outgoingRequestCb);
   }
   return (req, res, next) => {
-    if (requestReceivedCb) {
-      catchExpressReceivedRequest(req, res, requestReceivedCb);
+    if (incomingRequestCb) {
+      catchExpressIncomingRequest(req, res, incomingRequestCb);
     }
     next();
   };

package/package.json

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