@nxtedition/nxt-undici 2.0.35 → 2.0.37

package/lib/interceptor/log.js

@@ -79,12 +79,24 @@ class Handler {
 
     if (this.aborted) {
       this.logger.debug(
-        { bytesRead: this.pos, elapsedTime: this.stats.end, stats: this.stats, err },
+        {
+          ureq: this.opts,
+          bytesRead: this.pos,
+          elapsedTime: this.stats.end,
+          stats: this.stats,
+          err,
+        },
         'upstream request aborted',
       )
     } else {
       this.logger.error(
-        { ureq: this.opts, bytesRead: this.pos, elapsedTime: this.stats.end, err },
+        {
+          ureq: this.opts,
+          bytesRead: this.pos,
+          elapsedTime: this.stats.end,
+          stats: this.stats,
+          err,
+        },
         'upstream request failed',
       )
     }

package/lib/readable.js

@@ -125,7 +125,7 @@ export class BodyReadable extends Readable {
   }
 
   push(chunk) {
-    if (this[kConsume] && chunk !== null && this.readableLength === 0) {
+    if (this[kConsume] && chunk !== null) {
       consumePush(this[kConsume], chunk)
       return this[kReading] ? super.push(chunk) : true
     }
@@ -232,26 +232,28 @@ async function consume(stream, type) {
         reject(rState.errored ?? new TypeError('unusable'))
       }
     } else {
-      stream[kConsume] = {
-        type,
-        stream,
-        resolve,
-        reject,
-        length: 0,
-        body: [],
-      }
+      queueMicrotask(() => {
+        stream[kConsume] = {
+          type,
+          stream,
+          resolve,
+          reject,
+          length: 0,
+          body: [],
+        }
 
-      stream
-        .on('error', function (err) {
-          consumeFinish(this[kConsume], err)
-        })
-        .on('close', function () {
-          if (this[kConsume].body !== null) {
-            consumeFinish(this[kConsume], new RequestAbortedError())
-          }
-        })
+        stream
+          .on('error', function (err) {
+            consumeFinish(this[kConsume], err)
+          })
+          .on('close', function () {
+            if (this[kConsume].body !== null) {
+              consumeFinish(this[kConsume], new RequestAbortedError())
+            }
+          })
 
-      queueMicrotask(() => consumeStart(stream[kConsume]))
+        consumeStart(stream[kConsume])
+      })
     }
   })
 }
@@ -263,8 +265,16 @@ function consumeStart(consume) {
 
   const { _readableState: state } = consume.stream
 
-  for (const chunk of state.buffer) {
-    consumePush(consume, chunk)
+  if (state.bufferIndex) {
+    const start = state.bufferIndex
+    const end = state.buffer.length
+    for (let n = start; n < end; n++) {
+      consumePush(consume, state.buffer[n])
+    }
+  } else {
+    for (const chunk of state.buffer) {
+      consumePush(consume, chunk)
+    }
   }
 
   if (state.endEmitted) {

package/package.json

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