fix: revert to the previous approach

Author: almeidx

packages/proxy/__tests__/proxyRequests.test.ts

@@ -24,6 +24,7 @@ beforeEach(() => {
 	setGlobalDispatcher(mockAgent); // enabled the mock client to intercept requests
 
 	mockPool = mockAgent.get('https://discord.com');
+	api.setAgent(mockAgent);
 });
 
 afterEach(async () => {

packages/rest/__tests__/REST.test.ts

@@ -37,6 +37,8 @@ beforeEach(() => {
 	setGlobalDispatcher(mockAgent); // enabled the mock client to intercept requests
 
 	mockPool = mockAgent.get('https://discord.com');
+	api.setAgent(mockAgent);
+	fetchApi.setAgent(mockAgent);
 });
 
 afterEach(async () => {

packages/rest/__tests__/RequestHandler.test.ts

@@ -481,6 +481,8 @@ test('perm server outage', async () => {
 test('server responding too slow', async () => {
 	const api2 = new REST({ timeout: 1 }).setToken('A-Very-Really-Real-Token');
 
+	api2.setAgent(mockAgent);
+
 	mockPool
 		.intercept({
 			path: genPath('/slow'),

packages/rest/__tests__/RequestManager.test.ts

@@ -15,6 +15,7 @@ beforeEach(() => {
 	setGlobalDispatcher(mockAgent);
 
 	mockPool = mockAgent.get('https://discord.com');
+	api.setAgent(mockAgent);
 });
 
 afterEach(async () => {

packages/rest/__tests__/UndiciRequest.test.ts

@@ -28,6 +28,7 @@ beforeEach(() => {
 	setGlobalDispatcher(mockAgent); // enabled the mock client to intercept requests
 
 	mockPool = mockAgent.get('https://discord.com');
+	api.setAgent(mockAgent);
 });
 
 afterEach(async () => {

packages/rest/src/strategies/undiciRequest.ts

@@ -1,20 +1,14 @@
 import { STATUS_CODES } from 'node:http';
 import { URLSearchParams } from 'node:url';
 import { types } from 'node:util';
-import {
-	type RequestInit,
-	request,
-	Headers,
-	FormData as UndiciFormData,
-	Agent,
-	getGlobalDispatcher,
-	Dispatcher,
-} from 'undici';
+import { type RequestInit, request, Headers, FormData as UndiciFormData, Agent } from 'undici';
 import type { HeaderRecord } from 'undici/types/header.js';
 import type { ResponseLike } from '../shared.js';
 
 export type RequestOptions = Exclude<Parameters<typeof request>[1], undefined>;
 
+let localAgent: Agent | null = null;
+
 export async function makeRequest(url: string, init: RequestInit): Promise<ResponseLike> {
 	// The cast is necessary because `headers` and `method` are narrower types in `undici.request`
 	// our request path guarantees they are of acceptable type for `undici.request`
@@ -24,9 +18,11 @@ export async function makeRequest(url: string, init: RequestInit): Promise<Respo
 	} as RequestOptions;
 
 	// Mismatched dispatchers from the Node.js-bundled undici and package-installed undici breaks file uploads.
+	// So we ensure that we always pass an Agent to request()
 	// https://github.com/nodejs/node/issues/59012
-	if (!options.dispatcher && !(getGlobalDispatcher() instanceof Dispatcher)) {
-		options.dispatcher = new Agent();
+	if (!options.dispatcher) {
+		localAgent ??= new Agent();
+		options.dispatcher = localAgent;
 	}
 
 	const res = await request(url, options);