@nxtedition/nxt-undici 2.0.28 → 2.0.30

package/lib/index.js

@@ -185,7 +185,7 @@ export async function request(url, opts) {
           if (statusCode !== 101) {
             this.abort(createError(statusCode, { headers }))
           } else {
-            this.resolve({ headers, socket })
+            this.resolve?.({ headers, socket })
             this.resolve = null
           }
         },
@@ -214,7 +214,7 @@ export async function request(url, opts) {
             size: Number.isFinite(contentLength) ? contentLength : null,
           })
 
-          this.resolve(this.body)
+          this.resolve?.(this.body)
           this.resolve = null
           this.reject = null
 

package/lib/utils.js

@@ -1,20 +1,11 @@
 import tp from 'node:timers/promises'
 import cacheControlParser from 'cache-control-parser'
+import { util } from 'undici'
 
 export function parseCacheControl(str) {
   return str ? cacheControlParser.parse(str) : null
 }
 
-const lowerCaseCache = new Map()
-export function toLowerCase(val) {
-  let ret = lowerCaseCache.get(val)
-  if (ret === undefined) {
-    ret = val.toLowerCase()
-    lowerCaseCache.set(val, ret)
-  }
-  return ret
-}
-
 export function isDisturbed(body) {
   if (
     body == null ||
@@ -66,7 +57,7 @@ export function findHeader(headers, name) {
   if (Array.isArray(headers)) {
     for (let i = 0; i < headers.length; i += 2) {
       const key = headers[i + 0]
-      if (key.length === len && toLowerCase(key.toString()) === name) {
+      if (key.length === len && util.headerNameToString(key) === name) {
         return headers[i + 1]?.toString()
       }
     }
@@ -77,7 +68,7 @@ export function findHeader(headers, name) {
     }
 
     for (const key of Object.keys(headers)) {
-      if (key.length === len && toLowerCase(key) === name) {
+      if (key.length === len && util.headerNameToString(key) === name) {
         return headers[key]?.toString()
       }
     }
@@ -208,26 +199,7 @@ export function parseOrigin(url) {
 }
 
 export function parseHeaders(headers, obj = {}) {
-  for (let i = 0; i < headers.length; i += 2) {
-    const key = toLowerCase(headers[i].toString())
-
-    let val = obj[key]
-    if (!val) {
-      val = headers[i + 1]
-      if (typeof val === 'string') {
-        obj[key] = val
-      } else {
-        obj[key] = Array.isArray(val) ? val.map((x) => x.toString()) : val.toString()
-      }
-    } else {
-      if (!Array.isArray(val)) {
-        val = [val]
-        obj[key] = val
-      }
-      val.push(headers[i + 1].toString())
-    }
-  }
-  return obj
+  return util.parseHeaders(headers, obj)
 }
 
 export class AbortError extends Error {

package/package.json

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