@belmonddev/catch-request-express-middleware 3.2.1 → 3.2.3

package/index.js

@@ -56,16 +56,39 @@ 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, request) => {
-    const contentLength = getHeaderValue(
-      request.headers || {},
-      'content-length'
-    );
+  override(httpModule, 'request', (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 requestHasBody = !!contentLength;
-    const params = Object.fromEntries(
-      new URLSearchParams(request.query).entries()
-    );
+
+    const [pathname, query] = request.path.split('?');
+    const params = Object.fromEntries(new URLSearchParams(query).entries());
+
+    // add values not included in node-fetch v3+
+    request = {
+      ...request,
+      href: `${reqObject.protocol}//${reqObject.host}${request.path}`,
+      protocol: reqObject.protocol,
+      host: reqObject.host,
+      search: `&${query}`,
+      pathname,
+      query,
+    };
 
     let responseCb;
     if (requestHasBody) {

package/package.json

@@ -1,16 +1,10 @@
 {
   "name": "@belmonddev/catch-request-express-middleware",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "main": "index.js",
-  "scripts": {
-    "start": "nodemon -L --experimental-specifier-resolution=node ./src/index.js"
-  },
   "author": "David Escalera",
   "license": "ISC",
-  "dependencies": {},
-  "devDependencies": {
-    "nodemon": "^2.0.7"
-  },
+  "description": "",
   "type": "module",
-  "description": ""
+  "dependencies": {}
 }