@nxtedition/nxt-undici 4.2.2 → 4.2.4

package/lib/index.js

@@ -1,4 +1,4 @@
-import undici from '@nxtedition/undici'
+import undici from 'undici'
 import { parseHeaders } from './utils.js'
 
 const dispatcherCache = new WeakMap()
@@ -18,7 +18,7 @@ export const interceptors = {
 }
 
 export { parseHeaders } from './utils.js'
-export { Client, Pool, Agent, getGlobalDispatcher, setGlobalDispatcher } from '@nxtedition/undici'
+export { Client, Pool, Agent, getGlobalDispatcher, setGlobalDispatcher } from 'undici'
 
 function wrapDispatcher(dispatcher) {
   let wrappedDispatcher = dispatcherCache.get(dispatcher)
@@ -79,6 +79,7 @@ function wrapDispatcher(dispatcher) {
                     ? origin[Math.floor(Math.random() * origin.length)]
                     : origin,
                 )),
+            maxRedirections: 0, // TODO (fix): Ugly hack to disable undici redirections.
           },
           handler,
         )

package/lib/interceptor/dns.js

@@ -57,9 +57,9 @@ export default (interceptorOpts) => (dispatch) => (opts, handler) => {
 
   assert(typeof resolver.lookup === 'function')
 
-  const { hostname } = new URL(opts.origin)
+  const { hostname, host } = new URL(opts.origin)
 
-  if (net.isIP(hostname)) {
+  if (net.isIP(hostname) || opts.headers?.host) {
     return dispatch(opts, handler)
   }
 
@@ -72,7 +72,11 @@ export default (interceptorOpts) => (dispatch) => (opts, handler) => {
         ? val[Math.floor(val.length * Math.random())].address
         : val?.address ?? val
       dispatch(
-        { ...opts, origin: url.origin, headers: { ...opts.headers, host: url.host } },
+        {
+          ...opts,
+          origin: url.origin,
+          headers: { ...opts.headers, host },
+        },
         resolver.clear ? new Handler({ resolver, key: hostname }, { handler }) : handler,
       )
     }

package/lib/utils.js

@@ -1,7 +1,7 @@
 import tp from 'node:timers/promises'
 import cacheControlParser from 'cache-control-parser'
 import stream from 'node:stream'
-import { util } from '@nxtedition/undici'
+import { util } from 'undici'
 
 export function parseCacheControl(str) {
   return str ? cacheControlParser.parse(str) : null
@@ -194,15 +194,6 @@ export function parseOrigin(url) {
   return url
 }
 
-/**
- * @param {Record<string, string | string[] | null | undefined> | (Buffer | string | (Buffer | string)[])[]} headers
- * @param {Record<string, string | string[]>} [obj]
- * @returns {Record<string, string | string[]>}
- */
-export function parseHeaders(headers, obj) {
-  return util.parseHeaders(headers, obj)
-}
-
 export class AbortError extends Error {
   constructor(message) {
     super(message ?? 'The operation was aborted')
@@ -290,3 +281,89 @@ export class DecoratorHandler {
     return this.#handler.onBodySent?.(...args)
   }
 }
+
+/**
+ * @param {Record<string, string | string[] | null | undefined> | (Buffer | string | (Buffer | string)[])[]} headers
+ * @param {Record<string, string | string[]>} [obj]
+ * @returns {Record<string, string | string[]>}
+ */
+export function parseHeaders(headers, obj) {
+  if (obj == null) {
+    obj = {}
+  } else {
+    // TODO (fix): assert obj values type?
+  }
+
+  if (Array.isArray(headers)) {
+    for (let i = 0; i < headers.length; i += 2) {
+      const key2 = headers[i]
+      const val2 = headers[i + 1]
+
+      // TODO (fix): assert key2 type?
+      // TODO (fix): assert val2 type?
+
+      if (val2 == null) {
+        continue
+      }
+
+      const key = util.headerNameToString(key2)
+      let val = obj[key]
+
+      if (val) {
+        if (!Array.isArray(val)) {
+          val = [val]
+          obj[key] = val
+        }
+
+        if (Array.isArray(val2)) {
+          val.push(...val2.filter((x) => x != null).map((x) => `${x}`))
+        } else {
+          val.push(`${val2}`)
+        }
+      } else {
+        obj[key] = Array.isArray(val2)
+          ? val2.filter((x) => x != null).map((x) => `${x}`)
+          : `${val2}`
+      }
+    }
+  } else if (typeof headers === 'object' && headers !== null) {
+    for (const key2 of Object.keys(headers)) {
+      const val2 = headers[key2]
+
+      // TODO (fix): assert key2 type?
+      // TODO (fix): assert val2 type?
+
+      if (val2 == null) {
+        continue
+      }
+
+      const key = util.headerNameToString(key2)
+      let val = obj[key]
+
+      if (val) {
+        if (!Array.isArray(val)) {
+          val = [val]
+          obj[key] = val
+        }
+        if (Array.isArray(val2)) {
+          val.push(...val2.filter((x) => x != null).map((x) => `${x}`))
+        } else {
+          val.push(`${val2}`)
+        }
+      } else if (val2 != null) {
+        obj[key] = Array.isArray(val2)
+          ? val2.filter((x) => x != null).map((x) => `${x}`)
+          : `${val2}`
+      }
+    }
+  } else if (headers != null) {
+    throw new Error('invalid argument: headers')
+  }
+
+  // See https://github.com/nodejs/node/pull/46528
+  if ('content-length' in obj && 'content-disposition' in obj) {
+    obj['content-disposition'] = Buffer.from(obj['content-disposition']).toString('latin1')
+  }
+
+  return obj
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "4.2.2",
+  "version": "4.2.4",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",
@@ -9,28 +9,28 @@
     "lib/*"
   ],
   "dependencies": {
-    "@nxtedition/undici": "^8.1.0",
     "cache-control-parser": "^2.0.6",
     "cacheable-lookup": "^7.0.0",
     "http-errors": "^2.0.0",
-    "lru-cache": "^10.3.0"
+    "lru-cache": "^11.0.0",
+    "undici": "^6.19.5"
   },
   "devDependencies": {
-    "@types/node": "^20.14.9",
+    "@types/node": "^22.0.2",
     "eslint": "^8.0.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-n": "^17.9.0",
-    "eslint-plugin-promise": "^6.4.0",
-    "husky": "^9.0.11",
+    "eslint-plugin-n": "^17.10.1",
+    "eslint-plugin-promise": "^7.0.0",
+    "husky": "^9.1.4",
     "lint-staged": "^15.2.7",
     "pinst": "^3.0.0",
-    "prettier": "^3.3.2",
-    "tap": "^20.0.3"
+    "prettier": "^3.3.3",
+    "tap": "^21.0.0"
   },
   "scripts": {
-    "prepare": "husky install",
+    "prepare": "husky",
     "prepublishOnly": "pinst --disable",
     "postpublish": "pinst --enable",
     "test": "tap test"