@nxtedition/nxt-undici 7.3.15 → 7.3.16

package/lib/interceptor/log.js

@@ -1,5 +1,8 @@
 import { DecoratorHandler } from '../utils.js'
 
+const kGlobalIndex = Symbol('globalIndex')
+const kGlobalArray = Symbol('globalArray')
+
 class Handler extends DecoratorHandler {
   #opts
   #logger
@@ -19,9 +22,6 @@ class Handler extends DecoratorHandler {
   #statusCode
   #headers
 
-  #globalIndex = -1
-  #globalArray = (globalThis.__undici_requests ??= [])
-
   constructor(logOpts, opts, { handler }) {
     super(handler)
 
@@ -35,7 +35,8 @@ class Handler extends DecoratorHandler {
     this.#logger.debug('upstream request started')
     this.#timing.created = this.#created + performance.timeOrigin
 
-    this.#globalIndex = this.#globalArray.push(this) - 1
+    this[kGlobalArray] = globalThis.__undici_requests ??= []
+    this[kGlobalIndex] = this[kGlobalArray].push(this) - 1
   }
 
   onConnect(abort) {
@@ -151,13 +152,13 @@ class Handler extends DecoratorHandler {
   }
 
   onDone() {
-    if (this.#globalIndex !== -1) {
-      const tmp = this.#globalArray.pop()
+    if (this[kGlobalIndex] !== -1) {
+      const tmp = this[kGlobalArray].pop()
       if (tmp !== this) {
-        this.#globalArray[this.#globalIndex] = tmp
-        tmp.#globalIndex = this.#globalIndex
+        this[kGlobalArray][this[kGlobalIndex]] = tmp
+        tmp[kGlobalIndex] = this[kGlobalIndex]
       }
-      this.#globalIndex = -1
+      this[kGlobalIndex] = -1
     }
   }
 }

package/lib/interceptor/response-retry.js

@@ -177,6 +177,11 @@ class Handler extends DecoratorHandler {
   onData(chunk) {
     if (this.#pos != null) {
       this.#pos += chunk.byteLength
+
+      if (this.#end != null && this.#pos > this.#end) {
+        this.#maybeError(new Error('Response body exceeded Content-Range'))
+        return false
+      }
     }
 
     if (this.#statusCode < 400) {
@@ -197,6 +202,10 @@ class Handler extends DecoratorHandler {
     this.#trailers = trailers
 
     if (this.#statusCode < 400) {
+      if (this.#end != null && this.#pos !== this.#end) {
+        this.#maybeError(new Error('Response body length mismatch with Content-Range'))
+        return
+      }
       return super.onComplete(trailers)
     }
 

package/package.json

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