@nxtedition/nxt-undici 3.3.0 → 3.3.2

package/lib/index.js

@@ -20,7 +20,7 @@ export const interceptors = {
 export { parseHeaders } from './utils.js'
 export { Client, Pool, Agent, getGlobalDispatcher, setGlobalDispatcher } from '@nxtedition/undici'
 
-function wrapdDispatcher(dispatcher) {
+function wrapDispatcher(dispatcher) {
   let wrappedDispatcher = dispatcherCache.get(dispatcher)
   if (wrappedDispatcher == null) {
     wrappedDispatcher = dispatcher.compose(
@@ -35,6 +35,45 @@ function wrapdDispatcher(dispatcher) {
       interceptors.redirect(),
       interceptors.cache(),
       interceptors.proxy(),
+      (dispatch) => (opts, handler) => {
+        const headers = parseHeaders(opts.headers)
+
+        const userAgent = opts.userAgent ?? globalThis.userAgent
+        if (userAgent && headers?.['user-agent'] !== userAgent) {
+          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),
+            method: opts.method ?? (opts.body ? 'POST' : 'GET'),
+            body: opts.body,
+            query: opts.query,
+            headers,
+            signal: opts.signal,
+            reset: opts.reset ?? false,
+            blocking: opts.blocking ?? false,
+            headersTimeout: opts.headersTimeout,
+            bodyTimeout: opts.bodyTimeout,
+            idempotent: opts.idempotent,
+            retry: opts.retry ?? 8,
+            proxy: opts.proxy ?? false,
+            cache: opts.cache ?? false,
+            upgrade: opts.upgrade ?? false,
+            follow: opts.follow ?? 8,
+            error: opts.error ?? true,
+            verify: opts.verify ?? true,
+            logger: opts.logger ?? null,
+            lookup: opts.lookup ?? null,
+            dns: opts.dns ?? true,
+          },
+          handler,
+        )
+      },
     )
     dispatcherCache.set(dispatcher, wrappedDispatcher)
   }
@@ -42,67 +81,23 @@ function wrapdDispatcher(dispatcher) {
 }
 
 export function dispatch(dispatcher, opts, handler) {
-  return wrapdDispatcher(opts.dispatcher ?? undici.getGlobalDispatcher()).dispatch(opts, handler)
+  return wrapDispatcher(dispatcher).dispatch(opts, handler)
 }
 
 export async function request(url, opts) {
   // TODO (fix): More argument validation...
 
   if (typeof url === 'string') {
-    url = new URL(url)
+    opts = { url: new URL(url), ...opts }
   } else if (url instanceof URL) {
-    // Do nothing...
+    opts = { url, ...opts }
   } else if (typeof url.origin === 'string' && typeof (url.path ?? url.pathname) === 'string') {
-    // Do nothing...
+    opts = { url, ...opts }
   }
 
   if (opts == null && typeof url === 'object' && url != null) {
     opts = url
   }
 
-  if (url) {
-    // Do nothing...
-  } else if (typeof opts.url === 'string') {
-    url = new URL(opts.url)
-  } else if (url.url instanceof URL) {
-    url = opts.url
-  } else if (typeof opts.origin === 'string' && typeof (opts.path ?? opts.pathname) === 'string') {
-    url = opts
-  } else {
-    throw new Error('missing url')
-  }
-
-  const method = opts.method ?? (opts.body ? 'POST' : 'GET')
-  const headers = parseHeaders(opts.headers)
-
-  const userAgent = opts.userAgent ?? globalThis.userAgent
-  if (userAgent && headers?.['user-agent'] !== userAgent) {
-    headers['user-agent'] = userAgent
-  }
-
-  return await wrapdDispatcher(opts.dispatcher ?? undici.getGlobalDispatcher()).request({
-    id: opts.id,
-    origin: url.origin,
-    path: url.path ?? (url.search ? `${url.pathname}${url.search}` : url.pathname),
-    method,
-    body: opts.body,
-    query: opts.query,
-    headers,
-    signal: opts.signal,
-    reset: opts.reset ?? false,
-    blocking: opts.blocking ?? false,
-    headersTimeout: opts.headersTimeout,
-    bodyTimeout: opts.bodyTimeout,
-    idempotent: opts.idempotent,
-    retry: opts.retry ?? 8,
-    proxy: opts.proxy ?? false,
-    cache: opts.cache ?? false,
-    upgrade: opts.upgrade ?? false,
-    follow: opts.follow ?? 8,
-    error: opts.error ?? true,
-    verify: opts.verify ?? true,
-    logger: opts.logger ?? null,
-    lookup: opts.lookup ?? null,
-    dns: opts.dns ?? true,
-  })
+  return await wrapDispatcher(opts.dispatcher ?? undici.getGlobalDispatcher()).request(opts)
 }

package/lib/interceptor/log.js

@@ -7,8 +7,14 @@ class Handler extends DecoratorHandler {
   #aborted = false
   #logger
   #pos
-  #timing
-  #startTime = performance.now()
+  #timing = {
+    created: performance.now(),
+    connect: -1,
+    headers: -1,
+    data: -1,
+    complete: -1,
+    error: -1,
+  }
 
   constructor(opts, { handler }) {
     super(handler)
@@ -21,13 +27,7 @@ class Handler extends DecoratorHandler {
   onConnect(abort) {
     this.#pos = 0
     this.#abort = abort
-    this.#timing = {
-      connect: performance.now() - this.#startTime,
-      headers: -1,
-      data: -1,
-      complete: -1,
-      error: -1,
-    }
+    this.#timing.connect = performance.now() - this.#timing.created
 
     this.#logger.debug({ ureq: this.#opts }, 'upstream request started')
 
@@ -47,7 +47,7 @@ class Handler extends DecoratorHandler {
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
-    this.#timing.headers = performance.now() - this.#timing.connect - this.#startTime
+    this.#timing.headers = performance.now() - this.#timing.connect - this.#timing.created
 
     this.#logger.debug(
       {
@@ -62,7 +62,7 @@ class Handler extends DecoratorHandler {
 
   onData(chunk) {
     if (this.#timing.data === -1) {
-      this.#timing.data = performance.now() - this.#timing.headers - this.#startTime
+      this.#timing.data = performance.now() - this.#timing.headers - this.#timing.created
     }
 
     this.#pos += chunk.length
@@ -71,7 +71,7 @@ class Handler extends DecoratorHandler {
   }
 
   onComplete(rawTrailers) {
-    this.#timing.complete = performance.now() - this.#timing.data - this.#startTime
+    this.#timing.complete = performance.now() - this.#timing.data - this.#timing.created
 
     this.#logger.debug(
       { elapsedTime: this.#timing.complete, bytesRead: this.#pos, timing: this.#timing },
@@ -82,7 +82,7 @@ class Handler extends DecoratorHandler {
   }
 
   onError(err) {
-    this.#timing.error = performance.now() - this.#timing.data - this.#startTime
+    this.#timing.error = performance.now() - this.#timing.data - this.#timing.created
 
     if (this.#aborted) {
       this.#logger.debug(

package/lib/utils.js

@@ -250,6 +250,7 @@ export function bodyLength(body) {
 
 export class DecoratorHandler {
   #handler
+  #onConnectCalled = false
 
   constructor(handler) {
     if (typeof handler !== 'object' || handler === null) {
@@ -259,10 +260,15 @@ export class DecoratorHandler {
   }
 
   onConnect(...args) {
+    this.#onConnectCalled = true
     return this.#handler.onConnect?.(...args)
   }
 
   onError(...args) {
+    if (!this.#onConnectCalled) {
+      this.#onConnectCalled = true
+      this.#handler.onConnect?.(...args)
+    }
     return this.#handler.onError?.(...args)
   }
 

package/package.json

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