From 1d08325ca417376525d81a45bc6fad356874564d Mon Sep 17 00:00:00 2001 From: jake li Date: Mon, 10 Jun 2024 22:51:25 +0930 Subject: [PATCH 1/3] export interceptor to type def file Fixes: https://github.com/nodejs/undici/issues/3308 --- types/index.d.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/types/index.d.ts b/types/index.d.ts index 9e5eaeb3d54..18657b6aeb7 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -18,6 +18,7 @@ import EnvHttpProxyAgent from './env-http-proxy-agent' import RetryHandler from'./retry-handler' import RetryAgent from'./retry-agent' import { request, pipeline, stream, connect, upgrade } from './api' +import interceptors from './interceptors' export * from './util' export * from './cookies' @@ -32,7 +33,7 @@ export * from './content-type' export * from './cache' export { Interceptable } from './mock-interceptor' -export { Dispatcher, BalancedPool, Pool, Client, buildConnector, errors, Agent, request, stream, pipeline, connect, upgrade, setGlobalDispatcher, getGlobalDispatcher, setGlobalOrigin, getGlobalOrigin, MockClient, MockPool, MockAgent, mockErrors, ProxyAgent, EnvHttpProxyAgent, RedirectHandler, DecoratorHandler, RetryHandler, RetryAgent } +export { Dispatcher, BalancedPool, Pool, Client, buildConnector, errors, Agent, request, stream, pipeline, connect, upgrade, setGlobalDispatcher, getGlobalDispatcher, setGlobalOrigin, getGlobalOrigin, interceptors, MockClient, MockPool, MockAgent, mockErrors, ProxyAgent, EnvHttpProxyAgent, RedirectHandler, DecoratorHandler, RetryHandler, RetryAgent } export default Undici declare namespace Undici { From fb67581d7ce68ca8a46ebc80d471df1a55660df8 Mon Sep 17 00:00:00 2001 From: jake li Date: Mon, 10 Jun 2024 23:27:22 +0930 Subject: [PATCH 2/3] fixup! add a test --- test/imports/undici-import.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/imports/undici-import.ts b/test/imports/undici-import.ts index fb7344e49b8..abb5cfbefc6 100644 --- a/test/imports/undici-import.ts +++ b/test/imports/undici-import.ts @@ -1,5 +1,7 @@ import { request } from '../../' +import { interceptors } from '../../' async function exampleCode() { + const ri = interceptors.createRedirectInterceptor({}) await request('http://localhost:3000/foo') } From 3e170a5fcbd90dbaa00dd8f70a3efaa8344d84e0 Mon Sep 17 00:00:00 2001 From: jake li Date: Tue, 11 Jun 2024 17:59:07 +0930 Subject: [PATCH 3/3] fixup! add retry, redirect, dump and remove createRedirectInterceptor --- test/imports/undici-import.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/imports/undici-import.ts b/test/imports/undici-import.ts index abb5cfbefc6..ecab8584f6b 100644 --- a/test/imports/undici-import.ts +++ b/test/imports/undici-import.ts @@ -2,6 +2,9 @@ import { request } from '../../' import { interceptors } from '../../' async function exampleCode() { - const ri = interceptors.createRedirectInterceptor({}) + const retry = interceptors.retry() + const rd = interceptors.redirect() + const dump = interceptors.dump() + await request('http://localhost:3000/foo') }