undici 4.14.1 → 4.15.0

package/docs/api/BalancedPool.md

@@ -11,14 +11,15 @@ Requests are not guaranteed to be dispatched in order of invocation.
 Arguments:
 
 * **upstreams** `URL | string | string[]` - It should only include the **protocol, hostname, and port**.
-* **options** `PoolOptions` (optional)
+* **options** `BalancedPoolOptions` (optional)
 
-### Parameter: `PoolOptions`
+### Parameter: `BalancedPoolOptions`
 
-The `PoolOptions` are passed to each of the `Pool` instances being created.
+Extends: [`PoolOptions`](Pool.md#parameter-pooloptions)
 
-See: [`PoolOptions`](Pool.md#parameter-pooloptions)
+* **factory** `(origin: URL, opts: Object) => Dispatcher` - Default: `(origin, opts) => new Pool(origin, opts)`
 
+The `PoolOptions` are passed to each of the `Pool` instances being created.
 ## Instance Properties
 
 ### `BalancedPool.upstreams`
@@ -33,6 +34,10 @@ Implements [Client.closed](Client.md#clientclosed)
 
 Implements [Client.destroyed](Client.md#clientdestroyed)
 
+### `Pool.stats`
+
+Returns [`PoolStats`](PoolStats.md) instance for this pool.
+
 ## Instance Methods
 
 ### `BalancedPool.addUpstream(upstream)`

package/docs/api/Dispatcher.md

@@ -307,6 +307,59 @@ client.dispatch({
 })
 ```
 
+#### Example 3 - Dispatch POST request
+
+```js
+import { createServer } from 'http'
+import { Client } from 'undici'
+import { once } from 'events'
+
+const server = createServer((request, response) => {
+  request.on('data', (data) => {
+    console.log(`Request Data: ${data.toString('utf8')}`)
+    const body = JSON.parse(data)
+    body.message = 'World'
+    response.end(JSON.stringify(body))
+  })
+}).listen()
+
+await once(server, 'listening')
+
+const client = new Client(`http://localhost:${server.address().port}`)
+
+const data = []
+
+client.dispatch({
+  path: '/',
+  method: 'POST',
+  headers: {
+    'content-type': 'application/json'
+  },
+  body: JSON.stringify({ message: 'Hello' })
+}, {
+  onConnect: () => {
+    console.log('Connected!')
+  },
+  onError: (error) => {
+    console.error(error)
+  },
+  onHeaders: (statusCode, headers) => {
+    console.log(`onHeaders | statusCode: ${statusCode} | headers: ${headers}`)
+  },
+  onData: (chunk) => {
+    console.log('onData: chunk received')
+    data.push(chunk)
+  },
+  onComplete: (trailers) => {
+    console.log(`onComplete | trailers: ${trailers}`)
+    const res = Buffer.concat(data).toString('utf8')
+    console.log(`Response Data: ${res}`)
+    client.close()
+    server.close()
+  }
+})
+```
+
 ### `Dispatcher.pipeline(options, handler)`
 
 For easy use with [stream.pipeline](https://nodejs.org/api/stream.html#stream_stream_pipeline_source_transforms_destination_callback). The `handler` argument should return a `Readable` from which the result will be read. Usually it should just return the `body` argument unless some kind of transformation needs to be performed based on e.g. `headers` or `statusCode`. The `handler` should validate the response and save any required state. If there is an error, it should be thrown. The function returns a `Duplex` which writes to the request and reads from the response.
@@ -436,7 +489,7 @@ The `RequestOptions.method` property should not be value `'CONNECT'`.
 - `body`
 - `bodyUsed`
 
-`body` contains the following additional extentions:
+`body` contains the following additional extensions:
 
 - `dump({ limit: Integer })`, dump the response by reading up to `limit` bytes without killing the socket (optional) - Default: 262144.
 

package/docs/api/Pool.md

@@ -30,6 +30,10 @@ Implements [Client.closed](Client.md#clientclosed)
 
 Implements [Client.destroyed](Client.md#clientdestroyed)
 
+### `Pool.stats`
+
+Returns [`PoolStats`](PoolStats.md) instance for this pool.
+
 ## Instance Methods
 
 ### `Pool.close([callback])`

package/docs/api/PoolStats.md

@@ -0,0 +1,35 @@
+# Class: PoolStats
+
+Aggregate stats for a [Pool](Pool.md) or [BalancedPool](BalancedPool.md).
+
+## `new PoolStats(pool)`
+
+Arguments:
+
+* **pool** `Pool` - Pool or BalancedPool from which to return stats.
+
+## Instance Properties
+
+### `PoolStats.connected`
+
+Number of open socket connections in this pool.
+
+### `PoolStats.free`
+
+Number of open socket connections in this pool that do not have an active request.
+
+### `PoolStats.pending`
+
+Number of pending requests across all clients in this pool.
+
+### `PoolStats.queued`
+
+Number of queued requests across all clients in this pool.
+
+### `PoolStats.running`
+
+Number of currently active requests across all clients in this pool.
+
+### `PoolStats.size`
+
+Number of active, pending, or queued requests across all clients in this pool.

package/index.js

@@ -94,12 +94,12 @@ module.exports.getGlobalDispatcher = getGlobalDispatcher
 
 if (nodeMajor > 16 || (nodeMajor === 16 && nodeMinor >= 5)) {
   let fetchImpl = null
-  module.exports.fetch = async function fetch (resource, init) {
+  module.exports.fetch = async function fetch (resource) {
     if (!fetchImpl) {
       fetchImpl = require('./lib/fetch')
     }
     const dispatcher = getGlobalDispatcher()
-    return fetchImpl.call(dispatcher, resource, init)
+    return fetchImpl.apply(dispatcher, arguments)
   }
   module.exports.Headers = require('./lib/fetch/headers').Headers
   module.exports.Response = require('./lib/fetch/response').Response

package/lib/api/api-connect.js

@@ -15,7 +15,7 @@ class ConnectHandler extends AsyncResource {
       throw new InvalidArgumentError('invalid callback')
     }
 
-    const { signal, opaque } = opts
+    const { signal, opaque, responseHeaders } = opts
 
     if (signal && typeof signal.on !== 'function' && typeof signal.addEventListener !== 'function') {
       throw new InvalidArgumentError('signal must be an EventEmitter or EventTarget')
@@ -24,6 +24,7 @@ class ConnectHandler extends AsyncResource {
     super('UNDICI_CONNECT')
 
     this.opaque = opaque || null
+    this.responseHeaders = responseHeaders || null
     this.callback = callback
     this.abort = null
 
@@ -43,15 +44,16 @@ class ConnectHandler extends AsyncResource {
     throw new SocketError('bad connect', null)
   }
 
-  onUpgrade (statusCode, headers, socket) {
+  onUpgrade (statusCode, rawHeaders, socket) {
     const { callback, opaque, context } = this
 
     removeSignal(this)
 
     this.callback = null
+    const headers = this.responseHeaders === 'raw' ? util.parseRawHeaders(rawHeaders) : util.parseHeaders(rawHeaders)
     this.runInAsyncScope(callback, null, null, {
       statusCode,
-      headers: util.parseHeaders(headers),
+      headers,
       socket,
       opaque,
       context

package/lib/api/api-pipeline.js

@@ -69,7 +69,7 @@ class PipelineHandler extends AsyncResource {
       throw new InvalidArgumentError('invalid handler')
     }
 
-    const { signal, method, opaque, onInfo } = opts
+    const { signal, method, opaque, onInfo, responseHeaders } = opts
 
     if (signal && typeof signal.on !== 'function' && typeof signal.addEventListener !== 'function') {
       throw new InvalidArgumentError('signal must be an EventEmitter or EventTarget')
@@ -86,6 +86,7 @@ class PipelineHandler extends AsyncResource {
     super('UNDICI_PIPELINE')
 
     this.opaque = opaque || null
+    this.responseHeaders = responseHeaders || null
     this.handler = handler
     this.abort = null
     this.context = null
@@ -156,12 +157,13 @@ class PipelineHandler extends AsyncResource {
     this.context = context
   }
 
-  onHeaders (statusCode, headers, resume) {
+  onHeaders (statusCode, rawHeaders, resume) {
     const { opaque, handler, context } = this
 
     if (statusCode < 200) {
       if (this.onInfo) {
-        this.onInfo({ statusCode, headers: util.parseHeaders(headers) })
+        const headers = this.responseHeaders === 'raw' ? util.parseRawHeaders(rawHeaders) : util.parseHeaders(rawHeaders)
+        this.onInfo({ statusCode, headers })
       }
       return
     }
@@ -171,9 +173,10 @@ class PipelineHandler extends AsyncResource {
     let body
     try {
       this.handler = null
+      const headers = this.responseHeaders === 'raw' ? util.parseRawHeaders(rawHeaders) : util.parseHeaders(rawHeaders)
       body = this.runInAsyncScope(handler, null, {
         statusCode,
-        headers: util.parseHeaders(headers),
+        headers,
         opaque,
         body: this.res,
         context

package/lib/api/api-request.js

@@ -15,7 +15,7 @@ class RequestHandler extends AsyncResource {
       throw new InvalidArgumentError('invalid opts')
     }
 
-    const { signal, method, opaque, body, onInfo } = opts
+    const { signal, method, opaque, body, onInfo, responseHeaders } = opts
 
     try {
       if (typeof callback !== 'function') {
@@ -42,6 +42,7 @@ class RequestHandler extends AsyncResource {
       throw err
     }
 
+    this.responseHeaders = responseHeaders || null
     this.opaque = opaque || null
     this.callback = callback
     this.res = null
@@ -69,25 +70,27 @@ class RequestHandler extends AsyncResource {
     this.context = context
   }
 
-  onHeaders (statusCode, headers, resume) {
+  onHeaders (statusCode, rawHeaders, resume) {
     const { callback, opaque, abort, context } = this
 
     if (statusCode < 200) {
       if (this.onInfo) {
-        this.onInfo({ statusCode, headers: util.parseHeaders(headers) })
+        const headers = this.responseHeaders === 'raw' ? util.parseRawHeaders(rawHeaders) : util.parseHeaders(rawHeaders)
+        this.onInfo({ statusCode, headers })
       }
       return
     }
 
-    const parsedHeaders = util.parseHeaders(headers)
+    const parsedHeaders = util.parseHeaders(rawHeaders)
     const body = new Readable(resume, abort, parsedHeaders['content-type'])
 
     this.callback = null
     this.res = body
+    const headers = this.responseHeaders === 'raw' ? util.parseRawHeaders(rawHeaders) : util.parseHeaders(rawHeaders)
 
     this.runInAsyncScope(callback, null, null, {
       statusCode,
-      headers: parsedHeaders,
+      headers,
       trailers: this.trailers,
       opaque,
       body,

package/lib/api/api-stream.js

@@ -16,7 +16,7 @@ class StreamHandler extends AsyncResource {
       throw new InvalidArgumentError('invalid opts')
     }
 
-    const { signal, method, opaque, body, onInfo } = opts
+    const { signal, method, opaque, body, onInfo, responseHeaders } = opts
 
     try {
       if (typeof callback !== 'function') {
@@ -47,6 +47,7 @@ class StreamHandler extends AsyncResource {
       throw err
     }
 
+    this.responseHeaders = responseHeaders || null
     this.opaque = opaque || null
     this.factory = factory
     this.callback = callback
@@ -75,20 +76,22 @@ class StreamHandler extends AsyncResource {
     this.context = context
   }
 
-  onHeaders (statusCode, headers, resume) {
+  onHeaders (statusCode, rawHeaders, resume) {
     const { factory, opaque, context } = this
 
     if (statusCode < 200) {
       if (this.onInfo) {
-        this.onInfo({ statusCode, headers: util.parseHeaders(headers) })
+        const headers = this.responseHeaders === 'raw' ? util.parseRawHeaders(rawHeaders) : util.parseHeaders(rawHeaders)
+        this.onInfo({ statusCode, headers })
       }
       return
     }
 
     this.factory = null
+    const headers = this.responseHeaders === 'raw' ? util.parseRawHeaders(rawHeaders) : util.parseHeaders(rawHeaders)
     const res = this.runInAsyncScope(factory, null, {
       statusCode,
-      headers: util.parseHeaders(headers),
+      headers,
       opaque,
       context
     })

package/lib/api/api-upgrade.js

@@ -16,7 +16,7 @@ class UpgradeHandler extends AsyncResource {
       throw new InvalidArgumentError('invalid callback')
     }
 
-    const { signal, opaque } = opts
+    const { signal, opaque, responseHeaders } = opts
 
     if (signal && typeof signal.on !== 'function' && typeof signal.addEventListener !== 'function') {
       throw new InvalidArgumentError('signal must be an EventEmitter or EventTarget')
@@ -24,6 +24,7 @@ class UpgradeHandler extends AsyncResource {
 
     super('UNDICI_UPGRADE')
 
+    this.responseHeaders = responseHeaders || null
     this.opaque = opaque || null
     this.callback = callback
     this.abort = null
@@ -45,7 +46,7 @@ class UpgradeHandler extends AsyncResource {
     throw new SocketError('bad upgrade', null)
   }
 
-  onUpgrade (statusCode, headers, socket) {
+  onUpgrade (statusCode, rawHeaders, socket) {
     const { callback, opaque, context } = this
 
     assert.strictEqual(statusCode, 101)
@@ -53,8 +54,9 @@ class UpgradeHandler extends AsyncResource {
     removeSignal(this)
 
     this.callback = null
+    const headers = this.responseHeaders === 'raw' ? util.parseRawHeaders(rawHeaders) : util.parseHeaders(rawHeaders)
     this.runInAsyncScope(callback, null, null, {
-      headers: util.parseHeaders(headers),
+      headers,
       socket,
       opaque,
       context

package/lib/balanced-pool.js

@@ -1,7 +1,8 @@
 'use strict'
 
 const {
-  BalancedPoolMissingUpstreamError
+  BalancedPoolMissingUpstreamError,
+  InvalidArgumentError
 } = require('./core/errors')
 const {
   PoolBase,
@@ -13,11 +14,17 @@ const {
 } = require('./pool-base')
 const Pool = require('./pool')
 const { kUrl } = require('./core/symbols')
+const { parseOrigin } = require('./core/util')
+const kFactory = Symbol('factory')
 
 const kOptions = Symbol('options')
 
+function defaultFactory (origin, opts) {
+  return new Pool(origin, opts);
+}
+
 class BalancedPool extends PoolBase {
-  constructor (upstreams = [], opts = {}) {
+  constructor (upstreams = [], { factory = defaultFactory, ...opts } = {}) {
     super()
 
     this[kOptions] = opts
@@ -26,28 +33,38 @@ class BalancedPool extends PoolBase {
       upstreams = [upstreams]
     }
 
+    if (typeof factory !== 'function') {
+      throw new InvalidArgumentError('factory must be a function.')
+    }
+
+    this[kFactory] = factory
+
     for (const upstream of upstreams) {
       this.addUpstream(upstream)
     }
   }
 
   addUpstream (upstream) {
+    const upstreamOrigin = parseOrigin(upstream).origin
+
     if (this[kClients].find((pool) => (
-      pool[kUrl].origin === upstream &&
+      pool[kUrl].origin === upstreamOrigin &&
       pool.closed !== true &&
       pool.destroyed !== true
     ))) {
       return this
     }
 
-    this[kAddClient](new Pool(upstream, Object.assign({}, this[kOptions])))
+    this[kAddClient](this[kFactory](upstreamOrigin, Object.assign({}, this[kOptions])))
 
     return this
   }
 
   removeUpstream (upstream) {
+    const upstreamOrigin = parseOrigin(upstream).origin
+
     const pool = this[kClients].find((pool) => (
-      pool[kUrl].origin === upstream &&
+      pool[kUrl].origin === upstreamOrigin &&
       pool.closed !== true &&
       pool.destroyed !== true
     ))

package/lib/client.js

@@ -408,6 +408,8 @@ const constants = require('./llhttp/constants')
 const EMPTY_BUF = Buffer.alloc(0)
 
 async function lazyllhttp () {
+  const llhttpWasmData = process.env.JEST_WORKER_ID ? require('./llhttp/llhttp.wasm.js') : undefined
+
   let mod
   try {
     mod = await WebAssembly.compile(Buffer.from(require('./llhttp/llhttp_simd.wasm.js'), 'base64'))
@@ -418,7 +420,7 @@ async function lazyllhttp () {
     // being enabled, but the occurring of this other error
     // * https://github.com/emscripten-core/emscripten/issues/11495
     // got me to remove that check to avoid breaking Node 12.
-    mod = await WebAssembly.compile(Buffer.from(require('./llhttp/llhttp.wasm.js'), 'base64'))
+    mod = await WebAssembly.compile(Buffer.from(llhttpWasmData || require('./llhttp/llhttp.wasm.js'), 'base64'))
   }
 
   return await WebAssembly.instantiate(mod, {
@@ -1481,7 +1483,7 @@ function write (client, request) {
 
   let header = `${method} ${path} HTTP/1.1\r\n`
 
-  if (host) {
+  if (typeof host === 'string') {
     header += `host: ${host}\r\n`
   } else {
     header += client[kHostHeader]

package/lib/core/symbols.js

@@ -22,6 +22,8 @@ module.exports = {
   kPending: Symbol('pending'),
   kSize: Symbol('size'),
   kBusy: Symbol('busy'),
+  kQueued: Symbol('queued'),
+  kFree: Symbol('free'),
   kConnected: Symbol('connected'),
   kClosed: Symbol('closed'),
   kNeedDrain: Symbol('need drain'),

package/lib/core/util.js

@@ -200,6 +200,10 @@ function parseHeaders (headers, obj = {}) {
   return obj
 }
 
+function parseRawHeaders (headers) {
+  return headers.map(header => header.toString());
+}
+
 function isBuffer (buffer) {
   // See, https://github.com/mcollina/undici/pull/319
   return buffer instanceof Uint8Array || Buffer.isBuffer(buffer)
@@ -339,6 +343,7 @@ module.exports = {
   isIterable,
   isAsyncIterable,
   isDestroyed,
+  parseRawHeaders,
   parseHeaders,
   parseKeepAliveTimeout,
   destroy,

package/lib/fetch/request.js

@@ -127,12 +127,12 @@ class Request {
     }
 
     // 10. If init["window"] exists and is non-null, then throw a TypeError.
-    if ('window' in init && window != null) {
+    if (init.window !== undefined && init.window != null) {
       throw new TypeError(`'window' option '${window}' must be null`)
     }
 
     // 11. If init["window"] exists, then set window to "no-window".
-    if ('window' in init) {
+    if (init.window !== undefined) {
       window = 'no-window'
     }
 
@@ -212,7 +212,7 @@ class Request {
     }
 
     // 14. If init["referrer"] exists, then:
-    if ('referrer' in init) {
+    if (init.referrer !== undefined) {
       // 1. Let referrer be init["referrer"].
       const referrer = init.referrer
 
@@ -248,7 +248,7 @@ class Request {
 
     // 15. If init["referrerPolicy"] exists, then set request’s referrer policy
     // to it.
-    if ('referrerPolicy' in init) {
+    if (init.referrerPolicy !== undefined) {
       request.referrerPolicy = init.referrerPolicy
       if (!referrerPolicy.includes(request.referrerPolicy)) {
         throw new TypeError(
@@ -259,7 +259,7 @@ class Request {
 
     // 16. Let mode be init["mode"] if it exists, and fallbackMode otherwise.
     let mode
-    if ('mode' in init) {
+    if (init.mode !== undefined) {
       mode = init.mode
       if (!requestMode.includes(mode)) {
         throw new TypeError(
@@ -282,7 +282,7 @@ class Request {
 
     // 19. If init["credentials"] exists, then set request’s credentials mode
     // to it.
-    if ('credentials' in init) {
+    if (init.credentials !== undefined) {
       request.credentials = init.credentials
       if (!requestCredentials.includes(request.credentials)) {
         throw new TypeError(
@@ -292,7 +292,7 @@ class Request {
     }
 
     // 18. If init["cache"] exists, then set request’s cache mode to it.
-    if ('cache' in init) {
+    if (init.cache !== undefined) {
       request.cache = init.cache
       if (!requestCache.includes(request.cache)) {
         throw new TypeError(
@@ -310,7 +310,7 @@ class Request {
     }
 
     // 22. If init["redirect"] exists, then set request’s redirect mode to it.
-    if ('redirect' in init) {
+    if (init.redirect !== undefined) {
       request.redirect = init.redirect
       if (!requestRedirect.includes(request.redirect)) {
         throw new TypeError(
@@ -320,17 +320,17 @@ class Request {
     }
 
     // 23. If init["integrity"] exists, then set request’s integrity metadata to it.
-    if ('integrity' in init && init.integrity != null) {
+    if (init.integrity !== undefined && init.integrity != null) {
       request.integrity = String(init.integrity)
     }
 
     // 24. If init["keepalive"] exists, then set request’s keepalive to it.
-    if ('keepalive' in init) {
+    if (init.keepalive !== undefined) {
       request.keepalive = Boolean(init.keepalive)
     }
 
     // 25. If init["method"] exists, then:
-    if ('method' in init) {
+    if (init.method !== undefined) {
       // 1. Let method be init["method"].
       let method = init.method
 
@@ -353,7 +353,7 @@ class Request {
     }
 
     // 26. If init["signal"] exists, then set signal to it.
-    if ('signal' in init) {
+    if (init.signal !== undefined) {
       signal = init.signal
     }
 
@@ -416,7 +416,7 @@ class Request {
       let headers = new Headers(this.headers)
 
       // 2. If init["headers"] exists, then set headers to init["headers"].
-      if ('headers' in init) {
+      if (init.headers !== undefined) {
         headers = init.headers
       }
 
@@ -442,7 +442,7 @@ class Request {
     // non-null, and request’s method is `GET` or `HEAD`, then throw a
     // TypeError.
     if (
-      (('body' in init && init.body != null) || inputBody != null) &&
+      ((init.body !== undefined && init.body != null) || inputBody != null) &&
       (request.method === 'GET' || request.method === 'HEAD')
     ) {
       throw new TypeError('Request with GET/HEAD method cannot have body.')
@@ -452,7 +452,7 @@ class Request {
     let initBody = null
 
     // 36. If init["body"] exists and is non-null, then:
-    if ('body' in init && init.body != null) {
+    if (init.body !== undefined && init.body != null) {
       // 1. Let Content-Type be null.
       // 2. Set initBody and Content-Type to the result of extracting
       // init["body"], with keepalive set to request’s keepalive.

package/lib/pool-base.js

@@ -7,7 +7,8 @@ const {
   InvalidArgumentError
 } = require('./core/errors')
 const FixedQueue = require('./node/fixed-queue')
-const { kSize, kRunning, kPending, kBusy, kUrl } = require('./core/symbols')
+const { kConnected, kSize, kRunning, kPending, kQueued, kBusy, kFree, kUrl } = require('./core/symbols')
+const PoolStats = require('./pool-stats')
 
 const kClients = Symbol('clients')
 const kNeedDrain = Symbol('needDrain')
@@ -19,10 +20,10 @@ const kOnDrain = Symbol('onDrain')
 const kOnConnect = Symbol('onConnect')
 const kOnDisconnect = Symbol('onDisconnect')
 const kOnConnectionError = Symbol('onConnectionError')
-const kQueued = Symbol('queued')
 const kGetDispatcher = Symbol('get dispatcher')
 const kAddClient = Symbol('add client')
 const kRemoveClient = Symbol('remove client')
+const kStats = Symbol('stats')
 
 class PoolBase extends Dispatcher {
   constructor () {
@@ -77,12 +78,22 @@ class PoolBase extends Dispatcher {
     this[kOnConnectionError] = (origin, targets, err) => {
       pool.emit('connectionError', origin, [pool, ...targets], err)
     }
+
+    this[kStats] = new PoolStats(this)
   }
 
   get [kBusy] () {
     return this[kNeedDrain]
   }
 
+  get [kConnected] () {
+    return this[kClients].filter(client => client[kConnected]).length
+  }
+
+  get [kFree] () {
+    return this[kClients].filter(client => client[kConnected] && !client[kNeedDrain]).length
+  }
+
   get [kPending] () {
     let ret = this[kQueued]
     for (const { [kPending]: pending } of this[kClients]) {
@@ -107,6 +118,10 @@ class PoolBase extends Dispatcher {
     return ret
   }
 
+  get stats() {
+    return this[kStats];
+  }
+
   get destroyed () {
     return this[kDestroyed]
   }

package/lib/pool-stats.js

@@ -0,0 +1,34 @@
+const { kFree, kConnected, kPending, kQueued, kRunning, kSize } = require('./core/symbols')
+const kPool = Symbol('pool')
+
+class PoolStats {
+  constructor(pool) {
+    this[kPool] = pool
+  }
+
+  get connected() {
+    return this[kPool][kConnected]
+  }
+
+  get free() {
+    return this[kPool][kFree]
+  }
+
+  get pending() {
+    return this[kPool][kPending]
+  }
+
+  get queued() {
+    return this[kPool][kQueued]
+  }
+
+  get running() {
+    return this[kPool][kRunning]
+  }
+
+  get size() {
+    return this[kPool][kSize]
+  }
+}
+
+module.exports = PoolStats

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "undici",
-  "version": "4.14.1",
+  "version": "4.15.0",
   "description": "An HTTP/1.1 client, written from scratch for Node.js",
   "homepage": "https://undici.nodejs.org",
   "bugs": {
@@ -48,7 +48,7 @@
     "test": "npm run test:tap && npm run test:node-fetch && npm run test:fetch && npm run test:jest && tsd",
     "test:node-fetch": "node scripts/verifyVersion.js 16 || mocha test/node-fetch",
     "test:fetch": "node scripts/verifyVersion.js 16 || tap test/fetch/*.js",
-    "test:jest": "jest test/jest/test",
+    "test:jest": "jest",
     "test:tap": "tap test/*.js test/diagnostics-channel/*.js",
     "test:tdd": "tap test/*.js test/diagnostics-channel/*.js -w",
     "test:typescript": "tsd",
@@ -114,5 +114,8 @@
         "esnext"
       ]
     }
+  },
+  "jest": {
+    "testMatch": ["<rootDir>/test/jest/**"]
   }
 }

package/types/dispatcher.d.ts

@@ -3,6 +3,7 @@ import { Duplex, Readable, Writable } from 'stream'
 import { EventEmitter } from 'events'
 import { IncomingHttpHeaders } from 'http'
 import { Blob } from 'buffer'
+import BodyReadable from './readable'
 
 type AbortSignal = unknown;
 
@@ -64,6 +65,8 @@ declare namespace Dispatcher {
     opaque?: unknown;
     /** Default: 0 */
     maxRedirections?: number;
+    /** Default: `null` */
+    responseHeader?: 'raw' | null;
   }
   export interface RequestOptions extends DispatchOptions {
     /** Default: `null` */
@@ -73,7 +76,9 @@ declare namespace Dispatcher {
     /** Default: 0 */
     maxRedirections?: number;
     /** Default: `null` */
-    onInfo?: (info: {statusCode: number, headers: Record<string, string | string[]>}) => void;
+    onInfo?: (info: { statusCode: number, headers: Record<string, string | string[]> }) => void;
+    /** Default: `null` */
+    responseHeader?: 'raw' | null;
   }
   export interface PipelineOptions extends RequestOptions {
     /** `true` if the `handler` will return an object stream. Default: `false` */
@@ -91,6 +96,8 @@ declare namespace Dispatcher {
     signal?: AbortSignal | EventEmitter | null;
     /** Default: 0 */
     maxRedirections?: number;
+    /** Default: `null` */
+    responseHeader?: 'raw' | null;
   }
   export interface ConnectData {
     statusCode: number;
@@ -101,7 +108,7 @@ declare namespace Dispatcher {
   export interface ResponseData {
     statusCode: number;
     headers: IncomingHttpHeaders;
-    body: Readable & BodyMixin;
+    body: BodyReadable & BodyMixin;
     trailers: Record<string, string>;
     opaque: unknown;
     context: object;
@@ -110,7 +117,7 @@ declare namespace Dispatcher {
     statusCode: number;
     headers: IncomingHttpHeaders;
     opaque: unknown;
-    body: Readable;
+    body: BodyReadable;
     context: object;
   }
   export interface StreamData {

package/types/fetch.d.ts

@@ -42,7 +42,7 @@ export interface BodyMixin {
   readonly text: () => Promise<string>
 }
 
-export type HeadersInit = string[][] | Record<string, string> | Headers
+export type HeadersInit = string[][] | Record<string, string | ReadonlyArray<string>> | Headers
 
 export declare class Headers implements Iterable<[string, string]> {
   constructor (init?: HeadersInit)
@@ -107,7 +107,7 @@ export interface RequestInit {
   readonly window?: null
 }
 
-export type ReferrerPolicy = 
+export type ReferrerPolicy =
   | ''
   | 'no-referrer'
   | 'no-referrer-when-downgrade'

package/types/readable.d.ts

@@ -0,0 +1,61 @@
+import { Readable } from "stream";
+import { Blob } from 'buffer'
+
+export = BodyReadable
+
+declare class BodyReadable extends Readable {
+  constructor(
+    resume?: (this: Readable, size: number) => void | null,
+    abort?: () => void | null,
+    contentType?: string
+  )
+
+  /** Consumes and returns the body as a string
+   *  https://fetch.spec.whatwg.org/#dom-body-text
+   */
+  text(): Promise<string>
+
+  /** Consumes and returns the body as a JavaScript Object
+   *  https://fetch.spec.whatwg.org/#dom-body-json
+   */
+  json(): Promise<any>
+
+  /** Consumes and returns the body as a Blob
+   *  https://fetch.spec.whatwg.org/#dom-body-blob
+   */
+  blob(): Promise<Blob>
+
+  /** Consumes and returns the body as an ArrayBuffer
+   *  https://fetch.spec.whatwg.org/#dom-body-arraybuffer
+   */
+  arrayBuffer(): Promise<ArrayBuffer>
+
+  /** Not implemented
+   *
+   *  https://fetch.spec.whatwg.org/#dom-body-formdata
+   */
+  formData(): Promise<never>
+
+  /** Returns true if the body is not null and the body has been consumed
+   *
+   *  Otherwise, returns false
+   *
+   * https://fetch.spec.whatwg.org/#dom-body-bodyused
+   */
+  readonly bodyUsed: boolean
+
+  /** Throws on node 16.6.0
+   *
+   *  If body is null, it should return null as the body
+   *
+   *  If body is not null, should return the body as a ReadableStream
+   *
+   *  https://fetch.spec.whatwg.org/#dom-body-body
+   */
+  readonly body: never | undefined
+
+  /** Dumps the response body by reading `limit` number of bytes.
+   * @param opts.limit Number of bytes to read (optional) - Default: 262144
+   */
+  dump(opts?: { limit: number }): Promise<void>
+}