undici 4.12.0 → 4.12.1

package/lib/balanced-pool.js

@@ -9,7 +9,7 @@ const {
   kNeedDrain,
   kAddClient,
   kRemoveClient,
-  kDispatch
+  kGetDispatcher
 } = require('./pool-base')
 const Pool = require('./pool')
 const { kUrl } = require('./core/symbols')
@@ -65,7 +65,7 @@ class BalancedPool extends PoolBase {
       .map((p) => p[kUrl].origin)
   }
 
-  [kDispatch] () {
+  [kGetDispatcher] () {
     // We validate that pools is greater than 0,
     // otherwise we would have to wait until an upstream
     // is added, which might never happen.

package/lib/client.js

@@ -1016,7 +1016,7 @@ function onParserTimeout (parser) {
   }
 }
 
-function onSocketReadable (data) {
+function onSocketReadable () {
   const { [kParser]: parser } = this
   parser.readMore()
 }

package/lib/core/util.js

@@ -263,7 +263,11 @@ function isErrored (body) {
 }
 
 function isReadable (body) {
-  return !!(body && /state: 'readable'/.test(nodeUtil.inspect(body)))
+  return !!(body && (
+    stream.isReadable
+      ? stream.isReadable(body)
+      : /state: 'readable'/.test(nodeUtil.inspect(body)
+  )))
 }
 
 function getSocketInfo (socket) {

package/lib/fetch/index.js

@@ -46,6 +46,7 @@ const { kHeadersList } = require('../core/symbols')
 const EE = require('events')
 const { PassThrough, pipeline } = require('stream')
 const { isErrored, isReadable } = require('../core/util')
+const { kIsMockActive } = require('../mock/mock-symbols')
 
 let ReadableStream
 
@@ -1621,7 +1622,7 @@ function httpNetworkFetch (
         path: url.pathname + url.search,
         origin: url.origin,
         method: request.method,
-        body,
+        body: context.dispatcher[kIsMockActive] ? request.body && request.body.source : body,
         headers: request.headersList,
         maxRedirections: 0
       },

package/lib/mock/mock-utils.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const { MockNotMatchedError } = require('./mock-errors')
+const { kHeadersList } = require('../core/symbols')
 const {
   kDispatches,
   kMockAgent,
@@ -30,8 +31,11 @@ function matchHeaders (mockDispatch, headers) {
   if (typeof headers !== 'object' || typeof mockDispatch.headers !== 'object') {
     return false
   }
+
   for (const [matchHeaderName, matchHeaderValue] of Object.entries(mockDispatch.headers)) {
-    if (!matchValue(matchHeaderValue, headers[matchHeaderName])) {
+    const header = typeof headers.get === 'function' ? headers.get(matchHeaderName) : headers[matchHeaderName]
+
+    if (!matchValue(matchHeaderValue, header)) {
       return false
     }
   }

package/lib/pool-base.js

@@ -20,7 +20,7 @@ const kOnConnect = Symbol('onConnect')
 const kOnDisconnect = Symbol('onDisconnect')
 const kOnConnectionError = Symbol('onConnectionError')
 const kQueued = Symbol('queued')
-const kDispatch = Symbol('dispatch')
+const kGetDispatcher = Symbol('get dispatcher')
 const kAddClient = Symbol('add client')
 const kRemoveClient = Symbol('remove client')
 
@@ -190,7 +190,7 @@ class PoolBase extends Dispatcher {
         throw new ClientClosedError()
       }
 
-      const dispatcher = this[kDispatch]()
+      const dispatcher = this[kGetDispatcher]()
 
       if (!dispatcher) {
         this[kNeedDrain] = true
@@ -198,11 +198,7 @@ class PoolBase extends Dispatcher {
         this[kQueued]++
       } else if (!dispatcher.dispatch(opts, handler)) {
         dispatcher[kNeedDrain] = true
-        this[kNeedDrain] = this[kClients].some(dispatcher => (
-          !dispatcher[kNeedDrain] &&
-          dispatcher.closed !== true &&
-          dispatcher.destroyed !== true
-        ))
+        this[kNeedDrain] = !this[kGetDispatcher]()
       }
     } catch (err) {
       if (typeof handler.onError !== 'function') {
@@ -257,5 +253,5 @@ module.exports = {
   kNeedDrain,
   kAddClient,
   kRemoveClient,
-  kDispatch
+  kGetDispatcher
 }

package/lib/pool.js

@@ -5,7 +5,7 @@ const {
   kClients,
   kNeedDrain,
   kAddClient,
-  kDispatch
+  kGetDispatcher
 } = require('./pool-base')
 const Client = require('./client')
 const {
@@ -64,7 +64,7 @@ class Pool extends PoolBase {
     this[kFactory] = factory
   }
 
-  [kDispatch] () {
+  [kGetDispatcher] () {
     let dispatcher = this[kClients].find(dispatcher => !dispatcher[kNeedDrain])
 
     if (dispatcher) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "undici",
-  "version": "4.12.0",
+  "version": "4.12.1",
   "description": "An HTTP/1.1 client, written from scratch for Node.js",
   "homepage": "https://undici.nodejs.org",
   "bugs": {