Complete features for fetch, remove axios (#22)

* Complete features for fetch, remove axios

* cover

---------

Co-authored-by: Olivier Van den Mooter <olivier.vandenmooter@digipolis.be>

Author: vademo

example/index.js

@@ -1,5 +1,4 @@
 const express = require('express');
-const axios = require('axios');
 
 const { requestMiddleware, requestlogger } = require('../lib');
 
@@ -45,7 +44,7 @@ async function start() {
   try {
     initializeExpress();
     const startedapp = await startListening();
-    await axios.get('http://localhost:2000?page=1').catch(() => {});
+    await global.fetch('http://localhost:2000?page=1').catch(() => {});
     return startedapp;
   } catch (err) {
     console.log(`Error occured ${err}`);

lib/request.logger.js

@@ -16,57 +16,54 @@ module.exports = (config) => {
   if(original) {
     global.fetch = async (requestUrl, options) => {
       const parsedUrl = url.parse(requestUrl);
+      const params = Object.fromEntries(new URLSearchParams(parsedUrl.search));
       let correlationId;
       if (options && options.headers) {
         correlationId = options.headers['Dgp-Correlation'] || options.headers['dgp-correlation'] || validatedConfig.correlationIdfallback;
       }
 
       const timer = startTimer();
-      const response = await original(requestUrl, options)
-      const duration = timer.getDuration();
       const req = {
         headers: options?.headers || undefined,
         host: parsedUrl.host,
-        path: parsedUrl.path,
+        path: parsedUrl.pathname,
         method: options?.method || 'GET',
-        payload: options?.body || undefined,
+        payload: options?.body || params,
         search: parsedUrl.search,
       };
-      const res = {
-        status: response.status,
-        duration,
-      };
-      const log = logRequest(logger, correlationId, req, res, parsedUrl.protocol );
-      let logged = false;
-      if (validatedConfig.logResponsePayload) {
-        const json = () =>
-          response
-            .clone()
-            .json()
-            .then((data) => {
-              log(data);
-              logged = true;
-              return (data)
-            });
-        const text = () =>
-          response
-            .clone()
-            .text()
-            .then((data) => {
-              log(data);
-              logged = true;
-              return (data)
-            });
-        // Response is not parsed json/text
-        setTimeout(() => {
-          if(!logged) log();
-        }, 1)
-        response.json = json;
-        response.text = text;
-      } else {
+      try {
+        const response = await original(requestUrl, options)
+        const duration = timer.getDuration();
+        const res = {
+          headers: Object.fromEntries(response.headers),
+          status: response.status,
+          duration,
+        };
+        const log = logRequest(logger, correlationId, req, res, parsedUrl.protocol );
+        if (validatedConfig.logResponsePayload) {
+          try {
+            if(response.json) {
+              const json = await response.clone().json();
+              log(json);
+            }
+          } catch {
+            const text = await response.clone().text();
+            log(text);
+          }
+        } else {
+          log();
+        }
+        return response;
+      } catch(e) {
+        const duration = timer.getDuration();
+        const res = {
+          status: `${e.message}: ${e.cause?.code}`,
+          duration,
+        };
+        const log = logRequest(logger, correlationId, req, res, parsedUrl.protocol );
         log();
+        throw e;
       }
-      return response;
     }
   }
 

lib/request.middleware.js

@@ -45,7 +45,7 @@ module.exports = (config) => {
             payload: req.body,
           },
           response: {
-            headers: res.getHeaders(),
+            headers:  { ...res.getHeaders() },
             status: res.statusCode,
             duration: timer.getDuration(),
             payload: responsebody,

package-lock.json

@@ -26,14 +26,13 @@
     "@digipolis/log": "^1.1.1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.33.0",
+    "@eslint/js": "^9.35.0",
     "eslint-plugin-mocha": "^11.1.0",
-    "axios": "^1.11.0",
     "c8": "^10.1.3",
     "jsonschema": "^1.5.0",
     "express": "^5.1.0",
-    "globals": "^16.3.0",
-    "mocha": "^11.7.1",
+    "globals": "^16.4.0",
+    "mocha": "^11.7.2",
     "sinon": "^21.0.0"
   }
 }

package.json

@@ -14,6 +14,7 @@ function initializeExpress(config) {
   });
   app.get('/externalcall', (req, res) => res.json({ ok: 'ok' }));
   app.post('/externalcall', (req, res) => res.json({ ok: 'ok' }));
+  app.get('/externalcalltext', (req, res) => res.send('ok'));
   app.use(requestMiddleware(config));
 
   app.get('/internalcall', (req, res) => res.json({ ok: 'ok' }));