Merge pull request #64 from TechCat-Team/develop

Develop

Author: chaoji233

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## v0.7.5
+
+### 修复
+- 自启动隧道失效的问题
+- 在登陆失效后提示用户重新登陆
+
+### 优化
+- 调整图表颜色，改进暗色模式下的配色
+- 在用户退出的时候清理关闭全部隧道
+- 删除遗留的系统托盘自启动代码
+- 删除"仅存在IPV6"功能
+
+
 ## v0.7.3
 
 ### 新增

package.json

@@ -1,7 +1,7 @@
 {
   "name": "chmlfrplauncher",
   "private": true,
-  "version": "0.7.3",
+  "version": "0.7.5",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ChmlFrpLauncher"
-version = "0.7.3"
+version = "0.7.5"
 description = "ChmlFrp的官方启动器"
 authors = ["南充市轻爪网络科技有限公司 <chaoji@chcat.cn>"]
 license = "Apache-2.0"

src-tauri/Cargo.toml

@@ -91,38 +91,3 @@ pub async fn set_tunnel_auto_start(
 
     Ok(())
 }
-
-/// 获取所有自动启动的隧道列表
-#[tauri::command]
-pub async fn get_auto_start_tunnels(
-    app: tauri::AppHandle,
-) -> Result<Vec<(String, String)>, String> {
-    let app_data_dir = app
-        .path()
-        .app_data_dir()
-        .map_err(|e| format!("获取应用数据目录失败: {}", e))?;
-    
-    let config_path = app_data_dir.join("tunnel_auto_start.json");
-    
-    if !config_path.exists() {
-        return Ok(vec![]);
-    }
-    
-    let content = std::fs::read_to_string(&config_path)
-        .map_err(|e| format!("读取配置文件失败: {}", e))?;
-    
-    let config: serde_json::Map<String, serde_json::Value> = serde_json::from_str(&content)
-        .map_err(|e| format!("解析配置文件失败: {}", e))?;
-    
-    let mut result = vec![];
-    for (key, value) in config {
-        if let Some(true) = value.as_bool() {
-            // 解析 key 格式: "api_123" or "custom_any_id_with_underscore"
-            if let Some((tunnel_type, id_str)) = key.split_once('_') {
-                result.push((tunnel_type.to_string(), id_str.to_string()));
-            }
-        }
-    }
-    
-    Ok(result)
-}

src-tauri/src/commands/autostart.rs

@@ -10,37 +10,6 @@ use tauri::{
     Emitter, Listener, Manager,
 };
 
-const AUTO_START_CONFIG_FILE: &str = "auto_start_tunnels.json";
-
-fn get_auto_start_tunnels_setting(app_handle: &tauri::AppHandle) -> bool {
-    let Some(app_data_dir) = app_handle.path().app_data_dir().ok() else {
-        return false;
-    };
-    let config_path = app_data_dir.join(AUTO_START_CONFIG_FILE);
-    if !config_path.exists() {
-        return false;
-    }
-    let Ok(content) = std::fs::read_to_string(&config_path) else {
-        return false;
-    };
-    serde_json::from_str::<serde_json::Value>(&content)
-        .ok()
-        .and_then(|config| config.get("enabled").and_then(|v| v.as_bool()))
-        .unwrap_or(false)
-}
-
-fn save_auto_start_tunnels_setting(app_handle: &tauri::AppHandle, enabled: bool) -> bool {
-    let Some(app_data_dir) = app_handle.path().app_data_dir().ok() else {
-        return false;
-    };
-    if std::fs::create_dir_all(&app_data_dir).is_err() {
-        return false;
-    }
-    let config_path = app_data_dir.join(AUTO_START_CONFIG_FILE);
-    let config = serde_json::json!({ "enabled": enabled });
-    std::fs::write(&config_path, serde_json::to_string_pretty(&config).unwrap()).is_ok()
-}
-
 fn cleanup_official_tunnel_configs(app_handle: &tauri::AppHandle) {
     let Ok(app_data_dir) = app_handle.path().app_data_dir() else {
         return;
@@ -58,22 +27,12 @@ fn cleanup_official_tunnel_configs(app_handle: &tauri::AppHandle) {
 }
 
 fn build_tray_menu(app: &tauri::App) -> Result<tauri::menu::Menu<tauri::Wry>, Box<dyn std::error::Error>> {
-    let auto_start_tunnels = get_auto_start_tunnels_setting(&app.handle());
-    let auto_start_label = if auto_start_tunnels {
-        "✓ 启动软件时自动启动隧道"
-    } else {
-        "启动软件时自动启动隧道"
-    };
-
     let show_item = MenuItemBuilder::with_id("show", "显示窗口").build(app)?;
-    let auto_start_item = MenuItemBuilder::with_id("auto_start_tunnels", auto_start_label).build(app)?;
     let quit_item = MenuItemBuilder::with_id("quit", "退出").build(app)?;
 
     MenuBuilder::new(app)
         .item(&show_item)
         .separator()
-        .item(&auto_start_item)
-        .separator()
         .item(&quit_item)
         .build()
         .map_err(Into::into)
@@ -135,15 +94,6 @@ pub fn run() {
                             let _ = window.set_focus();
                         }
                     }
-                    "auto_start_tunnels" => {
-                        let app_handle = app.clone();
-                        let current_setting = get_auto_start_tunnels_setting(&app_handle);
-                        let new_setting = !current_setting;
-
-                        if save_auto_start_tunnels_setting(&app_handle, new_setting) {
-                            let _ = app_handle.emit("auto-start-tunnels-changed", new_setting);
-                        }
-                    }
                     "quit" => {
                         app.exit(0);
                     }
@@ -258,7 +208,6 @@ pub fn run() {
             commands::get_running_tunnels,
             commands::is_autostart_enabled,
             commands::set_autostart,
-            commands::get_auto_start_tunnels,
             commands::get_tunnel_auto_start,
             commands::set_tunnel_auto_start,
             commands::http_request,

src-tauri/src/lib.rs

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "ChmlFrpLauncher",
-  "version": "0.7.3",
+  "version": "0.7.5",
   "identifier": "net.chmlfrp.launcher",
   "build": {
     "frontendDist": "../dist",

src-tauri/tauri.conf.json

@@ -18,7 +18,7 @@ import { useBackground } from "@/components/App/hooks/useBackground";
 import { useDeepLink } from "@/components/App/hooks/useDeepLink";
 import { useFrpcDownload } from "@/components/App/hooks/useFrpcDownload";
 import { useUpdateCheck } from "@/components/App/hooks/useUpdateCheck";
-import { useStartupAutoStartTunnels } from "@/components/App/hooks/useStartupAutoStartTunnels";
+import { useAutoStartTunnels } from "@/components/App/hooks/useAutoStartTunnels";
 import { updateService } from "@/services/updateService";
 import { toast } from "sonner";
 import { BackgroundLayer } from "@/components/App/components/BackgroundLayer";
@@ -46,8 +46,8 @@ function App() {
   // 其他功能 Hooks
   useAppTheme();
   useAppInitialization();
+  useAutoStartTunnels(user);
   useDeepLink(user, setUser);
-  useStartupAutoStartTunnels(user);
   useTunnelNotifications(activeTab);
   const { showCloseConfirmDialog, setShowCloseConfirmDialog } = useWindowEvents();
   const { showTitleBar } = useTitleBar();

src/App.tsx

@@ -20,34 +20,7 @@ export function useAppInitialization() {
       }
     };
 
-    const initIpv6OnlyNetwork = async () => {
-      if (typeof window === "undefined") return;
-      if (localStorage.getItem("ipv6OnlyNetwork") !== null) return;
-      if (!("__TAURI__" in window)) {
-        localStorage.setItem("ipv6OnlyNetwork", "false");
-        window.dispatchEvent(new Event("ipv6OnlyNetworkChanged"));
-        return;
-      }
-
-      try {
-        const { invoke } = await import("@tauri-apps/api/core");
-        const ipv4Result = await invoke<{ success: boolean }>("ping_host", {
-          host: "1.1.1.1",
-        });
-        const ipv6Result = await invoke<{ success: boolean }>("ping_host", {
-          host: "2606:4700:4700::1111",
-        });
-        const ipv6Only = ipv6Result.success && !ipv4Result.success;
-        localStorage.setItem("ipv6OnlyNetwork", ipv6Only ? "true" : "false");
-        window.dispatchEvent(new Event("ipv6OnlyNetworkChanged"));
-      } catch {
-        localStorage.setItem("ipv6OnlyNetwork", "false");
-        window.dispatchEvent(new Event("ipv6OnlyNetworkChanged"));
-      }
-    };
-
     initProcessGuard();
-    initIpv6OnlyNetwork();
   }, []);
 
   useEffect(() => {

src/components/App/hooks/useAppInitialization.ts

@@ -0,0 +1,68 @@
+import { useEffect, useRef } from "react";
+import { fetchTunnels, type StoredUser, type Tunnel } from "@/services/api";
+import { frpcManager } from "@/services/frpcManager";
+import { customTunnelService } from "@/services/customTunnelService";
+import { autoStartTunnelsService } from "@/services/autoStartTunnelsService";
+
+export function useAutoStartTunnels(user: StoredUser | null) {
+  const hasRunRef = useRef(false);
+
+  useEffect(() => {
+    if (hasRunRef.current) return;
+    if (!user?.usertoken) return;
+
+    hasRunRef.current = true;
+
+    const run = async () => {
+      try {
+        const [apiTunnels, customTunnels] = await Promise.all([
+          fetchTunnels().catch(() => [] as Tunnel[]),
+          customTunnelService.getCustomTunnels().catch(() => []),
+        ]);
+
+        await Promise.all(
+          apiTunnels.map(async (t) => {
+            try {
+              const enabled = await autoStartTunnelsService.isTunnelEnabled(
+                "api",
+                t.id,
+              );
+              if (!enabled) return;
+              if (t.nodestate && t.nodestate !== "online") return;
+              const running = await frpcManager
+                .isTunnelRunning(t.id)
+                .catch(() => false);
+              if (running) return;
+              await frpcManager.startTunnel(t, user.usertoken!);
+            } catch (error) {
+              console.error(`自动启动隧道失败 (api ${t.id}):`, error);
+            }
+          }),
+        );
+
+        await Promise.all(
+          customTunnels.map(async (t) => {
+            try {
+              const enabled = await autoStartTunnelsService.isTunnelEnabled(
+                "custom",
+                t.id,
+              );
+              if (!enabled) return;
+              const running = await customTunnelService
+                .isCustomTunnelRunning(t.id)
+                .catch(() => false);
+              if (running) return;
+              await customTunnelService.startCustomTunnel(t.id);
+            } catch (error) {
+              console.error(`自动启动自定义隧道失败 (${t.id}):`, error);
+            }
+          }),
+        );
+      } catch (error) {
+        console.error("自动启动隧道失败:", error);
+      }
+    };
+
+    void run();
+  }, [user?.usertoken]);
+}