Fix proxy conflict

Chocobozzz · Jan 15, 2025 · cda0351 · cda0351
1 parent b6eb8de
commit cda0351
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/server/core/helpers/requests.ts b/server/core/helpers/requests.ts
@@ -177,7 +177,14 @@ export function generateRequestStream (url: string, options: PeerTubeRequestOpti
 }
 
 export function getProxyAgent () {
-  if (!isProxyEnabled()) return {}
+  if (!isProxyEnabled()) {
+    return {
+      agent: { // Fix issue https://github.com/node-fetch/node-fetch/issues/1735 with Node 20
+        http: new http.Agent({ keepAlive: false }),
+        https: new https.Agent({ keepAlive: false })
+      }
+    }
+  }
 
   const proxy = getProxy()
 
@@ -230,10 +237,6 @@ function buildGotOptions (options: PeerTubeRequestOptions): OptionsOfUnknownResp
   return {
     method: options.method,
     dnsCache: true,
-    agent: { // Fix issue https://github.com/node-fetch/node-fetch/issues/1735 with Node 20
-      http: new http.Agent({ keepAlive: false }),
-      https: new https.Agent({ keepAlive: false })
-    },
     timeout: {
       request: options.timeout ?? REQUEST_TIMEOUTS.DEFAULT
     },