@nxtedition/nxt-undici 6.2.11 → 6.2.13

package/lib/interceptor/cache.js

@@ -1,6 +1,6 @@
 import undici from '@nxtedition/undici'
 import { DecoratorHandler, parseCacheControl, parseContentRange } from '../utils.js'
-import { SqliteCacheStore, assertCacheKey } from '../sqlite-cache-store.js'
+import { SqliteCacheStore } from '../sqlite-cache-store.js'
 
 const DEFAULT_STORE = new SqliteCacheStore({ location: ':memory:' })
 const DEFAULT_MAX_ENTRY_SIZE = 128 * 1024
@@ -13,8 +13,6 @@ class CacheHandler extends DecoratorHandler {
   #maxEntrySize
 
   constructor(key, { store, handler, maxEntrySize }) {
-    assertCacheKey(key)
-
     super(handler)
 
     this.#key = key
@@ -211,7 +209,7 @@ export default () => (dispatch) => (opts, handler) => {
     )
   }
 
-  const { statusCode, headers, body } = entry ?? { statusCode: 504, headers: {} }
+  const { statusCode, headers, trailers, body } = entry ?? { statusCode: 504 }
 
   let aborted = false
   const abort = (reason) => {
@@ -230,7 +228,7 @@ export default () => (dispatch) => (opts, handler) => {
       return
     }
 
-    handler.onHeaders(statusCode, headers, NOOP)
+    handler.onHeaders(statusCode, headers ?? {}, NOOP)
     if (aborted) {
       return
     }
@@ -242,7 +240,7 @@ export default () => (dispatch) => (opts, handler) => {
       }
     }
 
-    handler.onComplete({})
+    handler.onComplete(trailers ?? {})
   } catch (err) {
     abort(err)
   }

package/lib/interceptor/dns.js

