@nxtedition/nxt-undici 2.2.4 → 2.2.6

package/lib/index.js

@@ -137,13 +137,6 @@ export async function request(url, opts) {
         verify: opts.verify ?? true,
         logger: opts.logger ?? null,
         startTime: performance.now(),
-        stats: {
-          connect: -1,
-          headers: -1,
-          data: -1,
-          complete: -1,
-          error: -1,
-        },
       },
       {
         resolve,
@@ -155,8 +148,6 @@ export async function request(url, opts) {
         /** @type {Function | null} */ abort: null,
         /** @type {stream.Readable | null} */ body: null,
         onConnect(abort) {
-          this.stats.connect = performance.now() - this.startTime
-
           if (this.signal?.aborted) {
             abort(this.signal.reason)
           } else {
@@ -189,24 +180,19 @@ export async function request(url, opts) {
           statusMessage,
           headers = parseHeaders(rawHeaders),
         ) {
-          if (this.stats.headers === -1) {
-            this.stats.headers = performance.now() - this.startTime - this.stats.connect
-          }
-
           assert(statusCode >= 200)
 
           const contentLength = headers['content-length']
           const contentType = headers['content-type']
 
           this.body = new BodyReadable(this, {
-            stats: this.stats,
             resume,
             abort: this.abort,
             highWaterMark: this.highWaterMark,
             method: this.method,
             statusCode,
             statusMessage,
-            contentType,
+            contentType: typeof contentType === 'string' ? contentType : undefined,
             headers,
             size: Number.isFinite(contentLength) ? contentLength : null,
           })
@@ -225,24 +211,12 @@ export async function request(url, opts) {
           return true
         },
         onData(chunk) {
-          if (this.stats.data === -1) {
-            this.stats.data = performance.now() - this.startTime - this.stats.headers
-          }
-
           return this.body.push(chunk)
         },
         onComplete() {
-          if (this.stats.complete === -1) {
-            this.stats.complete = performance.now() - this.startTime - this.stats.data
-          }
-
           this.body.push(null)
         },
         onError(err) {
-          if (this.stats.error === -1) {
-            this.stats.error = performance.now() - this.startTime - this.stats.data
-          }
-
           this.signal?.removeEventListener('abort', this.onAbort)
           this.signal = null
 

package/lib/interceptor/log.js

@@ -10,7 +10,7 @@ class Handler extends DecoratorHandler {
   #logger
   #pos
   #timing
-  #startTime
+  #startTime = performance.now()
 
   constructor(opts, { handler }) {
     super(handler)
@@ -24,12 +24,12 @@ class Handler extends DecoratorHandler {
     this.#pos = 0
     this.#abort = abort
     this.#timing = {
+      connect: performance.now() - this.#startTime,
       headers: -1,
       data: -1,
       complete: -1,
       error: -1,
     }
-    this.#startTime = performance.now()
 
     this.#logger.debug({ ureq: this.#opts }, 'upstream request started')
 
@@ -49,7 +49,7 @@ class Handler extends DecoratorHandler {
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
-    this.#timing.headers = performance.now() - this.#startTime
+    this.#timing.headers = performance.now() - this.#timing.connect - this.#startTime
 
     this.#logger.debug(
       {
@@ -64,7 +64,7 @@ class Handler extends DecoratorHandler {
 
   onData(chunk) {
     if (this.#timing.data === -1) {
-      this.#timing.data = performance.now() - this.#startTime
+      this.#timing.data = performance.now() - this.#timing.headers - this.#startTime
     }
 
     this.#pos += chunk.length
@@ -73,7 +73,7 @@ class Handler extends DecoratorHandler {
   }
 
   onComplete(rawTrailers) {
-    this.#timing.complete = performance.now() - this.#startTime
+    this.#timing.complete = performance.now() - this.#timing.data - this.#startTime
 
     this.#logger.debug(
       { elapsedTime: this.#timing.complete, bytesRead: this.#pos, timing: this.#timing },
@@ -84,7 +84,7 @@ class Handler extends DecoratorHandler {
   }
 
   onError(err) {
-    this.#timing.error = performance.now() - this.#startTime
+    this.#timing.error = performance.now() - this.#timing.data - this.#startTime
 
     if (this.#aborted) {
       this.#logger.debug(

package/lib/interceptor/redirect.js

@@ -69,7 +69,7 @@ class Handler extends DecoratorHandler {
     this.#count += 1
 
     if (typeof this.#opts.follow === 'function') {
-      if (!this.#opts.follow(this.#location, this.#count)) {
+      if (!this.#opts.follow(this.#location, this.#count, this.#opts)) {
         assert(!this.#headersSent)
         this.#headersSent = true
         return this.#handler.onHeaders(statusCode, rawHeaders, resume, statusText, headers)

package/lib/readable.js

@@ -1,10 +1,10 @@
 import assert from 'node:assert'
-import { Readable, isDisturbed } from 'node:stream'
+import { Readable } from 'node:stream'
 import { errors as undiciErrors } from 'undici'
+import { isDisturbed } from './utils.js'
 
-const { RequestAbortedError, NotSupportedError, InvalidArgumentError, AbortError } = undiciErrors
+const { RequestAbortedError, NotSupportedError, InvalidArgumentError } = undiciErrors
 
-const kStats = Symbol('kStats')
 const kConsume = Symbol('kConsume')
 const kReading = Symbol('kReading')
 const kBody = Symbol('kBody')
@@ -27,7 +27,6 @@ export class BodyReadable extends Readable {
   constructor(
     handler,
     {
-      stats,
       contentType = '',
       method,
       statusCode,
@@ -47,7 +46,6 @@ export class BodyReadable extends Readable {
 
     this._readableState.dataEmitted = false
 
-    this[kStats] = stats
     this[kHandler] = handler
     this[kStatusCode] = statusCode
     this[kStatusMessage] = statusMessage
@@ -68,10 +66,6 @@ export class BodyReadable extends Readable {
     this[kReading] = false
   }
 
-  get stats() {
-    return this[kStats]
-  }
-
   get statusCode() {
     return this[kStatusCode]
   }
@@ -198,7 +192,7 @@ export class BodyReadable extends Readable {
     const signal = opts?.signal
 
     if (this[kSize] != null && this[kSize] - this[kReadLength] > limit) {
-      this.destroy(signal.reason ?? new AbortError())
+      this.destroy(signal.reason ?? new RequestAbortedError())
     }
 
     if (signal != null && (typeof signal !== 'object' || !('aborted' in signal))) {
@@ -222,14 +216,14 @@ export class BodyReadable extends Readable {
 
     return await new Promise((resolve, reject) => {
       const onAbort = () => {
-        this.destroy(signal.reason ?? new AbortError())
+        this.destroy(signal.reason ?? new RequestAbortedError())
       }
       signal?.addEventListener('abort', onAbort)
 
       this.on('close', function () {
         signal?.removeEventListener('abort', onAbort)
         if (signal?.aborted) {
-          reject(signal.reason ?? new AbortError())
+          reject(signal.reason ?? new RequestAbortedError())
         } else {
           resolve(null)
         }

package/lib/utils.js

@@ -1,5 +1,6 @@
 import tp from 'node:timers/promises'
 import cacheControlParser from 'cache-control-parser'
+import stream from 'node:stream'
 import { util } from 'undici'
 
 export function parseCacheControl(str) {
@@ -39,7 +40,7 @@ export function isDisturbed(body) {
     return false
   }
 
-  return true
+  return stream.isDisturbed(body)
 }
 
 export function parseContentRange(range) {
@@ -70,17 +71,13 @@ export function parseContentRange(range) {
   return { start, end: end ? end + 1 : size, size }
 }
 
-export function retry(err, retryCount, opts) {
+export async function retry(err, retryCount, opts) {
   if (!opts) {
-    return null
+    throw err
   }
 
   if (typeof opts === 'function') {
-    try {
-      return opts(err, retryCount, opts, (opts) => retry(err, retryCount, opts))
-    } catch (err) {
-      return Promise.reject(err)
-    }
+    return opts(err, retryCount, opts, (opts) => retry(err, retryCount, opts))
   }
 
   if (typeof opts === 'number') {
@@ -90,7 +87,7 @@ export function retry(err, retryCount, opts) {
   const retryMax = opts?.count ?? 8
 
   if (retryCount > retryMax) {
-    return null
+    throw err
   }
 
   const statusCode = err.statusCode ?? err.status ?? err.$metadata?.httpStatusCode ?? null
@@ -125,7 +122,7 @@ export function retry(err, retryCount, opts) {
     return tp.setTimeout(Math.min(10e3, retryCount * 1e3), undefined, { signal: opts.signal })
   }
 
-  return null
+  throw err
 }
 
 export function parseURL(url) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "2.2.4",
+  "version": "2.2.6",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",
@@ -9,25 +9,25 @@
     "lib/*"
   ],
   "dependencies": {
-    "cache-control-parser": "^2.0.5",
+    "cache-control-parser": "^2.0.6",
     "cacheable-lookup": "^7.0.0",
     "http-errors": "^2.0.0",
     "lru-cache": "^10.2.0",
-    "undici": "^6.18.0"
+    "undici": "^6.18.2"
   },
   "devDependencies": {
-    "@types/node": "^20.12.12",
+    "@types/node": "^20.14.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.7.0",
-    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-n": "^17.9.0",
+    "eslint-plugin-promise": "^6.2.0",
     "husky": "^9.0.11",
-    "lint-staged": "^15.2.2",
+    "lint-staged": "^15.2.7",
     "pinst": "^3.0.0",
-    "prettier": "^3.2.5",
-    "tap": "^18.8.0"
+    "prettier": "^3.3.2",
+    "tap": "^19.2.5"
   },
   "scripts": {
     "prepare": "husky install",