From bcecca7ab7191ba22415ef824a339a26d410dec1 Mon Sep 17 00:00:00 2001
From: Memory <134070804+Memory2314@users.noreply.github.com>
Date: Fri, 5 Sep 2025 11:57:51 +0800
Subject: [PATCH] feat: add fetch timeout configuration

---
 src/main/config/profile.ts                    |  8 ++++---
 src/main/utils/template.ts                    |  1 +
 .../src/components/settings/mihomo-config.tsx | 22 +++++++++++++++++++
 src/renderer/src/locales/en-US.json           |  1 +
 src/renderer/src/locales/fa-IR.json           |  1 +
 src/renderer/src/locales/ru-RU.json           |  1 +
 src/renderer/src/locales/zh-CN.json           |  1 +
 src/shared/types.d.ts                         |  1 +
 8 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/main/config/profile.ts b/src/main/config/profile.ts
index 20b1dc6..10f4be4 100644
--- a/src/main/config/profile.ts
+++ b/src/main/config/profile.ts
@@ -129,7 +129,7 @@ export async function createProfile(item: Partial<IProfileItem>): Promise<IProfi
   } as IProfileItem
   switch (newItem.type) {
     case 'remote': {
-      const { userAgent } = await getAppConfig()
+      const { userAgent, subscriptionTimeout = 30000 } = await getAppConfig()
       const { 'mixed-port': mixedPort = 7890 } = await getControledMihomoConfig()
       if (!item.url) throw new Error('Empty URL')
       let res: AxiosResponse
@@ -146,7 +146,8 @@ export async function createProfile(item: Partial<IProfileItem>): Promise<IProfi
           headers: {
             'User-Agent': userAgent || `mihomo.party/v${app.getVersion()} (clash.meta)`
           },
-          responseType: 'text'
+          responseType: 'text',
+          timeout: subscriptionTimeout
         })
       } else {
         res = await axios.get(item.url, {
@@ -160,7 +161,8 @@ export async function createProfile(item: Partial<IProfileItem>): Promise<IProfi
           headers: {
             'User-Agent': userAgent || `mihomo.party/v${app.getVersion()} (clash.meta)`
           },
-          responseType: 'text'
+          responseType: 'text',
+          timeout: subscriptionTimeout
         })
       }
 
diff --git a/src/main/utils/template.ts b/src/main/utils/template.ts
index 8812505..e0f5832 100644
--- a/src/main/utils/template.ts
+++ b/src/main/utils/template.ts
@@ -19,6 +19,7 @@ export const defaultConfig: IAppConfig = {
   proxyDisplayOrder: 'default',
   autoCheckUpdate: true,
   autoCloseConnection: true,
+  subscriptionTimeout: 30000,
   useNameserverPolicy: false,
   controlDns: true,
   controlSniff: true,
diff --git a/src/renderer/src/components/settings/mihomo-config.tsx b/src/renderer/src/components/settings/mihomo-config.tsx
index 4bed9bb..33408d4 100644
--- a/src/renderer/src/components/settings/mihomo-config.tsx
+++ b/src/renderer/src/components/settings/mihomo-config.tsx
@@ -23,6 +23,7 @@ const MihomoConfig: React.FC = () => {
     pauseSSID = [],
     delayTestUrl,
     userAgent,
+    subscriptionTimeout = 30000,
     mihomoCpuPriority = 'PRIORITY_NORMAL',
     proxyCols = 'auto'
   } = appConfig || {}
@@ -49,6 +50,27 @@ const MihomoConfig: React.FC = () => {
           }}
         ></Input>
       </SettingItem>
+      <SettingItem title={t('settings.subscriptionTimeout')} divider>
+        <div className="flex items-center gap-2">
+          <Input
+            size="sm"
+            className="w-[100px]"
+            type="number"
+            value={(subscriptionTimeout / 1000)?.toString()}
+            onValueChange={async (v: string) => {
+              let num = parseInt(v)
+              await patchAppConfig({ subscriptionTimeout: num * 1000 })
+            }}
+            onBlur={async (e) => {
+              let num = parseInt(e.target.value)
+              if (isNaN(num)) num = 30
+              if (num < 30) num = 30
+              await patchAppConfig({ subscriptionTimeout: num * 1000 })
+            }}
+          />
+          <span className="text-default-500">{t('common.seconds')}</span>
+        </div>
+      </SettingItem>
       <SettingItem title={t('mihomo.delayTest.url')} divider>
         <Input
           size="sm"
