@nxtedition/lib 23.3.4 → 23.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "23.3.4",
+  "version": "23.3.5",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",

package/serializers.js

@@ -22,6 +22,35 @@ function getHeaders(obj) {
   )
 }
 
+function getUrl(obj) {
+  if (!obj) {
+    return undefined
+  }
+
+  if (obj.url?.href) {
+    return obj.url.href
+  }
+
+  if (typeof obj.url === 'string') {
+    return obj.url
+  }
+
+  if (obj.origin) {
+    const { origin, path } = obj
+    if (path && path.startsWith('/') && origin.endsWith('/')) {
+      return `${origin.slice(0, -1)}${path}`
+    } else {
+      return `${origin}${path || ''}`
+    }
+  }
+
+  if (obj.hostname) {
+    return `${obj.protocol || 'http:'}//${obj.hostname}:${obj.port || { 'http:': 80, 'https:': 443 }[obj.protocol]}${obj.path || ''}`
+  }
+
+  return obj.path || obj.pathname
+}
+
 function getTiming(obj) {
   const timing = obj?.timing ?? obj.stats
   if (!timing) {
@@ -106,29 +135,13 @@ export default {
       body: typeof ures.body === 'string' ? ures.body : undefined,
       headers: getHeaders(ures),
     },
-  ureq: (ureq) => {
-    if (!ureq) {
-      return
-    }
-
-    const url = ureq.url?.href
-      ? ureq.url.href
-      : typeof ureq.url === 'string'
-        ? ureq.url
-        : ureq.origin
-          ? `${ureq.origin}${ureq.path || ''}`
-          : ureq.hostname
-            ? `${ureq.protocol || 'http:'}//${ureq.hostname}:${
-                ureq.port || { 'http:': 80, 'https:': 443 }[ureq.protocol]
-              }${ureq.path || ''}`
-            : ureq.path || ureq.pathname
-
-    return {
+  ureq: (ureq) =>
+    ureq && {
       id: ureq.id || getHeader(ureq, 'request-id'),
       userAgent: ureq.userAgent ?? getHeader(ureq, 'user-agent'),
       timing: getTiming(ureq),
       method: ureq.method,
-      url,
+      url: getUrl(ureq),
       body: typeof ureq.body === 'string' ? ureq.body : undefined,
       bytesWritten: ureq.bytesWritten,
       bytesReadPerSecond:
@@ -138,8 +151,7 @@ export default {
           : undefined),
       headers: getHeaders(ureq),
       query: ureq.query,
-    }
-  },
+    },
 }
 
 // TODO (fix): Merge with errros/serializeError.