@nxtedition/nxt-undici 5.1.7 → 5.2.0

package/lib/interceptor/response-retry.js

@@ -9,7 +9,6 @@ import {
 
 // TODO (fix): What about onUpgrade?
 class Handler extends DecoratorHandler {
-  #handler
   #dispatch
   #opts
 
@@ -29,7 +28,6 @@ class Handler extends DecoratorHandler {
   constructor(opts, { handler, dispatch }) {
     super(handler)
 
-    this.#handler = handler
     this.#dispatch = dispatch
 
     if (typeof opts === 'number') {
@@ -50,7 +48,7 @@ class Handler extends DecoratorHandler {
       this.#etag = null
       this.#error = null
 
-      this.#handler.onConnect((reason) => {
+      super.onConnect((reason) => {
         if (!this.#aborted) {
           this.#aborted = true
           if (this.#abort) {
@@ -77,18 +75,18 @@ class Handler extends DecoratorHandler {
       assert(this.#headersSent === false)
 
       if (headers.trailer) {
-        return this.#onHeaders(statusCode, null, resume, statusMessage, headers)
+        return this.#onHeaders(statusCode, null, resume, null, headers)
       }
 
       const contentLength = headers['content-length'] ? Number(headers['content-length']) : null
       if (contentLength != null && !Number.isFinite(contentLength)) {
-        return this.#onHeaders(statusCode, null, resume, statusMessage, headers)
+        return this.#onHeaders(statusCode, null, resume, null, headers)
       }
 
       if (statusCode === 206) {
         const range = parseRangeHeader(headers['content-range'])
         if (!range) {
-          return this.#onHeaders(statusCode, null, resume, statusMessage, headers)
+          return this.#onHeaders(statusCode, null, resume, null, headers)
         }
 
         const { start, size, end = size } = range
@@ -108,7 +106,7 @@ class Handler extends DecoratorHandler {
         this.#end = contentLength
         this.#etag = headers.etag
       } else {
-        return this.#onHeaders(statusCode, null, resume, statusMessage, headers)
+        return this.#onHeaders(statusCode, null, resume, null, headers)
       }
 
       // Weak etags are not useful for comparison nor cache
@@ -121,7 +119,7 @@ class Handler extends DecoratorHandler {
       assert(Number.isFinite(this.#pos))
       assert(this.#end == null || Number.isFinite(this.#end))
 
-      return this.#onHeaders(statusCode, null, resume, statusMessage, headers)
+      return this.#onHeaders(statusCode, null, resume, null, headers)
     } else if (statusCode === 206 || (this.#pos === 0 && statusCode === 200)) {
       assert(this.#etag != null || !this.#pos)
 
@@ -149,7 +147,7 @@ class Handler extends DecoratorHandler {
     if (this.#pos != null) {
       this.#pos += chunk.byteLength
     }
-    return this.#handler.onData(chunk)
+    return super.onData(chunk)
   }
 
   onError(err) {
@@ -158,7 +156,13 @@ class Handler extends DecoratorHandler {
       return
     }
 
-    const retryPromise = retryFn(err, this.#retryCount, { ...this.#opts.retry })
+    let retryPromise
+    try {
+      retryPromise = retryFn(err, this.#retryCount, { ...this.#opts.retry })
+    } catch (err) {
+      retryPromise = Promise.reject(err)
+    }
+
     if (retryPromise == null) {
       this.#onError(err)
       return
@@ -206,13 +210,13 @@ class Handler extends DecoratorHandler {
   #onError(err) {
     assert(!this.#errorSent)
     this.#errorSent = true
-    this.#handler.onError(err)
+    super.onError(err)
   }
 
   #onHeaders(...args) {
     assert(!this.#headersSent)
     this.#headersSent = true
-    return this.#handler.onHeaders(...args)
+    return super.onHeaders(...args)
   }
 }
 

package/lib/interceptor/response-verify.js

@@ -2,24 +2,17 @@ import crypto from 'node:crypto'
 import assert from 'node:assert'
 import { DecoratorHandler, parseHeaders } from '../utils.js'
 
-const DEFAULT_OPTS = { hash: null }
-
 class Handler extends DecoratorHandler {
-  #handler
-
   #verifyOpts
   #contentMD5
   #contentLength
   #hasher
   #pos = 0
-  #errorSent = false
 
   constructor(opts, { handler }) {
     super(handler)
 
-    this.#handler = handler
-    this.#verifyOpts =
-      opts.verify === true ? { hash: true, size: true } : (opts.verify ?? DEFAULT_OPTS)
+    this.#verifyOpts = opts.verify === true ? { hash: true, size: true } : opts.verify
   }
 
   onConnect(abort) {
@@ -29,54 +22,44 @@ class Handler extends DecoratorHandler {
     this.#contentLength = null
     this.#hasher = null
     this.#pos = 0
-    this.#errorSent = false
 
-    this.#handler.onConnect(abort)
+    super.onConnect(abort)
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
     this.#contentMD5 = this.#verifyOpts.hash ? headers['content-md5'] : null
-    this.#contentLength = this.#verifyOpts.hash ? headers['content-length'] : null
+    this.#contentLength = this.#verifyOpts.size ? headers['content-length'] : null
     this.#hasher = this.#contentMD5 != null ? crypto.createHash('md5') : null
 
-    return this.#handler.onHeaders(statusCode, null, resume, statusMessage, headers)
+    return super.onHeaders(statusCode, null, resume, null, headers)
   }
 
   onData(chunk) {
     this.#pos += chunk.length
     this.#hasher?.update(chunk)
 
-    return this.#handler.onData(chunk)
+    return super.onData(chunk)
   }
 
   onComplete() {
     const contentMD5 = this.#hasher?.digest('base64')
 
     if (this.#contentLength != null && this.#pos !== Number(this.#contentLength)) {
-      this.#errorSent = true
-      this.#handler.onError(
+      super.onError(
         Object.assign(new Error('Request Content-Length mismatch'), {
           expected: Number(this.#contentLength),
           actual: this.#pos,
         }),
       )
     } else if (this.#contentMD5 != null && contentMD5 !== this.#contentMD5) {
-      this.#errorSent = true
-      this.#handler.onError(
+      super.onError(
         Object.assign(new Error('Request Content-MD5 mismatch'), {
           expected: this.#contentMD5,
           actual: contentMD5,
         }),
       )
     } else {
-      return this.#handler.onComplete()
-    }
-  }
-
-  onError(err) {
-    if (!this.#errorSent) {
-      this.#errorSent = true
-      this.#handler.onError(err)
+      super.onComplete()
     }
   }
 }

package/lib/request.js

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

package/lib/utils.js

@@ -1,7 +1,17 @@
 import tp from 'node:timers/promises'
 import cacheControlParser from 'cache-control-parser'
 import stream from 'node:stream'
-import { util } from 'undici'
+import { util } from '@nxtedition/undici'
+
+let fastNow = Date.now()
+
+setInterval(() => {
+  fastNow = Date.now()
+}, 1e3).unref()
+
+export function getFastNow() {
+  return fastNow
+}
 
 export function parseCacheControl(str) {
   return str ? cacheControlParser.parse(str) : null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "5.1.7",
+  "version": "5.2.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",
@@ -9,17 +9,16 @@
     "lib/*"
   ],
   "dependencies": {
+    "@nxtedition/undici": "^9.0.3",
     "cache-control-parser": "^2.0.6",
-    "http-errors": "^2.0.0",
-    "lru-cache": "^11.0.2",
-    "undici": "^6.0.0"
+    "http-errors": "^2.0.0"
   },
   "devDependencies": {
-    "@types/node": "^22.10.1",
+    "@types/node": "^22.10.7",
     "eslint": "^9.16.0",
     "eslint-plugin-n": "^17.14.0",
     "husky": "^9.1.7",
-    "lint-staged": "^15.2.10",
+    "lint-staged": "^15.4.1",
     "pinst": "^3.0.0",
     "prettier": "^3.4.1",
     "send": "^1.1.0",