@nxtedition/nxt-undici 6.4.18 → 6.4.19

package/lib/index.js

@@ -120,7 +120,7 @@ function wrapDispatch(dispatcher) {
             headersTimeout: opts.timeout?.headers ?? opts.headersTimeout,
             bodyTimeout: opts.timeout?.body ?? opts.bodyTimeout,
             idempotent: opts.idempotent,
-            retry: opts.retry ?? 4,
+            retry: opts.retry ?? 8,
             proxy: opts.proxy ?? false,
             cache: opts.cache ?? false,
             upgrade: opts.upgrade ?? false,
@@ -133,7 +133,7 @@ function wrapDispatch(dispatcher) {
             lookup: opts.lookup ?? defaultLookup,
           },
           handler,
-        )?.catch((err) => handler.onError(err))
+        )
       },
     )
     dispatcherCache.set(dispatcher, wrappedDispatcher)
@@ -142,7 +142,7 @@ function wrapDispatch(dispatcher) {
 }
 
 export function dispatch(dispatcher, opts, handler) {
-  return wrapDispatch(dispatcher)(opts, handler)?.catch((err) => handler.onError(err))
+  return wrapDispatch(dispatcher)(opts, handler)
 }
 
 export function request(url, opts) {

package/lib/interceptor/dns.js

@@ -66,7 +66,7 @@ export default () => (dispatch) => {
   }
 
   return async (opts, handler) => {
-    if (!opts || !opts.dns || !opts.origin) {
+    if (!opts.dns || !opts.origin) {
       return dispatch(opts, handler)
     }
 
@@ -74,83 +74,87 @@ export default () => (dispatch) => {
     const url = new URL(opts.path ?? '', opts.origin)
     const balance = opts.dns.balance
 
-    if (net.isIP(url.hostname)) {
+    const { host, hostname, pathname } = url
+
+    if (net.isIP(hostname)) {
       return dispatch(opts, handler)
     }
 
-    const { host, hostname } = url
+    try {
+      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 Object.assign(new Error('lookup failed: ' + err.message), { cause: err })
+        }
 
-      if (err) {
-        throw Object.assign(new Error('lookup failed: ' + err.message), { cause: err })
+        records = val
+      } else if (records.some((x) => x.expires < now + 1e3)) {
+        resolve(hostname, { ttl })
       }
 
-      records = val
-    } else if (records.some((x) => x.expires < now + 1e3)) {
-      resolve(hostname, { ttl })
-    }
+      let record
 
-    let record
+      if (balance === 'hash') {
+        HASHER ??= await xxhash()
 
-    if (balance === 'hash') {
-      HASHER ??= await xxhash()
+        const hash = HASHER.h32(pathname)
 
-      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
+        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
 
-    record.counter++
-    record.pending++
+      record.counter++
+      record.pending++
 
-    return dispatch(
-      { ...opts, origin: url.origin, headers: { ...opts.headers, host } },
-      new Handler(handler, (err, statusCode) => {
-        record.pending--
+      return dispatch(
+        { ...opts, origin: url.origin, headers: { ...opts.headers, host } },
+        new Handler(handler, (err, statusCode) => {
+          record.pending--
 
-        if (err != null && err.name !== 'AbortError') {
-          record.expires = 0
-        } else if (statusCode != null && statusCode >= 500) {
-          record.errored++
-        }
+          if (err != null && err.name !== 'AbortError') {
+            record.expires = 0
+          } else if (statusCode != null && statusCode >= 500) {
+            record.errored++
+          }
 
-        if (err != null || statusCode >= 500) {
-          record.timeout = getFastNow() + 10e3
-        }
-      }),
-    )
+          if (err != null || statusCode >= 500) {
+            record.timeout = getFastNow() + 10e3
+          }
+        }),
+      )
+    } catch (err) {
+      handler.onError(err)
+    }
   }
 }

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

@@ -1,13 +1,6 @@
-export default () => (dispatch) => (opts, handler) => {
-  if (typeof opts.body !== 'function') {
-    return dispatch(opts, handler)
-  }
-
-  const body = opts.body({ signal: opts.signal ?? undefined })
-
-  if (typeof body?.then !== 'function') {
-    return dispatch({ ...opts, body }, handler)
-  }
-
-  return body.then((body) => dispatch({ ...opts, body }, handler))
-}
+export default () => (dispatch) => (opts, handler) =>
+  typeof opts.body !== 'function'
+    ? dispatch(opts, handler)
+    : Promise.resolve(opts.body(opts))
+        .then((body) => dispatch({ ...opts, body }, handler))
+        .catch((err) => handler.onError(err))

package/package.json

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