fixup

Author: ronag

docs/docs/api/RedirectHandler.md

@@ -16,7 +16,7 @@ Returns: `RedirectHandler`
 
 ### Parameters
 
-- **dispatch** `(options: Dispatch.DispatchOptions, handlers: Dispatch.DispatchHandlers) => Promise<Dispatch.DispatchResponse>` (required) - Dispatch function to be called after every redirection.
+- **dispatch** `(options: Dispatch.DispatchOptions, handlers: Dispatch.DispatchHandler) => Promise<Dispatch.DispatchResponse>` (required) - Dispatch function to be called after every redirection.
 - **maxRedirections** `number` (required) - Maximum number of redirections allowed.
 - **opts** `object` (required) - Options for handling redirection.
 - **handler** `object` (required) - Handlers for different stages of the request lifecycle.

docs/docs/api/RetryHandler.md

@@ -43,8 +43,8 @@ It represents the retry state for a given request.
 
 ### Parameter `RetryHandlers`
 
-- **dispatch** `(options: Dispatch.DispatchOptions, handlers: Dispatch.DispatchHandlers) => Promise<Dispatch.DispatchResponse>` (required) - Dispatch function to be called after every retry.
-- **handler** Extends [`Dispatch.DispatchHandlers`](/docs/docs/api/Dispatcher.md#dispatcherdispatchoptions-handler) (required) - Handler function to be called after the request is successful or the retries are exhausted.
+- **dispatch** `(options: Dispatch.DispatchOptions, handlers: Dispatch.DispatchHandler) => Promise<Dispatch.DispatchResponse>` (required) - Dispatch function to be called after every retry.
+- **handler** Extends [`Dispatch.DispatchHandler`](/docs/docs/api/Dispatcher.md#dispatcherdispatchoptions-handler) (required) - Handler function to be called after the request is successful or the retries are exhausted.
 
 >__Note__: The `RetryHandler` does not retry over stateful bodies (e.g. streams, AsyncIterable) as those, once consumed, are left in a state that cannot be reutilized. For these situations the `RetryHandler` will identify
 >the body as stateful and will not retry the request rejecting with the error `UND_ERR_REQ_RETRY`.

lib/handler/cache-handler.js

@@ -52,6 +52,10 @@ class CacheHandler {
     this.#handler.onRequestStart?.(controller, context)
   }
 
+  onRequestUpgrade (controller, statusCode, headers, socket) {
+    this.#handler.onRequestUpgrade?.(controller, statusCode, headers, socket)
+  }
+
   onResponseStart (
     controller,
     statusCode,

lib/handler/cache-revalidation-handler.js

@@ -46,6 +46,10 @@ class CacheRevalidationHandler {
     this.#context = context
   }
 
+  onRequestUpgrade (controller, statusCode, headers, socket) {
+    this.#handler.onRequestUpgrade?.(controller, statusCode, headers, socket)
+  }
+
   onResponseStart (
     controller,
     statusCode,

lib/interceptor/cache.js

@@ -267,7 +267,7 @@ module.exports = (opts = {}) => {
           opts.body.on('error', () => {}).destroy()
         }
 
-        respondWithCachedValue(result, age)
+        respondWithCachedValue(result, age, null)
       }
 
       if (typeof result.then === 'function') {

test/types/client.test-d.ts

@@ -73,7 +73,7 @@ expectAssignable<Client>(new Client('', {
       expectAssignable<Dispatcher['dispatch']>(dispatcher)
       return (opts, handlers) => {
         expectAssignable<Dispatcher.DispatchOptions>(opts)
-        expectAssignable<Dispatcher.DispatchHandlers>(handlers)
+        expectAssignable<Dispatcher.DispatchHandler>(handlers)
         return dispatcher(opts, handlers)
       }
     }]

test/types/dispatcher.test-d.ts

@@ -178,7 +178,7 @@ expectAssignable<Dispatcher.ComposedDispatcher>(new Dispatcher().compose(
     expectAssignable<Dispatcher['dispatch']>(dispatcher)
     return (opts, handlers) => {
       expectAssignable<Dispatcher.DispatchOptions>(opts)
-      expectAssignable<Dispatcher.DispatchHandlers>(handlers)
+      expectAssignable<Dispatcher.DispatchHandler>(handlers)
       return dispatcher(opts, handlers)
     }
   }
@@ -188,15 +188,15 @@ expectAssignable<Dispatcher.ComposedDispatcher>(new Dispatcher().compose([
     expectAssignable<Dispatcher['dispatch']>(dispatcher)
     return (opts, handlers) => {
       expectAssignable<Dispatcher.DispatchOptions>(opts)
-      expectAssignable<Dispatcher.DispatchHandlers>(handlers)
+      expectAssignable<Dispatcher.DispatchHandler>(handlers)
       return dispatcher(opts, handlers)
     }
   },
   (dispatcher) => {
     expectAssignable<Dispatcher['dispatch']>(dispatcher)
     return (opts, handlers) => {
       expectAssignable<Dispatcher.DispatchOptions>(opts)
-      expectAssignable<Dispatcher.DispatchHandlers>(handlers)
+      expectAssignable<Dispatcher.DispatchHandler>(handlers)
       return dispatcher(opts, handlers)
     }
   }

test/types/index.test-d.ts

@@ -17,7 +17,7 @@ expectAssignable<Dispatcher.DispatcherComposeInterceptor>(Undici.interceptors.re
 expectAssignable<Dispatcher.DispatcherComposeInterceptor>(Undici.interceptors.cache())
 
 const client = new Undici.Client('', {})
-const handler: Dispatcher.DispatchHandlers = {}
+const handler: Dispatcher.DispatchHandler = {}
 
 const redirectHandler = new Undici.RedirectHandler(client, 10, {
   path: '/', method: 'GET'

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): boolean
+  dispatch (options: Agent.DispatchOptions, handler: Dispatcher.DispatchHandler): boolean
 }
 
 declare namespace Agent {

types/dispatcher.d.ts

@@ -226,7 +226,7 @@ declare namespace Dispatcher {
   export interface DispatchHandler {
     onRequestStart?(controller: DispatchController, context: any): void;
     onRequestUpgrade?(controller: DispatchController, statusCode: number, headers: IncomingHttpHeaders, socket: Duplex): void;
-    onResponseStart?(controller: DispatchController, statusCode: number, statusMessage?: string, headers: IncomingHttpHeaders): void;
+    onResponseStart?(controller: DispatchController, statusCode: number, statusMessage: string | null, headers: IncomingHttpHeaders): void;
     onResponseData?(controller: DispatchController, chunk: Buffer): void;
     onResponseEnd?(controller: DispatchController, trailers: IncomingHttpHeaders): void;
     onResponseError?(controller: DispatchController, error: Error): void;