@nxtedition/nxt-undici 2.0.17 → 2.0.19

package/lib/index.js

@@ -2,7 +2,7 @@ import assert from 'node:assert'
 import stream from 'node:stream'
 import createError from 'http-errors'
 import undici from 'undici'
-import { findHeader, parseHeaders, AbortError } from './utils.js'
+import { findHeader, parseHeaders, AbortError, isStream } from './utils.js'
 import CacheableLookup from 'cacheable-lookup'
 
 const dispatcherCache = new WeakMap()
@@ -78,7 +78,10 @@ class Readable extends stream.Readable {
       this[kHandler].signal = null
     }
 
-    callback(err)
+    // Workaround: https://github.com/nodejs/undici/pull/2497
+    queueMicrotask(() => {
+      callback(err)
+    })
   }
 
   async text() {
@@ -117,7 +120,8 @@ class Readable extends stream.Readable {
 
   dump() {
     return new Promise((resolve) => {
-      if (this.closed) {
+      const rState = this._readableState
+      if (rState.closeEmitted) {
         resolve(null)
       } else {
         let n = 0
@@ -137,7 +141,6 @@ class Readable extends stream.Readable {
 
 const dispatchers = {
   responseError: (await import('./interceptor/response-error.js')).default,
-  requestBody: (await import('./interceptor/request-body.js')).default,
   requestBodyFactory: (await import('./interceptor/request-body-factory.js')).default,
   responseContent: (await import('./interceptor/response-content.js')).default,
   requestContent: (await import('./interceptor/request-content.js')).default,
@@ -225,6 +228,11 @@ export async function request(url, opts) {
     delete headers['content-length']
   }
 
+  if (isStream(opts.body)) {
+    // Workaround: https://github.com/nodejs/undici/pull/2497
+    opts.body.on('error', () => {})
+  }
+
   const dispatcher = opts.dispatcher ?? defaultDispatcher
 
   let dispatch = dispatcherCache.get(dispatcher)
@@ -241,7 +249,6 @@ export async function request(url, opts) {
     dispatch = dispatchers.cache(dispatch)
     dispatch = dispatchers.redirect(dispatch)
     dispatch = dispatchers.proxy(dispatch)
-    dispatch = dispatchers.requestBody(dispatch)
     dispatcherCache.set(dispatcher, dispatch)
   }
 

package/lib/interceptor/log.js

@@ -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/request-body-factory.js

@@ -10,8 +10,15 @@ export default (dispatch) => (opts, handler) => {
 
   if (typeof body?.then === 'function') {
     body.then(
-      (body) => dispatch({ ...opts, body }, handler),
-      (err) => handler.onError(err),
+      (body) => {
+        // Workaround: https://github.com/nodejs/undici/pull/2497
+        body.on('error', () => {})
+
+        dispatch({ ...opts, body }, handler)
+      },
+      (err) => {
+        handler.onError(err)
+      },
     )
   } else {
     dispatch({ ...opts, body }, handler)

package/lib/interceptor/request-content.js

@@ -31,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,
         }),
       )
     }

package/lib/interceptor/response-content.js

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "2.0.17",
+  "version": "2.0.19",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",
@@ -9,22 +9,22 @@
     "lib/*"
   ],
   "dependencies": {
-    "cache-control-parser": "^2.0.4",
+    "cache-control-parser": "^2.0.5",
     "cacheable-lookup": "^7.0.0",
     "http-errors": "^2.0.0",
-    "lru-cache": "^10.0.1",
-    "undici": "^5.27.0"
+    "lru-cache": "^10.1.0",
+    "undici": "^6.0.0"
   },
   "devDependencies": {
-    "@types/node": "^20.9.1",
-    "eslint": "^8.54.0",
-    "eslint-config-prettier": "^9.0.0",
+    "@types/node": "^20.10.3",
+    "eslint": "^8.55.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-n": "^16.2.0",
     "eslint-plugin-promise": "^6.1.1",
     "husky": "^8.0.3",
-    "lint-staged": "^15.0.2",
+    "lint-staged": "^15.2.0",
     "pinst": "^3.0.0",
     "prettier": "^3.0.3",
     "tap": "^18.6.1"

package/lib/interceptor/request-body.js

@@ -1,72 +0,0 @@
-import { isStream } from '../utils.js'
-
-class Handler {
-  constructor(opts, { handler }) {
-    this.handler = handler
-    this.body = opts.body
-    this.error = null
-    this.abort = null
-
-    this.errorHandler = (err) => {
-      if (this.abort) {
-        this.abort(err)
-      } else {
-        this.error = err
-      }
-    }
-
-    this.body.on('error', this.errorHandler)
-  }
-
-  onConnect(abort) {
-    if (this.error) {
-      abort(this.error)
-    } else {
-      this.abort = abort
-      return this.handler.onConnect(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) {
-    return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage, headers)
-  }
-
-  onData(chunk) {
-    return this.handler.onData(chunk)
-  }
-
-  onComplete(rawTrailers) {
-    this.body.off('error', this.errorHandler)
-    return this.handler.onComplete(rawTrailers)
-  }
-
-  onError(err) {
-    this.body.off('error', this.errorHandler)
-    return this.handler.onError(err)
-  }
-}
-
-export default (dispatch) => (opts, handler) => {
-  if (isStream(opts.body)) {
-    if (opts.method === 'GET' || opts.method === 'HEAD') {
-      opts.body.resume() // dump
-      return dispatch({ ...opts, body: undefined }, new Handler(opts, { handler }))
-    } else {
-      return dispatch(opts, new Handler(opts, { handler }))
-    }
-  } else {
-    return dispatch(opts, handler)
-  }
-}