@nxtedition/nxt-undici 7.3.13 → 7.3.15

package/lib/interceptor/dns.js

@@ -45,14 +45,19 @@ export default () => (dispatch) => {
             resolve([err, null])
           } else {
             const now = getFastNow()
-            const val = records.map(({ address }) => ({
-              address,
-              expires: now + (ttl ?? 1e3),
-              pending: 0,
-              errored: 0,
-              counter: 0,
-              timeout: 0,
-            }))
+            const prev = cache.get(hostname)
+            const prevByAddr = prev ? new Map(prev.map((r) => [r.address, r])) : null
+            const val = records.map(({ address }) => {
+              const old = prevByAddr?.get(address)
+              return {
+                address,
+                expires: now + (ttl ?? 1e3),
+                pending: 0,
+                errored: old ? old.errored : 0,
+                counter: 0,
+                timeout: old ? old.timeout : 0,
+              }
+            })
 
             cache.set(hostname, val)
 

package/lib/interceptor/log.js

@@ -66,6 +66,7 @@ class Handler extends DecoratorHandler {
 
     socket.on('close', () => {
       this.#logger.debug('upstream request socket closed')
+      this.onDone()
     })
 
     super.onUpgrade(statusCode, headers, socket)

package/lib/interceptor/proxy.js

@@ -105,7 +105,9 @@ function reduceHeaders({ headers, proxyName, httpVersion, socket }, fn, acc) {
           socket.remoteAddress && `for=${printIp(socket.remoteAddress, socket.remotePort)}`,
           `proto=${socket.encrypted ? 'https' : 'http'}`,
           forwardedHost && `host="${forwardedHost}"`,
-        ].join(';'),
+        ]
+          .filter(Boolean)
+          .join(';'),
     )
   } else if (forwarded) {
     // The forwarded header should not be included in response.
@@ -171,8 +173,7 @@ export default () => (dispatch) => (opts, handler) => {
         // the request message does not contain a payload body and the method
         // semantics do not anticipate such a body.
         // undici will error if provided an unexpected content-length: 0 header.
-      }
-      if (key[0] === ':') {
+      } else if (key[0] === ':') {
         // strip pseudo headers
       } else if (key === 'expect') {
         // undici doesn't support expect header.

package/lib/interceptor/redirect.js

@@ -176,11 +176,10 @@ function shouldRemoveHeader(header, removeContent, unknownOrigin) {
 
 // https://tools.ietf.org/html/rfc7231#section-6.4
 function cleanRequestHeaders(headers, removeContent, unknownOrigin) {
-  let ret
+  const ret = {}
   if (headers && typeof headers === 'object') {
     for (const key of Object.keys(headers)) {
       if (!shouldRemoveHeader(key, removeContent, unknownOrigin)) {
-        ret ??= {}
         ret[key] = headers[key]
       }
     }

package/lib/interceptor/response-error.js

@@ -1,11 +1,14 @@
 import { DecoratorHandler, decorateError } from '../utils.js'
 
+const MAX_ERROR_BODY_SIZE = 256 * 1024
+
 class Handler extends DecoratorHandler {
   #statusCode = 0
   #decoder
   #headers
   #trailers
   #body = ''
+  #bodySize = 0
   #opts
 
   constructor(opts, { handler }) {
@@ -19,6 +22,7 @@ class Handler extends DecoratorHandler {
     this.#decoder = null
     this.#headers = null
     this.#body = ''
+    this.#bodySize = 0
 
     super.onConnect(abort)
   }
@@ -45,7 +49,12 @@ class Handler extends DecoratorHandler {
       return super.onData(chunk)
     }
 
-    this.#body += this.#decoder?.decode(chunk, { stream: true }) ?? ''
+    if (this.#decoder) {
+      this.#bodySize += chunk.byteLength
+      if (this.#bodySize <= MAX_ERROR_BODY_SIZE) {
+        this.#body += this.#decoder.decode(chunk, { stream: true })
+      }
+    }
   }
 
   onComplete(trailers) {

package/lib/interceptor/response-retry.js

@@ -85,6 +85,10 @@ class Handler extends DecoratorHandler {
     this.#statusCode = statusCode
     this.#headers = headers
 
+    if (statusCode < 200) {
+      return super.onHeaders(statusCode, headers, resume)
+    }
+
     if (!this.#headersSent) {
       assert(this.#etag == null)
       assert(this.#pos == null)
@@ -176,7 +180,6 @@ class Handler extends DecoratorHandler {
     }
 
     if (this.#statusCode < 400) {
-      this.#retryCount = 0
       return super.onData(chunk)
     }
 
@@ -194,7 +197,6 @@ class Handler extends DecoratorHandler {
     this.#trailers = trailers
 
     if (this.#statusCode < 400) {
-      this.#retryCount = 0
       return super.onComplete(trailers)
     }
 
@@ -234,6 +236,14 @@ class Handler extends DecoratorHandler {
       }
 
       super.onComplete(this.#trailers)
+    } else {
+      // Headers already sent but retry failed (e.g. etag mismatch, missing
+      // content-range). The user is waiting for data/complete — send an error
+      // so the response stream doesn't hang.
+      if (!this.#errorSent) {
+        this.#errorSent = true
+        super.onError(new Error('Response retry failed'))
+      }
     }
 
     this.#maybeAbort(err)

package/lib/interceptor/response-verify.js

@@ -1,5 +1,4 @@
 import crypto from 'node:crypto'
-import assert from 'node:assert'
 import { DecoratorHandler } from '../utils.js'
 
 class Handler extends DecoratorHandler {
@@ -16,8 +15,6 @@ class Handler extends DecoratorHandler {
   }
 
   onConnect(abort) {
-    assert(!this.#pos)
-
     this.#contentMD5 = null
     this.#contentLength = null
     this.#hasher = null

package/lib/utils.js

@@ -59,8 +59,8 @@ export function parseContentRange(range) {
   return m
     ? {
         start: parseInt(m[1], 10),
-        end: m[2] ? parseInt(m[2]) + 1 : null,
-        size: m[3] === '*' ? null : parseInt(m[3]),
+        end: m[2] ? parseInt(m[2], 10) + 1 : null,
+        size: m[3] === '*' ? null : parseInt(m[3], 10),
       }
     : null
 }
@@ -83,8 +83,8 @@ export function parseRangeHeader(range) {
   const m = range.match(/^bytes=(\d+)-(\d+)?$/)
   return m
     ? {
-        start: parseInt(m[1]),
-        end: m[2] ? parseInt(m[2]) + 1 : null,
+        start: parseInt(m[1], 10),
+        end: m[2] ? parseInt(m[2], 10) + 1 : null,
         size: null,
       }
     : null

package/package.json

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