@nxtedition/nxt-undici 6.2.31 → 6.2.33

package/lib/index.js

@@ -26,7 +26,29 @@ export { parseHeaders } from './utils.js'
 export { Client, Pool, Agent, getGlobalDispatcher, setGlobalDispatcher } from '@nxtedition/undici'
 
 function defaultLookup(origin, opts, callback) {
-  callback(null, Array.isArray(origin) ? origin[Math.floor(Math.random() * origin.length)] : origin)
+  try {
+    if (Array.isArray(origin)) {
+      origin = origin[Math.floor(Math.random() * origin.length)]
+    } else if (origin != null && typeof origin === 'object') {
+      const protocol = origin.protocol || 'http:'
+
+      let host = origin.host
+      if (!host && origin.hostname) {
+        const port = origin.port || (protocol === 'https:' ? 443 : 80)
+        host = `${origin.hostname}:${port}`
+      }
+
+      if (!host) {
+        throw new Error('invalid url')
+      }
+
+      origin = `${protocol}//${host}`
+    }
+
+    callback(null, origin)
+  } catch (err) {
+    callback(err, null)
+  }
 }
 
 export function compose(...interceptors) {
@@ -61,12 +83,12 @@ function wrapDispatch(dispatcher) {
       dispatcher,
       interceptors.log({ bindings: { intercept: 'upstream' } }),
       interceptors.requestBodyFactory(),
-      interceptors.lookup(),
       interceptors.responseRetry(),
       interceptors.responseVerify(),
       interceptors.proxy(),
       interceptors.cache(),
       interceptors.redirect(),
+      interceptors.lookup(),
       interceptors.log({ bindings: { intercept: 'downstream' } }),
       interceptors.requestId(),
       interceptors.responseError(),

package/package.json

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