@nxtedition/nxt-undici 2.0.38 → 2.0.40

package/lib/index.js

@@ -3,7 +3,6 @@ import createError from 'http-errors'
 import undici from 'undici'
 import { findHeader, parseHeaders, AbortError, isStream } from './utils.js'
 import { BodyReadable as Readable } from './readable.js'
-import CacheableLookup from 'cacheable-lookup'
 
 const dispatcherCache = new WeakMap()
 
@@ -33,13 +32,6 @@ const dispatchers = {
   requestId: (await import('./interceptor/request-id.js')).default,
 }
 
-const dnsCache = new CacheableLookup({ maxTtl: 10e3 })
-const defaultDispatcher = new undici.Agent({
-  connect: {
-    lookup: dnsCache.lookup,
-  },
-})
-
 export async function request(url, opts) {
   // TODO (fix): More argument validation...
 
@@ -113,7 +105,7 @@ export async function request(url, opts) {
     opts.body.on('error', () => {})
   }
 
-  const dispatcher = opts.dispatcher ?? defaultDispatcher
+  const dispatcher = opts.dispatcher ?? undici.getGlobalDispatcher()
 
   let dispatch = dispatcherCache.get(dispatcher)
   if (dispatch == null) {

package/lib/interceptor/redirect.js

@@ -17,6 +17,7 @@ class Handler {
 
     this.count = 0
     this.location = null
+    this.history = []
 
     this.handler.onConnect((reason) => {
       this.aborted = true
@@ -57,6 +58,7 @@ class Handler {
       throw new Error(`Missing redirection location .`)
     }
 
+    this.history.push(this.location)
     this.count += 1
 
     if (typeof this.opts.follow === 'function') {
@@ -67,7 +69,9 @@ class Handler {
       }
     } else {
       if (this.count >= this.maxCount) {
-        throw new Error(`Max redirections reached: ${this.maxCount}.`)
+        throw Object.assign(new Error(`Max redirections reached: ${this.maxCount}.`), {
+          history: this.history,
+        })
       }
     }
 

package/lib/interceptor/response-retry-body.js

@@ -171,3 +171,23 @@ export default (dispatch) => (opts, handler) => {
     ? dispatch(opts, new Handler(opts, { handler, dispatch }))
     : dispatch(opts, handler)
 }
+export function isConnectionError(err) {
+  // AWS compat.
+  const statusCode = err?.statusCode ?? err?.$metadata?.httpStatusCode
+  return err
+    ? err.code === 'ECONNRESET' ||
+        err.code === 'ECONNREFUSED' ||
+        err.code === 'ENOTFOUND' ||
+        err.code === 'ENETDOWN' ||
+        err.code === 'ENETUNREACH' ||
+        err.code === 'EHOSTDOWN' ||
+        err.code === 'EHOSTUNREACH' ||
+        err.code === 'EPIPE' ||
+        err.message === 'other side closed' ||
+        statusCode === 420 ||
+        statusCode === 429 ||
+        statusCode === 502 ||
+        statusCode === 503 ||
+        statusCode === 504
+    : false
+}

package/lib/readable.js

@@ -12,6 +12,7 @@ const kReading = Symbol('kReading')
 const kBody = Symbol('kBody')
 const kAbort = Symbol('abort')
 const kContentType = Symbol('kContentType')
+const kReadLength = Symbol('kReadLength')
 
 const kStatusCode = Symbol('kStatusCode')
 const kStatusMessage = Symbol('kStatusMessage')
@@ -40,8 +41,9 @@ export class BodyReadable extends Readable {
     this[kStatusCode] = statusCode
     this[kStatusMessage] = statusMessage
     this[kHeaders] = headers
-    this[kSize] = size
+    this[kSize] = Number.isFinite(size) ? size : null
     this[kAbort] = abort
+    this[kReadLength] = 0
 
     this[kConsume] = null
     this[kBody] = null
@@ -124,7 +126,16 @@ export class BodyReadable extends Readable {
     return this.off(ev, ...args)
   }
 
+  setEncoding(encoding) {
+    if (encoding) {
+      throw new Error('not supported')
+    }
+    return super.setEncoding(encoding)
+  }
+
   push(chunk) {
+    this[kReadLength] += chunk.length
+
     if (this[kConsume] && chunk !== null) {
       consumePush(this[kConsume], chunk)
       return this[kReading] ? super.push(chunk) : true
@@ -164,9 +175,13 @@ export class BodyReadable extends Readable {
   }
 
   async dump(opts) {
-    let limit = Number.isFinite(opts?.limit) ? opts.limit : 262144
+    let limit = Number.isFinite(opts?.limit) ? opts.limit : 128 * 1024
     const signal = opts?.signal
 
+    if (this[kSize] != null && this[kSize] - this[kReadLength] > limit) {
+      this.destroy(signal.reason ?? new AbortError())
+    }
+
     if (signal != null && (typeof signal !== 'object' || !('aborted' in signal))) {
       throw new InvalidArgumentError('signal must be an AbortSignal')
     }

package/package.json

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