@nxtedition/nxt-undici 2.0.47 → 2.0.49

package/lib/index.js

@@ -1,7 +1,7 @@
 import assert from 'node:assert'
 import createError from 'http-errors'
 import undici from 'undici'
-import { findHeader, parseHeaders, AbortError, isStream } from './utils.js'
+import { parseHeaders, AbortError, headerNameToString, isStream } from './utils.js'
 import { BodyReadable } from './readable.js'
 
 const dispatcherCache = new WeakMap()
@@ -61,17 +61,18 @@ export async function request(url, opts) {
   const method = opts.method ?? (opts.body ? 'POST' : 'GET')
   const idempotent = opts.idempotent ?? (method === 'GET' || method === 'HEAD')
 
-  let headers
+  let headers = {}
   if (Array.isArray(opts.headers)) {
     headers = parseHeaders(opts.headers)
   } else if (opts.headers != null) {
-    // TODO (fix): Object.values(opts.headers)?
-    headers = opts.headers
+    for (const [key, val] of Object.entries(opts.headers)) {
+      headers[headerNameToString(key)] = val
+    }
   }
 
   const userAgent = opts.userAgent ?? globalThis.userAgent
   if (userAgent && headers?.['user-agent'] !== userAgent) {
-    headers = { 'user-agent': userAgent, ...headers }
+    headers['user-agent'] = userAgent
   }
 
   if (method === 'CONNECT') {
@@ -86,6 +87,14 @@ export async function request(url, opts) {
     throw new createError.BadRequest('HEAD and GET cannot have body')
   }
 
+  if (
+    opts.body != null &&
+    (opts.body.size > 0 || opts.body.length > 0) &&
+    (method === 'HEAD' || method === 'GET')
+  ) {
+    throw new createError.BadRequest('HEAD and GET cannot have body')
+  }
+
   const expectsPayload = opts.method === 'PUT' || opts.method === 'POST' || opts.method === 'PATCH'
 
   if (headers != null && headers['content-length'] === '0' && !expectsPayload) {
@@ -124,7 +133,7 @@ export async function request(url, opts) {
   return await new Promise((resolve, reject) =>
     dispatch(
       {
-        id: opts.id ?? findHeader(headers, 'request-id') ?? genReqId(),
+        id: opts.id ?? headers['request-id'] ?? headers['Request-Id'] ?? genReqId(),
         url,
         method,
         body: opts.body,
@@ -187,8 +196,8 @@ export async function request(url, opts) {
         ) {
           assert(statusCode >= 200)
 
-          const contentLength = findHeader(headers, 'content-length')
-          const contentType = findHeader(headers, 'content-type')
+          const contentLength = headers['content-length']
+          const contentType = headers['content-type']
 
           this.body = new BodyReadable(this, {
             resume,
@@ -201,6 +210,13 @@ export async function request(url, opts) {
             size: Number.isFinite(contentLength) ? contentLength : null,
           })
 
+          if (this.signal) {
+            this.body.on('close', () => {
+              this.signal?.removeEventListener('abort', this.onAbort)
+              this.signal = null
+            })
+          }
+
           this.resolve(this.body)
           this.resolve = null
           this.reject = null

package/lib/interceptor/log.js

@@ -9,7 +9,8 @@ class Handler extends DecoratorHandler {
   #aborted = false
   #logger
   #pos
-  #stats
+  #timing
+  #startTime
 
   constructor(opts, { handler }) {
     super(handler)
@@ -17,24 +18,18 @@ class Handler extends DecoratorHandler {
     this.#handler = handler
     this.#opts = opts
     this.#logger = opts.logger.child({ ureq: { id: opts.id } })
-    this.#stats = {
-      created: performance.now(),
-      start: -1,
-      end: -1,
-      headers: -1,
-      firstBodyReceived: -1,
-      lastBodyReceived: -1,
-    }
   }
 
   onConnect(abort) {
     this.#pos = 0
     this.#abort = abort
-    this.#stats.start = performance.now()
-    this.#stats.end = -1
-    this.#stats.headers = -1
-    this.#stats.firstBodyReceived = -1
-    this.#stats.lastBodyReceived = -1
+    this.#timing = {
+      headers: -1,
+      data: -1,
+      complete: -1,
+      error: -1,
+    }
+    this.#startTime = performance.now()
 
     this.#logger.debug({ ureq: this.#opts }, 'upstream request started')
 
@@ -54,12 +49,12 @@ class Handler extends DecoratorHandler {
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
-    this.#stats.headers = performance.now() - this.#stats.start
+    this.#timing.headers = performance.now() - this.#startTime
 
     this.#logger.debug(
       {
         ures: { statusCode, headers },
-        elapsedTime: this.#stats.headers,
+        elapsedTime: this.#timing.headers,
       },
       'upstream request response',
     )
@@ -68,8 +63,8 @@ class Handler extends DecoratorHandler {
   }
 
   onData(chunk) {
-    if (this.#stats.firstBodyReceived === -1) {
-      this.#stats.firstBodyReceived = performance.now() - this.#stats.start
+    if (this.#timing.data === -1) {
+      this.#timing.data = performance.now() - this.#startTime
     }
 
     this.#pos += chunk.length
@@ -78,11 +73,10 @@ class Handler extends DecoratorHandler {
   }
 
   onComplete(rawTrailers) {
-    this.#stats.lastBodyReceived = performance.now() - this.#stats.start
-    this.#stats.end = this.#stats.lastBodyReceived
+    this.#timing.complete = performance.now() - this.#startTime
 
     this.#logger.debug(
-      { bytesRead: this.#pos, elapsedTime: this.#stats.end, stats: this.#stats },
+      { elapsedTime: this.#timing.complete, bytesRead: this.#pos, timing: this.#timing },
       'upstream request completed',
     )
 
@@ -90,17 +84,15 @@ class Handler extends DecoratorHandler {
   }
 
   onError(err) {
-    if (this.#stats) {
-      this.#stats.end = performance.now() - this.#stats.start
-    }
+    this.#timing.error = performance.now() - this.#startTime
 
     if (this.#aborted) {
       this.#logger.debug(
         {
           ureq: this.#opts,
           bytesRead: this.#pos,
-          elapsedTime: this.#stats.end,
-          stats: this.#stats,
+          timing: this.#timing,
+          elapsedTime: this.#timing.error,
           err,
         },
         'upstream request aborted',
@@ -110,8 +102,8 @@ class Handler extends DecoratorHandler {
         {
           ureq: this.#opts,
           bytesRead: this.#pos,
-          elapsedTime: this.#stats.end,
-          stats: this.#stats,
+          timing: this.#timing,
+          elapsedTime: this.#timing.error,
           err,
         },
         'upstream request failed',

package/lib/interceptor/redirect.js

@@ -1,97 +1,101 @@
 import assert from 'node:assert'
-import { findHeader, isDisturbed, parseURL } from '../utils.js'
+import { isDisturbed, parseHeaders, parseURL } from '../utils.js'
 import { DecoratorHandler } from 'undici'
 
 const redirectableStatusCodes = [300, 301, 302, 303, 307, 308]
 
 class Handler extends DecoratorHandler {
+  #dispatch
+  #handler
+
+  #opts
+  #abort
+  #aborted = false
+  #reason
+  #maxCount
+  #headersSent = false
+  #count = 0
+  #location
+  #history = []
+
   constructor(opts, { dispatch, handler }) {
     super(handler)
 
-    this.dispatch = dispatch
-    this.handler = handler
-    this.opts = opts
-    this.abort = null
-    this.aborted = false
-    this.reason = null
-    this.maxCount = Number.isFinite(opts.follow) ? opts.follow : opts.follow?.count ?? 0
-
-    this.headersSent = false
-
-    this.count = 0
-    this.location = null
-    this.history = []
+    this.#dispatch = dispatch
+    this.#handler = handler
+    this.#opts = opts
+    this.#maxCount = Number.isFinite(opts.follow) ? opts.follow : opts.follow?.count ?? 0
 
-    this.handler.onConnect((reason) => {
-      this.aborted = true
-      if (this.abort) {
-        this.abort(reason)
+    this.#handler.onConnect((reason) => {
+      this.#aborted = true
+      if (this.#abort) {
+        this.#abort(reason)
       } else {
-        this.reason = reason
+        this.#reason = reason
       }
     })
   }
 
   onConnect(abort) {
-    if (this.aborted) {
-      abort(this.reason)
+    if (this.#aborted) {
+      abort(this.#reason)
     } else {
-      this.abort = abort
+      this.#abort = abort
     }
   }
 
   onUpgrade(statusCode, rawHeaders, socket, headers) {
-    return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
+    return this.#handler.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
-  onHeaders(statusCode, rawHeaders, resume, statusText, headers) {
+  onHeaders(statusCode, rawHeaders, resume, statusText, headers = parseHeaders(rawHeaders)) {
     if (redirectableStatusCodes.indexOf(statusCode) === -1) {
-      assert(!this.headersSent)
-      this.headersSent = true
-      return this.handler.onHeaders(statusCode, rawHeaders, resume, statusText, headers)
+      assert(!this.#headersSent)
+      this.#headersSent = true
+      return this.#handler.onHeaders(statusCode, rawHeaders, resume, statusText, headers)
     }
 
-    if (isDisturbed(this.opts.body)) {
+    if (isDisturbed(this.#opts.body)) {
       throw new Error(`Disturbed request cannot be redirected.`)
     }
 
-    this.location = headers ? headers.location : findHeader(rawHeaders, 'location')
+    this.#location = headers.location
 
-    if (!this.location) {
+    if (!this.#location) {
       throw new Error(`Missing redirection location .`)
     }
 
-    this.history.push(this.location)
-    this.count += 1
+    this.#history.push(this.#location)
+    this.#count += 1
 
-    if (typeof this.opts.follow === 'function') {
-      if (!this.opts.follow(this.location, this.count)) {
-        assert(!this.headersSent)
-        this.headersSent = true
-        return this.handler.onHeaders(statusCode, rawHeaders, resume, statusText, headers)
+    if (typeof this.#opts.follow === 'function') {
+      if (!this.#opts.follow(this.#location, this.#count)) {
+        assert(!this.#headersSent)
+        this.#headersSent = true
+        return this.#handler.onHeaders(statusCode, rawHeaders, resume, statusText, headers)
       }
     } else {
-      if (this.count >= this.maxCount) {
-        throw Object.assign(new Error(`Max redirections reached: ${this.maxCount}.`), {
-          history: this.history,
+      if (this.#count >= this.#maxCount) {
+        throw Object.assign(new Error(`Max redirections reached: ${this.#maxCount}.`), {
+          history: this.#history,
         })
       }
     }
 
     const { origin, pathname, search } = parseURL(
-      new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin)),
+      new URL(this.#location, this.#opts.origin && new URL(this.#opts.path, this.#opts.origin)),
     )
     const path = search ? `${pathname}${search}` : pathname
 
     // Remove headers referring to the original URL.
     // By default it is Host only, unless it's a 303 (see below), which removes also all Content-* headers.
     // https://tools.ietf.org/html/rfc7231#section-6.4
-    this.opts = {
-      ...this.opts,
+    this.#opts = {
+      ...this.#opts,
       headers: cleanRequestHeaders(
-        this.opts.headers,
+        this.#opts.headers,
         statusCode === 303,
-        this.opts.origin !== origin,
+        this.#opts.origin !== origin,
       ),
       path,
       origin,
@@ -100,13 +104,13 @@ class Handler extends DecoratorHandler {
 
     // https://tools.ietf.org/html/rfc7231#section-6.4.4
     // In case of HTTP 303, always replace method to be either HEAD or GET
-    if (statusCode === 303 && this.opts.method !== 'HEAD') {
-      this.opts = { ...this.opts, method: 'GET', body: null }
+    if (statusCode === 303 && this.#opts.method !== 'HEAD') {
+      this.#opts = { ...this.#opts, method: 'GET', body: null }
     }
   }
 
   onData(chunk) {
-    if (this.location) {
+    if (this.#location) {
       /*
         https://tools.ietf.org/html/rfc7231#section-6.4
 
@@ -125,12 +129,12 @@ class Handler extends DecoratorHandler {
         servers and browsers implementors, we ignore the body as there is no specified way to eventually parse it.
       */
     } else {
-      return this.handler.onData(chunk)
+      return this.#handler.onData(chunk)
     }
   }
 
   onComplete(trailers) {
-    if (this.location) {
+    if (this.#location) {
       /*
         https://tools.ietf.org/html/rfc7231#section-6.4
 
@@ -140,16 +144,16 @@ class Handler extends DecoratorHandler {
         See comment on onData method above for more detailed informations.
       */
 
-      this.location = null
+      this.#location = null
 
-      this.dispatch(this.opts, this)
+      this.#dispatch(this.#opts, this)
     } else {
-      return this.handler.onComplete(trailers)
+      return this.#handler.onComplete(trailers)
     }
   }
 
   onError(error) {
-    return this.handler.onError(error)
+    return this.#handler.onError(error)
   }
 }
 

package/lib/interceptor/request-id.js

@@ -12,7 +12,7 @@ function genReqId() {
 }
 
 export default (dispatch) => (opts, handler) => {
-  let id = opts.id ?? opts.headers?.['request-id'] ?? opts.headers?.['Request-Id']
+  let id = opts.id ?? opts.headers?.['request-id']
   id = id ? `${id},${genReqId()}` : genReqId()
 
   return dispatch(

package/lib/interceptor/response-content.js

@@ -31,8 +31,8 @@ class Handler extends DecoratorHandler {
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
-    this.#contentMD5 = headers ? headers['content-md5'] : headers['content-md5']
-    this.#contentLength = headers ? headers['content-length'] : headers['content-length']
+    this.#contentMD5 = headers['content-md5']
+    this.#contentLength = headers['content-length']
     this.#hasher = this.#contentMD5 != null ? crypto.createHash('md5') : null
 
     return this.#handler.onHeaders(statusCode, rawHeaders, resume, statusMessage, headers)

package/lib/interceptor/response-error.js

@@ -34,14 +34,14 @@ class Handler extends DecoratorHandler {
     this.#headers = headers
     this.#contentType = headers['content-type']
 
-    if (this.#statusCode >= 400) {
-      // TODO (fix): Check content length
-      if (this.#contentType === 'application/json' || this.#contentType === 'text/plain') {
-        this.#decoder = new TextDecoder('utf-8')
-      }
-    } else {
+    if (this.#statusCode < 400) {
       return this.#handler.onHeaders(statusCode, rawHeaders, resume, statusMessage, headers)
     }
+
+    // TODO (fix): Check content length
+    if (this.#contentType === 'application/json' || this.#contentType === 'text/plain') {
+      this.#decoder = new TextDecoder('utf-8')
+    }
   }
 
   onData(chunk) {
@@ -65,14 +65,22 @@ class Handler extends DecoratorHandler {
       }
 
       this.#errored = true
-      this.#handler.onError(
-        Object.assign(createHttpError(this.#statusCode), {
+
+      let err
+
+      const stackTraceLimit = Error.stackTraceLimit
+      Error.stackTraceLimit = 0
+      try {
+        err = Object.assign(createHttpError(this.#statusCode), {
           reason: this.#body?.reason,
           error: this.#body?.error,
           headers: this.#headers,
           body: this.#body,
-        }),
-      )
+        })
+      } finally {
+        Error.stackTraceLimit = stackTraceLimit
+      }
+      this.#handler.onError(err)
     } else {
       this.#handler.onComplete(rawTrailers)
     }

package/lib/interceptor/response-retry.js

@@ -97,6 +97,13 @@ class Handler extends DecoratorHandler {
         return this.#onHeaders(statusCode, rawHeaders, resume, statusMessage, headers)
       }
 
+      // Weak etags are not useful for comparison nor cache
+      // for instance not safe to assume if the response is byte-per-byte
+      // equal
+      if (this.#etag != null && this.#etag.startsWith('W/')) {
+        this.#etag = null
+      }
+
       assert(Number.isFinite(this.#pos))
       assert(this.#end == null || Number.isFinite(this.#end))
 
@@ -104,8 +111,7 @@ class Handler extends DecoratorHandler {
     } else if (statusCode === 206 || (this.#pos === 0 && statusCode === 200)) {
       assert(this.#etag != null || !this.#pos)
 
-      const etag = headers.etag
-      if (this.#pos > 0 && this.#etag !== etag) {
+      if (this.#pos > 0 && this.#etag !== headers.etag) {
         throw this.#error
       }
 
@@ -138,7 +144,7 @@ class Handler extends DecoratorHandler {
       return
     }
 
-    const retryPromise = retryFn(err, this.#retryCount++, this.#opts)
+    const retryPromise = retryFn(err, this.#retryCount++, { ...this.#opts.retry })
     if (retryPromise == null) {
       this.#onError(err)
       return
@@ -193,7 +199,8 @@ class Handler extends DecoratorHandler {
 }
 
 export default (dispatch) => (opts, handler) => {
-  return opts.idempotent && opts.retry && opts.method === 'GET' && !opts.upgrade
+  // TODO (fix): HEAD, PUT, PATCH, DELETE, OPTIONS?
+  return opts.retry && opts.method === 'GET' && !opts.upgrade
     ? dispatch(opts, new Handler(opts, { handler, dispatch }))
     : dispatch(opts, handler)
 }

package/lib/readable.js

@@ -90,7 +90,7 @@ export class BodyReadable extends Readable {
       this[kHandler].signal = null
     }
 
-    if (err) {
+    if (!this[kReading]) {
       // Workaround for Node "bug". If the stream is destroyed in same
       // tick as it is created, then a user who is waiting for a
       // promise (i.e micro tick) for installing a 'error' listener will

package/lib/utils.js

@@ -6,6 +6,10 @@ export function parseCacheControl(str) {
   return str ? cacheControlParser.parse(str) : null
 }
 
+export function headerNameToString(name) {
+  return util.headerNameToString(name)
+}
+
 // Parsed accordingly to RFC 9110
 // https://www.rfc-editor.org/rfc/rfc9110#field.content-range
 export function parseRangeHeader(range) {
@@ -66,50 +70,24 @@ export function parseContentRange(range) {
   return { start, end: end ? end + 1 : size, size }
 }
 
-export function findHeader(headers, name) {
-  const len = name.length
-
-  if (Array.isArray(headers)) {
-    for (let i = 0; i < headers.length; i += 2) {
-      const key = headers[i + 0]
-      if (key.length === len && util.headerNameToString(key) === name) {
-        return headers[i + 1]?.toString()
-      }
-    }
-  } else if (headers != null) {
-    const val = headers[name]
-    if (val !== undefined) {
-      return val
-    }
-
-    for (const key of Object.keys(headers)) {
-      if (key.length === len && util.headerNameToString(key) === name) {
-        return headers[key]?.toString()
-      }
-    }
-  }
-
-  return null
-}
-
 export function retry(err, retryCount, opts) {
-  if (!opts.retry) {
+  if (!opts) {
     return null
   }
 
-  if (typeof opts.retry === 'function') {
+  if (typeof opts === 'function') {
     try {
-      return opts.retry(err, retryCount, opts)
+      return opts(err, retryCount, opts, (opts) => retry(err, retryCount, opts))
     } catch (err) {
       return Promise.reject(err)
     }
   }
 
-  if (typeof opts.retry === 'number') {
-    opts = { count: opts.retry }
+  if (typeof opts === 'number') {
+    opts = { count: opts }
   }
 
-  const retryMax = opts.retry?.count ?? opts.maxRetries ?? 8
+  const retryMax = opts?.count ?? 8
 
   if (retryCount > retryMax) {
     return null

package/package.json

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