@nxtedition/nxt-undici 6.4.11 → 6.4.13

package/lib/interceptor/dns.js

@@ -78,83 +78,79 @@ export default () => (dispatch) => {
       return dispatch(opts, handler)
     }
 
-    try {
-      const { host, hostname } = url
+    const { host, hostname } = url
 
-      const now = getFastNow()
+    const now = getFastNow()
 
-      let records = cache.get(hostname)
+    let records = cache.get(hostname)
 
-      if (records == null || records.every((x) => x.expires < now)) {
-        const [err, val] = await resolve(hostname, { ttl })
+    if (records == null || records.every((x) => x.expires < now)) {
+      const [err, val] = await resolve(hostname, { ttl })
 
-        if (err) {
-          throw err
-        }
-
-        records = val
-      } else if (records.some((x) => x.expires < now + 1e3)) {
-        resolve(hostname, { ttl })
+      if (err) {
+        throw err
       }
 
-      let record
+      records = val
+    } else if (records.some((x) => x.expires < now + 1e3)) {
+      resolve(hostname, { ttl })
+    }
 
-      if (balance === 'hash') {
-        HASHER ??= await xxhash()
+    let record
 
-        const hash = HASHER.h32(url.pathname)
+    if (balance === 'hash') {
+      HASHER ??= await xxhash()
 
-        for (let i = 0; i < records.length; i++) {
-          const idx = (hash + i) % records.length
-          if (records[idx].expires >= now && records[idx].timeout < now) {
-            record = records[idx]
-            break
-          }
+      const hash = HASHER.h32(url.pathname)
+
+      for (let i = 0; i < records.length; i++) {
+        const idx = (hash + i) % records.length
+        if (records[idx].expires >= now && records[idx].timeout < now) {
+          record = records[idx]
+          break
         }
       }
+    }
 
-      if (record == null) {
-        records.sort(
-          (a, b) => a.errored - b.errored || a.pending - b.pending || a.counter - b.counter,
-        )
+    if (record == null) {
+      records.sort(
+        (a, b) => a.errored - b.errored || a.pending - b.pending || a.counter - b.counter,
+      )
 
-        for (let i = 0; i < records.length; i++) {
-          if (records[i].expires >= now) {
-            record = records[i]
-            break
-          }
+      for (let i = 0; i < records.length; i++) {
+        if (records[i].expires >= now) {
+          record = records[i]
+          break
         }
       }
+    }
 
-      if (!record) {
-        throw Object.assign(new Error(`No available DNS records found for ${hostname}`), {
-          code: 'ENOTFOUND',
-        })
-      }
+    if (!record) {
+      throw Object.assign(new Error(`No available DNS records found for ${hostname}`), {
+        code: 'ENOTFOUND',
+      })
+    }
 
-      url.hostname = record.address
+    url.hostname = record.address
 
-      dispatch(
-        { ...opts, origin: url.origin, headers: { ...opts.headers, host } },
-        new Handler(handler, (err, statusCode) => {
-          record.pending--
+    record.counter++
+    record.pending++
 
-          if (err != null && err.name !== 'AbortError') {
-            record.expires = 0
-          } else if (statusCode != null && statusCode >= 500) {
-            record.errored++
-          }
+    return dispatch(
+      { ...opts, origin: url.origin, headers: { ...opts.headers, host } },
+      new Handler(handler, (err, statusCode) => {
+        record.pending--
 
-          if (err != null || statusCode >= 500) {
-            record.timeout = getFastNow() + 10e3
-          }
-        }),
-      )
+        if (err != null && err.name !== 'AbortError') {
+          record.expires = 0
+        } else if (statusCode != null && statusCode >= 500) {
+          record.errored++
+        }
 
-      record.counter++
-      record.pending++
-    } catch (err) {
-      handler.onError(err)
-    }
+        if (err != null || statusCode >= 500) {
+          record.timeout = getFastNow() + 10e3
+        }
+      }),
+    )
   }
 }

package/lib/interceptor/log.js

@@ -7,8 +7,9 @@ class Handler extends DecoratorHandler {
   #abort
   #aborted = false
   #pos = 0
+  #created = performance.now()
   #timing = {
-    created: performance.now(),
+    created: -1,
     connect: -1,
     headers: -1,
     data: -1,
@@ -29,13 +30,14 @@ class Handler extends DecoratorHandler {
     }
 
     this.#logger.debug('upstream request started')
+    this.#timing.created = this.#created + performance.timeOrigin
   }
 
   onConnect(abort) {
     this.#pos = 0
     this.#abort = abort
 
-    this.#timing.connect = performance.now() - this.#timing.created
+    this.#timing.connect = performance.now() - this.#created
     this.#timing.headers = -1
     this.#timing.data = -1
     this.#timing.end = -1
@@ -47,7 +49,7 @@ class Handler extends DecoratorHandler {
   }
 
   onUpgrade(statusCode, headers, socket) {
-    this.#timing.headers = performance.now() - this.#timing.created
+    this.#timing.headers = performance.now() - this.#created
 
     this.#logger.debug(
       {
@@ -65,7 +67,7 @@ class Handler extends DecoratorHandler {
   }
 
   onHeaders(statusCode, headers, resume) {
-    this.#timing.headers = performance.now() - this.#timing.created
+    this.#timing.headers = performance.now() - this.#created
     this.#statusCode = statusCode
     this.#headers = headers
 
@@ -74,7 +76,7 @@ class Handler extends DecoratorHandler {
 
   onData(chunk) {
     if (this.#timing.data === -1) {
-      this.#timing.data = performance.now() - this.#timing.created
+      this.#timing.data = performance.now() - this.#created
     }
 
     this.#pos += chunk.length
@@ -83,7 +85,7 @@ class Handler extends DecoratorHandler {
   }
 
   onComplete() {
-    this.#timing.end = performance.now() - this.#timing.created
+    this.#timing.end = performance.now() - this.#created
 
     const data = {
       ureq: this.#opts,
@@ -109,7 +111,7 @@ class Handler extends DecoratorHandler {
   }
 
   onError(err) {
-    this.#timing.end = performance.now() - this.#timing.created
+    this.#timing.end = performance.now() - this.#created
 
     const data = {
       ures: {

package/lib/interceptor/lookup.js

@@ -1,29 +1,14 @@
-export default () => (dispatch) => (opts, handler) => {
+export default () => (dispatch) => async (opts, handler) => {
   const lookup = opts.lookup
 
   if (!lookup) {
     return dispatch(opts, handler)
   }
 
-  const callback = (err, origin) => {
-    if (err) {
-      handler.onError(err)
-    } else if (!origin) {
-      handler.onError(new Error('invalid origin: ' + origin))
-    } else {
-      dispatch({ ...opts, origin }, handler)
-    }
+  const origin = await lookup(opts.origin, { signal: opts.signal ?? undefined })
+  if (!origin) {
+    throw new Error('invalid origin: ' + origin)
   }
 
-  try {
-    const thenable = lookup(opts.origin, { signal: opts.signal ?? undefined }, callback)
-    if (typeof thenable?.then === 'function') {
-      thenable.then(
-        (val) => callback(null, val),
-        (err) => callback(err),
-      )
-    }
-  } catch (err) {
-    callback(err)
-  }
+  return dispatch({ ...opts, origin }, handler)
 }

package/lib/interceptor/redirect.js

@@ -143,7 +143,11 @@ class Handler extends DecoratorHandler {
 
       this.#location = null
 
-      this.#dispatch(this.#opts, this)
+      try {
+        this.#dispatch(this.#opts, this)?.catch((err) => this.onError(err))
+      } catch (err) {
+        this.onError(err)
+      }
     } else {
       super.onComplete(trailers)
     }

package/lib/interceptor/request-body-factory.js

@@ -9,12 +9,5 @@ export default () => (dispatch) => (opts, handler) => {
     return dispatch({ ...opts, body }, handler)
   }
 
-  body.then(
-    (body) => {
-      dispatch({ ...opts, body }, handler)
-    },
-    (err) => {
-      handler.onError(err)
-    },
-  )
+  return body.then((body) => dispatch({ ...opts, body }, handler))
 }

package/lib/interceptor/response-retry.js

@@ -280,7 +280,7 @@ class Handler extends DecoratorHandler {
           this.#retryCount++
           this.#retryError = err
 
-          this.#dispatch(this.#opts, this)
+          return this.#dispatch(this.#opts, this)
         } else {
           assert(Number.isFinite(this.#pos))
           assert(this.#end == null || (Number.isFinite(this.#end) && this.#end > 0))
@@ -292,7 +292,7 @@ class Handler extends DecoratorHandler {
           this.#retryCount++
           this.#retryError = err
 
-          this.#dispatch(this.#opts, this)
+          return this.#dispatch(this.#opts, this)
         }
       })
       .catch((err) => {

package/lib/request.js

@@ -190,5 +190,7 @@ export function request(dispatch, url, opts) {
     body: isStream(opts?.body) && opts.body.closed ? null : opts?.body,
   }
 
-  return new Promise((resolve) => dispatch(opts, new RequestHandler(opts, resolve)))
+  return new Promise((resolve, reject) =>
+    dispatch(opts, new RequestHandler(opts, resolve))?.catch(reject),
+  )
 }

package/package.json

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