undici 4.8.2 → 4.9.3

package/docs/api/BalancedPool.md

@@ -25,10 +25,6 @@ See: [`PoolOptions`](docs/api/Pool.md#parameter-pooloptions)
 
 Returns an array of upstreams that were previously added.
 
-### `BalancedPool.busy`
-
-Implements [Client.busy](docs/api/Client.md#clientbusy)
-
 ### `BalancedPool.closed`
 
 Implements [Client.closed](docs/api/Client.md#clientclosed)

package/docs/api/Client.md

@@ -113,12 +113,6 @@ See [`Dispatcher.upgrade(options[, callback])`](docs/api/Dispatcher.md#clientupg
 
 ## Instance Properties
 
-### `Client.busy`
-
-* `boolean`
-
-`true` if pipeline is saturated or blocked. Indicates whether dispatching further requests is meaningful.
-
 ### `Client.closed`
 
 * `boolean`
@@ -161,7 +155,7 @@ const server = createServer((request, response) => {
   response.end('Hello, World!')
 }).listen()
 
-await once(server, 'listening') 
+await once(server, 'listening')
 
 const client = new Client(`http://localhost:${server.address().port}`)
 
@@ -251,7 +245,6 @@ const client = new Client(`http://localhost:${server.address().port}`)
 
 client.on('drain', () => {
   console.log('drain event')
-  console.log(`Is Client busy: ${client.busy}`)
   client.close()
   server.close()
 })
@@ -262,8 +255,6 @@ const requests = [
   client.request({ path: '/', method: 'GET' })
 ]
 
-console.log(`Is Client busy: ${client.busy}`)
-
 await Promise.all(requests)
 
 console.log('requests completed')

package/docs/api/Dispatcher.md

@@ -177,14 +177,15 @@ try {
 ### `Dispatcher.dispatch(options, handler)`
 
 This is the low level API which all the preceding APIs are implemented on top of.
-This API is expected to evolve through semver-major versions and is less stable than the preceding higher level APIs. It is primarily intended for library developers who implement higher level APIs on top of this.
+This API is expected to evolve through semver-major versions and is less stable than the preceding higher level APIs.
+It is primarily intended for library developers who implement higher level APIs on top of this.
 
 Arguments:
 
 * **options** `DispatchOptions`
 * **handler** `DispatchHandler`
 
-Returns: `void`
+Returns: `Boolean` - `false` if dispatcher is busy and further dispatch calls won't make any progress until the `'drain'` event has been emitted.
 
 #### Parameter: `DispatchOptions`
 
@@ -330,7 +331,7 @@ Extends: [`RequestOptions`](#parameter-requestoptions)
 * **opaque** `unknown`
 * **body** `stream.Readable`
 * **context** `object`
-* **onInfo** `({statusCode: number, headers: Record<string, string | string[]>}) => void | null` (optional) - Default: `null` - Callback collecting all the info headers (HTTP 100-199) received. 
+* **onInfo** `({statusCode: number, headers: Record<string, string | string[]>}) => void | null` (optional) - Default: `null` - Callback collecting all the info headers (HTTP 100-199) received.
 
 #### Example 1 - Pipeline Echo
 
@@ -413,7 +414,7 @@ Extends: [`DispatchOptions`](#parameter-dispatchoptions)
 
 * **opaque** `unknown` (optional) - Default: `null` - Used for passing through context to `ResponseData`
 * **signal** `AbortSignal | events.EventEmitter | null` (optional) - Default: `null`
-* **onInfo** `({statusCode: number, headers: Record<string, string | string[]>}) => void | null` (optional) - Default: `null` - Callback collecting all the info headers (HTTP 100-199) received. 
+* **onInfo** `({statusCode: number, headers: Record<string, string | string[]>}) => void | null` (optional) - Default: `null` - Callback collecting all the info headers (HTTP 100-199) received.
 
 The `RequestOptions.method` property should not be value `'CONNECT'`.
 
@@ -581,7 +582,7 @@ Returns: `void | Promise<StreamData>` - Only returns a `Promise` if no `callback
 * **statusCode** `number`
 * **headers** `http.IncomingHttpHeaders`
 * **opaque** `unknown`
-* **onInfo** `({statusCode: number, headers: Record<string, string | string[]>}) => void | null` (optional) - Default: `null` - Callback collecting all the info headers (HTTP 100-199) received. 
+* **onInfo** `({statusCode: number, headers: Record<string, string | string[]>}) => void | null` (optional) - Default: `null` - Callback collecting all the info headers (HTTP 100-199) received.
 
 #### Parameter: `StreamData`
 

package/docs/api/Pool.md

@@ -22,10 +22,6 @@ Extends: [`ClientOptions`](docs/api/Client.md#parameter-clientoptions)
 
 ## Instance Properties
 
-### `Pool.busy`
-
-Implements [Client.busy](docs/api/Client.md#clientbusy)
-
 ### `Pool.closed`
 
 Implements [Client.closed](docs/api/Client.md#clientclosed)

package/docs/api/api-lifecycle.md

@@ -59,4 +59,4 @@ This sub-state is only entered when a `Client` instance has queued requests and
 
 ### destroyed
 
-The **destroyed** state is a final state for the `Client` instance. Once in this state, a `Client` is nonfunctional. Calling any other `Client` methods will result in an `ClientDestroyedError`.
+The **destroyed** state is a final state for the `Client` instance. Once in this state, a `Client` is nonfunctional. Calling any other `Client` methods will result in an `ClientDestroyedError`.

package/lib/balanced-pool.js

@@ -44,6 +44,8 @@ class BalancedPool extends Dispatcher {
     })
 
     pool.on('drain', (...args) => {
+      pool[kNeedDrain] = false
+
       if (this[kNeedDrain]) {
         this[kNeedDrain] = false
         this.emit('drain', ...args)
@@ -62,12 +64,16 @@ class BalancedPool extends Dispatcher {
       throw new BalancedPoolMissingUpstreamError()
     }
 
-    let pool = this[kPools].shift()
-    this[kPools].push(pool)
-    if (pool.busy) {
-      pool = this[kPools].find(pool => !pool.busy) || pool
+    const pool = this[kPools].find(pool => !pool[kNeedDrain]) || this[kPools][0]
+
+    if (!pool.dispatch(opts, handler)) {
+      pool[kNeedDrain] = true
+      this[kNeedDrain] = true
     }
-    this[kNeedDrain] = !pool.dispatch(opts, handler)
+
+    this[kPools].splice(this[kPools].indexOf(pool), 1)
+    this[kPools].push(pool)
+
     return !this[kNeedDrain]
   }
 
@@ -87,10 +93,6 @@ class BalancedPool extends Dispatcher {
     return this[kPools].reduce((acc, pool) => acc && pool.destroyed, true)
   }
 
-  get busy () {
-    return this[kPools].reduce((acc, pool) => acc && pool.busy, true) || false
-  }
-
   get closed () {
     return this[kPools].reduce((acc, pool) => acc && pool.closed, true)
   }

package/lib/client.js

@@ -62,7 +62,9 @@ const {
   kBodyTimeout,
   kStrictContentLength,
   kConnector,
-  kMaxRedirections
+  kMaxRedirections,
+  kMaxRequests,
+  kCounter
 } = require('./core/symbols')
 
 const channels = {}
@@ -100,7 +102,8 @@ class Client extends Dispatcher {
     strictContentLength,
     maxCachedSessions,
     maxRedirections,
-    connect
+    connect,
+    maxRequestsPerClient
   } = {}) {
     super()
 
@@ -164,6 +167,10 @@ class Client extends Dispatcher {
       throw new InvalidArgumentError('maxRedirections must be a positive number')
     }
 
+    if (maxRequestsPerClient != null && (!Number.isInteger(maxRequestsPerClient) || maxRequestsPerClient < 0)) {
+      throw new InvalidArgumentError('maxRequestsPerClient must be a positive number')
+    }
+
     if (typeof connect !== 'function') {
       connect = buildConnector({
         ...tls,
@@ -194,6 +201,7 @@ class Client extends Dispatcher {
     this[kHeadersTimeout] = headersTimeout != null ? headersTimeout : 30e3
     this[kStrictContentLength] = strictContentLength == null ? true : strictContentLength
     this[kMaxRedirections] = maxRedirections
+    this[kMaxRequests] = maxRequestsPerClient
 
     // kQueue is built up of 3 sections separated by
     // the kRunningIdx and kPendingIdx indices.
@@ -400,8 +408,6 @@ class Client extends Dispatcher {
 const constants = require('./llhttp/constants')
 const EMPTY_BUF = Buffer.alloc(0)
 
-let llhttpPromise
-let llhttpInstance
 async function lazyllhttp () {
   const { resolve } = require('path')
   const { readFile } = require('fs').promises
@@ -419,7 +425,7 @@ async function lazyllhttp () {
     mod = await WebAssembly.compile(await readFile(resolve(__dirname, './llhttp/llhttp.wasm')))
   }
 
-  llhttpInstance = new WebAssembly.Instance(mod, {
+  return await WebAssembly.instantiate(mod, {
     env: {
       /* eslint-disable camelcase */
 
@@ -467,10 +473,14 @@ async function lazyllhttp () {
       /* eslint-enable camelcase */
     }
   })
-
-  return llhttpInstance
 }
 
+let llhttpInstance = null
+let llhttpPromise = lazyllhttp()
+  .catch(() => {
+    // TODO: Emit warning?
+  })
+
 let currentParser = null
 let currentBufferRef = null
 let currentBufferSize = 0
@@ -1130,15 +1140,6 @@ async function connect (client) {
   }
 
   try {
-    if (!llhttpInstance) {
-      if (!llhttpPromise) {
-        llhttpPromise = lazyllhttp()
-      }
-      await llhttpPromise
-      assert(llhttpInstance)
-      llhttpPromise = null
-    }
-
     const socket = await new Promise((resolve, reject) => {
       client[kConnector]({
         host,
@@ -1155,6 +1156,11 @@ async function connect (client) {
       })
     })
 
+    if (!llhttpInstance) {
+      llhttpInstance = await llhttpPromise
+      llhttpPromise = null
+    }
+
     client[kConnecting] = false
 
     assert(socket)
@@ -1168,6 +1174,8 @@ async function connect (client) {
     socket[kError] = null
     socket[kParser] = new Parser(client, socket, llhttpInstance)
     socket[kClient] = client
+    socket[kCounter] = 0
+    socket[kMaxRequests] = client[kMaxRequests]
     socket
       .on('error', onSocketError)
       .on('readable', onSocketReadable)
@@ -1187,7 +1195,6 @@ async function connect (client) {
         socket
       })
     }
-
     client.emit('connect', client[kUrl], [client])
   } catch (err) {
     client[kConnecting] = false
@@ -1233,6 +1240,7 @@ function resume (client, sync) {
   }
 
   client[kResuming] = 2
+
   _resume(client, sync)
   client[kResuming] = 0
 
@@ -1465,6 +1473,10 @@ function write (client, request) {
     socket[kReset] = true
   }
 
+  if (client[kMaxRequests] && socket[kCounter]++ >= client[kMaxRequests]) {
+    socket[kReset] = true
+  }
+
   if (blocking) {
     socket[kBlocking] = true
   }

package/lib/core/symbols.js

@@ -41,5 +41,7 @@ module.exports = {
   kConnector: Symbol('connector'),
   kStrictContentLength: Symbol('strict content length'),
   kMaxRedirections: Symbol('maxRedirections'),
-  kProxy: Symbol('proxy agent options')
+  kMaxRequests: Symbol('maxRequestsPerClient'),
+  kProxy: Symbol('proxy agent options'),
+  kCounter: Symbol('socket request counter')
 }

package/lib/fetch/headers.js

@@ -313,20 +313,23 @@ class Headers {
   }
 
   * keys () {
-    for (let index = 0; index < this[kHeadersList].length; index += 2) {
-      yield this[kHeadersList][index]
+    const clone = this[kHeadersList].slice()
+    for (let index = 0; index < clone.length; index += 2) {
+      yield clone[index]
     }
   }
 
   * values () {
-    for (let index = 1; index < this[kHeadersList].length; index += 2) {
-      yield this[kHeadersList][index]
+    const clone = this[kHeadersList].slice()
+    for (let index = 1; index < clone.length; index += 2) {
+      yield clone[index]
     }
   }
 
   * entries () {
-    for (let index = 0; index < this[kHeadersList].length; index += 2) {
-      yield [this[kHeadersList][index], this[kHeadersList][index + 1]]
+    const clone = this[kHeadersList].slice()
+    for (let index = 0; index < clone.length; index += 2) {
+      yield [clone[index], clone[index + 1]]
     }
   }
 

package/lib/fetch/index.js

@@ -171,7 +171,7 @@ async function fetch (...args) {
 
     // 3. If response is a network error, then reject p with a TypeError
     // and terminate these substeps.
-    if (response.status === 0) {
+    if (response.type === 'error') {
       p.reject(
         Object.assign(new TypeError('fetch failed'), { cause: response.error })
       )

package/package.json

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

package/types/agent.d.ts

@@ -11,7 +11,7 @@ declare class Agent extends Dispatcher{
   /** `true` after `dispatcher.destroyed()` has been called or `dispatcher.close()` has been called and the dispatcher shutdown has completed. */
   destroyed: boolean;
   /** Dispatches a request. */
-  dispatch(options: Agent.DispatchOptions, handler: Dispatcher.DispatchHandlers): void;
+  dispatch(options: Agent.DispatchOptions, handler: Dispatcher.DispatchHandlers): boolean;
 }
 
 declare namespace Agent {

package/types/client.d.ts

@@ -39,6 +39,8 @@ declare namespace Client {
     strictContentLength?: boolean;
     /** @deprecated use the connect option instead */
     tls?: TlsOptions | null;
+    /** */
+    maxRequestsPerClient?: number;
   }
 
   export interface SocketInfo {

package/types/dispatcher.d.ts

@@ -11,7 +11,7 @@ export = Dispatcher;
 /** Dispatcher is the core API used to dispatch requests. */
 declare class Dispatcher extends EventEmitter {
   /** Dispatches a request. This API is expected to evolve through semver-major versions and is less stable than the preceding higher level APIs. It is primarily intended for library developers who implement higher level APIs on top of this. */
-  dispatch(options: Dispatcher.DispatchOptions, handler: Dispatcher.DispatchHandlers): void;
+  dispatch(options: Dispatcher.DispatchOptions, handler: Dispatcher.DispatchHandlers): boolean;
   /** Starts two-way communications with the requested resource. */
   connect(options: Dispatcher.ConnectOptions): Promise<Dispatcher.ConnectData>;
   connect(options: Dispatcher.ConnectOptions, callback: (err: Error | null, data: Dispatcher.ConnectData) => void): void;
@@ -148,7 +148,7 @@ declare namespace Dispatcher {
   export type PipelineHandler = (data: PipelineHandlerData) => Readable;
   export type HttpMethod = 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'CONNECT' | 'OPTIONS' | 'TRACE' | 'PATCH';
 
-  /** 
+  /**
    * @link https://fetch.spec.whatwg.org/#body-mixin
    */
   interface BodyMixin {

package/types/mock-agent.d.ts

@@ -12,7 +12,7 @@ declare class MockAgent<TMockAgentOptions extends MockAgent.Options = MockAgent.
   get<TInterceptable extends Interceptable>(origin: RegExp): TInterceptable;
   get<TInterceptable extends Interceptable>(origin: ((origin: string) => boolean)): TInterceptable;
   /** Dispatches a mocked request. */
-  dispatch(options: Agent.DispatchOptions, handler: Dispatcher.DispatchHandlers): void;
+  dispatch(options: Agent.DispatchOptions, handler: Dispatcher.DispatchHandlers): boolean;
   /** Closes the mock agent and waits for registered mock pools and clients to also close before resolving. */
   close(): Promise<void>;
   /** Disables mocking in MockAgent. */

package/types/mock-client.d.ts

@@ -11,7 +11,7 @@ declare class MockClient extends Client implements Interceptable {
   /** Intercepts any matching requests that use the same origin as this mock client. */
   intercept(options: MockInterceptor.Options): MockInterceptor;
   /** Dispatches a mocked request. */
-  dispatch(options: Dispatcher.DispatchOptions, handlers: Dispatcher.DispatchHandlers): void;
+  dispatch(options: Dispatcher.DispatchOptions, handlers: Dispatcher.DispatchHandlers): boolean;
   /** Closes the mock client and gracefully waits for enqueued requests to complete. */
   close(): Promise<void>;
 }

package/types/mock-pool.d.ts

@@ -11,7 +11,7 @@ declare class MockPool extends Pool implements Interceptable {
   /** Intercepts any matching requests that use the same origin as this mock pool. */
   intercept(options: MockInterceptor.Options): MockInterceptor;
   /** Dispatches a mocked request. */
-  dispatch(options: Dispatcher.DispatchOptions, handlers: Dispatcher.DispatchHandlers): void;
+  dispatch(options: Dispatcher.DispatchOptions, handlers: Dispatcher.DispatchHandlers): boolean;
   /** Closes the mock pool and gracefully waits for enqueued requests to complete. */
   close(): Promise<void>;
 }

package/types/proxy-agent.d.ts

@@ -6,7 +6,7 @@ export = ProxyAgent
 declare class ProxyAgent extends Dispatcher {
   constructor(options: ProxyAgent.Options | string)
 
-  dispatch(options: Agent.DispatchOptions, handler: Dispatcher.DispatchHandlers): void;
+  dispatch(options: Agent.DispatchOptions, handler: Dispatcher.DispatchHandlers): boolean;
   close(): Promise<void>;
 }