@nxtedition/nxt-undici 2.0.52 → 2.0.54

package/lib/index.js

@@ -128,7 +128,7 @@ export async function request(url, opts) {
         idempotent: opts.idempotent,
         retry: opts.retry ?? 8,
         proxy: opts.proxy ?? false,
-        cache: opts.cache ?? true,
+        cache: opts.cache ?? false,
         upgrade: opts.upgrade ?? false,
         follow: opts.follow ?? 8,
         error: opts.error ?? true,

package/lib/interceptor/cache.js

@@ -92,7 +92,7 @@ class CacheStore {
     this.maxEntrySize = maxEntrySize
     this.cache = new LRUCache({
       maxSize,
-      sizeCalculation: (value) => value.body.byteLength,
+      sizeCalculation: (value) => value.size,
     })
   }
 

package/lib/interceptor/request-body-factory.js

@@ -17,6 +17,7 @@ export default (dispatch) => (opts, handler) => {
         dispatch({ ...opts, body }, handler)
       },
       (err) => {
+        handler.onConnect(() => {})
         handler.onError(err)
       },
     )

package/lib/utils.js

@@ -201,14 +201,85 @@ export function parseOrigin(url) {
   return url
 }
 
-export function parseHeaders(headers, obj = {}) {
+/**
+ * @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)) {
-    return util.parseHeaders(headers, obj)
-  } else if (headers != null) {
-    for (const [key, val] of Object.entries(headers)) {
-      obj[headerNameToString(key)] = val
+    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) {
+        continue
+      }
+
+      const key = headerNameToString(key2)
+      let val = obj[key]
+
+      if (val) {
+        if (typeof val === 'string') {
+          val = [val]
+          obj[key] = val
+        }
+
+        if (Array.isArray(val2)) {
+          val.push(...val2.map((x) => x.toString()))
+        } else {
+          val.push(val2.toString())
+        }
+      } else {
+        obj[key] = Array.isArray(val2) ? val2.map((x) => x.toString()) : val2.toString()
+      }
+    }
+  } 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) {
+        continue
+      }
+
+      const key = headerNameToString(key2)
+      let val = obj[key]
+
+      if (val) {
+        if (typeof val === 'string') {
+          val = [val]
+          obj[key] = val
+        }
+        if (Array.isArray(val2)) {
+          val.push(...val2.map((x) => x.toString()))
+        } else {
+          val.push(val2.toString())
+        }
+      } else if (val2 != null) {
+        obj[key] = Array.isArray(val2) ? val2.map((x) => x.toString()) : val2.toString()
+      }
     }
+  } 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": "2.0.52",
+  "version": "2.0.54",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",