Merge branch 'dev' into feat/optional-delay-check-interval

.mergify.yml

@@ -0,0 +1,5 @@
+queue_rules:
+  - name: LetMeMergeForYou
+    batch_size: 3
+    allow_queue_branch_edit: true
+    queue_conditions: []

Cargo.lock

@@ -1124,7 +1124,6 @@ dependencies = [
  "clash-verge-i18n",
  "clash-verge-logging",
  "clash-verge-signal",
- "clash-verge-types",
  "clash_verge_logger",
  "clash_verge_service_ipc",
  "compact_str",
@@ -1219,15 +1218,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "clash-verge-types"
-version = "0.1.0"
-dependencies = [
- "serde",
- "serde_yaml_ng",
- "smartstring",
-]
-
 [[package]]
 name = "clash_verge_logger"
 version = "0.2.2"
@@ -3442,12 +3432,12 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.6.1",
+ "socket2 0.5.10",
  "system-configuration",
  "tokio",
  "tower-service",
  "tracing",
- "windows-registry 0.6.1",
+ "windows-registry",
 ]
 
 [[package]]
@@ -4911,7 +4901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -5720,7 +5710,7 @@ dependencies = [
  "quinn-udp",
  "rustc-hash",
  "rustls",
- "socket2 0.6.1",
+ "socket2 0.5.10",
  "thiserror 2.0.18",
  "tokio",
  "tracing",
@@ -5758,7 +5748,7 @@ dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.6.1",
+ "socket2 0.5.10",
  "tracing",
  "windows-sys 0.60.2",
 ]
@@ -7597,7 +7587,7 @@ dependencies = [
  "thiserror 2.0.18",
  "tracing",
  "url",
- "windows-registry 0.5.3",
+ "windows-registry",
  "windows-result 0.3.4",
 ]
 
@@ -7710,7 +7700,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-mihomo"
 version = "0.1.3"
-source = "git+https://github.com/clash-verge-rev/tauri-plugin-mihomo#65500f248533c0700a65f0f081e4bcadda4bff35"
+source = "git+https://github.com/clash-verge-rev/tauri-plugin-mihomo#322d9f965b5daeb01bc9b16c73d199bb524c7a98"
 dependencies = [
  "base64 0.22.1",
  "futures-util",
@@ -9337,7 +9327,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -9517,17 +9507,6 @@ dependencies = [
  "windows-strings 0.4.2",
 ]
 
-[[package]]
-name = "windows-registry"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
-dependencies = [
- "windows-link 0.2.1",
- "windows-result 0.4.1",
- "windows-strings 0.5.1",
-]
-
 [[package]]
 name = "windows-result"
 version = "0.3.4"

Cargo.toml

@@ -5,7 +5,6 @@ members = [
   "crates/clash-verge-logging",
   "crates/clash-verge-signal",
   "crates/tauri-plugin-clash-verge-sysinfo",
-  "crates/clash-verge-types",
   "crates/clash-verge-i18n",
 ]
 resolver = "2"
@@ -44,7 +43,6 @@ strip = false
 clash-verge-draft = { path = "crates/clash-verge-draft" }
 clash-verge-logging = { path = "crates/clash-verge-logging" }
 clash-verge-signal = { path = "crates/clash-verge-signal" }
-clash-verge-types = { path = "crates/clash-verge-types" }
 clash-verge-i18n = { path = "crates/clash-verge-i18n" }
 tauri-plugin-clash-verge-sysinfo = { path = "crates/tauri-plugin-clash-verge-sysinfo" }
 

crates/clash-verge-types/Cargo.toml

@@ -1,13 +0,0 @@
-[package]
-name = "clash-verge-types"
-version = "0.1.0"
-edition = "2024"
-rust-version = "1.91"
-
-[dependencies]
-serde = { workspace = true }
-serde_yaml_ng = { workspace = true }
-smartstring = { workspace = true }
-
-[lints]
-workspace = true

crates/clash-verge-types/src/lib.rs

@@ -1 +0,0 @@
-pub mod runtime;

src-tauri/Cargo.toml

@@ -34,7 +34,6 @@ tauri-build = { version = "2.5.3", features = [] }
 clash-verge-draft = { workspace = true }
 clash-verge-logging = { workspace = true }
 clash-verge-signal = { workspace = true }
-clash-verge-types = { workspace = true }
 clash-verge-i18n = { workspace = true }
 tauri-plugin-clash-verge-sysinfo = { workspace = true }
 tauri-plugin-clipboard-manager = { workspace = true }

src-tauri/src/config/config.rs

@@ -1,6 +1,6 @@
 use super::{IClashTemp, IProfiles, IVerge};
 use crate::{
-    config::{PrfItem, profiles_append_item_safe},
+    config::{PrfItem, profiles_append_item_safe, runtime::IRuntime},
     constants::{files, timing},
     core::{
         CoreManager,
@@ -16,7 +16,6 @@ use anyhow::{Result, anyhow};
 use backoff::{Error as BackoffError, ExponentialBackoff};
 use clash_verge_draft::Draft;
 use clash_verge_logging::{Type, logging, logging_error};
-use clash_verge_types::runtime::IRuntime;
 use smartstring::alias::String;
 use std::path::PathBuf;
 use tauri_plugin_clash_verge_sysinfo::is_current_app_handle_admin;

src-tauri/src/config/mod.rs

@@ -4,6 +4,7 @@ mod config;
 mod encrypt;
 mod prfitem;
 pub mod profiles;
+pub mod runtime;
 mod verge;
 
 pub use self::{clash::*, config::*, encrypt::*, prfitem::*, profiles::*, verge::*};

src-tauri/src/config/runtime.rs

@@ -2,6 +2,8 @@ use serde_yaml_ng::{Mapping, Value};
 use smartstring::alias::String;
 use std::collections::{HashMap, HashSet};
 
+use crate::enhance::field::use_keys;
+
 const PATCH_CONFIG_INNER: [&str; 4] = ["allow-lan", "ipv6", "log-level", "unified-delay"];
 
 #[derive(Default, Clone)]
@@ -136,13 +138,3 @@ impl IRuntime {
         }
     }
 }
-
-// TODO 完整迁移 enhance 行为后移除
-#[inline]
-fn use_keys<'a>(config: &'a Mapping) -> impl Iterator<Item = String> + 'a {
-    config.iter().filter_map(|(key, _)| key.as_str()).map(|s: &str| {
-        let mut s: String = s.into();
-        s.make_ascii_lowercase();
-        s
-    })
-}

