@nxtedition/nxt-undici 5.1.0 → 5.1.2

package/lib/index.js

@@ -15,7 +15,6 @@ export const interceptors = {
   cache: (await import('./interceptor/cache.js')).default,
   requestId: (await import('./interceptor/request-id.js')).default,
   dns: (await import('./interceptor/dns.js')).default,
-  lookup: (await import('./interceptor/lookup.js')).default,
 }
 
 export { parseHeaders } from './utils.js'
@@ -59,7 +58,6 @@ function wrapDispatch(dispatcher) {
       interceptors.requestBodyFactory(),
       interceptors.log(),
       interceptors.dns(),
-      interceptors.lookup(),
       interceptors.requestId(),
       interceptors.responseRetry(),
       interceptors.responseVerify(),

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

@@ -6,13 +6,7 @@ import { BodyReadable as Readable } from './readable.js'
 function noop() {}
 
 export class RequestHandler {
-  constructor(opts, resolve) {
-    if (!opts || typeof opts !== 'object') {
-      throw new InvalidArgumentError('invalid opts')
-    }
-
-    const { signal, method, body, highWaterMark } = opts
-
+  constructor({ signal, method, body, highWaterMark }, resolve) {
     try {
       if (typeof resolve !== 'function') {
         throw new InvalidArgumentError('invalid resolve')
@@ -149,19 +143,34 @@ export class RequestHandler {
 }
 
 export function request(dispatch, url, opts) {
-  return new Promise((resolve) => {
-    if (typeof url === 'string') {
-      opts = { url: new URL(url), ...opts }
-    } else if (url instanceof URL) {
-      opts = { url, ...opts }
-    } else if (typeof url.origin === 'string' && typeof (url.path ?? url.pathname) === 'string') {
-      opts = opts ? { ...url, ...opts } : url
-    }
+  if (!url || (typeof url !== 'string' && typeof url !== 'object' && !(url instanceof URL))) {
+    throw new InvalidArgumentError('invalid url')
+  }
 
-    if (opts == null && typeof url === 'object' && url != null) {
-      opts = url
-    }
+  if (opts != null && typeof opts !== 'object') {
+    throw new InvalidArgumentError('invalid opts')
+  }
+
+  if (typeof url === 'string') {
+    url = new URL(url)
+  } else if (typeof url === 'object' && url != null && opts == null) {
+    opts = url
+  }
+
+  let origin = url.origin
+
+  if (!origin) {
+    const protocol = url.protocol ?? 'http:'
+    const host = url.host ?? `${url.hostname}:${url.port ?? (protocol === 'https:' ? 443 : 80)}`
+    origin = `${protocol}//${host}`
+  }
+
+  let path = url.path
+  if (!path) {
+    path = url.search ? `${url.pathname}${url.search}` : url
+  }
+
+  opts = { ...opts, origin, path }
 
-    dispatch(opts, new RequestHandler(opts, resolve))
-  })
+  return new Promise((resolve) => dispatch(opts, new RequestHandler(opts, resolve)))
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "5.1.0",
+  "version": "5.1.2",
   "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
-}