@nxtedition/nxt-undici 5.1.1 → 5.1.3

package/lib/index.js

@@ -72,13 +72,11 @@ function wrapDispatch(dispatcher) {
           headers['user-agent'] = userAgent
         }
 
-        const url = opts.url ? new URL(opts.url) : null
-
         return dispatch(
           {
             id: opts.id,
-            origin: opts.origin ?? url?.origin,
-            path: opts.path ?? (url?.search ? `${url.pathname}${url.search}` : url?.pathname),
+            origin: opts.origin,
+            path: opts.path,
             method: opts.method ?? (opts.body ? 'POST' : 'GET'),
             body: opts.body,
             query: opts.query,

package/lib/interceptor/log.js

@@ -17,12 +17,15 @@ class Handler extends DecoratorHandler {
     end: -1,
   }
 
+  #statusCode
+  #headers
+
   constructor(opts, { handler }) {
     super(handler)
 
     this.#handler = handler
     this.#opts = opts
-    this.#logger = opts.logger
+    this.#logger = opts.logger.#logger.child({ ureq: opts })
 
     this.#created = performance.now()
   }
@@ -36,7 +39,6 @@ class Handler extends DecoratorHandler {
     this.#timing.data = -1
     this.#timing.end = -1
 
-    this.#logger = this.#logger.child({ ureq: this.#opts })
     this.#logger.debug('upstream request started')
 
     return this.#handler.onConnect((reason) => {
@@ -50,7 +52,6 @@ class Handler extends DecoratorHandler {
 
     this.#logger.debug(
       {
-        ureq: { id: this.#opts.id, url: String(this.#opts.url) },
         ures: { statusCode, headers },
         elapsedTime: this.#timing.headers,
       },
@@ -67,14 +68,8 @@ class Handler extends DecoratorHandler {
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
     this.#timing.headers = performance.now() - this.#created
 
-    this.#logger.debug(
-      {
-        ureq: { id: this.#opts.id, url: String(this.#opts.url) },
-        ures: { statusCode, headers },
-        elapsedTime: this.#timing.headers,
-      },
-      'upstream request response',
-    )
+    this.#statusCode = statusCode
+    this.#headers = headers
 
     return this.#handler.onHeaders(statusCode, null, resume, statusMessage, headers)
   }
@@ -95,9 +90,11 @@ class Handler extends DecoratorHandler {
     this.#logger.debug(
       {
         ures: {
+          statusCode: this.#statusCode,
+          headers: this.#headers,
+          timing: this.#timing,
           bytesRead: this.#pos,
           bytesReadPerSecond: (this.#pos * 1e3) / (this.#timing.end - this.#timing.data),
-          timing: this.#timing,
         },
         elapsedTime: this.#timing.end,
       },
@@ -111,10 +108,13 @@ class Handler extends DecoratorHandler {
     this.#timing.end = performance.now() - this.#created
 
     const data = {
+      ureq: this.#opts,
       ures: {
+        statusCode: this.#statusCode,
+        headers: this.#headers,
+        timing: this.#timing,
         bytesRead: this.#pos,
         bytesReadPerSecond: (this.#pos * 1e3) / (this.#timing.end - this.#timing.data),
-        timing: this.#timing,
       },
       elapsedTime: this.#timing.end,
       err,

package/lib/request.js

@@ -6,13 +6,7 @@ import { BodyReadable as Readable } from './readable.js'
 function noop() {}
 
 export class RequestHandler {
-  constructor(opts, resolve) {
-    if (!opts || typeof opts !== 'object') {
-      throw new InvalidArgumentError('invalid opts')
-    }
-
-    const { signal, method, body, highWaterMark } = opts
-
+  constructor({ signal, method, body, highWaterMark }, resolve) {
     try {
       if (typeof resolve !== 'function') {
         throw new InvalidArgumentError('invalid resolve')
@@ -149,20 +143,33 @@ export class RequestHandler {
 }
 
 export function request(dispatch, url, opts) {
-  return new Promise((resolve) => {
-    if (typeof url === 'string') {
-      opts = { url: new URL(url), ...opts }
-    } else if (url instanceof URL) {
-      opts = { url, ...opts }
-    } else if (typeof url.origin === 'string' && typeof (url.path ?? url.pathname) === 'string') {
-      opts = opts ? { ...url, ...opts } : url
-    }
+  if (!url || (typeof url !== 'string' && typeof url !== 'object' && !(url instanceof URL))) {
+    throw new InvalidArgumentError('invalid url')
+  }
 
-    if (opts == null && typeof url === 'object' && url != null) {
-      url.protocol ??= 'http:'
-      opts = { protocol: 'http:', ...url }
-    }
+  if (opts != null && typeof opts !== 'object') {
+    throw new InvalidArgumentError('invalid opts')
+  }
+
+  if (typeof url === 'string') {
+    url = new URL(url)
+  } else if (typeof url === 'object' && url != null && opts == null) {
+    opts = url
+  }
+
+  let origin = url.origin
+  if (!origin) {
+    const protocol = url.protocol ?? 'http:'
+    const host = url.host ?? `${url.hostname}:${url.port ?? (protocol === 'https:' ? 443 : 80)}`
+    origin = `${protocol}//${host}`
+  }
+
+  let path = url.path
+  if (!path) {
+    path = url.search ? `${url.pathname}${url.search}` : url.pathname
+  }
+
+  opts = { ...opts, origin, path }
 
-    dispatch(opts, new RequestHandler(opts, resolve))
-  })
+  return new Promise((resolve) => dispatch(opts, new RequestHandler(opts, resolve)))
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "5.1.1",
+  "version": "5.1.3",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",