@nxtedition/nxt-undici 5.0.3 → 5.1.1

package/lib/index.js

@@ -14,7 +14,7 @@ export const interceptors = {
   proxy: (await import('./interceptor/proxy.js')).default,
   cache: (await import('./interceptor/cache.js')).default,
   requestId: (await import('./interceptor/request-id.js')).default,
-  lookup: (await import('./interceptor/lookup.js')).default,
+  dns: (await import('./interceptor/dns.js')).default,
 }
 
 export { parseHeaders } from './utils.js'
@@ -57,7 +57,7 @@ function wrapDispatch(dispatcher) {
       interceptors.responseError(),
       interceptors.requestBodyFactory(),
       interceptors.log(),
-      interceptors.lookup(),
+      interceptors.dns(),
       interceptors.requestId(),
       interceptors.responseRetry(),
       interceptors.responseVerify(),
@@ -97,6 +97,7 @@ function wrapDispatch(dispatcher) {
             error: opts.error ?? true,
             verify: opts.verify ?? true,
             logger: opts.logger ?? null,
+            dns: opts.dns ?? true,
             connect: opts.connect,
             lookup: opts.lookup ?? defaultLookup,
             maxRedirections: 0, // TODO (fix): Ugly hack to disable undici redirections.

package/lib/interceptor/dns.js

@@ -0,0 +1,22 @@
+import net from 'node:net'
+import { resolve4 } from 'node:dns/promises'
+
+export default () => (dispatch) => {
+  return async (opts, handler) => {
+    if (!opts.dns) {
+      return dispatch(opts, handler)
+    }
+
+    const origin = new URL(opts.origin)
+
+    if (net.isIP(origin.hostname)) {
+      return dispatch(opts, handler)
+    }
+
+    const host = origin.host
+    const records = await resolve4(origin.hostname)
+    origin.hostname = records[Math.floor(Math.random() * records.length)]
+
+    return dispatch({ ...opts, origin, headers: { ...opts.headers, host } }, handler)
+  }
+}

package/lib/interceptor/log.js

@@ -45,13 +45,23 @@ class Handler extends DecoratorHandler {
     })
   }
 
-  onUpgrade(statusCode, rawHeaders, socket, headers) {
-    this.#logger.debug('upstream request upgraded')
+  onUpgrade(statusCode, rawHeaders, socket, 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 upgraded',
+    )
+
     socket.on('close', () => {
       this.#logger.debug('upstream request socket closed')
     })
 
-    return this.#handler.onUpgrade(statusCode, rawHeaders, socket, headers)
+    return this.#handler.onUpgrade(statusCode, null, socket, headers)
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {

package/lib/interceptor/proxy.js

@@ -13,12 +13,12 @@ class Handler extends DecoratorHandler {
     this.#opts = proxyOpts
   }
 
-  onUpgrade(statusCode, rawHeaders, socket) {
+  onUpgrade(statusCode, rawHeaders, socket, headers = parseHeaders(rawHeaders)) {
     return this.#handler.onUpgrade(
       statusCode,
       reduceHeaders(
         {
-          headers: rawHeaders,
+          headers,
           httpVersion: this.#opts.httpVersion ?? this.#opts.req?.httpVersion,
           socket: this.#opts.socket,
           proxyName: this.#opts.name,

package/lib/interceptor/response-retry.js

@@ -121,7 +121,7 @@ class Handler extends DecoratorHandler {
       assert(Number.isFinite(this.#pos))
       assert(this.#end == null || Number.isFinite(this.#end))
 
-      return this.#onHeaders(statusCode, rawHeaders, resume, statusMessage, headers)
+      return this.#onHeaders(statusCode, null, resume, statusMessage, headers)
     } else if (statusCode === 206 || (this.#pos === 0 && statusCode === 200)) {
       assert(this.#etag != null || !this.#pos)
 

package/lib/interceptor/response-verify.js

@@ -82,6 +82,6 @@ class Handler extends DecoratorHandler {
 }
 
 export default () => (dispatch) => (opts, handler) =>
-  !opts.upgrade && opts.verify !== false
+  !opts.upgrade && opts.verify !== false && opts.method !== 'HEAD'
     ? dispatch(opts, new Handler(opts, { handler }))
     : dispatch(opts, handler)

package/lib/request.js

@@ -159,7 +159,8 @@ export function request(dispatch, url, opts) {
     }
 
     if (opts == null && typeof url === 'object' && url != null) {
-      opts = url
+      url.protocol ??= 'http:'
+      opts = { protocol: 'http:', ...url }
     }
 
     dispatch(opts, new RequestHandler(opts, resolve))

package/lib/utils.js

@@ -263,10 +263,6 @@ export class DecoratorHandler {
     return this.#handler.onUpgrade?.(...args)
   }
 
-  onResponseStarted(...args) {
-    return this.#handler.onResponseStarted?.(...args)
-  }
-
   onHeaders(...args) {
     return this.#handler.onHeaders?.(...args)
   }
@@ -278,10 +274,6 @@ export class DecoratorHandler {
   onComplete(...args) {
     return this.#handler.onComplete?.(...args)
   }
-
-  onBodySent(...args) {
-    return this.#handler.onBodySent?.(...args)
-  }
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "5.0.3",
+  "version": "5.1.1",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",
@@ -12,7 +12,7 @@
     "cache-control-parser": "^2.0.6",
     "http-errors": "^2.0.0",
     "lru-cache": "^11.0.2",
-    "undici": "^7.0.0"
+    "undici": "^6.0.0"
   },
   "devDependencies": {
     "@types/node": "^22.10.1",

package/lib/interceptor/lookup.js

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