feat: 更新 undici, fetch-socks; 修正 throwOnMaxRedirect; 请求参数支持传入 proxyTunnel

Author: xream

backend/package.json

@@ -34,7 +34,7 @@
     "dotenv": "^16.4.7",
     "express": "^4.17.1",
     "fastestsmallesttextencoderdecoder": "^1.0.22",
-    "fetch-socks": "^1.3.2",
+    "fetch-socks": "^1.3.3",
     "http-proxy-middleware": "^3.0.3",
     "ip-address": "^9.0.5",
     "js-base64": "^3.7.2",
@@ -45,7 +45,7 @@
     "ms": "^2.1.3",
     "nanoid": "^3.3.3",
     "semver": "^7.6.3",
-    "undici": "^7.4.0",
+    "undici": "^8.8.0",
     "yaml": "^2.9.0"
   },
   "devDependencies": {

backend/pnpm-lock.yaml

@@ -13,6 +13,7 @@ import {
 let $;
 let openApi;
 let download;
+let downloadFile;
 let resourceCache;
 let headersResourceCache;
 let originalRead;
@@ -49,7 +50,7 @@ describe('download github proxy regex', function () {
         ({
             default: headersResourceCache,
         } = require('@/utils/headers-resource-cache'));
-        ({ default: download } = require('@/utils/download'));
+        ({ default: download, downloadFile } = require('@/utils/download'));
         ageUtils = require('@/utils/age');
 
         originalRead = $.read.bind($);
@@ -321,4 +322,43 @@ describe('download github proxy regex', function () {
             wrongPair['age-secret-key'],
         );
     });
+
+    it('uses the Undici option that throws at the file redirect limit', async function () {
+        const undici = eval("require('undici')");
+        const originalAgent = undici.Agent;
+        const originalRedirect = undici.interceptors.redirect;
+        const originalRequest = undici.request;
+        let redirectOptions;
+        let error;
+
+        undici.Agent = class {
+            compose() {
+                return this;
+            }
+        };
+        undici.interceptors.redirect = (options) => {
+            redirectOptions = options;
+            return () => {};
+        };
+        undici.request = async () => ({ statusCode: 500 });
+
+        try {
+            await downloadFile(
+                'https://example.com/redirecting-file',
+                path.join(tempDir, 'redirecting-file'),
+            );
+        } catch (e) {
+            error = e;
+        } finally {
+            undici.Agent = originalAgent;
+            undici.interceptors.redirect = originalRedirect;
+            undici.request = originalRequest;
+        }
+
+        expect(error).to.be.instanceOf(Error);
+        expect(redirectOptions).to.deep.equal({
+            maxRedirections: 3,
+            throwOnMaxRedirect: true,
+        });
+    });
 });

backend/src/test/utils/download.spec.js

@@ -19,8 +19,10 @@ describe('open-api HTTP adapter', function () {
     let originalEnv;
     let originalEnvHttpProxyAgent;
     let originalProxyAgent;
+    let originalRedirect;
     let originalRequest;
     let agentOptions;
+    let redirectOptions;
     let requestOptions;
 
     beforeEach(function () {
@@ -33,8 +35,10 @@ describe('open-api HTTP adapter', function () {
 
         originalEnvHttpProxyAgent = undici.EnvHttpProxyAgent;
         originalProxyAgent = undici.ProxyAgent;
+        originalRedirect = undici.interceptors.redirect;
         originalRequest = undici.request;
         agentOptions = [];
+        redirectOptions = undefined;
         requestOptions = undefined;
 
         class CapturingAgent {
@@ -49,6 +53,10 @@ describe('open-api HTTP adapter', function () {
 
         undici.EnvHttpProxyAgent = CapturingAgent;
         undici.ProxyAgent = CapturingAgent;
+        undici.interceptors.redirect = (options) => {
+            redirectOptions = options;
+            return () => {};
+        };
         undici.request = async (_url, options) => {
             requestOptions = options;
             return {
@@ -65,6 +73,7 @@ describe('open-api HTTP adapter', function () {
     afterEach(function () {
         undici.EnvHttpProxyAgent = originalEnvHttpProxyAgent;
         undici.ProxyAgent = originalProxyAgent;
+        undici.interceptors.redirect = originalRedirect;
         undici.request = originalRequest;
         proxyEnvKeys.forEach((key) => {
             if (originalEnv[key] == null) {
@@ -96,6 +105,33 @@ describe('open-api HTTP adapter', function () {
         expect(agentOptions[0].requestTls.allowH2).to.equal(false);
     });
 
+    it('passes proxyTunnel to undici proxy agents', async function () {
+        await HTTP().get({
+            url: 'http://example.com/subscription',
+            proxy: 'http://127.0.0.1:8080',
+            proxyTunnel: true,
+        });
+        await HTTP().get({
+            url: 'http://example.com/subscription',
+            proxyTunnel: true,
+        });
+
+        expect(agentOptions).to.have.length(2);
+        expect(agentOptions.map(({ proxyTunnel }) => proxyTunnel)).to.deep.equal([
+            true,
+            true,
+        ]);
+    });
+
+    it('uses the Undici option that throws at the redirect limit', async function () {
+        await HTTP().get('https://example.com/subscription');
+
+        expect(redirectOptions).to.deep.equal({
+            maxRedirections: 3,
+            throwOnMaxRedirect: true,
+        });
+    });
+
     it('normalizes Node.js request header names to lowercase', async function () {
         await HTTP({
             headers: {

backend/src/test/vendor/open-api.spec.js

@@ -521,7 +521,7 @@ export async function downloadFile(url, file) {
         dispatcher: new Agent().compose(
             interceptors.redirect({
                 maxRedirections: 3,
-                throwOnRedirect: true,
+                throwOnMaxRedirect: true,
             }),
         ),
     });

backend/src/utils/download.js

@@ -570,12 +570,14 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                                     ...agentOpts,
                                     uri: opts.proxy,
                                     requestTls: tlsOptions,
+                                    proxyTunnel: opts.proxyTunnel,
                                 });
                             }
                         } else {
                             dispatcher = new EnvHttpProxyAgent({
                                 ...agentOpts,
                                 requestTls: tlsOptions,
+                                proxyTunnel: opts.proxyTunnel,
                             });
                         }
                         const response = await request(opts.url, {
@@ -584,7 +586,7 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                             dispatcher: dispatcher.compose(
                                 interceptors.redirect({
                                     maxRedirections: 3,
-                                    throwOnMaxRedirects: true,
+                                    throwOnMaxRedirect: true,
                                 }),
                             ),
                         });