@nxtedition/nxt-undici 6.3.21 → 6.4.1

package/lib/interceptor/dns.js

@@ -1,6 +1,9 @@
 import net from 'node:net'
 import * as dns from 'node:dns'
 import { DecoratorHandler, getFastNow } from '../utils.js'
+import xxhash from 'xxhash-wasm'
+
+let HASHER
 
 class Handler extends DecoratorHandler {
   #callback
@@ -48,6 +51,7 @@ export default () => (dispatch) => {
               pending: 0,
               errored: 0,
               counter: 0,
+              timeout: 0,
             }))
 
             cache.set(hostname, val)
@@ -67,14 +71,15 @@ export default () => (dispatch) => {
     }
 
     const ttl = opts.dns.ttl ?? 2e3
-    const origin = new URL(opts.origin)
+    const url = new URL(opts.path ?? '', opts.origin)
+    const balance = opts.dns.balance
 
-    if (net.isIP(origin.hostname)) {
+    if (net.isIP(url.hostname)) {
       return dispatch(opts, handler)
     }
 
     try {
-      const { host, hostname } = origin
+      const { host, hostname } = url
 
       const now = getFastNow()
 
@@ -92,11 +97,34 @@ export default () => (dispatch) => {
         resolve(hostname, { ttl })
       }
 
-      records.sort(
-        (a, b) => a.errored - b.errored || a.pending - b.pending || a.counter - b.counter,
-      )
+      let record
+
+      if (balance === 'hash') {
+        HASHER ??= await xxhash()
+
+        const hash = HASHER.h32(url.href)
+
+        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 record = records.find((x) => x.expires >= now)
+      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
+          }
+        }
+      }
 
       if (!record) {
         throw Object.assign(new Error(`No available DNS records found for ${hostname}`), {
@@ -104,10 +132,10 @@ export default () => (dispatch) => {
         })
       }
 
-      origin.hostname = record.address
+      url.hostname = record.address
 
       dispatch(
-        { ...opts, origin, headers: { ...opts.headers, host } },
+        { ...opts, origin: url.origin, headers: { ...opts.headers, host } },
         new Handler(handler, (err, statusCode) => {
           record.pending--
 
@@ -116,6 +144,10 @@ export default () => (dispatch) => {
           } else if (statusCode != null && statusCode >= 500) {
             record.errored++
           }
+
+          if (err != null || statusCode >= 500) {
+            record.timeout = getFastNow() + 10e3
+          }
         }),
       )
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "6.3.21",
+  "version": "6.4.1",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",
@@ -12,7 +12,8 @@
     "@nxtedition/undici": "^11.0.0",
     "cache-control-parser": "^2.0.6",
     "fast-querystring": "^1.1.2",
-    "http-errors": "^2.0.0"
+    "http-errors": "^2.0.0",
+    "xxhash-wasm": "^1.1.0"
   },
   "devDependencies": {
     "@types/node": "^22.13.10",