@nxtedition/nxt-undici 5.2.1 → 6.0.0

package/lib/interceptor/cache.js

@@ -1,5 +1,5 @@
 import { SqliteCacheStore } from '../cache/sqlite-cache-store.js'
-import { DecoratorHandler, parseHeaders, parseCacheControl } from '../utils.js'
+import { DecoratorHandler, parseCacheControl } from '../utils.js'
 
 const DEFAULT_STORE = new SqliteCacheStore({ location: ':memory:' })
 
@@ -21,15 +21,15 @@ class CacheHandler extends DecoratorHandler {
     super.onConnect(abort)
   }
 
-  onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
+  onHeaders(statusCode, headers, resume) {
     if (statusCode !== 307) {
       // Only cache redirects...
-      return super.onHeaders(statusCode, null, resume, null, headers)
+      return super.onHeaders(statusCode, headers, resume)
     }
 
     if (headers.vary === '*') {
       // Not cacheble...
-      return super.onHeaders(statusCode, null, resume, null, headers)
+      return super.onHeaders(statusCode, headers, resume)
     }
 
     const cacheControl = parseCacheControl(headers['cache-control'])
@@ -37,7 +37,7 @@ class CacheHandler extends DecoratorHandler {
 
     if (contentLength) {
       // We don't support caching responses with body...
-      return super.onHeaders(statusCode, null, resume, null, headers)
+      return super.onHeaders(statusCode, headers, resume)
     }
 
     if (
@@ -53,7 +53,7 @@ class CacheHandler extends DecoratorHandler {
       cacheControl['proxy-revalidate']
     ) {
       // Not cacheble...
-      return super.onHeaders(statusCode, null, resume, null, headers)
+      return super.onHeaders(statusCode, headers, resume)
     }
 
     const vary = {}
@@ -64,20 +64,20 @@ class CacheHandler extends DecoratorHandler {
         const val = this.#opts.headers?.[key]
         if (!val) {
           // Expect vary headers to be present...
-          return super.onHeaders(statusCode, null, resume, null, headers)
+          return super.onHeaders(statusCode, headers, resume)
         }
         vary[key] = val
       }
 
       // Unexpected vary header type...
-      return super.onHeaders(statusCode, null, resume, null, headers)
+      return super.onHeaders(statusCode, headers, resume)
     }
 
     const ttl = cacheControl.immutable
       ? 31556952
       : Number(cacheControl['s-max-age'] ?? cacheControl['max-age'])
     if (!ttl || !Number.isFinite(ttl) || ttl <= 0) {
-      return super.onHeaders(statusCode, null, resume, null, headers)
+      return super.onHeaders(statusCode, headers, resume)
     }
 
     const cachedAt = Date.now()
@@ -95,7 +95,7 @@ class CacheHandler extends DecoratorHandler {
       staleAt: 0,
     }
 
-    return super.onHeaders(statusCode, null, resume, null, headers)
+    return super.onHeaders(statusCode, headers, resume)
   }
 
   onData(chunk) {
@@ -164,7 +164,7 @@ export default () => (dispatch) => (opts, handler) => {
       return true
     }
 
-    if (handler.onHeaders(statusCode, null, resume, null, headers) === false) {
+    if (handler.onHeaders(statusCode, headers, resume) === false) {
       paused = true
     }
 

package/lib/interceptor/log.js

@@ -1,4 +1,4 @@
-import { DecoratorHandler, parseHeaders } from '../utils.js'
+import { DecoratorHandler } from '../utils.js'
 
 class Handler extends DecoratorHandler {
   #opts
@@ -45,7 +45,7 @@ class Handler extends DecoratorHandler {
     })
   }
 
-  onUpgrade(statusCode, rawHeaders, socket, headers = parseHeaders(rawHeaders)) {
+  onUpgrade(statusCode, headers, socket) {
     this.#timing.headers = performance.now() - this.#created
 
     this.#logger.debug(
@@ -63,13 +63,13 @@ class Handler extends DecoratorHandler {
     super.onUpgrade(statusCode, null, socket, headers)
   }
 
-  onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
+  onHeaders(statusCode, headers, resume) {
     this.#timing.headers = performance.now() - this.#created
 
     this.#statusCode = statusCode
     this.#headers = headers
 
-    return super.onHeaders(statusCode, null, resume, null, headers)
+    return super.onHeaders(statusCode, headers, resume)
   }
 
   onData(chunk) {

package/lib/interceptor/proxy.js

@@ -1,6 +1,6 @@
 import net from 'node:net'
 import createError from 'http-errors'
-import { DecoratorHandler, parseHeaders } from '../utils.js'
+import { DecoratorHandler } from '../utils.js'
 
 class Handler extends DecoratorHandler {
   #opts
@@ -11,7 +11,7 @@ class Handler extends DecoratorHandler {
     this.#opts = proxyOpts
   }
 
-  onUpgrade(statusCode, rawHeaders, socket, headers = parseHeaders(rawHeaders)) {
+  onUpgrade(statusCode, headers, socket) {
     super.onUpgrade(
       statusCode,
       reduceHeaders(
@@ -22,16 +22,16 @@ class Handler extends DecoratorHandler {
           proxyName: this.#opts.name,
         },
         (acc, key, val) => {
-          acc.push(key, val)
+          acc[key] = val
           return acc
         },
-        [],
+        {},
       ),
       socket,
     )
   }
 
-  onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
+  onHeaders(statusCode, headers, resume) {
     return super.onHeaders(
       statusCode,
       reduceHeaders(
@@ -48,7 +48,6 @@ class Handler extends DecoratorHandler {
         [],
       ),
       resume,
-      null,
     )
   }
 }

package/lib/interceptor/redirect.js

@@ -1,5 +1,5 @@
 import assert from 'node:assert'
-import { DecoratorHandler, isDisturbed, parseHeaders, parseURL } from '../utils.js'
+import { DecoratorHandler, isDisturbed, parseURL } from '../utils.js'
 
 const redirectableStatusCodes = [300, 301, 302, 303, 307, 308]
 
@@ -45,11 +45,11 @@ class Handler extends DecoratorHandler {
     super.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
-  onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
+  onHeaders(statusCode, headers, resume) {
     if (redirectableStatusCodes.indexOf(statusCode) === -1) {
       assert(!this.#headersSent)
       this.#headersSent = true
-      return super.onHeaders(statusCode, null, resume, null, headers)
+      return super.onHeaders(statusCode, headers, resume)
     }
 
     if (isDisturbed(this.#opts.body)) {
@@ -69,7 +69,7 @@ class Handler extends DecoratorHandler {
       if (!this.#opts.follow(this.#location, this.#count, this.#opts)) {
         assert(!this.#headersSent)
         this.#headersSent = true
-        return super.onHeaders(statusCode, null, resume, null, headers)
+        return super.onHeaders(statusCode, headers, resume)
       }
     } else {
       if (this.#count >= this.#maxCount) {

package/lib/interceptor/response-error.js

@@ -1,5 +1,5 @@
 import createHttpError from 'http-errors'
-import { DecoratorHandler, parseHeaders } from '../utils.js'
+import { DecoratorHandler } from '../utils.js'
 
 class Handler extends DecoratorHandler {
   #statusCode = 0
@@ -29,13 +29,13 @@ class Handler extends DecoratorHandler {
     super.onConnect(abort)
   }
 
-  onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
+  onHeaders(statusCode, headers, resume) {
     this.#statusCode = statusCode
     this.#headers = headers
     this.#contentType = headers['content-type']
 
     if (this.#statusCode < 400) {
-      return super.onHeaders(statusCode, null, resume, null, headers)
+      return super.onHeaders(statusCode, headers, resume)
     }
 
     if (this.#checkContentType('application/json') || this.#checkContentType('text/plain')) {
@@ -51,7 +51,7 @@ class Handler extends DecoratorHandler {
     this.#body += this.#decoder?.decode(chunk, { stream: true }) ?? ''
   }
 
-  onComplete(rawTrailers) {
+  onComplete(trailers) {
     if (this.#statusCode >= 400) {
       this.#body += this.#decoder?.decode(undefined, { stream: false }) ?? ''
 
@@ -74,7 +74,7 @@ class Handler extends DecoratorHandler {
 
       super.onError(this.#decorateError(err))
     } else {
-      super.onComplete(rawTrailers)
+      super.onComplete(trailers)
     }
   }
 

package/lib/interceptor/response-retry.js

@@ -1,11 +1,5 @@
 import assert from 'node:assert'
-import {
-  DecoratorHandler,
-  isDisturbed,
-  parseHeaders,
-  parseRangeHeader,
-  retry as retryFn,
-} from '../utils.js'
+import { DecoratorHandler, isDisturbed, parseRangeHeader, retry as retryFn } from '../utils.js'
 
 // TODO (fix): What about onUpgrade?
 class Handler extends DecoratorHandler {
@@ -67,7 +61,7 @@ class Handler extends DecoratorHandler {
     }
   }
 
-  onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
+  onHeaders(statusCode, headers, resume) {
     if (this.#error == null) {
       assert(this.#etag == null)
       assert(this.#pos == null)
@@ -75,18 +69,18 @@ class Handler extends DecoratorHandler {
       assert(this.#headersSent === false)
 
       if (headers.trailer) {
-        return this.#onHeaders(statusCode, null, resume, null, headers)
+        return this.#onHeaders(statusCode, headers, resume)
       }
 
       const contentLength = headers['content-length'] ? Number(headers['content-length']) : null
       if (contentLength != null && !Number.isFinite(contentLength)) {
-        return this.#onHeaders(statusCode, null, resume, null, headers)
+        return this.#onHeaders(statusCode, headers, resume)
       }
 
       if (statusCode === 206) {
         const range = parseRangeHeader(headers['content-range'])
         if (!range) {
-          return this.#onHeaders(statusCode, null, resume, null, headers)
+          return this.#onHeaders(statusCode, headers, resume)
         }
 
         const { start, size, end = size } = range
@@ -106,7 +100,7 @@ class Handler extends DecoratorHandler {
         this.#end = contentLength
         this.#etag = headers.etag
       } else {
-        return this.#onHeaders(statusCode, null, resume, null, headers)
+        return this.#onHeaders(statusCode, headers, resume)
       }
 
       // Weak etags are not useful for comparison nor cache
@@ -119,7 +113,7 @@ class Handler extends DecoratorHandler {
       assert(Number.isFinite(this.#pos))
       assert(this.#end == null || Number.isFinite(this.#end))
 
-      return this.#onHeaders(statusCode, null, resume, null, headers)
+      return this.#onHeaders(statusCode, headers, resume)
     } else if (statusCode === 206 || (this.#pos === 0 && statusCode === 200)) {
       assert(this.#etag != null || !this.#pos)
 
@@ -213,10 +207,10 @@ class Handler extends DecoratorHandler {
     super.onError(err)
   }
 
-  #onHeaders(...args) {
+  #onHeaders(statusCode, headers, resume) {
     assert(!this.#headersSent)
     this.#headersSent = true
-    return super.onHeaders(...args)
+    return super.onHeaders(statusCode, headers, resume)
   }
 }
 

package/lib/interceptor/response-verify.js

@@ -1,6 +1,6 @@
 import crypto from 'node:crypto'
 import assert from 'node:assert'
-import { DecoratorHandler, parseHeaders } from '../utils.js'
+import { DecoratorHandler } from '../utils.js'
 
 class Handler extends DecoratorHandler {
   #verifyOpts
@@ -26,12 +26,12 @@ class Handler extends DecoratorHandler {
     super.onConnect(abort)
   }
 
-  onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
+  onHeaders(statusCode, headers, resume) {
     this.#contentMD5 = this.#verifyOpts.hash ? headers['content-md5'] : null
     this.#contentLength = this.#verifyOpts.size ? headers['content-length'] : null
     this.#hasher = this.#contentMD5 != null ? crypto.createHash('md5') : null
 
-    return super.onHeaders(statusCode, null, resume, null, headers)
+    return super.onHeaders(statusCode, headers, resume)
   }
 
   onData(chunk) {

package/lib/request.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert'
 import { InvalidArgumentError, RequestAbortedError } from './errors.js'
-import { isStream, parseHeaders } from './utils.js'
+import { isStream } from './utils.js'
 import { Readable } from '@nxtedition/undici'
 
 function noop() {}
@@ -70,7 +70,7 @@ export class RequestHandler {
     this.abort = abort
   }
 
-  onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
+  onHeaders(statusCode, headers, resume) {
     const { resolve, abort, highWaterMark } = this
 
     if (statusCode < 200) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "5.2.1",
+  "version": "6.0.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",
@@ -9,7 +9,7 @@
     "lib/*"
   ],
   "dependencies": {
-    "@nxtedition/undici": "^9.0.3",
+    "@nxtedition/undici": "^10.0.2",
     "cache-control-parser": "^2.0.6",
     "http-errors": "^2.0.0"
   },