@nxtedition/nxt-undici 2.0.16 → 2.0.18

package/lib/index.js

@@ -84,6 +84,7 @@ class Readable extends stream.Readable {
   async text() {
     const dec = new TextDecoder()
     let str = ''
+
     for await (const chunk of this) {
       if (typeof chunk === 'string') {
         str += chunk
@@ -91,6 +92,7 @@ class Readable extends stream.Readable {
         str += dec.decode(chunk, { stream: true })
       }
     }
+
     // Flush the streaming TextDecoder so that any pending
     // incomplete multibyte characters are handled.
     str += dec.decode(undefined, { stream: false })
@@ -142,6 +144,7 @@ const dispatchers = {
   log: (await import('./interceptor/log.js')).default,
   redirect: (await import('./interceptor/redirect.js')).default,
   responseRetry: (await import('./interceptor/response-retry.js')).default,
+  responseRetryBody: (await import('./interceptor/response-retry-body.js')).default,
   proxy: (await import('./interceptor/proxy.js')).default,
   cache: (await import('./interceptor/cache.js')).default,
   requestId: (await import('./interceptor/request-id.js')).default,
@@ -232,10 +235,11 @@ export async function request(url, opts) {
     dispatch = dispatchers.log(dispatch)
     dispatch = dispatchers.requestId(dispatch)
     dispatch = dispatchers.responseRetry(dispatch)
+    dispatch = dispatchers.responseRetryBody(dispatch)
     dispatch = dispatchers.responseContent(dispatch)
     dispatch = dispatchers.requestContent(dispatch)
-    dispatch = dispatchers.redirect(dispatch)
     dispatch = dispatchers.cache(dispatch)
+    dispatch = dispatchers.redirect(dispatch)
     dispatch = dispatchers.proxy(dispatch)
     dispatch = dispatchers.requestBody(dispatch)
     dispatcherCache.set(dispatcher, dispatch)
@@ -244,7 +248,7 @@ export async function request(url, opts) {
   return await new Promise((resolve, reject) =>
     dispatch(
       {
-        id: opts.id ?? headers?.['request-id'] ?? headers?.['Request-Id'] ?? genReqId(),
+        id: opts.id ?? findHeader(headers, 'request-id') ?? genReqId(),
         url,
         method,
         body: opts.body,
@@ -289,9 +293,7 @@ export async function request(url, opts) {
             }
           }
         },
-        onUpgrade(statusCode, rawHeaders, socket) {
-          const headers = parseHeaders(rawHeaders)
-
+        onUpgrade(statusCode, rawHeaders, socket, headers = parseHeaders(rawHeaders)) {
           if (statusCode !== 101) {
             this.abort(createError(statusCode, { headers }))
           } else {
@@ -332,9 +334,6 @@ export async function request(url, opts) {
           return this.body.push(chunk)
         },
         onComplete() {
-          this.signal?.removeEventListener('abort', this.onAbort)
-          this.signal = null
-
           this.body.push(null)
         },
         onError(err) {

package/lib/interceptor/cache.js

@@ -14,8 +14,8 @@ class CacheHandler {
     return this.handler.onConnect(abort)
   }
 
-  onUpgrade(statusCode, rawHeaders, socket) {
-    return this.handler.onUpgrade(statusCode, rawHeaders, socket)
+  onUpgrade(statusCode, rawHeaders, socket, headers) {
+    return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
   onBodySent(chunk) {

package/lib/interceptor/log.js

@@ -31,13 +31,13 @@ class Handler {
     })
   }
 
-  onUpgrade(statusCode, rawHeaders, socket) {
+  onUpgrade(statusCode, rawHeaders, socket, headers) {
     this.logger.debug('upstream request upgraded')
     socket.on('close', () => {
       this.logger.debug('upstream request socket closed')
     })
 
-    return this.handler.onUpgrade(statusCode, rawHeaders, socket)
+    return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
   onBodySent(chunk) {
@@ -100,7 +100,7 @@ class Handler {
       )
     } else {
       this.logger.error(
-        { bytesRead: this.pos, elapsedTime: this.stats.end, err },
+        { ureq: this.opts, bytesRead: this.pos, elapsedTime: this.stats.end, err },
         'upstream request failed',
       )
     }

package/lib/interceptor/redirect.js

@@ -34,8 +34,8 @@ class Handler {
     }
   }
 
-  onUpgrade(statusCode, headers, socket) {
-    return this.handler.onUpgrade(statusCode, headers, socket)
+  onUpgrade(statusCode, rawHeaders, socket, headers) {
+    return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
   onBodySent(chunk) {

package/lib/interceptor/request-body.js

@@ -27,8 +27,8 @@ class Handler {
     }
   }
 
-  onUpgrade(statusCode, rawHeaders, socket) {
-    return this.handler.onUpgrade(statusCode, rawHeaders, socket)
+  onUpgrade(statusCode, rawHeaders, socket, headers) {
+    return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
   onBodySent(chunk) {

package/lib/interceptor/request-content.js

@@ -1,4 +1,5 @@
 import crypto from 'node:crypto'
+import { findHeader } from '../utils.js'
 
 class Handler {
   constructor(opts, { handler, md5, length }) {
@@ -16,8 +17,8 @@ class Handler {
     return this.handler.onConnect(abort)
   }
 
-  onUpgrade(statusCode, rawHeaders, socket) {
-    return this.handler.onUpgrade(statusCode, rawHeaders, socket)
+  onUpgrade(statusCode, rawHeaders, socket, headers) {
+    return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
   onBodySent(chunk) {
@@ -30,20 +31,20 @@ class Handler {
   onRequestSent() {
     const hash = this.hasher?.digest('base64')
 
-    if (this.md5 != null && hash !== this.md5) {
+    if (this.length != null && this.pos !== Number(this.length)) {
       this.abort(
         Object.assign(new Error('Request Content-Length mismatch'), {
-          expected: this.md5,
-          actual: hash,
+          expected: Number(this.length),
+          actual: this.pos,
         }),
       )
     }
 
-    if (this.length != null && this.pos !== Number(this.length)) {
+    if (this.md5 != null && hash !== this.md5) {
       this.abort(
-        Object.assign(new Error('Request Content-Length mismatch'), {
-          expected: Number(this.length),
-          actual: this.pos,
+        Object.assign(new Error('Request Content-MD5 mismatch'), {
+          expected: this.md5,
+          actual: hash,
         }),
       )
     }
@@ -74,8 +75,8 @@ export default (dispatch) => (opts, handler) => {
   }
 
   // TODO (fix): case-insensitive check?
-  const md5 = opts.headers?.['content-md5'] ?? opts.headers?.['Content-MD5']
-  const length = opts.headers?.['content-lenght'] ?? opts.headers?.['Content-Length']
+  const md5 = findHeader(opts.headers, 'content-md5')
+  const length = findHeader(opts.headers, 'content-length')
 
   return md5 != null || length != null
     ? dispatch(opts, new Handler(opts, { handler, md5, length }))

package/lib/interceptor/response-content.js

@@ -14,8 +14,8 @@ class Handler {
     return this.handler.onConnect(abort)
   }
 
-  onUpgrade(statusCode, rawHeaders, socket) {
-    return this.handler.onUpgrade(statusCode, rawHeaders, socket)
+  onUpgrade(statusCode, rawHeaders, socket, headers) {
+    return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
   onBodySent(chunk) {
@@ -44,15 +44,6 @@ class Handler {
   onComplete(rawTrailers) {
     const hash = this.hasher?.digest('base64')
 
-    if (this.md5 != null && hash !== this.md5) {
-      return this.handler.onError(
-        Object.assign(new Error('Request Content-Length mismatch'), {
-          expected: this.md5,
-          actual: hash,
-        }),
-      )
-    }
-
     if (this.length != null && this.pos !== Number(this.length)) {
       return this.handler.onError(
         Object.assign(new Error('Request Content-Length mismatch'), {
@@ -60,9 +51,16 @@ class Handler {
           actual: this.pos,
         }),
       )
+    } else if (this.md5 != null && hash !== this.md5) {
+      return this.handler.onError(
+        Object.assign(new Error('Request Content-MD5 mismatch'), {
+          expected: this.md5,
+          actual: hash,
+        }),
+      )
+    } else {
+      return this.handler.onComplete(rawTrailers)
     }
-
-    return this.handler.onComplete(rawTrailers)
   }
 
   onError(err) {

package/lib/interceptor/response-error.js

@@ -15,8 +15,8 @@ class Handler {
     return this.handler.onConnect(abort)
   }
 
-  onUpgrade(statusCode, rawHeaders, socket) {
-    return this.handler.onUpgrade(statusCode, rawHeaders, socket)
+  onUpgrade(statusCode, rawHeaders, socket, headers) {
+    return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
   onBodySent(chunk) {
@@ -63,26 +63,33 @@ class Handler {
 
   onFinally(err, rawTrailers) {
     if (this.statusCode) {
+      if (this.decoder != null) {
+        this.body += this.decoder.decode(undefined, { stream: false })
+        if (this.contentType === 'application/json') {
+          this.body = JSON.parse(this.body)
+        }
+      }
+
       const stackTraceLimit = Error.stackTraceLimit
       Error.stackTraceLimit = 0
       try {
-        if (this.decoder != null) {
-          this.body += this.decoder.decode(undefined, { stream: false })
-          if (this.contentType === 'application/json') {
-            this.body = JSON.parse(this.body)
-          }
-        }
         this.handler.onError(
           createHttpError(this.statusCode, { headers: this.headers, body: this.body }),
         )
       } finally {
         Error.stackTraceLimit = stackTraceLimit
       }
+
+      this.decoder = null
+      this.contentType = null
+      this.body = null
     } else if (err) {
       this.handler.onError(err)
     } else {
       this.handler.onComplete(rawTrailers)
     }
+
+    this.handler = null
   }
 }
 

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

@@ -0,0 +1,169 @@
+import assert from 'node:assert'
+import { parseContentRange, isDisturbed, findHeader, retry as retryFn } from '../utils.js'
+
+class Handler {
+  constructor(opts, { dispatch, handler }) {
+    this.dispatch = dispatch
+    this.handler = handler
+    this.opts = opts
+
+    this.count = 0
+    this.pos = 0
+    this.end = null
+    this.error = null
+    this.etag = null
+
+    this.reason = null
+    this.aborted = false
+
+    this.handler.onConnect((reason) => {
+      this.aborted = true
+      if (this.abort) {
+        this.abort(reason)
+      } else {
+        this.reason = reason
+      }
+    })
+  }
+
+  onConnect(abort) {
+    if (this.aborted) {
+      abort(this.reason)
+    } else {
+      this.abort = abort
+    }
+  }
+
+  onUpgrade(statusCode, rawHeaders, socket, headers) {
+    return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
+  }
+
+  onBodySent(chunk) {
+    return this.handler.onBodySent(chunk)
+  }
+
+  onRequestSent() {
+    return this.handler.onRequestSent()
+  }
+
+  onHeaders(statusCode, rawHeaders, resume, statusMessage, headers) {
+    const etag = findHeader(rawHeaders, 'etag')
+
+    if (this.resume) {
+      this.resume = null
+
+      // TODO (fix): Support other statusCode with skip?
+      if (statusCode !== 206) {
+        throw this.error
+      }
+
+      // TODO (fix): strict vs weak etag?
+      if (this.etag == null || this.etag !== etag) {
+        throw this.error
+      }
+
+      const contentRange = parseContentRange(findHeader(rawHeaders, 'content-range'))
+      if (!contentRange) {
+        throw this.error
+      }
+
+      const { start, size, end = size } = contentRange
+
+      assert(this.pos === start, 'content-range mismatch')
+      assert(this.end == null || this.end === end, 'content-range mismatch')
+
+      this.resume = resume
+      return true
+    }
+
+    if (this.end == null) {
+      if (statusCode === 206) {
+        const contentRange = parseContentRange(findHeader(rawHeaders, 'content-range'))
+        if (!contentRange) {
+          return this.handler.onHeaders(
+            statusCode,
+            rawHeaders,
+            () => this.resume(),
+            statusMessage,
+            headers,
+          )
+        }
+
+        const { start, size, end = size } = contentRange
+
+        this.end = end
+        this.pos = Number(start)
+      } else {
+        const contentLength = findHeader(rawHeaders, 'content-length')
+        if (contentLength) {
+          this.end = Number(contentLength)
+        }
+      }
+
+      assert(Number.isFinite(this.pos))
+      assert(this.end == null || Number.isFinite(this.end), 'invalid content-length')
+    }
+
+    this.etag = etag
+    this.resume = resume
+
+    return this.handler.onHeaders(
+      statusCode,
+      rawHeaders,
+      () => this.resume(),
+      statusMessage,
+      headers,
+    )
+  }
+
+  onData(chunk) {
+    this.pos += chunk.length
+    this.count = 0
+    return this.handler.onData(chunk)
+  }
+
+  onComplete(rawTrailers) {
+    return this.handler.onComplete(rawTrailers)
+  }
+
+  onError(err) {
+    if (this.aborted || !this.etag || isDisturbed(this.opts.body)) {
+      return this.handler.onError(err)
+    }
+
+    const retryPromise = retryFn(err, this.count++, this.opts)
+    if (retryPromise == null) {
+      return this.handler.onError(err)
+    }
+
+    this.error = err
+    this.opts = {
+      ...this.opts,
+      headers: {
+        ...this.opts.headers,
+        'if-match': this.etag,
+        range: `bytes=${this.pos}-${this.end ?? ''}`,
+      },
+    }
+
+    this.opts.logger?.debug('retrying response body')
+
+    retryPromise
+      .then(() => {
+        if (!this.aborted) {
+          this.dispatch(this.opts, this)
+        }
+      })
+      .catch((err) => {
+        if (!this.aborted) {
+          this.handler.onError(err)
+        }
+      })
+  }
+}
+
+export default (dispatch) => (opts, handler) => {
+  return opts.idempotent && opts.retry && opts.method === 'GET' && !opts.upgrade
+    ? dispatch(opts, new Handler(opts, { handler, dispatch }))
+    : dispatch(opts, handler)
+}

package/lib/interceptor/response-retry.js

@@ -1,5 +1,4 @@
-import assert from 'node:assert'
-import { parseContentRange, isDisturbed, findHeader, retry as retryFn } from '../utils.js'
+import { isDisturbed, retry as retryFn } from '../utils.js'
 
 class Handler {
   constructor(opts, { dispatch, handler }) {
@@ -8,24 +7,31 @@ class Handler {
     this.opts = opts
 
     this.hasBody = false
-    this.aborted = false
     this.count = 0
-    this.pos = 0
-    this.end = null
-    this.error = null
-    this.etag = null
-  }
 
-  onConnect(abort) {
+    this.reason = null
     this.aborted = false
-    return this.handler.onConnect((reason) => {
+
+    this.handler.onConnect((reason) => {
       this.aborted = true
-      abort(reason)
+      if (this.abort) {
+        this.abort(reason)
+      } else {
+        this.reason = reason
+      }
     })
   }
 
-  onUpgrade(statusCode, rawHeaders, socket) {
-    return this.handler.onUpgrade(statusCode, rawHeaders, socket)
+  onConnect(abort) {
+    if (this.aborted) {
+      abort(this.reason)
+    } else {
+      this.abort = abort
+    }
+  }
+
+  onUpgrade(statusCode, rawHeaders, socket, headers) {
+    return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
   onBodySent(chunk) {
@@ -37,80 +43,11 @@ class Handler {
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers) {
-    const etag = findHeader(rawHeaders, 'etag')
-
-    if (this.resume) {
-      this.resume = null
-
-      // TODO (fix): Support other statusCode with skip?
-      if (statusCode !== 206) {
-        throw this.error
-      }
-
-      // TODO (fix): strict vs weak etag?
-      if (this.etag == null || this.etag !== etag) {
-        throw this.error
-      }
-
-      const contentRange = parseContentRange(findHeader(rawHeaders, 'content-range'))
-      if (!contentRange) {
-        throw this.error
-      }
-
-      const { start, size, end = size } = contentRange
-
-      assert(this.pos === start, 'content-range mismatch')
-      assert(this.end == null || this.end === end, 'content-range mismatch')
-
-      this.resume = resume
-      return true
-    }
-
-    if (this.end == null) {
-      if (statusCode === 206) {
-        const contentRange = parseContentRange(findHeader(rawHeaders, 'content-range'))
-        if (!contentRange) {
-          return this.handler.onHeaders(
-            statusCode,
-            rawHeaders,
-            () => this.resume(),
-            statusMessage,
-            headers,
-          )
-        }
-
-        const { start, size, end = size } = contentRange
-
-        this.end = end
-        this.pos = Number(start)
-      } else {
-        const contentLength = findHeader(rawHeaders, 'content-length')
-        if (contentLength) {
-          this.end = Number(contentLength)
-        }
-      }
-
-      assert(Number.isFinite(this.pos))
-      assert(this.end == null || Number.isFinite(this.end), 'invalid content-length')
-    }
-
-    this.etag = etag
-    this.resume = resume
-
-    return this.handler.onHeaders(
-      statusCode,
-      rawHeaders,
-      () => this.resume(),
-      statusMessage,
-      headers,
-    )
+    return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage, headers)
   }
 
   onData(chunk) {
-    this.pos += chunk.length
-    this.count = 0
     this.hasBody = true
-
     return this.handler.onData(chunk)
   }
 
@@ -119,7 +56,7 @@ class Handler {
   }
 
   onError(err) {
-    if (this.aborted || (this.hasBody && !this.etag) || isDisturbed(this.opts.body)) {
+    if (this.aborted || this.hasBody || isDisturbed(this.opts.body)) {
       return this.handler.onError(err)
     }
 
@@ -128,20 +65,7 @@ class Handler {
       return this.handler.onError(err)
     }
 
-    this.error = err
-
-    if (this.hasBody) {
-      this.opts = {
-        ...this.opts,
-        headers: {
-          ...this.opts.headers,
-          'if-match': this.etag,
-          range: `bytes=${this.pos}-${this.end ?? ''}`,
-        },
-      }
-    }
-
-    this.opts.logger?.debug('retrying response body')
+    this.opts.logger?.debug('retrying response')
 
     retryPromise
       .then(() => {
@@ -158,7 +82,7 @@ class Handler {
 }
 
 export default (dispatch) => (opts, handler) => {
-  return opts.idempotent && opts.retry && opts.method === 'GET' && !opts.upgrade
+  return opts.retry
     ? dispatch(opts, new Handler(opts, { handler, dispatch }))
     : dispatch(opts, handler)
 }

package/lib/utils.js

@@ -60,13 +60,28 @@ export function parseContentRange(range) {
   return { start, end: end ? end + 1 : size, size }
 }
 
-export function findHeader(rawHeaders, name) {
+export function findHeader(headers, name) {
   const len = name.length
 
-  for (let i = 0; i < rawHeaders.length; i += 2) {
-    const key = rawHeaders[i + 0]
-    if (key.length === len && toLowerCase(key.toString()) === name) {
-      return rawHeaders[i + 1].toString()
+  if (Array.isArray(headers)) {
+    for (let i = 0; i < headers.length; i += 2) {
+      const key = headers[i + 0]
+      if (key.length === len && toLowerCase(key.toString()) === 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 && toLowerCase(key) === name) {
+        return headers[key].toString()
+      }
     }
   }
 

package/package.json

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