feat: add hosts settings to DNS settings and enhance DNS config validation

src-tauri/src/cmd/clash.rs

@@ -233,3 +233,26 @@ pub async fn get_dns_config_content() -> CmdResult<String> {
     let content = fs::read_to_string(&dns_path).map_err(|e| e.to_string())?;
     Ok(content)
 }
+
+/// 验证DNS配置文件
+#[tauri::command]
+pub async fn validate_dns_config() -> CmdResult<(bool, String)> {
+    use crate::core::CoreManager;
+    use crate::utils::dirs;
+
+    let app_dir = dirs::app_home_dir().map_err(|e| e.to_string())?;
+    let dns_path = app_dir.join("dns_config.yaml");
+    let dns_path_str = dns_path.to_str().unwrap_or_default();
+
+    if !dns_path.exists() {
+        return Ok((false, "DNS config file not found".to_string()));
+    }
+
+    match CoreManager::global()
+        .validate_config_file(dns_path_str, None)
+        .await
+    {
+        Ok(result) => Ok(result),
+        Err(e) => Err(e.to_string()),
+    }
+}

src-tauri/src/enhance/mod.rs

@@ -261,16 +261,29 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
         use crate::utils::dirs;
         use std::fs;
 
-        // 尝试读取dns_config.yaml
         if let Ok(app_dir) = dirs::app_home_dir() {
             let dns_path = app_dir.join("dns_config.yaml");
 
             if dns_path.exists() {
                 if let Ok(dns_yaml) = fs::read_to_string(&dns_path) {
                     if let Ok(dns_config) = serde_yaml::from_str::<serde_yaml::Mapping>(&dns_yaml) {
-                        // 将DNS配置合并到最终配置中
-                        config.insert("dns".into(), dns_config.into());
-                        log::info!(target: "app", "apply dns_config.yaml");
+                        // 处理hosts配置
+                        if let Some(hosts_value) = dns_config.get("hosts") {
+                            if hosts_value.is_mapping() {
+                                config.insert("hosts".into(), hosts_value.clone());
+                                log::info!(target: "app", "apply hosts configuration");
+                            }
+                        }
+
+                        if let Some(dns_value) = dns_config.get("dns") {
+                            if let Some(dns_mapping) = dns_value.as_mapping() {
+                                config.insert("dns".into(), dns_mapping.clone().into());
+                                log::info!(target: "app", "apply dns_config.yaml (dns section)");
+                            }
+                        } else {
+                            config.insert("dns".into(), dns_config.into());
+                            log::info!(target: "app", "apply dns_config.yaml");
+                        }
                     }
                 }
             }

src-tauri/src/lib.rs

@@ -252,6 +252,7 @@ pub fn run() {
             cmd::apply_dns_config,
             cmd::check_dns_config_exists,
             cmd::get_dns_config_content,
+            cmd::validate_dns_config,
             // verge
             cmd::get_verge_config,
             cmd::patch_verge_config,

src-tauri/src/utils/init.rs

@@ -142,8 +142,8 @@ pub fn delete_log() -> Result<()> {
 fn init_dns_config() -> Result<()> {
     use serde_yaml::Value;
 
-    // 获取默认DNS配置
-    let default_dns_config = serde_yaml::Mapping::from_iter([
+    // 创建DNS子配置
+    let dns_config = serde_yaml::Mapping::from_iter([
         ("enable".into(), Value::Bool(true)),
         ("listen".into(), Value::String(":53".into())),
         ("enhanced-mode".into(), Value::String("fake-ip".into())),
@@ -231,6 +231,12 @@ fn init_dns_config() -> Result<()> {
         ),
     ]);
 
+    // 获取默认DNS和host配置
+    let default_dns_config = serde_yaml::Mapping::from_iter([
+        ("dns".into(), Value::Mapping(dns_config)),
+        ("hosts".into(), Value::Mapping(serde_yaml::Mapping::new())),
+    ]);
+
     // 检查DNS配置文件是否存在
     let app_dir = dirs::app_home_dir()?;
     let dns_path = app_dir.join("dns_config.yaml");

src-tauri/src/utils/tmpl.rs

@@ -15,9 +15,6 @@ pub const ITEM_MERGE: &str = "# Profile Enhancement Merge Template for Clash Ver
 
 profile:
   store-selected: true
-
-dns:
-  use-system-hosts: false
 ";
 
 pub const ITEM_MERGE_EMPTY: &str = "# Profile Enhancement Merge Template for Clash Verge