Add files via upload

Author: Mr-xn

frontend/js/main.js

@@ -10,7 +10,7 @@ import { showApiKeyModal, closeApiKeyModal, togglePasswordVisibility, saveApiKey
          initQuickFilters, toggleFilters, toggleFilter, updateFilterOperator, updateFilterInput, removeFilter, clearAllFilters, getFilterQuery,
          restoreFiltersFromData,
          exportConfigToFile, importConfigFromFile, toggleAdvanced, setSearchButtonUpdater,
-         showSettingsModal, closeSettingsModal, saveSettingsApiKey, toggleSettingsPassword, saveProxySettings, toggleProxyEnabled,
+         showSettingsModal, closeSettingsModal, saveSettingsApiKey, toggleSettingsPassword, saveProxySettings, toggleProxyEnabled, restoreProxyOnStartup,
          resetUserAgent, saveRequestConfig, renderLogViewer, clearDiagnosticLogs, exportDiagnosticLogs } from './ui.js';
 import { doSearch, showSuggestions, hideSuggestions, handleInputChange, fetchResults, updateSearchButtonState } from './search.js';
 import { sortTable, goToPage, downloadCurrentPage, downloadAllPages, closeDownloadModal, startDownload, hideDownloadProgress, copyColumn, setFetchResults } from './results.js';
@@ -836,19 +836,17 @@ document.addEventListener('DOMContentLoaded', async () => {
     try {
         state.apiBaseUrl = await initTauriBridge();
 
-        // 恢复上次保存的代理配置到 Rust 侧（解决重启后代理不生效的问题）
+        // 恢复上次保存的代理配置到 Rust 侧（仅在代理启用时恢复）
         if (isTauri()) {
-            const { setProxyConfig, setRequestConfig } = await import('./tauri-bridge.js');
-            const savedHost = localStorage.getItem(STORAGE_KEYS.proxyHost) || '';
-            const savedPort = parseInt(localStorage.getItem(STORAGE_KEYS.proxyPort)) || 0;
-            const savedUser = localStorage.getItem(STORAGE_KEYS.proxyUsername) || '';
-            const savedPass = localStorage.getItem(STORAGE_KEYS.proxyPassword) || '';
-            if (savedHost && savedPort) {
-                try {
-                    await setProxyConfig(savedHost, savedPort, savedUser, savedPass);
-                    console.log('[Init] Proxy config restored:', savedHost, savedPort);
-                    logInfo('proxy', '启动时恢复代理配置成功', { host: savedHost, port: savedPort, usernamePresent: !!savedUser, passwordPresent: !!savedPass });
-                } catch (e) { console.warn('[Init] Failed to restore proxy config:', e); logWarn('proxy', '启动时恢复代理配置失败', { message: e.message || String(e) }); }
+            const { setRequestConfig } = await import('./tauri-bridge.js');
+            try {
+                const proxyResult = await restoreProxyOnStartup();
+                if (proxyResult.restored) {
+                    console.log('[Init] Proxy config restored:', proxyResult.host, proxyResult.port);
+                } else {
+                    console.log('[Init] Proxy not restored:', proxyResult.reason);
+                }
+            } catch (e) { console.warn('[Init] Failed to restore proxy config:', e); logWarn('proxy', '启动时恢复代理配置失败', { message: e.message || String(e) }); }
             }
 
             // 恢复请求配置（User-Agent + 自定义 Headers）

frontend/js/ui.js

@@ -252,6 +252,37 @@ export async function saveProxySettings() {
     }
 }
 
+/**
+ * 启动时恢复代理配置到 Rust 侧
+ * 读取 localStorage 中的 proxyEnabled 标志，只在启用时才恢复代理
+ * @returns {Promise<{restored: boolean, host?: string, port?: number, reason?: string}>}
+ */
+export async function restoreProxyOnStartup() {
+    const savedHost = localStorage.getItem(STORAGE_KEYS.proxyHost) || '';
+    const savedPort = parseInt(localStorage.getItem(STORAGE_KEYS.proxyPort)) || 0;
+
+    // 无配置：host 或 port 缺失
+    if (!savedHost || !savedPort) {
+        return { restored: false, reason: 'no-config' };
+    }
+
+    // 检查代理开关状态（无键时默认启用，向后兼容旧版本）
+    const enabledRaw = localStorage.getItem(STORAGE_KEYS.proxyEnabled);
+    const proxyEnabled = enabledRaw !== 'false';
+
+    if (!proxyEnabled) {
+        return { restored: false, reason: 'disabled' };
+    }
+
+    const savedUser = localStorage.getItem(STORAGE_KEYS.proxyUsername) || '';
+    const savedPass = localStorage.getItem(STORAGE_KEYS.proxyPassword) || '';
+
+    await setProxyConfig(savedHost, savedPort, savedUser, savedPass);
+    logInfo('proxy', '启动时恢复代理配置成功', { host: savedHost, port: savedPort, usernamePresent: !!savedUser, passwordPresent: !!savedPass });
+
+    return { restored: true, host: savedHost, port: savedPort };
+}
+
 /**
  * 代理开关联动：启用/禁用输入框和保存按钮文字
  * @param {boolean} enabled - 是否启用代理