From d22b37c7bf910336acff13edc46bc34413656b3e Mon Sep 17 00:00:00 2001
From: huzibaca <masterorigin91@gmail.com>
Date: Fri, 6 Dec 2024 12:35:09 +0800
Subject: [PATCH] fix: extension script dns is overwritten  fixer #2235

---
 src-tauri/src/enhance/mod.rs | 8 +-------
 src-tauri/src/enhance/tun.rs | 8 ++++----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src-tauri/src/enhance/mod.rs b/src-tauri/src/enhance/mod.rs
index 45033faf..11355e87 100644
--- a/src-tauri/src/enhance/mod.rs
+++ b/src-tauri/src/enhance/mod.rs
@@ -60,7 +60,6 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
         global_merge,
         global_script,
         profile_name,
-        dns,
     ) = {
         let profiles = Config::profiles();
         let profiles = profiles.latest();
@@ -131,10 +130,6 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
             .and_then(|item| item.name.clone())
             .unwrap_or_default();
 
-        let dns = current.get("dns").map_or(Mapping::new(), |val| {
-            val.as_mapping().cloned().unwrap_or(Mapping::new())
-        });
-
         (
             current,
             merge,
@@ -145,7 +140,6 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
             global_merge,
             global_script,
             name,
-            dns,
         )
     };
 
@@ -265,7 +259,7 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
             });
     }
 
-    config = use_tun(config, enable_tun, dns).await;
+    config = use_tun(config, enable_tun).await;
     config = use_sort(config);
 
     let mut exists_set = HashSet::new();
diff --git a/src-tauri/src/enhance/tun.rs b/src-tauri/src/enhance/tun.rs
index 3d8fa518..4ae7b787 100644
--- a/src-tauri/src/enhance/tun.rs
+++ b/src-tauri/src/enhance/tun.rs
@@ -18,7 +18,7 @@ macro_rules! append {
     };
 }
 
-pub async fn use_tun(mut config: Mapping, enable: bool, origin_dns_val: Mapping) -> Mapping {
+pub async fn use_tun(mut config: Mapping, enable: bool) -> Mapping {
     let tun_key = Value::from("tun");
     let tun_val = config.get(&tun_key);
     let mut tun_val = tun_val.map_or(Mapping::new(), |val| {
@@ -49,7 +49,7 @@ pub async fn use_tun(mut config: Mapping, enable: bool, origin_dns_val: Mapping)
         revise!(
             dns_val,
             "enable",
-            origin_dns_val
+            dns_val
                 .get("enable")
                 .and_then(|v| v.as_bool())
                 .unwrap_or(true)
@@ -60,7 +60,7 @@ pub async fn use_tun(mut config: Mapping, enable: bool, origin_dns_val: Mapping)
         revise!(
             dns_val,
             "enhanced-mode",
-            origin_dns_val
+            dns_val
                 .get("enhanced-mode")
                 .and_then(|v| v.as_str())
                 .unwrap_or("redir-host")
@@ -69,7 +69,7 @@ pub async fn use_tun(mut config: Mapping, enable: bool, origin_dns_val: Mapping)
         revise!(
             dns_val,
             "fake-ip-range",
-            origin_dns_val
+            dns_val
                 .get("fake-ip-range")
                 .and_then(|v| v.as_str())
                 .unwrap_or("198.18.0.1/16")