undici 6.21.0 → 7.0.0-alpha.10

package/types/dispatcher.d.ts

@@ -6,98 +6,96 @@ import { IncomingHttpHeaders } from './header'
 import BodyReadable from './readable'
 import { FormData } from './formdata'
 import Errors from './errors'
+import { Autocomplete } from './utility'
 
-type AbortSignal = unknown;
+type AbortSignal = unknown
 
 export default 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): boolean;
+  dispatch (options: Dispatcher.DispatchOptions, handler: Dispatcher.DispatchHandler): 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;
+  connect<TOpaque = null>(options: Dispatcher.ConnectOptions<TOpaque>): Promise<Dispatcher.ConnectData<TOpaque>>
+  connect<TOpaque = null>(options: Dispatcher.ConnectOptions<TOpaque>, callback: (err: Error | null, data: Dispatcher.ConnectData<TOpaque>) => void): void
   /** Compose a chain of dispatchers */
-  compose(dispatchers: Dispatcher.DispatcherComposeInterceptor[]): Dispatcher.ComposedDispatcher;
-  compose(...dispatchers: Dispatcher.DispatcherComposeInterceptor[]): Dispatcher.ComposedDispatcher;
+  compose (dispatchers: Dispatcher.DispatcherComposeInterceptor[]): Dispatcher.ComposedDispatcher
+  compose (...dispatchers: Dispatcher.DispatcherComposeInterceptor[]): Dispatcher.ComposedDispatcher
   /** Performs an HTTP request. */
-  request(options: Dispatcher.RequestOptions): Promise<Dispatcher.ResponseData>;
-  request(options: Dispatcher.RequestOptions, callback: (err: Error | null, data: Dispatcher.ResponseData) => void): void;
+  request<TOpaque = null>(options: Dispatcher.RequestOptions<TOpaque>): Promise<Dispatcher.ResponseData<TOpaque>>
+  request<TOpaque = null>(options: Dispatcher.RequestOptions<TOpaque>, callback: (err: Error | null, data: Dispatcher.ResponseData<TOpaque>) => void): void
   /** For easy use with `stream.pipeline`. */
-  pipeline(options: Dispatcher.PipelineOptions, handler: Dispatcher.PipelineHandler): Duplex;
+  pipeline<TOpaque = null>(options: Dispatcher.PipelineOptions<TOpaque>, handler: Dispatcher.PipelineHandler<TOpaque>): Duplex
   /** A faster version of `Dispatcher.request`. */
-  stream(options: Dispatcher.RequestOptions, factory: Dispatcher.StreamFactory): Promise<Dispatcher.StreamData>;
-  stream(options: Dispatcher.RequestOptions, factory: Dispatcher.StreamFactory, callback: (err: Error | null, data: Dispatcher.StreamData) => void): void;
+  stream<TOpaque = null>(options: Dispatcher.RequestOptions<TOpaque>, factory: Dispatcher.StreamFactory<TOpaque>): Promise<Dispatcher.StreamData<TOpaque>>
+  stream<TOpaque = null>(options: Dispatcher.RequestOptions<TOpaque>, factory: Dispatcher.StreamFactory<TOpaque>, callback: (err: Error | null, data: Dispatcher.StreamData<TOpaque>) => void): void
   /** Upgrade to a different protocol. */
-  upgrade(options: Dispatcher.UpgradeOptions): Promise<Dispatcher.UpgradeData>;
-  upgrade(options: Dispatcher.UpgradeOptions, callback: (err: Error | null, data: Dispatcher.UpgradeData) => void): void;
+  upgrade (options: Dispatcher.UpgradeOptions): Promise<Dispatcher.UpgradeData>
+  upgrade (options: Dispatcher.UpgradeOptions, callback: (err: Error | null, data: Dispatcher.UpgradeData) => void): void
   /** Closes the client and gracefully waits for enqueued requests to complete before invoking the callback (or returning a promise if no callback is provided). */
-  close(): Promise<void>;
-  close(callback: () => void): void;
+  close (): Promise<void>
+  close (callback: () => void): void
   /** Destroy the client abruptly with the given err. All the pending and running requests will be asynchronously aborted and error. Waits until socket is closed before invoking the callback (or returning a promise if no callback is provided). Since this operation is asynchronously dispatched there might still be some progress on dispatched requests. */
