@nxtedition/lib 14.1.16 → 14.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "14.1.16",
+  "version": "14.1.18",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [

package/undici.js

@@ -1,4 +1,5 @@
 const assert = require('assert')
+const { errorMonitor } = require('node:events')
 const tp = require('timers/promises')
 const xuid = require('xuid')
 const { isReadableNodeStream, readableStreamLength } = require('./stream')
@@ -73,15 +74,16 @@ module.exports.request = async function request(
     }),
   }
 
-  const upstreamLogger = logger?.child({ ureq })
+  let upstreamLogger = logger?.child({ ureq })
 
-  upstreamLogger?.debug({ ureq }, 'upstream request started')
+  upstreamLogger?.debug('upstream request started')
 
   try {
     /* eslint-disable no-unreachable-loop */
     for (let retryCount = 0; true; retryCount++) {
+      let ures
       try {
-        const ures = await undici.request(url, {
+        ures = await undici.request(url, {
           method,
           reset,
           body,
@@ -94,10 +96,11 @@ module.exports.request = async function request(
           bodyTimeout,
         })
 
-        upstreamLogger?.debug({ ureq, ures }, 'upstream request response')
+        upstreamLogger = upstreamLogger?.child({ ures })
+
+        upstreamLogger?.debug('upstream request response')
 
         if (ures.statusCode >= 300 && ures.statusCode < 400) {
-          await ures.body.dump()
           throw new Error('maxRedirections exceeded')
         }
 
@@ -107,10 +110,16 @@ module.exports.request = async function request(
           await ures.body.dump()
         }
 
+        ures.body.on(errorMonitor, (err) => {
+          upstreamLogger?.debug({ err }, 'upstream request body failed')
+        })
+
         // TODO (fix): Wrap response to handle error that can continue with range request...
 
         return ures
       } catch (err) {
+        await ures?.body.dump()
+
         if (retryCount >= maxRetries) {
           throw err
         }