feat: 增加后端请求并发配置(后端 >= 2.23.32)

Author: xream

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store-front-end",
-  "version": "2.17.24",
+  "version": "2.17.27",
   "private": true,
   "scripts": {
     "dev": "vite --host",

src/api/index.ts

@@ -78,6 +78,14 @@ const getResponseContent = (e: AxiosError<ErrorResponse>) => {
   return [statusLine, getText(e.message)].filter(Boolean).join('\n') || undefined;
 };
 
+const isCanceledRequestError = (error: AxiosError<ErrorResponse>) => {
+  return error.name === 'AbortError'
+    || error.name === 'CanceledError'
+    || error.code === 'ERR_CANCELED'
+    || error.message === 'canceled'
+    || axios.isCancel(error);
+};
+
 // 配置新建一个 axios 实例
 const service = axios.create({
   baseURL: getHostAPIUrl(),
@@ -94,6 +102,9 @@ service.interceptors.response.use(
     // console.log(e.config.url);
     const requestUrl = e.config?.url || '';
 
+    if (isCanceledRequestError(e))
+      return Promise.reject(e);
+
     // 流量信息接口的报错,不通知，直接返回
     if (requestUrl.startsWith('/api/sub/flow') || requestUrl.startsWith('https://api.github.com/'))
       return Promise.resolve(e.response);

src/locales/en.ts

@@ -532,7 +532,7 @@ export default {
           ],
           cache: ["Enabled", "Disabled"],
           concurrency: "Request Concurrency",
-          concurrencyPlaceholder: "Default 15. Keep proxy apps at 20 or less",
+          concurrencyPlaceholder: "Default 10. Keep proxy apps at 20 or less",
           tipsTitle: "domain Tips",
           tipsDes: "Operation instructions for node domain name resolution",
         },
@@ -730,6 +730,8 @@ export default {
       defaultFlowUserAgent: "Please input Default Flow User-Agent",
       defaultProxy: "Please input Default Proxy/Policy",
       defaultTimeout: "Default Timeout (in ms, default: 8000)",
+      backendRequestConcurrency: "Backend Request Concurrency (default: 10)",
+      backendRequestConcurrencyWaitTime: "Backend Request Concurrency Wait Time (in ms, default: 0)",
       cacheThreshold: "Cache Threshold (in KB, default: 1024)",
       resourceCacheTtl: 'Resource Cache TTL, default: 3600(s)',
       headersCacheTtl: 'Headers Cache TTL, default: 60(s)',

src/locales/ru.ts

@@ -518,7 +518,7 @@ export default {
             "Отключено"
           ],
           "concurrency": "Конкурентность запросов",
-          "concurrencyPlaceholder": "По умолчанию 15. Рекомендуется ставить не более 20",
+          "concurrencyPlaceholder": "По умолчанию 10. Рекомендуется ставить не более 20",
           "tipsTitle": "Подсказки по резолву",
           "tipsDes": "Инструкции по разрешению доменных имен узлов в IP-адреса"
         },
@@ -779,6 +779,8 @@ export default {
       "defaultFlowUserAgent": "Введите User-Agent для трафика по умолчанию",
       "defaultProxy": "Укажите дефолтный прокси/политику бэкенда",
       "defaultTimeout": "Таймаут по умолчанию (в мс, по умолчанию: 8000)",
+      "backendRequestConcurrency": "Параллельные запросы бэкенда (по умолчанию: 10)",
+      "backendRequestConcurrencyWaitTime": "Ожидание параллельных запросов бэкенда (в мс, по умолчанию: 0)",
       "cacheThreshold": "Порог кэширования (в КБ, по умолчанию: 1024)",
       "resourceCacheTtl": "TTL кэша ресурсов, по умолчанию: 3600 (сек)",
       "headersCacheTtl": "TTL кэша заголовков, по умолчанию: 60 (сек)",

src/locales/zh.ts

@@ -549,7 +549,7 @@ export default {
           filters: ['不过滤', '移除失败', '只保留 IP', '只保留 IPv4', '只保留 IPv6'],
           cache: ['启用', '禁用'],
           concurrency: '请求并发数',
-          concurrencyPlaceholder: '默认 15. 在代理 App 中建议不超过 20',
+          concurrencyPlaceholder: '默认 10. 在代理 App 中建议不超过 20',
           tipsTitle: '域名解析操作提示',
           tipsDes: '将节点域名解析成为 IP 地址，减少一次额外的 DNS 请求',
         },
@@ -694,6 +694,8 @@ export default {
       defaultFlowUserAgent: '请输入默认查询订阅流量信息 的 User-Agent',
       defaultProxy: '请输入默认代理/策略',
       defaultTimeout: '默认超时(单位: 毫秒, 默认: 8000)',
+      backendRequestConcurrency: '后端请求并发数(默认: 10)',
+      backendRequestConcurrencyWaitTime: '后端请求并发等待时间(单位: 毫秒, 默认: 0)',
       cacheThreshold: '缓存阈值(单位: KB, 默认: 1024)',
       resourceCacheTtl: '资源缓存(单位: 秒, 默认: 3600)',
       headersCacheTtl: '响应头缓存(单位: 秒, 默认: 60)',

src/store/settings.ts

@@ -106,6 +106,8 @@ export const useSettingsStore = defineStore("settingsStore", {
       defaultFlowUserAgent: "",
       defaultProxy: "",
       defaultTimeout: "",
+      backendRequestConcurrency: "",
+      backendRequestConcurrencyWaitTime: "",
       cacheThreshold: "",
       resourceCacheTtl: "",
       headersCacheTtl: "",
@@ -212,6 +214,8 @@ export const useSettingsStore = defineStore("settingsStore", {
         this.defaultUserAgent = res.data.data.defaultUserAgent || "";
         this.defaultFlowUserAgent = res.data.data.defaultFlowUserAgent || "";
         this.defaultTimeout = res.data.data.defaultTimeout || "";
+        this.backendRequestConcurrency = normalizeSettingInputValue(res.data.data.backendRequestConcurrency);
+        this.backendRequestConcurrencyWaitTime = normalizeSettingInputValue(res.data.data.backendRequestConcurrencyWaitTime);
         this.cacheThreshold = res.data.data.cacheThreshold || "";
         this.resourceCacheTtl = res.data.data.resourceCacheTtl || "";
         this.headersCacheTtl = res.data.data.headersCacheTtl || "";
@@ -255,6 +259,8 @@ export const useSettingsStore = defineStore("settingsStore", {
         this.defaultUserAgent = res.data.data.defaultUserAgent || "";
         this.defaultFlowUserAgent = res.data.data.defaultFlowUserAgent || "";
         this.defaultTimeout = res.data.data.defaultTimeout || "";
+        this.backendRequestConcurrency = normalizeSettingInputValue(res.data.data.backendRequestConcurrency);
+        this.backendRequestConcurrencyWaitTime = normalizeSettingInputValue(res.data.data.backendRequestConcurrencyWaitTime);
         this.cacheThreshold = res.data.data.cacheThreshold || "";
         this.resourceCacheTtl = res.data.data.resourceCacheTtl || "";
         this.headersCacheTtl = res.data.data.headersCacheTtl || "";

src/types/store/settings.d.ts

@@ -28,6 +28,8 @@ interface SettingsPostData {
   defaultUserAgent?: string;
   defaultFlowUserAgent?: string;
   defaultTimeout?: string;
+  backendRequestConcurrency?: string;
+  backendRequestConcurrencyWaitTime?: string;
   cacheThreshold?: string;
   resourceCacheTtl?: string;
   headersCacheTtl?: string;

src/views/My.vue

@@ -334,6 +334,28 @@
             right-icon="tips"
             @click-right-icon="githubApiTimeoutTips"
           />
+          <nut-input
+            class="input"
+            v-model="backendRequestConcurrencyInput"
+            :disabled="!isRequestConfigEditing"
+            :placeholder="$t(`myPage.placeholder.backendRequestConcurrency`)"
+            type="number"
+            input-align="left"
+            :left-icon="iconConcurrency"
+            right-icon="tips"
+            @click-right-icon="backendRequestConcurrencyTips"
+          />
+          <nut-input
+            class="input"
+            v-model="backendRequestConcurrencyWaitTimeInput"
+            :disabled="!isRequestConfigEditing"
+            :placeholder="$t(`myPage.placeholder.backendRequestConcurrencyWaitTime`)"
+            type="number"
+            input-align="left"
+            :left-icon="iconTimeout"
+            right-icon="tips"
+            @click-right-icon="backendRequestConcurrencyWaitTimeTips"
+          />
         </div>
       </div>
       <div class="config-card">
@@ -629,7 +651,7 @@ const router = useRouter();
 const { showNotify } = useAppNotifyStore();
 const { currentUrl: host } = useHostAPI();
 const settingsStore = useSettingsStore();
-const { githubUser, gistToken, syncTime, defaultUserAgent, defaultFlowUserAgent, defaultProxy, defaultTimeout, cacheThreshold, resourceCacheTtl, headersCacheTtl, scriptCacheTtl, logsMaxCount, syncPlatform, githubProxy, githubApiUrl, githubApiTimeout, artifactSyncBatchSize, githubProxyRegex, gistUpload } =
+const { githubUser, gistToken, syncTime, defaultUserAgent, defaultFlowUserAgent, defaultProxy, defaultTimeout, backendRequestConcurrency, backendRequestConcurrencyWaitTime, cacheThreshold, resourceCacheTtl, headersCacheTtl, scriptCacheTtl, logsMaxCount, syncPlatform, githubProxy, githubApiUrl, githubApiTimeout, artifactSyncBatchSize, githubProxyRegex, gistUpload } =
   storeToRefs(settingsStore);
 
 const DEFAULT_GITHUB_API_URL = "https://api.github.com";
@@ -748,6 +770,8 @@ const uaInput = ref("");
 const flowUaInput = ref("");
 const proxyInput = ref("");
 const timeoutInput = ref("");
+const backendRequestConcurrencyInput = ref("");
+const backendRequestConcurrencyWaitTimeInput = ref("");
 const cacheThresholdInput = ref("");
 const resourceCacheTtlInput = ref("");
 const headersCacheTtlInput = ref("");
@@ -783,6 +807,8 @@ const toggleEditMode = async (type) => {
         defaultFlowUserAgent: flowUaInput.value,
         defaultProxy: proxyInput.value,
         defaultTimeout: timeoutInput.value,
+        backendRequestConcurrency: backendRequestConcurrencyInput.value,
+        backendRequestConcurrencyWaitTime: backendRequestConcurrencyWaitTimeInput.value,
         cacheThreshold: cacheThresholdInput.value,
         resourceCacheTtl: resourceCacheTtlInput.value,
         headersCacheTtl: headersCacheTtlInput.value,
@@ -812,6 +838,8 @@ const toggleEditMode = async (type) => {
       flowUaInput.value = defaultFlowUserAgent.value || "";
       proxyInput.value = defaultProxy.value;
       timeoutInput.value = defaultTimeout.value;
+      backendRequestConcurrencyInput.value = backendRequestConcurrency.value || "";
+      backendRequestConcurrencyWaitTimeInput.value = backendRequestConcurrencyWaitTime.value || "";
       cacheThresholdInput.value = cacheThreshold.value;
       resourceCacheTtlInput.value = resourceCacheTtl.value;
       headersCacheTtlInput.value = headersCacheTtl.value;
@@ -972,6 +1000,8 @@ const setDisplayInfo = () => {
   flowUaInput.value = defaultFlowUserAgent.value || "";
   proxyInput.value = defaultProxy.value || "";
   timeoutInput.value = defaultTimeout.value || "";
+  backendRequestConcurrencyInput.value = backendRequestConcurrency.value || "";
+  backendRequestConcurrencyWaitTimeInput.value = backendRequestConcurrencyWaitTime.value || "";
   cacheThresholdInput.value = cacheThreshold.value || "";
   resourceCacheTtlInput.value = resourceCacheTtl.value || "";
   headersCacheTtlInput.value = headersCacheTtl.value || "";
@@ -1266,6 +1296,30 @@ const timeoutTips = () => {
       lockScroll: false,
     });
 };
+const backendRequestConcurrencyTips = () => {
+  Dialog({
+      title: '后端请求并发数',
+      content: '后端需 >= 2.23.32\n\n控制后端发起外部请求时的并发数。默认 10；在代理 App 中建议不超过 20，过高可能增加连接数和内存压力。\n\n实际会用于远程资源下载，例如远程订阅、文件、脚本、预览、同步/定时同步等经后端下载工具发起的请求；也会用于订阅流量信息请求，例如 Subscription-Userinfo 的 HEAD/GET 请求。\n\n域名解析除外，它有自己的请求并发数。\n\n后端日志会输出 [Backend Request Concurrency]，包含 active、pending、limit、waitTime，方便调试。',
+      popClass: 'auto-dialog',
+      textAlign: 'left',
+      okText: 'OK',
+      noCancelBtn: true,
+      closeOnPopstate: true,
+      lockScroll: false,
+    });
+};
+const backendRequestConcurrencyWaitTimeTips = () => {
+  Dialog({
+      title: '后端请求并发等待时间',
+      content: '后端需 >= 2.23.32\n\n每个受后端请求并发数限制的请求拿到并发槽后，先等待指定毫秒数再发出。默认 0。\n\n可用于降低代理 App 中后端请求的瞬时连接压力；数值越大，总处理耗时也会越长。\n\n作用范围与后端请求并发数一致：远程资源下载和订阅流量信息请求。域名解析除外，它有自己的请求并发数。',
+      popClass: 'auto-dialog',
+      textAlign: 'left',
+      okText: 'OK',
+      noCancelBtn: true,
+      closeOnPopstate: true,
+      lockScroll: false,
+    });
+};
 const cacheThresholdTips = () => {
   Dialog({
       title: '可尝试设置为 1024',
@@ -1324,7 +1378,7 @@ const logsMaxCountTips = () => {
 const concurrencyTips = () => {
   Dialog({
       title: '并发数',
-      content: 'Shadowrocket 并发可能会爆内存, 可设为 1',
+      content: 'Shadowrocket/Surge 等代理 App 中并发数太高可能会爆内存, 可自行调整',
       popClass: 'auto-dialog',
       okText: 'OK',
       noCancelBtn: true,