@@ -35,15 +35,18 @@ export default () => (dispatch) => {
   function resolve(hostname, { logger }) {
     let promise = promises.get(hostname)
     if (!promise) {
-      logger?.debug({ dns: { hostname } }, 'lookup started')
-      promise = new Promise((resolve) =>
+      promise = new Promise((resolve) => {
+        logger?.debug({ dns: { hostname } }, 'lookup started')
         dns.resolve4(hostname, { ttl: true }, (err, records) => {
           promises.delete(hostname)
 
           if (err) {
             logger?.error({ err, dns: { hostname } }, 'lookup failed')
+
             resolve([err, null])
           } else {
+            logger?.debug({ dns: { hostname, records } }, 'lookup completed')
+
             const now = getFastNow()
             const val = records.map(({ address, ttl }) => ({
               address,
@@ -53,14 +56,12 @@ export default () => (dispatch) => {
               counter: 0,
             }))
 
-            logger?.debug({ err, dns: { hostname, records } }, 'lookup completed')
-
             cache.set(hostname, val)
 
             resolve([null, val])
           }
-        }),
-      )
+        })
+      })
       promises.set(hostname, promise)
     }
     return promise

package/lib/interceptor/response-error.js

@@ -1,11 +1,10 @@
-import createHttpError from 'http-errors'
-import { DecoratorHandler } from '../utils.js'
+import { DecoratorHandler, decorateError } from '../utils.js'
 
 class Handler extends DecoratorHandler {
   #statusCode = 0
-  #contentType
   #decoder
   #headers
+  #trailers
   #body = ''
   #opts
 
@@ -15,13 +14,8 @@ class Handler extends DecoratorHandler {
     this.#opts = opts
   }
 
-  #checkContentType(contentType) {
-    return (this.#contentType ?? '').indexOf(contentType) === 0
-  }
-
   onConnect(abort) {
     this.#statusCode = 0
-    this.#contentType = null
     this.#decoder = null
     this.#headers = null
     this.#body = ''
@@ -32,14 +26,17 @@ class Handler extends DecoratorHandler {
   onHeaders(statusCode, headers, resume) {
     this.#statusCode = statusCode
     this.#headers = headers
-    this.#contentType = headers['content-type']
 
     if (this.#statusCode < 400) {
       return super.onHeaders(statusCode, headers, resume)
     }
 
-    if (this.#checkContentType('application/json') || this.#checkContentType('text/plain')) {
+    if (
+      this.#headers['content-type']?.startsWith('application/json') ||
+      this.#headers['content-type']?.startsWith('text/plain')
+    ) {
       this.#decoder = new TextDecoder('utf-8')
+      this.#body = ''
     }
   }
 
@@ -52,72 +49,33 @@ class Handler extends DecoratorHandler {
   }
 
   onComplete(trailers) {
-    if (this.#statusCode >= 400) {
-      this.#body += this.#decoder?.decode(undefined, { stream: false }) ?? ''
-
-      if (this.#checkContentType('application/json')) {
-        try {
-          this.#body = JSON.parse(this.#body)
-        } catch {
-          // Do nothing...
-        }
-      }
-
-      let err
-      const stackTraceLimit = Error.stackTraceLimit
-      Error.stackTraceLimit = 0
-      try {
-        err = createHttpError(this.#statusCode)
-      } finally {
-        Error.stackTraceLimit = stackTraceLimit
-      }
-
-      super.onError(this.#decorateError(err))
-    } else {
-      super.onComplete(trailers)
+    this.#trailers = trailers
+
+    if (this.#statusCode < 400) {
+      return super.onComplete(trailers)
     }
-  }
 
-  onError(err) {
-    super.onError(this.#decorateError(err))
+    this.#body += this.#decoder?.decode(undefined, { stream: false }) ?? ''
+
+    super.onError(
+      decorateError(null, this.#opts, {
+        statusCode: this.#statusCode,
+        headers: this.#headers,
+        trailers: this.#trailers,
+        body: this.#body,
+      }),
+    )
   }
 
-  #decorateError(err) {
-    try {
-      err.url ??= this.#opts.origin ? new URL(this.#opts.path, this.#opts.origin).href : null
-
-      err.req = {
-        method: this.#opts?.method,
-        headers: this.#opts?.headers,
-        body:
-          // TODO (fix): JSON.stringify POJO
-          typeof this.#opts?.body !== 'string' || this.#opts.body.length > 1024
-            ? undefined
-            : this.#opts.body,
-      }
-
-      err.res = {
+  onError(err) {
+    super.onError(
+      decorateError(err, this.#opts, {
+        statusCode: this.#statusCode,
         headers: this.#headers,
-        // TODO (fix): JSON.stringify POJO
-        body: typeof this.#body !== 'string' || this.#body.length < 1024 ? undefined : this.#body,
-      }
-
-      if (this.#body) {
-        if (this.#body.reason != null) {
-          err.reason ??= this.#body.reason
-        }
-        if (this.#body.code != null) {
-          err.code ??= this.#body.code
-        }
-        if (this.#body.error != null) {
-          err.error ??= this.#body.error
-        }
-      }
-
-      return err
-    } catch (er) {
-      return new AggregateError([er, err])
-    }
+        trailers: this.#trailers,
+        body: null,
+      }),
+    )
   }
 }
 

package/lib/interceptor/response-retry.js

@@ -1,7 +1,6 @@
 import assert from 'node:assert'
 import tp from 'node:timers/promises'
-import { DecoratorHandler, isDisturbed, parseRangeHeader } from '../utils.js'
-import createHttpError from 'http-errors'
+import { DecoratorHandler, isDisturbed, decorateError, parseRangeHeader } from '../utils.js'
 
 function noop() {}
 
@@ -15,8 +14,10 @@ class Handler extends DecoratorHandler {
   #errorSent = false
 
   #statusCode = 0
-  #headers = null
-  #trailers = null
+  #headers
+  #trailers
+  #body = ''
+  #decoder
 
   #abort
   #aborted = false
@@ -48,6 +49,8 @@ class Handler extends DecoratorHandler {
     this.#statusCode = 0
     this.#headers = null
     this.#trailers = null
+    this.#body = ''
+    this.#decoder = null
 
     if (!this.#headersSent) {
       this.#pos = null
@@ -117,6 +120,13 @@ class Handler extends DecoratorHandler {
         this.#end = contentLength
         this.#etag = headers.etag
       } else if (statusCode >= 400) {
+        if (
+          this.#headers['content-type']?.startsWith('application/json') ||
+          this.#headers['content-type']?.startsWith('text/plain')
+        ) {
+          this.#decoder = new TextDecoder('utf-8')
+          this.#body = ''
+        }
         return true
       } else {
         return this.#onHeaders(statusCode, headers, resume)
@@ -161,29 +171,30 @@ class Handler extends DecoratorHandler {
   }
 
   onData(chunk) {
-    if (this.#statusCode >= 400) {
-      // TODO (fix): Limit the amount of data we read?
-      return true
-    }
-
     if (this.#pos != null) {
       this.#pos += chunk.byteLength
     }
-    return super.onData(chunk)
-  }
 
-  onError(err) {
-    this.#maybeRetry(err)
+    if (this.#statusCode < 400) {
+      return super.onData(chunk)
+    }
+
+    this.#body += this.#decoder?.decode(chunk, { stream: true }) ?? ''
   }
 
   onComplete(trailers) {
     this.#trailers = trailers
 
-    if (this.#statusCode >= 400) {
-      this.#maybeRetry(null, this.#statusCode)
-    } else {
-      super.onComplete(trailers)
+    if (this.#statusCode < 400) {
+      return super.onComplete(trailers)
     }
+
+    this.#body += this.#decoder?.decode(undefined, { stream: false }) ?? ''
+    this.#maybeRetry(null)
+  }
+
+  onError(err) {
+    this.#maybeRetry(err)
   }
 
   #maybeError(err) {
@@ -202,26 +213,29 @@ class Handler extends DecoratorHandler {
     }
   }
 
-  #maybeRetry(err, statusCode) {
+  #maybeRetry(err) {
     if (this.#aborted || isDisturbed(this.#opts.body) || (this.#pos && !this.#etag)) {
       this.#maybeError(err)
       return
     }
 
-    if (!err) {
-      // TOOD (fix): Avoid creating an Error and do onHeaders + onComplete.
-      const stackTraceLimit = Error.stackTraceLimit
-      Error.stackTraceLimit = 0
-      try {
-        err = createHttpError(statusCode ?? 500)
-      } finally {
-        Error.stackTraceLimit = stackTraceLimit
-      }
-    }
+    this.#error =
+      err ??
+      decorateError(null, this.#opts, {
+        statusCode: this.#statusCode,
+        headers: this.#headers,
+        trailers: this.#trailers,
+        body: this.#body,
+      })
 
     let retryPromise
     try {
-      retryPromise = retryFn(err, this.#retryCount, this.#opts)
+      retryPromise =
+        typeof this.#opts?.retry === 'function'
+          ? this.#opts?.retry(this.#error, this.#retryCount, this.#opts, () =>
+              retryFn(this.#error, this.#retryCount, this.#opts),
+            )
+          : retryFn(this.#error, this.#retryCount, this.#opts)
     } catch (err) {
       retryPromise = Promise.reject(err)
     }
@@ -231,8 +245,6 @@ class Handler extends DecoratorHandler {
       return
     }
 
-    this.#error = err
-
     retryPromise
       .then((opts) => {
         if (this.#aborted) {
@@ -301,10 +313,6 @@ async function retryFn(err, retryCount, opts) {
     throw err
   }
 
-  if (typeof retryOpts === 'function') {
-    return retryOpts(err, retryCount, opts, () => retryFn(err, retryCount, opts))
-  }
-
   if (typeof retryOpts === 'number') {
     retryOpts = { count: retryOpts }
   }
@@ -338,6 +346,7 @@ async function retryFn(err, retryCount, opts) {
       'EHOSTDOWN',
       'EHOSTUNREACH',
       'EPIPE',
+      'ENODATA',
       'UND_ERR_CONNECT_TIMEOUT',
     ].includes(err.code)
   ) {

package/lib/sqlite-cache-store.js

@@ -410,7 +410,7 @@ function makeResult(value) {
 /**
  * @param {any} key
  */
-export function assertCacheKey(key) {
+function assertCacheKey(key) {
   if (typeof key !== 'object') {
     throw new TypeError(`expected key to be object, got ${typeof key}`)
   }
@@ -429,7 +429,7 @@ export function assertCacheKey(key) {
 /**
  * @param {any} value
  */
-export function assertCacheValue(value) {
+function assertCacheValue(value) {
   if (typeof value !== 'object') {
     throw new TypeError(`expected value to be object, got ${typeof value}`)
   }

package/lib/utils.js

@@ -2,6 +2,7 @@ import cacheControlParser from 'cache-control-parser'
 import stream from 'node:stream'
 import assert from 'node:assert'
 import { util } from '@nxtedition/undici'
+import createHttpError from 'http-errors'
 
 let fastNow = Date.now()
 
@@ -351,9 +352,69 @@ export function parseHeaders(headers, obj) {
   }
 
   // See https://github.com/nodejs/node/pull/46528
-  if ('content-length' in obj && 'content-disposition' in obj) {
+  if (obj != null && 'content-length' in obj && 'content-disposition' in obj) {
     obj['content-disposition'] = Buffer.from(obj['content-disposition']).toString('latin1')
   }
 
   return obj
 }
+
+export function decorateError(err, opts, { statusCode, headers, trailers, body }) {
+  try {
+    if (err == null) {
+      const stackTraceLimit = Error.stackTraceLimit
+      Error.stackTraceLimit = 0
+      try {
+        err = createHttpError(statusCode)
+      } finally {
+        Error.stackTraceLimit = stackTraceLimit
+      }
+    }
+
+    if (statusCode != null) {
+      err.statusCode = statusCode
+    }
+
+    err.url ??= opts.origin ? new URL(opts.path, opts.origin).href : null
+
+    err.req = {
+      method: opts?.method,
+      headers: opts?.headers,
+      body:
+        // TODO (fix): JSON.stringify POJO
+        typeof opts?.body !== 'string' || opts.body.length > 1024 ? undefined : opts.body,
+    }
+
+    if (headers?.['content-type']?.startsWith('application/json') && typeof body === 'string') {
+      try {
+        body = JSON.parse(body)
+      } catch {
+        // Do nothing...
+      }
+    }
+
+    err.res = {
+      headers,
+      trailers,
+      // TODO (fix): JSON.stringify POJO
+      body: typeof body !== 'string' || body.length < 1024 ? undefined : body,
+      statusCode,
+    }
+
+    if (body) {
+      if (body.reason != null) {
+        err.reason ??= body.reason
+      }
+      if (body.code != null) {
+        err.code ??= body.code
+      }
+      if (body.error != null) {
+        err.error ??= body.error
+      }
+    }
+
+    return err
+  } catch (er) {
+    return new AggregateError([er, err])
+  }
+}

package/package.json

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