diff --git a/src/renderer/src/locales/en-US.json b/src/renderer/src/locales/en-US.json
index 9888b4f..8dec5ae 100644
--- a/src/renderer/src/locales/en-US.json
+++ b/src/renderer/src/locales/en-US.json
@@ -53,6 +53,7 @@
   "settings.silentStart": "Silent Start",
   "settings.autoQuitWithoutCore": "Auto Enable Light Mode",
   "settings.autoQuitWithoutCoreTooltip": "Automatically enter light mode after closing window for specified time",
+  "settings.subscriptionTimeout": "Subscription Timeout",
   "settings.autoQuitWithoutCoreDelay": "Light Mode Auto Enable Delay",
   "settings.envType": "Environment Variable Type",
   "settings.showFloatingWindow": "Show Floating Window",
diff --git a/src/renderer/src/locales/fa-IR.json b/src/renderer/src/locales/fa-IR.json
index 055f0d0..5882a1b 100644
--- a/src/renderer/src/locales/fa-IR.json
+++ b/src/renderer/src/locales/fa-IR.json
@@ -52,6 +52,7 @@
   "settings.silentStart": "اجرای بی‌صدا",
   "settings.autoQuitWithoutCore": "ورود خودکار به حالت سبک",
   "settings.autoQuitWithoutCoreTooltip": "ورود خودکار به حالت سبک پس از بستن پنجره برای زمان مشخص",
+  "settings.subscriptionTimeout": "زمان انتظار اشتراک",
   "settings.autoQuitWithoutCoreDelay": "تاخیر فعال‌سازی خودکار حالت سبک",
   "settings.envType": "نوع متغیر محیطی",
   "settings.showFloatingWindow": "نمایش پنجره شناور",
diff --git a/src/renderer/src/locales/ru-RU.json b/src/renderer/src/locales/ru-RU.json
index 91ca742..d7dfa95 100644
--- a/src/renderer/src/locales/ru-RU.json
+++ b/src/renderer/src/locales/ru-RU.json
@@ -52,6 +52,7 @@
   "settings.silentStart": "Тихий запуск",
   "settings.autoQuitWithoutCore": "Автоматический облегчённый режим",
   "settings.autoQuitWithoutCoreTooltip": "Автоматически переходить в облегчённый режим после закрытия окна",
+  "settings.subscriptionTimeout": "Таймаут подписки",
   "settings.autoQuitWithoutCoreDelay": "Задержка включения облегчённого режима",
   "settings.envType": "Тип переменных окружения",
   "settings.showFloatingWindow": "Показывать плавающее окно",
diff --git a/src/renderer/src/locales/zh-CN.json b/src/renderer/src/locales/zh-CN.json
index f45abd9..5cf18db 100644
--- a/src/renderer/src/locales/zh-CN.json
+++ b/src/renderer/src/locales/zh-CN.json
@@ -53,6 +53,7 @@
   "settings.silentStart": "静默启动",
   "settings.autoQuitWithoutCore": "自动进入轻量模式",
   "settings.autoQuitWithoutCoreTooltip": "关闭窗口后指定时间自动进入轻量模式",
+  "settings.subscriptionTimeout": "订阅超时时间",
   "settings.autoQuitWithoutCoreDelay": "轻量模式自动启用延迟",
   "settings.envType": "环境变量类型",
   "settings.showFloatingWindow": "显示悬浮窗",
diff --git a/src/shared/types.d.ts b/src/shared/types.d.ts
index 0afea9e..6c5a57f 100644
--- a/src/shared/types.d.ts
+++ b/src/shared/types.d.ts
@@ -282,6 +282,7 @@ interface IAppConfig {
   delayTestConcurrency?: number
   delayTestUrl?: string
   delayTestTimeout?: number
+  subscriptionTimeout?: number
   encryptedPassword?: number[]
   controlDns?: boolean
   controlSniff?: boolean