src-tauri/src/core/manager/config.rs

@@ -1,13 +1,12 @@
 use super::CoreManager;
 use crate::{
-    config::{Config, ConfigType},
+    config::{Config, ConfigType, runtime::IRuntime},
     constants::timing,
     core::{handle, validate::CoreConfigValidator},
     utils::{dirs, help},
 };
 use anyhow::{Result, anyhow};
 use clash_verge_logging::{Type, logging};
-use clash_verge_types::runtime::IRuntime;
 use smartstring::alias::String;
 use std::{collections::HashSet, path::PathBuf, time::Instant};
 use tauri_plugin_mihomo::Error as MihomoError;

src-tauri/src/enhance/field.rs

@@ -61,14 +61,11 @@ pub fn use_sort(config: Mapping) -> Mapping {
     ret
 }
 
-pub fn use_keys(config: &Mapping) -> Vec<String> {
-    config
-        .iter()
-        .filter_map(|(key, _)| key.as_str())
-        .map(|s: &str| {
-            let mut s: String = s.into();
-            s.make_ascii_lowercase();
-            s
-        })
-        .collect()
+#[inline]
+pub fn use_keys<'a>(config: &'a Mapping) -> impl Iterator<Item = String> + 'a {
+    config.iter().filter_map(|(key, _)| key.as_str()).map(|s: &str| {
+        let mut s: String = s.into();
+        s.make_ascii_lowercase();
+        s
+    })
 }

src-tauri/src/enhance/mod.rs

@@ -310,7 +310,7 @@ fn process_global_items(
     profile_name: &String,
 ) -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
     let mut result_map = HashMap::new();
-    let mut exists_keys = use_keys(&config);
+    let mut exists_keys = use_keys(&config).collect::<Vec<_>>();
 
     if let ChainType::Merge(merge) = global_merge.data {
         exists_keys.extend(use_keys(&merge));

src-tauri/src/lib.rs

@@ -19,7 +19,6 @@ use crate::{
 use anyhow::Result;
 use clash_verge_logging::{Type, logging};
 use once_cell::sync::OnceCell;
-use std::time::Duration;
 use tauri::{AppHandle, Manager as _};
 #[cfg(target_os = "macos")]
 use tauri_plugin_autostart::MacosLauncher;
@@ -61,11 +60,11 @@ mod app_init {
                     .socket_path(crate::config::IClashTemp::guard_external_controller_ipc())
                     .pool_config(
                         tauri_plugin_mihomo::IpcPoolConfigBuilder::new()
-                            .min_connections(1)
+                            .min_connections(3)
                             .max_connections(32)
                             .idle_timeout(std::time::Duration::from_secs(60))
                             .health_check_interval(std::time::Duration::from_secs(60))
-                            .reject_policy(RejectPolicy::Timeout(Duration::from_secs(3)))
+                            .reject_policy(RejectPolicy::Wait)
                             .build(),
                     )
                     .build(),

src/pages/_layout.tsx

@@ -23,8 +23,8 @@ import {
 } from "@mui/material";
 import dayjs from "dayjs";
 import relativeTime from "dayjs/plugin/relativeTime";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { CSSProperties } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Outlet, useNavigate } from "react-router";
 import { SWRConfig } from "swr";
@@ -257,12 +257,24 @@ const Layout = () => {
     <SWRConfig
       value={{
         errorRetryCount: 3,
+        // TODO remove the 5000ms
         errorRetryInterval: 5000,
         onError: (error, key) => {
-          console.error(`[SWR Error] Key: ${key}, Error:`, error);
+          // FIXME the condition should not be handle gllobally
           if (key !== "getAutotemProxy") {
             console.error(`SWR Error for ${key}:`, error);
+            return;
           }
+
+          // FIXME we need a better way to handle the retry when first booting app
+          const silentKeys = [
+            "getVersion",
+            "getClashConfig",
+            "getAutotemProxy",
+          ];
+          if (silentKeys.includes(key)) return;
+
+          console.error(`[SWR Error] Key: ${key}, Error:`, error);
         },
         dedupingInterval: 2000,
       }}

src/providers/app-data-provider.tsx

@@ -32,7 +32,11 @@ export const AppDataProvider = ({
     calcuProxies,
     {
       ...SWR_REALTIME,
-      onError: (err) => console.warn("[DataProvider] Proxy fetch failed:", err),
+      onError: (_) => {
+        // FIXME when we intially start the app, and core is starting,
+        // there will be error thrown by getProxies API.
+        // We should handle this case properly later.
+      },
     },
   );