-  destroy(): Promise<void>;
-  destroy(err: Error | null): Promise<void>;
-  destroy(callback: () => void): void;
-  destroy(err: Error | null, callback: () => void): void;
+  destroy (): Promise<void>
+  destroy (err: Error | null): Promise<void>
+  destroy (callback: () => void): void
+  destroy (err: Error | null, callback: () => void): void
 
-  on(eventName: 'connect', callback: (origin: URL, targets: readonly Dispatcher[]) => void): this;
-  on(eventName: 'disconnect', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this;
-  on(eventName: 'connectionError', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this;
-  on(eventName: 'drain', callback: (origin: URL) => void): this;
+  on (eventName: 'connect', callback: (origin: URL, targets: readonly Dispatcher[]) => void): this
+  on (eventName: 'disconnect', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this
+  on (eventName: 'connectionError', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this
+  on (eventName: 'drain', callback: (origin: URL) => void): this
 
+  once (eventName: 'connect', callback: (origin: URL, targets: readonly Dispatcher[]) => void): this
+  once (eventName: 'disconnect', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this
+  once (eventName: 'connectionError', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this
+  once (eventName: 'drain', callback: (origin: URL) => void): this
 
-  once(eventName: 'connect', callback: (origin: URL, targets: readonly Dispatcher[]) => void): this;
-  once(eventName: 'disconnect', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this;
-  once(eventName: 'connectionError', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this;
-  once(eventName: 'drain', callback: (origin: URL) => void): this;
+  off (eventName: 'connect', callback: (origin: URL, targets: readonly Dispatcher[]) => void): this
+  off (eventName: 'disconnect', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this
+  off (eventName: 'connectionError', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this
+  off (eventName: 'drain', callback: (origin: URL) => void): this
 
+  addListener (eventName: 'connect', callback: (origin: URL, targets: readonly Dispatcher[]) => void): this
+  addListener (eventName: 'disconnect', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this
+  addListener (eventName: 'connectionError', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this
+  addListener (eventName: 'drain', callback: (origin: URL) => void): this
 
-  off(eventName: 'connect', callback: (origin: URL, targets: readonly Dispatcher[]) => void): this;
-  off(eventName: 'disconnect', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this;
-  off(eventName: 'connectionError', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this;
-  off(eventName: 'drain', callback: (origin: URL) => void): this;
+  removeListener (eventName: 'connect', callback: (origin: URL, targets: readonly Dispatcher[]) => void): this
+  removeListener (eventName: 'disconnect', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this
+  removeListener (eventName: 'connectionError', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this
+  removeListener (eventName: 'drain', callback: (origin: URL) => void): this
 
+  prependListener (eventName: 'connect', callback: (origin: URL, targets: readonly Dispatcher[]) => void): this
+  prependListener (eventName: 'disconnect', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this
+  prependListener (eventName: 'connectionError', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this
+  prependListener (eventName: 'drain', callback: (origin: URL) => void): this
 
-  addListener(eventName: 'connect', callback: (origin: URL, targets: readonly Dispatcher[]) => void): this;
-  addListener(eventName: 'disconnect', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this;
-  addListener(eventName: 'connectionError', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this;
-  addListener(eventName: 'drain', callback: (origin: URL) => void): this;
+  prependOnceListener (eventName: 'connect', callback: (origin: URL, targets: readonly Dispatcher[]) => void): this
+  prependOnceListener (eventName: 'disconnect', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this
+  prependOnceListener (eventName: 'connectionError', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this
+  prependOnceListener (eventName: 'drain', callback: (origin: URL) => void): this
 
-  removeListener(eventName: 'connect', callback: (origin: URL, targets: readonly Dispatcher[]) => void): this;
-  removeListener(eventName: 'disconnect', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this;
-  removeListener(eventName: 'connectionError', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this;
-  removeListener(eventName: 'drain', callback: (origin: URL) => void): this;
+  listeners (eventName: 'connect'): ((origin: URL, targets: readonly Dispatcher[]) => void)[]
+  listeners (eventName: 'disconnect'): ((origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void)[]
+  listeners (eventName: 'connectionError'): ((origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void)[]
+  listeners (eventName: 'drain'): ((origin: URL) => void)[]
 
-  prependListener(eventName: 'connect', callback: (origin: URL, targets: readonly Dispatcher[]) => void): this;
-  prependListener(eventName: 'disconnect', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this;
-  prependListener(eventName: 'connectionError', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this;
-  prependListener(eventName: 'drain', callback: (origin: URL) => void): this;
+  rawListeners (eventName: 'connect'): ((origin: URL, targets: readonly Dispatcher[]) => void)[]
+  rawListeners (eventName: 'disconnect'): ((origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void)[]
+  rawListeners (eventName: 'connectionError'): ((origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void)[]
+  rawListeners (eventName: 'drain'): ((origin: URL) => void)[]
 
-  prependOnceListener(eventName: 'connect', callback: (origin: URL, targets: readonly Dispatcher[]) => void): this;
-  prependOnceListener(eventName: 'disconnect', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this;
-  prependOnceListener(eventName: 'connectionError', callback: (origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void): this;
-  prependOnceListener(eventName: 'drain', callback: (origin: URL) => void): this;
-
-  listeners(eventName: 'connect'): ((origin: URL, targets: readonly Dispatcher[]) => void)[]
-  listeners(eventName: 'disconnect'): ((origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void)[];
-  listeners(eventName: 'connectionError'): ((origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void)[];
-  listeners(eventName: 'drain'): ((origin: URL) => void)[];
-
-  rawListeners(eventName: 'connect'): ((origin: URL, targets: readonly Dispatcher[]) => void)[]
-  rawListeners(eventName: 'disconnect'): ((origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void)[];
-  rawListeners(eventName: 'connectionError'): ((origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError) => void)[];
-  rawListeners(eventName: 'drain'): ((origin: URL) => void)[];
-
-  emit(eventName: 'connect', origin: URL, targets: readonly Dispatcher[]): boolean;
-  emit(eventName: 'disconnect', origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError): boolean;
-  emit(eventName: 'connectionError', origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError): boolean;
-  emit(eventName: 'drain', origin: URL): boolean;
+  emit (eventName: 'connect', origin: URL, targets: readonly Dispatcher[]): boolean
+  emit (eventName: 'disconnect', origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError): boolean
+  emit (eventName: 'connectionError', origin: URL, targets: readonly Dispatcher[], error: Errors.UndiciError): boolean
+  emit (eventName: 'drain', origin: URL): boolean
 }
 
 declare namespace Dispatcher {
   export interface ComposedDispatcher extends Dispatcher {}
-  export type DispatcherComposeInterceptor = (dispatch: Dispatcher['dispatch']) => Dispatcher['dispatch'];
+  export type DispatcherComposeInterceptor = (dispatch: Dispatcher['dispatch']) => Dispatcher['dispatch']
   export interface DispatchOptions {
     origin?: string | URL;
     path: string;
@@ -105,12 +103,12 @@ declare namespace Dispatcher {
     /** Default: `null` */
     body?: string | Buffer | Uint8Array | Readable | null | FormData;
     /** Default: `null` */
-    headers?: IncomingHttpHeaders | string[] | Iterable<[string, string | string[] | undefined]> | null;
+    headers?: Record<string, string | string[]> | IncomingHttpHeaders | string[] | Iterable<[string, string | string[] | undefined]> | null;
     /** Query string params to be embedded in the request URL. Default: `null` */
     query?: Record<string, any>;
     /** Whether the requests can be safely retried or not. If `false` the request won't be sent until all preceding requests in the pipeline have completed. Default: `true` if `method` is `HEAD` or `GET`. */
     idempotent?: boolean;
-    /** Whether the response is expected to take a long time and would end up blocking the pipeline. When this is set to `true` further pipelining will be avoided on the same connection until headers have been received. */
+    /** Whether the response is expected to take a long time and would end up blocking the pipeline. When this is set to `true` further pipelining will be avoided on the same connection until headers have been received. Defaults to `method !== 'HEAD'`. */
     blocking?: boolean;
     /** Upgrade the request. Should be used to specify the kind of upgrade i.e. `'Websocket'`. Default: `method === 'CONNECT' || null`. */
     upgrade?: boolean | string | null;
@@ -122,10 +120,10 @@ declare namespace Dispatcher {
     reset?: boolean;
     /** Whether Undici should throw an error upon receiving a 4xx or 5xx response from the server. Defaults to false */
     throwOnError?: boolean;
-    /** For H2, it appends the expect: 100-continue header, and halts the request body until a 100-continue is received from the remote server*/
+    /** For H2, it appends the expect: 100-continue header, and halts the request body until a 100-continue is received from the remote server */
     expectContinue?: boolean;
   }
-  export interface ConnectOptions {
+  export interface ConnectOptions<TOpaque = null> {
     origin: string | URL;
     path: string;
     /** Default: `null` */
@@ -133,17 +131,17 @@ declare namespace Dispatcher {
     /** Default: `null` */
     signal?: AbortSignal | EventEmitter | null;
     /** This argument parameter is passed through to `ConnectData` */
-    opaque?: unknown;
+    opaque?: TOpaque;
     /** Default: 0 */
     maxRedirections?: number;
     /** Default: false */
     redirectionLimitReached?: boolean;
     /** Default: `null` */
-    responseHeader?: 'raw' | null;
+    responseHeaders?: 'raw' | null;
   }
-  export interface RequestOptions extends DispatchOptions {
+  export interface RequestOptions<TOpaque = null> extends DispatchOptions {
     /** Default: `null` */
-    opaque?: unknown;
+    opaque?: TOpaque;
     /** Default: `null` */
     signal?: AbortSignal | EventEmitter | null;
     /** Default: 0 */
@@ -153,11 +151,11 @@ declare namespace Dispatcher {
     /** Default: `null` */
     onInfo?: (info: { statusCode: number, headers: Record<string, string | string[]> }) => void;
     /** Default: `null` */
-    responseHeader?: 'raw' | null;
+    responseHeaders?: 'raw' | null;
     /** Default: `64 KiB` */
     highWaterMark?: number;
   }
-  export interface PipelineOptions extends RequestOptions {
+  export interface PipelineOptions<TOpaque = null> extends RequestOptions<TOpaque> {
     /** `true` if the `handler` will return an object stream. Default: `false` */
     objectMode?: boolean;
   }
@@ -176,65 +174,90 @@ declare namespace Dispatcher {
     /** Default: false */
     redirectionLimitReached?: boolean;
     /** Default: `null` */
-    responseHeader?: 'raw' | null;
+    responseHeaders?: 'raw' | null;
   }
-  export interface ConnectData {
+  export interface ConnectData<TOpaque = null> {
     statusCode: number;
     headers: IncomingHttpHeaders;
     socket: Duplex;
-    opaque: unknown;
+    opaque: TOpaque;
   }
-  export interface ResponseData {
+  export interface ResponseData<TOpaque = null> {
     statusCode: number;
     headers: IncomingHttpHeaders;
     body: BodyReadable & BodyMixin;
     trailers: Record<string, string>;
-    opaque: unknown;
+    opaque: TOpaque;
     context: object;
   }
-  export interface PipelineHandlerData {
+  export interface PipelineHandlerData<TOpaque = null> {
     statusCode: number;
     headers: IncomingHttpHeaders;
-    opaque: unknown;
+    opaque: TOpaque;
     body: BodyReadable;
     context: object;
   }
-  export interface StreamData {
-    opaque: unknown;
+  export interface StreamData<TOpaque = null> {
+    opaque: TOpaque;
     trailers: Record<string, string>;
   }
-  export interface UpgradeData {
+  export interface UpgradeData<TOpaque = null> {
     headers: IncomingHttpHeaders;
     socket: Duplex;
-    opaque: unknown;
+    opaque: TOpaque;
   }
-  export interface StreamFactoryData {
+  export interface StreamFactoryData<TOpaque = null> {
     statusCode: number;
     headers: IncomingHttpHeaders;
-    opaque: unknown;
+    opaque: TOpaque;
     context: object;
   }
-  export type StreamFactory = (data: StreamFactoryData) => Writable;
-  export interface DispatchHandlers {
+  export type StreamFactory<TOpaque = null> = (data: StreamFactoryData<TOpaque>) => Writable
+
+  export interface DispatchController {
+    get aborted () : boolean
+    get paused () : boolean
+    get reason () : Error | null
+    abort (reason: Error): void
+    pause(): void
+    resume(): void
+  }
+
+  export interface DispatchHandler {
+    onRequestStart?(controller: DispatchController, context: any): void;
+    onRequestUpgrade?(controller: DispatchController, statusCode: number, headers: IncomingHttpHeaders, socket: Duplex): void;
+    onResponseStart?(controller: DispatchController, statusCode: number, headers: IncomingHttpHeaders, statusMessage?: string): void;
+    onResponseData?(controller: DispatchController, chunk: Buffer): void;
+    onResponseEnd?(controller: DispatchController, trailers: IncomingHttpHeaders): void;
+    onResponseError?(controller: DispatchController, error: Error): void;
+
     /** Invoked before request is dispatched on socket. May be invoked multiple times when a request is retried when the request at the head of the pipeline fails. */
+    /** @deprecated */
     onConnect?(abort: (err?: Error) => void): void;
     /** Invoked when an error has occurred. */
+    /** @deprecated */
     onError?(err: Error): void;
     /** Invoked when request is upgraded either due to a `Upgrade` header or `CONNECT` method. */
+    /** @deprecated */
     onUpgrade?(statusCode: number, headers: Buffer[] | string[] | null, socket: Duplex): void;
     /** Invoked when response is received, before headers have been read. **/
+    /** @deprecated */
     onResponseStarted?(): void;
     /** Invoked when statusCode and headers have been received. May be invoked multiple times due to 1xx informational headers. */
+    /** @deprecated */
     onHeaders?(statusCode: number, headers: Buffer[], resume: () => void, statusText: string): boolean;
     /** Invoked when response payload data is received. */
+    /** @deprecated */
     onData?(chunk: Buffer): boolean;
     /** Invoked when response payload and trailers have been received and the request has completed. */
+    /** @deprecated */
     onComplete?(trailers: string[] | null): void;
     /** Invoked when a body chunk is sent to the server. May be invoked multiple times for chunked requests */
+    /** @deprecated */
     onBodySent?(chunkSize: number, totalBytesSent: number): void;
   }
-  export type PipelineHandler = (data: PipelineHandlerData) => Readable;
-  export type HttpMethod = 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'CONNECT' | 'OPTIONS' | 'TRACE' | 'PATCH';
+  export type PipelineHandler<TOpaque = null> = (data: PipelineHandlerData<TOpaque>) => Readable
+  export type HttpMethod = Autocomplete<'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'CONNECT' | 'OPTIONS' | 'TRACE' | 'PATCH'>
 
   /**
    * @link https://fetch.spec.whatwg.org/#body-mixin

package/types/env-http-proxy-agent.d.ts

@@ -4,9 +4,9 @@ import Dispatcher from './dispatcher'
 export default EnvHttpProxyAgent
 
 declare class EnvHttpProxyAgent extends Dispatcher {
-  constructor(opts?: EnvHttpProxyAgent.Options)
+  constructor (opts?: EnvHttpProxyAgent.Options)
 
-  dispatch(options: Agent.DispatchOptions, handler: Dispatcher.DispatchHandlers): boolean;
+  dispatch (options: Agent.DispatchOptions, handler: Dispatcher.DispatchHandler): boolean
 }
 
 declare namespace EnvHttpProxyAgent {

package/types/errors.d.ts

@@ -1,24 +1,24 @@
-import { IncomingHttpHeaders } from "./header";
+import { IncomingHttpHeaders } from './header'
 import Client from './client'
 
 export default Errors
 
 declare namespace Errors {
   export class UndiciError extends Error {
-    name: string;
-    code: string;
+    name: string
+    code: string
   }
 
   /** Connect timeout error. */
   export class ConnectTimeoutError extends UndiciError {
-    name: 'ConnectTimeoutError';
-    code: 'UND_ERR_CONNECT_TIMEOUT';
+    name: 'ConnectTimeoutError'
+    code: 'UND_ERR_CONNECT_TIMEOUT'
   }
 
   /** A header exceeds the `headersTimeout` option. */
   export class HeadersTimeoutError extends UndiciError {
-    name: 'HeadersTimeoutError';
-    code: 'UND_ERR_HEADERS_TIMEOUT';
+    name: 'HeadersTimeoutError'
+    code: 'UND_ERR_HEADERS_TIMEOUT'
   }
 
   /** Headers overflow error. */
@@ -29,8 +29,8 @@ declare namespace Errors {
 
   /** A body exceeds the `bodyTimeout` option. */
   export class BodyTimeoutError extends UndiciError {
-    name: 'BodyTimeoutError';
-    code: 'UND_ERR_BODY_TIMEOUT';
+    name: 'BodyTimeoutError'
+    code: 'UND_ERR_BODY_TIMEOUT'
   }
 
   export class ResponseStatusCodeError extends UndiciError {
@@ -39,91 +39,91 @@ declare namespace Errors {
       statusCode?: number,
       headers?: IncomingHttpHeaders | string[] | null,
       body?: null | Record<string, any> | string
-    );
-    name: 'ResponseStatusCodeError';
-    code: 'UND_ERR_RESPONSE_STATUS_CODE';
+    )
+    name: 'ResponseStatusCodeError'
+    code: 'UND_ERR_RESPONSE_STATUS_CODE'
     body: null | Record<string, any> | string
     status: number
     statusCode: number
-    headers: IncomingHttpHeaders | string[] | null;
+    headers: IncomingHttpHeaders | string[] | null
   }
 
   /** Passed an invalid argument. */
   export class InvalidArgumentError extends UndiciError {
-    name: 'InvalidArgumentError';
-    code: 'UND_ERR_INVALID_ARG';
+    name: 'InvalidArgumentError'
+    code: 'UND_ERR_INVALID_ARG'
   }
 
   /** Returned an invalid value. */
   export class InvalidReturnValueError extends UndiciError {
-    name: 'InvalidReturnValueError';
-    code: 'UND_ERR_INVALID_RETURN_VALUE';
+    name: 'InvalidReturnValueError'
+    code: 'UND_ERR_INVALID_RETURN_VALUE'
   }
 
   /** The request has been aborted by the user. */
   export class RequestAbortedError extends UndiciError {
-    name: 'AbortError';
-    code: 'UND_ERR_ABORTED';
+    name: 'AbortError'
+    code: 'UND_ERR_ABORTED'
   }
 
   /** Expected error with reason. */
   export class InformationalError extends UndiciError {
-    name: 'InformationalError';
-    code: 'UND_ERR_INFO';
+    name: 'InformationalError'
+    code: 'UND_ERR_INFO'
   }
 
   /** Request body length does not match content-length header. */
   export class RequestContentLengthMismatchError extends UndiciError {
-    name: 'RequestContentLengthMismatchError';
-    code: 'UND_ERR_REQ_CONTENT_LENGTH_MISMATCH';
+    name: 'RequestContentLengthMismatchError'
+    code: 'UND_ERR_REQ_CONTENT_LENGTH_MISMATCH'
   }
 
   /** Response body length does not match content-length header. */
   export class ResponseContentLengthMismatchError extends UndiciError {
-    name: 'ResponseContentLengthMismatchError';
-    code: 'UND_ERR_RES_CONTENT_LENGTH_MISMATCH';
+    name: 'ResponseContentLengthMismatchError'
+    code: 'UND_ERR_RES_CONTENT_LENGTH_MISMATCH'
   }
 
   /** Trying to use a destroyed client. */
   export class ClientDestroyedError extends UndiciError {
-    name: 'ClientDestroyedError';
-    code: 'UND_ERR_DESTROYED';
+    name: 'ClientDestroyedError'
+    code: 'UND_ERR_DESTROYED'
   }
 
   /** Trying to use a closed client. */
   export class ClientClosedError extends UndiciError {
-    name: 'ClientClosedError';
-    code: 'UND_ERR_CLOSED';
+    name: 'ClientClosedError'
+    code: 'UND_ERR_CLOSED'
   }
 
   /** There is an error with the socket. */
   export class SocketError extends UndiciError {
-    name: 'SocketError';
-    code: 'UND_ERR_SOCKET';
+    name: 'SocketError'
+    code: 'UND_ERR_SOCKET'
     socket: Client.SocketInfo | null
   }
 
   /** Encountered unsupported functionality. */
   export class NotSupportedError extends UndiciError {
-    name: 'NotSupportedError';
-    code: 'UND_ERR_NOT_SUPPORTED';
+    name: 'NotSupportedError'
+    code: 'UND_ERR_NOT_SUPPORTED'
   }
 
   /** No upstream has been added to the BalancedPool. */
   export class BalancedPoolMissingUpstreamError extends UndiciError {
-    name: 'MissingUpstreamError';
-    code: 'UND_ERR_BPL_MISSING_UPSTREAM';
+    name: 'MissingUpstreamError'
+    code: 'UND_ERR_BPL_MISSING_UPSTREAM'
   }
 
   export class HTTPParserError extends UndiciError {
-    name: 'HTTPParserError';
-    code: string;
+    name: 'HTTPParserError'
+    code: string
   }
 
   /** The response exceed the length allowed. */
   export class ResponseExceededMaxSizeError extends UndiciError {
-    name: 'ResponseExceededMaxSizeError';
-    code: 'UND_ERR_RES_EXCEEDED_MAX_SIZE';
+    name: 'ResponseExceededMaxSizeError'
+    code: 'UND_ERR_RES_EXCEEDED_MAX_SIZE'
   }
 
   export class RequestRetryError extends UndiciError {
@@ -132,18 +132,24 @@ declare namespace Errors {
       statusCode: number,
       headers?: IncomingHttpHeaders | string[] | null,
       body?: null | Record<string, any> | string
-    );
-    name: 'RequestRetryError';
-    code: 'UND_ERR_REQ_RETRY';
-    statusCode: number;
+    )
+    name: 'RequestRetryError'
+    code: 'UND_ERR_REQ_RETRY'
+    statusCode: number
     data: {
       count: number;
-    };
-    headers: Record<string, string | string[]>;
+    }
+
+    headers: Record<string, string | string[]>
   }
 
   export class SecureProxyConnectionError extends UndiciError {
-    name: 'SecureProxyConnectionError';
-    code: 'UND_ERR_PRX_TLS';
+    constructor (
+      cause?: Error,
+      message?: string,
+      options?: Record<any, any>
+    )
+    name: 'SecureProxyConnectionError'
+    code: 'UND_ERR_PRX_TLS'
   }
 }

package/types/fetch.d.ts

@@ -6,7 +6,7 @@ import { Blob } from 'buffer'
 import { URL, URLSearchParams } from 'url'
 import { ReadableStream } from 'stream/web'
 import { FormData } from './formdata'
-
+import { HeaderRecord } from './header'
 import Dispatcher from './dispatcher'
 
 export type RequestInfo = string | URL | Request
@@ -36,17 +36,17 @@ export class BodyMixin {
   /**
    * @deprecated This method is not recommended for parsing multipart/form-data bodies in server environments.
    * It is recommended to use a library such as [@fastify/busboy](https://www.npmjs.com/package/@fastify/busboy) as follows:
-   * 
+   *
    * @example
    * ```js
    * import { Busboy } from '@fastify/busboy'
    * import { Readable } from 'node:stream'
-   * 
+   *
    * const response = await fetch('...')
    * const busboy = new Busboy({ headers: { 'content-type': response.headers.get('content-type') } })
-   * 
+   *
    * // handle events emitted from `busboy`
-   * 
+   *
    * Readable.fromWeb(response.body).pipe(busboy)
    * ```
    */
@@ -67,7 +67,7 @@ export interface SpecIterable<T> {
   [Symbol.iterator](): SpecIterator<T>;
 }
 
-export type HeadersInit = string[][] | Record<string, string | ReadonlyArray<string>> | Headers
+export type HeadersInit = [string, string][] | HeaderRecord | Headers
 
 export declare class Headers implements SpecIterable<[string, string]> {
   constructor (init?: HeadersInit)
@@ -119,20 +119,21 @@ type RequestDestination =
   | 'xslt'
 
 export interface RequestInit {
-  method?: string
-  keepalive?: boolean
-  headers?: HeadersInit
   body?: BodyInit | null
-  redirect?: RequestRedirect
-  integrity?: string
-  signal?: AbortSignal | null
+  cache?: RequestCache
   credentials?: RequestCredentials
+  dispatcher?: Dispatcher
+  duplex?: RequestDuplex
+  headers?: HeadersInit
+  integrity?: string
+  keepalive?: boolean
+  method?: string
   mode?: RequestMode
+  redirect?: RequestRedirect
   referrer?: string
   referrerPolicy?: ReferrerPolicy
+  signal?: AbortSignal | null
   window?: null
-  dispatcher?: Dispatcher
-  duplex?: RequestDuplex
 }
 
 export type ReferrerPolicy =
@@ -144,7 +145,7 @@ export type ReferrerPolicy =
   | 'same-origin'
   | 'strict-origin'
   | 'strict-origin-when-cross-origin'
-  | 'unsafe-url';
+  | 'unsafe-url'
 
 export type RequestMode = 'cors' | 'navigate' | 'no-cors' | 'same-origin'
 
@@ -204,6 +205,6 @@ export declare class Response extends BodyMixin {
   readonly clone: () => Response
 
   static error (): Response
-  static json(data: any, init?: ResponseInit): Response
+  static json (data: any, init?: ResponseInit): Response
   static redirect (url: string | URL, status: ResponseRedirectStatus): Response
 }