don't use EnvHttpProxyAgent by default

nodejs · Apr 2, 2024 · f31d3f9 · f31d3f9
1 parent 3b7cd3b
commit f31d3f9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/index-fetch.js b/index-fetch.js
@@ -1,9 +1,5 @@
 'use strict'
 
-const Dispatcher = require('./lib/dispatcher/dispatcher')
-const api = require('./lib/api')
-Object.assign(Dispatcher.prototype, api)
-
 const fetchImpl = require('./lib/web/fetch').fetch
 
 module.exports.fetch = function fetch (resource, init = undefined) {

diff --git a/lib/global.js b/lib/global.js
@@ -4,10 +4,10 @@
 // this version number must be increased to avoid conflicts.
 const globalDispatcher = Symbol.for('undici.globalDispatcher.1')
 const { InvalidArgumentError } = require('./core/errors')
-const EnvHttpProxyAgent = require('./dispatcher/env-http-proxy-agent')
+const Agent = require('./dispatcher/agent')
 
 if (getGlobalDispatcher() === undefined) {
-  setGlobalDispatcher(new EnvHttpProxyAgent())
+  setGlobalDispatcher(new Agent())
 }
 
 function setGlobalDispatcher (agent) {

diff --git a/test/node-fetch/main.js b/test/node-fetch/main.js
@@ -17,7 +17,7 @@ const {
   FormData,
   Response,
   setGlobalDispatcher,
-  EnvHttpProxyAgent
+  Agent
 } = require('../../index.js')
 const HeadersOrig = require('../../lib/web/fetch/headers.js').Headers
 const ResponseOrig = require('../../lib/web/fetch/response.js').Response
@@ -34,7 +34,7 @@ describe('node-fetch', () => {
 
   before(async () => {
     await local.start()
-    setGlobalDispatcher(new EnvHttpProxyAgent({
+    setGlobalDispatcher(new Agent({
       connect: {
         rejectUnauthorized: false
       }

diff --git a/test/node-test/debug.js b/test/node-test/debug.js
@@ -53,7 +53,7 @@ test('debug#fetch', async t => {
     process.execPath,
     [join(__dirname, '../fixtures/fetch.js')],
     {
-      env: Object.assign({}, process.env, { NODE_DEBUG: 'fetch', NO_PROXY: '*' })
+      env: Object.assign({}, process.env, { NODE_DEBUG: 'fetch' })
     }
   )
   const chunks = []