From d8bdc1ceb35a5464a89071a041a64ce2b60f57e4 Mon Sep 17 00:00:00 2001
From: cg3s <service@cgsss.net>
Date: Fri, 24 Apr 2020 20:13:44 +0800
Subject: [PATCH 001/115] change url

---
 v2rayN/v2rayN/Forms/MainForm.cs | 2 +-
 v2rayN/v2rayN/Global.cs         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs
index bf61cc5b..ef7a0678 100644
--- a/v2rayN/v2rayN/Forms/MainForm.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.cs
@@ -1451,7 +1451,7 @@ namespace v2rayN.Forms
 
         private void tsbPromotion_Click(object sender, EventArgs e)
         {
-            Process.Start($"{Utils.Base64Decode(Global.PromotionUrl)}?t={DateTime.Now.Ticks}");
+            Process.Start($"{Utils.Base64Decode(Global.PromotionUrl)}");
         }
         #endregion
 
diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs
index 58ed9d5a..37780783 100644
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -7,7 +7,7 @@ namespace v2rayN
 
 
         public const string v2rayWebsiteUrl = @"https://www.v2ray.com/";
-        public const string AboutUrl = @"https://github.com/2dust/v2rayN";
+        public const string AboutUrl = @"https://github.com/cg3s/v2rayN";
         public const string UpdateUrl = AboutUrl + @"/releases";
 
 
@@ -28,7 +28,7 @@ namespace v2rayN
         /// <summary>
         /// PromotionUrl
         /// </summary>
-        public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
+        public const string PromotionUrl = @"aHR0cHM6Ly9naXRodWIuY29tL2NnM3MvdjJyYXlO";
 
         /// <summary>
         /// 本软件配置文件名

From a761c3380519eb3dc35b9bcc42065d4c960d6d18 Mon Sep 17 00:00:00 2001
From: cg3s <service@cgsss.net>
Date: Fri, 24 Apr 2020 20:32:09 +0800
Subject: [PATCH 002/115] change url

---
 v2rayN/v2rayN/Global.cs                  | 2 +-
 v2rayN/v2rayN/Handler/DownloadHandle.cs  | 4 ++--
 v2rayN/v2rayN/Properties/AssemblyInfo.cs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs
index 37780783..0c494cd4 100644
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -21,7 +21,7 @@ namespace v2rayN
         /// <summary>
         /// CustomRoutingListUrl
         /// </summary>
-        public const string CustomRoutingListUrl = @"https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/";
+        public const string CustomRoutingListUrl = @"https://raw.githubusercontent.com/cg3s/v2rayCustomRoutingList/master/";
 
         public const string GFWLIST_URL = "https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt";
 
diff --git a/v2rayN/v2rayN/Handler/DownloadHandle.cs b/v2rayN/v2rayN/Handler/DownloadHandle.cs
index bd3f4e62..88025613 100644
--- a/v2rayN/v2rayN/Handler/DownloadHandle.cs
+++ b/v2rayN/v2rayN/Handler/DownloadHandle.cs
@@ -52,8 +52,8 @@ namespace v2rayN.Handler
 
         #region Check for updates
 
-        private readonly string nLatestUrl = "https://github.com/2dust/v2rayN/releases/latest";
-        private const string nUrl = "https://github.com/2dust/v2rayN/releases/download/{0}/v2rayN.zip";
+        private readonly string nLatestUrl = "https://github.com/cg3s/v2rayN/releases/latest";
+        private const string nUrl = "https://github.com/cg3s/v2rayN/releases/download/{0}/v2rayN.zip";
         private readonly string coreLatestUrl = "https://github.com/v2ray/v2ray-core/releases/latest";
         private const string coreUrl = "https://github.com/v2ray/v2ray-core/releases/download/{0}/v2ray-windows-{1}.zip";
 
diff --git a/v2rayN/v2rayN/Properties/AssemblyInfo.cs b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
index 505b9e16..0a693b55 100644
--- a/v2rayN/v2rayN/Properties/AssemblyInfo.cs
+++ b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”:
 //[assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("3.17")]
+[assembly: AssemblyFileVersion("3.18")]

From e487e8ff0dc43162900c03c427745ca8e8899d6e Mon Sep 17 00:00:00 2001
From: cg3s <servie@cgsss.net>
Date: Sun, 20 Dec 2020 13:30:22 +0800
Subject: [PATCH 003/115] change to v2fly

---
 v2rayN/v2rayN/Handler/DownloadHandle.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2rayN/v2rayN/Handler/DownloadHandle.cs b/v2rayN/v2rayN/Handler/DownloadHandle.cs
index 25806fac..1a186641 100644
--- a/v2rayN/v2rayN/Handler/DownloadHandle.cs
+++ b/v2rayN/v2rayN/Handler/DownloadHandle.cs
@@ -54,8 +54,8 @@ namespace v2rayN.Handler
 
         private readonly string nLatestUrl = "https://github.com/cg3s/v2rayN/releases/latest";
         private const string nUrl = "https://github.com/cg3s/v2rayN/releases/download/{0}/v2rayN.zip";
-        private readonly string coreLatestUrl = "https://github.com/v2ray/v2ray-core/releases/latest";
-        private const string coreUrl = "https://github.com/v2ray/v2ray-core/releases/download/{0}/v2ray-windows-{1}.zip";
+        private readonly string coreLatestUrl = "https://github.com/v2fly/v2ray-core/releases/latest";
+        private const string coreUrl = "https://github.com/v2fly/v2ray-core/releases/download/{0}/v2ray-windows-{1}.zip";
 
         public async void CheckUpdateAsync(string type)
         {

From 82f9698c0d5931e7e7684e3d7fa78fc3f8122dfa Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Tue, 29 Jul 2025 19:16:50 +0800
Subject: [PATCH 004/115] Supports IPv6 addresses in profile summary (#7656)

---
 v2rayN/ServiceLib/Models/ProfileItem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/ServiceLib/Models/ProfileItem.cs b/v2rayN/ServiceLib/Models/ProfileItem.cs
index bc4358b5..077bc4b2 100644
--- a/v2rayN/ServiceLib/Models/ProfileItem.cs
+++ b/v2rayN/ServiceLib/Models/ProfileItem.cs
@@ -32,7 +32,7 @@ public class ProfileItem : ReactiveObject
     public string GetSummary()
     {
         var summary = $"[{(ConfigType).ToString()}] ";
-        var arrAddr = Address.Split('.');
+        var arrAddr = Address.Contains(':') ? Address.Split(':') : Address.Split('.');
         var addr = arrAddr.Length switch
         {
             > 2 => $"{arrAddr.First()}***{arrAddr.Last()}",

From 74bb01d0446d007fb4df2f3c8b2461eaa2b52bf8 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Tue, 29 Jul 2025 19:18:13 +0800
Subject: [PATCH 005/115] Improves private IP address detection (#7657)

---
 v2rayN/ServiceLib/Common/Utils.cs | 43 ++++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/v2rayN/ServiceLib/Common/Utils.cs b/v2rayN/ServiceLib/Common/Utils.cs
index c5b670cf..63540ee2 100644
--- a/v2rayN/ServiceLib/Common/Utils.cs
+++ b/v2rayN/ServiceLib/Common/Utils.cs
@@ -390,13 +390,44 @@ public class Utils
     {
         if (IPAddress.TryParse(ip, out var address))
         {
+            // Loopback address check (127.0.0.1 for IPv4, ::1 for IPv6)
+            if (IPAddress.IsLoopback(address))
+                return true;
+
             var ipBytes = address.GetAddressBytes();
-            if (ipBytes[0] == 10)
-                return true;
-            if (ipBytes[0] == 172 && ipBytes[1] >= 16 && ipBytes[1] <= 31)
-                return true;
-            if (ipBytes[0] == 192 && ipBytes[1] == 168)
-                return true;
+            if (address.AddressFamily == AddressFamily.InterNetwork)
+            {
+                // IPv4 private address check
+                if (ipBytes[0] == 10)
+                    return true;
+                if (ipBytes[0] == 172 && ipBytes[1] >= 16 && ipBytes[1] <= 31)
+                    return true;
+                if (ipBytes[0] == 192 && ipBytes[1] == 168)
+                    return true;
+            }
+            else if (address.AddressFamily == AddressFamily.InterNetworkV6)
+            {
+                // IPv6 private address check
+                // Link-local address fe80::/10
+                if (ipBytes[0] == 0xfe && (ipBytes[1] & 0xc0) == 0x80)
+                    return true;
+                
+                // Unique local address fc00::/7 (typically fd00::/8)
+                if ((ipBytes[0] & 0xfe) == 0xfc)
+                    return true;
+                
+                // Private portion in IPv4-mapped addresses ::ffff:0:0/96
+                if (address.IsIPv4MappedToIPv6)
+                {
+                    var ipv4Bytes = ipBytes.Skip(12).ToArray();
+                    if (ipv4Bytes[0] == 10)
+                        return true;
+                    if (ipv4Bytes[0] == 172 && ipv4Bytes[1] >= 16 && ipv4Bytes[1] <= 31)
+                        return true;
+                    if (ipv4Bytes[0] == 192 && ipv4Bytes[1] == 168)
+                        return true;
+                }
+            }
         }
 
         return false;

From ce7c41e3fff5750ca57a5dc9e13b2b908677ecff Mon Sep 17 00:00:00 2001
From: maximilionus <maximilionuss@gmail.com>
Date: Tue, 29 Jul 2025 14:28:09 +0300
Subject: [PATCH 006/115] Unix platform elevation enhancements v2 (#7658)

* Remove multiple send password actions on Unix elev

* Remove CoreAdminHandler password verification

This is useless since already handled in
v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs with
CheckSudoPasswordAsync().

* Disable caching and prompt for sudo call

* Cleanup CoreAdminHandler pwd verify remains

* Migrate sudo opts to initial pwd verification
---
 v2rayN/ServiceLib/Handler/CoreAdminHandler.cs        | 12 +-----------
 .../Views/SudoPasswordInputView.axaml.cs             |  4 ++--
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs b/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs
index 3e7d3f93..661d9052 100644
--- a/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs
+++ b/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs
@@ -9,7 +9,6 @@ public class CoreAdminHandler
     private static readonly Lazy<CoreAdminHandler> _instance = new(() => new());
     public static CoreAdminHandler Instance => _instance.Value;
     private Config _config;
-    private readonly string _sudoAccessText = "SUDO_ACCESS_VERIFIED";
     private Action<bool, string>? _updateFunc;
     private int _linuxSudoPid = -1;
 
@@ -50,17 +49,10 @@ public class CoreAdminHandler
             }
         };
 
-        var sudoVerified = false;
         DataReceivedEventHandler dataHandler = (sender, e) =>
         {
             if (e.Data.IsNotEmpty())
             {
-                if (!sudoVerified && e.Data.Contains(_sudoAccessText))
-                {
-                    sudoVerified = true;
-                    UpdateFunc(false, ResUI.SudoPwdVerfiedSuccessTip + Environment.NewLine);
-                    return;
-                }
                 UpdateFunc(false, e.Data + Environment.NewLine);
             }
         };
@@ -72,8 +64,6 @@ public class CoreAdminHandler
         proc.BeginOutputReadLine();
         proc.BeginErrorReadLine();
 
-        await Task.Delay(10);
-        await proc.StandardInput.WriteLineAsync(AppHandler.Instance.LinuxSudoPwd);
         await Task.Delay(10);
         await proc.StandardInput.WriteLineAsync(AppHandler.Instance.LinuxSudoPwd);
 
@@ -118,7 +108,7 @@ public class CoreAdminHandler
         }
         else
         {
-            sb.AppendLine($"sudo -S echo \"{_sudoAccessText}\" && sudo -S {cmdLine}");
+            sb.AppendLine($"sudo -S -k -p '' {cmdLine}");
         }
 
         await File.WriteAllTextAsync(shFilePath, sb.ToString());
diff --git a/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
index ad1a0211..b5dcb5c9 100644
--- a/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
@@ -64,8 +64,8 @@ public partial class SudoPasswordInputView : UserControl
     {
         try
         {
-            // Use sudo -S echo command to verify password
-            var arg = new List<string>() { "-c", "sudo -S echo SUDO_CHECK" };
+            // Use sudo echo command to verify password
+            var arg = new List<string>() { "-c", "sudo -S -k -p '' echo SUDO_CHECK" };
             var result = await CliWrap.Cli
                 .Wrap(Global.LinuxBash)
                 .WithArguments(arg)

From f779e311edebf58db1f0f239310be7539fad8a62 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 29 Jul 2025 19:42:59 +0800
Subject: [PATCH 007/115] Optimize code and remove unused resources

---
 v2rayN/ServiceLib/Handler/CoreAdminHandler.cs | 6 ++++--
 v2rayN/ServiceLib/Handler/CoreHandler.cs      | 4 ++--
 v2rayN/ServiceLib/Resx/ResUI.Designer.cs      | 9 ---------
 v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx       | 3 ---
 v2rayN/ServiceLib/Resx/ResUI.hu.resx          | 3 ---
 v2rayN/ServiceLib/Resx/ResUI.resx             | 3 ---
 v2rayN/ServiceLib/Resx/ResUI.ru.resx          | 3 ---
 v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx     | 3 ---
 v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx     | 3 ---
 9 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs b/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs
index 661d9052..a573c1b0 100644
--- a/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs
+++ b/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs
@@ -20,6 +20,8 @@ public class CoreAdminHandler
         }
         _config = config;
         _updateFunc = updateFunc;
+
+        await Task.CompletedTask;
     }
 
     private void UpdateFunc(bool notify, string msg)
@@ -49,13 +51,13 @@ public class CoreAdminHandler
             }
         };
 
-        DataReceivedEventHandler dataHandler = (sender, e) =>
+        void dataHandler(object sender, DataReceivedEventArgs e)
         {
             if (e.Data.IsNotEmpty())
             {
                 UpdateFunc(false, e.Data + Environment.NewLine);
             }
-        };
+        }
 
         proc.OutputDataReceived += dataHandler;
         proc.ErrorDataReceived += dataHandler;
diff --git a/v2rayN/ServiceLib/Handler/CoreHandler.cs b/v2rayN/ServiceLib/Handler/CoreHandler.cs
index d1cf43f0..f0c23c69 100644
--- a/v2rayN/ServiceLib/Handler/CoreHandler.cs
+++ b/v2rayN/ServiceLib/Handler/CoreHandler.cs
@@ -280,13 +280,13 @@ public class CoreHandler
 
         if (displayLog)
         {
-            DataReceivedEventHandler dataHandler = (sender, e) =>
+            void dataHandler(object sender, DataReceivedEventArgs e)
             {
                 if (e.Data.IsNotEmpty())
                 {
                     UpdateFunc(false, e.Data + Environment.NewLine);
                 }
-            };
+            }
             proc.OutputDataReceived += dataHandler;
             proc.ErrorDataReceived += dataHandler;
         }
diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index 4732cdd4..23469763 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -2211,15 +2211,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Sudo password has been verified successfully, please ignore the incorrect password prompts! 的本地化字符串。
-        /// </summary>
-        public static string SudoPwdVerfiedSuccessTip {
-            get {
-                return ResourceManager.GetString("SudoPwdVerfiedSuccessTip", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Address 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
index f8f8d6fa..1f05cf8f 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1395,9 +1395,6 @@
   <data name="TbRuleOutboundTagTip" xml:space="preserve">
     <value>Can fill in the configuration remarks, please make sure it exist and are unique</value>
   </data>
-  <data name="SudoPwdVerfiedSuccessTip" xml:space="preserve">
-    <value>Sudo password has been verified successfully, please ignore the incorrect password prompts!</value>
-  </data>
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>Incorrect password, please try again.</value>
   </data>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
index 85ea3335..862758f6 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1395,9 +1395,6 @@
   <data name="TbRuleOutboundTagTip" xml:space="preserve">
     <value>Can fill in the configuration remarks, please make sure it exist and are unique</value>
   </data>
-  <data name="SudoPwdVerfiedSuccessTip" xml:space="preserve">
-    <value>Sudo password has been verified successfully, please ignore the incorrect password prompts!</value>
-  </data>
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>Incorrect password, please try again.</value>
   </data>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index 8092e2e9..2826c9cc 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1395,9 +1395,6 @@
   <data name="TbRuleOutboundTagTip" xml:space="preserve">
     <value>Can fill in the configuration remarks, please make sure it exist and are unique</value>
   </data>
-  <data name="SudoPwdVerfiedSuccessTip" xml:space="preserve">
-    <value>Sudo password has been verified successfully, please ignore the incorrect password prompts!</value>
-  </data>
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>Incorrect password, please try again.</value>
   </data>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
index 434b2c8f..a4d82127 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1395,9 +1395,6 @@
   <data name="TbRuleOutboundTagTip" xml:space="preserve">
     <value>Can fill in the configuration remarks, please make sure it exist and are unique</value>
   </data>
-  <data name="SudoPwdVerfiedSuccessTip" xml:space="preserve">
-    <value>Sudo password has been verified successfully, please ignore the incorrect password prompts!</value>
-  </data>
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>Incorrect password, please try again.</value>
   </data>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index fed61bf6..55186822 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1392,9 +1392,6 @@
   <data name="TbRuleOutboundTagTip" xml:space="preserve">
     <value>可以填写配置文件别名，请确保存在并唯一</value>
   </data>
-  <data name="SudoPwdVerfiedSuccessTip" xml:space="preserve">
-    <value>sudo 密码已经验证成功，请忽略错误密码提示！</value>
-  </data>
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>密码错误，请重试。</value>
   </data>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index f6676488..cbf27b8c 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1392,9 +1392,6 @@
   <data name="TbRuleOutboundTagTip" xml:space="preserve">
     <value>可以填寫設定檔別名，請確保存在並唯一</value>
   </data>
-  <data name="SudoPwdVerfiedSuccessTip" xml:space="preserve">
-    <value>sudo 密碼已經驗證成功，請忽略錯誤密碼提示！</value>
-  </data>
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>密碼錯誤，請重試。</value>
   </data>

From dad35f57d05348c3d0591aa4bd6ba5d6c3794d7c Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 29 Jul 2025 20:23:42 +0800
Subject: [PATCH 008/115] Fixed an issue where root processes could not be
 exited on macOS

---
 v2rayN/ServiceLib/Handler/CoreAdminHandler.cs              | 2 +-
 v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs b/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs
index a573c1b0..0adc6c41 100644
--- a/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs
+++ b/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs
@@ -110,7 +110,7 @@ public class CoreAdminHandler
         }
         else
         {
-            sb.AppendLine($"sudo -S -k -p '' {cmdLine}");
+            sb.AppendLine($"sudo -S {cmdLine}");
         }
 
         await File.WriteAllTextAsync(shFilePath, sb.ToString());
diff --git a/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
index b5dcb5c9..e0b27607 100644
--- a/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
@@ -65,7 +65,7 @@ public partial class SudoPasswordInputView : UserControl
         try
         {
             // Use sudo echo command to verify password
-            var arg = new List<string>() { "-c", "sudo -S -k -p '' echo SUDO_CHECK" };
+            var arg = new List<string>() { "-c", "sudo -S echo SUDO_CHECK" };
             var result = await CliWrap.Cli
                 .Wrap(Global.LinuxBash)
                 .WithArguments(arg)

From 6715d7dce6933f0bfc3b28778e0d17bb0ccd7296 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 29 Jul 2025 20:44:43 +0800
Subject: [PATCH 009/115] up 7.13.4

---
 v2rayN/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/Directory.Build.props b/v2rayN/Directory.Build.props
index d7fd93ac..faf528a8 100644
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.13.3</Version>
+        <Version>7.13.4</Version>
     </PropertyGroup>
 
     <PropertyGroup>

From 3d23f3e3a27ec5a94bfc8faa6b7f0c109afe2a41 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 30 Jul 2025 19:52:45 +0800
Subject: [PATCH 010/115] Optimized and improved the code

Optimized and improved the code for killing core processes in non-Windows environments. Now uses a shell script for precise processing.
---
 v2rayN/ServiceLib/Common/FileManager.cs       | 24 ++++++++
 v2rayN/ServiceLib/Global.cs                   |  2 +
 v2rayN/ServiceLib/Handler/CoreAdminHandler.cs | 50 +++++++--------
 .../Handler/SysProxy/ProxySettingLinux.cs     |  9 +--
 .../Handler/SysProxy/ProxySettingOSX.cs       |  9 +--
 .../ServiceLib/Sample/kill_as_sudo_linux_sh   | 61 +++++++++++++++++++
 v2rayN/ServiceLib/Sample/kill_as_sudo_osx_sh  | 56 +++++++++++++++++
 v2rayN/ServiceLib/ServiceLib.csproj           |  2 +
 .../Views/SudoPasswordInputView.axaml.cs      |  3 +-
 9 files changed, 170 insertions(+), 46 deletions(-)
 create mode 100644 v2rayN/ServiceLib/Sample/kill_as_sudo_linux_sh
 create mode 100644 v2rayN/ServiceLib/Sample/kill_as_sudo_osx_sh

diff --git a/v2rayN/ServiceLib/Common/FileManager.cs b/v2rayN/ServiceLib/Common/FileManager.cs
index d988c702..6d4d28ca 100644
--- a/v2rayN/ServiceLib/Common/FileManager.cs
+++ b/v2rayN/ServiceLib/Common/FileManager.cs
@@ -223,4 +223,28 @@ public static class FileManager
             // ignored
         }
     }
+
+    /// <summary>
+    /// Creates a Linux shell file with the specified contents.
+    /// </summary>
+    /// <param name="fileName"></param>
+    /// <param name="contents"></param>
+    /// <param name="overwrite"></param>
+    /// <returns></returns>
+    public static async Task<string> CreateLinuxShellFile(string fileName, string contents, bool overwrite)
+    {
+        var shFilePath = Utils.GetBinConfigPath(fileName);
+
+        // Check if the file already exists and if we should overwrite it
+        if (!overwrite && File.Exists(shFilePath))
+        {
+            return shFilePath;
+        }
+
+        File.Delete(shFilePath);
+        await File.WriteAllTextAsync(shFilePath, contents);
+        await Utils.SetLinuxChmod(shFilePath);
+
+        return shFilePath;
+    }
 }
diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs
index 5592fa2e..0728b2ea 100644
--- a/v2rayN/ServiceLib/Global.cs
+++ b/v2rayN/ServiceLib/Global.cs
@@ -38,6 +38,8 @@ public class Global
     public const string PacFileName = NamespaceSample + "pac";
     public const string ProxySetOSXShellFileName = NamespaceSample + "proxy_set_osx_sh";
     public const string ProxySetLinuxShellFileName = NamespaceSample + "proxy_set_linux_sh";
+    public const string KillAsSudoOSXShellFileName = NamespaceSample + "kill_as_sudo_osx_sh";
+    public const string KillAsSudoLinuxShellFileName = NamespaceSample + "kill_as_sudo_linux_sh";
 
     public const string DefaultSecurity = "auto";
     public const string DefaultNetwork = "tcp";
diff --git a/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs b/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs
index 0adc6c41..ec448b7a 100644
--- a/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs
+++ b/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics;
 using System.Text;
 using CliWrap;
+using CliWrap.Buffered;
 
 namespace ServiceLib.Handler;
 
@@ -11,6 +12,7 @@ public class CoreAdminHandler
     private Config _config;
     private Action<bool, string>? _updateFunc;
     private int _linuxSudoPid = -1;
+    private const string _tag = "CoreAdminHandler";
 
     public async Task Init(Config config, Action<bool, string> updateFunc)
     {
@@ -31,8 +33,11 @@ public class CoreAdminHandler
 
     public async Task<Process?> RunProcessAsLinuxSudo(string fileName, CoreInfo coreInfo, string configPath)
     {
+        StringBuilder sb = new();
+        sb.AppendLine("#!/bin/bash");
         var cmdLine = $"{fileName.AppendQuotes()} {string.Format(coreInfo.Arguments, Utils.GetBinConfigPath(configPath).AppendQuotes())}";
-        var shFilePath = await CreateLinuxShellFile(cmdLine, "run_as_sudo.sh");
+        sb.AppendLine($"sudo -S {cmdLine}");
+        var shFilePath = await FileManager.CreateLinuxShellFile("run_as_sudo.sh", sb.ToString(), true);
 
         Process proc = new()
         {
@@ -87,35 +92,24 @@ public class CoreAdminHandler
             return;
         }
 
-        var cmdLine = $"pkill -P {_linuxSudoPid} ; kill {_linuxSudoPid}";
-        var shFilePath = await CreateLinuxShellFile(cmdLine, "kill_as_sudo.sh");
+        try
+        {
+            var shellFileName = Utils.IsOSX() ? Global.KillAsSudoOSXShellFileName : Global.KillAsSudoLinuxShellFileName;
+            var shFilePath = await FileManager.CreateLinuxShellFile("kill_as_sudo.sh", EmbedUtils.GetEmbedText(shellFileName), true);
 
-        await Cli.Wrap(shFilePath)
-           .WithStandardInputPipe(PipeSource.FromString(AppHandler.Instance.LinuxSudoPwd))
-           .ExecuteAsync();
+            var arg = new List<string>() { "-c", $"sudo -S {shFilePath} {_linuxSudoPid}" };
+            var result = await Cli.Wrap(Global.LinuxBash)
+                .WithArguments(arg)
+                .WithStandardInputPipe(PipeSource.FromString(AppHandler.Instance.LinuxSudoPwd))
+                .ExecuteBufferedAsync();
+
+            UpdateFunc(false, result.StandardOutput.ToString());
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
 
         _linuxSudoPid = -1;
     }
-
-    private async Task<string> CreateLinuxShellFile(string cmdLine, string fileName)
-    {
-        var shFilePath = Utils.GetBinConfigPath(fileName);
-        File.Delete(shFilePath);
-
-        var sb = new StringBuilder();
-        sb.AppendLine("#!/bin/sh");
-        if (Utils.IsAdministrator())
-        {
-            sb.AppendLine($"{cmdLine}");
-        }
-        else
-        {
-            sb.AppendLine($"sudo -S {cmdLine}");
-        }
-
-        await File.WriteAllTextAsync(shFilePath, sb.ToString());
-        await Utils.SetLinuxChmod(shFilePath);
-
-        return shFilePath;
-    }
 }
diff --git a/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs b/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs
index 9c5a53a8..9c2be056 100644
--- a/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs
+++ b/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs
@@ -18,14 +18,7 @@ public class ProxySettingLinux
 
     private static async Task ExecCmd(List<string> args)
     {
-        var fileName = Utils.GetBinConfigPath(_proxySetFileName);
-        if (!File.Exists(fileName))
-        {
-            var contents = EmbedUtils.GetEmbedText(Global.ProxySetLinuxShellFileName);
-            await File.AppendAllTextAsync(fileName, contents);
-
-            await Utils.SetLinuxChmod(fileName);
-        }
+        var fileName = await FileManager.CreateLinuxShellFile(_proxySetFileName, EmbedUtils.GetEmbedText(Global.ProxySetLinuxShellFileName), false);
 
         await Utils.GetCliWrapOutput(fileName, args);
     }
diff --git a/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs b/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs
index c18cd728..9d15839b 100644
--- a/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs
+++ b/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs
@@ -23,14 +23,7 @@ public class ProxySettingOSX
 
     private static async Task ExecCmd(List<string> args)
     {
-        var fileName = Utils.GetBinConfigPath(_proxySetFileName);
-        if (!File.Exists(fileName))
-        {
-            var contents = EmbedUtils.GetEmbedText(Global.ProxySetOSXShellFileName);
-            await File.AppendAllTextAsync(fileName, contents);
-
-            await Utils.SetLinuxChmod(fileName);
-        }
+        var fileName = await FileManager.CreateLinuxShellFile(_proxySetFileName, EmbedUtils.GetEmbedText(Global.ProxySetOSXShellFileName), false);
 
         await Utils.GetCliWrapOutput(fileName, args);
     }
diff --git a/v2rayN/ServiceLib/Sample/kill_as_sudo_linux_sh b/v2rayN/ServiceLib/Sample/kill_as_sudo_linux_sh
new file mode 100644
index 00000000..7f62a532
--- /dev/null
+++ b/v2rayN/ServiceLib/Sample/kill_as_sudo_linux_sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+#
+# Process Terminator Script for Linux
+# This script forcibly terminates a process and all its child processes
+#
+
+# Check if PID argument is provided
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 <PID>"
+    exit 1
+fi
+
+PID=$1
+
+# Validate that input is a valid PID (numeric)
+if ! [[ "$PID" =~ ^[0-9]+$ ]]; then
+    echo "Error: The PID must be a numeric value"
+    exit 1
+fi
+
+# Check if the process exists
+if ! ps -p $PID > /dev/null; then
+    echo "Warning: No process found with PID $PID"
+    exit 0
+fi
+
+# Recursive function to find and kill all child processes
+kill_children() {
+    local parent=$1
+    local children=$(ps -o pid --no-headers --ppid "$parent")
+    
+    # Output information about processes being terminated
+    echo "Processing children of PID: $parent..."
+    
+    # Process each child
+    for child in $children; do
+        # Recursively find and kill child's children first
+        kill_children "$child"
+        
+        # Force kill the child process
+        echo "Terminating child process: $child"
+        kill -9 "$child" 2>/dev/null || true
+    done
+}
+
+echo "============================================"
+echo "Starting termination of process $PID and all its children"
+echo "============================================"
+
+# Find and kill all child processes
+kill_children "$PID"
+
+# Finally kill the main process
+echo "Terminating main process: $PID"
+kill -9 "$PID" 2>/dev/null || true
+
+echo "============================================"
+echo "Process $PID and all its children have been terminated"
+echo "============================================"
+
+exit 0
diff --git a/v2rayN/ServiceLib/Sample/kill_as_sudo_osx_sh b/v2rayN/ServiceLib/Sample/kill_as_sudo_osx_sh
new file mode 100644
index 00000000..043d3703
--- /dev/null
+++ b/v2rayN/ServiceLib/Sample/kill_as_sudo_osx_sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+#
+# Process Terminator Script for macOS
+# This script forcibly terminates a process and all its descendant processes
+#
+
+# Check if PID argument is provided
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 <PID>"
+    exit 1
+fi
+
+PID=$1
+
+# Validate that input is a valid PID (numeric)
+if ! [[ "$PID" =~ ^[0-9]+$ ]]; then
+    echo "Error: The PID must be a numeric value"
+    exit 1
+fi
+
+# Check if the process exists
+if ! ps -p $PID > /dev/null; then
+    echo "Warning: No process found with PID $PID"
+    exit 0
+fi
+
+# Recursive function to find and kill all descendant processes
+kill_descendants() {
+    local parent=$1
+    # Use ps -eo pid,ppid for macOS compatibility
+    local children=$(ps -eo pid=,ppid= | awk -v ppid=$parent '$2==ppid {print $1}')
+    
+    echo "Processing children of PID: $parent..."
+    for child in $children; do
+        kill_descendants "$child"
+        echo "Terminating child process: $child"
+        kill -9 "$child" 2>/dev/null || true
+    done
+}
+
+echo "============================================"
+echo "Starting termination of process $PID and all its descendants"
+echo "============================================"
+
+# Find and kill all descendant processes
+kill_descendants "$PID"
+
+# Finally kill the main process
+echo "Terminating main process: $PID"
+kill -9 "$PID" 2>/dev/null || true
+
+echo "============================================"
+echo "Process $PID and all its descendants have been terminated"
+echo "============================================"
+
+exit 0
diff --git a/v2rayN/ServiceLib/ServiceLib.csproj b/v2rayN/ServiceLib/ServiceLib.csproj
index bedde615..ecbab780 100644
--- a/v2rayN/ServiceLib/ServiceLib.csproj
+++ b/v2rayN/ServiceLib/ServiceLib.csproj
@@ -28,6 +28,8 @@
 		<EmbeddedResource Include="Sample\custom_routing_white" />
 		<EmbeddedResource Include="Sample\dns_singbox_normal" />
 		<EmbeddedResource Include="Sample\dns_v2ray_normal" />
+		<EmbeddedResource Include="Sample\kill_as_sudo_linux_sh" />
+		<EmbeddedResource Include="Sample\kill_as_sudo_osx_sh" />
 		<EmbeddedResource Include="Sample\pac" />
 		<EmbeddedResource Include="Sample\proxy_set_linux_sh" /> 
 		<EmbeddedResource Include="Sample\proxy_set_osx_sh" />
diff --git a/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
index e0b27607..9a5e908f 100644
--- a/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
@@ -66,8 +66,7 @@ public partial class SudoPasswordInputView : UserControl
         {
             // Use sudo echo command to verify password
             var arg = new List<string>() { "-c", "sudo -S echo SUDO_CHECK" };
-            var result = await CliWrap.Cli
-                .Wrap(Global.LinuxBash)
+            var result = await CliWrap.Cli.Wrap(Global.LinuxBash)
                 .WithArguments(arg)
                 .WithStandardInputPipe(CliWrap.PipeSource.FromString(password))
                 .ExecuteBufferedAsync();

From 8662d94ab6bfe62058c42a41d43a93ad3fd6b604 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 30 Jul 2025 20:33:51 +0800
Subject: [PATCH 011/115] Fixed bug for macos kill_as_sudo

---
 v2rayN/ServiceLib/Handler/CoreAdminHandler.cs |  5 ++++-
 v2rayN/ServiceLib/Sample/kill_as_sudo_osx_sh  | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs b/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs
index ec448b7a..ec99b26b 100644
--- a/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs
+++ b/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs
@@ -96,7 +96,10 @@ public class CoreAdminHandler
         {
             var shellFileName = Utils.IsOSX() ? Global.KillAsSudoOSXShellFileName : Global.KillAsSudoLinuxShellFileName;
             var shFilePath = await FileManager.CreateLinuxShellFile("kill_as_sudo.sh", EmbedUtils.GetEmbedText(shellFileName), true);
-
+            if (shFilePath.Contains(' '))
+            {
+                shFilePath = shFilePath.AppendQuotes();
+            }
             var arg = new List<string>() { "-c", $"sudo -S {shFilePath} {_linuxSudoPid}" };
             var result = await Cli.Wrap(Global.LinuxBash)
                 .WithArguments(arg)
diff --git a/v2rayN/ServiceLib/Sample/kill_as_sudo_osx_sh b/v2rayN/ServiceLib/Sample/kill_as_sudo_osx_sh
index 043d3703..94011d6f 100644
--- a/v2rayN/ServiceLib/Sample/kill_as_sudo_osx_sh
+++ b/v2rayN/ServiceLib/Sample/kill_as_sudo_osx_sh
@@ -18,8 +18,8 @@ if ! [[ "$PID" =~ ^[0-9]+$ ]]; then
     exit 1
 fi
 
-# Check if the process exists
-if ! ps -p $PID > /dev/null; then
+# Check if the process exists - using kill -0 which is more reliable on macOS
+if ! kill -0 $PID 2>/dev/null; then
     echo "Warning: No process found with PID $PID"
     exit 0
 fi
@@ -27,9 +27,9 @@ fi
 # Recursive function to find and kill all descendant processes
 kill_descendants() {
     local parent=$1
-    # Use ps -eo pid,ppid for macOS compatibility
-    local children=$(ps -eo pid=,ppid= | awk -v ppid=$parent '$2==ppid {print $1}')
-    
+    # Use ps -axo for macOS to ensure all processes are included
+    local children=$(ps -axo pid=,ppid= | awk -v ppid=$parent '$2==ppid {print $1}')
+
     echo "Processing children of PID: $parent..."
     for child in $children; do
         kill_descendants "$child"

From ac1231ad54ffc9dd43452aaa853929c4495489e2 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 30 Jul 2025 21:08:37 +0800
Subject: [PATCH 012/115] sing-box LAN listening address changed to 0.0.0.0

https://github.com/2dust/v2rayN/discussions/7669
---
 .../ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index c9bef4f5..79e4c0a2 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -519,7 +519,7 @@ public class CoreConfigSingboxService
     {
         try
         {
-            var listen = "::";
+            var listen = "0.0.0.0";
             singboxConfig.inbounds = [];
 
             if (!_config.TunModeItem.EnableTun

From 3f79df21d949e8e0c1f609b8b9992723861d7d98 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Thu, 31 Jul 2025 16:56:39 +0800
Subject: [PATCH 013/115] Fix missing hysteria2 arguments (#7673)

---
 v2rayN/ServiceLib/Handler/CoreInfoHandler.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2rayN/ServiceLib/Handler/CoreInfoHandler.cs b/v2rayN/ServiceLib/Handler/CoreInfoHandler.cs
index 6b7e1df2..befd80fa 100644
--- a/v2rayN/ServiceLib/Handler/CoreInfoHandler.cs
+++ b/v2rayN/ServiceLib/Handler/CoreInfoHandler.cs
@@ -130,7 +130,7 @@ public sealed class CoreInfoHandler
                 {
                     CoreType = ECoreType.hysteria,
                     CoreExes = ["hysteria"],
-                    Arguments = "",
+                    Arguments = "-c {0}",
                     Url = GetCoreUrl(ECoreType.hysteria),
                 },
 
@@ -180,7 +180,7 @@ public sealed class CoreInfoHandler
                 {
                     CoreType = ECoreType.hysteria2,
                     CoreExes = ["hysteria-windows-amd64", "hysteria-linux-amd64", "hysteria"],
-                    Arguments = "",
+                    Arguments = "-c {0}",
                     Url = GetCoreUrl(ECoreType.hysteria2),
                 },
 

From 1d1f5641ebc633d7b76ca16626f90ea1ffae6fd4 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 31 Jul 2025 20:43:00 +0800
Subject: [PATCH 014/115] up 7.13.5

---
 v2rayN/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/Directory.Build.props b/v2rayN/Directory.Build.props
index faf528a8..484cde47 100644
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.13.4</Version>
+        <Version>7.13.5</Version>
     </PropertyGroup>
 
     <PropertyGroup>

From 6fa5ca5aa952222d818024fb9ee5fb5e8240bd4b Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 1 Aug 2025 12:16:19 +0800
Subject: [PATCH 015/115] Revert "Fix missing hysteria2 arguments (#7673)"

This reverts commit 3f79df21d949e8e0c1f609b8b9992723861d7d98.
---
 v2rayN/ServiceLib/Handler/CoreInfoHandler.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2rayN/ServiceLib/Handler/CoreInfoHandler.cs b/v2rayN/ServiceLib/Handler/CoreInfoHandler.cs
index befd80fa..6b7e1df2 100644
--- a/v2rayN/ServiceLib/Handler/CoreInfoHandler.cs
+++ b/v2rayN/ServiceLib/Handler/CoreInfoHandler.cs
@@ -130,7 +130,7 @@ public sealed class CoreInfoHandler
                 {
                     CoreType = ECoreType.hysteria,
                     CoreExes = ["hysteria"],
-                    Arguments = "-c {0}",
+                    Arguments = "",
                     Url = GetCoreUrl(ECoreType.hysteria),
                 },
 
@@ -180,7 +180,7 @@ public sealed class CoreInfoHandler
                 {
                     CoreType = ECoreType.hysteria2,
                     CoreExes = ["hysteria-windows-amd64", "hysteria-linux-amd64", "hysteria"],
-                    Arguments = "-c {0}",
+                    Arguments = "",
                     Url = GetCoreUrl(ECoreType.hysteria2),
                 },
 

From 96e1f85d6f4f11dbe85ecd4149b7634bffbb867f Mon Sep 17 00:00:00 2001
From: Internetezoo <123302216+Internetezoo@users.noreply.github.com>
Date: Sat, 2 Aug 2025 15:06:14 +0200
Subject: [PATCH 016/115] Update ResUI.hu.resx (#7679)

---
 v2rayN/ServiceLib/Resx/ResUI.hu.resx | 574 +++++++++++++--------------
 1 file changed, 287 insertions(+), 287 deletions(-)

diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
index 862758f6..d7fd9fd3 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -118,55 +118,55 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="BatchExportURLSuccessfully" xml:space="preserve">
-    <value>A megosztási link másolása a vágólapra sikerült</value>
+    <value>Sikeresen exportálta a megosztási linket a vágólapra</value>
   </data>
   <data name="CheckServerSettings" xml:space="preserve">
-    <value>Kérjük, először ellenőrizze a szerverbeállításokat</value>
+    <value>Kérjük, először ellenőrizze a konfigurációs beállításokat.</value>
   </data>
   <data name="ConfigurationFormatIncorrect" xml:space="preserve">
-    <value>Érvénytelen konfigurációs formátum</value>
+    <value>Érvénytelen konfigurációs formátum.</value>
   </data>
   <data name="CustomServerTips" xml:space="preserve">
-    <value>Vegye figyelembe, hogy a testreszabott konfiguráció teljes mértékben az ön konfigurációjától függ, és nem működik minden beállítással. Ha a rendszer proxyját szeretné használni, kérjük, módosítsa a figyelési portot kézzel.</value>
+    <value>Ne feledje, hogy az egyéni konfiguráció teljes mértékben a saját konfigurációjától függ, és nem működik minden beállítással. Ha a rendszerproxyt szeretné használni, kérjük, manuálisan módosítsa a figyelő portot.</value>
   </data>
   <data name="Downloading" xml:space="preserve">
     <value>Letöltés...</value>
   </data>
   <data name="FailedConversionConfiguration" xml:space="preserve">
-    <value>Nem sikerült a konfigurációs fájl átalakítása</value>
+    <value>Nem sikerült a konfigurációs fájl konvertálása</value>
   </data>
   <data name="FailedGenDefaultConfiguration" xml:space="preserve">
-    <value>Nem sikerült a gyári konfigurációs fájl generálása</value>
+    <value>Nem sikerült az alapértelmezett konfigurációs fájl generálása</value>
   </data>
   <data name="FailedGetDefaultConfiguration" xml:space="preserve">
-    <value>Nem sikerült lekérni a gyári konfigurációt</value>
+    <value>Nem sikerült lekérni az alapértelmezett konfigurációt</value>
   </data>
   <data name="FailedImportedCustomServer" xml:space="preserve">
-    <value>Nem sikerült a testreszabott konfigurációs szerver importálása</value>
+    <value>Nem sikerült importálni az egyéni konfigurációt</value>
   </data>
   <data name="FailedReadConfiguration" xml:space="preserve">
-    <value>Nem sikerült a konfigurációs fájl beolvasása</value>
+    <value>Nem sikerült olvasni a konfigurációs fájlt</value>
   </data>
   <data name="FillCorrectServerPort" xml:space="preserve">
-    <value>Kérjük, adja meg a helyes formátumú szerverportot</value>
+    <value>Kérjük, adja meg a helyes port formátumot.</value>
   </data>
   <data name="FillLocalListeningPort" xml:space="preserve">
-    <value>Kérjük, adja meg a helyi figyelési portot</value>
+    <value>Kérjük, adja meg a helyi figyelő portot.</value>
   </data>
   <data name="FillPassword" xml:space="preserve">
-    <value>Kérjük, töltse ki a jelszót</value>
+    <value>Kérjük, adja meg a jelszót.</value>
   </data>
   <data name="FillServerAddress" xml:space="preserve">
-    <value>Kérjük, adja meg a szerver címét</value>
+    <value>Kérjük, adja meg a címet.</value>
   </data>
   <data name="FillUUID" xml:space="preserve">
-    <value>Kérjük, adja meg a felhasználói azonosítót</value>
+    <value>Kérjük, adja meg a felhasználói azonosítót.</value>
   </data>
   <data name="Incorrectconfiguration" xml:space="preserve">
-    <value>Nem helyes a konfiguráció, kérjük, ellenőrizze</value>
+    <value>Ez nem a megfelelő konfiguráció, kérjük, ellenőrizze</value>
   </data>
   <data name="InitialConfiguration" xml:space="preserve">
-    <value>Kezi konfiguráció</value>
+    <value>Kezdeti konfiguráció</value>
   </data>
   <data name="IsLatestCore" xml:space="preserve">
     <value>{0} {1} már naprakész.</value>
@@ -187,13 +187,13 @@
     <value>Típus</value>
   </data>
   <data name="LvSubscription" xml:space="preserve">
-    <value>Előfizetési csoport</value>
+    <value>Előfizetés csoport</value>
   </data>
   <data name="LvTodayDownloadDataAmount" xml:space="preserve">
-    <value>Letöltési forgalom ma</value>
+    <value>Mai letöltési forgalom</value>
   </data>
   <data name="LvTodayUploadDataAmount" xml:space="preserve">
-    <value>Feltöltési forgalom ma</value>
+    <value>Mai feltöltési forgalom</value>
   </data>
   <data name="LvTotalDownloadDataAmount" xml:space="preserve">
     <value>Összes letöltési forgalom</value>
@@ -205,37 +205,37 @@
     <value>Szállítás</value>
   </data>
   <data name="MsgDownloadV2rayCoreSuccessfully" xml:space="preserve">
-    <value>A Core letöltése sikerült</value>
+    <value>A Core sikeresen letöltve</value>
   </data>
   <data name="MsgFailedImportSubscription" xml:space="preserve">
-    <value>Nem sikerült az előfizetési tartalom importálása</value>
+    <value>Nem sikerült importálni az előfizetés tartalmát</value>
   </data>
   <data name="MsgGetSubscriptionSuccessfully" xml:space="preserve">
-    <value>Az előfizetési tartalom sikeresen lekérve</value>
+    <value>Az előfizetés tartalma sikeresen lekérve</value>
   </data>
   <data name="MsgNoValidSubscription" xml:space="preserve">
-    <value>Nincs érvényes előfizetés meghatározva</value>
+    <value>Nincs érvényes előfizetés beállítva</value>
   </data>
   <data name="MsgParsingSuccessfully" xml:space="preserve">
-    <value>Resolve {0} sikeresen</value>
+    <value>Resolved {0} successfully</value>
   </data>
   <data name="MsgStartGettingSubscriptions" xml:space="preserve">
-    <value>Kezdje el az előfizetések lekérését</value>
+    <value>Előfizetések lekérdezése elindult</value>
   </data>
   <data name="MsgStartUpdating" xml:space="preserve">
-    <value>Kezdődik a frissítés: {0}...</value>
+    <value>Frissítés indítása: {0}...</value>
   </data>
   <data name="MsgSubscriptionDecodingFailed" xml:space="preserve">
-    <value>Érvénytelen előfizetési tartalom</value>
+    <value>Érvénytelen előfizetés tartalom</value>
   </data>
   <data name="MsgUnpacking" xml:space="preserve">
-    <value>Kicsomagolás folyamatban......</value>
+    <value>Kicsomagolás...</value>
   </data>
   <data name="MsgUpdateSubscriptionEnd" xml:space="preserve">
-    <value>Az előfizetések frissítése befejeződött</value>
+    <value>Előfizetés frissítése befejeződött</value>
   </data>
   <data name="MsgUpdateSubscriptionStart" xml:space="preserve">
-    <value>Az előfizetések frissítése elkezdődött</value>
+    <value>Előfizetés frissítése elindult</value>
   </data>
   <data name="MsgUpdateV2rayCoreSuccessfully" xml:space="preserve">
     <value>A Core sikeresen frissítve</value>
@@ -244,16 +244,16 @@
     <value>A Core sikeresen frissítve! Szolgáltatás újraindítása...</value>
   </data>
   <data name="NonvmessOrssProtocol" xml:space="preserve">
-    <value>Nem-VMess vagy ss protokoll</value>
+    <value>Nem VMess vagy SS protokoll</value>
   </data>
   <data name="NotFoundCore" xml:space="preserve">
-    <value>A Core fájl (fájl neve: {1}) nem található a mappában ({0}), kérjük, töltse le és helyezze a mappába, letöltési cím: {2}</value>
+    <value>A Core fájl (fájlnév: {1}) nem található a mappában ({0}), kérjük, töltse le és helyezze a mappába, letöltési cím: {2}</value>
   </data>
   <data name="NoValidQRcodeFound" xml:space="preserve">
-    <value>Beolvasás befejeződött, nem található érvényes QR-kód</value>
+    <value>Szkennelés befejeződött, nem található érvényes QR kód</value>
   </data>
   <data name="OperationFailed" xml:space="preserve">
-    <value>A művelet nem sikerült, kérjük, ellenőrizze és próbálja újra</value>
+    <value>Művelet sikertelen, kérjük, ellenőrizze és próbálja újra</value>
   </data>
   <data name="PleaseFillRemarks" xml:space="preserve">
     <value>Kérjük, töltse ki a megjegyzéseket</value>
@@ -262,97 +262,97 @@
     <value>Kérjük, válassza ki a titkosítási módszert</value>
   </data>
   <data name="PleaseSelectProtocol" xml:space="preserve">
-    <value>Kérjük, válasszon egy protokollt</value>
+    <value>Kérjük, válassza ki a protokollt</value>
   </data>
   <data name="PleaseSelectServer" xml:space="preserve">
-    <value>Kérjük, először válassza ki a szervert</value>
+    <value>Kérjük, először válassza ki a konfigurációt</value>
   </data>
   <data name="RemoveDuplicateServerResult" xml:space="preserve">
-    <value>A szerverek duplikáció eltávolítása befejeződött. Régi: {0}, Új: {1}.</value>
+    <value>Konfigurációk deduplikálása befejeződött. Régi: {0}, Új: {1}.</value>
   </data>
   <data name="RemoveServer" xml:space="preserve">
-    <value>Biztosan el kívánja távolítani a szervert?</value>
+    <value>Biztosan eltávolítja a konfigurációt?</value>
   </data>
   <data name="SaveClientConfigurationIn" xml:space="preserve">
-    <value>A kliens konfigurációs fájl mentve van itt: {0}</value>
+    <value>Az ügyfélkonfigurációs fájl mentése itt: {0}</value>
   </data>
   <data name="StartService" xml:space="preserve">
     <value>Szolgáltatás indítása ({0})...</value>
   </data>
   <data name="SuccessfulConfiguration" xml:space="preserve">
-    <value>Konfiguráció sikeres {0}</value>
+    <value>Konfiguráció sikeres. {0}</value>
   </data>
   <data name="SuccessfullyImportedCustomServer" xml:space="preserve">
-    <value>A testreszabott konfigurációs szerver sikeresen importálva</value>
+    <value>Egyéni konfiguráció sikeresen importálva</value>
   </data>
   <data name="SuccessfullyImportedServerViaClipboard" xml:space="preserve">
-    <value>{0} szerver importálva a vágólapról</value>
+    <value>{0} konfiguráció importálva a vágólapról</value>
   </data>
   <data name="SuccessfullyImportedServerViaScan" xml:space="preserve">
-    <value>A megosztott link sikeresen importálva a beolvasás során</value>
+    <value>Sikeresen beolvasta és importálta a megosztott linket</value>
   </data>
   <data name="TestMeOutput" xml:space="preserve">
     <value>A késleltetés: {0} ms, {1}</value>
   </data>
   <data name="OperationSuccess" xml:space="preserve">
-    <value>A művelet sikeres</value>
+    <value>Művelet sikeres</value>
   </data>
   <data name="PleaseSelectRules" xml:space="preserve">
-    <value>Kérjük, válassza ki a szabályokat</value>
+    <value>Kérjük, válasszon szabályokat</value>
   </data>
   <data name="RemoveRules" xml:space="preserve">
-    <value>Biztosan el kívánja távolítani a szabályokat?</value>
+    <value>Biztosan eltávolítja a szabályokat?</value>
   </data>
   <data name="RoutingRuleDetailRequiredTips" xml:space="preserve">
-    <value>{0}, az egyik kötelező.</value>
+    <value>{0}, az egyik kötelező mező.</value>
   </data>
   <data name="LvRemarks" xml:space="preserve">
     <value>Megjegyzések</value>
   </data>
   <data name="LvUrl" xml:space="preserve">
-    <value>URL (Opcionális)</value>
+    <value>URL (opcionális)</value>
   </data>
   <data name="LvCount" xml:space="preserve">
-    <value>Szám</value>
+    <value>Darabszám</value>
   </data>
   <data name="MsgNeedUrl" xml:space="preserve">
     <value>Kérjük, adja meg az URL-t</value>
   </data>
   <data name="AddBatchRoutingRulesYesNo" xml:space="preserve">
-    <value>Hozzá kívánja adni a szabályokat? Válassza az igent az összefűzéshez, válassza a másikat a cseréhez</value>
+    <value>Hozzá szeretne fűzni szabályokat? Igen a hozzáfűzéshez, nem a cseréhez.</value>
   </data>
   <data name="MsgDownloadGeoFileSuccessfully" xml:space="preserve">
-    <value>GeoFile letöltése: {0} sikerült</value>
+    <value>A GeoFile: {0} sikeresen letöltve</value>
   </data>
   <data name="MsgInformationTitle" xml:space="preserve">
     <value>Információ</value>
   </data>
   <data name="LvCustomIcon" xml:space="preserve">
-    <value>Testreszabott ikona</value>
+    <value>Egyéni ikon</value>
   </data>
   <data name="FillCorrectDNSText" xml:space="preserve">
-    <value>Kérjük, adja meg a helyes egyedi DNS-t</value>
+    <value>Kérjük, töltse ki a helyes egyéni DNS-t</value>
   </data>
   <data name="TransportPathTip1" xml:space="preserve">
-    <value>*ws/httpupgrade/xhttp útvonal</value>
+    <value>*ws/http upgrade/xhttp elérési út</value>
   </data>
   <data name="TransportPathTip2" xml:space="preserve">
-    <value>*h2 útvonal</value>
+    <value>*h2 elérési út</value>
   </data>
   <data name="TransportPathTip3" xml:space="preserve">
-    <value>*QUIC kulcs/KCP mag</value>
+    <value>*QUIC kulcs/KCP seed</value>
   </data>
   <data name="TransportPathTip4" xml:space="preserve">
-    <value>*grpc szolgáltatás neve</value>
+    <value>*grpc szolgáltatásnév</value>
   </data>
   <data name="TransportRequestHostTip1" xml:space="preserve">
-    <value>*http host, vesszővel elválasztva (,)</value>
+    <value>*http host vesszővel elválasztva (,)</value>
   </data>
   <data name="TransportRequestHostTip2" xml:space="preserve">
-    <value>*ws/httpupgrade/xhttp host</value>
+    <value>*ws/http upgrade/xhttp host</value>
   </data>
   <data name="TransportRequestHostTip3" xml:space="preserve">
-    <value>*h2 host, vesszővel elválasztva (,)</value>
+    <value>*h2 host vesszővel elválasztva (,)</value>
   </data>
   <data name="TransportRequestHostTip4" xml:space="preserve">
     <value>*QUIC biztonság</value>
@@ -373,19 +373,19 @@
     <value>TLS</value>
   </data>
   <data name="TransportPathTip5" xml:space="preserve">
-    <value>*kcp mag</value>
+    <value>*kcp seed</value>
   </data>
   <data name="RegisterGlobalHotkeyFailed" xml:space="preserve">
-    <value>A globális billentyűparancs {0} bejegyzése nem sikerült, ok: {1}</value>
+    <value>Globális gyorsbillentyű {0} regisztrációja sikertelen, ok: {1}</value>
   </data>
   <data name="RegisterGlobalHotkeySuccessfully" xml:space="preserve">
-    <value>A globális billentyűparancs {0} sikeresen bejegyezve</value>
+    <value>Globális gyorsbillentyű {0} sikeresen regisztrálva</value>
   </data>
   <data name="AllGroupServers" xml:space="preserve">
     <value>Összes</value>
   </data>
   <data name="FillServerAddressCustom" xml:space="preserve">
-    <value>Kérjük, keresse meg a szerver konfigurációjának importálásához</value>
+    <value>Kérjük, tallózzon a konfiguráció importálásához</value>
   </data>
   <data name="Speedtesting" xml:space="preserve">
     <value>Tesztelés...</value>
@@ -397,7 +397,7 @@
     <value>Helyi</value>
   </data>
   <data name="MsgServerTitle" xml:space="preserve">
-    <value>Szerver szűrő, nyomja meg az Enter-t a végrehajtáshoz</value>
+    <value>Konfigurációs szűrő, Enter billentyűvel végrehajtható</value>
   </data>
   <data name="menuCheckUpdate" xml:space="preserve">
     <value>Frissítés ellenőrzése</value>
@@ -409,13 +409,13 @@
     <value>Kilépés</value>
   </data>
   <data name="menuGlobalHotkeySetting" xml:space="preserve">
-    <value>Globális billentyűparancs beállítása</value>
+    <value>Globális gyorsbillentyű beállítás</value>
   </data>
   <data name="menuHelp" xml:space="preserve">
-    <value>Segítség</value>
+    <value>Súgó</value>
   </data>
   <data name="menuOptionSetting" xml:space="preserve">
-    <value>Opció beállítása</value>
+    <value>Opció beállítás</value>
   </data>
   <data name="menuPromotion" xml:space="preserve">
     <value>Promóció</value>
@@ -424,25 +424,25 @@
     <value>Újratöltés</value>
   </data>
   <data name="menuRoutingSetting" xml:space="preserve">
-    <value>Útvonal beállítása</value>
+    <value>Útválasztási beállítás</value>
   </data>
   <data name="menuServers" xml:space="preserve">
-    <value>Szerverek</value>
+    <value>Konfigurációk</value>
   </data>
   <data name="menuSetting" xml:space="preserve">
     <value>Beállítások</value>
   </data>
   <data name="menuSubGroupUpdate" xml:space="preserve">
-    <value>Frissítse a jelenlegi előfizetést proxy nélkül</value>
+    <value>Aktuális előfizetés frissítése proxy nélkül</value>
   </data>
   <data name="menuSubGroupUpdateViaProxy" xml:space="preserve">
-    <value>Frissítse a jelenlegi előfizetést proxyval</value>
+    <value>Aktuális előfizetés frissítése proxyval</value>
   </data>
   <data name="menuSubscription" xml:space="preserve">
     <value>Előfizetési csoport</value>
   </data>
   <data name="menuSubSetting" xml:space="preserve">
-    <value>Előfizetési csoport beállítások</value>
+    <value>Előfizetési csoport beállításai</value>
   </data>
   <data name="menuSubUpdate" xml:space="preserve">
     <value>Előfizetések frissítése proxy nélkül</value>
@@ -457,7 +457,7 @@
     <value>Rendszerproxy törlése</value>
   </data>
   <data name="menuSystemProxyNothing" xml:space="preserve">
-    <value>Ne változtassa meg a rendszer proxyját</value>
+    <value>Ne változtassa meg a rendszerproxyt</value>
   </data>
   <data name="menuSystemProxyPac" xml:space="preserve">
     <value>PAC mód</value>
@@ -472,64 +472,64 @@
     <value>Nyelv (Újraindítás)</value>
   </data>
   <data name="menuAddServerViaClipboard" xml:space="preserve">
-    <value>Importálja a megosztott linkeket a vágólapról (Ctrl+V)</value>
+    <value>Megosztási linkek importálása vágólapról (Ctrl+V)</value>
   </data>
   <data name="menuAddServerViaScan" xml:space="preserve">
-    <value>QR kód beolvasása a képernyőn (Ctrl+S)</value>
+    <value>QR kód beolvasása a képernyőről (Ctrl+S)</value>
   </data>
   <data name="menuCopyServer" xml:space="preserve">
-    <value>Kiválasztott szerver klónozása</value>
+    <value>Kijelölt konfiguráció klónozása</value>
   </data>
   <data name="menuRemoveDuplicateServer" xml:space="preserve">
-    <value>Duplikált szerverek eltávolítása</value>
+    <value>Ismétlődő konfigurációk eltávolítása</value>
   </data>
   <data name="menuRemoveServer" xml:space="preserve">
-    <value>Kiválasztott szerver(törlés)</value>
+    <value>Kijelölt konfigurációk eltávolítása (Delete)</value>
   </data>
   <data name="menuSetDefaultServer" xml:space="preserve">
-    <value>Aktív szerverként beállítani (Enter)</value>
+    <value>Beállítás aktív konfigurációként (Enter)</value>
   </data>
   <data name="menuClearServerStatistics" xml:space="preserve">
-    <value>Minden szolgáltatási statisztika törlése</value>
+    <value>Összes szolgáltatás statisztika törlése</value>
   </data>
   <data name="menuRealPingServer" xml:space="preserve">
-    <value>A szerverek valós késleltetésének tesztelése (Ctrl+R)</value>
+    <value>Konfigurációk valós késleltetésének tesztelése (Ctrl+R)</value>
   </data>
   <data name="menuSortServerResult" xml:space="preserve">
-    <value>Sorrend szerinti tesztelési eredmény</value>
+    <value>Rendezés teszteredmény szerint</value>
   </data>
   <data name="menuSpeedServer" xml:space="preserve">
-    <value>A szerverek letöltési sebességének tesztelése (Ctrl+T)</value>
+    <value>Konfigurációk letöltési sebességének tesztelése (Ctrl+T)</value>
   </data>
   <data name="menuTcpingServer" xml:space="preserve">
-    <value>Szerver tesztelése tcping-gel (Ctrl+O)</value>
+    <value>Konfigurációk tesztelése tcpinggel (Ctrl+O)</value>
   </data>
   <data name="menuExport2ClientConfig" xml:space="preserve">
-    <value>A kiválasztott szerver exportálása a teljes konfigurációhoz</value>
+    <value>Kijelölt konfiguráció exportálása teljes konfigurációként</value>
   </data>
   <data name="menuExport2ShareUrl" xml:space="preserve">
-    <value>A megosztási link kattintásra másolása (Ctrl+C)</value>
+    <value>Megosztási link exportálása vágólapra (Ctrl+C)</value>
   </data>
   <data name="menuAddCustomServer" xml:space="preserve">
-    <value>Testreszabott konfigurációs szerver hozzáadása</value>
+    <value>Egyéni konfiguráció hozzáadása</value>
   </data>
   <data name="menuAddShadowsocksServer" xml:space="preserve">
-    <value>[Shadowsocks] szerver hozzáadása</value>
+    <value>[Shadowsocks] konfiguráció hozzáadása</value>
   </data>
   <data name="menuAddSocksServer" xml:space="preserve">
-    <value>[SOCKS] szerver hozzáadása</value>
+    <value>[SOCKS] konfiguráció hozzáadása</value>
   </data>
   <data name="menuAddTrojanServer" xml:space="preserve">
-    <value>[Trojan] szerver hozzáadása</value>
+    <value>[Trojan] konfiguráció hozzáadása</value>
   </data>
   <data name="menuAddVlessServer" xml:space="preserve">
-    <value>[VLESS] szerver hozzáadása</value>
+    <value>[VLESS] konfiguráció hozzáadása</value>
   </data>
   <data name="menuAddVmessServer" xml:space="preserve">
-    <value>[VMess] szerver hozzáadása</value>
+    <value>[VMess] konfiguráció hozzáadása</value>
   </data>
   <data name="menuSelectAll" xml:space="preserve">
-    <value>Mindet kijelölni (Ctrl+A)</value>
+    <value>Összes kijelölése (Ctrl+A)</value>
   </data>
   <data name="menuMsgViewClear" xml:space="preserve">
     <value>Összes törlése</value>
@@ -556,19 +556,19 @@
     <value>Megosztás</value>
   </data>
   <data name="LvEnabled" xml:space="preserve">
-    <value>A frissítés engedélyezése</value>
+    <value>Frissítés engedélyezése</value>
   </data>
   <data name="LvSort" xml:space="preserve">
-    <value>Sorrend</value>
+    <value>Rendezés</value>
   </data>
   <data name="LvUserAgent" xml:space="preserve">
-    <value>Felhasználói ügynök</value>
+    <value>User Agent</value>
   </data>
   <data name="TbCancel" xml:space="preserve">
-    <value>Cancel</value>
+    <value>Mégsem</value>
   </data>
   <data name="TbConfirm" xml:space="preserve">
-    <value>Megerősít</value>
+    <value>Megerősítés</value>
   </data>
   <data name="GbTransport" xml:space="preserve">
     <value>Szállítás</value>
@@ -577,40 +577,40 @@
     <value>Cím</value>
   </data>
   <data name="TbAllowInsecure" xml:space="preserve">
-    <value>Engedélyezett nem biztosított</value>
+    <value>Nem biztonságos engedélyezése</value>
   </data>
   <data name="TbAlpn" xml:space="preserve">
     <value>ALPN</value>
   </data>
   <data name="TbAlterId" xml:space="preserve">
-    <value>AlterID</value>
+    <value>Alter ID</value>
   </data>
   <data name="TbFingerprint" xml:space="preserve">
     <value>Ujjlenyomat</value>
   </data>
   <data name="TbHeaderType" xml:space="preserve">
-    <value>Álcázás típusa</value>
+    <value>Álcázási típus</value>
   </data>
   <data name="TbId" xml:space="preserve">
     <value>UUID(id)</value>
   </data>
   <data name="TbNetwork" xml:space="preserve">
-    <value>Szállítási protokoll (hálózat)</value>
+    <value>Szállítási protokoll(hálózat)</value>
   </data>
   <data name="TbPath" xml:space="preserve">
-    <value>Útvonal</value>
+    <value>Elérési út</value>
   </data>
   <data name="TbPort" xml:space="preserve">
     <value>Port</value>
   </data>
   <data name="TbRemarks" xml:space="preserve">
-    <value>Álnév (megjegyzések)</value>
+    <value>Alias (megjegyzések)</value>
   </data>
   <data name="TbRequestHost" xml:space="preserve">
-    <value>Álcázott domain (hoszt)</value>
+    <value>Álcázási tartomány(host)</value>
   </data>
   <data name="TbSecurity" xml:space="preserve">
-    <value>Kódolási módszer (biztonság)</value>
+    <value>Titkosítási módszer (biztonság)</value>
   </data>
   <data name="TbSNI" xml:space="preserve">
     <value>SNI</value>
@@ -622,10 +622,10 @@
     <value>*Alapértelmezett érték tcp</value>
   </data>
   <data name="TbCoreType" xml:space="preserve">
-    <value>Yalap típusa</value>
+    <value>Core Típus</value>
   </data>
   <data name="TbFlow5" xml:space="preserve">
-    <value>Folyam</value>
+    <value>Flow</value>
   </data>
   <data name="TbGUID" xml:space="preserve">
     <value>Generálás</value>
@@ -634,34 +634,34 @@
     <value>Jelszó</value>
   </data>
   <data name="TbId4" xml:space="preserve">
-    <value>Jelszó (opcionális)</value>
+    <value>Jelszó(Opcionális)</value>
   </data>
   <data name="TbId5" xml:space="preserve">
     <value>UUID(id)</value>
   </data>
   <data name="TbSecurity3" xml:space="preserve">
-    <value>Kódolás</value>
+    <value>Titkosítás</value>
   </data>
   <data name="TbSecurity4" xml:space="preserve">
-    <value>Felhasználó (opcionális)</value>
+    <value>Felhasználó(Opcionális)</value>
   </data>
   <data name="TbSecurity5" xml:space="preserve">
-    <value>Kódolás</value>
+    <value>Titkosítás</value>
   </data>
   <data name="TbPreSocksPort" xml:space="preserve">
     <value>Socks port</value>
   </data>
   <data name="TipPreSocksPort" xml:space="preserve">
-    <value>* Ezen érték beállítása után egy socks szolgáltatás indul el Xray/sing-box(Tun) használatával, amely funkcionalitásokat biztosít, mint például a sebesség megjelenítése</value>
+    <value>* A beállítás után egy socks szolgáltatás indul az Xray/sing-box(Tun) segítségével, hogy olyan funkciókat biztosítson, mint a sebességkijelzés</value>
   </data>
   <data name="TbBrowse" xml:space="preserve">
-    <value>Böngészés</value>
+    <value>Tallózás</value>
   </data>
   <data name="TbEdit" xml:space="preserve">
     <value>Szerkesztés</value>
   </data>
   <data name="TbSettingsAdvancedProtocol" xml:space="preserve">
-    <value>Fejlett proxy beállítások, protokoll választás (opcionális)</value>
+    <value>Haladó proxy beállítások, protokoll kiválasztása (opcionális)</value>
   </data>
   <data name="TbSettingsAllowLAN" xml:space="preserve">
     <value>Kapcsolatok engedélyezése a LAN-ról</value>
@@ -670,61 +670,61 @@
     <value>Automatikus elrejtés indításkor</value>
   </data>
   <data name="TbSettingsAutoUpdateInterval" xml:space="preserve">
-    <value>Geo automatikus frissítési időköz (órák)</value>
+    <value>Geo fájlok automatikus frissítési intervalluma (órák)</value>
   </data>
   <data name="TbSettingsCore" xml:space="preserve">
-    <value>Yalap: alapbeállítások</value>
+    <value>Core: alapbeállítások</value>
   </data>
   <data name="TbSettingsCoreDns" xml:space="preserve">
     <value>V2ray DNS beállítások</value>
   </data>
   <data name="TbSettingsCoreKcp" xml:space="preserve">
-    <value>Yalap: KCP beállítások</value>
+    <value>Core: KCP beállítások</value>
   </data>
   <data name="TbSettingsCoreType" xml:space="preserve">
-    <value>Yalap típusa beállítások</value>
+    <value>Core Típus beállítások</value>
   </data>
   <data name="TbSettingsDefAllowInsecure" xml:space="preserve">
-    <value>Engedélyezett a nem biztonságos</value>
+    <value>Nem biztonságos engedélyezése</value>
   </data>
   <data name="TbSettingsDomainStrategy4Freedom" xml:space="preserve">
-    <value>Kimenő szabadság domain stratégia</value>
+    <value>Kimenő Freedom tartomány stratégia</value>
   </data>
   <data name="TbSettingsEnableAutoAdjustMainLvColWidth" xml:space="preserve">
-    <value>Otomatikusan állítja be az oszlop szélességét előfizetés frissítése után</value>
+    <value>Oszlopszélesség automatikus beállítása előfizetés frissítése után</value>
   </data>
   <data name="TbSettingsEnableCheckPreReleaseUpdate" xml:space="preserve">
-    <value>Frissítések ellenőrzése a kiadás előtt</value>
+    <value>Előzetes kiadás frissítések ellenőrzése</value>
   </data>
   <data name="TbSettingsException" xml:space="preserve">
     <value>Kivétel</value>
   </data>
   <data name="TbSettingsExceptionTip" xml:space="preserve">
-    <value>Kivétel. Ne használjon proxy szervert a címek esetében, amelyek pontosan itt kezdődnek, használjon pontosvesszőt (;)</value>
+    <value>Kivételek: Ne használjon proxy szervert a következő címmel kezdődő címekhez. Pontosvesszővel (;) válassza el a bejegyzéseket.</value>
   </data>
   <data name="TbSettingsDisplayRealTimeSpeed" xml:space="preserve">
-    <value>Display real-time speed</value>
+    <value>Valós idejű sebesség megjelenítése (újraindítást igényel)</value>
   </data>
   <data name="TbSettingsKeepOlderDedupl" xml:space="preserve">
-    <value>Régi megőrzése a deduplikáció során</value>
+    <value>Régebbi bejegyzések megtartása deduplikáláskor</value>
   </data>
   <data name="TbSettingsLogEnabled" xml:space="preserve">
-    <value>Napló engedélyezése</value>
+    <value>Naplózás engedélyezése</value>
   </data>
   <data name="TbSettingsLogLevel" xml:space="preserve">
-    <value>Napló szint</value>
+    <value>Naplózási szint</value>
   </data>
   <data name="TbSettingsMuxEnabled" xml:space="preserve">
-    <value>Mux multiplexelés bekapcsolása</value>
+    <value>Mux Multiplexing bekapcsolása</value>
   </data>
   <data name="TbSettingsN" xml:space="preserve">
     <value>v2rayN beállítások</value>
   </data>
   <data name="TbSettingsPass" xml:space="preserve">
-    <value>Hitelesítő jelszó</value>
+    <value>Hitelesítési jelszó</value>
   </data>
   <data name="TbSettingsRemoteDNS" xml:space="preserve">
-    <value>Testreszabott DNS (több, vesszővel elválasztva (,))</value>
+    <value>Egyéni DNS (több, vesszővel (,) elválasztva)</value>
   </data>
   <data name="TbSettingsSetUWP" xml:space="preserve">
     <value>Win10 UWP Loopback beállítása</value>
@@ -733,34 +733,34 @@
     <value>Sniffing bekapcsolása</value>
   </data>
   <data name="TbSettingsSocksPort" xml:space="preserve">
-    <value>Keverék Port</value>
+    <value>Vegyes port</value>
   </data>
   <data name="TbSettingsStartBoot" xml:space="preserve">
-    <value>Indításkor indítani</value>
+    <value>Indítás rendszerindításkor</value>
   </data>
   <data name="TbSettingsStatistics" xml:space="preserve">
-    <value>Statisztikák engedélyezése (indítás szükséges)</value>
+    <value>Forgalmi statisztikák engedélyezése (újraindítást igényel)</value>
   </data>
   <data name="TbSettingsSubConvert" xml:space="preserve">
-    <value>Előfizetés átalakító URL</value>
+    <value>Előfizetés konverziós URL</value>
   </data>
   <data name="TbSettingsSystemproxy" xml:space="preserve">
-    <value>Rendszer proxy beállítások</value>
+    <value>Rendszerproxy beállítások</value>
   </data>
   <data name="TbSettingsTLS13" xml:space="preserve">
     <value>Biztonsági protokoll TLS v1.3 engedélyezése (előfizetés/frissítés)</value>
   </data>
   <data name="TbSettingsTrayMenuServersLimit" xml:space="preserve">
-    <value>A tálcán megjelenő menü szerverek megjelenítési korlátozása</value>
+    <value>Tálca jobb egérgombos menü konfigurációk megjelenítési limitje</value>
   </data>
   <data name="TbSettingsUdpEnabled" xml:space="preserve">
     <value>UDP engedélyezése</value>
   </data>
   <data name="TbSettingsUser" xml:space="preserve">
-    <value>Hitelesítő felhasználó</value>
+    <value>Hitelesítési felhasználó</value>
   </data>
   <data name="TbClearSystemProxy" xml:space="preserve">
-    <value>Rendszer proxy törlése</value>
+    <value>Rendszerproxy törlése</value>
   </data>
   <data name="TbDisplayGUI" xml:space="preserve">
     <value>GUI megjelenítése</value>
@@ -769,40 +769,40 @@
     <value>Globális gyorsbillentyű beállítások</value>
   </data>
   <data name="TbGlobalHotkeySettingTip" xml:space="preserve">
-    <value>Állítsa be közvetlenül a billentyűzet megnyomásával, indítás után érvényes</value>
+    <value>Közvetlenül beállítható billentyűnyomással; újraindítás után lép életbe</value>
   </data>
   <data name="TbNotChangeSystemProxy" xml:space="preserve">
-    <value>Ne változtassa meg a rendszer proxy-t</value>
+    <value>Ne változtassa meg a rendszerproxyt</value>
   </data>
   <data name="TbReset" xml:space="preserve">
     <value>Visszaállítás</value>
   </data>
   <data name="TbSetSystemProxy" xml:space="preserve">
-    <value>Rendszer proxy beállítása</value>
+    <value>Rendszerproxy beállítása</value>
   </data>
   <data name="TbSystemProxyPac" xml:space="preserve">
-    <value>PAC módban</value>
+    <value>PAC mód</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
-    <value>Megosztási szerver (Ctrl+F)</value>
+    <value>Konfiguráció megosztása (Ctrl+F)</value>
   </data>
   <data name="menuRouting" xml:space="preserve">
-    <value>Útvonal</value>
+    <value>Útválasztás</value>
   </data>
   <data name="NotRunAsAdmin" xml:space="preserve">
-    <value>Nem adminisztrátorként fut</value>
+    <value>Nem rendszergazdaként fut</value>
   </data>
   <data name="RunAsAdmin" xml:space="preserve">
-    <value>Futtatás adminisztrátorként</value>
+    <value>Futtatás rendszergazdaként</value>
   </data>
   <data name="menuMoveBottom" xml:space="preserve">
-    <value>Áthelyezés a végére (B)</value>
+    <value>Mozgatás alulra (B)</value>
   </data>
   <data name="menuMoveDown" xml:space="preserve">
     <value>Le (D)</value>
   </data>
   <data name="menuMoveTop" xml:space="preserve">
-    <value>Áthelyezés a tetejére (T)</value>
+    <value>Mozgatás felülre (T)</value>
   </data>
   <data name="menuMoveUp" xml:space="preserve">
     <value>Fel (U)</value>
@@ -817,28 +817,28 @@
     <value>Hozzáadás</value>
   </data>
   <data name="menuRoutingAdvancedImportRules" xml:space="preserve">
-    <value>Fejlett szabályok importálása</value>
+    <value>Szabályok importálása</value>
   </data>
   <data name="menuRoutingAdvancedRemove" xml:space="preserve">
-    <value>Kiválasztott eltávolítása (Törlés)</value>
+    <value>Kijelölt eltávolítása (Delete)</value>
   </data>
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
-    <value>Aktív szabályként beállítása (Enter)</value>
+    <value>Beállítás aktív szabályként (Enter)</value>
   </data>
   <data name="TbdomainMatcher" xml:space="preserve">
-    <value>Domain illesztő</value>
+    <value>Tartomány illesztő</value>
   </data>
   <data name="TbdomainStrategy" xml:space="preserve">
-    <value>Domain stratégia</value>
+    <value>Tartomány stratégia</value>
   </data>
   <data name="TbRoutingTabRuleList" xml:space="preserve">
-    <value>Előre definiált szabálykészletlista</value>
+    <value>Előre definiált szabálykészlet lista</value>
   </data>
   <data name="TbRoutingTips" xml:space="preserve">
-    <value>* Állítsa be a szabályokat, vesszővel elválasztva (,); A reguláris kifejezésben a vesszőt &lt;COMMA&gt; -ra cseréli</value>
+    <value>*Szabályok elválasztása vesszővel (,); Szó szerinti vesszőhöz használja a &lt;COMMA&gt;-t; Előtag # a szabály figyelmen kívül hagyásához</value>
   </data>
   <data name="menuImportRulesFromClipboard" xml:space="preserve">
-    <value>Szabályok importálása a vágólapról</value>
+    <value>Szabályok importálása vágólapról</value>
   </data>
   <data name="menuImportRulesFromFile" xml:space="preserve">
     <value>Szabályok importálása fájlból</value>
@@ -847,61 +847,61 @@
     <value>Szabályok importálása előfizetési URL-ből</value>
   </data>
   <data name="menuRoutingRuleSetting" xml:space="preserve">
-    <value>Szabálybeállítások</value>
+    <value>Szabály beállítások</value>
   </data>
   <data name="menuRuleAdd" xml:space="preserve">
     <value>Szabály hozzáadása</value>
   </data>
   <data name="menuRuleExportSelected" xml:space="preserve">
-    <value>Kiválasztott szabályok exportálása</value>
+    <value>Kijelölt szabályok exportálása</value>
   </data>
   <data name="menuRuleList" xml:space="preserve">
     <value>Szabálylista</value>
   </data>
   <data name="menuRuleRemove" xml:space="preserve">
-    <value>Szabály eltávolítása (Törlés)</value>
+    <value>Szabály eltávolítása (Delete)</value>
   </data>
   <data name="menuRoutingRuleDetailsSetting" xml:space="preserve">
-    <value>RoutingRuleDetailsSetting</value>
+    <value>Útválasztási szabály részleteinek beállítása</value>
   </data>
   <data name="TbAutoSort" xml:space="preserve">
-    <value>Domain, ip, folyamat automatikusan rendezve lesz a mentés során</value>
+    <value>Tartomány, IP, folyamat automatikusan rendeződik mentéskor</value>
   </data>
   <data name="TbRuleobjectDoc" xml:space="preserve">
-    <value>Szabály objektum dokumentáció</value>
+    <value>Szabály objektum dokumentum</value>
   </data>
   <data name="TbDnsObjectDoc" xml:space="preserve">
-    <value>Támogatja a DnsObject, kattintson a dokumentum megtekintésére</value>
+    <value>Támogatja a DNS objektumot; Kattintson a dokumentáció megtekintéséhez</value>
   </data>
   <data name="SubUrlTips" xml:space="preserve">
-    <value>Csoporthoz, kérlek, hagyd üresen ezt a mezőt</value>
+    <value>Csoport esetén hagyja üresen</value>
   </data>
   <data name="TipChangeRouting" xml:space="preserve">
-    <value>Útvonal beállítása megváltozott</value>
+    <value>Útválasztási beállítás megváltozott</value>
   </data>
   <data name="TipChangeSystemProxy" xml:space="preserve">
-    <value>Rendszer proxy beállítása megváltozott</value>
+    <value>Rendszerproxy beállítás megváltozott</value>
   </data>
   <data name="TbSettingsRouteOnly" xml:space="preserve">
-    <value>Csak útvonal</value>
+    <value>Csak útválasztás</value>
   </data>
   <data name="TbSettingsNotProxyLocalAddress" xml:space="preserve">
-    <value>Ne használjon proxy szervert a helyi (intranet) címekhez</value>
+    <value>Ne használjon proxy szervert helyi (intranet) címekhez</value>
   </data>
   <data name="menuMixedTestServer" xml:space="preserve">
-    <value>Egy kattintásos több teszt késleltetés és sebesség (Ctrl+E)</value>
+    <value>Egykattintásos többszörös késleltetés és sebesség teszt (Ctrl+E)</value>
   </data>
   <data name="LvTestDelay" xml:space="preserve">
-    <value>Késleltetés(ms)</value>
+    <value>Késleltetés (ms)</value>
   </data>
   <data name="LvTestSpeed" xml:space="preserve">
-    <value>Sebesség(M/s)</value>
+    <value>Sebesség (M/s)</value>
   </data>
   <data name="FailedToRunCore" xml:space="preserve">
-    <value>Nem sikerült futtatni a Core-t, kérlek, nézd meg a naplót</value>
+    <value>Nem sikerült futtatni a Core-t, kérjük, ellenőrizze a prompt információt</value>
   </data>
   <data name="LvFilter" xml:space="preserve">
-    <value>Megjegyzések reguláris szűrő</value>
+    <value>Megjegyzések reguláris szűrője</value>
   </data>
   <data name="TbDisplayLog" xml:space="preserve">
     <value>Napló megjelenítése</value>
@@ -913,61 +913,61 @@
     <value>Új port a LAN-hoz</value>
   </data>
   <data name="TbSettingsTunMode" xml:space="preserve">
-    <value>TunMode beállítások</value>
+    <value>Tun mód beállítások</value>
   </data>
   <data name="menuMoveToGroup" xml:space="preserve">
-    <value>Áthelyezés csoporthoz</value>
+    <value>Mozgatás csoportba</value>
   </data>
   <data name="TbSettingsEnableDragDropSort" xml:space="preserve">
-    <value>Proxy Drag Drop Szortírozás engedélyezése (indítás szükséges)</value>
+    <value>Konfigurációk rendezésének engedélyezése húzással (újraindítást igényel)</value>
   </data>
   <data name="TbAutoRefresh" xml:space="preserve">
-    <value>AutoFrissítés</value>
+    <value>Automatikus frissítés</value>
   </data>
   <data name="SpeedtestingSkip" xml:space="preserve">
     <value>Teszt kihagyása</value>
   </data>
   <data name="menuEditServer" xml:space="preserve">
-    <value>Szerver szerkesztése (Ctrl+D)</value>
+    <value>Konfiguráció szerkesztése (Ctrl+D)</value>
   </data>
   <data name="TbSettingsDoubleClick2Activate" xml:space="preserve">
-    <value>Kattintson duplán a szerver aktiválásához</value>
+    <value>Dupla kattintás a konfigurációra aktiválja</value>
   </data>
   <data name="SpeedtestingCompleted" xml:space="preserve">
-    <value>A teszt befejeződött</value>
+    <value>Teszt befejeződött</value>
   </data>
   <data name="TbSettingsDefFingerprint" xml:space="preserve">
     <value>Alapértelmezett TLS ujjlenyomat</value>
   </data>
   <data name="TbSettingsDefUserAgent" xml:space="preserve">
-    <value>Felhasználói ügynök</value>
+    <value>User-Agent</value>
   </data>
   <data name="TbSettingsDefUserAgentTips" xml:space="preserve">
     <value>Ez a paraméter csak tcp/http és ws esetén érvényes</value>
   </data>
   <data name="TbSettingsCurrentFontFamily" xml:space="preserve">
-    <value>Betűcsalád (indítás szükséges)</value>
+    <value>Betűtípus (újraindítást igényel)</value>
   </data>
   <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
-    <value>Kérlek, másold a betűtípus TTF/TTC fájlt a guiFonts könyvtárba, indítsd újra a beállításokat</value>
+    <value>Másolja a TTF/TTC betűtípus fájlt a gui Fonts könyvtárba; Nyissa meg újra a beállítások ablakot</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
     <value>Pac port = +3; Xray API port = +4; mihomo API port = +5;</value>
   </data>
   <data name="TbSettingsStartBootTip" xml:space="preserve">
-    <value>Állítsd be ezt admin jogokkal, indítás után szerezd meg az admin jogokat</value>
+    <value>Rendszergazdai jogosultságokkal állítsa be, indítás után szerezzen rendszergazdai jogosultságokat</value>
   </data>
   <data name="TbSettingsFontSize" xml:space="preserve">
     <value>Betűméret</value>
   </data>
   <data name="TbSettingsSpeedTestTimeout" xml:space="preserve">
-    <value>SpeedTest egyéni időtúllépési érték</value>
+    <value>Sebességteszt egyszeri időtúllépési érték</value>
   </data>
   <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
-    <value>SpeedTest URL</value>
+    <value>Sebességteszt URL</value>
   </data>
   <data name="menuMoveTo" xml:space="preserve">
-    <value>Feljebb és lejjebb mozgatás</value>
+    <value>Mozgatás fel és le</value>
   </data>
   <data name="TbPublicKey" xml:space="preserve">
     <value>Nyilvános kulcs</value>
@@ -976,40 +976,40 @@
     <value>Rövid azonosító</value>
   </data>
   <data name="TbSpiderX" xml:space="preserve">
-    <value>SpiderX</value>
+    <value>Spider X</value>
   </data>
   <data name="TbSettingsEnableHWA" xml:space="preserve">
-    <value>Hardveres gyorsítás engedélyezése (indítás szükséges)</value>
+    <value>Hardveres gyorsítás engedélyezése (újraindítást igényel)</value>
   </data>
   <data name="SpeedtestingWait" xml:space="preserve">
-    <value>Várakozás a tesztelésre (nyomj ESC-t a leállításhoz)...</value>
+    <value>Tesztelésre vár (ESC megnyomásával megszakítható)...</value>
   </data>
   <data name="TipDisplayLog" xml:space="preserve">
-    <value>Kérlek, kapcsold ki, ha szokatlan megszakítás történt</value>
+    <value>Kérjük, kapcsolja ki rendellenes megszakadás esetén</value>
   </data>
   <data name="MsgSkipSubscriptionUpdate" xml:space="preserve">
-    <value>A frissítések nincsenek aktiválva, átugorva ez az előfizetés</value>
+    <value>A frissítések nincsenek engedélyezve, kihagyja ezt az előfizetést</value>
   </data>
   <data name="menuRebootAsAdmin" xml:space="preserve">
-    <value>Újraindítás adminisztrátorként</value>
+    <value>Újraindítás rendszergazdaként</value>
   </data>
   <data name="LvMoreUrl" xml:space="preserve">
-    <value>Több URL, vesszővel elválasztva; Az előfizetés átalakítása érvénytelen lesz</value>
+    <value>További URL-ek, vesszővel elválasztva; Az előfizetés konverzió érvénytelen lesz</value>
   </data>
   <data name="SpeedDisplayText" xml:space="preserve">
     <value>{0} : {1}/s↑ | {2}/s↓</value>
   </data>
   <data name="LvAutoUpdateInterval" xml:space="preserve">
-    <value>Automatikus frissítési időköz (perc)</value>
+    <value>Automatikus frissítési intervallum (percek)</value>
   </data>
   <data name="TbSettingsLogEnabledToFile" xml:space="preserve">
-    <value>Napló engedélyezése fájlba</value>
+    <value>Naplózás engedélyezése fájlba</value>
   </data>
   <data name="LvConvertTarget" xml:space="preserve">
-    <value>Átalakítási cél típusa</value>
+    <value>Konverziós cél típus</value>
   </data>
   <data name="LvConvertTargetTip" xml:space="preserve">
-    <value>Kérlek, hagyd üresen, ha nincs szükség átalakításra</value>
+    <value>Kérjük, hagyja üresen, ha nincs szükség konverzióra</value>
   </data>
   <data name="menuDNSSetting" xml:space="preserve">
     <value>DNS beállítások</value>
@@ -1018,115 +1018,115 @@
     <value>sing-box DNS beállítások</value>
   </data>
   <data name="TbDnsSingboxObjectDoc" xml:space="preserve">
-    <value>Kérlek, töltsd ki a DNS struktúrát, kattints a dokumentum megtekintésére</value>
+    <value>Kérjük, töltse ki a DNS struktúrát, kattintson a dokumentum megtekintéséhez</value>
   </data>
   <data name="TbSettingDnsImportDefConfig" xml:space="preserve">
-    <value>Kattints az alapértelmezett DNS konfiguráció importálásához</value>
+    <value>Kattintson az alapértelmezett DNS konfiguráció importálásához</value>
   </data>
   <data name="TbdomainStrategy4Singbox" xml:space="preserve">
-    <value>sing-box domain stratégia</value>
+    <value>sing-box tartomány stratégia</value>
   </data>
   <data name="TbSettingsMux4SboxProtocol" xml:space="preserve">
     <value>sing-box Mux protokoll</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>Teljes folyamat neve (Tun módban)</value>
+    <value>Teljes folyamatnév (Tun mód)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP vagy IP CIDR</value>
   </data>
   <data name="TbRoutingRuleDomain" xml:space="preserve">
-    <value>Domain</value>
+    <value>Tartomány</value>
   </data>
   <data name="menuAddHysteria2Server" xml:space="preserve">
-    <value>[Hysteria2] szerver hozzáadása</value>
+    <value>Hysteria2 konfiguráció hozzáadása</value>
   </data>
   <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
-    <value>Hysteria maximális sávszélesség (Felfelé/Letöltés)</value>
+    <value>Hysteria Max sávszélesség (Fel/Le)</value>
   </data>
   <data name="TbSettingsUseSystemHosts" xml:space="preserve">
-    <value>Rendszer gazdagépeket használ</value>
+    <value>Rendszer Hosts használata</value>
   </data>
   <data name="menuAddTuicServer" xml:space="preserve">
-    <value>[TUIC] szerver hozzáadása</value>
+    <value>TUIC konfiguráció hozzáadása</value>
   </data>
   <data name="TbHeaderType8" xml:space="preserve">
-    <value>Befogadó irányítás</value>
+    <value>Torlódásvezérlés</value>
   </data>
   <data name="LvPrevProfile" xml:space="preserve">
-    <value>Előző proxy megjegyzések</value>
+    <value>Előző proxy konfiguráció megjegyzései</value>
   </data>
   <data name="LvNextProfile" xml:space="preserve">
-    <value>Következő proxy megjegyzések</value>
+    <value>Következő proxy konfiguráció megjegyzései</value>
   </data>
   <data name="LvPrevProfileTip" xml:space="preserve">
-    <value>Kérlek, győződj meg róla, hogy a megjegyzés létezik és egyedi</value>
+    <value>Kérjük, győződjön meg arról, hogy a konfigurációs megjegyzések léteznek és egyediek</value>
   </data>
   <data name="TbSettingsEnableExInbound" xml:space="preserve">
-    <value>Kiegészítő bejövő engedélyezése</value>
+    <value>További bejövő engedélyezése</value>
   </data>
   <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
     <value>IPv6 cím engedélyezése</value>
   </data>
   <data name="menuAddWireguardServer" xml:space="preserve">
-    <value>[WireGuard] szerver hozzáadása</value>
+    <value>WireGuard konfiguráció hozzáadása</value>
   </data>
   <data name="TbPrivateKey" xml:space="preserve">
     <value>Privát kulcs</value>
   </data>
   <data name="TbReserved" xml:space="preserve">
-    <value>Fenntartva (2,3,4)</value>
+    <value>Fenntartott (2,3,4)</value>
   </data>
   <data name="TbLocalAddress" xml:space="preserve">
-    <value>Cím (Ipv4,Ipv6)</value>
+    <value>Cím (IPv4, IPv6)</value>
   </data>
   <data name="TbPath7" xml:space="preserve">
     <value>obfs jelszó</value>
   </data>
   <data name="TbRuleMatchingTips" xml:space="preserve">
-    <value>(Domain vagy IP vagy ProcName) és Port és Protokoll és InboundTag =&gt; OutboundTag</value>
+    <value>(Tartomány vagy IP vagy folyamatnév) és port és protokoll és bejövő címke =&gt; kimenő címke</value>
   </data>
   <data name="TbAutoScrollToEnd" xml:space="preserve">
     <value>Automatikus görgetés a végére</value>
   </data>
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
-    <value>Speed Ping Test URL</value>
+    <value>Sebesség Ping Teszt URL</value>
   </data>
   <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
-    <value>Előfizetés frissítése, csak akkor határozd meg, ha a megjegyzések léteznek</value>
+    <value>Előfizetés frissítése, csak a megjegyzések létezésének ellenőrzése</value>
   </data>
   <data name="SpeedtestingStop" xml:space="preserve">
-    <value>A teszt leállítása...</value>
+    <value>Teszt megszakítása...</value>
   </data>
   <data name="TransportRequestHostTip5" xml:space="preserve">
-    <value>*grpc Hatóság</value>
+    <value>*grpc Authority</value>
   </data>
   <data name="menuAddHttpServer" xml:space="preserve">
-    <value>[HTTP] szerver hozzáadása</value>
+    <value>HTTP konfiguráció hozzáadása</value>
   </data>
   <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
-    <value>Használja az Xray-t és engedélyezze a nem-Tun módot, amely összeférhet a csoport előző proxy-jával</value>
+    <value>Használja az Xray-t és engedélyezze a nem Tun módot, ami ütközik a csoport előző proxyjával</value>
   </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
-    <value>Fragmentum engedélyezése</value>
+    <value>Fragment engedélyezése</value>
   </data>
   <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
-    <value>Cache fájl engedélyezése a sing-box számára (szabálykészlet fájlok)</value>
+    <value>Gyorsítótár fájl engedélyezése sing-boxhoz (szabálykészlet fájlok)</value>
   </data>
   <data name="LvCustomRulesetPath4Singbox" xml:space="preserve">
-    <value>Testreszabott a sing-box szabálykészletének</value>
+    <value>A sing-box szabálykészletének testreszabása</value>
   </data>
   <data name="NeedRebootTips" xml:space="preserve">
-    <value>Sikeres művelet. Kattintson a beállítási menüre az alkalmazás újraindításához.</value>
+    <value>Sikeres művelet. Kattintson a beállítások menüre az alkalmazás újraindításához.</value>
   </data>
   <data name="menuOpenTheFileLocation" xml:space="preserve">
-    <value>Megnyitja a tárolás helyét</value>
+    <value>Fájl helyének megnyitása</value>
   </data>
   <data name="TbSorting" xml:space="preserve">
     <value>Rendezés</value>
   </data>
   <data name="TbSortingChain" xml:space="preserve">
-    <value>Zárlat</value>
+    <value>Lánc</value>
   </data>
   <data name="TbSortingDefault" xml:space="preserve">
     <value>Alapértelmezett</value>
@@ -1141,7 +1141,7 @@
     <value>Letöltési forgalom</value>
   </data>
   <data name="TbSortingHost" xml:space="preserve">
-    <value>Gazda</value>
+    <value>Host</value>
   </data>
   <data name="TbSortingName" xml:space="preserve">
     <value>Név</value>
@@ -1171,7 +1171,7 @@
     <value>Összes kapcsolat bezárása</value>
   </data>
   <data name="TbProxies" xml:space="preserve">
-    <value>Proxy-k</value>
+    <value>Proxyk</value>
   </data>
   <data name="menuRulemode" xml:space="preserve">
     <value>Szabály mód</value>
@@ -1183,7 +1183,7 @@
     <value>Globális</value>
   </data>
   <data name="menuModeNothing" xml:space="preserve">
-    <value>Ne változtasson</value>
+    <value>Ne változtassa meg</value>
   </data>
   <data name="menuModeRule" xml:space="preserve">
     <value>Szabály</value>
@@ -1195,49 +1195,49 @@
     <value>Részleges csomópont késleltetés teszt</value>
   </data>
   <data name="menuProxiesReload" xml:space="preserve">
-    <value>Proxy-k frissítése</value>
+    <value>Proxyk frissítése</value>
   </data>
   <data name="menuProxiesSelectActivity" xml:space="preserve">
     <value>Aktív csomópont kiválasztása (Enter)</value>
   </data>
   <data name="TbSettingsDomainStrategy4Out" xml:space="preserve">
-    <value>Alapértelmezett domain stratégia a kimenő forgalomhoz</value>
+    <value>Alapértelmezett tartomány stratégia kimenő forgalomhoz</value>
   </data>
   <data name="TbSettingsMainGirdOrientation" xml:space="preserve">
-    <value>Fő elrendezés irányítása (indítás szükséges)</value>
+    <value>Fő elrendezés iránya (újraindítást igényel)</value>
   </data>
   <data name="TbSettingsDomainDNSAddress" xml:space="preserve">
     <value>Kimenő DNS cím</value>
   </data>
   <data name="menuProfileAutofitColumnWidth" xml:space="preserve">
-    <value>Oszlop szélesség automatikus beállítása</value>
+    <value>Oszlopszélesség automatikus beállítása</value>
   </data>
   <data name="menuExport2ShareUrlBase64" xml:space="preserve">
-    <value>Exportálja a Base64-kódolt megosztási linkeket a vágólapra</value>
+    <value>Base64-kódolt megosztási linkek exportálása vágólapra</value>
   </data>
   <data name="menuExport2ClientConfigClipboard" xml:space="preserve">
-    <value>Kiválasztott szerver exportálása teljes konfigurációval a vágólapra</value>
+    <value>Kijelölt konfiguráció exportálása teljes konfigurációként a vágólapra</value>
   </data>
   <data name="menuShowOrHideMainWindow" xml:space="preserve">
-    <value>Fő ablak megjelenítése vagy elrejtése</value>
+    <value>Főablak megjelenítése vagy elrejtése</value>
   </data>
   <data name="TbPreSocksPort4Sub" xml:space="preserve">
-    <value>Testreszabott konfigurációs socks port</value>
+    <value>Egyéni konfiguráció socks portja</value>
   </data>
   <data name="menuBackupAndRestore" xml:space="preserve">
     <value>Biztonsági mentés és visszaállítás</value>
   </data>
   <data name="menuLocalBackup" xml:space="preserve">
-    <value>Biztonsági mentés helyben</value>
+    <value>Biztonsági mentés helyi tárolóba</value>
   </data>
   <data name="menuLocalRestore" xml:space="preserve">
-    <value>Visszaállítás helyben</value>
+    <value>Visszaállítás helyi tárolóból</value>
   </data>
   <data name="menuRemoteBackup" xml:space="preserve">
-    <value>Biztonsági mentés távolról (WebDAV)</value>
+    <value>Biztonsági mentés távoli helyre (WebDAV)</value>
   </data>
   <data name="menuRemoteRestore" xml:space="preserve">
-    <value>Visszaállítás távolról (WebDAV)</value>
+    <value>Visszaállítás távoli helyről (WebDAV)</value>
   </data>
   <data name="menuLocalBackupAndRestore" xml:space="preserve">
     <value>Helyi</value>
@@ -1246,25 +1246,25 @@
     <value>Távoli (WebDAV)</value>
   </data>
   <data name="LvWebDavUrl" xml:space="preserve">
-    <value>WebDav URL</value>
+    <value>WebDAV URL</value>
   </data>
   <data name="LvWebDavUserName" xml:space="preserve">
-    <value>WebDav Felhasználónév</value>
+    <value>WebDAV felhasználónév</value>
   </data>
   <data name="LvWebDavPassword" xml:space="preserve">
-    <value>WebDav Jelszó</value>
+    <value>WebDAV jelszó</value>
   </data>
   <data name="LvWebDavCheck" xml:space="preserve">
-    <value>WebDav Ellenőrzés</value>
+    <value>WebDAV ellenőrzés</value>
   </data>
   <data name="LvWebDavDirName" xml:space="preserve">
     <value>Távoli mappa neve (opcionális)</value>
   </data>
   <data name="LocalRestoreInvalidZipTips" xml:space="preserve">
-    <value>Érvénytelen mentési fájl</value>
+    <value>Érvénytelen biztonsági mentés fájl</value>
   </data>
   <data name="ConnectionsHostFilterTitle" xml:space="preserve">
-    <value>Gazda szűrő</value>
+    <value>Host szűrő</value>
   </data>
   <data name="TipActiveServer" xml:space="preserve">
     <value>Aktív</value>
@@ -1276,13 +1276,13 @@
     <value>sing-box szabálykészlet fájlok forrása (opcionális)</value>
   </data>
   <data name="UpgradeAppNotExistTip" xml:space="preserve">
-    <value>UpgradeApp nem létezik</value>
+    <value>Frissítő alkalmazás nem létezik</value>
   </data>
   <data name="TbSettingsRoutingRulesSource" xml:space="preserve">
-    <value>Útvonal szabályok forrása (opcionális)</value>
+    <value>Útválasztási szabályok forrása (opcionális)</value>
   </data>
   <data name="menuRegionalPresets" xml:space="preserve">
-    <value>Regionális előbeállítások beállítása</value>
+    <value>Regionális előbeállítások</value>
   </data>
   <data name="menuRegionalPresetsDefault" xml:space="preserve">
     <value>Alapértelmezett</value>
@@ -1294,22 +1294,22 @@
     <value>Irán</value>
   </data>
   <data name="TbSettingsChinaUserTip" xml:space="preserve">
-    <value>A Kínában élő felhasználók figyelmen kívül hagyhatják ezt a tételt</value>
+    <value>Kínai régióban lévő felhasználók figyelmen kívül hagyhatják ezt az elemet</value>
   </data>
   <data name="menuAddServerViaImage" xml:space="preserve">
-    <value>QR kód beolvasása a képen</value>
+    <value>QR kód beolvasása a képből</value>
   </data>
   <data name="InvalidUrlTip" xml:space="preserve">
-    <value>Érvénytelen cím (Url)</value>
+    <value>Érvénytelen cím (URL)</value>
   </data>
   <data name="InsecureUrlProtocol" xml:space="preserve">
-    <value>Kérlek, ne használd a nem biztonságos HTTP protokollt az előfizetés címeknél</value>
+    <value>Kérjük, ne használjon nem biztonságos HTTP protokoll előfizetési címet</value>
   </data>
   <data name="TbSettingsCurrentFontFamilyLinuxTip" xml:space="preserve">
-    <value>Telepítsd a betűtípust a rendszerbe és indítsd újra a beállításokat</value>
+    <value>Telepítse a betűtípust a rendszerbe, válassza ki vagy töltse ki a betűtípus nevét, indítsa újra a beállításokat</value>
   </data>
   <data name="menuExitTips" xml:space="preserve">
-    <value>Biztosan ki akarsz lépni?</value>
+    <value>Biztosan ki akar lépni?</value>
   </data>
   <data name="LvMemo" xml:space="preserve">
     <value>Megjegyzések</value>
@@ -1318,84 +1318,84 @@
     <value>Rendszer sudo jelszó</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
-    <value>The password will be validated via the command line. If a validation error causes the application to malfunction, please restart the application. The password will not be stored and must be entered again after each restart.</value>
+    <value>A jelszót a parancssoron keresztül ellenőrizzük. Ha egy érvényesítési hiba miatt az alkalmazás hibásan működik, indítsa újra az alkalmazást. A jelszó nem kerül tárolásra, és minden újraindítás után újra meg kell adni.</value>
   </data>
   <data name="TransportHeaderTypeTip5" xml:space="preserve">
     <value>*xhttp mód</value>
   </data>
   <data name="TransportExtraTip" xml:space="preserve">
-    <value>XHTTP További nyers JSON, formátum: { XHTTPObject }</value>
+    <value>XHTTP Extra nyers JSON, formátum: { XHTTP Objektum }</value>
   </data>
   <data name="TbSettingsHide2TrayWhenClose" xml:space="preserve">
-    <value>Minimálás tálcára ablak zárásakor</value>
+    <value>Ablak bezárásakor a tálcára rejtés</value>
   </data>
   <data name="TbSettingsMixedConcurrencyCount" xml:space="preserve">
-    <value>The number of concurrent during multi-test</value>
+    <value>A párhuzamos tesztek száma több teszt során</value>
   </data>
   <data name="TbSettingsExceptionTip2" xml:space="preserve">
-    <value>Kivétel. Ne használj proxy szervert a címeknél, évezz pontosvesszőt (,)</value>
+    <value>Kivételek: Ne használjon proxy szervert a következő címekhez. Vesszővel (,) válassza el a bejegyzéseket.</value>
   </data>
   <data name="TbSettingsDestOverride" xml:space="preserve">
-    <value>Sniffing type</value>
+    <value>Sniffing típus</value>
   </data>
   <data name="TbSettingsSecondLocalPortEnabled" xml:space="preserve">
-    <value>Enable second mixed port</value>
+    <value>Második vegyes port engedélyezése</value>
   </data>
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
-    <value>socks: local port, socks2: second local port, socks3: LAN port</value>
+    <value>socks: helyi port, socks2: második helyi port, socks3: LAN port</value>
   </data>
   <data name="TbSettingsTheme" xml:space="preserve">
-    <value>Theme</value>
+    <value>Téma</value>
   </data>
   <data name="menuCopyProxyCmdToClipboard" xml:space="preserve">
-    <value>Copy proxy command to clipboard</value>
+    <value>Proxy parancs másolása vágólapra</value>
   </data>
   <data name="SpeedtestingTestFailedPart" xml:space="preserve">
-    <value>Starting retesting failed parts, {0} remaining. Press ESC to terminate...</value>
+    <value>Sikertelen részek újratesztelése elindult, {0} maradt. ESC megnyomásával megszakítható...</value>
   </data>
   <data name="menuTestServerResult" xml:space="preserve">
-    <value>By test result</value>
+    <value>Teszt eredmény szerint</value>
   </data>
   <data name="menuRemoveInvalidServerResult" xml:space="preserve">
-    <value>Remove invalid by test results</value>
+    <value>Érvénytelenek eltávolítása teszteredmények alapján</value>
   </data>
   <data name="RemoveInvalidServerResultTip" xml:space="preserve">
-    <value>Removed {0} invalid test results.</value>
+    <value>Eltávolítva {0} érvénytelen teszteredmény.</value>
   </data>
   <data name="TbPorts7" xml:space="preserve">
-    <value>Server port range</value>
+    <value>Konfigurációs port tartomány</value>
   </data>
   <data name="TbPorts7Tips" xml:space="preserve">
-    <value>Will cover the port, separate with commas (,)</value>
+    <value>A portot lefedi, vesszővel (,) elválasztva</value>
   </data>
   <data name="menuSetDefaultMultipleServer" xml:space="preserve">
-    <value>Multi-server to custom configuration</value>
+    <value>Több konfiguráció egyéni konfigurációra</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayRandom" xml:space="preserve">
-    <value>Multi-server Random by Xray</value>
+    <value>Több konfiguráció véletlenszerűen Xray szerint</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayRoundRobin" xml:space="preserve">
-    <value>Multi-server RoundRobin by Xray</value>
+    <value>Több konfiguráció RoundRobin Xray szerint</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayLeastPing" xml:space="preserve">
-    <value>Multi-server LeastPing by Xray</value>
+    <value>Több konfiguráció legkisebb pinggel Xray szerint</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayLeastLoad" xml:space="preserve">
-    <value>Multi-server LeastLoad by Xray</value>
+    <value>Több konfiguráció legkisebb terheléssel Xray szerint</value>
   </data>
   <data name="menuSetDefaultMultipleServerSingBoxLeastPing" xml:space="preserve">
-    <value>Multi-server LeastPing by sing-box</value>
+    <value>Több konfiguráció legkisebb pinggel sing-box szerint</value>
   </data>
   <data name="menuExportConfig" xml:space="preserve">
-    <value>Export server</value>
+    <value>Konfiguráció exportálása</value>
   </data>
   <data name="TbSettingsIPAPIUrl" xml:space="preserve">
-    <value>Current connection info test URL</value>
+    <value>Aktuális kapcsolat info teszt URL</value>
   </data>
   <data name="TbRuleOutboundTagTip" xml:space="preserve">
-    <value>Can fill in the configuration remarks, please make sure it exist and are unique</value>
+    <value>Kitöltheti a konfigurációs megjegyzéseket, kérjük, győződjön meg róla, hogy létezik és egyedi</value>
   </data>
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
-    <value>Incorrect password, please try again.</value>
+    <value>Helytelen jelszó, próbálja újra.</value>
   </data>
-</root>
\ No newline at end of file
+</root>

From d820c4367ea945a3a982b7ca91411b5a024e4b6c Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 3 Aug 2025 10:34:21 +0800
Subject: [PATCH 017/115] =?UTF-8?q?Add=20Mldsa65Verify=EF=BC=8CXray-core?=
 =?UTF-8?q?=20v25.7.26+?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/XTLS/Xray-core/pull/4915
---
 v2rayN/ServiceLib/Handler/ConfigHandler.cs      |  1 +
 v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs        |  5 +++++
 v2rayN/ServiceLib/Models/ProfileItem.cs         |  1 +
 v2rayN/ServiceLib/Models/V2rayConfig.cs         |  1 +
 v2rayN/ServiceLib/Resx/ResUI.Designer.cs        |  9 +++++++++
 v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx         |  3 +++
 v2rayN/ServiceLib/Resx/ResUI.hu.resx            |  5 ++++-
 v2rayN/ServiceLib/Resx/ResUI.resx               |  3 +++
 v2rayN/ServiceLib/Resx/ResUI.ru.resx            |  3 +++
 v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx       |  3 +++
 v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx       |  3 +++
 .../CoreConfig/CoreConfigV2rayService.cs        |  1 +
 .../v2rayN.Desktop/Views/AddServerWindow.axaml  | 16 +++++++++++++++-
 .../Views/AddServerWindow.axaml.cs              |  1 +
 v2rayN/v2rayN/Views/AddServerWindow.xaml        | 17 +++++++++++++++++
 v2rayN/v2rayN/Views/AddServerWindow.xaml.cs     |  1 +
 16 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
index c08ca28e..0eeadc46 100644
--- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -246,6 +246,7 @@ public class ConfigHandler
             item.PublicKey = profileItem.PublicKey;
             item.ShortId = profileItem.ShortId;
             item.SpiderX = profileItem.SpiderX;
+            item.Mldsa65Verify = profileItem.Mldsa65Verify;
             item.Extra = profileItem.Extra;
             item.MuxEnabled = profileItem.MuxEnabled;
         }
diff --git a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
index 86b92fa0..fa84a411 100644
--- a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
+++ b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
@@ -59,6 +59,10 @@ public class BaseFmt
         {
             dicQuery.Add("spx", Utils.UrlEncode(item.SpiderX));
         }
+        if (item.Mldsa65Verify.IsNotEmpty())
+        {
+            dicQuery.Add("pqv", Utils.UrlEncode(item.Mldsa65Verify));
+        }       
         if (item.AllowInsecure.Equals("true"))
         {
             dicQuery.Add("allowInsecure", "1");
@@ -159,6 +163,7 @@ public class BaseFmt
         item.PublicKey = Utils.UrlDecode(query["pbk"] ?? "");
         item.ShortId = Utils.UrlDecode(query["sid"] ?? "");
         item.SpiderX = Utils.UrlDecode(query["spx"] ?? "");
+        item.Mldsa65Verify = Utils.UrlDecode(query["pqv"] ?? "");
         item.AllowInsecure = (query["allowInsecure"] ?? "") == "1" ? "true" : "";
 
         item.Network = query["type"] ?? nameof(ETransport.tcp);
diff --git a/v2rayN/ServiceLib/Models/ProfileItem.cs b/v2rayN/ServiceLib/Models/ProfileItem.cs
index 077bc4b2..998aa120 100644
--- a/v2rayN/ServiceLib/Models/ProfileItem.cs
+++ b/v2rayN/ServiceLib/Models/ProfileItem.cs
@@ -93,6 +93,7 @@ public class ProfileItem : ReactiveObject
     public string PublicKey { get; set; }
     public string ShortId { get; set; }
     public string SpiderX { get; set; }
+    public string Mldsa65Verify { get; set; }
     public string Extra { get; set; }
     public bool? MuxEnabled { get; set; }
 }
diff --git a/v2rayN/ServiceLib/Models/V2rayConfig.cs b/v2rayN/ServiceLib/Models/V2rayConfig.cs
index 2e5ed4b4..e7cd3722 100644
--- a/v2rayN/ServiceLib/Models/V2rayConfig.cs
+++ b/v2rayN/ServiceLib/Models/V2rayConfig.cs
@@ -340,6 +340,7 @@ public class TlsSettings4Ray
     public string? publicKey { get; set; }
     public string? shortId { get; set; }
     public string? spiderX { get; set; }
+    public string? mldsa65Verify { get; set; }
 }
 
 public class TcpSettings4Ray
diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index 23469763..992adb94 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -2517,6 +2517,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Mldsa65Verify 的本地化字符串。
+        /// </summary>
+        public static string TbMldsa65Verify {
+            get {
+                return ResourceManager.GetString("TbMldsa65Verify", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Transport protocol(network) 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
index 1f05cf8f..eb9ae271 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1398,4 +1398,7 @@
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>Incorrect password, please try again.</value>
   </data>
+  <data name="TbMldsa65Verify" xml:space="preserve">
+    <value>Mldsa65Verify</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
index d7fd9fd3..0d45540e 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1398,4 +1398,7 @@
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>Helytelen jelszó, próbálja újra.</value>
   </data>
-</root>
+  <data name="TbMldsa65Verify" xml:space="preserve">
+    <value>Mldsa65Verify</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index 2826c9cc..03e9b124 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1398,4 +1398,7 @@
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>Incorrect password, please try again.</value>
   </data>
+  <data name="TbMldsa65Verify" xml:space="preserve">
+    <value>Mldsa65Verify</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
index a4d82127..75a596aa 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1398,4 +1398,7 @@
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>Incorrect password, please try again.</value>
   </data>
+  <data name="TbMldsa65Verify" xml:space="preserve">
+    <value>Mldsa65Verify</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index 55186822..8766ca8f 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1395,4 +1395,7 @@
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>密码错误，请重试。</value>
   </data>
+  <data name="TbMldsa65Verify" xml:space="preserve">
+    <value>Mldsa65Verify</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index cbf27b8c..9c7a2a3c 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1395,4 +1395,7 @@
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>密碼錯誤，請重試。</value>
   </data>
+  <data name="TbMldsa65Verify" xml:space="preserve">
+    <value>Mldsa65Verify</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
index 9be1acf0..2e4f5842 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
@@ -944,6 +944,7 @@ public class CoreConfigV2rayService
                     publicKey = node.PublicKey,
                     shortId = node.ShortId,
                     spiderX = node.SpiderX,
+                    mldsa65Verify = node.Mldsa65Verify,
                     show = false,
                 };
 
diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
index ad30f985..da56d617 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
@@ -753,7 +753,7 @@
                     Grid.Row="7"
                     ColumnDefinitions="180,Auto"
                     IsVisible="False"
-                    RowDefinitions="Auto,Auto,Auto,Auto,Auto">
+                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
 
                     <TextBlock
                         Grid.Row="0"
@@ -823,6 +823,20 @@
                         Width="400"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
+
+                    <TextBlock
+                        Grid.Row="5"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbMldsa65Verify}" />
+                    <TextBox
+                        x:Name="txtMldsa65Verify"
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
                 </Grid>
                 <Separator Grid.Row="8" Margin="{StaticResource MarginTb8}" />
             </Grid>
diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
index 5b86143b..3adef603 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
@@ -185,6 +185,7 @@ public partial class AddServerWindow : WindowBase<AddServerViewModel>
             this.Bind(ViewModel, vm => vm.SelectedSource.PublicKey, v => v.txtPublicKey.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.ShortId, v => v.txtShortId.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.SpiderX, v => v.txtSpiderX.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SelectedSource.Mldsa65Verify, v => v.txtMldsa65Verify.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml
index 3b7be680..9a4b88ad 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -979,6 +979,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="180" />
@@ -1064,6 +1065,22 @@
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
+
+                    <TextBlock
+                        Grid.Row="5"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbMldsa65Verify}" />
+                    <TextBox
+                        x:Name="txtMldsa65Verify"
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left"
+                        Style="{StaticResource DefTextBox}" />
                 </Grid>
                 <Separator
                     Grid.Row="8"
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
index c2c13636..a89b0243 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
@@ -179,6 +179,7 @@ public partial class AddServerWindow
             this.Bind(ViewModel, vm => vm.SelectedSource.PublicKey, v => v.txtPublicKey.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.ShortId, v => v.txtShortId.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.SpiderX, v => v.txtSpiderX.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SelectedSource.Mldsa65Verify, v => v.txtMldsa65Verify.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });

From 6973272dd08b05dd9921291f1f8e49d134ee541c Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 3 Aug 2025 10:49:28 +0800
Subject: [PATCH 018/115] up 7.13.6

---
 v2rayN/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/Directory.Build.props b/v2rayN/Directory.Build.props
index 484cde47..901b15d8 100644
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.13.5</Version>
+        <Version>7.13.6</Version>
     </PropertyGroup>
 
     <PropertyGroup>

From 508eb24fc3a8ad03a249332446da98754d005bbe Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 5 Aug 2025 19:31:48 +0800
Subject: [PATCH 019/115] Temporary addition to support proper use of sing-box
 v1.12

https://github.com/2dust/v2rayN/issues/7698
---
 v2rayN/ServiceLib/Handler/CoreHandler.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/v2rayN/ServiceLib/Handler/CoreHandler.cs b/v2rayN/ServiceLib/Handler/CoreHandler.cs
index f0c23c69..a0e20d07 100644
--- a/v2rayN/ServiceLib/Handler/CoreHandler.cs
+++ b/v2rayN/ServiceLib/Handler/CoreHandler.cs
@@ -25,6 +25,8 @@ public class CoreHandler
         Environment.SetEnvironmentVariable(Global.V2RayLocalAsset, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
         Environment.SetEnvironmentVariable(Global.XrayLocalAsset, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
         Environment.SetEnvironmentVariable(Global.XrayLocalCert, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
+        // TODO Temporary addition to support proper use of sing-box v1.12
+        Environment.SetEnvironmentVariable("ENABLE_DEPRECATED_SPECIAL_OUTBOUNDS", "true", EnvironmentVariableTarget.Process);
 
         //Copy the bin folder to the storage location (for init)
         if (Environment.GetEnvironmentVariable(Global.LocalAppData) == "1")

From 610418b42b40ab59ad73538df1a797b219a13189 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 6 Aug 2025 21:01:06 +0800
Subject: [PATCH 020/115] In the Desktop version, the information box uses
 SelectableTextBlock to replace TextBox

https://github.com/2dust/v2rayN/issues/7644
---
 .../ViewModels/ThemeSettingViewModel.cs       |  2 +
 v2rayN/v2rayN.Desktop/Views/MsgView.axaml     | 59 ++++++++++---------
 v2rayN/v2rayN.Desktop/Views/MsgView.axaml.cs  |  8 ++-
 3 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs b/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
index ea1a3b66..877a3b4f 100644
--- a/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
+++ b/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
@@ -107,6 +107,7 @@ public class ThemeSettingViewModel : MyReactiveObject
             x.OfType<Button>(),
             x.OfType<TextBox>(),
             x.OfType<TextBlock>(),
+            x.OfType<SelectableTextBlock>(),
             x.OfType<Menu>(),
             x.OfType<ContextMenu>(),
             x.OfType<DataGridRow>(),
@@ -146,6 +147,7 @@ public class ThemeSettingViewModel : MyReactiveObject
                 x.OfType<Button>(),
                 x.OfType<TextBox>(),
                 x.OfType<TextBlock>(),
+                x.OfType<SelectableTextBlock>(),
                 x.OfType<Menu>(),
                 x.OfType<ContextMenu>(),
                 x.OfType<DataGridRow>(),
diff --git a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
index a9875c76..3668b81e 100644
--- a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
@@ -69,34 +69,35 @@
                 IsChecked="True"
                 Theme="{DynamicResource SimpleToggleSwitch}" />
         </WrapPanel>
-        <TextBox
-            Name="txtMsg"
-            VerticalAlignment="Stretch"
-            BorderThickness="0"
-            Classes="TextArea"
-            IsReadOnly="True"
-            TextAlignment="Left"
-            TextWrapping="Wrap">
-            <TextBox.ContextMenu>
-                <ContextMenu>
-                    <MenuItem
-                        x:Name="menuMsgViewSelectAll"
-                        Click="menuMsgViewSelectAll_Click"
-                        Header="{x:Static resx:ResUI.menuMsgViewSelectAll}" />
-                    <MenuItem
-                        x:Name="menuMsgViewCopy"
-                        Click="menuMsgViewCopy_Click"
-                        Header="{x:Static resx:ResUI.menuMsgViewCopy}" />
-                    <MenuItem
-                        x:Name="menuMsgViewCopyAll"
-                        Click="menuMsgViewCopyAll_Click"
-                        Header="{x:Static resx:ResUI.menuMsgViewCopyAll}" />
-                    <MenuItem
-                        x:Name="menuMsgViewClear"
-                        Click="menuMsgViewClear_Click"
-                        Header="{x:Static resx:ResUI.menuMsgViewClear}" />
-                </ContextMenu>
-            </TextBox.ContextMenu>
-        </TextBox>
+
+        <ScrollViewer x:Name="msgScrollViewer" VerticalScrollBarVisibility="Auto">
+            <SelectableTextBlock
+                Name="txtMsg"
+                VerticalAlignment="Stretch"
+                Classes="TextArea"
+                TextAlignment="Left"
+                TextWrapping="Wrap">
+                <SelectableTextBlock.ContextMenu>
+                    <ContextMenu>
+                        <MenuItem
+                            x:Name="menuMsgViewSelectAll"
+                            Click="menuMsgViewSelectAll_Click"
+                            Header="{x:Static resx:ResUI.menuMsgViewSelectAll}" />
+                        <MenuItem
+                            x:Name="menuMsgViewCopy"
+                            Click="menuMsgViewCopy_Click"
+                            Header="{x:Static resx:ResUI.menuMsgViewCopy}" />
+                        <MenuItem
+                            x:Name="menuMsgViewCopyAll"
+                            Click="menuMsgViewCopyAll_Click"
+                            Header="{x:Static resx:ResUI.menuMsgViewCopyAll}" />
+                        <MenuItem
+                            x:Name="menuMsgViewClear"
+                            Click="menuMsgViewClear_Click"
+                            Header="{x:Static resx:ResUI.menuMsgViewClear}" />
+                    </ContextMenu>
+                </SelectableTextBlock.ContextMenu>
+            </SelectableTextBlock>
+        </ScrollViewer>
     </DockPanel>
 </UserControl>
diff --git a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml.cs
index f606a10b..e2d21101 100644
--- a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml.cs
@@ -1,4 +1,5 @@
 using System.Reactive.Disposables;
+using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
@@ -9,9 +10,12 @@ namespace v2rayN.Desktop.Views;
 
 public partial class MsgView : ReactiveUserControl<MsgViewModel>
 {
+    private readonly ScrollViewer _scrollViewer;
+
     public MsgView()
     {
         InitializeComponent();
+        _scrollViewer = this.FindControl<ScrollViewer>("msgScrollViewer");
 
         ViewModel = new MsgViewModel(UpdateViewHandler);
 
@@ -43,14 +47,14 @@ public partial class MsgView : ReactiveUserControl<MsgViewModel>
         txtMsg.Text = msg.ToString();
         if (togScrollToEnd.IsChecked ?? true)
         {
-            txtMsg.CaretIndex = int.MaxValue;
+            _scrollViewer?.ScrollToEnd();
         }
     }
 
     public void ClearMsg()
     {
         ViewModel?.ClearMsg();
-        txtMsg.Clear();
+        txtMsg.Text = "";
     }
 
     private void menuMsgViewSelectAll_Click(object? sender, RoutedEventArgs e)

From 46db5efef3f2c39678089c8692c41585766e0e2e Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 7 Aug 2025 13:30:36 +0800
Subject: [PATCH 021/115] Update Directory.Packages.props

---
 v2rayN/Directory.Packages.props | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/v2rayN/Directory.Packages.props b/v2rayN/Directory.Packages.props
index 57a50cfb..48fba7da 100644
--- a/v2rayN/Directory.Packages.props
+++ b/v2rayN/Directory.Packages.props
@@ -5,10 +5,10 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.2" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.2" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.2" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.2" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.3" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.3" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.3" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.3" />
     <PackageVersion Include="CliWrap" Version="3.9.0" />
     <PackageVersion Include="Downloader" Version="4.0.2" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />

From c669e72189e22bb50822402a7096bc0a06ec3c54 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 7 Aug 2025 13:35:16 +0800
Subject: [PATCH 022/115] up 7.13.7

---
 v2rayN/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/Directory.Build.props b/v2rayN/Directory.Build.props
index 901b15d8..7444d9cf 100644
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.13.6</Version>
+        <Version>7.13.7</Version>
     </PropertyGroup>
 
     <PropertyGroup>

From df95cc6af7d6dbdf7677824a40cf1d3145cc7bb0 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 10 Aug 2025 09:17:15 +0800
Subject: [PATCH 023/115] Code clean

---
 v2rayN/ServiceLib/Common/Utils.cs                             | 4 ++--
 v2rayN/ServiceLib/Handler/ConfigHandler.cs                    | 2 +-
 v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs                      | 2 +-
 .../ServiceLib/Services/CoreConfig/CoreConfigClashService.cs  | 2 +-
 v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs         | 2 +-
 v2rayN/v2rayN.Desktop/Views/MsgView.axaml                     | 1 +
 v2rayN/v2rayN/Views/MsgView.xaml.cs                           | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/v2rayN/ServiceLib/Common/Utils.cs b/v2rayN/ServiceLib/Common/Utils.cs
index 63540ee2..f0026249 100644
--- a/v2rayN/ServiceLib/Common/Utils.cs
+++ b/v2rayN/ServiceLib/Common/Utils.cs
@@ -411,11 +411,11 @@ public class Utils
                 // Link-local address fe80::/10
                 if (ipBytes[0] == 0xfe && (ipBytes[1] & 0xc0) == 0x80)
                     return true;
-                
+
                 // Unique local address fc00::/7 (typically fd00::/8)
                 if ((ipBytes[0] & 0xfe) == 0xfc)
                     return true;
-                
+
                 // Private portion in IPv4-mapped addresses ::ffff:0:0/96
                 if (address.IsIPv4MappedToIPv6)
                 {
diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
index 0eeadc46..529dc4c9 100644
--- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -1997,7 +1997,7 @@ public class ConfigHandler
 
         if (!blImportAdvancedRules && items.Count > 0)
         {
-            //migrate 
+            //migrate
             //TODO Temporary code to be removed later
             if (config.RoutingBasicItem.RoutingIndexId.IsNotEmpty())
             {
diff --git a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
index fa84a411..61614f13 100644
--- a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
+++ b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
@@ -62,7 +62,7 @@ public class BaseFmt
         if (item.Mldsa65Verify.IsNotEmpty())
         {
             dicQuery.Add("pqv", Utils.UrlEncode(item.Mldsa65Verify));
-        }       
+        }
         if (item.AllowInsecure.Equals("true"))
         {
             dicQuery.Add("allowInsecure", "1");
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs
index 481ae92d..50c6df67 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs
@@ -12,7 +12,7 @@ public class CoreConfigClashService
     {
         _config = config;
     }
- 
+
     public async Task<RetResult> GenerateClientCustomConfig(ProfileItem node, string? fileName)
     {
         var ret = new RetResult();
diff --git a/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs b/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
index e3f053fb..53566726 100644
--- a/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
@@ -234,7 +234,7 @@ public class ClashProxiesViewModel : MyReactiveObject
             else
             {
                 SelectedGroup = _proxyGroups.First();
-            } 
+            }
         }
         else
         {
diff --git a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
index 3668b81e..b6ca81a1 100644
--- a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
@@ -73,6 +73,7 @@
         <ScrollViewer x:Name="msgScrollViewer" VerticalScrollBarVisibility="Auto">
             <SelectableTextBlock
                 Name="txtMsg"
+                Margin="{StaticResource Margin8}"
                 VerticalAlignment="Stretch"
                 Classes="TextArea"
                 TextAlignment="Left"
diff --git a/v2rayN/v2rayN/Views/MsgView.xaml.cs b/v2rayN/v2rayN/Views/MsgView.xaml.cs
index 96e67c16..3cc1fdfa 100644
--- a/v2rayN/v2rayN/Views/MsgView.xaml.cs
+++ b/v2rayN/v2rayN/Views/MsgView.xaml.cs
@@ -25,7 +25,7 @@ public partial class MsgView
         menuMsgViewCopy.Click += menuMsgViewCopy_Click;
         menuMsgViewCopyAll.Click += menuMsgViewCopyAll_Click;
         menuMsgViewClear.Click += menuMsgViewClear_Click;
-                
+
         cmbMsgFilter.ItemsSource = Global.PresetMsgFilters;
     }
 

From 7995bdd4dfc5091a7b393c0d60f77c3735bf4556 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Sun, 10 Aug 2025 10:15:32 +0800
Subject: [PATCH 024/115] Migrate to sing-box 1.12 support (#7521)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Revert "Temporary addition to support proper use of sing-box v1.12"

This reverts commit 508eb24fc3a8ad03a249332446da98754d005bbe.

* Migrating to singbox 1.11 support

* Removes unnecessary sniffer

* Migrating to singbox 1.12 support

* Adds Google cn dns rules

* Improves geoip rule handling in singbox

* add anytls support

* Simplifies local DNS address handling

* Enables dhcp interface configuration

* Fetches DNS strategy for domain resolution

* support Wireguard endpoint
Refactors Singbox config classes for dial fields

* Utils.GetFreePort() default port to be zero

* Adds Sing-box legacy DNS config support

* Adds IPv4 preference to DNS configurations

对应原dns.servers[].strategy = prefer_ipv4

* Refactors DNS address parsing

* Fixes config generation

* fix singbox endpoints proxy chain not work

* Fixes wrong field

* Removes direct clash_mode domain strategy

* Improves DNS address parsing in Singbox

DNS type, host, port, and path

* Adds properties to Rule4Sbox class

* Removes Wireguard listen port

* Support sing-box hosts

* Adds tag resolver supports

* Adds sing-box DomainStrategy support

* Deletes Duplicate Rules

* Adds anytls reality support

* Fixes

* Updates sing-box documentation link

* Updates translations
---
 v2rayN/ServiceLib/Common/Utils.cs             |   4 +-
 v2rayN/ServiceLib/Enums/EConfigType.cs        |   3 +-
 v2rayN/ServiceLib/Global.cs                   |   6 +-
 v2rayN/ServiceLib/Handler/ConfigHandler.cs    |  31 ++
 v2rayN/ServiceLib/Handler/CoreHandler.cs      |   4 +-
 v2rayN/ServiceLib/Handler/Fmt/AnytlsFmt.cs    |  49 ++
 v2rayN/ServiceLib/Handler/Fmt/FmtHandler.cs   |   5 +
 v2rayN/ServiceLib/Models/SingboxConfig.cs     | 123 ++++-
 v2rayN/ServiceLib/Resx/ResUI.Designer.cs      |   9 +
 v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx       |   3 +
 v2rayN/ServiceLib/Resx/ResUI.hu.resx          |   3 +
 v2rayN/ServiceLib/Resx/ResUI.resx             |   3 +
 v2rayN/ServiceLib/Resx/ResUI.ru.resx          |   3 +
 v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx     |   3 +
 v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx     |   3 +
 .../Sample/SingboxSampleClientConfig          |  14 +-
 v2rayN/ServiceLib/Sample/dns_singbox_normal   |  27 +-
 v2rayN/ServiceLib/Sample/tun_singbox_dns      |  34 +-
 v2rayN/ServiceLib/Sample/tun_singbox_rules    |   4 +-
 .../CoreConfig/CoreConfigSingboxService.cs    | 506 +++++++++++++++---
 .../CoreConfig/CoreConfigV2rayService.cs      |  16 +-
 .../ServiceLib/Services/SpeedtestService.cs   |   4 +-
 .../ViewModels/MainWindowViewModel.cs         |   5 +
 .../Views/AddServerWindow.axaml               |  20 +
 .../Views/AddServerWindow.axaml.cs            |  10 +
 v2rayN/v2rayN.Desktop/Views/MainWindow.axaml  |   1 +
 .../v2rayN.Desktop/Views/MainWindow.axaml.cs  |   1 +
 .../Views/RoutingSettingWindow.axaml.cs       |   2 +-
 v2rayN/v2rayN/Views/AddServerWindow.xaml      |  29 +
 v2rayN/v2rayN/Views/AddServerWindow.xaml.cs   |  10 +
 v2rayN/v2rayN/Views/MainWindow.xaml           |   4 +
 v2rayN/v2rayN/Views/MainWindow.xaml.cs        |   1 +
 .../v2rayN/Views/RoutingSettingWindow.xaml.cs |   2 +-
 33 files changed, 781 insertions(+), 161 deletions(-)
 create mode 100644 v2rayN/ServiceLib/Handler/Fmt/AnytlsFmt.cs

diff --git a/v2rayN/ServiceLib/Common/Utils.cs b/v2rayN/ServiceLib/Common/Utils.cs
index f0026249..38869ebb 100644
--- a/v2rayN/ServiceLib/Common/Utils.cs
+++ b/v2rayN/ServiceLib/Common/Utils.cs
@@ -466,11 +466,11 @@ public class Utils
         return false;
     }
 
-    public static int GetFreePort(int defaultPort = 9090)
+    public static int GetFreePort(int defaultPort = 0)
     {
         try
         {
-            if (!Utils.PortInUse(defaultPort))
+            if (!(defaultPort == 0 || Utils.PortInUse(defaultPort)))
             {
                 return defaultPort;
             }
diff --git a/v2rayN/ServiceLib/Enums/EConfigType.cs b/v2rayN/ServiceLib/Enums/EConfigType.cs
index f56d0e0f..6698f962 100644
--- a/v2rayN/ServiceLib/Enums/EConfigType.cs
+++ b/v2rayN/ServiceLib/Enums/EConfigType.cs
@@ -11,5 +11,6 @@ public enum EConfigType
     Hysteria2 = 7,
     TUIC = 8,
     WireGuard = 9,
-    HTTP = 10
+    HTTP = 10,
+    Anytls = 11
 }
diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs
index 0728b2ea..4888ab6a 100644
--- a/v2rayN/ServiceLib/Global.cs
+++ b/v2rayN/ServiceLib/Global.cs
@@ -169,7 +169,8 @@ public class Global
             { EConfigType.Trojan, "trojan://" },
             { EConfigType.Hysteria2, "hysteria2://" },
             { EConfigType.TUIC, "tuic://" },
-            { EConfigType.WireGuard, "wireguard://" }
+            { EConfigType.WireGuard, "wireguard://" },
+            { EConfigType.Anytls, "anytls://" }
         };
 
     public static readonly Dictionary<EConfigType, string> ProtocolTypes = new()
@@ -182,7 +183,8 @@ public class Global
             { EConfigType.Trojan, "trojan" },
             { EConfigType.Hysteria2, "hysteria2" },
             { EConfigType.TUIC, "tuic" },
-            { EConfigType.WireGuard, "wireguard" }
+            { EConfigType.WireGuard, "wireguard" },
+            { EConfigType.Anytls, "anytls" }
         };
 
     public static readonly List<string> VmessSecurities =
diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
index 529dc4c9..6c93d868 100644
--- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -262,6 +262,7 @@ public class ConfigHandler
             EConfigType.Hysteria2 => await AddHysteria2Server(config, item),
             EConfigType.TUIC => await AddTuicServer(config, item),
             EConfigType.WireGuard => await AddWireguardServer(config, item),
+            EConfigType.Anytls => await AddAnytlsServer(config, item),
             _ => -1,
         };
         return ret;
@@ -786,6 +787,35 @@ public class ConfigHandler
         return 0;
     }
 
+    /// <summary>
+    /// Add or edit a Anytls server
+    /// Validates and processes Anytls-specific settings
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="profileItem">Anytls profile to add</param>
+    /// <param name="toFile">Whether to save to file</param>
+    /// <returns>0 if successful, -1 if failed</returns>
+    public static async Task<int> AddAnytlsServer(Config config, ProfileItem profileItem, bool toFile = true)
+    {
+        profileItem.ConfigType = EConfigType.Anytls;
+        profileItem.CoreType = ECoreType.sing_box;
+
+        profileItem.Address = profileItem.Address.TrimEx();
+        profileItem.Id = profileItem.Id.TrimEx();
+        profileItem.Security = profileItem.Security.TrimEx();
+        profileItem.Network = string.Empty;
+        if (profileItem.StreamSecurity.IsNullOrEmpty())
+        {
+            profileItem.StreamSecurity = Global.StreamSecurity;
+        }
+        if (profileItem.Id.IsNullOrEmpty())
+        {
+            return -1;
+        }
+        await AddServerCommon(config, profileItem, toFile);
+        return 0;
+    }
+
     /// <summary>
     /// Sort the server list by the specified column
     /// Updates the sort order in the profile extension data
@@ -1295,6 +1325,7 @@ public class ConfigHandler
                 EConfigType.Hysteria2 => await AddHysteria2Server(config, profileItem, false),
                 EConfigType.TUIC => await AddTuicServer(config, profileItem, false),
                 EConfigType.WireGuard => await AddWireguardServer(config, profileItem, false),
+                EConfigType.Anytls => await AddAnytlsServer(config, profileItem, false),
                 _ => -1,
             };
 
diff --git a/v2rayN/ServiceLib/Handler/CoreHandler.cs b/v2rayN/ServiceLib/Handler/CoreHandler.cs
index a0e20d07..f7ad2285 100644
--- a/v2rayN/ServiceLib/Handler/CoreHandler.cs
+++ b/v2rayN/ServiceLib/Handler/CoreHandler.cs
@@ -25,8 +25,6 @@ public class CoreHandler
         Environment.SetEnvironmentVariable(Global.V2RayLocalAsset, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
         Environment.SetEnvironmentVariable(Global.XrayLocalAsset, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
         Environment.SetEnvironmentVariable(Global.XrayLocalCert, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
-        // TODO Temporary addition to support proper use of sing-box v1.12
-        Environment.SetEnvironmentVariable("ENABLE_DEPRECATED_SPECIAL_OUTBOUNDS", "true", EnvironmentVariableTarget.Process);
 
         //Copy the bin folder to the storage location (for init)
         if (Environment.GetEnvironmentVariable(Global.LocalAppData) == "1")
@@ -103,7 +101,7 @@ public class CoreHandler
 
     public async Task<int> LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
     {
-        var coreType = selecteds.Exists(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC) ? ECoreType.sing_box : ECoreType.Xray;
+        var coreType = selecteds.Exists(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls) ? ECoreType.sing_box : ECoreType.Xray;
         var fileName = string.Format(Global.CoreSpeedtestConfigFileName, Utils.GetGuid(false));
         var configPath = Utils.GetBinConfigPath(fileName);
         var result = await CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType);
diff --git a/v2rayN/ServiceLib/Handler/Fmt/AnytlsFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/AnytlsFmt.cs
new file mode 100644
index 00000000..3f1d40dc
--- /dev/null
+++ b/v2rayN/ServiceLib/Handler/Fmt/AnytlsFmt.cs
@@ -0,0 +1,49 @@
+using static QRCoder.PayloadGenerator;
+
+namespace ServiceLib.Handler.Fmt;
+public class AnytlsFmt : BaseFmt
+{
+    public static ProfileItem? Resolve(string str, out string msg)
+    {
+        msg = ResUI.ConfigurationFormatIncorrect;
+
+        var parsedUrl = Utils.TryUri(str);
+        if (parsedUrl == null)
+        {
+            return null;
+        }
+
+        ProfileItem item = new()
+        {
+            ConfigType = EConfigType.Anytls,
+            Remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
+            Address = parsedUrl.IdnHost,
+            Port = parsedUrl.Port,
+        };
+        var rawUserInfo = Utils.UrlDecode(parsedUrl.UserInfo);
+        item.Id = rawUserInfo;
+
+        var query = Utils.ParseQueryString(parsedUrl.Query);
+        _ = ResolveStdTransport(query, ref item);
+
+        return item;
+    }
+
+    public static string? ToUri(ProfileItem? item)
+    {
+        if (item == null)
+        {
+            return null;
+        }
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
+        {
+            remark = "#" + Utils.UrlEncode(item.Remarks);
+        }
+        var pw = item.Id;
+        var dicQuery = new Dictionary<string, string>();
+        _ = GetStdTransport(item, Global.None, ref dicQuery);
+
+        return ToUri(EConfigType.Anytls, item.Address, item.Port, pw, dicQuery, remark);
+    }
+}
diff --git a/v2rayN/ServiceLib/Handler/Fmt/FmtHandler.cs b/v2rayN/ServiceLib/Handler/Fmt/FmtHandler.cs
index 3e8ab2ae..814d753d 100644
--- a/v2rayN/ServiceLib/Handler/Fmt/FmtHandler.cs
+++ b/v2rayN/ServiceLib/Handler/Fmt/FmtHandler.cs
@@ -18,6 +18,7 @@ public class FmtHandler
                 EConfigType.Hysteria2 => Hysteria2Fmt.ToUri(item),
                 EConfigType.TUIC => TuicFmt.ToUri(item),
                 EConfigType.WireGuard => WireguardFmt.ToUri(item),
+                EConfigType.Anytls => AnytlsFmt.ToUri(item),
                 _ => null,
             };
 
@@ -75,6 +76,10 @@ public class FmtHandler
             {
                 return WireguardFmt.Resolve(str, out msg);
             }
+            else if (str.StartsWith(Global.ProtocolShares[EConfigType.Anytls]))
+            {
+                return AnytlsFmt.Resolve(str, out msg);
+            }
             else
             {
                 msg = ResUI.NonvmessOrssProtocol;
diff --git a/v2rayN/ServiceLib/Models/SingboxConfig.cs b/v2rayN/ServiceLib/Models/SingboxConfig.cs
index 9ea1157d..c63acc4a 100644
--- a/v2rayN/ServiceLib/Models/SingboxConfig.cs
+++ b/v2rayN/ServiceLib/Models/SingboxConfig.cs
@@ -1,3 +1,5 @@
+using System.Text.Json.Serialization;
+
 namespace ServiceLib.Models;
 
 public class SingboxConfig
@@ -6,6 +8,7 @@ public class SingboxConfig
     public Dns4Sbox? dns { get; set; }
     public List<Inbound4Sbox> inbounds { get; set; }
     public List<Outbound4Sbox> outbounds { get; set; }
+    public List<Endpoints4Sbox>? endpoints { get; set; }
     public Route4Sbox route { get; set; }
     public Experimental4Sbox? experimental { get; set; }
 }
@@ -29,7 +32,6 @@ public class Dns4Sbox
     public bool? independent_cache { get; set; }
     public bool? reverse_mapping { get; set; }
     public string? client_subnet { get; set; }
-    public Fakeip4Sbox? fakeip { get; set; }
 }
 
 public class Route4Sbox
@@ -37,6 +39,7 @@ public class Route4Sbox
     public bool? auto_detect_interface { get; set; }
     public List<Rule4Sbox> rules { get; set; }
     public List<Ruleset4Sbox>? rule_set { get; set; }
+    public string? final { get; set; }
 }
 
 [Serializable]
@@ -49,6 +52,7 @@ public class Rule4Sbox
     public string? mode { get; set; }
     public bool? ip_is_private { get; set; }
     public string? client_subnet { get; set; }
+    public int? rewrite_ttl { get; set; }
     public bool? invert { get; set; }
     public string? clash_mode { get; set; }
     public List<string>? inbound { get; set; }
@@ -67,6 +71,27 @@ public class Rule4Sbox
     public List<string>? process_name { get; set; }
     public List<string>? rule_set { get; set; }
     public List<Rule4Sbox>? rules { get; set; }
+    public string? action { get; set; }
+    public string? strategy { get; set; }
+    public List<string>? sniffer { get; set; }
+    public string? rcode { get; set; }
+    public List<object>? query_type { get; set; }
+    public List<string>? answer { get; set; }
+    public List<string>? ns { get; set; }
+    public List<string>? extra { get; set; }
+    public string? method { get; set; }
+    public bool? no_drop { get; set; }
+    public bool? source_ip_is_private { get; set; }
+    public bool? ip_accept_any { get; set; }
+    public int? source_port { get; set; }
+    public List<string>? source_port_range { get; set; }
+    public List<string>? network_type { get; set; }
+    public bool? network_is_expensive { get; set; }
+    public bool? network_is_constrained { get; set; }
+    public List<string>? wifi_ssid { get; set; }
+    public List<string>? wifi_bssid { get; set; }
+    public bool? rule_set_ip_cidr_match_source { get; set; }
+    public bool? rule_set_ip_cidr_accept_empty { get; set; }
 }
 
 [Serializable]
@@ -76,7 +101,6 @@ public class Inbound4Sbox
     public string tag { get; set; }
     public string listen { get; set; }
     public int? listen_port { get; set; }
-    public string? domain_strategy { get; set; }
     public string interface_name { get; set; }
     public List<string>? address { get; set; }
     public int? mtu { get; set; }
@@ -84,8 +108,6 @@ public class Inbound4Sbox
     public bool? strict_route { get; set; }
     public bool? endpoint_independent_nat { get; set; }
     public string? stack { get; set; }
-    public bool? sniff { get; set; }
-    public bool? sniff_override_destination { get; set; }
     public List<User4Sbox> users { get; set; }
 }
 
@@ -95,10 +117,8 @@ public class User4Sbox
     public string password { get; set; }
 }
 
-public class Outbound4Sbox
+public class Outbound4Sbox : BaseServer4Sbox
 {
-    public string type { get; set; }
-    public string tag { get; set; }
     public string? server { get; set; }
     public int? server_port { get; set; }
     public List<string>? server_ports { get; set; }
@@ -113,7 +133,6 @@ public class Outbound4Sbox
     public int? recv_window_conn { get; set; }
     public int? recv_window { get; set; }
     public bool? disable_mtu_discovery { get; set; }
-    public string? detour { get; set; }
     public string? method { get; set; }
     public string? username { get; set; }
     public string? password { get; set; }
@@ -121,21 +140,36 @@ public class Outbound4Sbox
     public string? version { get; set; }
     public string? network { get; set; }
     public string? packet_encoding { get; set; }
-    public List<string>? local_address { get; set; }
-    public string? private_key { get; set; }
-    public string? peer_public_key { get; set; }
-    public List<int>? reserved { get; set; }
-    public int? mtu { get; set; }
     public string? plugin { get; set; }
     public string? plugin_opts { get; set; }
-    public Tls4Sbox? tls { get; set; }
-    public Multiplex4Sbox? multiplex { get; set; }
-    public Transport4Sbox? transport { get; set; }
-    public HyObfs4Sbox? obfs { get; set; }
     public List<string>? outbounds { get; set; }
     public bool? interrupt_exist_connections { get; set; }
 }
 
+public class Endpoints4Sbox : BaseServer4Sbox
+{
+    public bool? system { get; set; }
+    public string? name { get; set; }
+    public int? mtu { get; set; }
+    public List<string> address { get; set; }
+    public string private_key { get; set; }
+    public int? listen_port { get; set; }
+    public string? udp_timeout { get; set; }
+    public int? workers { get; set; }
+    public List<Peer4Sbox> peers { get; set; }
+}
+
+public class Peer4Sbox
+{
+    public string address { get; set; }
+    public int port { get; set; }
+    public string public_key { get; set; }
+    public string? pre_shared_key { get; set; }
+    public List<string> allowed_ips { get; set; }
+    public int? persistent_keepalive_interval { get; set; }
+    public List<int> reserved { get; set; }
+}
+
 public class Tls4Sbox
 {
     public bool enabled { get; set; }
@@ -191,15 +225,25 @@ public class HyObfs4Sbox
     public string? password { get; set; }
 }
 
-public class Server4Sbox
+public class Server4Sbox : BaseServer4Sbox
 {
-    public string? tag { get; set; }
+    public string? inet4_range { get; set; }
+    public string? inet6_range { get; set; }
+    public string? client_subnet { get; set; }
+    public string? server { get; set; }
+    public new string? domain_resolver { get; set; }
+    [JsonPropertyName("interface")] public string? Interface { get; set; }
+    public int? server_port { get; set; }
+    public string? path { get; set; }
+    public Headers4Sbox? headers { get; set; }
+    // public List<string>? path { get; set; } // hosts
+    public Dictionary<string, object>? predefined { get; set; }
+    // Deprecated
     public string? address { get; set; }
     public string? address_resolver { get; set; }
     public string? address_strategy { get; set; }
     public string? strategy { get; set; }
-    public string? detour { get; set; }
-    public string? client_subnet { get; set; }
+    // Deprecated End
 }
 
 public class Experimental4Sbox
@@ -229,13 +273,6 @@ public class Stats4Sbox
     public List<string>? users { get; set; }
 }
 
-public class Fakeip4Sbox
-{
-    public bool enabled { get; set; }
-    public string inet4_range { get; set; }
-    public string inet6_range { get; set; }
-}
-
 public class CacheFile4Sbox
 {
     public bool enabled { get; set; }
@@ -254,3 +291,33 @@ public class Ruleset4Sbox
     public string? download_detour { get; set; }
     public string? update_interval { get; set; }
 }
+
+public abstract class DialFields4Sbox
+{
+    public string? detour { get; set; }
+    public string? bind_interface { get; set; }
+    public string? inet4_bind_address { get; set; }
+    public string? inet6_bind_address { get; set; }
+    public int? routing_mark { get; set; }
+    public bool? reuse_addr { get; set; }
+    public string? netns { get; set; }
+    public string? connect_timeout { get; set; }
+    public bool? tcp_fast_open { get; set; }
+    public bool? tcp_multi_path { get; set; }
+    public bool? udp_fragment { get; set; }
+    public Rule4Sbox? domain_resolver { get; set; } // or string
+    public string? network_strategy { get; set; }
+    public List<string>? network_type { get; set; }
+    public List<string>? fallback_network_type { get; set; }
+    public string? fallback_delay { get; set; }
+    public Tls4Sbox? tls { get; set; }
+    public Multiplex4Sbox? multiplex { get; set; }
+    public Transport4Sbox? transport { get; set; }
+    public HyObfs4Sbox? obfs { get; set; }
+}
+
+public abstract class BaseServer4Sbox : DialFields4Sbox
+{
+    public string type { get; set; }
+    public string tag { get; set; }
+}
diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index 992adb94..ca554860 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -654,6 +654,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Add [Anytls] Configuration 的本地化字符串。
+        /// </summary>
+        public static string menuAddAnytlsServer {
+            get {
+                return ResourceManager.GetString("menuAddAnytlsServer", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Add a custom configuration Configuration 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
index eb9ae271..bd2cb887 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1401,4 +1401,7 @@
   <data name="TbMldsa65Verify" xml:space="preserve">
     <value>Mldsa65Verify</value>
   </data>
+  <data name="menuAddAnytlsServer" xml:space="preserve">
+    <value>Add [Anytls] Configuration</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
index 0d45540e..0fc30153 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1401,4 +1401,7 @@
   <data name="TbMldsa65Verify" xml:space="preserve">
     <value>Mldsa65Verify</value>
   </data>
+  <data name="menuAddAnytlsServer" xml:space="preserve">
+    <value>[Anytls] konfiguráció hozzáadása</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index 03e9b124..7ecfcc98 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1401,4 +1401,7 @@
   <data name="TbMldsa65Verify" xml:space="preserve">
     <value>Mldsa65Verify</value>
   </data>
+  <data name="menuAddAnytlsServer" xml:space="preserve">
+    <value>Add [Anytls] Configuration</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
index 75a596aa..25f17e0d 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1401,4 +1401,7 @@
   <data name="TbMldsa65Verify" xml:space="preserve">
     <value>Mldsa65Verify</value>
   </data>
+  <data name="menuAddAnytlsServer" xml:space="preserve">
+    <value>Добавить сервер [Anytls]</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index 8766ca8f..95d69e9b 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1398,4 +1398,7 @@
   <data name="TbMldsa65Verify" xml:space="preserve">
     <value>Mldsa65Verify</value>
   </data>
+  <data name="menuAddAnytlsServer" xml:space="preserve">
+    <value>添加 [Anytls] 配置文件</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index 9c7a2a3c..0b23885c 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1398,4 +1398,7 @@
   <data name="TbMldsa65Verify" xml:space="preserve">
     <value>Mldsa65Verify</value>
   </data>
+  <data name="menuAddAnytlsServer" xml:space="preserve">
+    <value>新增 [Anytls] 設定檔</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Sample/SingboxSampleClientConfig b/v2rayN/ServiceLib/Sample/SingboxSampleClientConfig
index f88422a1..b07fd72c 100644
--- a/v2rayN/ServiceLib/Sample/SingboxSampleClientConfig
+++ b/v2rayN/ServiceLib/Sample/SingboxSampleClientConfig
@@ -1,4 +1,4 @@
-{
+{
 	"log": {
 		"level": "debug",
 		"timestamp": true
@@ -14,22 +14,10 @@
 		{
 			"type": "direct",
 			"tag": "direct"
-		},
-		{
-			"type": "block",
-			"tag": "block"
-		},
-		{
-			"tag": "dns_out",
-			"type": "dns"
 		}
 	],
 	"route": {
 		"rules": [
-			{
-				"protocol": [ "dns" ],
-				"outbound": "dns_out"
-			}
 		]
 	}
 }
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Sample/dns_singbox_normal b/v2rayN/ServiceLib/Sample/dns_singbox_normal
index 0921fe64..b32b439c 100644
--- a/v2rayN/ServiceLib/Sample/dns_singbox_normal
+++ b/v2rayN/ServiceLib/Sample/dns_singbox_normal
@@ -2,28 +2,33 @@
   "servers": [
     {
       "tag": "remote",
-      "address": "tcp://8.8.8.8",
-      "strategy": "prefer_ipv4",
+      "type": "tcp",
+      "server": "8.8.8.8",
       "detour": "proxy"
     },
     {
       "tag": "local",
-      "address": "223.5.5.5",
-      "strategy": "prefer_ipv4",
-      "detour": "direct"
-    },
-    {
-      "tag": "block",
-      "address": "rcode://success"
+      "type": "udp",
+      "server": "223.5.5.5"
     }
   ],
   "rules": [
+    {
+      "domain_suffix": [
+        "googleapis.cn",
+        "gstatic.com"
+      ],
+      "server": "remote",
+      "strategy": "prefer_ipv4"
+    },
     {
       "rule_set": [
         "geosite-cn"
       ],
-      "server": "local"
+      "server": "local",
+      "strategy": "prefer_ipv4"
     }
   ],
-  "final": "remote"
+  "final": "remote",
+  "strategy": "prefer_ipv4"
 }
diff --git a/v2rayN/ServiceLib/Sample/tun_singbox_dns b/v2rayN/ServiceLib/Sample/tun_singbox_dns
index d8ca9808..3dd55eef 100644
--- a/v2rayN/ServiceLib/Sample/tun_singbox_dns
+++ b/v2rayN/ServiceLib/Sample/tun_singbox_dns
@@ -2,29 +2,33 @@
   "servers": [
     {
       "tag": "remote",
-      "address": "tcp://8.8.8.8",
-      "strategy": "prefer_ipv4",
+      "type": "tcp",
+      "server": "8.8.8.8",
       "detour": "proxy"
     },
     {
       "tag": "local",
-      "address": "223.5.5.5",
-      "strategy": "prefer_ipv4",
-      "detour": "direct"
-    },
-    {
-      "tag": "block",
-      "address": "rcode://success"
+      "type": "udp",
+      "server": "223.5.5.5"
     }
   ],
   "rules": [
     {
-      "rule_set": [
-        "geosite-cn",
-        "geosite-geolocation-cn"
+      "domain_suffix": [
+        "googleapis.cn",
+        "gstatic.com"
       ],
-      "server": "local"
+      "server": "remote",
+      "strategy": "prefer_ipv4"
+    },
+    {
+      "rule_set": [
+        "geosite-cn"
+      ],
+      "server": "local",
+      "strategy": "prefer_ipv4"
     }
   ],
-  "final": "remote"
-}
+  "final": "remote",
+  "strategy": "prefer_ipv4"
+}
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Sample/tun_singbox_rules b/v2rayN/ServiceLib/Sample/tun_singbox_rules
index df1dc4ec..a4276134 100644
--- a/v2rayN/ServiceLib/Sample/tun_singbox_rules
+++ b/v2rayN/ServiceLib/Sample/tun_singbox_rules
@@ -8,13 +8,13 @@
       139,
       5353
     ],
-    "outbound": "block"
+    "action": "reject"
   },
   {
     "ip_cidr": [
       "224.0.0.0/3",
       "ff00::/8"
     ],
-    "outbound": "block"
+    "action": "reject"
   }
 ]
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index 79e4c0a2..80b89654 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -1,6 +1,9 @@
 using System.Data;
 using System.Net;
 using System.Net.NetworkInformation;
+using System.Reactive;
+using DynamicData;
+using ServiceLib.Models;
 
 namespace ServiceLib.Services.CoreConfig;
 
@@ -53,7 +56,18 @@ public class CoreConfigSingboxService
 
             await GenInbounds(singboxConfig);
 
-            await GenOutbound(node, singboxConfig.outbounds.First());
+            if (node.ConfigType == EConfigType.WireGuard)
+            {
+                singboxConfig.outbounds.RemoveAt(0);
+                var endpoints = new Endpoints4Sbox();
+                await GenEndpoint(node, endpoints);
+                endpoints.tag = Global.ProxyTag;
+                singboxConfig.endpoints = new() { endpoints };
+            }
+            else
+            {
+                await GenOutbound(node, singboxConfig.outbounds.First());
+            }
 
             await GenMoreOutbounds(node, singboxConfig);
 
@@ -202,16 +216,29 @@ public class CoreConfigSingboxService
                     continue;
                 }
 
-                var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
-                await GenOutbound(item, outbound);
-                outbound.tag = Global.ProxyTag + inbound.listen_port.ToString();
-                singboxConfig.outbounds.Add(outbound);
+                var server = await GenServer(item);
+                if (server is null)
+                {
+                    ret.Msg = ResUI.FailedGenDefaultConfiguration;
+                    return ret;
+                }
+                var tag = Global.ProxyTag + inbound.listen_port.ToString();
+                server.tag = tag;
+                if (server is Endpoints4Sbox endpoint)
+                {
+                    singboxConfig.endpoints ??= new();
+                    singboxConfig.endpoints.Add(endpoint);
+                }
+                else if (server is Outbound4Sbox outbound)
+                {
+                    singboxConfig.outbounds.Add(outbound);
+                }
 
                 //rule
                 Rule4Sbox rule = new()
                 {
                     inbound = new List<string> { inbound.tag },
-                    outbound = outbound.tag
+                    outbound = tag
                 };
                 singboxConfig.route.rules.Add(rule);
             }
@@ -275,7 +302,18 @@ public class CoreConfigSingboxService
             }
 
             await GenLog(singboxConfig);
-            await GenOutbound(node, singboxConfig.outbounds.First());
+            if (node.ConfigType == EConfigType.WireGuard)
+            {
+                singboxConfig.outbounds.RemoveAt(0);
+                var endpoints = new Endpoints4Sbox();
+                await GenEndpoint(node, endpoints);
+                endpoints.tag = Global.ProxyTag;
+                singboxConfig.endpoints = new() { endpoints };
+            }
+            else
+            {
+                await GenOutbound(node, singboxConfig.outbounds.First());
+            }
             await GenMoreOutbounds(node, singboxConfig);
             await GenDnsDomains(null, singboxConfig, null);
 
@@ -534,15 +572,6 @@ public class CoreConfigSingboxService
                 singboxConfig.inbounds.Add(inbound);
 
                 inbound.listen_port = AppHandler.Instance.GetLocalPort(EInboundProtocol.socks);
-                inbound.sniff = _config.Inbound.First().SniffingEnabled;
-                inbound.sniff_override_destination = _config.Inbound.First().RouteOnly ? false : _config.Inbound.First().SniffingEnabled;
-                inbound.domain_strategy = _config.RoutingBasicItem.DomainStrategy4Singbox.IsNullOrEmpty() ? null : _config.RoutingBasicItem.DomainStrategy4Singbox;
-
-                var routing = await ConfigHandler.GetDefaultRouting(_config);
-                if (routing.DomainStrategy4Singbox.IsNotEmpty())
-                {
-                    inbound.domain_strategy = routing.DomainStrategy4Singbox;
-                }
 
                 if (_config.Inbound.First().SecondLocalPortEnabled)
                 {
@@ -587,8 +616,6 @@ public class CoreConfigSingboxService
                 tunInbound.mtu = _config.TunModeItem.Mtu;
                 tunInbound.strict_route = _config.TunModeItem.StrictRoute;
                 tunInbound.stack = _config.TunModeItem.Stack;
-                tunInbound.sniff = _config.Inbound.First().SniffingEnabled;
-                //tunInbound.sniff_override_destination = _config.inbound.First().routeOnly ? false : _config.inbound.First().sniffingEnabled;
                 if (_config.TunModeItem.EnableIPv6Address == false)
                 {
                     tunInbound.address = ["172.18.0.1/30"];
@@ -621,6 +648,17 @@ public class CoreConfigSingboxService
             outbound.server_port = node.Port;
             outbound.type = Global.ProtocolTypes[node.ConfigType];
 
+            if (Utils.IsDomain(node.Address))
+            {
+                var item = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+                var localDnsAddress = string.IsNullOrEmpty(item?.DomainDNSAddress) ? Global.SingboxDomainDNSAddress.FirstOrDefault() : item?.DomainDNSAddress;
+                outbound.domain_resolver = new()
+                {
+                    server = localDnsAddress.StartsWith("tag://") ? localDnsAddress.Substring(6) : "local_resolver",
+                    strategy = string.IsNullOrEmpty(item?.DomainStrategy4Freedom) ? null : item?.DomainStrategy4Freedom
+                };
+            }
+
             switch (node.ConfigType)
             {
                 case EConfigType.VMess:
@@ -730,13 +768,9 @@ public class CoreConfigSingboxService
                         outbound.congestion_control = node.HeaderType;
                         break;
                     }
-                case EConfigType.WireGuard:
+                case EConfigType.Anytls:
                     {
-                        outbound.private_key = node.Id;
-                        outbound.peer_public_key = node.PublicKey;
-                        outbound.reserved = Utils.String2List(node.Path)?.Select(int.Parse).ToList();
-                        outbound.local_address = Utils.String2List(node.RequestHost);
-                        outbound.mtu = node.ShortId.IsNullOrEmpty() ? Global.TunMtus.First() : node.ShortId.ToInt();
+                        outbound.password = node.Id;
                         break;
                     }
             }
@@ -752,6 +786,76 @@ public class CoreConfigSingboxService
         return 0;
     }
 
+    private async Task<int> GenEndpoint(ProfileItem node, Endpoints4Sbox endpoint)
+    {
+        try
+        {
+            endpoint.address = Utils.String2List(node.RequestHost);
+            endpoint.type = Global.ProtocolTypes[node.ConfigType];
+
+            if (Utils.IsDomain(node.Address))
+            {
+                var item = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+                var localDnsAddress = string.IsNullOrEmpty(item?.DomainDNSAddress) ? Global.SingboxDomainDNSAddress.FirstOrDefault() : item?.DomainDNSAddress;
+                endpoint.domain_resolver = new()
+                {
+                    server = localDnsAddress.StartsWith("tag://") ? localDnsAddress.Substring(6) : "local_resolver",
+                    strategy = string.IsNullOrEmpty(item?.DomainStrategy4Freedom) ? null : item?.DomainStrategy4Freedom
+                };
+            }
+
+            switch (node.ConfigType)
+            {
+                case EConfigType.WireGuard:
+                    {
+                        var peer = new Peer4Sbox
+                        {
+                            public_key = node.PublicKey,
+                            reserved = Utils.String2List(node.Path)?.Select(int.Parse).ToList(),
+                            address = node.Address,
+                            port = node.Port,
+                            // TODO default ["0.0.0.0/0", "::/0"]
+                            allowed_ips = new() { "0.0.0.0/0", "::/0" },
+                        };
+                        endpoint.private_key = node.Id;
+                        endpoint.mtu = node.ShortId.IsNullOrEmpty() ? Global.TunMtus.First() : node.ShortId.ToInt();
+                        endpoint.peers = new() { peer };
+                        break;
+                    }
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return await Task.FromResult(0);
+    }
+
+    private async Task<BaseServer4Sbox?> GenServer(ProfileItem node)
+    {
+        try
+        {
+            var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
+            if (node.ConfigType == EConfigType.WireGuard)
+            {
+                var endpoint = JsonUtils.Deserialize<Endpoints4Sbox>(txtOutbound);
+                await GenEndpoint(node, endpoint);
+                return endpoint;
+            }
+            else
+            {
+                var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                await GenOutbound(node, outbound);
+                return outbound;
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return await Task.FromResult<BaseServer4Sbox?>(null);
+    }
+
     private async Task<int> GenOutboundMux(ProfileItem node, Outbound4Sbox outbound)
     {
         try
@@ -918,7 +1022,8 @@ public class CoreConfigSingboxService
             }
 
             //current proxy
-            var outbound = singboxConfig.outbounds.First();
+            BaseServer4Sbox? outbound = singboxConfig.endpoints?.FirstOrDefault(t => t.tag == Global.ProxyTag) == null ? singboxConfig.outbounds.First() : null;
+
             var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
 
             //Previous proxy
@@ -927,17 +1032,32 @@ public class CoreConfigSingboxService
             if (prevNode is not null
                 && prevNode.ConfigType != EConfigType.Custom)
             {
-                var prevOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
-                await GenOutbound(prevNode, prevOutbound);
                 prevOutboundTag = $"prev-{Global.ProxyTag}";
-                prevOutbound.tag = prevOutboundTag;
-                singboxConfig.outbounds.Add(prevOutbound);
+                var prevServer = await GenServer(prevNode);
+                prevServer.tag = prevOutboundTag;
+                if (prevServer is Endpoints4Sbox endpoint)
+                {
+                    singboxConfig.endpoints ??= new();
+                    singboxConfig.endpoints.Add(endpoint);
+                }
+                else if (prevServer is Outbound4Sbox outboundPrev)
+                {
+                    singboxConfig.outbounds.Add(outboundPrev);
+                }
             }
-            var nextOutbound = await GenChainOutbounds(subItem, outbound, prevOutboundTag);
+            var nextServer = await GenChainOutbounds(subItem, outbound, prevOutboundTag);
 
-            if (nextOutbound is not null)
+            if (nextServer is not null)
             {
-                singboxConfig.outbounds.Insert(0, nextOutbound);
+                if (nextServer is Endpoints4Sbox endpoint)
+                {
+                    singboxConfig.endpoints ??= new();
+                    singboxConfig.endpoints.Insert(0, endpoint);
+                }
+                else if (nextServer is Outbound4Sbox outboundNext)
+                {
+                    singboxConfig.outbounds.Insert(0, outboundNext);
+                }
             }
         }
         catch (Exception ex)
@@ -960,11 +1080,13 @@ public class CoreConfigSingboxService
             }
 
             var resultOutbounds = new List<Outbound4Sbox>();
+            var resultEndpoints = new List<Endpoints4Sbox>(); // For endpoints
             var prevOutbounds = new List<Outbound4Sbox>(); // Separate list for prev outbounds
+            var prevEndpoints = new List<Endpoints4Sbox>(); // Separate list for prev endpoints
             var proxyTags = new List<string>(); // For selector and urltest outbounds
 
             // Cache for chain proxies to avoid duplicate generation
-            var nextProxyCache = new Dictionary<string, Outbound4Sbox?>();
+            var nextProxyCache = new Dictionary<string, BaseServer4Sbox?>();
             var prevProxyTags = new Dictionary<string, string?>(); // Map from profile name to tag
             int prevIndex = 0; // Index for prev outbounds
 
@@ -976,19 +1098,18 @@ public class CoreConfigSingboxService
 
                 // Handle proxy chain
                 string? prevTag = null;
-                var currentOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
-                var nextOutbound = nextProxyCache.GetValueOrDefault(node.Subid, null);
-                if (nextOutbound != null)
+                var currentServer = await GenServer(node);
+                var nextServer = nextProxyCache.GetValueOrDefault(node.Subid, null);
+                if (nextServer != null)
                 {
-                    nextOutbound = JsonUtils.DeepCopy(nextOutbound);
+                    nextServer = JsonUtils.DeepCopy(nextServer);
                 }
 
                 var subItem = await AppHandler.Instance.GetSubItem(node.Subid);
 
                 // current proxy
-                await GenOutbound(node, currentOutbound);
-                currentOutbound.tag = $"{Global.ProxyTag}-{index}";
-                proxyTags.Add(currentOutbound.tag);
+                currentServer.tag = $"{Global.ProxyTag}-{index}";
+                proxyTags.Add(currentServer.tag);
 
                 if (!node.Subid.IsNullOrEmpty())
                 {
@@ -1011,18 +1132,32 @@ public class CoreConfigSingboxService
                         prevProxyTags[node.Subid] = prevTag;
                     }
 
-                    nextOutbound = await GenChainOutbounds(subItem, currentOutbound, prevTag, nextOutbound);
+                    nextServer = await GenChainOutbounds(subItem, currentServer, prevTag, nextServer);
                     if (!nextProxyCache.ContainsKey(node.Subid))
                     {
-                        nextProxyCache[node.Subid] = nextOutbound;
+                        nextProxyCache[node.Subid] = nextServer;
                     }
                 }
 
-                if (nextOutbound is not null)
+                if (nextServer is not null)
                 {
-                    resultOutbounds.Add(nextOutbound);
+                    if (nextServer is Endpoints4Sbox nextEndpoint)
+                    {
+                        resultEndpoints.Add(nextEndpoint);
+                    }
+                    else if (nextServer is Outbound4Sbox nextOutbound)
+                    {
+                        resultOutbounds.Add(nextOutbound);
+                    }
+                }
+                if (currentServer is Endpoints4Sbox currentEndpoint)
+                {
+                    resultEndpoints.Add(currentEndpoint);
+                }
+                else if (currentServer is Outbound4Sbox currentOutbound)
+                {
+                    resultOutbounds.Add(currentOutbound);
                 }
-                resultOutbounds.Add(currentOutbound);
             }
 
             // Add urltest outbound (auto selection based on latency)
@@ -1055,6 +1190,9 @@ public class CoreConfigSingboxService
             resultOutbounds.AddRange(prevOutbounds);
             resultOutbounds.AddRange(singboxConfig.outbounds);
             singboxConfig.outbounds = resultOutbounds;
+            singboxConfig.endpoints ??= new List<Endpoints4Sbox>();
+            resultEndpoints.AddRange(singboxConfig.endpoints);
+            singboxConfig.endpoints = resultEndpoints;
         }
         catch (Exception ex)
         {
@@ -1076,7 +1214,7 @@ public class CoreConfigSingboxService
     /// <returns>
     /// The outbound configuration for the next proxy in the chain, or null if no next proxy exists.
     /// </returns>
-    private async Task<Outbound4Sbox?> GenChainOutbounds(SubItem subItem, Outbound4Sbox outbound, string? prevOutboundTag, Outbound4Sbox? nextOutbound = null)
+    private async Task<BaseServer4Sbox?> GenChainOutbounds(SubItem subItem, BaseServer4Sbox outbound, string? prevOutboundTag, BaseServer4Sbox? nextOutbound = null)
     {
         try
         {
@@ -1092,11 +1230,7 @@ public class CoreConfigSingboxService
             if (nextNode is not null
                 && nextNode.ConfigType != EConfigType.Custom)
             {
-                if (nextOutbound == null)
-                {
-                    nextOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
-                    await GenOutbound(nextNode, nextOutbound);
-                }
+                nextOutbound ??= await GenServer(nextNode);
                 nextOutbound.tag = outbound.tag;
 
                 outbound.tag = $"mid-{outbound.tag}";
@@ -1115,7 +1249,7 @@ public class CoreConfigSingboxService
     {
         try
         {
-            var dnsOutbound = "dns_out";
+            singboxConfig.route.final = Global.ProxyTag;
 
             if (_config.TunModeItem.EnableTun)
             {
@@ -1131,7 +1265,7 @@ public class CoreConfigSingboxService
                 singboxConfig.route.rules.Add(new()
                 {
                     port = new() { 53 },
-                    outbound = dnsOutbound,
+                    action = "hijack-dns",
                     process_name = lstDnsExe
                 });
 
@@ -1142,13 +1276,25 @@ public class CoreConfigSingboxService
                 });
             }
 
-            if (!_config.Inbound.First().SniffingEnabled)
+            if (_config.Inbound.First().SniffingEnabled)
             {
                 singboxConfig.route.rules.Add(new()
                 {
-                    port = [53],
-                    network = ["udp"],
-                    outbound = dnsOutbound
+                    action = "sniff"
+                });
+                singboxConfig.route.rules.Add(new()
+                {
+                    protocol = new() { "dns" },
+                    action = "hijack-dns"
+                });
+            }
+            else
+            {
+                singboxConfig.route.rules.Add(new()
+                {
+                    port = new() { 53 },
+                    network = new() { "udp" },
+                    action = "hijack-dns"
                 });
             }
 
@@ -1163,7 +1309,24 @@ public class CoreConfigSingboxService
                 clash_mode = ERuleMode.Global.ToString()
             });
 
+            var domainStrategy = _config.RoutingBasicItem.DomainStrategy4Singbox.IsNullOrEmpty() ? null : _config.RoutingBasicItem.DomainStrategy4Singbox;
+            var defaultRouting = await ConfigHandler.GetDefaultRouting(_config);
+            if (defaultRouting.DomainStrategy4Singbox.IsNotEmpty())
+            {
+                domainStrategy = defaultRouting.DomainStrategy4Singbox;
+            }
+            var resolveRule = new Rule4Sbox
+            {
+                action = "resolve",
+                strategy = domainStrategy
+            };
+            if (_config.RoutingBasicItem.DomainStrategy == "IPOnDemand")
+            {
+                singboxConfig.route.rules.Add(resolveRule);
+            }
+
             var routing = await ConfigHandler.GetDefaultRouting(_config);
+            var ipRules = new List<RulesItem>();
             if (routing != null)
             {
                 var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet);
@@ -1172,9 +1335,21 @@ public class CoreConfigSingboxService
                     if (item.Enabled)
                     {
                         await GenRoutingUserRule(item, singboxConfig);
+                        if (item.Ip != null && item.Ip.Count > 0)
+                        {
+                            ipRules.Add(item);
+                        }
                     }
                 }
             }
+            if (_config.RoutingBasicItem.DomainStrategy == "IPIfNonMatch")
+            {
+                singboxConfig.route.rules.Add(resolveRule);
+                foreach (var item in ipRules)
+                {
+                    await GenRoutingUserRule(item, singboxConfig);
+                }
+            }
         }
         catch (Exception ex)
         {
@@ -1222,10 +1397,15 @@ public class CoreConfigSingboxService
             item.OutboundTag = await GenRoutingUserRuleOutbound(item.OutboundTag, singboxConfig);
             var rules = singboxConfig.route.rules;
 
-            var rule = new Rule4Sbox()
+            var rule = new Rule4Sbox();
+            if (item.OutboundTag == "block")
             {
-                outbound = item.OutboundTag,
-            };
+                rule.action = "reject";
+            }
+            else
+            {
+                rule.outbound = item.OutboundTag;
+            }
 
             if (item.Port.IsNotEmpty())
             {
@@ -1349,24 +1529,28 @@ public class CoreConfigSingboxService
         {
             return false;
         }
-        else if (address.StartsWith("geoip:!"))
-        {
-            return false;
-        }
         else if (address.Equals("geoip:private"))
         {
             rule.ip_is_private = true;
         }
         else if (address.StartsWith("geoip:"))
         {
-            if (rule.geoip is null)
-            { rule.geoip = new(); }
+            rule.geoip ??= new();
             rule.geoip?.Add(address.Substring(6));
         }
+        else if (address.Equals("geoip:!private"))
+        {
+            rule.ip_is_private = false;
+        }
+        else if (address.StartsWith("geoip:!"))
+        {
+            rule.geoip ??= new();
+            rule.geoip?.Add(address.Substring(6));
+            rule.invert = true;
+        }
         else
         {
-            if (rule.ip_cidr is null)
-            { rule.ip_cidr = new(); }
+            rule.ip_cidr ??= new();
             rule.ip_cidr?.Add(address);
         }
         return true;
@@ -1386,13 +1570,24 @@ public class CoreConfigSingboxService
             return Global.ProxyTag;
         }
 
-        var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
-        var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
-        await GenOutbound(node, outbound);
-        outbound.tag = Global.ProxyTag + node.IndexId.ToString();
-        singboxConfig.outbounds.Add(outbound);
+        var server = await GenServer(node);
+        if (server is null)
+        {
+            return Global.ProxyTag;
+        }
 
-        return outbound.tag;
+        server.tag = Global.ProxyTag + node.IndexId.ToString();
+        if (server is Endpoints4Sbox endpoint)
+        {
+            singboxConfig.endpoints ??= new();
+            singboxConfig.endpoints.Add(endpoint);
+        }
+        else if (server is Outbound4Sbox outbound)
+        {
+            singboxConfig.outbounds.Add(outbound);
+        }
+
+        return server.tag;
     }
 
     private async Task<int> GenDns(ProfileItem? node, SingboxConfig singboxConfig)
@@ -1417,7 +1612,14 @@ public class CoreConfigSingboxService
             }
             singboxConfig.dns = dns4Sbox;
 
-            await GenDnsDomains(node, singboxConfig, item);
+            if (dns4Sbox.servers != null && dns4Sbox.servers.Count > 0 && dns4Sbox.servers.First().address.IsNullOrEmpty())
+            {
+                await GenDnsDomains(node, singboxConfig, item);
+            }
+            else
+            {
+                await GenDnsDomainsLegacy(node, singboxConfig, item);
+            }
         }
         catch (Exception ex)
         {
@@ -1432,6 +1634,75 @@ public class CoreConfigSingboxService
         dns4Sbox.servers ??= [];
         dns4Sbox.rules ??= [];
 
+        var tag = "local_resolver";
+        var localDnsAddress = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.SingboxDomainDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress;
+
+        if (localDnsAddress.StartsWith("tag://"))
+        {
+            tag = localDnsAddress.Substring(6);
+
+            var localDnsTag = "local_local";
+
+            dns4Sbox.servers.Add(new()
+            {
+                tag = localDnsTag,
+                type = "local"
+            });
+
+            dns4Sbox.rules.Insert(0, new()
+            {
+                server = localDnsTag,
+                clash_mode = ERuleMode.Direct.ToString()
+            });
+        }
+        else
+        {
+            var (dnsType, dnsHost, dnsPort, dnsPath) = ParseDnsAddress(localDnsAddress);
+
+            dns4Sbox.servers.Add(new()
+            {
+                tag = tag,
+                type = dnsType,
+                server = dnsHost,
+                Interface = dnsType == "dhcp" ? dnsHost : null,
+                server_port = dnsPort,
+                path = dnsPath
+            });
+
+            dns4Sbox.rules.Insert(0, new()
+            {
+                server = tag,
+                clash_mode = ERuleMode.Direct.ToString()
+            });
+        }
+
+        dns4Sbox.rules.Insert(0, new()
+        {
+            server = dns4Sbox.servers.Where(t => t.detour == Global.ProxyTag).Select(t => t.tag).FirstOrDefault() ?? "remote",
+            clash_mode = ERuleMode.Global.ToString()
+        });
+
+        //Tun2SocksAddress
+        if (_config.TunModeItem.EnableTun && node?.ConfigType == EConfigType.SOCKS && Utils.IsDomain(node?.Sni))
+        {
+            dns4Sbox.rules.Insert(0, new()
+            {
+                server = tag,
+                domain = [node?.Sni],
+                strategy = string.IsNullOrEmpty(dNSItem?.DomainStrategy4Freedom) ? null : dNSItem?.DomainStrategy4Freedom
+            });
+        }
+
+        singboxConfig.dns = dns4Sbox;
+        return await Task.FromResult(0);
+    }
+
+    private async Task<int> GenDnsDomainsLegacy(ProfileItem? node, SingboxConfig singboxConfig, DNSItem? dNSItem)
+    {
+        var dns4Sbox = singboxConfig.dns ?? new();
+        dns4Sbox.servers ??= [];
+        dns4Sbox.rules ??= [];
+
         var tag = "local_local";
         dns4Sbox.servers.Add(new()
         {
@@ -1479,6 +1750,91 @@ public class CoreConfigSingboxService
         return await Task.FromResult(0);
     }
 
+    private (string type, string? host, int? port, string? path) ParseDnsAddress(string address)
+    {
+        string type = "udp";
+        string? host = null;
+        int? port = null;
+        string? path = null;
+
+        if (address is "local" or "localhost")
+        {
+            return ("local", null, null, null);
+        }
+
+        if (address.StartsWith("dhcp://", StringComparison.OrdinalIgnoreCase))
+        {
+            string interface_name = address.Substring(7);
+            return ("dhcp", interface_name == "auto" ? null : interface_name, null, null);
+        }
+
+        if (!address.Contains("://"))
+        {
+            // udp dns
+            host = address;
+            return (type, host, port, path);
+        }
+
+        try
+        {
+            int protocolEndIndex = address.IndexOf("://", StringComparison.Ordinal);
+            type = address.Substring(0, protocolEndIndex).ToLower();
+
+            var uri = new Uri(address);
+            host = uri.Host;
+
+            if (!uri.IsDefaultPort)
+            {
+                port = uri.Port;
+            }
+
+            if ((type == "https" || type == "h3") && !string.IsNullOrEmpty(uri.AbsolutePath) && uri.AbsolutePath != "/")
+            {
+                path = uri.AbsolutePath;
+            }
+        }
+        catch (UriFormatException)
+        {
+            int protocolEndIndex = address.IndexOf("://", StringComparison.Ordinal);
+            if (protocolEndIndex > 0)
+            {
+                type = address.Substring(0, protocolEndIndex).ToLower();
+                string remaining = address.Substring(protocolEndIndex + 3);
+
+                int portIndex = remaining.IndexOf(':');
+                int pathIndex = remaining.IndexOf('/');
+
+                if (portIndex > 0)
+                {
+                    host = remaining.Substring(0, portIndex);
+                    string portPart = pathIndex > portIndex
+                        ? remaining.Substring(portIndex + 1, pathIndex - portIndex - 1)
+                        : remaining.Substring(portIndex + 1);
+
+                    if (int.TryParse(portPart, out int parsedPort))
+                    {
+                        port = parsedPort;
+                    }
+                }
+                else if (pathIndex > 0)
+                {
+                    host = remaining.Substring(0, pathIndex);
+                }
+                else
+                {
+                    host = remaining;
+                }
+
+                if (pathIndex > 0 && (type == "https" || type == "h3"))
+                {
+                    path = remaining.Substring(pathIndex);
+                }
+            }
+        }
+
+        return (type, host, port, path);
+    }
+
     private async Task<int> GenExperimental(SingboxConfig singboxConfig)
     {
         //if (_config.guiItem.enableStatistics)
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
index 2e4f5842..60b4df3e 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
@@ -120,7 +120,7 @@ public class CoreConfigV2rayService
                 {
                     continue;
                 }
-                if (it.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC)
+                if (it.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls)
                 {
                     continue;
                 }
@@ -640,7 +640,8 @@ public class CoreConfigV2rayService
         if (node == null
             || node.ConfigType == EConfigType.Custom
             || node.ConfigType == EConfigType.Hysteria2
-            || node.ConfigType == EConfigType.TUIC)
+            || node.ConfigType == EConfigType.TUIC
+            || node.ConfigType == EConfigType.Anytls)
         {
             return Global.ProxyTag;
         }
@@ -1222,6 +1223,7 @@ public class CoreConfigV2rayService
                     && prevNode.ConfigType != EConfigType.Custom
                     && prevNode.ConfigType != EConfigType.Hysteria2
                     && prevNode.ConfigType != EConfigType.TUIC
+                    && prevNode.ConfigType != EConfigType.Anytls
                     && Utils.IsDomain(prevNode.Address))
                 {
                     domainList.Add(prevNode.Address);
@@ -1233,6 +1235,7 @@ public class CoreConfigV2rayService
                     && nextNode.ConfigType != EConfigType.Custom
                     && nextNode.ConfigType != EConfigType.Hysteria2
                     && nextNode.ConfigType != EConfigType.TUIC
+                    && nextNode.ConfigType != EConfigType.Anytls
                     && Utils.IsDomain(nextNode.Address))
                 {
                     domainList.Add(nextNode.Address);
@@ -1350,7 +1353,8 @@ public class CoreConfigV2rayService
             if (prevNode is not null
                 && prevNode.ConfigType != EConfigType.Custom
                 && prevNode.ConfigType != EConfigType.Hysteria2
-                && prevNode.ConfigType != EConfigType.TUIC)
+                && prevNode.ConfigType != EConfigType.TUIC
+                && prevNode.ConfigType != EConfigType.Anytls)
             {
                 var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                 await GenOutbound(prevNode, prevOutbound);
@@ -1425,7 +1429,8 @@ public class CoreConfigV2rayService
                         if (prevNode is not null
                             && prevNode.ConfigType != EConfigType.Custom
                             && prevNode.ConfigType != EConfigType.Hysteria2
-                            && prevNode.ConfigType != EConfigType.TUIC)
+                            && prevNode.ConfigType != EConfigType.TUIC
+                            && prevNode.ConfigType != EConfigType.Anytls)
                         {
                             var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                             await GenOutbound(prevNode, prevOutbound);
@@ -1494,7 +1499,8 @@ public class CoreConfigV2rayService
             if (nextNode is not null
                 && nextNode.ConfigType != EConfigType.Custom
                 && nextNode.ConfigType != EConfigType.Hysteria2
-                && nextNode.ConfigType != EConfigType.TUIC)
+                && nextNode.ConfigType != EConfigType.TUIC
+                && nextNode.ConfigType != EConfigType.Anytls)
             {
                 if (nextOutbound == null)
                 {
diff --git a/v2rayN/ServiceLib/Services/SpeedtestService.cs b/v2rayN/ServiceLib/Services/SpeedtestService.cs
index 998cedcc..9c97a217 100644
--- a/v2rayN/ServiceLib/Services/SpeedtestService.cs
+++ b/v2rayN/ServiceLib/Services/SpeedtestService.cs
@@ -358,8 +358,8 @@ public class SpeedtestService
     private List<List<ServerTestItem>> GetTestBatchItem(List<ServerTestItem> lstSelected, int pageSize)
     {
         List<List<ServerTestItem>> lstTest = new();
-        var lst1 = lstSelected.Where(t => t.ConfigType is not (EConfigType.Hysteria2 or EConfigType.TUIC)).ToList();
-        var lst2 = lstSelected.Where(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC).ToList();
+        var lst1 = lstSelected.Where(t => t.ConfigType is not (EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls)).ToList();
+        var lst2 = lstSelected.Where(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls).ToList();
 
         for (var num = 0; num < (int)Math.Ceiling(lst1.Count * 1.0 / pageSize); num++)
         {
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index 7bae19be..36e20a87 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -20,6 +20,7 @@ public class MainWindowViewModel : MyReactiveObject
     public ReactiveCommand<Unit, Unit> AddHysteria2ServerCmd { get; }
     public ReactiveCommand<Unit, Unit> AddTuicServerCmd { get; }
     public ReactiveCommand<Unit, Unit> AddWireguardServerCmd { get; }
+    public ReactiveCommand<Unit, Unit> AddAnytlsServerCmd { get; }
     public ReactiveCommand<Unit, Unit> AddCustomServerCmd { get; }
     public ReactiveCommand<Unit, Unit> AddServerViaClipboardCmd { get; }
     public ReactiveCommand<Unit, Unit> AddServerViaScanCmd { get; }
@@ -111,6 +112,10 @@ public class MainWindowViewModel : MyReactiveObject
         {
             await AddServerAsync(true, EConfigType.WireGuard);
         });
+        AddAnytlsServerCmd = ReactiveCommand.CreateFromTask(async () =>
+        {
+            await AddServerAsync(true, EConfigType.Anytls);
+        });
         AddCustomServerCmd = ReactiveCommand.CreateFromTask(async () =>
         {
             await AddServerAsync(true, EConfigType.Custom);
diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
index da56d617..56cc82a0 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
@@ -533,6 +533,26 @@
                         HorizontalAlignment="Left"
                         Watermark="1500" />
                 </Grid>
+                <Grid
+                    x:Name="gridAnytls"
+                    Grid.Row="2"
+                    ColumnDefinitions="180,Auto"
+                    IsVisible="False"
+                    RowDefinitions="Auto,Auto,Auto">
+
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbId3}" />
+                    <TextBox
+                        x:Name="txtId10"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource Margin4}" />
+                </Grid>
 
                 <Separator
                     x:Name="sepa2"
diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
index 3adef603..9d24175f 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
@@ -102,6 +102,12 @@ public partial class AddServerWindow : WindowBase<AddServerViewModel>
                 gridTls.IsVisible = false;
 
                 break;
+
+            case EConfigType.Anytls:
+                gridAnytls.IsVisible = true;
+                lstStreamSecurity.Add(Global.StreamSecurityReality);
+                cmbCoreType.IsEnabled = false;
+                break;
         }
         cmbStreamSecurity.ItemsSource = lstStreamSecurity;
 
@@ -167,6 +173,10 @@ public partial class AddServerWindow : WindowBase<AddServerViewModel>
                     this.Bind(ViewModel, vm => vm.SelectedSource.RequestHost, v => v.txtRequestHost9.Text).DisposeWith(disposables);
                     this.Bind(ViewModel, vm => vm.SelectedSource.ShortId, v => v.txtShortId9.Text).DisposeWith(disposables);
                     break;
+
+                case EConfigType.Anytls:
+                    this.Bind(ViewModel, vm => vm.SelectedSource.Id, v => v.txtId10.Text).DisposeWith(disposables);
+                    break;
             }
             this.Bind(ViewModel, vm => vm.SelectedSource.Network, v => v.cmbNetwork.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.HeaderType, v => v.cmbHeaderType.SelectedValue).DisposeWith(disposables);
diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
index bbc78a72..af4ae529 100644
--- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
@@ -46,6 +46,7 @@
                         <Separator />
                         <MenuItem x:Name="menuAddHysteria2Server" Header="{x:Static resx:ResUI.menuAddHysteria2Server}" />
                         <MenuItem x:Name="menuAddTuicServer" Header="{x:Static resx:ResUI.menuAddTuicServer}" />
+                        <MenuItem x:Name="menuAddAnytlsServer" Header="{x:Static resx:ResUI.menuAddAnytlsServer}" />
                     </MenuItem>
 
                     <MenuItem Padding="8,0">
diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
index ea95ef0e..2584310b 100644
--- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
@@ -83,6 +83,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
             this.BindCommand(ViewModel, vm => vm.AddHysteria2ServerCmd, v => v.menuAddHysteria2Server).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddTuicServerCmd, v => v.menuAddTuicServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddWireguardServerCmd, v => v.menuAddWireguardServer).DisposeWith(disposables);
+            this.BindCommand(ViewModel, vm => vm.AddAnytlsServerCmd, v => v.menuAddAnytlsServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddCustomServerCmd, v => v.menuAddCustomServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddServerViaClipboardCmd, v => v.menuAddServerViaClipboard).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddServerViaScanCmd, v => v.menuAddServerViaScan).DisposeWith(disposables);
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs
index d9095135..53fba00b 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs
@@ -117,7 +117,7 @@ public partial class RoutingSettingWindow : WindowBase<RoutingSettingViewModel>
 
     private void linkdomainStrategy4Singbox_Click(object? sender, RoutedEventArgs e)
     {
-        ProcUtils.ProcessStart("https://sing-box.sagernet.org/zh/configuration/shared/listen/#domain_strategy");
+        ProcUtils.ProcessStart("https://sing-box.sagernet.org/zh/configuration/route/rule_action/#strategy");
     }
 
     private void btnCancel_Click(object? sender, RoutedEventArgs e)
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml
index 9a4b88ad..acea0c28 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -707,6 +707,35 @@
                         materialDesign:HintAssist.Hint="1500"
                         Style="{StaticResource DefTextBox}" />
                 </Grid>
+                <Grid
+                    x:Name="gridAnytls"
+                    Grid.Row="2"
+                    Visibility="Hidden">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbId3}" />
+                    <TextBox
+                        x:Name="txtId10"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource Margin4}"
+                        Style="{StaticResource DefTextBox}" />
+                </Grid>
 
                 <Separator
                     x:Name="sepa2"
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
index a89b0243..b06002a9 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
@@ -96,6 +96,12 @@ public partial class AddServerWindow
                 gridTls.Visibility = Visibility.Collapsed;
 
                 break;
+
+            case EConfigType.Anytls:
+                gridAnytls.Visibility = Visibility.Visible;
+                cmbCoreType.IsEnabled = false;
+                lstStreamSecurity.Add(Global.StreamSecurityReality);
+                break;
         }
         cmbStreamSecurity.ItemsSource = lstStreamSecurity;
 
@@ -161,6 +167,10 @@ public partial class AddServerWindow
                     this.Bind(ViewModel, vm => vm.SelectedSource.RequestHost, v => v.txtRequestHost9.Text).DisposeWith(disposables);
                     this.Bind(ViewModel, vm => vm.SelectedSource.ShortId, v => v.txtShortId9.Text).DisposeWith(disposables);
                     break;
+
+                case EConfigType.Anytls:
+                    this.Bind(ViewModel, vm => vm.SelectedSource.Id, v => v.txtId10.Text).DisposeWith(disposables);
+                    break;
             }
             this.Bind(ViewModel, vm => vm.SelectedSource.Network, v => v.cmbNetwork.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.HeaderType, v => v.cmbHeaderType.Text).DisposeWith(disposables);
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index 55384453..0b8c30b3 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -108,6 +108,10 @@
                                     x:Name="menuAddTuicServer"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuAddTuicServer}" />
+                                <MenuItem
+                                    x:Name="menuAddAnytlsServer"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuAddAnytlsServer}" />
                             </MenuItem>
                         </Menu>
                         <Separator />
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index 88af6334..08bdd90b 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -80,6 +80,7 @@ public partial class MainWindow
             this.BindCommand(ViewModel, vm => vm.AddHysteria2ServerCmd, v => v.menuAddHysteria2Server).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddTuicServerCmd, v => v.menuAddTuicServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddWireguardServerCmd, v => v.menuAddWireguardServer).DisposeWith(disposables);
+            this.BindCommand(ViewModel, vm => vm.AddAnytlsServerCmd, v => v.menuAddAnytlsServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddCustomServerCmd, v => v.menuAddCustomServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddServerViaClipboardCmd, v => v.menuAddServerViaClipboard).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddServerViaScanCmd, v => v.menuAddServerViaScan).DisposeWith(disposables);
diff --git a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
index 5781dcba..0c7f1518 100644
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
@@ -122,7 +122,7 @@ public partial class RoutingSettingWindow
 
     private void linkdomainStrategy4Singbox_Click(object sender, RoutedEventArgs e)
     {
-        ProcUtils.ProcessStart("https://sing-box.sagernet.org/zh/configuration/shared/listen/#domain_strategy");
+        ProcUtils.ProcessStart("https://sing-box.sagernet.org/zh/configuration/route/rule_action/#strategy");
     }
 
     private void btnCancel_Click(object sender, System.Windows.RoutedEventArgs e)

From d41a73b44b6751bff16c72d47086a0ada4ef7f49 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Sun, 10 Aug 2025 11:57:42 +0800
Subject: [PATCH 025/115] Simplify DNS Settings (#7572)

* Simplify DNS Settings

* fix

* ExpectedIPs

* Optimize ExpectedIPs Logic

* Fixes geoip overrides rule_set when geosite is also set

* rename DNSItem to SimpleDNSItem

* Compatible

* Fixes Combobox for desktop

* Regional Preset

* Fix

* Refactor DNS tags handling

* Uses correct DNS strategy for direct connections

* auto-disable DNS items with empty NormalDNS on startup
---
 v2rayN/ServiceLib/Common/JsonUtils.cs         |   5 +-
 v2rayN/ServiceLib/Global.cs                   |  67 ++-
 v2rayN/ServiceLib/Handler/ConfigHandler.cs    |  64 ++
 v2rayN/ServiceLib/Models/Config.cs            |   1 +
 v2rayN/ServiceLib/Models/ConfigItems.cs       |  18 +
 v2rayN/ServiceLib/Models/DNSItem.cs           |   2 +-
 v2rayN/ServiceLib/Models/SingboxConfig.cs     |   5 +-
 v2rayN/ServiceLib/Models/V2rayConfig.cs       |   7 +-
 v2rayN/ServiceLib/Resx/ResUI.Designer.cs      | 198 +++++++
 v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx       |  66 +++
 v2rayN/ServiceLib/Resx/ResUI.hu.resx          |  66 +++
 v2rayN/ServiceLib/Resx/ResUI.resx             |  66 +++
 v2rayN/ServiceLib/Resx/ResUI.ru.resx          | 126 +++-
 v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx     |  66 +++
 v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx     |  66 +++
 .../CoreConfig/CoreConfigSingboxService.cs    | 546 +++++++++++++-----
 .../CoreConfig/CoreConfigV2rayService.cs      | 289 ++++++++-
 .../ViewModels/DNSSettingViewModel.cs         | 142 +++--
 .../Views/DNSSettingWindow.axaml              | 372 ++++++++++--
 .../Views/DNSSettingWindow.axaml.cs           |  67 ++-
 v2rayN/v2rayN/Views/DNSSettingWindow.xaml     | 431 ++++++++++++--
 v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs  |  68 ++-
 22 files changed, 2371 insertions(+), 367 deletions(-)

diff --git a/v2rayN/ServiceLib/Common/JsonUtils.cs b/v2rayN/ServiceLib/Common/JsonUtils.cs
index 773ba79c..6954e124 100644
--- a/v2rayN/ServiceLib/Common/JsonUtils.cs
+++ b/v2rayN/ServiceLib/Common/JsonUtils.cs
@@ -128,5 +128,8 @@ public class JsonUtils
     /// </summary>
     /// <param name="obj"></param>
     /// <returns></returns>
-    public static JsonNode? SerializeToNode(object? obj) => JsonSerializer.SerializeToNode(obj);
+    public static JsonNode? SerializeToNode(object? obj, JsonSerializerOptions? options = null)
+    {
+        return JsonSerializer.SerializeToNode(obj, options);
+    }
 }
diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs
index 4888ab6a..11acde71 100644
--- a/v2rayN/ServiceLib/Global.cs
+++ b/v2rayN/ServiceLib/Global.cs
@@ -76,6 +76,13 @@ public class Global
     public const int SpeedTestPageSize = 1000;
     public const string LinuxBash = "/bin/bash";
 
+    public const string SingboxDirectDNSTag = "direct_dns";
+    public const string SingboxRemoteDNSTag = "remote_dns";
+    public const string SingboxOutboundResolverTag = "outbound_resolver";
+    public const string SingboxFinalResolverTag = "final_resolver";
+    public const string SingboxHostsDNSTag = "hosts_dns";
+    public const string SingboxFakeDNSTag = "fake_dns";
+
     public static readonly List<string> IEProxyProtocols =
     [
         "{ip}:{http_port}",
@@ -351,25 +358,42 @@ public class Global
 
     public static readonly List<string> SingboxDomainStrategy4Out =
     [
-        "ipv4_only",
+        "",
+            "ipv4_only",
             "prefer_ipv4",
             "prefer_ipv6",
-            "ipv6_only",
-            ""
+            "ipv6_only"
     ];
 
-    public static readonly List<string> DomainDNSAddress =
+    public static readonly List<string> DomainDirectDNSAddress =
     [
-        "223.5.5.5",
-            "223.6.6.6",
+        "https://dns.alidns.com/dns-query",
+            "https://doh.pub/dns-query",
+            "223.5.5.5",
+            "119.29.29.29",
             "localhost"
     ];
 
-    public static readonly List<string> SingboxDomainDNSAddress =
+    public static readonly List<string> DomainRemoteDNSAddress =
+    [
+        "https://cloudflare-dns.com/dns-query",
+            "https://dns.cloudflare.com/dns-query",
+            "https://dns.google/dns-query",
+            "https://doh.dns.sb/dns-query",
+            "https://doh.opendns.com/dns-query",
+            "https://common.dot.dns.yandex.net",
+            "8.8.8.8",
+            "1.1.1.1",
+            "185.222.222.222",
+            "208.67.222.222",
+            "77.88.8.8"
+    ];
+
+    public static readonly List<string> DomainPureIPDNSAddress =
     [
         "223.5.5.5",
-            "223.6.6.6",
-            "dhcp://auto"
+            "119.29.29.29",
+            "localhost"
     ];
 
     public static readonly List<string> Languages =
@@ -539,5 +563,30 @@ public class Global
         BlockTag
     ];
 
+    public static readonly Dictionary<string, List<string>> PredefinedHosts = new()
+        {
+            { "dns.google", new List<string> { "8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844" } },
+            { "dns.alidns.com", new List<string> { "223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1" } },
+            { "one.one.one.one", new List<string> { "1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001" } },
+            { "1dot1dot1dot1.cloudflare-dns.com", new List<string> { "1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001" } },
+            { "cloudflare-dns.com", new List<string> { "104.16.249.249", "104.16.248.249", "2606:4700::6810:f8f9", "2606:4700::6810:f9f9" } },
+            { "dns.cloudflare.com", new List<string> { "104.16.132.229", "104.16.133.229", "2606:4700::6810:84e5", "2606:4700::6810:85e5" } },
+            { "dot.pub", new List<string> { "1.12.12.12", "120.53.53.53" } },
+            { "dns.quad9.net", new List<string> { "9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9" } },
+            { "dns.yandex.net", new List<string> { "77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff" } },
+            { "dns.sb", new List<string> { "185.222.222.222", "2a09::" } },
+            { "dns.umbrella.com", new List<string> { "208.67.220.220", "208.67.222.222", "2620:119:35::35", "2620:119:53::53" } },
+            { "dns.sse.cisco.com", new List<string> { "208.67.220.220", "208.67.222.222", "2620:119:35::35", "2620:119:53::53" } },
+            { "engage.cloudflareclient.com", new List<string> { "162.159.192.1", "2606:4700:d0::a29f:c001" } }
+        };
+
+    public static readonly List<string> ExpectedIPs =
+    [
+        "geoip:cn",
+            "geoip:ir",
+            "geoip:ru",
+            ""
+    ];
+
     #endregion const
 }
diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
index 6c93d868..998c2427 100644
--- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -112,6 +112,11 @@ public class ConfigHandler
 
         config.ConstItem ??= new ConstItem();
 
+        if (config.SimpleDNSItem == null)
+        {
+            InitBuiltinSimpleDNS(config);
+        }
+
         config.SpeedTestItem ??= new();
         if (config.SpeedTestItem.SpeedTestTimeout < 10)
         {
@@ -2094,18 +2099,38 @@ public class ConfigHandler
     /// <summary>
     /// Initialize built-in DNS configurations
     /// Creates default DNS items for V2Ray and sing-box
+    /// Also checks existing DNS items and disables those with empty NormalDNS
     /// </summary>
     /// <param name="config">Current configuration</param>
     /// <returns>0 if successful</returns>
     public static async Task<int> InitBuiltinDNS(Config config)
     {
         var items = await AppHandler.Instance.DNSItems();
+        
+        // Check existing DNS items and disable those with empty NormalDNS
+        var needsUpdate = false;
+        foreach (var existingItem in items)
+        {
+            if (existingItem.NormalDNS.IsNullOrEmpty() && existingItem.Enabled)
+            {
+                existingItem.Enabled = false;
+                needsUpdate = true;
+            }
+        }
+        
+        // Update items if any changes were made
+        if (needsUpdate)
+        {
+            await SQLiteHelper.Instance.UpdateAllAsync(items);
+        }
+        
         if (items.Count <= 0)
         {
             var item = new DNSItem()
             {
                 Remarks = "V2ray",
                 CoreType = ECoreType.Xray,
+                Enabled = false,
             };
             await SaveDNSItems(config, item);
 
@@ -2113,6 +2138,7 @@ public class ConfigHandler
             {
                 Remarks = "sing-box",
                 CoreType = ECoreType.sing_box,
+                Enabled = false,
             };
             await SaveDNSItems(config, item2);
         }
@@ -2184,6 +2210,38 @@ public class ConfigHandler
 
     #endregion DNS
 
+    #region Simple DNS
+
+    public static int InitBuiltinSimpleDNS(Config config)
+    {
+        config.SimpleDNSItem = new SimpleDNSItem()
+        {
+            UseSystemHosts = false,
+            AddCommonHosts = true,
+            FakeIP = false,
+            BlockBindingQuery = true,
+            DirectDNS = Global.DomainDirectDNSAddress.FirstOrDefault(),
+            RemoteDNS = Global.DomainRemoteDNSAddress.FirstOrDefault(),
+            SingboxOutboundsResolveDNS = Global.DomainDirectDNSAddress.FirstOrDefault(),
+            SingboxFinalResolveDNS = Global.DomainPureIPDNSAddress.FirstOrDefault()
+        };
+        return 0;
+    }
+
+    public static async Task<SimpleDNSItem> GetExternalSimpleDNSItem(string url)
+    {
+        var downloadHandle = new DownloadService();
+        var templateContent = await downloadHandle.TryDownloadString(url, true, "");
+        if (templateContent.IsNullOrEmpty())
+            return null;
+        var template = JsonUtils.Deserialize<SimpleDNSItem>(templateContent);
+        if (template == null)
+            return null;
+        return template;
+    }
+
+    #endregion Simple DNS
+
     #region Regional Presets
 
     /// <summary>
@@ -2205,6 +2263,8 @@ public class ConfigHandler
                 await SQLiteHelper.Instance.DeleteAllAsync<DNSItem>();
                 await InitBuiltinDNS(config);
 
+                InitBuiltinSimpleDNS(config);
+
                 return true;
 
             case EPresetType.Russia:
@@ -2215,6 +2275,8 @@ public class ConfigHandler
                 await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.Xray, Global.DNSTemplateSources[1] + "v2ray.json"));
                 await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.sing_box, Global.DNSTemplateSources[1] + "sing_box.json"));
 
+                config.SimpleDNSItem = await GetExternalSimpleDNSItem(Global.DNSTemplateSources[1] + "simple_dns.json");
+
                 return true;
 
             case EPresetType.Iran:
@@ -2225,6 +2287,8 @@ public class ConfigHandler
                 await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.Xray, Global.DNSTemplateSources[2] + "v2ray.json"));
                 await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.sing_box, Global.DNSTemplateSources[2] + "sing_box.json"));
 
+                config.SimpleDNSItem = await GetExternalSimpleDNSItem(Global.DNSTemplateSources[2] + "simple_dns.json");
+
                 return true;
         }
 
diff --git a/v2rayN/ServiceLib/Models/Config.cs b/v2rayN/ServiceLib/Models/Config.cs
index 15996608..91b49b29 100644
--- a/v2rayN/ServiceLib/Models/Config.cs
+++ b/v2rayN/ServiceLib/Models/Config.cs
@@ -48,6 +48,7 @@ public class Config
     public List<InItem> Inbound { get; set; }
     public List<KeyEventItem> GlobalHotkeys { get; set; }
     public List<CoreTypeItem> CoreTypeItem { get; set; }
+    public SimpleDNSItem SimpleDNSItem { get; set; }
 
     #endregion other entities
 }
diff --git a/v2rayN/ServiceLib/Models/ConfigItems.cs b/v2rayN/ServiceLib/Models/ConfigItems.cs
index c6254b9f..998b49f1 100644
--- a/v2rayN/ServiceLib/Models/ConfigItems.cs
+++ b/v2rayN/ServiceLib/Models/ConfigItems.cs
@@ -253,3 +253,21 @@ public class WindowSizeItem
     public int Width { get; set; }
     public int Height { get; set; }
 }
+
+[Serializable]
+public class SimpleDNSItem
+{
+    public bool? UseSystemHosts { get; set; }
+    public bool? AddCommonHosts { get; set; }
+    public bool? FakeIP { get; set; }
+    public bool? BlockBindingQuery { get; set; }
+    public string? DirectDNS { get; set; }
+    public string? RemoteDNS { get; set; }
+    public string? SingboxOutboundsResolveDNS { get; set; }
+    public string? SingboxFinalResolveDNS { get; set; }
+    public string? RayStrategy4Freedom { get; set; }
+    public string? SingboxStrategy4Direct { get; set; }
+    public string? SingboxStrategy4Proxy { get; set; }
+    public string? Hosts { get; set; }
+    public string? DirectExpectedIPs { get; set; }
+}
diff --git a/v2rayN/ServiceLib/Models/DNSItem.cs b/v2rayN/ServiceLib/Models/DNSItem.cs
index 59ab9c9b..9474d906 100644
--- a/v2rayN/ServiceLib/Models/DNSItem.cs
+++ b/v2rayN/ServiceLib/Models/DNSItem.cs
@@ -9,7 +9,7 @@ public class DNSItem
     public string Id { get; set; }
 
     public string Remarks { get; set; }
-    public bool Enabled { get; set; } = true;
+    public bool Enabled { get; set; } = false;
     public ECoreType CoreType { get; set; }
     public bool UseSystemHosts { get; set; }
     public string? NormalDNS { get; set; }
diff --git a/v2rayN/ServiceLib/Models/SingboxConfig.cs b/v2rayN/ServiceLib/Models/SingboxConfig.cs
index c63acc4a..cbaf77e6 100644
--- a/v2rayN/ServiceLib/Models/SingboxConfig.cs
+++ b/v2rayN/ServiceLib/Models/SingboxConfig.cs
@@ -36,6 +36,7 @@ public class Dns4Sbox
 
 public class Route4Sbox
 {
+    public Rule4Sbox? default_domain_resolver { get; set; } // or string
     public bool? auto_detect_interface { get; set; }
     public List<Rule4Sbox> rules { get; set; }
     public List<Ruleset4Sbox>? rule_set { get; set; }
@@ -75,7 +76,7 @@ public class Rule4Sbox
     public string? strategy { get; set; }
     public List<string>? sniffer { get; set; }
     public string? rcode { get; set; }
-    public List<object>? query_type { get; set; }
+    public List<int>? query_type { get; set; }
     public List<string>? answer { get; set; }
     public List<string>? ns { get; set; }
     public List<string>? extra { get; set; }
@@ -237,7 +238,7 @@ public class Server4Sbox : BaseServer4Sbox
     public string? path { get; set; }
     public Headers4Sbox? headers { get; set; }
     // public List<string>? path { get; set; } // hosts
-    public Dictionary<string, object>? predefined { get; set; }
+    public Dictionary<string, List<string>>? predefined { get; set; }
     // Deprecated
     public string? address { get; set; }
     public string? address_resolver { get; set; }
diff --git a/v2rayN/ServiceLib/Models/V2rayConfig.cs b/v2rayN/ServiceLib/Models/V2rayConfig.cs
index e7cd3722..354e33dc 100644
--- a/v2rayN/ServiceLib/Models/V2rayConfig.cs
+++ b/v2rayN/ServiceLib/Models/V2rayConfig.cs
@@ -5,7 +5,7 @@ namespace ServiceLib.Models;
 public class V2rayConfig
 {
     public Log4Ray log { get; set; }
-    public object dns { get; set; }
+    public Dns4Ray dns { get; set; }
     public List<Inbounds4Ray> inbounds { get; set; }
     public List<Outbounds4Ray> outbounds { get; set; }
     public Routing4Ray routing { get; set; }
@@ -203,7 +203,8 @@ public class Response4Ray
 
 public class Dns4Ray
 {
-    public List<string> servers { get; set; }
+    public Dictionary<string, List<string>>? hosts { get; set; }
+    public List<object> servers { get; set; }
 }
 
 public class DnsServer4Ray
@@ -211,6 +212,8 @@ public class DnsServer4Ray
     public string? address { get; set; }
     public List<string>? domains { get; set; }
     public bool? skipFallback { get; set; }
+    public List<string>? expectedIPs { get; set; }
+    public List<string>? unexpectedIPs { get; set; }
 }
 
 public class Routing4Ray
diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index ca554860..31405d61 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -2220,6 +2220,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Add Common DNS Hosts 的本地化字符串。
+        /// </summary>
+        public static string TbAddCommonDNSHosts {
+            get {
+                return ResourceManager.GetString("TbAddCommonDNSHosts", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Address 的本地化字符串。
         /// </summary>
@@ -2256,6 +2265,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Apply to Proxy Domains Only 的本地化字符串。
+        /// </summary>
+        public static string TbApplyProxyDomainsOnly {
+            get {
+                return ResourceManager.GetString("TbApplyProxyDomainsOnly", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Auto refresh 的本地化字符串。
         /// </summary>
@@ -2283,6 +2301,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Block SVCB and HTTPS Queries 的本地化字符串。
+        /// </summary>
+        public static string TbBlockSVCBHTTPSQueries {
+            get {
+                return ResourceManager.GetString("TbBlockSVCBHTTPSQueries", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Browse 的本地化字符串。
         /// </summary>
@@ -2337,6 +2364,24 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Enable Custom DNS 的本地化字符串。
+        /// </summary>
+        public static string TbCustomDNSEnable {
+            get {
+                return ResourceManager.GetString("TbCustomDNSEnable", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Custom DNS Enabled, This Page&apos;s Settings Invalid 的本地化字符串。
+        /// </summary>
+        public static string TbCustomDNSEnabledPageInvalid {
+            get {
+                return ResourceManager.GetString("TbCustomDNSEnabledPageInvalid", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Display GUI 的本地化字符串。
         /// </summary>
@@ -2355,6 +2400,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 DNS Hosts: (&quot;domain1 ip1 ip2&quot; per line) 的本地化字符串。
+        /// </summary>
+        public static string TbDNSHostsConfig {
+            get {
+                return ResourceManager.GetString("TbDNSHostsConfig", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Supports DNS Object; Click to view documentation 的本地化字符串。
         /// </summary>
@@ -2400,6 +2454,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Domestic DNS 的本地化字符串。
+        /// </summary>
+        public static string TbDomesticDNS {
+            get {
+                return ResourceManager.GetString("TbDomesticDNS", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Edit 的本地化字符串。
         /// </summary>
@@ -2418,6 +2481,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 FakeIP 的本地化字符串。
+        /// </summary>
+        public static string TbFakeIP {
+            get {
+                return ResourceManager.GetString("TbFakeIP", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Fingerprint 的本地化字符串。
         /// </summary>
@@ -2616,6 +2688,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Prevent DNS Leaks 的本地化字符串。
+        /// </summary>
+        public static string TbPreventDNSLeaks {
+            get {
+                return ResourceManager.GetString("TbPreventDNSLeaks", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Private Key 的本地化字符串。
         /// </summary>
@@ -2652,6 +2733,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Remote DNS 的本地化字符串。
+        /// </summary>
+        public static string TbRemoteDNS {
+            get {
+                return ResourceManager.GetString("TbRemoteDNS", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Camouflage domain(host) 的本地化字符串。
         /// </summary>
@@ -2760,6 +2850,69 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 sing-box Direct Resolution Strategy 的本地化字符串。
+        /// </summary>
+        public static string TbSBDirectResolveStrategy {
+            get {
+                return ResourceManager.GetString("TbSBDirectResolveStrategy", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 The sing-box DoH resolution server can be overwritten 的本地化字符串。
+        /// </summary>
+        public static string TbSBDoHOverride {
+            get {
+                return ResourceManager.GetString("TbSBDoHOverride", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 sing-box DoH Resolver Server 的本地化字符串。
+        /// </summary>
+        public static string TbSBDoHResolverServer {
+            get {
+                return ResourceManager.GetString("TbSBDoHResolverServer", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Fallback DNS Resolution, Suggest IP 的本地化字符串。
+        /// </summary>
+        public static string TbSBFallbackDNSResolve {
+            get {
+                return ResourceManager.GetString("TbSBFallbackDNSResolve", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Resolve Outbound Domains 的本地化字符串。
+        /// </summary>
+        public static string TbSBOutboundDomainResolve {
+            get {
+                return ResourceManager.GetString("TbSBOutboundDomainResolve", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Outbound DNS Resolution (sing-box) 的本地化字符串。
+        /// </summary>
+        public static string TbSBOutboundsResolverDNS {
+            get {
+                return ResourceManager.GetString("TbSBOutboundsResolverDNS", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 sing-box Remote Resolution Strategy 的本地化字符串。
+        /// </summary>
+        public static string TbSBRemoteResolveStrategy {
+            get {
+                return ResourceManager.GetString("TbSBRemoteResolveStrategy", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Encryption method (security) 的本地化字符串。
         /// </summary>
@@ -3705,6 +3858,33 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Validate Regional Domain IPs 的本地化字符串。
+        /// </summary>
+        public static string TbValidateDirectExpectedIPs {
+            get {
+                return ResourceManager.GetString("TbValidateDirectExpectedIPs", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs 的本地化字符串。
+        /// </summary>
+        public static string TbValidateDirectExpectedIPsDesc {
+            get {
+                return ResourceManager.GetString("TbValidateDirectExpectedIPsDesc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 xray Freedom Resolution Strategy 的本地化字符串。
+        /// </summary>
+        public static string TbXrayFreedomResolveStrategy {
+            get {
+                return ResourceManager.GetString("TbXrayFreedomResolveStrategy", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 The delay: {0} ms, {1} 的本地化字符串。
         /// </summary>
@@ -3714,6 +3894,24 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Advanced DNS Settings 的本地化字符串。
+        /// </summary>
+        public static string ThAdvancedDNSSettings {
+            get {
+                return ResourceManager.GetString("ThAdvancedDNSSettings", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Basic DNS Settings 的本地化字符串。
+        /// </summary>
+        public static string ThBasicDNSSettings {
+            get {
+                return ResourceManager.GetString("ThBasicDNSSettings", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Active 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
index bd2cb887..24625798 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1404,4 +1404,70 @@
   <data name="menuAddAnytlsServer" xml:space="preserve">
     <value>Add [Anytls] Configuration</value>
   </data>
+  <data name="TbRemoteDNS" xml:space="preserve">
+    <value>Remote DNS</value>
+  </data>
+  <data name="TbDomesticDNS" xml:space="preserve">
+    <value>Domestic DNS</value>
+  </data>
+  <data name="TbSBOutboundsResolverDNS" xml:space="preserve">
+    <value>Outbound DNS Resolution (sing-box)</value>
+  </data>
+  <data name="TbSBOutboundDomainResolve" xml:space="preserve">
+    <value>Resolve Outbound Domains</value>
+  </data>
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
+    <value>sing-box DoH Resolver Server</value>
+  </data>
+  <data name="TbSBFallbackDNSResolve" xml:space="preserve">
+    <value>Fallback DNS Resolution, Suggest IP</value>
+  </data>
+  <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
+    <value>xray Freedom Resolution Strategy</value>
+  </data>
+  <data name="TbSBDirectResolveStrategy" xml:space="preserve">
+    <value>sing-box Direct Resolution Strategy</value>
+  </data>
+  <data name="TbSBRemoteResolveStrategy" xml:space="preserve">
+    <value>sing-box Remote Resolution Strategy</value>
+  </data>
+  <data name="TbAddCommonDNSHosts" xml:space="preserve">
+    <value>Add Common DNS Hosts</value>
+  </data>
+  <data name="TbSBDoHOverride" xml:space="preserve">
+    <value>The sing-box DoH resolution server can be overwritten</value>
+  </data>
+  <data name="TbFakeIP" xml:space="preserve">
+    <value>FakeIP</value>
+  </data>
+  <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
+    <value>Block SVCB and HTTPS Queries</value>
+  </data>
+  <data name="TbPreventDNSLeaks" xml:space="preserve">
+    <value>Prevent DNS Leaks</value>
+  </data>
+  <data name="TbDNSHostsConfig" xml:space="preserve">
+    <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
+  </data>
+  <data name="TbApplyProxyDomainsOnly" xml:space="preserve">
+    <value>Apply to Proxy Domains Only</value>
+  </data>
+  <data name="ThBasicDNSSettings" xml:space="preserve">
+    <value>Basic DNS Settings</value>
+  </data>
+  <data name="ThAdvancedDNSSettings" xml:space="preserve">
+    <value>Advanced DNS Settings</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPs" xml:space="preserve">
+    <value>Validate Regional Domain IPs</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
+    <value>When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs</value>
+  </data>
+  <data name="TbCustomDNSEnable" xml:space="preserve">
+    <value>Enable Custom DNS</value>
+  </data>
+  <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
+    <value>Custom DNS Enabled, This Page's Settings Invalid</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
index 0fc30153..14df7b0e 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1404,4 +1404,70 @@
   <data name="menuAddAnytlsServer" xml:space="preserve">
     <value>[Anytls] konfiguráció hozzáadása</value>
   </data>
+  <data name="TbRemoteDNS" xml:space="preserve">
+    <value>Remote DNS</value>
+  </data>
+  <data name="TbDomesticDNS" xml:space="preserve">
+    <value>Domestic DNS</value>
+  </data>
+  <data name="TbSBOutboundsResolverDNS" xml:space="preserve">
+    <value>Outbound DNS Resolution (sing-box)</value>
+  </data>
+  <data name="TbSBOutboundDomainResolve" xml:space="preserve">
+    <value>Resolve Outbound Domains</value>
+  </data>
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
+    <value>sing-box DoH Resolver Server</value>
+  </data>
+  <data name="TbSBFallbackDNSResolve" xml:space="preserve">
+    <value>Fallback DNS Resolution, Suggest IP</value>
+  </data>
+  <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
+    <value>xray Freedom Resolution Strategy</value>
+  </data>
+  <data name="TbSBDirectResolveStrategy" xml:space="preserve">
+    <value>sing-box Direct Resolution Strategy</value>
+  </data>
+  <data name="TbSBRemoteResolveStrategy" xml:space="preserve">
+    <value>sing-box Remote Resolution Strategy</value>
+  </data>
+  <data name="TbAddCommonDNSHosts" xml:space="preserve">
+    <value>Add Common DNS Hosts</value>
+  </data>
+  <data name="TbSBDoHOverride" xml:space="preserve">
+    <value>The sing-box DoH resolution server can be overwritten</value>
+  </data>
+  <data name="TbFakeIP" xml:space="preserve">
+    <value>FakeIP</value>
+  </data>
+  <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
+    <value>Block SVCB and HTTPS Queries</value>
+  </data>
+  <data name="TbPreventDNSLeaks" xml:space="preserve">
+    <value>Prevent DNS Leaks</value>
+  </data>
+  <data name="TbDNSHostsConfig" xml:space="preserve">
+    <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
+  </data>
+  <data name="TbApplyProxyDomainsOnly" xml:space="preserve">
+    <value>Apply to Proxy Domains Only</value>
+  </data>
+  <data name="ThBasicDNSSettings" xml:space="preserve">
+    <value>Basic DNS Settings</value>
+  </data>
+  <data name="ThAdvancedDNSSettings" xml:space="preserve">
+    <value>Advanced DNS Settings</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPs" xml:space="preserve">
+    <value>Validate Regional Domain IPs</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
+    <value>When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs</value>
+  </data>
+  <data name="TbCustomDNSEnable" xml:space="preserve">
+    <value>Enable Custom DNS</value>
+  </data>
+  <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
+    <value>Custom DNS Enabled, This Page's Settings Invalid</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index 7ecfcc98..e44f9098 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1404,4 +1404,70 @@
   <data name="menuAddAnytlsServer" xml:space="preserve">
     <value>Add [Anytls] Configuration</value>
   </data>
+  <data name="TbRemoteDNS" xml:space="preserve">
+    <value>Remote DNS</value>
+  </data>
+  <data name="TbDomesticDNS" xml:space="preserve">
+    <value>Domestic DNS</value>
+  </data>
+  <data name="TbSBOutboundsResolverDNS" xml:space="preserve">
+    <value>Outbound DNS Resolution (sing-box)</value>
+  </data>
+  <data name="TbSBOutboundDomainResolve" xml:space="preserve">
+    <value>Resolve Outbound Domains</value>
+  </data>
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
+    <value>sing-box DoH Resolver Server</value>
+  </data>
+  <data name="TbSBFallbackDNSResolve" xml:space="preserve">
+    <value>Fallback DNS Resolution, Suggest IP</value>
+  </data>
+  <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
+    <value>xray Freedom Resolution Strategy</value>
+  </data>
+  <data name="TbSBDirectResolveStrategy" xml:space="preserve">
+    <value>sing-box Direct Resolution Strategy</value>
+  </data>
+  <data name="TbSBRemoteResolveStrategy" xml:space="preserve">
+    <value>sing-box Remote Resolution Strategy</value>
+  </data>
+  <data name="TbAddCommonDNSHosts" xml:space="preserve">
+    <value>Add Common DNS Hosts</value>
+  </data>
+  <data name="TbSBDoHOverride" xml:space="preserve">
+    <value>The sing-box DoH resolution server can be overwritten</value>
+  </data>
+  <data name="TbFakeIP" xml:space="preserve">
+    <value>FakeIP</value>
+  </data>
+  <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
+    <value>Block SVCB and HTTPS Queries</value>
+  </data>
+  <data name="TbPreventDNSLeaks" xml:space="preserve">
+    <value>Prevent DNS Leaks</value>
+  </data>
+  <data name="TbDNSHostsConfig" xml:space="preserve">
+    <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
+  </data>
+  <data name="TbApplyProxyDomainsOnly" xml:space="preserve">
+    <value>Apply to Proxy Domains Only</value>
+  </data>
+  <data name="ThBasicDNSSettings" xml:space="preserve">
+    <value>Basic DNS Settings</value>
+  </data>
+  <data name="ThAdvancedDNSSettings" xml:space="preserve">
+    <value>Advanced DNS Settings</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPs" xml:space="preserve">
+    <value>Validate Regional Domain IPs</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
+    <value>When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs</value>
+  </data>
+  <data name="TbCustomDNSEnable" xml:space="preserve">
+    <value>Enable Custom DNS</value>
+  </data>
+  <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
+    <value>Custom DNS Enabled, This Page's Settings Invalid</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
index 25f17e0d..c8c2894a 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
     Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -807,9 +807,6 @@
   <data name="menuMoveUp" xml:space="preserve">
     <value>Вверх (U)</value>
   </data>
-  <data name="menuMoveTo" xml:space="preserve">
-    <value>Переместить вверх/вниз</value>
-  </data>
   <data name="MsgFilterTitle" xml:space="preserve">
     <value>Фильтр, поддерживает regex</value>
   </data>
@@ -969,6 +966,9 @@
   <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
     <value>URL для тестирования скорости</value>
   </data>
+  <data name="menuMoveTo" xml:space="preserve">
+    <value>Переместить вверх/вниз</value>
+  </data>
   <data name="TbPublicKey" xml:space="preserve">
     <value>PublicKey</value>
   </data>
@@ -1404,4 +1404,70 @@
   <data name="menuAddAnytlsServer" xml:space="preserve">
     <value>Добавить сервер [Anytls]</value>
   </data>
+  <data name="TbRemoteDNS" xml:space="preserve">
+    <value>Remote DNS</value>
+  </data>
+  <data name="TbDomesticDNS" xml:space="preserve">
+    <value>Domestic DNS</value>
+  </data>
+  <data name="TbSBOutboundsResolverDNS" xml:space="preserve">
+    <value>Outbound DNS Resolution (sing-box)</value>
+  </data>
+  <data name="TbSBOutboundDomainResolve" xml:space="preserve">
+    <value>Resolve Outbound Domains</value>
+  </data>
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
+    <value>sing-box DoH Resolver Server</value>
+  </data>
+  <data name="TbSBFallbackDNSResolve" xml:space="preserve">
+    <value>Fallback DNS Resolution, Suggest IP</value>
+  </data>
+  <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
+    <value>xray Freedom Resolution Strategy</value>
+  </data>
+  <data name="TbSBDirectResolveStrategy" xml:space="preserve">
+    <value>sing-box Direct Resolution Strategy</value>
+  </data>
+  <data name="TbSBRemoteResolveStrategy" xml:space="preserve">
+    <value>sing-box Remote Resolution Strategy</value>
+  </data>
+  <data name="TbAddCommonDNSHosts" xml:space="preserve">
+    <value>Add Common DNS Hosts</value>
+  </data>
+  <data name="TbSBDoHOverride" xml:space="preserve">
+    <value>The sing-box DoH resolution server can be overwritten</value>
+  </data>
+  <data name="TbFakeIP" xml:space="preserve">
+    <value>FakeIP</value>
+  </data>
+  <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
+    <value>Block SVCB and HTTPS Queries</value>
+  </data>
+  <data name="TbPreventDNSLeaks" xml:space="preserve">
+    <value>Prevent DNS Leaks</value>
+  </data>
+  <data name="TbDNSHostsConfig" xml:space="preserve">
+    <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
+  </data>
+  <data name="TbApplyProxyDomainsOnly" xml:space="preserve">
+    <value>Apply to Proxy Domains Only</value>
+  </data>
+  <data name="ThBasicDNSSettings" xml:space="preserve">
+    <value>Basic DNS Settings</value>
+  </data>
+  <data name="ThAdvancedDNSSettings" xml:space="preserve">
+    <value>Advanced DNS Settings</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPs" xml:space="preserve">
+    <value>Validate Regional Domain IPs</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
+    <value>When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs</value>
+  </data>
+  <data name="TbCustomDNSEnable" xml:space="preserve">
+    <value>Enable Custom DNS</value>
+  </data>
+  <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
+    <value>Custom DNS Enabled, This Page's Settings Invalid</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index 95d69e9b..f9c5a02b 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1401,4 +1401,70 @@
   <data name="menuAddAnytlsServer" xml:space="preserve">
     <value>添加 [Anytls] 配置文件</value>
   </data>
+  <data name="TbRemoteDNS" xml:space="preserve">
+    <value>远程 DNS</value>
+  </data>
+  <data name="TbDomesticDNS" xml:space="preserve">
+    <value>直连 DNS</value>
+  </data>
+  <data name="TbSBOutboundsResolverDNS" xml:space="preserve">
+    <value>出站 DNS 解析（sing-box）</value>
+  </data>
+  <data name="TbSBOutboundDomainResolve" xml:space="preserve">
+    <value>解析出站域名</value>
+  </data>
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
+    <value>sing-box DoH 解析服务器</value>
+  </data>
+  <data name="TbSBFallbackDNSResolve" xml:space="preserve">
+    <value>兜底解析其他 DNS 域名，建议设为 ip</value>
+  </data>
+  <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
+    <value>xray freedom 解析策略</value>
+  </data>
+  <data name="TbSBDirectResolveStrategy" xml:space="preserve">
+    <value>sing-box 直连解析策略</value>
+  </data>
+  <data name="TbSBRemoteResolveStrategy" xml:space="preserve">
+    <value>sing-box 远程解析策略</value>
+  </data>
+  <data name="TbAddCommonDNSHosts" xml:space="preserve">
+    <value>添加常用 DNS Hosts</value>
+  </data>
+  <data name="TbSBDoHOverride" xml:space="preserve">
+    <value>开启后可覆盖 sing-box DoH 解析服务器</value>
+  </data>
+  <data name="TbFakeIP" xml:space="preserve">
+    <value>FakeIP</value>
+  </data>
+  <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
+    <value>阻止 SVCB 和 HTTPS 查询</value>
+  </data>
+  <data name="TbPreventDNSLeaks" xml:space="preserve">
+    <value>避免 DNS 泄漏</value>
+  </data>
+  <data name="TbDNSHostsConfig" xml:space="preserve">
+    <value>DNS Hosts：（“域名1 ip1 ip2” 一行一个）</value>
+  </data>
+  <data name="TbApplyProxyDomainsOnly" xml:space="preserve">
+    <value>仅对代理域名生效</value>
+  </data>
+  <data name="ThBasicDNSSettings" xml:space="preserve">
+    <value>DNS 基础设置</value>
+  </data>
+  <data name="ThAdvancedDNSSettings" xml:space="preserve">
+    <value>DNS 进阶设置</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPs" xml:space="preserve">
+    <value>校验相应地区域名 IP</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
+    <value>配置后，会对相应地区域名（如 geosite:cn）的返回 IP 进行校验，仅返回期望 IP</value>
+  </data>
+  <data name="TbCustomDNSEnable" xml:space="preserve">
+    <value>启用自定义 DNS</value>
+  </data>
+  <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
+    <value>自定义 DNS 已启用，此页面配置将无效</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index 0b23885c..429e4637 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1401,4 +1401,70 @@
   <data name="menuAddAnytlsServer" xml:space="preserve">
     <value>新增 [Anytls] 設定檔</value>
   </data>
+  <data name="TbRemoteDNS" xml:space="preserve">
+    <value>Remote DNS</value>
+  </data>
+  <data name="TbDomesticDNS" xml:space="preserve">
+    <value>Domestic DNS</value>
+  </data>
+  <data name="TbSBOutboundsResolverDNS" xml:space="preserve">
+    <value>Outbound DNS Resolution (sing-box)</value>
+  </data>
+  <data name="TbSBOutboundDomainResolve" xml:space="preserve">
+    <value>Resolve Outbound Domains</value>
+  </data>
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
+    <value>sing-box DoH Resolver Server</value>
+  </data>
+  <data name="TbSBFallbackDNSResolve" xml:space="preserve">
+    <value>Fallback DNS Resolution, Suggest IP</value>
+  </data>
+  <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
+    <value>xray Freedom Resolution Strategy</value>
+  </data>
+  <data name="TbSBDirectResolveStrategy" xml:space="preserve">
+    <value>sing-box Direct Resolution Strategy</value>
+  </data>
+  <data name="TbSBRemoteResolveStrategy" xml:space="preserve">
+    <value>sing-box Remote Resolution Strategy</value>
+  </data>
+  <data name="TbAddCommonDNSHosts" xml:space="preserve">
+    <value>Add Common DNS Hosts</value>
+  </data>
+  <data name="TbSBDoHOverride" xml:space="preserve">
+    <value>The sing-box DoH resolution server can be overwritten</value>
+  </data>
+  <data name="TbFakeIP" xml:space="preserve">
+    <value>FakeIP</value>
+  </data>
+  <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
+    <value>Block SVCB and HTTPS Queries</value>
+  </data>
+  <data name="TbPreventDNSLeaks" xml:space="preserve">
+    <value>Prevent DNS Leaks</value>
+  </data>
+  <data name="TbDNSHostsConfig" xml:space="preserve">
+    <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
+  </data>
+  <data name="TbApplyProxyDomainsOnly" xml:space="preserve">
+    <value>Apply to Proxy Domains Only</value>
+  </data>
+  <data name="ThBasicDNSSettings" xml:space="preserve">
+    <value>Basic DNS Settings</value>
+  </data>
+  <data name="ThAdvancedDNSSettings" xml:space="preserve">
+    <value>Advanced DNS Settings</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPs" xml:space="preserve">
+    <value>Validate Regional Domain IPs</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
+    <value>When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs</value>
+  </data>
+  <data name="TbCustomDNSEnable" xml:space="preserve">
+    <value>Enable Custom DNS</value>
+  </data>
+  <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
+    <value>Custom DNS Enabled, This Page's Settings Invalid</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index 80b89654..aa4b4322 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -1,7 +1,9 @@
+using System.Collections.Generic;
 using System.Data;
 using System.Net;
 using System.Net.NetworkInformation;
 using System.Reactive;
+using System.Text;
 using DynamicData;
 using ServiceLib.Models;
 
@@ -73,7 +75,7 @@ public class CoreConfigSingboxService
 
             await GenRouting(singboxConfig);
 
-            await GenDns(node, singboxConfig);
+            await GenDns(singboxConfig);
 
             await GenExperimental(singboxConfig);
 
@@ -243,20 +245,20 @@ public class CoreConfigSingboxService
                 singboxConfig.route.rules.Add(rule);
             }
 
-            await GenDnsDomains(null, singboxConfig, null);
-            //var dnsServer = singboxConfig.dns?.servers.FirstOrDefault();
-            //if (dnsServer != null)
-            //{
-            //    dnsServer.detour = singboxConfig.route.rules.LastOrDefault()?.outbound;
-            //}
-            //var dnsRule = singboxConfig.dns?.rules.Where(t => t.outbound != null).FirstOrDefault();
-            //if (dnsRule != null)
-            //{
-            //    singboxConfig.dns.rules = [];
-            //    singboxConfig.dns.rules.Add(dnsRule);
-            //}
+            var rawDNSItem = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+            if (rawDNSItem != null && rawDNSItem.Enabled == true)
+            {
+                await GenDnsDomainsCompatible(singboxConfig, rawDNSItem);
+            }
+            else
+            {
+                await GenDnsDomains(singboxConfig, _config.SimpleDNSItem);
+            }
+            singboxConfig.route.default_domain_resolver = new()
+            {
+                server = Global.SingboxFinalResolverTag
+            };
 
-            //ret.Msg =string.Format(ResUI.SuccessfulConfiguration"), node.getSummary());
             ret.Success = true;
             ret.Data = JsonUtils.Serialize(singboxConfig);
             return ret;
@@ -315,7 +317,19 @@ public class CoreConfigSingboxService
                 await GenOutbound(node, singboxConfig.outbounds.First());
             }
             await GenMoreOutbounds(node, singboxConfig);
-            await GenDnsDomains(null, singboxConfig, null);
+            var item = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+            if (item != null && item.Enabled == true)
+            {
+                await GenDnsDomainsCompatible(singboxConfig, item);
+            }
+            else
+            {
+                await GenDnsDomains(singboxConfig, _config.SimpleDNSItem);
+            }
+            singboxConfig.route.default_domain_resolver = new()
+            {
+                server = Global.SingboxFinalResolverTag
+            };
 
             singboxConfig.route.rules.Clear();
             singboxConfig.inbounds.Clear();
@@ -417,7 +431,7 @@ public class CoreConfigSingboxService
             }
             await GenOutboundsList(proxyProfiles, singboxConfig);
 
-            await GenDns(null, singboxConfig);
+            await GenDns(singboxConfig);
             await ConvertGeo2Ruleset(singboxConfig);
 
             ret.Success = true;
@@ -648,17 +662,6 @@ public class CoreConfigSingboxService
             outbound.server_port = node.Port;
             outbound.type = Global.ProtocolTypes[node.ConfigType];
 
-            if (Utils.IsDomain(node.Address))
-            {
-                var item = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
-                var localDnsAddress = string.IsNullOrEmpty(item?.DomainDNSAddress) ? Global.SingboxDomainDNSAddress.FirstOrDefault() : item?.DomainDNSAddress;
-                outbound.domain_resolver = new()
-                {
-                    server = localDnsAddress.StartsWith("tag://") ? localDnsAddress.Substring(6) : "local_resolver",
-                    strategy = string.IsNullOrEmpty(item?.DomainStrategy4Freedom) ? null : item?.DomainStrategy4Freedom
-                };
-            }
-
             switch (node.ConfigType)
             {
                 case EConfigType.VMess:
@@ -793,17 +796,6 @@ public class CoreConfigSingboxService
             endpoint.address = Utils.String2List(node.RequestHost);
             endpoint.type = Global.ProtocolTypes[node.ConfigType];
 
-            if (Utils.IsDomain(node.Address))
-            {
-                var item = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
-                var localDnsAddress = string.IsNullOrEmpty(item?.DomainDNSAddress) ? Global.SingboxDomainDNSAddress.FirstOrDefault() : item?.DomainDNSAddress;
-                endpoint.domain_resolver = new()
-                {
-                    server = localDnsAddress.StartsWith("tag://") ? localDnsAddress.Substring(6) : "local_resolver",
-                    strategy = string.IsNullOrEmpty(item?.DomainStrategy4Freedom) ? null : item?.DomainStrategy4Freedom
-                };
-            }
-
             switch (node.ConfigType)
             {
                 case EConfigType.WireGuard:
@@ -1250,6 +1242,22 @@ public class CoreConfigSingboxService
         try
         {
             singboxConfig.route.final = Global.ProxyTag;
+            var item = _config.SimpleDNSItem;
+
+            var defaultDomainResolverTag = Global.SingboxOutboundResolverTag;
+            var directDNSStrategy = item.SingboxStrategy4Direct.IsNullOrEmpty() ? Global.SingboxDomainStrategy4Out.FirstOrDefault() : item.SingboxStrategy4Direct;
+
+            var rawDNSItem = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+            if (rawDNSItem != null && rawDNSItem.Enabled == true)
+            {
+                defaultDomainResolverTag = Global.SingboxFinalResolverTag;
+                directDNSStrategy = rawDNSItem.DomainStrategy4Freedom.IsNullOrEmpty() ? Global.SingboxDomainStrategy4Out.FirstOrDefault() : rawDNSItem.DomainStrategy4Freedom;
+            }
+            singboxConfig.route.default_domain_resolver = new()
+            {
+                server = defaultDomainResolverTag,
+                strategy = directDNSStrategy
+            };
 
             if (_config.TunModeItem.EnableTun)
             {
@@ -1330,14 +1338,14 @@ public class CoreConfigSingboxService
             if (routing != null)
             {
                 var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet);
-                foreach (var item in rules ?? [])
+                foreach (var item1 in rules ?? [])
                 {
-                    if (item.Enabled)
+                    if (item1.Enabled)
                     {
-                        await GenRoutingUserRule(item, singboxConfig);
-                        if (item.Ip != null && item.Ip.Count > 0)
+                        await GenRoutingUserRule(item1, singboxConfig);
+                        if (item1.Ip != null && item1.Ip.Count > 0)
                         {
-                            ipRules.Add(item);
+                            ipRules.Add(item1);
                         }
                     }
                 }
@@ -1345,9 +1353,9 @@ public class CoreConfigSingboxService
             if (_config.RoutingBasicItem.DomainStrategy == "IPIfNonMatch")
             {
                 singboxConfig.route.rules.Add(resolveRule);
-                foreach (var item in ipRules)
+                foreach (var item2 in ipRules)
                 {
-                    await GenRoutingUserRule(item, singboxConfig);
+                    await GenRoutingUserRule(item2, singboxConfig);
                 }
             }
         }
@@ -1590,7 +1598,278 @@ public class CoreConfigSingboxService
         return server.tag;
     }
 
-    private async Task<int> GenDns(ProfileItem? node, SingboxConfig singboxConfig)
+    private async Task<int> GenDns(SingboxConfig singboxConfig)
+    {
+        try
+        {
+            var item = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+            if (item != null && item.Enabled == true)
+            {
+                return await GenDnsCompatible(singboxConfig);
+            }
+
+            var simpleDNSItem = _config.SimpleDNSItem;
+            await GenDnsServers(singboxConfig, simpleDNSItem);
+            await GenDnsRules(singboxConfig, simpleDNSItem);
+
+            singboxConfig.dns ??= new Dns4Sbox();
+            singboxConfig.dns.independent_cache = true;
+
+            var routing = await ConfigHandler.GetDefaultRouting(_config);
+            var useDirectDns = false;
+            if (routing != null)
+            {
+                var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet) ?? [];
+
+                useDirectDns = rules?.LastOrDefault() is { } lastRule &&
+                                  lastRule.OutboundTag == Global.DirectTag &&
+                                  (lastRule.Port == "0-65535" ||
+                                   lastRule.Network == "tcp,udp" ||
+                                   lastRule.Ip?.Contains("0.0.0.0/0") == true);
+            }
+            singboxConfig.dns.final = useDirectDns ? Global.SingboxDirectDNSTag : Global.SingboxRemoteDNSTag;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return 0;
+    }
+
+    private async Task<int> GenDnsServers(SingboxConfig singboxConfig, SimpleDNSItem simpleDNSItem)
+    {
+        var finalDns = await GenDnsDomains(singboxConfig, simpleDNSItem);
+
+        var directDns = ParseDnsAddress(simpleDNSItem.DirectDNS);
+        directDns.tag = Global.SingboxDirectDNSTag;
+        directDns.domain_resolver = Global.SingboxFinalResolverTag;
+
+        var remoteDns = ParseDnsAddress(simpleDNSItem.RemoteDNS);
+        remoteDns.tag = Global.SingboxRemoteDNSTag;
+        remoteDns.detour = Global.ProxyTag;
+        remoteDns.domain_resolver = Global.SingboxFinalResolverTag;
+
+        var resolverDns = ParseDnsAddress(simpleDNSItem.SingboxOutboundsResolveDNS);
+        resolverDns.tag = Global.SingboxOutboundResolverTag;
+        resolverDns.domain_resolver = Global.SingboxFinalResolverTag;
+
+        var hostsDns = new Server4Sbox
+        {
+            tag = Global.SingboxHostsDNSTag,
+            type = "hosts",
+        };
+        if (simpleDNSItem.AddCommonHosts == true)
+        {
+            hostsDns.predefined = Global.PredefinedHosts;
+        }
+        var userHostsMap = simpleDNSItem.Hosts?
+            .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
+            .Where(line => !string.IsNullOrWhiteSpace(line))
+            .Where(line => line.Contains(' '))
+            .ToDictionary(
+                line =>
+                {
+                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                    return parts[0];
+                },
+                line =>
+                {
+                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                    var values = parts.Skip(1).ToList();
+                    return values;
+                }
+            );
+
+        if (userHostsMap != null)
+        {
+            foreach (var kvp in userHostsMap)
+            {
+                hostsDns.predefined[kvp.Key] = kvp.Value;
+            }
+        }
+
+        foreach (var host in hostsDns.predefined)
+        {
+            if (finalDns.server == host.Key)
+            {
+                finalDns.domain_resolver = Global.SingboxHostsDNSTag;
+            }
+            if (remoteDns.server == host.Key)
+            {
+                remoteDns.domain_resolver = Global.SingboxHostsDNSTag;
+            }
+            if (resolverDns.server == host.Key)
+            {
+                resolverDns.domain_resolver = Global.SingboxHostsDNSTag;
+            }
+            if (directDns.server == host.Key)
+            {
+                directDns.domain_resolver = Global.SingboxHostsDNSTag;
+            }
+        }
+
+        singboxConfig.dns ??= new Dns4Sbox();
+        singboxConfig.dns.servers ??= new List<Server4Sbox>();
+        singboxConfig.dns.servers.Add(remoteDns);
+        singboxConfig.dns.servers.Add(directDns);
+        singboxConfig.dns.servers.Add(resolverDns);
+        singboxConfig.dns.servers.Add(hostsDns);
+
+        // fake ip
+        if (simpleDNSItem.FakeIP == true)
+        {
+            var fakeip = new Server4Sbox
+            {
+                tag = Global.SingboxFakeDNSTag,
+                type = "fakeip",
+                inet4_range = "198.18.0.0/15",
+                inet6_range = "fc00::/18",
+            };
+            singboxConfig.dns.servers.Add(fakeip);
+        }
+
+        return await Task.FromResult(0);
+    }
+
+    private async Task<Server4Sbox> GenDnsDomains(SingboxConfig singboxConfig, SimpleDNSItem? simpleDNSItem)
+    {
+        var finalDns = ParseDnsAddress(simpleDNSItem.SingboxFinalResolveDNS);
+        finalDns.tag = Global.SingboxFinalResolverTag;
+        singboxConfig.dns ??= new Dns4Sbox();
+        singboxConfig.dns.servers ??= new List<Server4Sbox>();
+        singboxConfig.dns.servers.Add(finalDns);
+        return await Task.FromResult(finalDns);
+    }
+
+    private async Task<int> GenDnsRules(SingboxConfig singboxConfig, SimpleDNSItem simpleDNSItem)
+    {
+        singboxConfig.dns ??= new Dns4Sbox();
+        singboxConfig.dns.rules ??= new List<Rule4Sbox>();
+
+        singboxConfig.dns.rules.AddRange(new[]
+            {
+            new Rule4Sbox { ip_accept_any = true, server = Global.SingboxHostsDNSTag },
+            new Rule4Sbox
+            {
+                server = Global.SingboxRemoteDNSTag,
+                strategy = simpleDNSItem.SingboxStrategy4Proxy.IsNullOrEmpty() ? null : simpleDNSItem.SingboxStrategy4Proxy,
+                clash_mode = ERuleMode.Global.ToString()
+            },
+            new Rule4Sbox
+            {
+                server = Global.SingboxDirectDNSTag,
+                strategy = simpleDNSItem.SingboxStrategy4Direct.IsNullOrEmpty() ? null : simpleDNSItem.SingboxStrategy4Direct,
+                clash_mode = ERuleMode.Direct.ToString()
+            }
+        });
+
+        if (simpleDNSItem.BlockBindingQuery == true)
+        {
+            singboxConfig.dns.rules.Add(new()
+            {
+                query_type = new List<int> { 64, 65 },
+                action = "predefined",
+                rcode = "NOTIMP"
+            });
+        }
+
+        var routing = await ConfigHandler.GetDefaultRouting(_config);
+        if (routing == null)
+            return 0;
+
+        var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet) ?? [];
+        var expectedIPCidr = new List<string>();
+        var expectedIPsRegions = new List<string>();
+        var regionNames = new HashSet<string>();
+
+        if (!string.IsNullOrEmpty(simpleDNSItem?.DirectExpectedIPs))
+        {
+            var ipItems = simpleDNSItem.DirectExpectedIPs
+                .Split(new[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(s => s.Trim())
+                .Where(s => !string.IsNullOrEmpty(s))
+                .ToList();
+
+            foreach (var ip in ipItems)
+            {
+                if (ip.StartsWith("geoip:", StringComparison.OrdinalIgnoreCase))
+                {
+                    var region = ip["geoip:".Length..];
+                    if (!string.IsNullOrEmpty(region))
+                    {
+                        expectedIPsRegions.Add(region);
+                        regionNames.Add(region);
+                        regionNames.Add($"geolocation-{region}");
+                        regionNames.Add($"tld-{region}");
+                    }
+                }
+                else
+                {
+                    expectedIPCidr.Add(ip);
+                }
+            }
+        }
+
+        foreach (var item in rules)
+        {
+            if (!item.Enabled || item.Domain is null || item.Domain.Count == 0)
+            {
+                continue;
+            }
+
+            var rule = new Rule4Sbox();
+            var validDomains = item.Domain.Count(it => ParseV2Domain(it, rule));
+            if (validDomains <= 0)
+            {
+                continue;
+            }
+
+            if (item.OutboundTag == Global.DirectTag)
+            {
+                rule.server = Global.SingboxDirectDNSTag;
+                rule.strategy = string.IsNullOrEmpty(simpleDNSItem.SingboxStrategy4Direct) ? null : simpleDNSItem.SingboxStrategy4Direct;
+
+                if (expectedIPsRegions.Count > 0 && rule.geosite?.Count > 0)
+                {
+                    var geositeSet = new HashSet<string>(rule.geosite);
+                    if (regionNames.Intersect(geositeSet).Any())
+                    {
+                        if (expectedIPsRegions.Count > 0)
+                        {
+                            rule.geoip = expectedIPsRegions;
+                        }
+                        if (expectedIPCidr.Count > 0)
+                        {
+                            rule.ip_cidr = expectedIPCidr;
+                        }
+                    }
+                }
+            }
+            else if (item.OutboundTag == Global.ProxyTag)
+            {
+                if (simpleDNSItem.FakeIP == true)
+                {
+                    var rule4Fake = JsonUtils.DeepCopy(rule);
+                    rule4Fake.server = Global.SingboxFakeDNSTag;
+                    singboxConfig.dns.rules.Add(rule4Fake);
+                }
+                rule.server = Global.SingboxRemoteDNSTag;
+                rule.strategy = string.IsNullOrEmpty(simpleDNSItem.SingboxStrategy4Proxy) ? null : simpleDNSItem.SingboxStrategy4Proxy;
+            }
+            else if (item.OutboundTag == Global.BlockTag)
+            {
+                rule.action = "predefined";
+                rule.rcode = "NOERROR";
+                rule.answer = new List<string> { "A" };
+            }
+
+            singboxConfig.dns.rules.Add(rule);
+        }
+
+        return 0;
+    }
+
+    private async Task<int> GenDnsCompatible(SingboxConfig singboxConfig)
     {
         try
         {
@@ -1614,11 +1893,11 @@ public class CoreConfigSingboxService
 
             if (dns4Sbox.servers != null && dns4Sbox.servers.Count > 0 && dns4Sbox.servers.First().address.IsNullOrEmpty())
             {
-                await GenDnsDomains(node, singboxConfig, item);
+                await GenDnsDomainsCompatible(singboxConfig, item);
             }
             else
             {
-                await GenDnsDomainsLegacy(node, singboxConfig, item);
+                await GenDnsDomainsLegacyCompatible(singboxConfig, item);
             }
         }
         catch (Exception ex)
@@ -1628,86 +1907,35 @@ public class CoreConfigSingboxService
         return 0;
     }
 
-    private async Task<int> GenDnsDomains(ProfileItem? node, SingboxConfig singboxConfig, DNSItem? dNSItem)
+    private async Task<int> GenDnsDomainsCompatible(SingboxConfig singboxConfig, DNSItem? dNSItem)
     {
         var dns4Sbox = singboxConfig.dns ?? new();
         dns4Sbox.servers ??= [];
         dns4Sbox.rules ??= [];
 
-        var tag = "local_resolver";
-        var localDnsAddress = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.SingboxDomainDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress;
+        var tag = Global.SingboxFinalResolverTag;
+        var localDnsAddress = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainPureIPDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress;
 
-        if (localDnsAddress.StartsWith("tag://"))
-        {
-            tag = localDnsAddress.Substring(6);
+        var localDnsServer = ParseDnsAddress(localDnsAddress);
+        localDnsServer.tag = tag;
 
-            var localDnsTag = "local_local";
-
-            dns4Sbox.servers.Add(new()
-            {
-                tag = localDnsTag,
-                type = "local"
-            });
-
-            dns4Sbox.rules.Insert(0, new()
-            {
-                server = localDnsTag,
-                clash_mode = ERuleMode.Direct.ToString()
-            });
-        }
-        else
-        {
-            var (dnsType, dnsHost, dnsPort, dnsPath) = ParseDnsAddress(localDnsAddress);
-
-            dns4Sbox.servers.Add(new()
-            {
-                tag = tag,
-                type = dnsType,
-                server = dnsHost,
-                Interface = dnsType == "dhcp" ? dnsHost : null,
-                server_port = dnsPort,
-                path = dnsPath
-            });
-
-            dns4Sbox.rules.Insert(0, new()
-            {
-                server = tag,
-                clash_mode = ERuleMode.Direct.ToString()
-            });
-        }
-
-        dns4Sbox.rules.Insert(0, new()
-        {
-            server = dns4Sbox.servers.Where(t => t.detour == Global.ProxyTag).Select(t => t.tag).FirstOrDefault() ?? "remote",
-            clash_mode = ERuleMode.Global.ToString()
-        });
-
-        //Tun2SocksAddress
-        if (_config.TunModeItem.EnableTun && node?.ConfigType == EConfigType.SOCKS && Utils.IsDomain(node?.Sni))
-        {
-            dns4Sbox.rules.Insert(0, new()
-            {
-                server = tag,
-                domain = [node?.Sni],
-                strategy = string.IsNullOrEmpty(dNSItem?.DomainStrategy4Freedom) ? null : dNSItem?.DomainStrategy4Freedom
-            });
-        }
+        dns4Sbox.servers.Add(localDnsServer);
 
         singboxConfig.dns = dns4Sbox;
         return await Task.FromResult(0);
     }
 
-    private async Task<int> GenDnsDomainsLegacy(ProfileItem? node, SingboxConfig singboxConfig, DNSItem? dNSItem)
+    private async Task<int> GenDnsDomainsLegacyCompatible(SingboxConfig singboxConfig, DNSItem? dNSItem)
     {
         var dns4Sbox = singboxConfig.dns ?? new();
         dns4Sbox.servers ??= [];
         dns4Sbox.rules ??= [];
 
-        var tag = "local_local";
+        var tag = Global.SingboxFinalResolverTag;
         dns4Sbox.servers.Add(new()
         {
             tag = tag,
-            address = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.SingboxDomainDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress,
+            address = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainPureIPDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress,
             detour = Global.DirectTag,
             strategy = string.IsNullOrEmpty(dNSItem?.DomainStrategy4Freedom) ? null : dNSItem?.DomainStrategy4Freedom,
         });
@@ -1736,103 +1964,100 @@ public class CoreConfigSingboxService
             });
         }
 
-        //Tun2SocksAddress
-        if (_config.TunModeItem.EnableTun && node?.ConfigType == EConfigType.SOCKS && Utils.IsDomain(node?.Sni))
-        {
-            dns4Sbox.rules.Insert(0, new()
-            {
-                server = tag,
-                domain = [node?.Sni]
-            });
-        }
-
         singboxConfig.dns = dns4Sbox;
         return await Task.FromResult(0);
     }
 
-    private (string type, string? host, int? port, string? path) ParseDnsAddress(string address)
+    private static Server4Sbox? ParseDnsAddress(string address)
     {
-        string type = "udp";
-        string? host = null;
-        int? port = null;
-        string? path = null;
-
-        if (address is "local" or "localhost")
+        var addressFirst = address?.Split(address.Contains(',') ? ',' : ';').FirstOrDefault()?.Trim();
+        if (string.IsNullOrEmpty(addressFirst))
         {
-            return ("local", null, null, null);
+            return null;
         }
 
-        if (address.StartsWith("dhcp://", StringComparison.OrdinalIgnoreCase))
+        var server = new Server4Sbox();
+
+        if (addressFirst is "local" or "localhost")
         {
-            string interface_name = address.Substring(7);
-            return ("dhcp", interface_name == "auto" ? null : interface_name, null, null);
+            server.type = "local";
+            return server;
         }
 
-        if (!address.Contains("://"))
+        if (addressFirst.StartsWith("dhcp://", StringComparison.OrdinalIgnoreCase))
+        {
+            var interface_name = addressFirst.Substring(7);
+            server.type = "dhcp";
+            server.Interface = interface_name == "auto" ? null : interface_name;
+            return server;
+        }
+
+        if (!addressFirst.Contains("://"))
         {
             // udp dns
-            host = address;
-            return (type, host, port, path);
+            server.type = "udp";
+            server.server = addressFirst;
+            return server;
         }
 
         try
         {
-            int protocolEndIndex = address.IndexOf("://", StringComparison.Ordinal);
-            type = address.Substring(0, protocolEndIndex).ToLower();
+            var protocolEndIndex = addressFirst.IndexOf("://", StringComparison.Ordinal);
+            server.type = addressFirst.Substring(0, protocolEndIndex).ToLower();
 
-            var uri = new Uri(address);
-            host = uri.Host;
+            var uri = new Uri(addressFirst);
+            server.server = uri.Host;
 
             if (!uri.IsDefaultPort)
             {
-                port = uri.Port;
+                server.server_port = uri.Port;
             }
 
-            if ((type == "https" || type == "h3") && !string.IsNullOrEmpty(uri.AbsolutePath) && uri.AbsolutePath != "/")
+            if ((server.type == "https" || server.type == "h3") && !string.IsNullOrEmpty(uri.AbsolutePath) && uri.AbsolutePath != "/")
             {
-                path = uri.AbsolutePath;
+                server.path = uri.AbsolutePath;
             }
         }
         catch (UriFormatException)
         {
-            int protocolEndIndex = address.IndexOf("://", StringComparison.Ordinal);
+            var protocolEndIndex = addressFirst.IndexOf("://", StringComparison.Ordinal);
             if (protocolEndIndex > 0)
             {
-                type = address.Substring(0, protocolEndIndex).ToLower();
-                string remaining = address.Substring(protocolEndIndex + 3);
+                server.type = addressFirst.Substring(0, protocolEndIndex).ToLower();
+                var remaining = addressFirst.Substring(protocolEndIndex + 3);
 
-                int portIndex = remaining.IndexOf(':');
-                int pathIndex = remaining.IndexOf('/');
+                var portIndex = remaining.IndexOf(':');
+                var pathIndex = remaining.IndexOf('/');
 
                 if (portIndex > 0)
                 {
-                    host = remaining.Substring(0, portIndex);
-                    string portPart = pathIndex > portIndex
+                    server.server = remaining.Substring(0, portIndex);
+                    var portPart = pathIndex > portIndex
                         ? remaining.Substring(portIndex + 1, pathIndex - portIndex - 1)
                         : remaining.Substring(portIndex + 1);
 
-                    if (int.TryParse(portPart, out int parsedPort))
+                    if (int.TryParse(portPart, out var parsedPort))
                     {
-                        port = parsedPort;
+                        server.server_port = parsedPort;
                     }
                 }
                 else if (pathIndex > 0)
                 {
-                    host = remaining.Substring(0, pathIndex);
+                    server.server = remaining.Substring(0, pathIndex);
                 }
                 else
                 {
-                    host = remaining;
+                    server.server = remaining;
                 }
 
-                if (pathIndex > 0 && (type == "https" || type == "h3"))
+                if (pathIndex > 0 && (server.type == "https" || server.type == "h3"))
                 {
-                    path = remaining.Substring(pathIndex);
+                    server.path = remaining.Substring(pathIndex);
                 }
             }
         }
 
-        return (type, host, port, path);
+        return server;
     }
 
     private async Task<int> GenExperimental(SingboxConfig singboxConfig)
@@ -1852,7 +2077,8 @@ public class CoreConfigSingboxService
             singboxConfig.experimental.cache_file = new CacheFile4Sbox()
             {
                 enabled = true,
-                path = Utils.GetBinPath("cache.db")
+                path = Utils.GetBinPath("cache.db"),
+                store_fakeip = _config.SimpleDNSItem.FakeIP == true
             };
         }
 
@@ -1873,13 +2099,15 @@ public class CoreConfigSingboxService
         //convert route geosite & geoip to ruleset
         foreach (var rule in singboxConfig.route.rules.Where(t => t.geosite?.Count > 0).ToList() ?? [])
         {
-            rule.rule_set = rule?.geosite?.Select(t => $"{geosite}-{t}").ToList();
+            rule.rule_set ??= new List<string>();
+            rule.rule_set.AddRange(rule?.geosite?.Select(t => $"{geosite}-{t}").ToList());
             rule.geosite = null;
             AddRuleSets(ruleSets, rule.rule_set);
         }
         foreach (var rule in singboxConfig.route.rules.Where(t => t.geoip?.Count > 0).ToList() ?? [])
         {
-            rule.rule_set = rule?.geoip?.Select(t => $"{geoip}-{t}").ToList();
+            rule.rule_set ??= new List<string>();
+            rule.rule_set.AddRange(rule?.geoip?.Select(t => $"{geoip}-{t}").ToList());
             rule.geoip = null;
             AddRuleSets(ruleSets, rule.rule_set);
         }
@@ -1887,12 +2115,14 @@ public class CoreConfigSingboxService
         //convert dns geosite & geoip to ruleset
         foreach (var rule in singboxConfig.dns?.rules.Where(t => t.geosite?.Count > 0).ToList() ?? [])
         {
-            rule.rule_set = rule?.geosite?.Select(t => $"{geosite}-{t}").ToList();
+            rule.rule_set ??= new List<string>();
+            rule.rule_set.AddRange(rule?.geosite?.Select(t => $"{geosite}-{t}").ToList());
             rule.geosite = null;
         }
         foreach (var rule in singboxConfig.dns?.rules.Where(t => t.geoip?.Count > 0).ToList() ?? [])
         {
-            rule.rule_set = rule?.geoip?.Select(t => $"{geoip}-{t}").ToList();
+            rule.rule_set ??= new List<string>();
+            rule.rule_set.AddRange(rule?.geoip?.Select(t => $"{geoip}-{t}").ToList());
             rule.geoip = null;
         }
         foreach (var dnsRule in singboxConfig.dns?.rules.Where(t => t.rule_set?.Count > 0).ToList() ?? [])
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
index 60b4df3e..1986be14 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
@@ -1,6 +1,8 @@
 using System.Net;
 using System.Net.NetworkInformation;
+using System.Text.Json;
 using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
 
 namespace ServiceLib.Services.CoreConfig;
 
@@ -1134,6 +1136,264 @@ public class CoreConfigV2rayService
     }
 
     private async Task<int> GenDns(ProfileItem? node, V2rayConfig v2rayConfig)
+    {
+        try
+        {
+            var item = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
+            if (item != null && item.Enabled == true)
+            {
+                return await GenDnsCompatible(node, v2rayConfig);
+            }
+            var simpleDNSItem = _config.SimpleDNSItem;
+            var domainStrategy4Freedom = simpleDNSItem?.RayStrategy4Freedom;
+
+            //Outbound Freedom domainStrategy
+            if (domainStrategy4Freedom.IsNotEmpty())
+            {
+                var outbound = v2rayConfig.outbounds.FirstOrDefault(t => t is { protocol: "freedom", tag: Global.DirectTag });
+                if (outbound != null)
+                {
+                    outbound.settings = new()
+                    {
+                        domainStrategy = domainStrategy4Freedom,
+                        userLevel = 0
+                    };
+                }
+            }
+
+            await GenDnsServers(node, v2rayConfig, simpleDNSItem);
+            await GenDnsHosts(v2rayConfig, simpleDNSItem);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return 0;
+    }
+
+    private async Task<int> GenDnsServers(ProfileItem? node, V2rayConfig v2rayConfig, SimpleDNSItem simpleDNSItem)
+    {
+        static List<string> ParseDnsAddresses(string? dnsInput, string defaultAddress)
+        {
+            var addresses = dnsInput?.Split(dnsInput.Contains(',') ? ',' : ';')
+                .Select(addr => addr.Trim())
+                .Where(addr => !string.IsNullOrEmpty(addr))
+                .Select(addr => addr.StartsWith("dhcp", StringComparison.OrdinalIgnoreCase) ? "localhost" : addr)
+                .Distinct()
+                .ToList() ?? new List<string> { defaultAddress };
+            return addresses.Count > 0 ? addresses : new List<string> { defaultAddress };
+        }
+
+        static object CreateDnsServer(string dnsAddress, List<string> domains, List<string>? expectedIPs = null)
+        {
+            var dnsServer = new DnsServer4Ray
+            {
+                address = dnsAddress,
+                skipFallback = true,
+                domains = domains.Count > 0 ? domains : null,
+                expectedIPs = expectedIPs?.Count > 0 ? expectedIPs : null
+            };
+            return JsonUtils.SerializeToNode(dnsServer, new JsonSerializerOptions
+            {
+                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+            });
+        }
+
+        var directDNSAddress = ParseDnsAddresses(simpleDNSItem?.DirectDNS, Global.DomainDirectDNSAddress.FirstOrDefault());
+        var remoteDNSAddress = ParseDnsAddresses(simpleDNSItem?.RemoteDNS, Global.DomainRemoteDNSAddress.FirstOrDefault());
+
+        var directDomainList = new List<string>();
+        var directGeositeList = new List<string>();
+        var proxyDomainList = new List<string>();
+        var proxyGeositeList = new List<string>();
+        var expectedDomainList = new List<string>();
+        var expectedIPs = new List<string>();
+        var regionNames = new HashSet<string>();
+
+        if (!string.IsNullOrEmpty(simpleDNSItem?.DirectExpectedIPs))
+        {
+            expectedIPs = simpleDNSItem.DirectExpectedIPs
+                .Split(new[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(s => s.Trim())
+                .Where(s => !string.IsNullOrEmpty(s))
+                .ToList();
+
+            foreach (var ip in expectedIPs)
+            {
+                if (ip.StartsWith("geoip:", StringComparison.OrdinalIgnoreCase))
+                {
+                    var region = ip["geoip:".Length..];
+                    if (!string.IsNullOrEmpty(region))
+                    {
+                        regionNames.Add($"geosite:{region}");
+                        regionNames.Add($"geosite:geolocation-{region}");
+                        regionNames.Add($"geosite:tld-{region}");
+                    }
+                }
+            }
+        }
+
+        var routing = await ConfigHandler.GetDefaultRouting(_config);
+        List<RulesItem>? rules = null;
+        if (routing != null)
+        {
+            rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet) ?? [];
+            foreach (var item in rules)
+            {
+                if (!item.Enabled || item.Domain is null || item.Domain.Count == 0)
+                {
+                    continue;
+                }
+
+                foreach (var domain in item.Domain)
+                {
+                    if (domain.StartsWith('#'))
+                        continue;
+                    var normalizedDomain = domain.Replace(Global.RoutingRuleComma, ",");
+
+                    if (item.OutboundTag == Global.DirectTag)
+                    {
+                        if (normalizedDomain.StartsWith("geosite:"))
+                        {
+                            (regionNames.Contains(normalizedDomain) ? expectedDomainList : directGeositeList).Add(normalizedDomain);
+                        }
+                        else
+                        {
+                            directDomainList.Add(normalizedDomain);
+                        }
+                    }
+                    else if (item.OutboundTag == Global.ProxyTag)
+                    {
+                        if (normalizedDomain.StartsWith("geosite:"))
+                        {
+                            proxyGeositeList.Add(normalizedDomain);
+                        }
+                        else
+                        {
+                            proxyDomainList.Add(normalizedDomain);
+                        }
+                    }
+                }
+            }
+        }
+
+        if (Utils.IsDomain(node?.Address))
+        {
+            directDomainList.Add(node.Address);
+        }
+
+        if (node?.Subid is not null)
+        {
+            var subItem = await AppHandler.Instance.GetSubItem(node.Subid);
+            if (subItem is not null)
+            {
+                foreach (var profile in new[] { subItem.PrevProfile, subItem.NextProfile })
+                {
+                    var profileNode = await AppHandler.Instance.GetProfileItemViaRemarks(profile);
+                    if (profileNode is not null &&
+                        profileNode.ConfigType is not (EConfigType.Custom or EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls) &&
+                        Utils.IsDomain(profileNode.Address))
+                    {
+                        directDomainList.Add(profileNode.Address);
+                    }
+                }
+            }
+        }
+
+        v2rayConfig.dns ??= new Dns4Ray();
+        v2rayConfig.dns.servers ??= new List<object>();
+
+        void AddDnsServers(List<string> dnsAddresses, List<string> domains, List<string>? expectedIPs = null)
+        {
+            if (domains.Count > 0)
+            {
+                foreach (var dnsAddress in dnsAddresses)
+                {
+                    v2rayConfig.dns.servers.Add(CreateDnsServer(dnsAddress, domains, expectedIPs));
+                }
+            }
+        }
+
+        AddDnsServers(remoteDNSAddress, proxyDomainList);
+        AddDnsServers(directDNSAddress, directDomainList);
+        AddDnsServers(remoteDNSAddress, proxyGeositeList);
+        AddDnsServers(directDNSAddress, directGeositeList);
+        AddDnsServers(directDNSAddress, expectedDomainList, expectedIPs);
+
+        var useDirectDns = rules?.LastOrDefault() is { } lastRule &&
+                          lastRule.OutboundTag == Global.DirectTag &&
+                          (lastRule.Port == "0-65535" ||
+                           lastRule.Network == "tcp,udp" ||
+                           lastRule.Ip?.Contains("0.0.0.0/0") == true);
+
+        var defaultDnsServers = useDirectDns ? directDNSAddress : remoteDNSAddress;
+        v2rayConfig.dns.servers.AddRange(defaultDnsServers);
+
+        return 0;
+    }
+
+    private async Task<int> GenDnsHosts(V2rayConfig v2rayConfig, SimpleDNSItem simpleDNSItem)
+    {
+        if (simpleDNSItem.AddCommonHosts == false && simpleDNSItem.UseSystemHosts == false && simpleDNSItem.Hosts.IsNullOrEmpty())
+        {
+            return await Task.FromResult(0);
+        }
+        v2rayConfig.dns ??= new Dns4Ray();
+        v2rayConfig.dns.hosts ??= new Dictionary<string, List<string>>();
+        if (simpleDNSItem.AddCommonHosts == true)
+        {
+            v2rayConfig.dns.hosts = Global.PredefinedHosts;
+        }
+
+        if (simpleDNSItem.UseSystemHosts == true)
+        {
+            var systemHosts = Utils.GetSystemHosts();
+            if (systemHosts.Count > 0)
+            {
+                var normalHost = v2rayConfig.dns.hosts;
+                if (normalHost != null)
+                {
+                    foreach (var host in systemHosts)
+                    {
+                        if (normalHost[host.Key] != null)
+                        {
+                            continue;
+                        }
+                        normalHost[host.Key] = new List<string> { host.Value };
+                    }
+                }
+            }
+        }
+
+        var userHostsMap = simpleDNSItem.Hosts?
+            .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
+            .Where(line => !string.IsNullOrWhiteSpace(line))
+            .Where(line => line.Contains(' '))
+            .ToDictionary(
+                line =>
+                {
+                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                    return parts[0];
+                },
+                line =>
+                {
+                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                    var values = parts.Skip(1).ToList();
+                    return values;
+                }
+            );
+
+        if (userHostsMap != null)
+        {
+            foreach (var kvp in userHostsMap)
+            {
+                v2rayConfig.dns.hosts[kvp.Key] = kvp.Value;
+            }
+        }
+        return await Task.FromResult(0);
+    }
+
+    private async Task<int> GenDnsCompatible(ProfileItem? node, V2rayConfig v2rayConfig)
     {
         try
         {
@@ -1176,22 +1436,33 @@ public class CoreConfigV2rayService
                 var systemHosts = Utils.GetSystemHosts();
                 if (systemHosts.Count > 0)
                 {
-                    var normalHost = obj["hosts"];
-                    if (normalHost != null)
+                    var normalHost1 = obj["hosts"];
+                    if (normalHost1 != null)
                     {
                         foreach (var host in systemHosts)
                         {
-                            if (normalHost[host.Key] != null)
+                            if (normalHost1[host.Key] != null)
                                 continue;
-                            normalHost[host.Key] = host.Value;
+                            normalHost1[host.Key] = host.Value;
                         }
                     }
                 }
             }
+            var normalHost = obj["hosts"];
+            if (normalHost != null)
+            {
+                foreach (var hostProp in normalHost.AsObject().ToList())
+                {
+                    if (hostProp.Value is JsonValue value && value.TryGetValue<string>(out var ip))
+                    {
+                        normalHost[hostProp.Key] = new JsonArray(ip);
+                    }
+                }
+            }
 
-            await GenDnsDomains(node, obj, item);
+            await GenDnsDomainsCompatible(node, obj, item);
 
-            v2rayConfig.dns = obj;
+            v2rayConfig.dns = JsonUtils.Deserialize<Dns4Ray>(obj.ToJsonString());
         }
         catch (Exception ex)
         {
@@ -1200,7 +1471,7 @@ public class CoreConfigV2rayService
         return 0;
     }
 
-    private async Task<int> GenDnsDomains(ProfileItem? node, JsonNode dns, DNSItem? dNSItem)
+    private async Task<int> GenDnsDomainsCompatible(ProfileItem? node, JsonNode dns, DNSItem? dNSItem)
     {
         if (node == null)
         {
@@ -1223,7 +1494,6 @@ public class CoreConfigV2rayService
                     && prevNode.ConfigType != EConfigType.Custom
                     && prevNode.ConfigType != EConfigType.Hysteria2
                     && prevNode.ConfigType != EConfigType.TUIC
-                    && prevNode.ConfigType != EConfigType.Anytls
                     && Utils.IsDomain(prevNode.Address))
                 {
                     domainList.Add(prevNode.Address);
@@ -1235,7 +1505,6 @@ public class CoreConfigV2rayService
                     && nextNode.ConfigType != EConfigType.Custom
                     && nextNode.ConfigType != EConfigType.Hysteria2
                     && nextNode.ConfigType != EConfigType.TUIC
-                    && nextNode.ConfigType != EConfigType.Anytls
                     && Utils.IsDomain(nextNode.Address))
                 {
                     domainList.Add(nextNode.Address);
@@ -1245,7 +1514,7 @@ public class CoreConfigV2rayService
             {
                 var dnsServer = new DnsServer4Ray()
                 {
-                    address = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress,
+                    address = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainPureIPDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress,
                     skipFallback = true,
                     domains = domainList
                 };
diff --git a/v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs b/v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs
index 1d6829b8..e6e985ca 100644
--- a/v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs
@@ -6,39 +6,52 @@ namespace ServiceLib.ViewModels;
 
 public class DNSSettingViewModel : MyReactiveObject
 {
-    [Reactive] public bool UseSystemHosts { get; set; }
-    [Reactive] public string DomainStrategy4Freedom { get; set; }
-    [Reactive] public string DomainDNSAddress { get; set; }
-    [Reactive] public string NormalDNS { get; set; }
+    [Reactive] public bool? UseSystemHosts { get; set; }
+    [Reactive] public bool? AddCommonHosts { get; set; }
+    [Reactive] public bool? FakeIP { get; set; }
+    [Reactive] public bool? BlockBindingQuery { get; set; }
+    [Reactive] public string? DirectDNS { get; set; }
+    [Reactive] public string? RemoteDNS { get; set; }
+    [Reactive] public string? SingboxOutboundsResolveDNS { get; set; }
+    [Reactive] public string? SingboxFinalResolveDNS { get; set; }
+    [Reactive] public string? RayStrategy4Freedom { get; set; }
+    [Reactive] public string? SingboxStrategy4Direct { get; set; }
+    [Reactive] public string? SingboxStrategy4Proxy { get; set; }
+    [Reactive] public string? Hosts { get; set; }
+    [Reactive] public string? DirectExpectedIPs { get; set; }
 
-    [Reactive] public string DomainStrategy4Freedom2 { get; set; }
-    [Reactive] public string DomainDNSAddress2 { get; set; }
-    [Reactive] public string NormalDNS2 { get; set; }
-    [Reactive] public string TunDNS2 { get; set; }
+    [Reactive] public bool UseSystemHostsCompatible { get; set; }
+    [Reactive] public string DomainStrategy4FreedomCompatible { get; set; }
+    [Reactive] public string DomainDNSAddressCompatible { get; set; }
+    [Reactive] public string NormalDNSCompatible { get; set; }
+
+    [Reactive] public string DomainStrategy4Freedom2Compatible { get; set; }
+    [Reactive] public string DomainDNSAddress2Compatible { get; set; }
+    [Reactive] public string NormalDNS2Compatible { get; set; }
+    [Reactive] public string TunDNS2Compatible { get; set; }
+    [Reactive] public bool RayCustomDNSEnableCompatible { get; set; }
+    [Reactive] public bool SBCustomDNSEnableCompatible { get; set; }
 
     public ReactiveCommand<Unit, Unit> SaveCmd { get; }
-    public ReactiveCommand<Unit, Unit> ImportDefConfig4V2rayCmd { get; }
-    public ReactiveCommand<Unit, Unit> ImportDefConfig4SingboxCmd { get; }
+    public ReactiveCommand<Unit, Unit> ImportDefConfig4V2rayCompatibleCmd { get; }
+    public ReactiveCommand<Unit, Unit> ImportDefConfig4SingboxCompatibleCmd { get; }
 
     public DNSSettingViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
     {
         _config = AppHandler.Instance.Config;
         _updateView = updateView;
-        SaveCmd = ReactiveCommand.CreateFromTask(async () =>
-        {
-            await SaveSettingAsync();
-        });
+        SaveCmd = ReactiveCommand.CreateFromTask(SaveSettingAsync);
 
-        ImportDefConfig4V2rayCmd = ReactiveCommand.CreateFromTask(async () =>
+        ImportDefConfig4V2rayCompatibleCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            NormalDNS = EmbedUtils.GetEmbedText(Global.DNSV2rayNormalFileName);
+            NormalDNSCompatible = EmbedUtils.GetEmbedText(Global.DNSV2rayNormalFileName);
             await Task.CompletedTask;
         });
 
-        ImportDefConfig4SingboxCmd = ReactiveCommand.CreateFromTask(async () =>
+        ImportDefConfig4SingboxCompatibleCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            NormalDNS2 = EmbedUtils.GetEmbedText(Global.DNSSingboxNormalFileName);
-            TunDNS2 = EmbedUtils.GetEmbedText(Global.TunSingboxDNSFileName);
+            NormalDNS2Compatible = EmbedUtils.GetEmbedText(Global.DNSSingboxNormalFileName);
+            TunDNS2Compatible = EmbedUtils.GetEmbedText(Global.TunSingboxDNSFileName);
             await Task.CompletedTask;
         });
 
@@ -47,48 +60,80 @@ public class DNSSettingViewModel : MyReactiveObject
 
     private async Task Init()
     {
-        var item = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
+        _config = AppHandler.Instance.Config;
+        var item = _config.SimpleDNSItem;
         UseSystemHosts = item.UseSystemHosts;
-        DomainStrategy4Freedom = item?.DomainStrategy4Freedom ?? string.Empty;
-        DomainDNSAddress = item?.DomainDNSAddress ?? string.Empty;
-        NormalDNS = item?.NormalDNS ?? string.Empty;
+        AddCommonHosts = item.AddCommonHosts;
+        FakeIP = item.FakeIP;
+        BlockBindingQuery = item.BlockBindingQuery;
+        DirectDNS = item.DirectDNS;
+        RemoteDNS = item.RemoteDNS;
+        RayStrategy4Freedom = item.RayStrategy4Freedom;
+        SingboxOutboundsResolveDNS = item.SingboxOutboundsResolveDNS;
+        SingboxFinalResolveDNS = item.SingboxFinalResolveDNS;
+        SingboxStrategy4Direct = item.SingboxStrategy4Direct;
+        SingboxStrategy4Proxy = item.SingboxStrategy4Proxy;
+        Hosts = item.Hosts;
+        DirectExpectedIPs = item.DirectExpectedIPs;
+
+        var item1 = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
+        RayCustomDNSEnableCompatible = item1.Enabled;
+        UseSystemHostsCompatible = item1.UseSystemHosts;
+        DomainStrategy4FreedomCompatible = item1?.DomainStrategy4Freedom ?? string.Empty;
+        DomainDNSAddressCompatible = item1?.DomainDNSAddress ?? string.Empty;
+        NormalDNSCompatible = item1?.NormalDNS ?? string.Empty;
 
         var item2 = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
-        DomainStrategy4Freedom2 = item2?.DomainStrategy4Freedom ?? string.Empty;
-        DomainDNSAddress2 = item2?.DomainDNSAddress ?? string.Empty;
-        NormalDNS2 = item2?.NormalDNS ?? string.Empty;
-        TunDNS2 = item2?.TunDNS ?? string.Empty;
+        SBCustomDNSEnableCompatible = item2.Enabled;
+        DomainStrategy4Freedom2Compatible = item2?.DomainStrategy4Freedom ?? string.Empty;
+        DomainDNSAddress2Compatible = item2?.DomainDNSAddress ?? string.Empty;
+        NormalDNS2Compatible = item2?.NormalDNS ?? string.Empty;
+        TunDNS2Compatible = item2?.TunDNS ?? string.Empty;
     }
 
     private async Task SaveSettingAsync()
     {
-        if (NormalDNS.IsNotEmpty())
+        _config.SimpleDNSItem.UseSystemHosts = UseSystemHosts;
+        _config.SimpleDNSItem.AddCommonHosts = AddCommonHosts;
+        _config.SimpleDNSItem.FakeIP = FakeIP;
+        _config.SimpleDNSItem.BlockBindingQuery = BlockBindingQuery;
+        _config.SimpleDNSItem.DirectDNS = DirectDNS;
+        _config.SimpleDNSItem.RemoteDNS = RemoteDNS;
+        _config.SimpleDNSItem.RayStrategy4Freedom = RayStrategy4Freedom;
+        _config.SimpleDNSItem.SingboxOutboundsResolveDNS = SingboxOutboundsResolveDNS;
+        _config.SimpleDNSItem.SingboxFinalResolveDNS = SingboxFinalResolveDNS;
+        _config.SimpleDNSItem.SingboxStrategy4Direct = SingboxStrategy4Direct;
+        _config.SimpleDNSItem.SingboxStrategy4Proxy = SingboxStrategy4Proxy;
+        _config.SimpleDNSItem.Hosts = Hosts;
+        _config.SimpleDNSItem.DirectExpectedIPs = DirectExpectedIPs;
+
+        if (NormalDNSCompatible.IsNotEmpty())
         {
-            var obj = JsonUtils.ParseJson(NormalDNS);
+            var obj = JsonUtils.ParseJson(NormalDNSCompatible);
             if (obj != null && obj["servers"] != null)
             {
             }
             else
             {
-                if (NormalDNS.Contains('{') || NormalDNS.Contains('}'))
+                if (NormalDNSCompatible.Contains('{') || NormalDNSCompatible.Contains('}'))
                 {
                     NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
                     return;
                 }
             }
         }
-        if (NormalDNS2.IsNotEmpty())
+        if (NormalDNS2Compatible.IsNotEmpty())
         {
-            var obj2 = JsonUtils.Deserialize<Dns4Sbox>(NormalDNS2);
+            var obj2 = JsonUtils.Deserialize<Dns4Sbox>(NormalDNS2Compatible);
             if (obj2 == null)
             {
                 NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
                 return;
             }
         }
-        if (TunDNS2.IsNotEmpty())
+        if (TunDNS2Compatible.IsNotEmpty())
         {
-            var obj2 = JsonUtils.Deserialize<Dns4Sbox>(TunDNS2);
+            var obj2 = JsonUtils.Deserialize<Dns4Sbox>(TunDNS2Compatible);
             if (obj2 == null)
             {
                 NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
@@ -96,21 +141,26 @@ public class DNSSettingViewModel : MyReactiveObject
             }
         }
 
-        var item = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
-        item.DomainStrategy4Freedom = DomainStrategy4Freedom;
-        item.DomainDNSAddress = DomainDNSAddress;
-        item.UseSystemHosts = UseSystemHosts;
-        item.NormalDNS = NormalDNS;
-        await ConfigHandler.SaveDNSItems(_config, item);
+        var item1 = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
+        item1.Enabled = RayCustomDNSEnableCompatible;
+        item1.DomainStrategy4Freedom = DomainStrategy4FreedomCompatible;
+        item1.DomainDNSAddress = DomainDNSAddressCompatible;
+        item1.UseSystemHosts = UseSystemHostsCompatible;
+        item1.NormalDNS = NormalDNSCompatible;
+        await ConfigHandler.SaveDNSItems(_config, item1);
 
         var item2 = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
-        item2.DomainStrategy4Freedom = DomainStrategy4Freedom2;
-        item2.DomainDNSAddress = DomainDNSAddress2;
-        item2.NormalDNS = JsonUtils.Serialize(JsonUtils.ParseJson(NormalDNS2));
-        item2.TunDNS = JsonUtils.Serialize(JsonUtils.ParseJson(TunDNS2));
+        item2.Enabled = RayCustomDNSEnableCompatible;
+        item2.DomainStrategy4Freedom = DomainStrategy4Freedom2Compatible;
+        item2.DomainDNSAddress = DomainDNSAddress2Compatible;
+        item2.NormalDNS = JsonUtils.Serialize(JsonUtils.ParseJson(NormalDNS2Compatible));
+        item2.TunDNS = JsonUtils.Serialize(JsonUtils.ParseJson(TunDNS2Compatible));
         await ConfigHandler.SaveDNSItems(_config, item2);
 
-        NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
-        _ = _updateView?.Invoke(EViewAction.CloseWindow, null);
+        await ConfigHandler.SaveConfig(_config);
+        if (_updateView != null)
+        {
+            await _updateView(EViewAction.CloseWindow, null);
+        }
     }
 }
diff --git a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
index efdf4eda..23ebe9fb 100644
--- a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
@@ -2,6 +2,7 @@
     x:Class="v2rayN.Desktop.Views.DNSSettingWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ctrls="clr-namespace:v2rayN.Desktop.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
@@ -35,25 +36,298 @@
         </StackPanel>
 
         <TabControl HorizontalContentAlignment="Stretch">
-            <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDns}">
-                <DockPanel Margin="{StaticResource Margin8}">
-                    <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
+            <TabItem Header="{x:Static resx:ResUI.ThBasicDNSSettings}">
+                <ScrollViewer VerticalScrollBarVisibility="Visible">
+                    <Grid
+                        Margin="{StaticResource Margin4}"
+                        ColumnDefinitions="Auto,Auto,*"
+                        RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+
                         <TextBlock
+                            x:Name="txtBasicDNSSettingsInvalid"
+                            Grid.Row="0"
+                            Grid.Column="0"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
-                            Text="{x:Static resx:ResUI.TbSettingsRemoteDNS}" />
-
-                        <TextBlock Margin="{StaticResource Margin4}" VerticalAlignment="Center">
-                            <HyperlinkButton Classes="WithIcon" Click="linkDnsObjectDoc_Click">
-                                <TextBlock Text="{x:Static resx:ResUI.TbDnsObjectDoc}" />
-                            </HyperlinkButton>
-                        </TextBlock>
-                        <Button
-                            x:Name="btnImportDefConfig4V2ray"
+                            Text="{x:Static resx:ResUI.TbCustomDNSEnabledPageInvalid}" />
+                        
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
                             Margin="{StaticResource Margin4}"
-                            Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
-                            Cursor="Hand" />
-                    </StackPanel>
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbDomesticDNS}" />
+                        <ctrls:AutoCompleteBox
+                            x:Name="cmbDirectDNS"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            Text="{Binding DirectDNS, Mode=TwoWay}" />
+
+                        <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbRemoteDNS}" />
+                        <ctrls:AutoCompleteBox
+                            x:Name="cmbRemoteDNS"
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            Text="{Binding RemoteDNS, Mode=TwoWay}" />
+
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSBOutboundsResolverDNS}" />
+                        <ctrls:AutoCompleteBox
+                            x:Name="cmbSBResolverDNS"
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            Text="{Binding SingboxOutboundsResolveDNS, Mode=TwoWay}" />
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSBOutboundDomainResolve}" />
+
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSBDoHResolverServer}" />
+                        <ctrls:AutoCompleteBox
+                            x:Name="cmbSBFinalResolverDNS"
+                            Grid.Row="4"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            Text="{Binding SingboxFinalResolveDNS, Mode=TwoWay}" />
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSBFallbackDNSResolve}" />
+
+                        <TextBlock
+                            Grid.Row="5"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbXrayFreedomResolveStrategy}" />
+                        <ComboBox
+                            x:Name="cmbRayFreedomDNSStrategy"
+                            Grid.Row="5"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            PlaceholderText="Default" />
+
+                        <TextBlock
+                            Grid.Row="6"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSBDirectResolveStrategy}" />
+                        <ComboBox
+                            x:Name="cmbSBDirectDNSStrategy"
+                            Grid.Row="6"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            PlaceholderText="Default" />
+
+                        <TextBlock
+                            Grid.Row="7"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSBRemoteResolveStrategy}" />
+                        <ComboBox
+                            x:Name="cmbSBRemoteDNSStrategy"
+                            Grid.Row="7"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            PlaceholderText="Default" />
+
+                        <TextBlock
+                            Grid.Row="8"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbAddCommonDNSHosts}" />
+                        <ToggleSwitch
+                            x:Name="togAddCommonHosts"
+                            Grid.Row="8"
+                            Grid.Column="1"
+                            Margin="{StaticResource Margin4}"
+                            HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="8"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSBDoHOverride}" />
+                    </Grid>
+                </ScrollViewer>
+            </TabItem>
+
+            <TabItem Header="{x:Static resx:ResUI.ThAdvancedDNSSettings}">
+                <ScrollViewer VerticalScrollBarVisibility="Visible">
+                    <Grid
+                        Margin="{StaticResource Margin4}"
+                        ColumnDefinitions="Auto,Auto,*"
+                        RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,*">
+
+                        <TextBlock
+                            x:Name="txtAdvancedDNSSettingsInvalid"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbCustomDNSEnabledPageInvalid}" />
+
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSettingsUseSystemHosts}" />
+                        <ToggleSwitch
+                            x:Name="togUseSystemHosts"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Margin="{StaticResource Margin4}"
+                            HorizontalAlignment="Left" />
+
+                        <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbFakeIP}" />
+                        <ToggleSwitch
+                            x:Name="togFakeIP"
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Margin="{StaticResource Margin4}"
+                            HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbApplyProxyDomainsOnly}" />
+
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbBlockSVCBHTTPSQueries}" />
+                        <ToggleSwitch
+                            x:Name="togBlockBindingQuery"
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            Margin="{StaticResource Margin4}"
+                            HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbPreventDNSLeaks}" />
+
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPs}" />
+                        <ctrls:AutoCompleteBox
+                            x:Name="cmbDirectExpectedIPs"
+                            Grid.Row="4"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            Text="{Binding DirectExpectedIPs, Mode=TwoWay}" />
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPsDesc}" />
+
+                        <TextBlock
+                            Grid.Row="5"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="3"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbDNSHostsConfig}" />
+
+                        <TextBox
+                            x:Name="txtHosts"
+                            Grid.Row="6"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="3"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Stretch"
+                            Watermark="{x:Static resx:ResUI.TbDNSHostsConfig}"
+                            BorderThickness="1"
+                            Classes="TextArea"
+                            TextWrapping="Wrap" />
+                    </Grid>
+                </ScrollViewer>
+            </TabItem>
+            <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDns}">
+                <DockPanel Margin="{StaticResource Margin8}">
+                    <Grid DockPanel.Dock="Top">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        
+                        <StackPanel Grid.Row="0" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbCustomDNSEnable}" />
+                            <ToggleSwitch
+                                x:Name="togRayCustomDNSEnableCompatible"
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+                        
+                        <StackPanel Grid.Row="1" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbSettingsRemoteDNS}" />
+
+                            <TextBlock Margin="{StaticResource Margin4}" VerticalAlignment="Center">
+                                <HyperlinkButton Classes="WithIcon" Click="linkDnsObjectDoc_Click">
+                                    <TextBlock Text="{x:Static resx:ResUI.TbDnsObjectDoc}" />
+                                </HyperlinkButton>
+                            </TextBlock>
+                            <Button
+                                x:Name="btnImportDefConfig4V2rayCompatible"
+                                Margin="{StaticResource Margin4}"
+                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
+                                Cursor="Hand" />
+                        </StackPanel>
+                    </Grid>
 
                     <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
                         <StackPanel Orientation="Horizontal">
@@ -62,7 +336,7 @@
                                 VerticalAlignment="Center"
                                 Text="{x:Static resx:ResUI.TbSettingsUseSystemHosts}" />
                             <ToggleSwitch
-                                x:Name="togUseSystemHosts"
+                                x:Name="togUseSystemHostsCompatible"
                                 Margin="{StaticResource Margin4}"
                                 HorizontalAlignment="Left" />
                         </StackPanel>
@@ -73,7 +347,7 @@
                                 VerticalAlignment="Center"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Freedom}" />
                             <ComboBox
-                                x:Name="cmbdomainStrategy4Freedom"
+                                x:Name="cmbdomainStrategy4FreedomCompatible"
                                 Width="150"
                                 Margin="{StaticResource Margin4}" />
                         </StackPanel>
@@ -83,10 +357,11 @@
                                 Margin="{StaticResource Margin4}"
                                 VerticalAlignment="Center"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
-                            <ComboBox
-                                x:Name="cmbdomainDNSAddress"
+                            <ctrls:AutoCompleteBox
+                                x:Name="cmbdomainDNSAddressCompatible"
                                 Width="150"
-                                Margin="{StaticResource Margin4}" />
+                                Margin="{StaticResource Margin4}"
+                                Text="{Binding DomainDNSAddressCompatible, Mode=TwoWay}" />
                         </StackPanel>
                     </WrapPanel>
 
@@ -96,7 +371,7 @@
                         BorderThickness="1"
                         Header="HTTP/SOCKS">
                         <TextBox
-                            Name="txtnormalDNS"
+                            Name="txtnormalDNSCompatible"
                             VerticalAlignment="Stretch"
                             Classes="TextArea"
                             MinLines="10"
@@ -107,18 +382,36 @@
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDnsSingbox}">
                 <DockPanel Margin="{StaticResource Margin8}">
-                    <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
-                        <TextBlock Margin="{StaticResource Margin4}" VerticalAlignment="Center">
-                            <HyperlinkButton Classes="WithIcon" Click="linkDnsSingboxObjectDoc_Click">
-                                <TextBlock Text="{x:Static resx:ResUI.TbDnsSingboxObjectDoc}" />
-                            </HyperlinkButton>
-                        </TextBlock>
-                        <Button
-                            x:Name="btnImportDefConfig4Singbox"
-                            Margin="{StaticResource Margin4}"
-                            Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
-                            Cursor="Hand" />
-                    </StackPanel>
+                    <Grid DockPanel.Dock="Top">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        
+                        <StackPanel Grid.Row="0" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbCustomDNSEnable}" />
+                            <ToggleSwitch
+                                x:Name="togSBCustomDNSEnableCompatible"
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+                        
+                        <StackPanel Grid.Row="1" Orientation="Horizontal">
+                            <TextBlock Margin="{StaticResource Margin4}" VerticalAlignment="Center">
+                                <HyperlinkButton Classes="WithIcon" Click="linkDnsSingboxObjectDoc_Click">
+                                    <TextBlock Text="{x:Static resx:ResUI.TbDnsSingboxObjectDoc}" />
+                                </HyperlinkButton>
+                            </TextBlock>
+                            <Button
+                                x:Name="btnImportDefConfig4SingboxCompatible"
+                                Margin="{StaticResource Margin4}"
+                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
+                                Cursor="Hand" />
+                        </StackPanel>
+                    </Grid>
 
                     <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
                         <StackPanel Orientation="Horizontal">
@@ -127,7 +420,7 @@
                                 VerticalAlignment="Center"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Out}" />
                             <ComboBox
-                                x:Name="cmbdomainStrategy4Out"
+                                x:Name="cmbdomainStrategy4OutCompatible"
                                 Width="150"
                                 Margin="{StaticResource Margin4}" />
                         </StackPanel>
@@ -137,10 +430,11 @@
                                 Margin="{StaticResource Margin4}"
                                 VerticalAlignment="Center"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
-                            <ComboBox
-                                x:Name="cmbdomainDNSAddress2"
+                            <ctrls:AutoCompleteBox
+                                x:Name="cmbdomainDNSAddress2Compatible"
                                 Width="150"
-                                Margin="{StaticResource Margin4}" />
+                                Margin="{StaticResource Margin4}"
+                                Text="{Binding DomainDNSAddress2Compatible, Mode=TwoWay}" />
                         </StackPanel>
                     </WrapPanel>
 
@@ -152,7 +446,7 @@
                             BorderThickness="1"
                             Header="HTTP/SOCKS">
                             <TextBox
-                                Name="txtnormalDNS2"
+                                Name="txtnormalDNS2Compatible"
                                 VerticalAlignment="Stretch"
                                 Classes="TextArea"
                                 MinLines="10"
@@ -167,7 +461,7 @@
                             BorderThickness="1"
                             Header="{x:Static resx:ResUI.TbSettingsTunMode}">
                             <TextBox
-                                Name="txttunDNS2"
+                                Name="txttunDNS2Compatible"
                                 VerticalAlignment="Stretch"
                                 Classes="TextArea"
                                 MinLines="10"
diff --git a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs
index 8f1a0f5a..7b239ff4 100644
--- a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs
@@ -1,4 +1,5 @@
 using System.Reactive.Disposables;
+using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
 using v2rayN.Desktop.Base;
@@ -17,26 +18,64 @@ public partial class DNSSettingWindow : WindowBase<DNSSettingViewModel>
         btnCancel.Click += (s, e) => this.Close();
         ViewModel = new DNSSettingViewModel(UpdateViewHandler);
 
-        cmbdomainStrategy4Freedom.ItemsSource = Global.DomainStrategy4Freedoms;
-        cmbdomainStrategy4Out.ItemsSource = Global.SingboxDomainStrategy4Out;
-        cmbdomainDNSAddress.ItemsSource = Global.DomainDNSAddress;
-        cmbdomainDNSAddress2.ItemsSource = Global.SingboxDomainDNSAddress;
+        cmbRayFreedomDNSStrategy.ItemsSource = Global.DomainStrategy4Freedoms;
+        cmbSBDirectDNSStrategy.ItemsSource = Global.SingboxDomainStrategy4Out;
+        cmbSBRemoteDNSStrategy.ItemsSource = Global.SingboxDomainStrategy4Out;
+        cmbDirectDNS.ItemsSource = Global.DomainDirectDNSAddress;
+        cmbSBResolverDNS.ItemsSource = Global.DomainDirectDNSAddress.Concat(new[] { "dhcp://auto,localhost" });
+        cmbRemoteDNS.ItemsSource = Global.DomainRemoteDNSAddress;
+        cmbSBFinalResolverDNS.ItemsSource = Global.DomainPureIPDNSAddress.Concat(new[] { "dhcp://auto,localhost" });
+        cmbDirectExpectedIPs.ItemsSource = Global.ExpectedIPs;
+
+        cmbdomainStrategy4FreedomCompatible.ItemsSource = Global.DomainStrategy4Freedoms;
+        cmbdomainStrategy4OutCompatible.ItemsSource = Global.SingboxDomainStrategy4Out;
+        cmbdomainDNSAddressCompatible.ItemsSource = Global.DomainPureIPDNSAddress;
+        cmbdomainDNSAddress2Compatible.ItemsSource = Global.DomainPureIPDNSAddress;
 
         this.WhenActivated(disposables =>
         {
             this.Bind(ViewModel, vm => vm.UseSystemHosts, v => v.togUseSystemHosts.IsChecked).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.DomainStrategy4Freedom, v => v.cmbdomainStrategy4Freedom.SelectedValue).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.DomainDNSAddress, v => v.cmbdomainDNSAddress.SelectedValue).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.NormalDNS, v => v.txtnormalDNS.Text).DisposeWith(disposables);
-
-            this.Bind(ViewModel, vm => vm.DomainStrategy4Freedom2, v => v.cmbdomainStrategy4Out.SelectedValue).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.DomainDNSAddress2, v => v.cmbdomainDNSAddress2.SelectedValue).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.NormalDNS2, v => v.txtnormalDNS2.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.TunDNS2, v => v.txttunDNS2.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.AddCommonHosts, v => v.togAddCommonHosts.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.FakeIP, v => v.togFakeIP.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.BlockBindingQuery, v => v.togBlockBindingQuery.IsChecked).DisposeWith(disposables);
+            //this.Bind(ViewModel, vm => vm.DirectDNS, v => v.cmbDirectDNS.Text).DisposeWith(disposables);
+            //this.Bind(ViewModel, vm => vm.RemoteDNS, v => v.cmbRemoteDNS.Text).DisposeWith(disposables);
+            //this.Bind(ViewModel, vm => vm.SingboxOutboundsResolveDNS, v => v.cmbSBResolverDNS.Text).DisposeWith(disposables);
+            //this.Bind(ViewModel, vm => vm.SingboxFinalResolveDNS, v => v.cmbSBFinalResolverDNS.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.RayStrategy4Freedom, v => v.cmbRayFreedomDNSStrategy.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SingboxStrategy4Direct, v => v.cmbSBDirectDNSStrategy.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SingboxStrategy4Proxy, v => v.cmbSBRemoteDNSStrategy.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.Hosts, v => v.txtHosts.Text).DisposeWith(disposables);
+            //this.Bind(ViewModel, vm => vm.DirectExpectedIPs, v => v.cmbDirectExpectedIPs.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
-            this.BindCommand(ViewModel, vm => vm.ImportDefConfig4V2rayCmd, v => v.btnImportDefConfig4V2ray).DisposeWith(disposables);
-            this.BindCommand(ViewModel, vm => vm.ImportDefConfig4SingboxCmd, v => v.btnImportDefConfig4Singbox).DisposeWith(disposables);
+
+            this.Bind(ViewModel, vm => vm.RayCustomDNSEnableCompatible, v => v.togRayCustomDNSEnableCompatible.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SBCustomDNSEnableCompatible, v => v.togSBCustomDNSEnableCompatible.IsChecked).DisposeWith(disposables);
+
+            this.Bind(ViewModel, vm => vm.UseSystemHostsCompatible, v => v.togUseSystemHostsCompatible.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.DomainStrategy4FreedomCompatible, v => v.cmbdomainStrategy4FreedomCompatible.SelectedItem).DisposeWith(disposables);
+            //this.Bind(ViewModel, vm => vm.DomainDNSAddressCompatible, v => v.cmbdomainDNSAddressCompatible.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.NormalDNSCompatible, v => v.txtnormalDNSCompatible.Text).DisposeWith(disposables);
+
+            this.Bind(ViewModel, vm => vm.DomainStrategy4Freedom2Compatible, v => v.cmbdomainStrategy4OutCompatible.SelectedItem).DisposeWith(disposables);
+            //this.Bind(ViewModel, vm => vm.DomainDNSAddress2Compatible, v => v.cmbdomainDNSAddress2Compatible.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.NormalDNS2Compatible, v => v.txtnormalDNS2Compatible.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.TunDNS2Compatible, v => v.txttunDNS2Compatible.Text).DisposeWith(disposables);
+
+            this.BindCommand(ViewModel, vm => vm.ImportDefConfig4V2rayCompatibleCmd, v => v.btnImportDefConfig4V2rayCompatible).DisposeWith(disposables);
+            this.BindCommand(ViewModel, vm => vm.ImportDefConfig4SingboxCompatibleCmd, v => v.btnImportDefConfig4SingboxCompatible).DisposeWith(disposables);
+
+            this.WhenAnyValue(
+                    x => x.ViewModel.RayCustomDNSEnableCompatible,
+                    x => x.ViewModel.SBCustomDNSEnableCompatible,
+                    (ray, sb) => ray && sb
+                ).BindTo(this.FindControl<TextBlock>("txtBasicDNSSettingsInvalid"), t => t.IsVisible);
+            this.WhenAnyValue(
+                    x => x.ViewModel.RayCustomDNSEnableCompatible,
+                    x => x.ViewModel.SBCustomDNSEnableCompatible,
+                    (ray, sb) => ray && sb
+                ).BindTo(this.FindControl<TextBlock>("txtAdvancedDNSSettingsInvalid"), t => t.IsVisible);
         });
     }
 
diff --git a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
index c2d9364e..9098fe43 100644
--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
@@ -41,31 +41,361 @@
         </StackPanel>
 
         <TabControl HorizontalContentAlignment="Left">
+            <TabItem Header="{x:Static resx:ResUI.ThBasicDNSSettings}">
+                <ScrollViewer VerticalScrollBarVisibility="Visible">
+                    <Grid Margin="{StaticResource Margin8}">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-            <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDns}">
-                <DockPanel Margin="{StaticResource Margin8}">
-                    <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
                         <TextBlock
+                            x:Name="txtBasicDNSSettingsInvalid"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="3"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbSettingsRemoteDNS}" />
+                            Text="{x:Static resx:ResUI.TbCustomDNSEnabledPageInvalid}" />
+
                         <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
-                            Style="{StaticResource ToolbarTextBlock}">
-                            <Hyperlink Click="linkDnsObjectDoc_Click">
-                                <TextBlock Text="{x:Static resx:ResUI.TbDnsObjectDoc}" />
-                                <materialDesign:PackIcon Kind="Link" />
-                            </Hyperlink>
-                        </TextBlock>
-                        <Button
-                            x:Name="btnImportDefConfig4V2ray"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbDomesticDNS}" />
+                        <ComboBox
+                            x:Name="cmbDirectDNS"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Width="200"
+                            IsEditable="True"
                             Margin="{StaticResource Margin8}"
-                            Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
-                            Cursor="Hand"
-                            Style="{StaticResource DefButton}" />
-                    </StackPanel>
+                            Style="{StaticResource DefComboBox}" />
+
+                        <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbRemoteDNS}" />
+                        <ComboBox
+                            x:Name="cmbRemoteDNS"
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Width="200"
+                            IsEditable="True"
+                            Margin="{StaticResource Margin8}"
+                            Style="{StaticResource DefComboBox}" />
+
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSBOutboundsResolverDNS}" />
+                        <ComboBox
+                            x:Name="cmbSBResolverDNS"
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            Width="200"
+                            IsEditable="True"
+                            Margin="{StaticResource Margin8}"
+                            Style="{StaticResource DefComboBox}" />
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSBOutboundDomainResolve}" />
+
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSBDoHResolverServer}" />
+                        <ComboBox
+                            x:Name="cmbSBFinalResolverDNS"
+                            Grid.Row="4"
+                            Grid.Column="1"
+                            Width="200"
+                            IsEditable="True"
+                            Margin="{StaticResource Margin8}"
+                            Style="{StaticResource DefComboBox}" />
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSBFallbackDNSResolve}" />
+
+                        <TextBlock
+                            Grid.Row="5"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbXrayFreedomResolveStrategy}" />
+                        <ComboBox
+                            x:Name="cmbRayFreedomDNSStrategy"
+                            Grid.Row="5"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin8}"
+                            materialDesign:HintAssist.Hint="Default"
+                            Style="{StaticResource DefComboBox}" />
+
+                        <TextBlock
+                            Grid.Row="6"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSBDirectResolveStrategy}" />
+                        <ComboBox
+                            x:Name="cmbSBDirectDNSStrategy"
+                            Grid.Row="6"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin8}"
+                            materialDesign:HintAssist.Hint="Default"
+                            Style="{StaticResource DefComboBox}" />
+
+                        <TextBlock
+                            Grid.Row="7"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSBRemoteResolveStrategy}" />
+                        <ComboBox
+                            x:Name="cmbSBRemoteDNSStrategy"
+                            Grid.Row="7"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin8}"
+                            materialDesign:HintAssist.Hint="Default"
+                            Style="{StaticResource DefComboBox}" />
+
+                        <TextBlock
+                            Grid.Row="8"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbAddCommonDNSHosts}" />
+                        <ToggleButton
+                            x:Name="togAddCommonHosts"
+                            Grid.Row="8"
+                            Grid.Column="1"
+                            Margin="{StaticResource Margin8}"
+                            HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="8"
+                            Grid.Column="3"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSBDoHOverride}" />
+                    </Grid>
+                </ScrollViewer>
+            </TabItem>
+            <TabItem Header="{x:Static resx:ResUI.ThAdvancedDNSSettings}">
+                <ScrollViewer VerticalScrollBarVisibility="Visible">
+                    <Grid Margin="{StaticResource Margin8}">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock
+                            x:Name="txtAdvancedDNSSettingsInvalid"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="3"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbCustomDNSEnabledPageInvalid}" />
+
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsUseSystemHosts}" />
+                        <ToggleButton
+                            x:Name="togUseSystemHosts"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Margin="{StaticResource Margin8}"
+                            HorizontalAlignment="Left" />
+
+                        <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbFakeIP}" />
+                        <ToggleButton
+                            x:Name="togFakeIP"
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Margin="{StaticResource Margin8}"
+                            HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbApplyProxyDomainsOnly}" />
+
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbBlockSVCBHTTPSQueries}" />
+                        <ToggleButton
+                            x:Name="togBlockBindingQuery"
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            Margin="{StaticResource Margin8}"
+                            HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbPreventDNSLeaks}" />
+
+
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPs}" />
+                        <ComboBox
+                            x:Name="cmbDirectExpectedIPs"
+                            Grid.Row="4"
+                            Grid.Column="1"
+                            Width="200"
+                            IsEditable="True"
+                            Margin="{StaticResource Margin8}"
+                            Style="{StaticResource DefComboBox}" />
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPsDesc}" />
+
+                        <TextBlock
+                            Grid.Row="5"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="3"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbDNSHostsConfig}" />
+                        <TextBox
+                            x:Name="txtHosts"
+                            Grid.Row="6"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="3"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Stretch"
+                            materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TbDNSHostsConfig}"
+                            AcceptsReturn="True"
+                            BorderThickness="1"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                            TextWrapping="Wrap"
+                            VerticalScrollBarVisibility="Auto" />
+                    </Grid>
+                </ScrollViewer>
+            </TabItem>
+
+            <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDns}">
+                <DockPanel Margin="{StaticResource Margin8}">
+                    <Grid DockPanel.Dock="Top">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        
+                        <StackPanel Grid.Row="0" Orientation="Horizontal">
+                            <TextBlock
+                                    Margin="{StaticResource Margin8}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ToolbarTextBlock}"
+                                    Text="{x:Static resx:ResUI.TbCustomDNSEnable}" />
+                            <ToggleButton
+                                    x:Name="togRayCustomDNSEnableCompatible"
+                                    Margin="{StaticResource Margin8}"
+                                    HorizontalAlignment="Left" />
+                        </StackPanel>
+                        
+                        <StackPanel Grid.Row="1" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}"
+                                Text="{x:Static resx:ResUI.TbSettingsRemoteDNS}" />
+                            <TextBlock
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}">
+                                <Hyperlink Click="linkDnsObjectDoc_Click">
+                                    <TextBlock Text="{x:Static resx:ResUI.TbDnsObjectDoc}" />
+                                    <materialDesign:PackIcon Kind="Link" />
+                                </Hyperlink>
+                            </TextBlock>
+                            <Button
+                                x:Name="btnImportDefConfig4V2rayCompatible"
+                                Margin="{StaticResource Margin8}"
+                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
+                                Cursor="Hand"
+                                Style="{StaticResource DefButton}" />
+                        </StackPanel>
+                    </Grid>
 
                     <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
                         <StackPanel Orientation="Horizontal">
@@ -75,7 +405,7 @@
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsUseSystemHosts}" />
                             <ToggleButton
-                                x:Name="togUseSystemHosts"
+                                x:Name="togUseSystemHostsCompatible"
                                 Margin="{StaticResource Margin8}"
                                 HorizontalAlignment="Left" />
                         </StackPanel>
@@ -87,7 +417,7 @@
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Freedom}" />
                             <ComboBox
-                                x:Name="cmbdomainStrategy4Freedom"
+                                x:Name="cmbdomainStrategy4FreedomCompatible"
                                 Width="150"
                                 Margin="{StaticResource Margin8}"
                                 Style="{StaticResource DefComboBox}" />
@@ -100,7 +430,7 @@
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
                             <ComboBox
-                                x:Name="cmbdomainDNSAddress"
+                                x:Name="cmbdomainDNSAddressCompatible"
                                 Width="150"
                                 Margin="{StaticResource Margin8}"
                                 IsEditable="True"
@@ -109,7 +439,7 @@
                     </WrapPanel>
 
                     <TextBox
-                        x:Name="txtnormalDNS"
+                        x:Name="txtnormalDNSCompatible"
                         Margin="{StaticResource Margin8}"
                         VerticalAlignment="Stretch"
                         materialDesign:HintAssist.Hint="HTTP/SOCKS"
@@ -123,23 +453,42 @@
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDnsSingbox}">
                 <DockPanel Margin="{StaticResource Margin8}">
-                    <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
-                        <TextBlock
-                            Margin="{StaticResource Margin8}"
-                            VerticalAlignment="Center"
-                            Style="{StaticResource ToolbarTextBlock}">
-                            <Hyperlink Click="linkDnsSingboxObjectDoc_Click">
-                                <TextBlock Text="{x:Static resx:ResUI.TbDnsSingboxObjectDoc}" />
-                                <materialDesign:PackIcon Kind="Link" />
-                            </Hyperlink>
-                        </TextBlock>
-                        <Button
-                            x:Name="btnImportDefConfig4Singbox"
-                            Margin="{StaticResource Margin8}"
-                            Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
-                            Cursor="Hand"
-                            Style="{StaticResource DefButton}" />
-                    </StackPanel>
+                    <Grid DockPanel.Dock="Top">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        
+                        <StackPanel Grid.Row="0" Orientation="Horizontal">
+                            <TextBlock
+                                    Margin="{StaticResource Margin8}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ToolbarTextBlock}"
+                                    Text="{x:Static resx:ResUI.TbCustomDNSEnable}" />
+                            <ToggleButton
+                                    x:Name="togSBCustomDNSEnableCompatible"
+                                    Margin="{StaticResource Margin8}"
+                                    HorizontalAlignment="Left" />
+                        </StackPanel>
+                        
+                        <StackPanel Grid.Row="1" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}">
+                                <Hyperlink Click="linkDnsSingboxObjectDoc_Click">
+                                    <TextBlock Text="{x:Static resx:ResUI.TbDnsSingboxObjectDoc}" />
+                                    <materialDesign:PackIcon Kind="Link" />
+                                </Hyperlink>
+                            </TextBlock>
+                            <Button
+                                x:Name="btnImportDefConfig4SingboxCompatible"
+                                Margin="{StaticResource Margin8}"
+                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
+                                Cursor="Hand"
+                                Style="{StaticResource DefButton}" />
+                        </StackPanel>
+                    </Grid>
 
                     <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
                         <StackPanel Orientation="Horizontal">
@@ -149,7 +498,7 @@
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Out}" />
                             <ComboBox
-                                x:Name="cmbdomainStrategy4Out"
+                                x:Name="cmbdomainStrategy4OutCompatible"
                                 Width="150"
                                 Margin="{StaticResource Margin8}"
                                 Style="{StaticResource DefComboBox}" />
@@ -162,7 +511,7 @@
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
                             <ComboBox
-                                x:Name="cmbdomainDNSAddress2"
+                                x:Name="cmbdomainDNSAddress2Compatible"
                                 Width="150"
                                 Margin="{StaticResource Margin8}"
                                 IsEditable="True"
@@ -178,7 +527,7 @@
                         </Grid.ColumnDefinitions>
 
                         <TextBox
-                            x:Name="txtnormalDNS2"
+                            x:Name="txtnormalDNS2Compatible"
                             Grid.Column="0"
                             VerticalAlignment="Stretch"
                             materialDesign:HintAssist.Hint="HTTP/SOCKS"
@@ -191,7 +540,7 @@
                         <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
 
                         <TextBox
-                            x:Name="txttunDNS2"
+                            x:Name="txttunDNS2Compatible"
                             Grid.Column="2"
                             VerticalAlignment="Stretch"
                             materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TbSettingsTunMode}"
diff --git a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs
index 1f6b960b..cb6b44a8 100644
--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs
@@ -17,26 +17,66 @@ public partial class DNSSettingWindow
 
         ViewModel = new DNSSettingViewModel(UpdateViewHandler);
 
-        cmbdomainStrategy4Freedom.ItemsSource = Global.DomainStrategy4Freedoms;
-        cmbdomainStrategy4Out.ItemsSource = Global.SingboxDomainStrategy4Out;
-        cmbdomainDNSAddress.ItemsSource = Global.DomainDNSAddress;
-        cmbdomainDNSAddress2.ItemsSource = Global.SingboxDomainDNSAddress;
+        cmbRayFreedomDNSStrategy.ItemsSource = Global.DomainStrategy4Freedoms;
+        cmbSBDirectDNSStrategy.ItemsSource = Global.SingboxDomainStrategy4Out;
+        cmbSBRemoteDNSStrategy.ItemsSource = Global.SingboxDomainStrategy4Out;
+        cmbDirectDNS.ItemsSource = Global.DomainDirectDNSAddress;
+        cmbSBResolverDNS.ItemsSource = Global.DomainDirectDNSAddress.Concat(new[] { "dhcp://auto,localhost" });
+        cmbRemoteDNS.ItemsSource = Global.DomainRemoteDNSAddress;
+        cmbSBFinalResolverDNS.ItemsSource = Global.DomainPureIPDNSAddress.Concat(new[] { "dhcp://auto,localhost" });
+        cmbDirectExpectedIPs.ItemsSource = Global.ExpectedIPs;
+
+        cmbdomainStrategy4FreedomCompatible.ItemsSource = Global.DomainStrategy4Freedoms;
+        cmbdomainStrategy4OutCompatible.ItemsSource = Global.SingboxDomainStrategy4Out;
+        cmbdomainDNSAddressCompatible.ItemsSource = Global.DomainPureIPDNSAddress;
+        cmbdomainDNSAddress2Compatible.ItemsSource = Global.DomainPureIPDNSAddress;
 
         this.WhenActivated(disposables =>
         {
             this.Bind(ViewModel, vm => vm.UseSystemHosts, v => v.togUseSystemHosts.IsChecked).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.DomainStrategy4Freedom, v => v.cmbdomainStrategy4Freedom.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.DomainDNSAddress, v => v.cmbdomainDNSAddress.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.NormalDNS, v => v.txtnormalDNS.Text).DisposeWith(disposables);
-
-            this.Bind(ViewModel, vm => vm.DomainStrategy4Freedom2, v => v.cmbdomainStrategy4Out.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.DomainDNSAddress2, v => v.cmbdomainDNSAddress2.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.NormalDNS2, v => v.txtnormalDNS2.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.TunDNS2, v => v.txttunDNS2.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.AddCommonHosts, v => v.togAddCommonHosts.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.FakeIP, v => v.togFakeIP.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.BlockBindingQuery, v => v.togBlockBindingQuery.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.DirectDNS, v => v.cmbDirectDNS.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.RemoteDNS, v => v.cmbRemoteDNS.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SingboxOutboundsResolveDNS, v => v.cmbSBResolverDNS.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SingboxFinalResolveDNS, v => v.cmbSBFinalResolverDNS.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.RayStrategy4Freedom, v => v.cmbRayFreedomDNSStrategy.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SingboxStrategy4Direct, v => v.cmbSBDirectDNSStrategy.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SingboxStrategy4Proxy, v => v.cmbSBRemoteDNSStrategy.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.Hosts, v => v.txtHosts.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.DirectExpectedIPs, v => v.cmbDirectExpectedIPs.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
-            this.BindCommand(ViewModel, vm => vm.ImportDefConfig4V2rayCmd, v => v.btnImportDefConfig4V2ray).DisposeWith(disposables);
-            this.BindCommand(ViewModel, vm => vm.ImportDefConfig4SingboxCmd, v => v.btnImportDefConfig4Singbox).DisposeWith(disposables);
+
+            this.Bind(ViewModel, vm => vm.RayCustomDNSEnableCompatible, v => v.togRayCustomDNSEnableCompatible.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SBCustomDNSEnableCompatible, v => v.togSBCustomDNSEnableCompatible.IsChecked).DisposeWith(disposables);
+
+            this.Bind(ViewModel, vm => vm.UseSystemHostsCompatible, v => v.togUseSystemHostsCompatible.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.DomainStrategy4FreedomCompatible, v => v.cmbdomainStrategy4FreedomCompatible.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.DomainDNSAddressCompatible, v => v.cmbdomainDNSAddressCompatible.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.NormalDNSCompatible, v => v.txtnormalDNSCompatible.Text).DisposeWith(disposables);
+
+            this.Bind(ViewModel, vm => vm.DomainStrategy4Freedom2Compatible, v => v.cmbdomainStrategy4OutCompatible.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.DomainDNSAddress2Compatible, v => v.cmbdomainDNSAddress2Compatible.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.NormalDNS2Compatible, v => v.txtnormalDNS2Compatible.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.TunDNS2Compatible, v => v.txttunDNS2Compatible.Text).DisposeWith(disposables);
+
+            this.BindCommand(ViewModel, vm => vm.ImportDefConfig4V2rayCompatibleCmd, v => v.btnImportDefConfig4V2rayCompatible).DisposeWith(disposables);
+            this.BindCommand(ViewModel, vm => vm.ImportDefConfig4SingboxCompatibleCmd, v => v.btnImportDefConfig4SingboxCompatible).DisposeWith(disposables);
+
+            this.WhenAnyValue(
+                    x => x.ViewModel.RayCustomDNSEnableCompatible,
+                    x => x.ViewModel.SBCustomDNSEnableCompatible,
+                    (ray, sb) => ray && sb ? Visibility.Visible : Visibility.Collapsed)
+                .BindTo(this, x => x.txtBasicDNSSettingsInvalid.Visibility)
+                .DisposeWith(disposables);
+            this.WhenAnyValue(
+                    x => x.ViewModel.RayCustomDNSEnableCompatible,
+                    x => x.ViewModel.SBCustomDNSEnableCompatible,
+                    (ray, sb) => ray && sb ? Visibility.Visible : Visibility.Collapsed)
+                .BindTo(this, x => x.txtAdvancedDNSSettingsInvalid.Visibility)
+                .DisposeWith(disposables);
         });
         WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
     }

From c561916b67cf997ac3a698fcb8937584a2dac8c2 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Sun, 10 Aug 2025 11:58:07 +0800
Subject: [PATCH 026/115] Fixes select proxy outbound server (#7727)

---
 .../ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index aa4b4322..6ced20f0 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -1014,7 +1014,8 @@ public class CoreConfigSingboxService
             }
 
             //current proxy
-            BaseServer4Sbox? outbound = singboxConfig.endpoints?.FirstOrDefault(t => t.tag == Global.ProxyTag) == null ? singboxConfig.outbounds.First() : null;
+            BaseServer4Sbox? outbound = singboxConfig.endpoints?.FirstOrDefault(t => t.tag == Global.ProxyTag, null);
+            outbound ??= singboxConfig.outbounds.First();
 
             var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
 

From 925cf16c504dffc2b99b96e1f506fae587d3e472 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Sun, 10 Aug 2025 13:39:51 +0800
Subject: [PATCH 027/115] Adds sing-box fragment support (#7729)

---
 v2rayN/ServiceLib/Models/SingboxConfig.cs                      | 3 +++
 v2rayN/ServiceLib/Resx/ResUI.Designer.cs                       | 2 +-
 v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx                        | 2 +-
 v2rayN/ServiceLib/Resx/ResUI.hu.resx                           | 2 +-
 v2rayN/ServiceLib/Resx/ResUI.resx                              | 2 +-
 v2rayN/ServiceLib/Resx/ResUI.ru.resx                           | 2 +-
 v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx                      | 2 +-
 v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx                      | 2 +-
 .../ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs | 1 +
 9 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/v2rayN/ServiceLib/Models/SingboxConfig.cs b/v2rayN/ServiceLib/Models/SingboxConfig.cs
index cbaf77e6..30478174 100644
--- a/v2rayN/ServiceLib/Models/SingboxConfig.cs
+++ b/v2rayN/ServiceLib/Models/SingboxConfig.cs
@@ -179,6 +179,9 @@ public class Tls4Sbox
     public List<string>? alpn { get; set; }
     public Utls4Sbox? utls { get; set; }
     public Reality4Sbox? reality { get; set; }
+    public bool? fragment { get; set; }
+    public string? fragment_fallback_delay { get; set; }
+    public bool? record_fragment { get; set; }
 }
 
 public class Multiplex4Sbox
diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index 31405d61..6a021a2b 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -3238,7 +3238,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Use Xray and enable non-Tun mode, which conflicts with the group previous proxy 的本地化字符串。
+        ///   查找类似 which conflicts with the group previous proxy 的本地化字符串。
         /// </summary>
         public static string TbSettingsEnableFragmentTips {
             get {
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
index 24625798..25a3c80e 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1105,7 +1105,7 @@
     <value>افزودن سرور [HTTP]</value>
   </data>
   <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
-    <value>از Xray استفاده کنید و حالت non-Tun را فعال کنید، که با پراکسی قبلی گروه در تضاد است</value>
+    <value>which conflicts with the group previous proxy</value>
   </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>فعال کردن فرگمنت</value>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
index 14df7b0e..20d0ab8e 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1105,7 +1105,7 @@
     <value>HTTP konfiguráció hozzáadása</value>
   </data>
   <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
-    <value>Használja az Xray-t és engedélyezze a nem Tun módot, ami ütközik a csoport előző proxyjával</value>
+    <value>which conflicts with the group previous proxy</value>
   </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>Fragment engedélyezése</value>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index e44f9098..a6009434 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1105,7 +1105,7 @@
     <value>Add [HTTP] Configuration</value>
   </data>
   <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
-    <value>Use Xray and enable non-Tun mode, which conflicts with the group previous proxy</value>
+    <value>which conflicts with the group previous proxy</value>
   </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>Enable fragment</value>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
index c8c2894a..6207b163 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1105,7 +1105,7 @@
     <value>Добавить сервер [HTTP]</value>
   </data>
   <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
-    <value>Используйте Xray и отключите режим TUN, так как он конфликтует с предыдущим прокси-сервером группы</value>
+    <value>which conflicts with the group previous proxy</value>
   </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>Включить фрагментацию (Fragment)</value>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index f9c5a02b..72c42604 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1102,7 +1102,7 @@
     <value>添加 [HTTP] 配置文件</value>
   </data>
   <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
-    <value>使用 Xray 且非 Tun 模式启用，和分组前置代理冲突</value>
+    <value>和分组前置代理冲突</value>
   </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>启用分片 (Fragment)</value>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index 429e4637..84c8f929 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1102,7 +1102,7 @@
     <value>新增 [HTTP] 設定檔</value>
   </data>
   <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
-    <value>使用 Xray 且非 Tun 模式啟用，和分組前置代理衝突</value>
+    <value>和分組前置代理衝突</value>
   </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>啟用分片（Fragment）</value>
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index 6ced20f0..b26f6336 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -890,6 +890,7 @@ public class CoreConfigSingboxService
                 var tls = new Tls4Sbox()
                 {
                     enabled = true,
+                    record_fragment = _config.CoreBasicItem.EnableFragment,
                     server_name = server_name,
                     insecure = Utils.ToBool(node.AllowInsecure.IsNullOrEmpty() ? _config.CoreBasicItem.DefAllowInsecure.ToString().ToLower() : node.AllowInsecure),
                     alpn = node.GetAlpn(),

From 386c86bfa685605bf3214d4f79842dcc4e88beca Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 10 Aug 2025 20:12:57 +0800
Subject: [PATCH 028/115] Code clean

---
 v2rayN/ServiceLib/Handler/ConfigHandler.cs    |  6 +--
 v2rayN/ServiceLib/Handler/Fmt/AnytlsFmt.cs    |  3 +-
 v2rayN/ServiceLib/Models/SingboxConfig.cs     |  3 ++
 .../CoreConfig/CoreConfigSingboxService.cs    |  5 --
 .../Views/DNSSettingWindow.axaml              | 19 ++++----
 v2rayN/v2rayN/Views/ClashConnectionsView.xaml |  6 +--
 v2rayN/v2rayN/Views/ClashProxiesView.xaml     |  8 ++--
 v2rayN/v2rayN/Views/DNSSettingWindow.xaml     | 47 +++++++++----------
 v2rayN/v2rayN/Views/StatusBarView.xaml        |  9 ++--
 9 files changed, 50 insertions(+), 56 deletions(-)

diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
index 998c2427..dd20974f 100644
--- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -2106,7 +2106,7 @@ public class ConfigHandler
     public static async Task<int> InitBuiltinDNS(Config config)
     {
         var items = await AppHandler.Instance.DNSItems();
-        
+
         // Check existing DNS items and disable those with empty NormalDNS
         var needsUpdate = false;
         foreach (var existingItem in items)
@@ -2117,13 +2117,13 @@ public class ConfigHandler
                 needsUpdate = true;
             }
         }
-        
+
         // Update items if any changes were made
         if (needsUpdate)
         {
             await SQLiteHelper.Instance.UpdateAllAsync(items);
         }
-        
+
         if (items.Count <= 0)
         {
             var item = new DNSItem()
diff --git a/v2rayN/ServiceLib/Handler/Fmt/AnytlsFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/AnytlsFmt.cs
index 3f1d40dc..f175ce82 100644
--- a/v2rayN/ServiceLib/Handler/Fmt/AnytlsFmt.cs
+++ b/v2rayN/ServiceLib/Handler/Fmt/AnytlsFmt.cs
@@ -1,6 +1,5 @@
-using static QRCoder.PayloadGenerator;
-
 namespace ServiceLib.Handler.Fmt;
+
 public class AnytlsFmt : BaseFmt
 {
     public static ProfileItem? Resolve(string str, out string msg)
diff --git a/v2rayN/ServiceLib/Models/SingboxConfig.cs b/v2rayN/ServiceLib/Models/SingboxConfig.cs
index 30478174..a5eec4ae 100644
--- a/v2rayN/ServiceLib/Models/SingboxConfig.cs
+++ b/v2rayN/ServiceLib/Models/SingboxConfig.cs
@@ -240,10 +240,13 @@ public class Server4Sbox : BaseServer4Sbox
     public int? server_port { get; set; }
     public string? path { get; set; }
     public Headers4Sbox? headers { get; set; }
+
     // public List<string>? path { get; set; } // hosts
     public Dictionary<string, List<string>>? predefined { get; set; }
+
     // Deprecated
     public string? address { get; set; }
+
     public string? address_resolver { get; set; }
     public string? address_strategy { get; set; }
     public string? strategy { get; set; }
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index b26f6336..6ea20a20 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -1,11 +1,6 @@
-using System.Collections.Generic;
 using System.Data;
 using System.Net;
 using System.Net.NetworkInformation;
-using System.Reactive;
-using System.Text;
-using DynamicData;
-using ServiceLib.Models;
 
 namespace ServiceLib.Services.CoreConfig;
 
diff --git a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
index 23ebe9fb..9ec377ff 100644
--- a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
@@ -39,7 +39,7 @@
             <TabItem Header="{x:Static resx:ResUI.ThBasicDNSSettings}">
                 <ScrollViewer VerticalScrollBarVisibility="Visible">
                     <Grid
-                        Margin="{StaticResource Margin4}"
+                        Margin="{StaticResource Margin8}"
                         ColumnDefinitions="Auto,Auto,*"
                         RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
 
@@ -50,7 +50,7 @@
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbCustomDNSEnabledPageInvalid}" />
-                        
+
                         <TextBlock
                             Grid.Row="1"
                             Grid.Column="0"
@@ -186,7 +186,7 @@
             <TabItem Header="{x:Static resx:ResUI.ThAdvancedDNSSettings}">
                 <ScrollViewer VerticalScrollBarVisibility="Visible">
                     <Grid
-                        Margin="{StaticResource Margin4}"
+                        Margin="{StaticResource Margin8}"
                         ColumnDefinitions="Auto,Auto,*"
                         RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,*">
 
@@ -284,13 +284,14 @@
                             Grid.ColumnSpan="3"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Stretch"
-                            Watermark="{x:Static resx:ResUI.TbDNSHostsConfig}"
                             BorderThickness="1"
                             Classes="TextArea"
-                            TextWrapping="Wrap" />
+                            TextWrapping="Wrap"
+                            Watermark="{x:Static resx:ResUI.TbDNSHostsConfig}" />
                     </Grid>
                 </ScrollViewer>
             </TabItem>
+
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDns}">
                 <DockPanel Margin="{StaticResource Margin8}">
                     <Grid DockPanel.Dock="Top">
@@ -298,7 +299,7 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
-                        
+
                         <StackPanel Grid.Row="0" Orientation="Horizontal">
                             <TextBlock
                                 Margin="{StaticResource Margin4}"
@@ -309,7 +310,7 @@
                                 Margin="{StaticResource Margin4}"
                                 HorizontalAlignment="Left" />
                         </StackPanel>
-                        
+
                         <StackPanel Grid.Row="1" Orientation="Horizontal">
                             <TextBlock
                                 Margin="{StaticResource Margin4}"
@@ -387,7 +388,7 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
-                        
+
                         <StackPanel Grid.Row="0" Orientation="Horizontal">
                             <TextBlock
                                 Margin="{StaticResource Margin4}"
@@ -398,7 +399,7 @@
                                 Margin="{StaticResource Margin4}"
                                 HorizontalAlignment="Left" />
                         </StackPanel>
-                        
+
                         <StackPanel Grid.Row="1" Orientation="Horizontal">
                             <TextBlock Margin="{StaticResource Margin4}" VerticalAlignment="Center">
                                 <HyperlinkButton Classes="WithIcon" Click="linkDnsSingboxObjectDoc_Click">
diff --git a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml b/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
index 35a93411..0e6ba6a7 100644
--- a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
+++ b/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
@@ -1,11 +1,11 @@
 <reactiveui:ReactiveUserControl
     x:Class="v2rayN.Views.ClashConnectionsView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     d:DesignHeight="450"
diff --git a/v2rayN/v2rayN/Views/ClashProxiesView.xaml b/v2rayN/v2rayN/Views/ClashProxiesView.xaml
index e47388d0..ca87e098 100644
--- a/v2rayN/v2rayN/Views/ClashProxiesView.xaml
+++ b/v2rayN/v2rayN/Views/ClashProxiesView.xaml
@@ -1,14 +1,14 @@
 <reactiveui:ReactiveUserControl
     x:Class="v2rayN.Views.ClashProxiesView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
-    xmlns:converters="clr-namespace:v2rayN.Converters"
     d:DesignHeight="450"
     d:DesignWidth="800"
     x:TypeArguments="vms:ClashProxiesViewModel"
diff --git a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
index 9098fe43..c90c019f 100644
--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
@@ -83,8 +83,8 @@
                             Grid.Row="1"
                             Grid.Column="1"
                             Width="200"
-                            IsEditable="True"
                             Margin="{StaticResource Margin8}"
+                            IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
@@ -99,8 +99,8 @@
                             Grid.Row="2"
                             Grid.Column="1"
                             Width="200"
-                            IsEditable="True"
                             Margin="{StaticResource Margin8}"
+                            IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
@@ -115,8 +115,8 @@
                             Grid.Row="3"
                             Grid.Column="1"
                             Width="200"
-                            IsEditable="True"
                             Margin="{StaticResource Margin8}"
+                            IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
                         <TextBlock
                             Grid.Row="3"
@@ -138,8 +138,8 @@
                             Grid.Row="4"
                             Grid.Column="1"
                             Width="200"
-                            IsEditable="True"
                             Margin="{StaticResource Margin8}"
+                            IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
                         <TextBlock
                             Grid.Row="4"
@@ -304,7 +304,6 @@
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbPreventDNSLeaks}" />
 
-
                         <TextBlock
                             Grid.Row="4"
                             Grid.Column="0"
@@ -317,8 +316,8 @@
                             Grid.Row="4"
                             Grid.Column="1"
                             Width="200"
-                            IsEditable="True"
                             Margin="{StaticResource Margin8}"
+                            IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
                         <TextBlock
                             Grid.Row="4"
@@ -360,19 +359,19 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
-                        
+
                         <StackPanel Grid.Row="0" Orientation="Horizontal">
                             <TextBlock
-                                    Margin="{StaticResource Margin8}"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource ToolbarTextBlock}"
-                                    Text="{x:Static resx:ResUI.TbCustomDNSEnable}" />
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}"
+                                Text="{x:Static resx:ResUI.TbCustomDNSEnable}" />
                             <ToggleButton
-                                    x:Name="togRayCustomDNSEnableCompatible"
-                                    Margin="{StaticResource Margin8}"
-                                    HorizontalAlignment="Left" />
+                                x:Name="togRayCustomDNSEnableCompatible"
+                                Margin="{StaticResource Margin8}"
+                                HorizontalAlignment="Left" />
                         </StackPanel>
-                        
+
                         <StackPanel Grid.Row="1" Orientation="Horizontal">
                             <TextBlock
                                 Margin="{StaticResource Margin8}"
@@ -458,19 +457,19 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
-                        
+
                         <StackPanel Grid.Row="0" Orientation="Horizontal">
                             <TextBlock
-                                    Margin="{StaticResource Margin8}"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource ToolbarTextBlock}"
-                                    Text="{x:Static resx:ResUI.TbCustomDNSEnable}" />
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}"
+                                Text="{x:Static resx:ResUI.TbCustomDNSEnable}" />
                             <ToggleButton
-                                    x:Name="togSBCustomDNSEnableCompatible"
-                                    Margin="{StaticResource Margin8}"
-                                    HorizontalAlignment="Left" />
+                                x:Name="togSBCustomDNSEnableCompatible"
+                                Margin="{StaticResource Margin8}"
+                                HorizontalAlignment="Left" />
                         </StackPanel>
-                        
+
                         <StackPanel Grid.Row="1" Orientation="Horizontal">
                             <TextBlock
                                 Margin="{StaticResource Margin8}"
diff --git a/v2rayN/v2rayN/Views/StatusBarView.xaml b/v2rayN/v2rayN/Views/StatusBarView.xaml
index c58e8326..d337c4cd 100644
--- a/v2rayN/v2rayN/Views/StatusBarView.xaml
+++ b/v2rayN/v2rayN/Views/StatusBarView.xaml
@@ -92,8 +92,7 @@
                         AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}"
                         DisplayMemberPath="Remarks"
                         FontSize="{DynamicResource StdFontSize}"
-                        Style="{StaticResource MaterialDesignFloatingHintComboBox}">
-                    </ComboBox>
+                        Style="{StaticResource MaterialDesignFloatingHintComboBox}" />
                 </StackPanel>
 
                 <StackPanel Margin="{StaticResource MarginLeftRight8}" VerticalAlignment="Center">
@@ -185,8 +184,7 @@
                                     AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}"
                                     DisplayMemberPath="Remarks"
                                     FontSize="{DynamicResource StdFontSize}"
-                                    Style="{StaticResource MaterialDesignFilledComboBox}">
-                                </ComboBox>
+                                    Style="{StaticResource MaterialDesignFilledComboBox}" />
                             </DockPanel>
                         </MenuItem.Header>
                     </MenuItem>
@@ -200,8 +198,7 @@
                                     AutomationProperties.Name="{x:Static resx:ResUI.menuServers}"
                                     DisplayMemberPath="Text"
                                     FontSize="{DynamicResource StdFontSize}"
-                                    Style="{StaticResource MaterialDesignFilledComboBox}">
-                                </ComboBox>
+                                    Style="{StaticResource MaterialDesignFilledComboBox}" />
                             </DockPanel>
                         </MenuItem.Header>
                     </MenuItem>

From c9989108bd0174d52c5c2a12fb23073d27d3ad58 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 10 Aug 2025 20:22:04 +0800
Subject: [PATCH 029/115] Use raw.githubusercontent.com instead of
 cdn.jsdelivr.net (#7732)

https://github.com/2dust/v2rayN/issues/7682
---
 v2rayN/ServiceLib/Global.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs
index 11acde71..3e7b8858 100644
--- a/v2rayN/ServiceLib/Global.cs
+++ b/v2rayN/ServiceLib/Global.cs
@@ -136,24 +136,24 @@ public class Global
     ];
 
     public static readonly List<string> SingboxRulesetSources =
-    [
-        "",
-            @"https://cdn.jsdelivr.net/gh/runetfreedom/russia-v2ray-rules-dat@release/sing-box/rule-set-{0}/{1}.srs",
-            @"https://cdn.jsdelivr.net/gh/chocolate4u/Iran-sing-box-rules@rule-set/{1}.srs"
-    ];
+[
+    "",
+    @"https://raw.githubusercontent.com/runetfreedom/russia-v2ray-rules-dat/release/sing-box/rule-set-{0}/{1}.srs",
+    @"https://raw.githubusercontent.com/chocolate4u/Iran-sing-box-rules/rule-set/{1}.srs"
+];
 
     public static readonly List<string> RoutingRulesSources =
     [
         "",
-            @"https://cdn.jsdelivr.net/gh/runetfreedom/russia-v2ray-custom-routing-list@main/v2rayN/template.json",
-            @"https://cdn.jsdelivr.net/gh/Chocolate4U/Iran-v2ray-rules@main/v2rayN/template.json"
+    @"https://raw.githubusercontent.com/runetfreedom/russia-v2ray-custom-routing-list/main/v2rayN/template.json",
+    @"https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/main/v2rayN/template.json"
     ];
 
     public static readonly List<string> DNSTemplateSources =
     [
         "",
-            @"https://cdn.jsdelivr.net/gh/runetfreedom/russia-v2ray-custom-routing-list@main/v2rayN/",
-            @"https://cdn.jsdelivr.net/gh/Chocolate4U/Iran-v2ray-rules@main/v2rayN/"
+    @"https://raw.githubusercontent.com/runetfreedom/russia-v2ray-custom-routing-list/main/v2rayN/",
+    @"https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/main/v2rayN/"
     ];
 
     public static readonly Dictionary<string, string> UserAgentTexts = new()

From dffc6d9a9b337fe7d11f0b087e2e09243ec3eee4 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 10 Aug 2025 21:08:49 +0800
Subject: [PATCH 030/115] Fixed DNS bug with region switch

---
 v2rayN/ServiceLib/Handler/ConfigHandler.cs | 27 ++++++++--------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
index dd20974f..3825fe74 100644
--- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -112,10 +112,7 @@ public class ConfigHandler
 
         config.ConstItem ??= new ConstItem();
 
-        if (config.SimpleDNSItem == null)
-        {
-            InitBuiltinSimpleDNS(config);
-        }
+        config.SimpleDNSItem ??= InitBuiltinSimpleDNS();
 
         config.SpeedTestItem ??= new();
         if (config.SpeedTestItem.SpeedTestTimeout < 10)
@@ -2212,9 +2209,9 @@ public class ConfigHandler
 
     #region Simple DNS
 
-    public static int InitBuiltinSimpleDNS(Config config)
+    public static SimpleDNSItem InitBuiltinSimpleDNS()
     {
-        config.SimpleDNSItem = new SimpleDNSItem()
+        return new SimpleDNSItem()
         {
             UseSystemHosts = false,
             AddCommonHosts = true,
@@ -2225,7 +2222,6 @@ public class ConfigHandler
             SingboxOutboundsResolveDNS = Global.DomainDirectDNSAddress.FirstOrDefault(),
             SingboxFinalResolveDNS = Global.DomainPureIPDNSAddress.FirstOrDefault()
         };
-        return 0;
     }
 
     public static async Task<SimpleDNSItem> GetExternalSimpleDNSItem(string url)
@@ -2263,9 +2259,8 @@ public class ConfigHandler
                 await SQLiteHelper.Instance.DeleteAllAsync<DNSItem>();
                 await InitBuiltinDNS(config);
 
-                InitBuiltinSimpleDNS(config);
-
-                return true;
+                config.SimpleDNSItem = InitBuiltinSimpleDNS();
+                break;
 
             case EPresetType.Russia:
                 config.ConstItem.GeoSourceUrl = Global.GeoFilesSources[1];
@@ -2275,9 +2270,8 @@ public class ConfigHandler
                 await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.Xray, Global.DNSTemplateSources[1] + "v2ray.json"));
                 await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.sing_box, Global.DNSTemplateSources[1] + "sing_box.json"));
 
-                config.SimpleDNSItem = await GetExternalSimpleDNSItem(Global.DNSTemplateSources[1] + "simple_dns.json");
-
-                return true;
+                config.SimpleDNSItem = await GetExternalSimpleDNSItem(Global.DNSTemplateSources[1] + "simple_dns.json") ?? InitBuiltinSimpleDNS();
+                break;
 
             case EPresetType.Iran:
                 config.ConstItem.GeoSourceUrl = Global.GeoFilesSources[2];
@@ -2287,12 +2281,11 @@ public class ConfigHandler
                 await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.Xray, Global.DNSTemplateSources[2] + "v2ray.json"));
                 await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.sing_box, Global.DNSTemplateSources[2] + "sing_box.json"));
 
-                config.SimpleDNSItem = await GetExternalSimpleDNSItem(Global.DNSTemplateSources[2] + "simple_dns.json");
-
-                return true;
+                config.SimpleDNSItem = await GetExternalSimpleDNSItem(Global.DNSTemplateSources[2] + "simple_dns.json") ?? InitBuiltinSimpleDNS();
+                break;
         }
 
-        return false;
+        return true;
     }
 
     #endregion Regional Presets

From b5e0a7740136a0671c53faacdd32edc7d35e8d27 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Mon, 11 Aug 2025 20:01:48 +0800
Subject: [PATCH 031/115] Full Config Template (#7576)

* Feat. custom config

* Fixes TypeInfoResolver Exception

* Adjust UI

* Fixes

* Adjust Avalonia UI

* Add Detour Feature

* Avoids detour for private networks

* Rename

* Adds Documents
---
 v2rayN/ServiceLib/Enums/EViewAction.cs        |   1 +
 v2rayN/ServiceLib/Handler/AppHandler.cs       |  11 +
 v2rayN/ServiceLib/Handler/ConfigHandler.cs    |  48 ++++
 .../Models/FullConfigTemplateItem.cs          |  18 ++
 v2rayN/ServiceLib/Resx/ResUI.Designer.cs      |  90 +++++++
 v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx       |  30 +++
 v2rayN/ServiceLib/Resx/ResUI.hu.resx          |  30 +++
 v2rayN/ServiceLib/Resx/ResUI.resx             |  30 +++
 v2rayN/ServiceLib/Resx/ResUI.ru.resx          |  30 +++
 v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx     |  30 +++
 v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx     |  30 +++
 .../CoreConfig/CoreConfigSingboxService.cs    |  65 ++++-
 .../CoreConfig/CoreConfigV2rayService.cs      |  89 ++++++-
 .../ViewModels/FullConfigTemplateViewModel.cs | 110 +++++++++
 .../ViewModels/MainWindowViewModel.cs         |  15 ++
 .../Views/FullConfigTemplateWindow.axaml      | 198 +++++++++++++++
 .../Views/FullConfigTemplateWindow.axaml.cs   |  51 ++++
 v2rayN/v2rayN.Desktop/Views/MainWindow.axaml  |   1 +
 .../v2rayN.Desktop/Views/MainWindow.axaml.cs  |   4 +
 v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj   |   3 +
 .../Views/FullConfigTemplateWindow.xaml       | 227 ++++++++++++++++++
 .../Views/FullConfigTemplateWindow.xaml.cs    |  52 ++++
 v2rayN/v2rayN/Views/MainWindow.xaml           |   4 +
 v2rayN/v2rayN/Views/MainWindow.xaml.cs        |   4 +
 24 files changed, 1166 insertions(+), 5 deletions(-)
 create mode 100644 v2rayN/ServiceLib/Models/FullConfigTemplateItem.cs
 create mode 100644 v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs
 create mode 100644 v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml
 create mode 100644 v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
 create mode 100644 v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml
 create mode 100644 v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs

diff --git a/v2rayN/ServiceLib/Enums/EViewAction.cs b/v2rayN/ServiceLib/Enums/EViewAction.cs
index a72e8765..bf7360e2 100644
--- a/v2rayN/ServiceLib/Enums/EViewAction.cs
+++ b/v2rayN/ServiceLib/Enums/EViewAction.cs
@@ -29,6 +29,7 @@ public enum EViewAction
     DNSSettingWindow,
     RoutingSettingWindow,
     OptionSettingWindow,
+    FullConfigTemplateWindow,
     GlobalHotkeySettingWindow,
     SubSettingWindow,
     DispatcherSpeedTest,
diff --git a/v2rayN/ServiceLib/Handler/AppHandler.cs b/v2rayN/ServiceLib/Handler/AppHandler.cs
index ad9a4029..18ba19b8 100644
--- a/v2rayN/ServiceLib/Handler/AppHandler.cs
+++ b/v2rayN/ServiceLib/Handler/AppHandler.cs
@@ -64,6 +64,7 @@ public sealed class AppHandler
         SQLiteHelper.Instance.CreateTable<RoutingItem>();
         SQLiteHelper.Instance.CreateTable<ProfileExItem>();
         SQLiteHelper.Instance.CreateTable<DNSItem>();
+        SQLiteHelper.Instance.CreateTable<FullConfigTemplateItem>();
         return true;
     }
 
@@ -203,6 +204,16 @@ public sealed class AppHandler
         return await SQLiteHelper.Instance.TableAsync<DNSItem>().FirstOrDefaultAsync(it => it.CoreType == eCoreType);
     }
 
+    public async Task<List<FullConfigTemplateItem>?> FullConfigTemplateItem()
+    {
+        return await SQLiteHelper.Instance.TableAsync<FullConfigTemplateItem>().ToListAsync();
+    }
+
+    public async Task<FullConfigTemplateItem?> GetFullConfigTemplateItem(ECoreType eCoreType)
+    {
+        return await SQLiteHelper.Instance.TableAsync<FullConfigTemplateItem>().FirstOrDefaultAsync(it => it.CoreType == eCoreType);
+    }
+
     #endregion SqliteHelper
 
     #region Core Type
diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
index 3825fe74..c05424a2 100644
--- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -2238,6 +2238,54 @@ public class ConfigHandler
 
     #endregion Simple DNS
 
+    #region Custom Config
+
+    public static async Task<int> InitBuiltinFullConfigTemplate(Config config)
+    {
+        var items = await AppHandler.Instance.FullConfigTemplateItem();
+        if (items.Count <= 0)
+        {
+            var item = new FullConfigTemplateItem()
+            {
+                Remarks = "V2ray",
+                CoreType = ECoreType.Xray,
+            };
+            await SaveFullConfigTemplate(config, item);
+
+            var item2 = new FullConfigTemplateItem()
+            {
+                Remarks = "sing-box",
+                CoreType = ECoreType.sing_box,
+            };
+            await SaveFullConfigTemplate(config, item2);
+        }
+
+        return 0;
+    }
+    public static async Task<int> SaveFullConfigTemplate(Config config, FullConfigTemplateItem item)
+    {
+        if (item == null)
+        {
+            return -1;
+        }
+
+        if (item.Id.IsNullOrEmpty())
+        {
+            item.Id = Utils.GetGuid(false);
+        }
+
+        if (await SQLiteHelper.Instance.ReplaceAsync(item) > 0)
+        {
+            return 0;
+        }
+        else
+        {
+            return -1;
+        }
+    }
+
+    #endregion Custom Config
+
     #region Regional Presets
 
     /// <summary>
diff --git a/v2rayN/ServiceLib/Models/FullConfigTemplateItem.cs b/v2rayN/ServiceLib/Models/FullConfigTemplateItem.cs
new file mode 100644
index 00000000..f3881325
--- /dev/null
+++ b/v2rayN/ServiceLib/Models/FullConfigTemplateItem.cs
@@ -0,0 +1,18 @@
+using SQLite;
+
+namespace ServiceLib.Models;
+
+[Serializable]
+public class FullConfigTemplateItem
+{
+    [PrimaryKey]
+    public string Id { get; set; }
+
+    public string Remarks { get; set; }
+    public bool Enabled { get; set; } = false;
+    public ECoreType CoreType { get; set; }
+    public string? Config { get; set; }
+    public string? TunConfig { get; set; }
+    public bool? AddProxyOnly { get; set; } = false;
+    public string? ProxyDetour { get; set; }
+}
diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index 6a021a2b..7a30e075 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -186,6 +186,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Please fill in the correct config template 的本地化字符串。
+        /// </summary>
+        public static string FillCorrectConfigTemplateText {
+            get {
+                return ResourceManager.GetString("FillCorrectConfigTemplateText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Please fill in the correct custom DNS 的本地化字符串。
         /// </summary>
@@ -933,6 +942,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Full Config Template Setting 的本地化字符串。
+        /// </summary>
+        public static string menuFullConfigTemplate {
+            get {
+                return ResourceManager.GetString("menuFullConfigTemplate", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Global Hotkey Setting 的本地化字符串。
         /// </summary>
@@ -2229,6 +2247,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Do Not Add Non-Proxy Protocol Outbound 的本地化字符串。
+        /// </summary>
+        public static string TbAddProxyProtocolOutboundOnly {
+            get {
+                return ResourceManager.GetString("TbAddProxyProtocolOutboundOnly", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Address 的本地化字符串。
         /// </summary>
@@ -2508,6 +2535,24 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core&apos;s basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you. 的本地化字符串。
+        /// </summary>
+        public static string TbFullConfigTemplateDesc {
+            get {
+                return ResourceManager.GetString("TbFullConfigTemplateDesc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Enable Full Config Template 的本地化字符串。
+        /// </summary>
+        public static string TbFullConfigTemplateEnable {
+            get {
+                return ResourceManager.GetString("TbFullConfigTemplateEnable", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Global Hotkey Settings 的本地化字符串。
         /// </summary>
@@ -2724,6 +2769,24 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 v2ray Full Config Template 的本地化字符串。
+        /// </summary>
+        public static string TbRayFullConfigTemplate {
+            get {
+                return ResourceManager.GetString("TbRayFullConfigTemplate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Add Outbound Config Only, routing.balancers and routing.rules.outboundTag, Click to view the document 的本地化字符串。
+        /// </summary>
+        public static string TbRayFullConfigTemplateDesc {
+            get {
+                return ResourceManager.GetString("TbRayFullConfigTemplateDesc", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Alias (remarks) 的本地化字符串。
         /// </summary>
@@ -2886,6 +2949,24 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 sing-box Full Config Template 的本地化字符串。
+        /// </summary>
+        public static string TbSBFullConfigTemplate {
+            get {
+                return ResourceManager.GetString("TbSBFullConfigTemplate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Add Outbound and Endpoint Config Only, Click to view the document 的本地化字符串。
+        /// </summary>
+        public static string TbSBFullConfigTemplateDesc {
+            get {
+                return ResourceManager.GetString("TbSBFullConfigTemplateDesc", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Resolve Outbound Domains 的本地化字符串。
         /// </summary>
@@ -3696,6 +3777,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Set Upstream Proxy Tag 的本地化字符串。
+        /// </summary>
+        public static string TbSetUpstreamProxyDetour {
+            get {
+                return ResourceManager.GetString("TbSetUpstreamProxyDetour", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Short Id 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
index 25a3c80e..82520c5f 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1470,4 +1470,34 @@
   <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
     <value>Custom DNS Enabled, This Page's Settings Invalid</value>
   </data>
+  <data name="FillCorrectConfigTemplateText" xml:space="preserve">
+    <value>Please fill in the correct config template</value>
+  </data>
+  <data name="menuFullConfigTemplate" xml:space="preserve">
+    <value>Full Config Template Setting</value>
+  </data>
+  <data name="TbFullConfigTemplateEnable" xml:space="preserve">
+    <value>Enable Full Config Template</value>
+  </data>
+  <data name="TbRayFullConfigTemplate" xml:space="preserve">
+    <value>v2ray Full Config Template</value>
+  </data>
+  <data name="TbRayFullConfigTemplateDesc" xml:space="preserve">
+    <value>Add Outbound Config Only, routing.balancers and routing.rules.outboundTag, Click to view the document</value>
+  </data>
+  <data name="TbAddProxyProtocolOutboundOnly" xml:space="preserve">
+    <value>Do Not Add Non-Proxy Protocol Outbound</value>
+  </data>
+  <data name="TbSetUpstreamProxyDetour" xml:space="preserve">
+    <value>Set Upstream Proxy Tag</value>
+  </data>
+  <data name="TbSBFullConfigTemplate" xml:space="preserve">
+    <value>sing-box Full Config Template</value>
+  </data>
+  <data name="TbSBFullConfigTemplateDesc" xml:space="preserve">
+    <value>Add Outbound and Endpoint Config Only, Click to view the document</value>
+  </data>
+  <data name="TbFullConfigTemplateDesc" xml:space="preserve">
+    <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
index 20d0ab8e..7ee68495 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1470,4 +1470,34 @@
   <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
     <value>Custom DNS Enabled, This Page's Settings Invalid</value>
   </data>
+  <data name="FillCorrectConfigTemplateText" xml:space="preserve">
+    <value>Please fill in the correct config template</value>
+  </data>
+  <data name="menuFullConfigTemplate" xml:space="preserve">
+    <value>Full Config Template Setting</value>
+  </data>
+  <data name="TbFullConfigTemplateEnable" xml:space="preserve">
+    <value>Enable Full Config Template</value>
+  </data>
+  <data name="TbRayFullConfigTemplate" xml:space="preserve">
+    <value>v2ray Full Config Template</value>
+  </data>
+  <data name="TbRayFullConfigTemplateDesc" xml:space="preserve">
+    <value>Add Outbound Config Only, routing.balancers and routing.rules.outboundTag, Click to view the document</value>
+  </data>
+  <data name="TbAddProxyProtocolOutboundOnly" xml:space="preserve">
+    <value>Do Not Add Non-Proxy Protocol Outbound</value>
+  </data>
+  <data name="TbSetUpstreamProxyDetour" xml:space="preserve">
+    <value>Set Upstream Proxy Tag</value>
+  </data>
+  <data name="TbSBFullConfigTemplate" xml:space="preserve">
+    <value>sing-box Full Config Template</value>
+  </data>
+  <data name="TbSBFullConfigTemplateDesc" xml:space="preserve">
+    <value>Add Outbound and Endpoint Config Only, Click to view the document</value>
+  </data>
+  <data name="TbFullConfigTemplateDesc" xml:space="preserve">
+    <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index a6009434..44343dee 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1470,4 +1470,34 @@
   <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
     <value>Custom DNS Enabled, This Page's Settings Invalid</value>
   </data>
+  <data name="FillCorrectConfigTemplateText" xml:space="preserve">
+    <value>Please fill in the correct config template</value>
+  </data>
+  <data name="menuFullConfigTemplate" xml:space="preserve">
+    <value>Full Config Template Setting</value>
+  </data>
+  <data name="TbFullConfigTemplateEnable" xml:space="preserve">
+    <value>Enable Full Config Template</value>
+  </data>
+  <data name="TbRayFullConfigTemplate" xml:space="preserve">
+    <value>v2ray Full Config Template</value>
+  </data>
+  <data name="TbRayFullConfigTemplateDesc" xml:space="preserve">
+    <value>Add Outbound Config Only, routing.balancers and routing.rules.outboundTag, Click to view the document</value>
+  </data>
+  <data name="TbAddProxyProtocolOutboundOnly" xml:space="preserve">
+    <value>Do Not Add Non-Proxy Protocol Outbound</value>
+  </data>
+  <data name="TbSetUpstreamProxyDetour" xml:space="preserve">
+    <value>Set Upstream Proxy Tag</value>
+  </data>
+  <data name="TbSBFullConfigTemplate" xml:space="preserve">
+    <value>sing-box Full Config Template</value>
+  </data>
+  <data name="TbSBFullConfigTemplateDesc" xml:space="preserve">
+    <value>Add Outbound and Endpoint Config Only, Click to view the document</value>
+  </data>
+  <data name="TbFullConfigTemplateDesc" xml:space="preserve">
+    <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
index 6207b163..e9ab6efe 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1470,4 +1470,34 @@
   <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
     <value>Custom DNS Enabled, This Page's Settings Invalid</value>
   </data>
+  <data name="FillCorrectConfigTemplateText" xml:space="preserve">
+    <value>Please fill in the correct config template</value>
+  </data>
+  <data name="menuFullConfigTemplate" xml:space="preserve">
+    <value>Full Config Template Setting</value>
+  </data>
+  <data name="TbFullConfigTemplateEnable" xml:space="preserve">
+    <value>Enable Full Config Template</value>
+  </data>
+  <data name="TbRayFullConfigTemplate" xml:space="preserve">
+    <value>v2ray Full Config Template</value>
+  </data>
+  <data name="TbRayFullConfigTemplateDesc" xml:space="preserve">
+    <value>Add Outbound Config Only, routing.balancers and routing.rules.outboundTag, Click to view the document</value>
+  </data>
+  <data name="TbAddProxyProtocolOutboundOnly" xml:space="preserve">
+    <value>Do Not Add Non-Proxy Protocol Outbound</value>
+  </data>
+  <data name="TbSetUpstreamProxyDetour" xml:space="preserve">
+    <value>Set Upstream Proxy Tag</value>
+  </data>
+  <data name="TbSBFullConfigTemplate" xml:space="preserve">
+    <value>sing-box Full Config Template</value>
+  </data>
+  <data name="TbSBFullConfigTemplateDesc" xml:space="preserve">
+    <value>Add Outbound and Endpoint Config Only, Click to view the document</value>
+  </data>
+  <data name="TbFullConfigTemplateDesc" xml:space="preserve">
+    <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index 72c42604..95a427c3 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1467,4 +1467,34 @@
   <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
     <value>自定义 DNS 已启用，此页面配置将无效</value>
   </data>
+  <data name="FillCorrectConfigTemplateText" xml:space="preserve">
+    <value>请填写正确的配置模板</value>
+  </data>
+  <data name="menuFullConfigTemplate" xml:space="preserve">
+    <value>完整配置模板设置</value>
+  </data>
+  <data name="TbFullConfigTemplateEnable" xml:space="preserve">
+    <value>启用完整配置模板</value>
+  </data>
+  <data name="TbRayFullConfigTemplate" xml:space="preserve">
+    <value>v2ray 完整配置模板</value>
+  </data>
+  <data name="TbRayFullConfigTemplateDesc" xml:space="preserve">
+    <value>仅添加出站配置，routing.balancers 和 routing.rules.outboundTag，点击查看文档</value>
+  </data>
+  <data name="TbAddProxyProtocolOutboundOnly" xml:space="preserve">
+    <value>不添加非代理协议出站</value>
+  </data>
+  <data name="TbSetUpstreamProxyDetour" xml:space="preserve">
+    <value>设置上游代理 tag</value>
+  </data>
+  <data name="TbSBFullConfigTemplate" xml:space="preserve">
+    <value>sing-box 完整配置模板</value>
+  </data>
+  <data name="TbSBFullConfigTemplateDesc" xml:space="preserve">
+    <value>仅添加出站和端点配置，点击查看文档</value>
+  </data>
+  <data name="TbFullConfigTemplateDesc" xml:space="preserve">
+    <value>此功能供高级用户和有特殊需求的用户使用。 启用此功能后，将忽略 Core 的基础设置，DNS 设置 ，路由设置。你需要保证系统代理的端口和流量统计等功能的配置正确，一切都由你来设置。</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index 84c8f929..f35c5faa 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1467,4 +1467,34 @@
   <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
     <value>Custom DNS Enabled, This Page's Settings Invalid</value>
   </data>
+  <data name="FillCorrectConfigTemplateText" xml:space="preserve">
+    <value>Please fill in the correct config template</value>
+  </data>
+  <data name="menuFullConfigTemplate" xml:space="preserve">
+    <value>Full Config Template Setting</value>
+  </data>
+  <data name="TbFullConfigTemplateEnable" xml:space="preserve">
+    <value>Enable Full Config Template</value>
+  </data>
+  <data name="TbRayFullConfigTemplate" xml:space="preserve">
+    <value>v2ray Full Config Template</value>
+  </data>
+  <data name="TbRayFullConfigTemplateDesc" xml:space="preserve">
+    <value>Add Outbound Config Only, routing.balancers and routing.rules.outboundTag, Click to view the document</value>
+  </data>
+  <data name="TbAddProxyProtocolOutboundOnly" xml:space="preserve">
+    <value>Do Not Add Non-Proxy Protocol Outbound</value>
+  </data>
+  <data name="TbSetUpstreamProxyDetour" xml:space="preserve">
+    <value>Set Upstream Proxy Tag</value>
+  </data>
+  <data name="TbSBFullConfigTemplate" xml:space="preserve">
+    <value>sing-box Full Config Template</value>
+  </data>
+  <data name="TbSBFullConfigTemplateDesc" xml:space="preserve">
+    <value>Add Outbound and Endpoint Config Only, Click to view the document</value>
+  </data>
+  <data name="TbFullConfigTemplateDesc" xml:space="preserve">
+    <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index 6ea20a20..6563e991 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -1,6 +1,7 @@
 using System.Data;
 using System.Net;
 using System.Net.NetworkInformation;
+using System.Text.Json.Nodes;
 
 namespace ServiceLib.Services.CoreConfig;
 
@@ -78,7 +79,9 @@ public class CoreConfigSingboxService
 
             ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
             ret.Success = true;
-            ret.Data = JsonUtils.Serialize(singboxConfig);
+
+            var fullConfigTemplate = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.sing_box);
+            ret.Data = await ApplyFullConfigTemplate(fullConfigTemplate, singboxConfig);
             return ret;
         }
         catch (Exception ex)
@@ -430,7 +433,9 @@ public class CoreConfigSingboxService
             await ConvertGeo2Ruleset(singboxConfig);
 
             ret.Success = true;
-            ret.Data = JsonUtils.Serialize(singboxConfig);
+
+            var fullConfigTemplate = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.sing_box);
+            ret.Data = await ApplyFullConfigTemplate(fullConfigTemplate, singboxConfig);
             return ret;
         }
         catch (Exception ex)
@@ -2197,5 +2202,61 @@ public class CoreConfigSingboxService
         return 0;
     }
 
+    private async Task<string> ApplyFullConfigTemplate(FullConfigTemplateItem fullConfigTemplate, SingboxConfig singboxConfig)
+    {
+        var fullConfigTemplateItem = fullConfigTemplate.Config;
+        if (_config.TunModeItem.EnableTun)
+        {
+            fullConfigTemplateItem = fullConfigTemplate.TunConfig;
+        }
+
+        if (!fullConfigTemplate.Enabled || fullConfigTemplateItem.IsNullOrEmpty())
+        {
+            return JsonUtils.Serialize(singboxConfig);
+        }
+
+        var fullConfigTemplateNode = JsonNode.Parse(fullConfigTemplateItem);
+        if (fullConfigTemplateNode == null)
+        {
+            return JsonUtils.Serialize(singboxConfig);
+        }
+
+        // Process outbounds
+        var customOutboundsNode = fullConfigTemplateNode["outbounds"] is JsonArray outbounds ? outbounds : new JsonArray();
+        foreach (var outbound in singboxConfig.outbounds)
+        {
+            if (outbound.type.ToLower() is "direct" or "block")
+            {
+                if (fullConfigTemplate.AddProxyOnly == true)
+                {
+                    continue;
+                }
+            }
+            else if (outbound.detour.IsNullOrEmpty() && (!fullConfigTemplate.ProxyDetour.IsNullOrEmpty()) && !Utils.IsPrivateNetwork(outbound.server ?? string.Empty))
+            {
+                outbound.detour = fullConfigTemplate.ProxyDetour;
+            }
+            customOutboundsNode.Add(JsonUtils.DeepCopy(outbound));
+        }
+        fullConfigTemplateNode["outbounds"] = customOutboundsNode;
+
+        // Process endpoints
+        if (singboxConfig.endpoints != null && singboxConfig.endpoints.Count > 0)
+        {
+            var customEndpointsNode = fullConfigTemplateNode["endpoints"] is JsonArray endpoints ? endpoints : new JsonArray();
+            foreach (var endpoint in singboxConfig.endpoints)
+            {
+                if (endpoint.detour.IsNullOrEmpty() && (!fullConfigTemplate.ProxyDetour.IsNullOrEmpty()))
+                {
+                    endpoint.detour = fullConfigTemplate.ProxyDetour;
+                }
+                customEndpointsNode.Add(JsonUtils.DeepCopy(endpoint));
+            }
+            fullConfigTemplateNode["endpoints"] = customEndpointsNode;
+        }
+
+        return await Task.FromResult(JsonUtils.Serialize(fullConfigTemplateNode));
+    }
+
     #endregion private gen function
 }
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
index 1986be14..96388ed3 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
@@ -3,6 +3,7 @@ using System.Net.NetworkInformation;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
+using ServiceLib.Models;
 
 namespace ServiceLib.Services.CoreConfig;
 
@@ -68,7 +69,9 @@ public class CoreConfigV2rayService
 
             ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
             ret.Success = true;
-            ret.Data = JsonUtils.Serialize(v2rayConfig);
+
+            var fullConfigTemplate = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
+            ret.Data = await ApplyFullConfigTemplate(fullConfigTemplate, v2rayConfig);
             return ret;
         }
         catch (Exception ex)
@@ -197,7 +200,9 @@ public class CoreConfigV2rayService
             }
 
             ret.Success = true;
-            ret.Data = JsonUtils.Serialize(v2rayConfig);
+
+            var fullConfigTemplate = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
+            ret.Data = await ApplyFullConfigTemplate(fullConfigTemplate, v2rayConfig, true);
             return ret;
         }
         catch (Exception ex)
@@ -1462,7 +1467,7 @@ public class CoreConfigV2rayService
 
             await GenDnsDomainsCompatible(node, obj, item);
 
-            v2rayConfig.dns = JsonUtils.Deserialize<Dns4Ray>(obj.ToJsonString());
+            v2rayConfig.dns = JsonUtils.Deserialize<Dns4Ray>(JsonUtils.Serialize(obj));
         }
         catch (Exception ex)
         {
@@ -1839,5 +1844,83 @@ public class CoreConfigV2rayService
         return await Task.FromResult(0);
     }
 
+    private async Task<string> ApplyFullConfigTemplate(FullConfigTemplateItem fullConfigTemplate, V2rayConfig v2rayConfig, bool handleBalancerAndRules = false)
+    {
+        if (!fullConfigTemplate.Enabled || fullConfigTemplate.Config.IsNullOrEmpty())
+        {
+            return JsonUtils.Serialize(v2rayConfig);
+        }
+
+        var fullConfigTemplateNode = JsonNode.Parse(fullConfigTemplate.Config);
+        if (fullConfigTemplateNode == null)
+        {
+            return JsonUtils.Serialize(v2rayConfig);
+        }
+
+        // Handle balancer and rules modifications (for multiple load scenarios)
+        if (handleBalancerAndRules && v2rayConfig.routing?.balancers?.Count > 0)
+        {
+            var balancer = v2rayConfig.routing.balancers.First();
+
+            // Modify existing rules in custom config
+            var rulesNode = fullConfigTemplateNode["routing"]?["rules"];
+            if (rulesNode != null)
+            {
+                foreach (var rule in rulesNode.AsArray())
+                {
+                    if (rule["outboundTag"]?.GetValue<string>() == Global.ProxyTag)
+                    {
+                        rule.AsObject().Remove("outboundTag");
+                        rule["balancerTag"] = balancer.tag;
+                    }
+                }
+            }
+
+            // Ensure routing node exists
+            if (fullConfigTemplateNode["routing"] == null)
+            {
+                fullConfigTemplateNode["routing"] = new JsonObject();
+            }
+
+            // Handle balancers - append instead of override
+            if (fullConfigTemplateNode["routing"]["balancers"] is JsonArray customBalancersNode)
+            {
+                if (JsonNode.Parse(JsonUtils.Serialize(v2rayConfig.routing.balancers)) is JsonArray newBalancers)
+                {
+                    foreach (var balancerNode in newBalancers)
+                    {
+                        customBalancersNode.Add(balancerNode?.DeepClone());
+                    }
+                }
+            }
+            else
+            {
+                fullConfigTemplateNode["routing"]["balancers"] = JsonNode.Parse(JsonUtils.Serialize(v2rayConfig.routing.balancers));
+            }
+        }
+
+        // Handle outbounds - append instead of override
+        var customOutboundsNode = fullConfigTemplateNode["outbounds"] is JsonArray outbounds ? outbounds : new JsonArray();
+        foreach (var outbound in v2rayConfig.outbounds)
+        {
+            if (outbound.protocol.ToLower() is "blackhole" or "dns" or "freedom")
+            {
+                if (fullConfigTemplate.AddProxyOnly == true)
+                {
+                    continue;
+                }
+            }
+            else if ((outbound.streamSettings?.sockopt?.dialerProxy.IsNullOrEmpty() == true) && (!fullConfigTemplate.ProxyDetour.IsNullOrEmpty()) && !(Utils.IsPrivateNetwork(outbound.settings?.servers?.FirstOrDefault()?.address ?? string.Empty) || Utils.IsPrivateNetwork(outbound.settings?.vnext?.FirstOrDefault()?.address ?? string.Empty)))
+            {
+                outbound.streamSettings ??= new StreamSettings4Ray();
+                outbound.streamSettings.sockopt ??= new Sockopt4Ray();
+                outbound.streamSettings.sockopt.dialerProxy = fullConfigTemplate.ProxyDetour;
+            }
+            customOutboundsNode.Add(JsonUtils.DeepCopy(outbound));
+        }
+
+        return await Task.FromResult(JsonUtils.Serialize(fullConfigTemplateNode));
+    }
+
     #endregion private gen function
 }
diff --git a/v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs b/v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs
new file mode 100644
index 00000000..3aa618bf
--- /dev/null
+++ b/v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs
@@ -0,0 +1,110 @@
+using System.Reactive;
+using DynamicData.Binding;
+using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
+
+namespace ServiceLib.ViewModels;
+public class FullConfigTemplateViewModel : MyReactiveObject
+{
+    #region Reactive
+    [Reactive]
+    public bool EnableFullConfigTemplate4Ray { get; set; }
+
+    [Reactive]
+    public bool EnableFullConfigTemplate4Singbox { get; set; }
+
+    [Reactive]
+    public string FullConfigTemplate4Ray { get; set; }
+
+    [Reactive]
+    public string FullConfigTemplate4Singbox { get; set; }
+
+    [Reactive]
+    public string FullTunConfigTemplate4Singbox { get; set; }
+
+    [Reactive]
+    public bool AddProxyOnly4Ray { get; set; }
+
+    [Reactive]
+    public bool AddProxyOnly4Singbox { get; set; }
+
+    [Reactive]
+    public string ProxyDetour4Ray { get; set; }
+
+    [Reactive]
+    public string ProxyDetour4Singbox { get; set; }
+
+    public ReactiveCommand<Unit, Unit> SaveCmd { get; }
+    #endregion Reactive
+
+    public FullConfigTemplateViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
+    {
+        _config = AppHandler.Instance.Config;
+        _updateView = updateView;
+        SaveCmd = ReactiveCommand.CreateFromTask(async () =>
+        {
+            await SaveSettingAsync();
+        });
+
+        _ = Init();
+    }
+    private async Task Init()
+    {
+        var item = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
+        EnableFullConfigTemplate4Ray = item?.Enabled ?? false;
+        FullConfigTemplate4Ray = item?.Config ?? string.Empty;
+        AddProxyOnly4Ray = item?.AddProxyOnly ?? false;
+        ProxyDetour4Ray = item?.ProxyDetour ?? string.Empty;
+
+        var item2 = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.sing_box);
+        EnableFullConfigTemplate4Singbox = item2?.Enabled ?? false;
+        FullConfigTemplate4Singbox = item2?.Config ?? string.Empty;
+        FullTunConfigTemplate4Singbox = item2?.TunConfig ?? string.Empty;
+        AddProxyOnly4Singbox = item2?.AddProxyOnly ?? false;
+        ProxyDetour4Singbox = item2?.ProxyDetour ?? string.Empty;
+    }
+
+    private async Task SaveSettingAsync()
+    {
+        if (!await SaveXrayConfigAsync())
+            return;
+
+        if (!await SaveSingboxConfigAsync())
+            return;
+
+        NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
+        _ = _updateView?.Invoke(EViewAction.CloseWindow, null);
+    }
+
+    private async Task<bool> SaveXrayConfigAsync()
+    {
+        var item = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
+        item.Enabled = EnableFullConfigTemplate4Ray;
+        item.Config = null;
+
+        item.Config = FullConfigTemplate4Ray;
+
+        item.AddProxyOnly = AddProxyOnly4Ray;
+        item.ProxyDetour = ProxyDetour4Ray;
+
+        await ConfigHandler.SaveFullConfigTemplate(_config, item);
+        return true;
+    }
+
+    private async Task<bool> SaveSingboxConfigAsync()
+    {
+        var item = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.sing_box);
+        item.Enabled = EnableFullConfigTemplate4Singbox;
+        item.Config = null;
+        item.TunConfig = null;
+
+        item.Config = FullConfigTemplate4Singbox;
+        item.TunConfig = FullTunConfigTemplate4Singbox;
+
+        item.AddProxyOnly = AddProxyOnly4Singbox;
+        item.ProxyDetour = ProxyDetour4Singbox;
+
+        await ConfigHandler.SaveFullConfigTemplate(_config, item);
+        return true;
+    }
+}
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index 36e20a87..8355996d 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -39,6 +39,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     public ReactiveCommand<Unit, Unit> RoutingSettingCmd { get; }
     public ReactiveCommand<Unit, Unit> DNSSettingCmd { get; }
+    public ReactiveCommand<Unit, Unit> FullConfigTemplateCmd { get; }
     public ReactiveCommand<Unit, Unit> GlobalHotkeySettingCmd { get; }
     public ReactiveCommand<Unit, Unit> RebootAsAdminCmd { get; }
     public ReactiveCommand<Unit, Unit> ClearServerStatisticsCmd { get; }
@@ -169,6 +170,10 @@ public class MainWindowViewModel : MyReactiveObject
         {
             await DNSSettingAsync();
         });
+        FullConfigTemplateCmd = ReactiveCommand.CreateFromTask(async () =>
+        {
+            await FullConfigTemplateAsync();
+        });
         GlobalHotkeySettingCmd = ReactiveCommand.CreateFromTask(async () =>
         {
             if (await _updateView?.Invoke(EViewAction.GlobalHotkeySettingWindow, null) == true)
@@ -220,6 +225,7 @@ public class MainWindowViewModel : MyReactiveObject
 
         await ConfigHandler.InitBuiltinRouting(_config);
         await ConfigHandler.InitBuiltinDNS(_config);
+        await ConfigHandler.InitBuiltinFullConfigTemplate(_config);
         await ProfileExHandler.Instance.Init();
         await CoreHandler.Instance.Init(_config, UpdateHandler);
         TaskHandler.Instance.RegUpdateTask(_config, UpdateTaskHandler);
@@ -508,6 +514,15 @@ public class MainWindowViewModel : MyReactiveObject
         }
     }
 
+    private async Task FullConfigTemplateAsync()
+    {
+        var ret = await _updateView?.Invoke(EViewAction.FullConfigTemplateWindow, null);
+        if (ret == true)
+        {
+            await Reload();
+        }
+    }
+
     public async Task RebootAsAdmin()
     {
         ProcUtils.RebootAsAdmin();
diff --git a/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml b/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml
new file mode 100644
index 00000000..bdeb1c93
--- /dev/null
+++ b/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml
@@ -0,0 +1,198 @@
+<Window
+    x:Class="v2rayN.Desktop.Views.FullConfigTemplateWindow"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
+    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
+    Title="{x:Static resx:ResUI.menuFullConfigTemplate}"
+    Width="900"
+    Height="600"
+    x:DataType="vms:FullConfigTemplateViewModel"
+    ShowInTaskbar="False"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <DockPanel Margin="{StaticResource Margin8}">
+        <StackPanel
+            Margin="{StaticResource Margin4}"
+            HorizontalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
+            <Button
+                x:Name="btnSave"
+                Width="100"
+                Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
+                IsDefault="True" />
+            <Button
+                x:Name="btnCancel"
+                Width="100"
+                Margin="{StaticResource MarginLr8}"
+                Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
+                IsCancel="True" />
+        </StackPanel>
+
+        <TabControl HorizontalContentAlignment="Stretch">
+            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbRayFullConfigTemplate}">
+                <DockPanel Margin="{StaticResource Margin4}">
+                    <Grid DockPanel.Dock="Top" RowDefinitions="Auto,Auto,Auto">
+
+                        <TextBlock
+                            Grid.Row="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbFullConfigTemplateDesc}"
+                            TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="1"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center">
+                            <HyperlinkButton Classes="WithIcon" Click="linkFullConfigTemplateDoc_Click">
+                                <TextBlock Text="{x:Static resx:ResUI.TbRayFullConfigTemplateDesc}" />
+                            </HyperlinkButton>
+                        </TextBlock>
+
+                        <StackPanel Grid.Row="2" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbFullConfigTemplateEnable}" />
+                            <ToggleSwitch
+                                x:Name="rayFullConfigTemplateEnable"
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+                    </Grid>
+
+                    <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbAddProxyProtocolOutboundOnly}" />
+                            <ToggleSwitch
+                                x:Name="togAddProxyProtocolOutboundOnly4Ray"
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbSetUpstreamProxyDetour}" />
+                            <TextBox
+                                x:Name="txtProxyDetour4Ray"
+                                Width="200"
+                                Margin="{StaticResource Margin4}" />
+                        </StackPanel>
+                    </WrapPanel>
+
+                    <HeaderedContentControl
+                        Margin="{StaticResource Margin4}"
+                        BorderBrush="Gray"
+                        BorderThickness="1"
+                        Header="xray config template json">
+                        <TextBox
+                            x:Name="rayFullConfigTemplate"
+                            VerticalAlignment="Stretch"
+                            Classes="TextArea"
+                            MinLines="10"
+                            TextWrapping="Wrap" />
+                    </HeaderedContentControl>
+                </DockPanel>
+            </TabItem>
+            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbSBFullConfigTemplate}">
+                <DockPanel Margin="{StaticResource Margin4}">
+                    <Grid DockPanel.Dock="Top" RowDefinitions="Auto,Auto,Auto">
+
+                        <TextBlock
+                            Grid.Row="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbFullConfigTemplateDesc}"
+                            TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="1"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center">
+                            <HyperlinkButton Classes="WithIcon" Click="linkFullConfigTemplateDoc_Click">
+                                <TextBlock Text="{x:Static resx:ResUI.TbSBFullConfigTemplateDesc}" />
+                            </HyperlinkButton>
+                        </TextBlock>
+
+                        <StackPanel Grid.Row="2" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbFullConfigTemplateEnable}" />
+                            <ToggleSwitch
+                                x:Name="sbFullConfigTemplateEnable"
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+                    </Grid>
+
+                    <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbAddProxyProtocolOutboundOnly}" />
+                            <ToggleSwitch
+                                x:Name="togAddProxyProtocolOutboundOnly4Singbox"
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbSetUpstreamProxyDetour}" />
+                            <TextBox
+                                x:Name="txtProxyDetour4Singbox"
+                                Width="200"
+                                Margin="{StaticResource Margin4}" />
+                        </StackPanel>
+                    </WrapPanel>
+
+                    <Grid Margin="{StaticResource Margin4}" ColumnDefinitions="*,10,*">
+
+                        <HeaderedContentControl
+                            Grid.Column="0"
+                            BorderBrush="Gray"
+                            BorderThickness="1"
+                            Header="sing-box config template json">
+                            <TextBox
+                                x:Name="sbFullConfigTemplate"
+                                VerticalAlignment="Stretch"
+                                Classes="TextArea"
+                                MinLines="10"
+                                TextWrapping="Wrap" />
+                        </HeaderedContentControl>
+
+                        <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
+
+                        <HeaderedContentControl
+                            Grid.Column="2"
+                            BorderBrush="Gray"
+                            BorderThickness="1"
+                            Header="sing-box tun config template json">
+                            <TextBox
+                                x:Name="sbFullTunConfigTemplate"
+                                VerticalAlignment="Stretch"
+                                Classes="TextArea"
+                                MinLines="10"
+                                TextWrapping="Wrap" />
+                        </HeaderedContentControl>
+                    </Grid>
+                </DockPanel>
+            </TabItem>
+        </TabControl>
+    </DockPanel>
+</Window>
diff --git a/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
new file mode 100644
index 00000000..502fef36
--- /dev/null
+++ b/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
@@ -0,0 +1,51 @@
+using System.Reactive.Disposables;
+using Avalonia.Interactivity;
+using ReactiveUI;
+using v2rayN.Desktop.Base;
+
+namespace v2rayN.Desktop.Views;
+
+public partial class FullConfigTemplateWindow : WindowBase<FullConfigTemplateViewModel>
+{
+    private static Config _config;
+
+    public FullConfigTemplateWindow()
+    {
+        InitializeComponent();
+
+        _config = AppHandler.Instance.Config;
+        btnCancel.Click += (s, e) => this.Close();
+        ViewModel = new FullConfigTemplateViewModel(UpdateViewHandler);
+
+        this.WhenActivated(disposables =>
+        {
+            this.Bind(ViewModel, vm => vm.EnableFullConfigTemplate4Ray, v => v.rayFullConfigTemplateEnable.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.FullConfigTemplate4Ray, v => v.rayFullConfigTemplate.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.AddProxyOnly4Ray, v => v.togAddProxyProtocolOutboundOnly4Ray.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.ProxyDetour4Ray, v => v.txtProxyDetour4Ray.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.EnableFullConfigTemplate4Singbox, v => v.sbFullConfigTemplateEnable.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.FullConfigTemplate4Singbox, v => v.sbFullConfigTemplate.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.FullTunConfigTemplate4Singbox, v => v.sbFullTunConfigTemplate.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.AddProxyOnly4Singbox, v => v.togAddProxyProtocolOutboundOnly4Singbox.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.ProxyDetour4Singbox, v => v.txtProxyDetour4Singbox.Text).DisposeWith(disposables);
+
+            this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
+        });
+    }
+
+    private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
+    {
+        switch (action)
+        {
+            case EViewAction.CloseWindow:
+                this.Close(true);
+                break;
+        }
+        return await Task.FromResult(true);
+    }
+
+    private void linkFullConfigTemplateDoc_Click(object sender, RoutedEventArgs e)
+    {
+        ProcUtils.ProcessStart("https://github.com/2dust/v2rayN/wiki/Description-of-some-ui#%E5%AE%8C%E6%95%B4%E9%85%8D%E7%BD%AE%E6%A8%A1%E6%9D%BF%E8%AE%BE%E7%BD%AE");
+    }
+}
diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
index af4ae529..91476dd7 100644
--- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
@@ -72,6 +72,7 @@
                         <MenuItem x:Name="menuOptionSetting" Header="{x:Static resx:ResUI.menuOptionSetting}" />
                         <MenuItem x:Name="menuRoutingSetting" Header="{x:Static resx:ResUI.menuRoutingSetting}" />
                         <MenuItem x:Name="menuDNSSetting" Header="{x:Static resx:ResUI.menuDNSSetting}" />
+                        <MenuItem x:Name="menuFullConfigTemplate" Header="{x:Static resx:ResUI.menuFullConfigTemplate}" />
                         <MenuItem x:Name="menuGlobalHotkeySetting" Header="{x:Static resx:ResUI.menuGlobalHotkeySetting}" />
                         <Separator />
                         <MenuItem x:Name="menuRebootAsAdmin" Header="{x:Static resx:ResUI.menuRebootAsAdmin}" />
diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
index 2584310b..581e0a35 100644
--- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
@@ -100,6 +100,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
             this.BindCommand(ViewModel, vm => vm.OptionSettingCmd, v => v.menuOptionSetting).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.RoutingSettingCmd, v => v.menuRoutingSetting).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.DNSSettingCmd, v => v.menuDNSSetting).DisposeWith(disposables);
+            this.BindCommand(ViewModel, vm => vm.FullConfigTemplateCmd, v => v.menuFullConfigTemplate).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.GlobalHotkeySettingCmd, v => v.menuGlobalHotkeySetting).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.RebootAsAdminCmd, v => v.menuRebootAsAdmin).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.ClearServerStatisticsCmd, v => v.menuClearServerStatistics).DisposeWith(disposables);
@@ -190,6 +191,9 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
             case EViewAction.DNSSettingWindow:
                 return await new DNSSettingWindow().ShowDialog<bool>(this);
 
+            case EViewAction.FullConfigTemplateWindow:
+                return await new FullConfigTemplateWindow().ShowDialog<bool>(this);
+
             case EViewAction.RoutingSettingWindow:
                 return await new RoutingSettingWindow().ShowDialog<bool>(this);
 
diff --git a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
index e488c63a..8c274a69 100644
--- a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
+++ b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
@@ -39,6 +39,9 @@
 		<EmbeddedResource Include="Assets\v2rayN.ico">
 			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
 		</EmbeddedResource>
+		<Compile Update="Views\FullConfigTemplateWindow.axaml.cs">
+		  <DependentUpon>FullConfigTemplateWindow.axaml</DependentUpon>
+		</Compile>
 		<None Update="v2rayN.png">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
diff --git a/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml b/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml
new file mode 100644
index 00000000..5a62cc11
--- /dev/null
+++ b/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml
@@ -0,0 +1,227 @@
+<base:WindowBase
+    x:Class="v2rayN.Views.FullConfigTemplateWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:base="clr-namespace:v2rayN.Base"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
+    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
+    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
+    Title="{x:Static resx:ResUI.menuFullConfigTemplate}"
+    Width="1000"
+    Height="700"
+    x:TypeArguments="vms:FullConfigTemplateViewModel"
+    ShowInTaskbar="False"
+    Style="{StaticResource WindowGlobal}"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <DockPanel Margin="{StaticResource Margin8}">
+        <StackPanel
+            Margin="{StaticResource Margin4}"
+            HorizontalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
+            <Button
+                x:Name="btnSave"
+                Width="100"
+                Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
+                IsDefault="True"
+                Style="{StaticResource DefButton}" />
+            <Button
+                x:Name="btnCancel"
+                Width="100"
+                Margin="{StaticResource MarginLeftRight8}"
+                Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
+                IsCancel="true"
+                Style="{StaticResource DefButton}" />
+        </StackPanel>
+
+        <TabControl HorizontalContentAlignment="Left">
+            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbRayFullConfigTemplate}">
+                <DockPanel Margin="{StaticResource Margin8}">
+                    <Grid DockPanel.Dock="Top">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <TextBlock
+                            Grid.Row="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbFullConfigTemplateDesc}"
+                            TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="1"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}">
+                            <Hyperlink Click="linkFullConfigTemplateDoc_Click">
+                                <TextBlock Text="{x:Static resx:ResUI.TbRayFullConfigTemplateDesc}" />
+                                <materialDesign:PackIcon Kind="Link" />
+                            </Hyperlink>
+                        </TextBlock>
+
+                        <StackPanel Grid.Row="2" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}"
+                                Text="{x:Static resx:ResUI.TbFullConfigTemplateEnable}" />
+                            <ToggleButton
+                                x:Name="rayFullConfigTemplateEnable"
+                                Margin="{StaticResource Margin8}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+                    </Grid>
+
+                    <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}"
+                                Text="{x:Static resx:ResUI.TbAddProxyProtocolOutboundOnly}" />
+                            <ToggleButton
+                                x:Name="togAddProxyProtocolOutboundOnly4Ray"
+                                Margin="{StaticResource Margin8}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}"
+                                Text="{x:Static resx:ResUI.TbSetUpstreamProxyDetour}" />
+                            <TextBox
+                                x:Name="txtProxyDetour4Ray"
+                                Width="200"
+                                Margin="{StaticResource Margin8}"
+                                Style="{StaticResource DefTextBox}" />
+                        </StackPanel>
+                    </WrapPanel>
+
+                    <TextBox
+                        x:Name="rayFullConfigTemplate"
+                        Margin="{StaticResource Margin8}"
+                        VerticalAlignment="Stretch"
+                        materialDesign:HintAssist.Hint="xray config template json"
+                        AcceptsReturn="True"
+                        BorderThickness="1"
+                        Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                        TextWrapping="Wrap"
+                        VerticalScrollBarVisibility="Auto" />
+                </DockPanel>
+            </TabItem>
+            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbSBFullConfigTemplate}">
+                <DockPanel Margin="{StaticResource Margin8}">
+                    <Grid DockPanel.Dock="Top">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <TextBlock
+                            Grid.Row="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbFullConfigTemplateDesc}"
+                            TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="1"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}">
+                            <Hyperlink Click="linkFullConfigTemplateDoc_Click">
+                                <TextBlock Text="{x:Static resx:ResUI.TbSBFullConfigTemplateDesc}" />
+                                <materialDesign:PackIcon Kind="Link" />
+                            </Hyperlink>
+                        </TextBlock>
+
+                        <StackPanel Grid.Row="2" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}"
+                                Text="{x:Static resx:ResUI.TbFullConfigTemplateEnable}" />
+                            <ToggleButton
+                                x:Name="sbFullConfigTemplateEnable"
+                                Margin="{StaticResource Margin8}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+                    </Grid>
+
+                    <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}"
+                                Text="{x:Static resx:ResUI.TbAddProxyProtocolOutboundOnly}" />
+                            <ToggleButton
+                                x:Name="togAddProxyProtocolOutboundOnly4Singbox"
+                                Margin="{StaticResource Margin8}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}"
+                                Text="{x:Static resx:ResUI.TbSetUpstreamProxyDetour}" />
+                            <TextBox
+                                x:Name="txtProxyDetour4Singbox"
+                                Width="200"
+                                Margin="{StaticResource Margin8}"
+                                Style="{StaticResource DefTextBox}" />
+                        </StackPanel>
+                    </WrapPanel>
+
+                    <Grid Margin="{StaticResource Margin8}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*" />
+                            <ColumnDefinition Width="10" />
+                            <ColumnDefinition Width="1*" />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBox
+                            x:Name="sbFullConfigTemplate"
+                            Grid.Column="0"
+                            VerticalAlignment="Stretch"
+                            materialDesign:HintAssist.Hint="sing-box config template json"
+                            AcceptsReturn="True"
+                            BorderThickness="1"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                            TextWrapping="Wrap"
+                            VerticalScrollBarVisibility="Auto" />
+
+                        <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
+
+                        <TextBox
+                            x:Name="sbFullTunConfigTemplate"
+                            Grid.Column="2"
+                            VerticalAlignment="Stretch"
+                            materialDesign:HintAssist.Hint="sing-box tun config template json"
+                            AcceptsReturn="True"
+                            BorderThickness="1"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                            TextWrapping="Wrap"
+                            VerticalScrollBarVisibility="Auto" />
+                    </Grid>
+                </DockPanel>
+            </TabItem>
+        </TabControl>
+    </DockPanel>
+</base:WindowBase>
diff --git a/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs b/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs
new file mode 100644
index 00000000..3e38bf12
--- /dev/null
+++ b/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs
@@ -0,0 +1,52 @@
+using System.Reactive.Disposables;
+using System.Windows;
+using ReactiveUI;
+
+namespace v2rayN.Views;
+
+public partial class FullConfigTemplateWindow
+{
+    private static Config _config;
+
+    public FullConfigTemplateWindow()
+    {
+        InitializeComponent();
+
+        this.Owner = Application.Current.MainWindow;
+        _config = AppHandler.Instance.Config;
+
+        ViewModel = new FullConfigTemplateViewModel(UpdateViewHandler);
+
+        this.WhenActivated(disposables =>
+        {
+            this.Bind(ViewModel, vm => vm.EnableFullConfigTemplate4Ray, v => v.rayFullConfigTemplateEnable.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.FullConfigTemplate4Ray, v => v.rayFullConfigTemplate.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.AddProxyOnly4Ray, v => v.togAddProxyProtocolOutboundOnly4Ray.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.ProxyDetour4Ray, v => v.txtProxyDetour4Ray.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.EnableFullConfigTemplate4Singbox, v => v.sbFullConfigTemplateEnable.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.FullConfigTemplate4Singbox, v => v.sbFullConfigTemplate.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.FullTunConfigTemplate4Singbox, v => v.sbFullTunConfigTemplate.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.AddProxyOnly4Singbox, v => v.togAddProxyProtocolOutboundOnly4Singbox.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.ProxyDetour4Singbox, v => v.txtProxyDetour4Singbox.Text).DisposeWith(disposables);
+
+            this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
+        });
+        WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
+    }
+
+    private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
+    {
+        switch (action)
+        {
+            case EViewAction.CloseWindow:
+                this.DialogResult = true;
+                break;
+        }
+        return await Task.FromResult(true);
+    }
+
+    private void linkFullConfigTemplateDoc_Click(object sender, RoutedEventArgs e)
+    {
+        ProcUtils.ProcessStart("https://github.com/2dust/v2rayN/wiki/Description-of-some-ui#%E5%AE%8C%E6%95%B4%E9%85%8D%E7%BD%AE%E6%A8%A1%E6%9D%BF%E8%AE%BE%E7%BD%AE");
+    }
+}
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index 0b8c30b3..14fe809a 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -173,6 +173,10 @@
                                     x:Name="menuDNSSetting"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuDNSSetting}" />
+                                <MenuItem
+                                    x:Name="menuFullConfigTemplate"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuFullConfigTemplate}" />
                                 <MenuItem
                                     x:Name="menuGlobalHotkeySetting"
                                     Height="{StaticResource MenuItemHeight}"
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index 08bdd90b..99f3fc03 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -97,6 +97,7 @@ public partial class MainWindow
             this.BindCommand(ViewModel, vm => vm.OptionSettingCmd, v => v.menuOptionSetting).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.RoutingSettingCmd, v => v.menuRoutingSetting).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.DNSSettingCmd, v => v.menuDNSSetting).DisposeWith(disposables);
+            this.BindCommand(ViewModel, vm => vm.FullConfigTemplateCmd, v => v.menuFullConfigTemplate).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.GlobalHotkeySettingCmd, v => v.menuGlobalHotkeySetting).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.RebootAsAdminCmd, v => v.menuRebootAsAdmin).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.ClearServerStatisticsCmd, v => v.menuClearServerStatistics).DisposeWith(disposables);
@@ -186,6 +187,9 @@ public partial class MainWindow
             case EViewAction.OptionSettingWindow:
                 return (new OptionSettingWindow().ShowDialog() ?? false);
 
+            case EViewAction.FullConfigTemplateWindow:
+                return (new FullConfigTemplateWindow().ShowDialog() ?? false);
+
             case EViewAction.GlobalHotkeySettingWindow:
                 return (new GlobalHotkeySettingWindow().ShowDialog() ?? false);
 

From 6a9408fe9bd1cb3e056fc7ab5ea58383b6b24127 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Mon, 11 Aug 2025 20:46:35 +0800
Subject: [PATCH 032/115] Fixes sing-box system hosts and ui (#7733)

---
 v2rayN/ServiceLib/Resx/ResUI.Designer.cs       | 18 +++++++++---------
 v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx        |  6 +++---
 v2rayN/ServiceLib/Resx/ResUI.hu.resx           |  6 +++---
 v2rayN/ServiceLib/Resx/ResUI.resx              |  6 +++---
 v2rayN/ServiceLib/Resx/ResUI.ru.resx           |  6 +++---
 v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx      |  6 +++---
 v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx      |  6 +++---
 .../CoreConfig/CoreConfigSingboxService.cs     | 16 ++++++++++++++++
 .../Views/DNSSettingWindow.axaml               | 18 ++++++++++++------
 v2rayN/v2rayN/Views/DNSSettingWindow.xaml      | 15 ++++++++++-----
 10 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index 7a30e075..2adb4f8d 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -2337,6 +2337,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Prevent domain-based routing rules from failing 的本地化字符串。
+        /// </summary>
+        public static string TbBlockSVCBHTTPSQueriesTips {
+            get {
+                return ResourceManager.GetString("TbBlockSVCBHTTPSQueriesTips", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Browse 的本地化字符串。
         /// </summary>
@@ -2733,15 +2742,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Prevent DNS Leaks 的本地化字符串。
-        /// </summary>
-        public static string TbPreventDNSLeaks {
-            get {
-                return ResourceManager.GetString("TbPreventDNSLeaks", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Private Key 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
index 82520c5f..d35c8d20 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1443,9 +1443,6 @@
   <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
     <value>Block SVCB and HTTPS Queries</value>
   </data>
-  <data name="TbPreventDNSLeaks" xml:space="preserve">
-    <value>Prevent DNS Leaks</value>
-  </data>
   <data name="TbDNSHostsConfig" xml:space="preserve">
     <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
   </data>
@@ -1470,6 +1467,9 @@
   <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
     <value>Custom DNS Enabled, This Page's Settings Invalid</value>
   </data>
+  <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
+    <value>Prevent domain-based routing rules from failing</value>
+  </data>
   <data name="FillCorrectConfigTemplateText" xml:space="preserve">
     <value>Please fill in the correct config template</value>
   </data>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
index 7ee68495..4bc19006 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1443,9 +1443,6 @@
   <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
     <value>Block SVCB and HTTPS Queries</value>
   </data>
-  <data name="TbPreventDNSLeaks" xml:space="preserve">
-    <value>Prevent DNS Leaks</value>
-  </data>
   <data name="TbDNSHostsConfig" xml:space="preserve">
     <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
   </data>
@@ -1470,6 +1467,9 @@
   <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
     <value>Custom DNS Enabled, This Page's Settings Invalid</value>
   </data>
+  <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
+    <value>Prevent domain-based routing rules from failing</value>
+  </data>
   <data name="FillCorrectConfigTemplateText" xml:space="preserve">
     <value>Please fill in the correct config template</value>
   </data>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index 44343dee..4cf1b91a 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1443,9 +1443,6 @@
   <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
     <value>Block SVCB and HTTPS Queries</value>
   </data>
-  <data name="TbPreventDNSLeaks" xml:space="preserve">
-    <value>Prevent DNS Leaks</value>
-  </data>
   <data name="TbDNSHostsConfig" xml:space="preserve">
     <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
   </data>
@@ -1470,6 +1467,9 @@
   <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
     <value>Custom DNS Enabled, This Page's Settings Invalid</value>
   </data>
+  <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
+    <value>Prevent domain-based routing rules from failing</value>
+  </data>
   <data name="FillCorrectConfigTemplateText" xml:space="preserve">
     <value>Please fill in the correct config template</value>
   </data>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
index e9ab6efe..fd53b826 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1443,9 +1443,6 @@
   <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
     <value>Block SVCB and HTTPS Queries</value>
   </data>
-  <data name="TbPreventDNSLeaks" xml:space="preserve">
-    <value>Prevent DNS Leaks</value>
-  </data>
   <data name="TbDNSHostsConfig" xml:space="preserve">
     <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
   </data>
@@ -1470,6 +1467,9 @@
   <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
     <value>Custom DNS Enabled, This Page's Settings Invalid</value>
   </data>
+  <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
+    <value>Prevent domain-based routing rules from failing</value>
+  </data>
   <data name="FillCorrectConfigTemplateText" xml:space="preserve">
     <value>Please fill in the correct config template</value>
   </data>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index 95a427c3..a2506ed8 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1440,9 +1440,6 @@
   <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
     <value>阻止 SVCB 和 HTTPS 查询</value>
   </data>
-  <data name="TbPreventDNSLeaks" xml:space="preserve">
-    <value>避免 DNS 泄漏</value>
-  </data>
   <data name="TbDNSHostsConfig" xml:space="preserve">
     <value>DNS Hosts：（“域名1 ip1 ip2” 一行一个）</value>
   </data>
@@ -1467,6 +1464,9 @@
   <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
     <value>自定义 DNS 已启用，此页面配置将无效</value>
   </data>
+  <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
+    <value>避免域名分流规则失效</value>
+  </data>
   <data name="FillCorrectConfigTemplateText" xml:space="preserve">
     <value>请填写正确的配置模板</value>
   </data>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index f35c5faa..3d16e5b5 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1440,9 +1440,6 @@
   <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
     <value>Block SVCB and HTTPS Queries</value>
   </data>
-  <data name="TbPreventDNSLeaks" xml:space="preserve">
-    <value>Prevent DNS Leaks</value>
-  </data>
   <data name="TbDNSHostsConfig" xml:space="preserve">
     <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
   </data>
@@ -1467,6 +1464,9 @@
   <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
     <value>Custom DNS Enabled, This Page's Settings Invalid</value>
   </data>
+  <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
+    <value>Prevent domain-based routing rules from failing</value>
+  </data>
   <data name="FillCorrectConfigTemplateText" xml:space="preserve">
     <value>Please fill in the correct config template</value>
   </data>
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index 6563e991..19f0af35 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -1690,6 +1690,22 @@ public class CoreConfigSingboxService
             }
         }
 
+        if (simpleDNSItem.UseSystemHosts == true)
+        {
+            var systemHosts = Utils.GetSystemHosts();
+            if (systemHosts.Count > 0)
+            {
+                foreach (var host in systemHosts)
+                {
+                    if (userHostsMap[host.Key] != null)
+                    {
+                        continue;
+                    }
+                    userHostsMap[host.Key] = new List<string> { host.Value };
+                }
+            }
+        }
+
         foreach (var host in hostsDns.predefined)
         {
             if (finalDns.server == host.Key)
diff --git a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
index 9ec377ff..afb3dd97 100644
--- a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
@@ -97,7 +97,8 @@
                             Grid.Column="2"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
-                            Text="{x:Static resx:ResUI.TbSBOutboundDomainResolve}" />
+                            Text="{x:Static resx:ResUI.TbSBOutboundDomainResolve}"
+                            TextWrapping="Wrap" />
 
                         <TextBlock
                             Grid.Row="4"
@@ -117,7 +118,8 @@
                             Grid.Column="2"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
-                            Text="{x:Static resx:ResUI.TbSBFallbackDNSResolve}" />
+                            Text="{x:Static resx:ResUI.TbSBFallbackDNSResolve}"
+                            TextWrapping="Wrap" />
 
                         <TextBlock
                             Grid.Row="5"
@@ -178,7 +180,8 @@
                             Grid.Column="2"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
-                            Text="{x:Static resx:ResUI.TbSBDoHOverride}" />
+                            Text="{x:Static resx:ResUI.TbSBDoHOverride}"
+                            TextWrapping="Wrap" />
                     </Grid>
                 </ScrollViewer>
             </TabItem>
@@ -228,7 +231,8 @@
                             Grid.Column="2"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
-                            Text="{x:Static resx:ResUI.TbApplyProxyDomainsOnly}" />
+                            Text="{x:Static resx:ResUI.TbApplyProxyDomainsOnly}"
+                            TextWrapping="Wrap" />
 
                         <TextBlock
                             Grid.Row="3"
@@ -247,7 +251,8 @@
                             Grid.Column="2"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
-                            Text="{x:Static resx:ResUI.TbPreventDNSLeaks}" />
+                            Text="{x:Static resx:ResUI.TbBlockSVCBHTTPSQueriesTips}"
+                            TextWrapping="Wrap" />
 
                         <TextBlock
                             Grid.Row="4"
@@ -267,7 +272,8 @@
                             Grid.Column="2"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
-                            Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPsDesc}" />
+                            Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPsDesc}"
+                            TextWrapping="Wrap" />
 
                         <TextBlock
                             Grid.Row="5"
diff --git a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
index c90c019f..b3d2e0fd 100644
--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
@@ -124,7 +124,8 @@
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbSBOutboundDomainResolve}" />
+                            Text="{x:Static resx:ResUI.TbSBOutboundDomainResolve}"
+                            TextWrapping="Wrap" />
 
                         <TextBlock
                             Grid.Row="4"
@@ -147,7 +148,8 @@
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbSBFallbackDNSResolve}" />
+                            Text="{x:Static resx:ResUI.TbSBFallbackDNSResolve}"
+                            TextWrapping="Wrap" />
 
                         <TextBlock
                             Grid.Row="5"
@@ -281,7 +283,8 @@
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbApplyProxyDomainsOnly}" />
+                            Text="{x:Static resx:ResUI.TbApplyProxyDomainsOnly}"
+                            TextWrapping="Wrap" />
 
                         <TextBlock
                             Grid.Row="3"
@@ -302,7 +305,8 @@
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbPreventDNSLeaks}" />
+                            Text="{x:Static resx:ResUI.TbBlockSVCBHTTPSQueriesTips}"
+                            TextWrapping="Wrap" />
 
                         <TextBlock
                             Grid.Row="4"
@@ -325,7 +329,8 @@
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPsDesc}" />
+                            Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPsDesc}"
+                            TextWrapping="Wrap" />
 
                         <TextBlock
                             Grid.Row="5"

From 8314ff3271c2e7a49079c7578950e8f817bc334f Mon Sep 17 00:00:00 2001
From: Summpot <summpot@outlook.com>
Date: Tue, 12 Aug 2025 19:18:26 +0800
Subject: [PATCH 033/115] Add Auto Route option to Tun mode settings (#7737)

Introduces a new 'Auto Route' option for Tun mode in the configuration, view models, and UI. Updates both Avalonia and WPF option setting windows to allow users to enable or disable automatic routing for Tun mode. Also ensures the new setting is properly bound and saved in the configuration.
---
 v2rayN/ServiceLib/Models/ConfigItems.cs       |  1 +
 .../CoreConfig/CoreConfigSingboxService.cs    |  1 +
 .../ViewModels/OptionSettingViewModel.cs      |  3 ++
 .../Views/OptionSettingWindow.axaml           | 33 ++++++++++++------
 .../Views/OptionSettingWindow.axaml.cs        |  1 +
 v2rayN/v2rayN/Views/OptionSettingWindow.xaml  | 34 ++++++++++++++-----
 .../v2rayN/Views/OptionSettingWindow.xaml.cs  |  1 +
 7 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/v2rayN/ServiceLib/Models/ConfigItems.cs b/v2rayN/ServiceLib/Models/ConfigItems.cs
index 998b49f1..1c3a57c3 100644
--- a/v2rayN/ServiceLib/Models/ConfigItems.cs
+++ b/v2rayN/ServiceLib/Models/ConfigItems.cs
@@ -142,6 +142,7 @@ public class CoreTypeItem
 public class TunModeItem
 {
     public bool EnableTun { get; set; }
+    public bool AutoRoute { get; set; } = true;
     public bool StrictRoute { get; set; } = true;
     public string Stack { get; set; }
     public int Mtu { get; set; }
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index 19f0af35..4b315c39 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -628,6 +628,7 @@ public class CoreConfigSingboxService
                 var tunInbound = JsonUtils.Deserialize<Inbound4Sbox>(EmbedUtils.GetEmbedText(Global.TunSingboxInboundFileName)) ?? new Inbound4Sbox { };
                 tunInbound.interface_name = Utils.IsOSX() ? $"utun{new Random().Next(99)}" : "singbox_tun";
                 tunInbound.mtu = _config.TunModeItem.Mtu;
+                tunInbound.auto_route = _config.TunModeItem.AutoRoute;
                 tunInbound.strict_route = _config.TunModeItem.StrictRoute;
                 tunInbound.stack = _config.TunModeItem.Stack;
                 if (_config.TunModeItem.EnableIPv6Address == false)
diff --git a/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs b/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
index 57d8cac7..b45eb30c 100644
--- a/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
@@ -84,6 +84,7 @@ public class OptionSettingViewModel : MyReactiveObject
 
     #region Tun mode
 
+    [Reactive] public bool TunAutoRoute { get; set; }
     [Reactive] public bool TunStrictRoute { get; set; }
     [Reactive] public string TunStack { get; set; }
     [Reactive] public int TunMtu { get; set; }
@@ -201,6 +202,7 @@ public class OptionSettingViewModel : MyReactiveObject
 
         #region Tun mode
 
+        TunAutoRoute = _config.TunModeItem.AutoRoute;
         TunStrictRoute = _config.TunModeItem.StrictRoute;
         TunStack = _config.TunModeItem.Stack;
         TunMtu = _config.TunModeItem.Mtu;
@@ -354,6 +356,7 @@ public class OptionSettingViewModel : MyReactiveObject
         _config.SystemProxyItem.SystemProxyAdvancedProtocol = systemProxyAdvancedProtocol;
 
         //tun mode
+        _config.TunModeItem.AutoRoute = TunAutoRoute;
         _config.TunModeItem.StrictRoute = TunStrictRoute;
         _config.TunModeItem.Stack = TunStack;
         _config.TunModeItem.Mtu = TunMtu;
diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
index a75ed6fc..ba174a62 100644
--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
@@ -729,71 +729,84 @@
                     Margin="{StaticResource Margin4}"
                     ColumnDefinitions="Auto,Auto,Auto"
                     DockPanel.Dock="Top"
-                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
                         Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
+                        Text="Auto Route" />
+                    <ToggleSwitch
+                        x:Name="togAutoRoute"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
+
+                    <TextBlock
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
                         Text="Strict Route" />
                     <ToggleSwitch
                         x:Name="togStrictRoute"
-                        Grid.Row="2"
+                        Grid.Row="3"
                         Grid.Column="1"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
 
                     <TextBlock
-                        Grid.Row="3"
+                        Grid.Row="4"
                         Grid.Column="0"
                         Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Text="Stack" />
                     <ComboBox
                         x:Name="cmbStack"
-                        Grid.Row="3"
+                        Grid.Row="4"
                         Grid.Column="1"
                         Width="200"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
 
                     <TextBlock
-                        Grid.Row="4"
+                        Grid.Row="5"
                         Grid.Column="0"
                         Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Text="Mtu" />
                     <ComboBox
                         x:Name="cmbMtu"
-                        Grid.Row="4"
+                        Grid.Row="5"
                         Grid.Column="1"
                         Width="200"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
 
                     <TextBlock
-                        Grid.Row="5"
+                        Grid.Row="6"
                         Grid.Column="0"
                         Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Text="{x:Static resx:ResUI.TbSettingsEnableExInbound}" />
                     <ToggleSwitch
                         x:Name="togEnableExInbound"
-                        Grid.Row="5"
+                        Grid.Row="6"
                         Grid.Column="1"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
 
                     <TextBlock
-                        Grid.Row="6"
+                        Grid.Row="7"
                         Grid.Column="0"
                         Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Text="{x:Static resx:ResUI.TbSettingsEnableIPv6Address}" />
                     <ToggleSwitch
                         x:Name="togEnableIPv6Address"
-                        Grid.Row="6"
+                        Grid.Row="7"
                         Grid.Column="1"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
index 010488e5..a7529369 100644
--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
@@ -105,6 +105,7 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
             this.Bind(ViewModel, vm => vm.systemProxyAdvancedProtocol, v => v.cmbsystemProxyAdvancedProtocol.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.systemProxyExceptions, v => v.txtsystemProxyExceptions.Text).DisposeWith(disposables);
 
+            this.Bind(ViewModel, vm => vm.TunAutoRoute, v => v.togAutoRoute.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunStrictRoute, v => v.togStrictRoute.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunStack, v => v.cmbStack.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunMtu, v => v.cmbMtu.SelectedValue).DisposeWith(disposables);
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
index 890352fc..bdd47f1c 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -1023,6 +1023,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
@@ -1036,9 +1037,9 @@
                         Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
-                        Text="Strict Route" />
+                        Text="Auto Route" />
                     <ToggleButton
-                        x:Name="togStrictRoute"
+                        x:Name="togAutoRoute"
                         Grid.Row="2"
                         Grid.Column="1"
                         Margin="{StaticResource Margin8}"
@@ -1050,10 +1051,24 @@
                         Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
+                        Text="Strict Route" />
+                    <ToggleButton
+                        x:Name="togStrictRoute"
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Margin="{StaticResource Margin8}"
+                        HorizontalAlignment="Left" />
+
+                    <TextBlock
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin8}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
                         Text="Stack" />
                     <ComboBox
                         x:Name="cmbStack"
-                        Grid.Row="3"
+                        Grid.Row="4"
                         Grid.Column="1"
                         Width="200"
                         Margin="{StaticResource Margin8}"
@@ -1061,7 +1076,7 @@
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
-                        Grid.Row="4"
+                        Grid.Row="5"
                         Grid.Column="0"
                         Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
@@ -1069,7 +1084,7 @@
                         Text="Mtu" />
                     <ComboBox
                         x:Name="cmbMtu"
-                        Grid.Row="4"
+                        Grid.Row="5"
                         Grid.Column="1"
                         Width="200"
                         Margin="{StaticResource Margin8}"
@@ -1077,7 +1092,7 @@
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
-                        Grid.Row="5"
+                        Grid.Row="6"
                         Grid.Column="0"
                         Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
@@ -1085,13 +1100,13 @@
                         Text="{x:Static resx:ResUI.TbSettingsEnableExInbound}" />
                     <ToggleButton
                         x:Name="togEnableExInbound"
-                        Grid.Row="5"
+                        Grid.Row="6"
                         Grid.Column="1"
                         Margin="{StaticResource Margin8}"
                         HorizontalAlignment="Left" />
 
                     <TextBlock
-                        Grid.Row="6"
+                        Grid.Row="7"
                         Grid.Column="0"
                         Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
@@ -1099,7 +1114,7 @@
                         Text="{x:Static resx:ResUI.TbSettingsEnableIPv6Address}" />
                     <ToggleButton
                         x:Name="togEnableIPv6Address"
-                        Grid.Row="6"
+                        Grid.Row="7"
                         Grid.Column="1"
                         Margin="{StaticResource Margin8}"
                         HorizontalAlignment="Left" />
@@ -1231,3 +1246,4 @@
         </TabControl>
     </DockPanel>
 </base:WindowBase>
+
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
index c790e25d..dea7302b 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
@@ -117,6 +117,7 @@ public partial class OptionSettingWindow
             this.Bind(ViewModel, vm => vm.systemProxyAdvancedProtocol, v => v.cmbsystemProxyAdvancedProtocol.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.systemProxyExceptions, v => v.txtsystemProxyExceptions.Text).DisposeWith(disposables);
 
+            this.Bind(ViewModel, vm => vm.TunAutoRoute, v => v.togAutoRoute.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunStrictRoute, v => v.togStrictRoute.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunStack, v => v.cmbStack.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunMtu, v => v.cmbMtu.Text).DisposeWith(disposables);

From a2028623e7dfd277f10ddd806a60c529a45cc701 Mon Sep 17 00:00:00 2001
From: Miheichev Aleksandr Sergeevich <ya.saska20@gmail.com>
Date: Tue, 12 Aug 2025 14:28:40 +0300
Subject: [PATCH 034/115] refactor: improve Russian localization, fix
 placeholders and typos (#7740)

Co-authored-by: Aleksandr Miheichev <alexandr.gmail@tuta.com>
---
 v2rayN/ServiceLib/Resx/ResUI.ru.resx | 130 +++++++++++++--------------
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
index fd53b826..97c04c81 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -1099,13 +1099,13 @@
     <value>Отмена тестирования...</value>
   </data>
   <data name="TransportRequestHostTip5" xml:space="preserve">
-    <value>*gRPC Authority</value>
+    <value>* gRPC Authority (HTTP/2 псевдозаголовок :authority)</value>
   </data>
   <data name="menuAddHttpServer" xml:space="preserve">
     <value>Добавить сервер [HTTP]</value>
   </data>
   <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
-    <value>which conflicts with the group previous proxy</value>
+    <value>что конфликтует с предыдущим прокси группы</value>
   </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>Включить фрагментацию (Fragment)</value>
@@ -1318,13 +1318,13 @@
     <value>Пароль sudo системы</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
-    <value>The password will be validated via the command line. If a validation error causes the application to malfunction, please restart the application. The password will not be stored and must be entered again after each restart.</value>
+    <value>Пароль sudo будет проверен в терминале. Если из-за ошибки проверки приложение начнёт работать некорректно, перезапустите его. Пароль не сохраняется — его нужно вводить после каждого перезапуска.</value>
   </data>
   <data name="TransportHeaderTypeTip5" xml:space="preserve">
     <value>*XHTTP-режим</value>
   </data>
   <data name="TransportExtraTip" xml:space="preserve">
-    <value>Дополнительный XHTTP сырой JSON, формат: { XHTTPObject }</value>
+    <value>Дополнительный „сырой“ JSON для XHTTP, формат: { XHTTP Object }</value>
   </data>
   <data name="TbSettingsHide2TrayWhenClose" xml:space="preserve">
     <value>Скрыть в трее при закрытии окна</value>
@@ -1393,10 +1393,10 @@
     <value>URL для тестирования текущего соединения</value>
   </data>
   <data name="TbRuleOutboundTagTip" xml:space="preserve">
-    <value>Can fill in the configuration remarks, please make sure it exist and are unique</value>
+    <value>Можно указать название (Remarks) из конфигурации, убедитесь, что оно существует и уникально</value>
   </data>
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
-    <value>Incorrect password, please try again.</value>
+    <value>Неверный пароль, попробуйте ещё раз.</value>
   </data>
   <data name="TbMldsa65Verify" xml:space="preserve">
     <value>Mldsa65Verify</value>
@@ -1405,99 +1405,99 @@
     <value>Добавить сервер [Anytls]</value>
   </data>
   <data name="TbRemoteDNS" xml:space="preserve">
-    <value>Remote DNS</value>
+    <value>Удалённый DNS</value>
   </data>
   <data name="TbDomesticDNS" xml:space="preserve">
-    <value>Domestic DNS</value>
+    <value>Внутренний DNS</value>
   </data>
   <data name="TbSBOutboundsResolverDNS" xml:space="preserve">
-    <value>Outbound DNS Resolution (sing-box)</value>
+    <value>Резолвер DNS для исходящих (sing-box)</value>
   </data>
   <data name="TbSBOutboundDomainResolve" xml:space="preserve">
-    <value>Resolve Outbound Domains</value>
+    <value>Разрешать домены для исходящих соединений</value>
   </data>
   <data name="TbSBDoHResolverServer" xml:space="preserve">
-    <value>sing-box DoH Resolver Server</value>
+    <value>Сервер DoH-резолвера (sing-box)</value>
   </data>
   <data name="TbSBFallbackDNSResolve" xml:space="preserve">
-    <value>Fallback DNS Resolution, Suggest IP</value>
+    <value>Резервное DNS-разрешение (рекомендуется указывать IP)</value>
   </data>
   <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
-    <value>xray Freedom Resolution Strategy</value>
+    <value>Стратегия резолвинга Freedom (Xray)</value>
   </data>
   <data name="TbSBDirectResolveStrategy" xml:space="preserve">
-    <value>sing-box Direct Resolution Strategy</value>
+    <value>Стратегия прямого резолвинга (sing-box)</value>
   </data>
   <data name="TbSBRemoteResolveStrategy" xml:space="preserve">
-    <value>sing-box Remote Resolution Strategy</value>
+    <value>Стратегия удалённого резолвинга (sing-box)</value>
   </data>
   <data name="TbAddCommonDNSHosts" xml:space="preserve">
-    <value>Add Common DNS Hosts</value>
+    <value>Добавить стандартные записи hosts (DNS)</value>
   </data>
   <data name="TbSBDoHOverride" xml:space="preserve">
-    <value>The sing-box DoH resolution server can be overwritten</value>
+    <value>Сервер DoH-резолвера sing-box можно переопределить</value>
   </data>
   <data name="TbFakeIP" xml:space="preserve">
     <value>FakeIP</value>
   </data>
   <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
-    <value>Block SVCB and HTTPS Queries</value>
+    <value>Блокировать DNS-запросы SVCB и HTTPS</value>
   </data>
   <data name="TbDNSHostsConfig" xml:space="preserve">
-    <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
+    <value>DNS hosts: (каждая строка в формате "domain1 ip1 ip2")</value>
   </data>
   <data name="TbApplyProxyDomainsOnly" xml:space="preserve">
-    <value>Apply to Proxy Domains Only</value>
+    <value>Применять только к доменам через прокси</value>
   </data>
   <data name="ThBasicDNSSettings" xml:space="preserve">
-    <value>Basic DNS Settings</value>
+    <value>Базовые настройки DNS</value>
   </data>
   <data name="ThAdvancedDNSSettings" xml:space="preserve">
-    <value>Advanced DNS Settings</value>
+    <value>Расширенные настройки DNS</value>
   </data>
   <data name="TbValidateDirectExpectedIPs" xml:space="preserve">
-    <value>Validate Regional Domain IPs</value>
+    <value>Проверять IP-адреса региональных доменов</value>
   </data>
   <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
-    <value>When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs</value>
+    <value>При включении проверяет IP-адреса, возвращаемые для региональных доменов (например, geosite:cn), и оставляет только ожидаемые IP-адреса</value>
   </data>
   <data name="TbCustomDNSEnable" xml:space="preserve">
-    <value>Enable Custom DNS</value>
+    <value>Включить пользовательский DNS</value>
   </data>
   <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
-    <value>Custom DNS Enabled, This Page's Settings Invalid</value>
+    <value>Включён пользовательский DNS — настройки на этой странице не применяются</value>
   </data>
   <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
-    <value>Prevent domain-based routing rules from failing</value>
+    <value>Предотвращает сбои доменных правил маршрутизации</value>
   </data>
   <data name="FillCorrectConfigTemplateText" xml:space="preserve">
-    <value>Please fill in the correct config template</value>
+    <value>Пожалуйста, заполните корректный шаблон конфигурации</value>
   </data>
   <data name="menuFullConfigTemplate" xml:space="preserve">
-    <value>Full Config Template Setting</value>
+    <value>Настройка полного шаблона конфигурации</value>
   </data>
   <data name="TbFullConfigTemplateEnable" xml:space="preserve">
-    <value>Enable Full Config Template</value>
+    <value>Включить полный шаблон конфигурации</value>
   </data>
   <data name="TbRayFullConfigTemplate" xml:space="preserve">
-    <value>v2ray Full Config Template</value>
+    <value>Полный шаблон конфигурации v2ray</value>
   </data>
   <data name="TbRayFullConfigTemplateDesc" xml:space="preserve">
-    <value>Add Outbound Config Only, routing.balancers and routing.rules.outboundTag, Click to view the document</value>
+    <value>Добавляет только конфигурацию исходящих (outbound), а также routing.balancers и routing.rules.outboundTag. Нажмите, чтобы открыть документ</value>
   </data>
   <data name="TbAddProxyProtocolOutboundOnly" xml:space="preserve">
-    <value>Do Not Add Non-Proxy Protocol Outbound</value>
+    <value>Не добавлять исходящие для непрокси-протоколов</value>
   </data>
   <data name="TbSetUpstreamProxyDetour" xml:space="preserve">
-    <value>Set Upstream Proxy Tag</value>
+    <value>Задать тег верхнего прокси (upstream)</value>
   </data>
   <data name="TbSBFullConfigTemplate" xml:space="preserve">
-    <value>sing-box Full Config Template</value>
+    <value>Полный шаблон конфигурации sing-box</value>
   </data>
   <data name="TbSBFullConfigTemplateDesc" xml:space="preserve">
-    <value>Add Outbound and Endpoint Config Only, Click to view the document</value>
+    <value>Добавляет только конфигурацию Outbound и Endpoint. Нажмите, чтобы открыть документ</value>
   </data>
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
-    <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
+    <value>Эта функция предназначена для продвинутых пользователей и особых случаев. После включения игнорируются базовые настройки ядра, DNS и маршрутизации. Вы должны самостоятельно корректно задать порт системного прокси, учёт трафика и другие связанные параметры — всё настраивается вручную.</value>
   </data>
-</root>
\ No newline at end of file
+</root>

From 4345c58b458765ce261e13fb21cb6d9e15969b0e Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 12 Aug 2025 20:23:37 +0800
Subject: [PATCH 035/115] Bug fix for FullConfigTemplate xray

---
 .../CoreConfig/CoreConfigSingboxService.cs      | 17 ++++++++---------
 .../CoreConfig/CoreConfigV2rayService.cs        | 14 ++++++--------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index 4b315c39..3fb32524 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -80,8 +80,7 @@ public class CoreConfigSingboxService
             ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
             ret.Success = true;
 
-            var fullConfigTemplate = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.sing_box);
-            ret.Data = await ApplyFullConfigTemplate(fullConfigTemplate, singboxConfig);
+            ret.Data = await ApplyFullConfigTemplate(singboxConfig);
             return ret;
         }
         catch (Exception ex)
@@ -434,8 +433,7 @@ public class CoreConfigSingboxService
 
             ret.Success = true;
 
-            var fullConfigTemplate = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.sing_box);
-            ret.Data = await ApplyFullConfigTemplate(fullConfigTemplate, singboxConfig);
+            ret.Data = await ApplyFullConfigTemplate(singboxConfig);
             return ret;
         }
         catch (Exception ex)
@@ -2219,15 +2217,16 @@ public class CoreConfigSingboxService
         return 0;
     }
 
-    private async Task<string> ApplyFullConfigTemplate(FullConfigTemplateItem fullConfigTemplate, SingboxConfig singboxConfig)
+    private async Task<string> ApplyFullConfigTemplate(SingboxConfig singboxConfig)
     {
-        var fullConfigTemplateItem = fullConfigTemplate.Config;
-        if (_config.TunModeItem.EnableTun)
+        var fullConfigTemplate = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.sing_box);
+        if (fullConfigTemplate == null || !fullConfigTemplate.Enabled)
         {
-            fullConfigTemplateItem = fullConfigTemplate.TunConfig;
+            return JsonUtils.Serialize(singboxConfig);
         }
 
-        if (!fullConfigTemplate.Enabled || fullConfigTemplateItem.IsNullOrEmpty())
+        var fullConfigTemplateItem = _config.TunModeItem.EnableTun ? fullConfigTemplate.TunConfig : fullConfigTemplate.Config;
+        if (fullConfigTemplateItem.IsNullOrEmpty())
         {
             return JsonUtils.Serialize(singboxConfig);
         }
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
index 96388ed3..43911046 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
@@ -3,7 +3,6 @@ using System.Net.NetworkInformation;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
-using ServiceLib.Models;
 
 namespace ServiceLib.Services.CoreConfig;
 
@@ -69,9 +68,7 @@ public class CoreConfigV2rayService
 
             ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
             ret.Success = true;
-
-            var fullConfigTemplate = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
-            ret.Data = await ApplyFullConfigTemplate(fullConfigTemplate, v2rayConfig);
+            ret.Data = await ApplyFullConfigTemplate(v2rayConfig);
             return ret;
         }
         catch (Exception ex)
@@ -201,8 +198,7 @@ public class CoreConfigV2rayService
 
             ret.Success = true;
 
-            var fullConfigTemplate = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
-            ret.Data = await ApplyFullConfigTemplate(fullConfigTemplate, v2rayConfig, true);
+            ret.Data = await ApplyFullConfigTemplate(v2rayConfig, true);
             return ret;
         }
         catch (Exception ex)
@@ -1844,9 +1840,10 @@ public class CoreConfigV2rayService
         return await Task.FromResult(0);
     }
 
-    private async Task<string> ApplyFullConfigTemplate(FullConfigTemplateItem fullConfigTemplate, V2rayConfig v2rayConfig, bool handleBalancerAndRules = false)
+    private async Task<string> ApplyFullConfigTemplate(V2rayConfig v2rayConfig, bool handleBalancerAndRules = false)
     {
-        if (!fullConfigTemplate.Enabled || fullConfigTemplate.Config.IsNullOrEmpty())
+        var fullConfigTemplate = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
+        if (fullConfigTemplate == null || !fullConfigTemplate.Enabled || fullConfigTemplate.Config.IsNullOrEmpty())
         {
             return JsonUtils.Serialize(v2rayConfig);
         }
@@ -1918,6 +1915,7 @@ public class CoreConfigV2rayService
             }
             customOutboundsNode.Add(JsonUtils.DeepCopy(outbound));
         }
+        fullConfigTemplateNode["outbounds"] = customOutboundsNode;
 
         return await Task.FromResult(JsonUtils.Serialize(fullConfigTemplateNode));
     }

From 46801ce3398580e05cc2607ea911bf2d124df792 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Aug 2025 08:39:18 +0800
Subject: [PATCH 036/115] Bump actions/checkout from 4.2.2 to 5.0.0 (#7749)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.2 to 5.0.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.2.2...v5.0.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/build-linux.yml           | 2 +-
 .github/workflows/build-osx.yml             | 2 +-
 .github/workflows/build-windows-desktop.yml | 2 +-
 .github/workflows/build-windows.yml         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index a9fe23e2..f793a1cb 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v5.0.0
       with:
         submodules: 'recursive'
         fetch-depth: '0'
diff --git a/.github/workflows/build-osx.yml b/.github/workflows/build-osx.yml
index 78c18dc5..fa1d3ef4 100644
--- a/.github/workflows/build-osx.yml
+++ b/.github/workflows/build-osx.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v5.0.0
       with:
         submodules: 'recursive'
         fetch-depth: '0'
diff --git a/.github/workflows/build-windows-desktop.yml b/.github/workflows/build-windows-desktop.yml
index 9afc504d..4cd33704 100644
--- a/.github/workflows/build-windows-desktop.yml
+++ b/.github/workflows/build-windows-desktop.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v5.0.0
       with:
         submodules: 'recursive'
         fetch-depth: '0'
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 1d33f85a..c39ed723 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -27,7 +27,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v5.0.0
 
     - name: Setup
       uses: actions/setup-dotnet@v4.3.1

From 9cc99c5c63d13fb820a5f0170ad744c3e13b48c4 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 13 Aug 2025 18:41:57 +0800
Subject: [PATCH 037/115] Update Directory.Packages.props

---
 v2rayN/Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/Directory.Packages.props b/v2rayN/Directory.Packages.props
index 48fba7da..e923397d 100644
--- a/v2rayN/Directory.Packages.props
+++ b/v2rayN/Directory.Packages.props
@@ -10,7 +10,7 @@
     <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.3" />
     <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.3" />
     <PackageVersion Include="CliWrap" Version="3.9.0" />
-    <PackageVersion Include="Downloader" Version="4.0.2" />
+    <PackageVersion Include="Downloader" Version="4.0.3" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
     <PackageVersion Include="MaterialDesignThemes" Version="5.2.1" />
     <PackageVersion Include="MessageBox.Avalonia" Version="3.2.0" />

From 0fb6b2e54b4f6bfa7c083d02dce84080ff8c8d47 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 13 Aug 2025 18:43:15 +0800
Subject: [PATCH 038/115] Bug fix for DNS setting

---
 v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs b/v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs
index e6e985ca..a679b8c1 100644
--- a/v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs
@@ -150,7 +150,7 @@ public class DNSSettingViewModel : MyReactiveObject
         await ConfigHandler.SaveDNSItems(_config, item1);
 
         var item2 = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
-        item2.Enabled = RayCustomDNSEnableCompatible;
+        item2.Enabled = SBCustomDNSEnableCompatible;
         item2.DomainStrategy4Freedom = DomainStrategy4Freedom2Compatible;
         item2.DomainDNSAddress = DomainDNSAddress2Compatible;
         item2.NormalDNS = JsonUtils.Serialize(JsonUtils.ParseJson(NormalDNS2Compatible));

From f45290eb3a00e6761846d2cfae6880b0afffa369 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 13 Aug 2025 21:19:51 +0800
Subject: [PATCH 039/115] Fixed a bug in dns rule processing when outbound in
 routing rules is a other server

---
 .../CoreConfig/CoreConfigSingboxService.cs         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index 3fb32524..fa995786 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -1862,7 +1862,13 @@ public class CoreConfigSingboxService
                     }
                 }
             }
-            else if (item.OutboundTag == Global.ProxyTag)
+            else if (item.OutboundTag == Global.BlockTag)
+            {
+                rule.action = "predefined";
+                rule.rcode = "NOERROR";
+                rule.answer = new List<string> { "A" };
+            }
+            else
             {
                 if (simpleDNSItem.FakeIP == true)
                 {
@@ -1873,12 +1879,6 @@ public class CoreConfigSingboxService
                 rule.server = Global.SingboxRemoteDNSTag;
                 rule.strategy = string.IsNullOrEmpty(simpleDNSItem.SingboxStrategy4Proxy) ? null : simpleDNSItem.SingboxStrategy4Proxy;
             }
-            else if (item.OutboundTag == Global.BlockTag)
-            {
-                rule.action = "predefined";
-                rule.rcode = "NOERROR";
-                rule.answer = new List<string> { "A" };
-            }
 
             singboxConfig.dns.rules.Add(rule);
         }

From a73906505c3d7f354ec71f8f346200e5e0d94a4c Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Thu, 14 Aug 2025 09:30:58 +0800
Subject: [PATCH 040/115] Improves domain blocking and proxy handling (#7754)

---
 .../ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs | 3 +--
 .../ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index fa995786..7d38ccfd 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -1865,8 +1865,7 @@ public class CoreConfigSingboxService
             else if (item.OutboundTag == Global.BlockTag)
             {
                 rule.action = "predefined";
-                rule.rcode = "NOERROR";
-                rule.answer = new List<string> { "A" };
+                rule.rcode = "NXDOMAIN";
             }
             else
             {
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
index 43911046..e6784db2 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
@@ -1263,7 +1263,7 @@ public class CoreConfigV2rayService
                             directDomainList.Add(normalizedDomain);
                         }
                     }
-                    else if (item.OutboundTag == Global.ProxyTag)
+                    else if (item.OutboundTag != Global.BlockTag)
                     {
                         if (normalizedDomain.StartsWith("geosite:"))
                         {

From dcc9c9fa140404b03dd7bb1cc16f7421f826a54c Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Thu, 14 Aug 2025 17:32:48 +0800
Subject: [PATCH 041/115] Fixes DNS (#7757)

* Adds properties

* Adds DNS routing
---
 v2rayN/ServiceLib/Global.cs                   |  1 +
 v2rayN/ServiceLib/Models/V2rayConfig.cs       | 15 +++++++-
 .../CoreConfig/CoreConfigV2rayService.cs      | 35 +++++++++++++++++--
 3 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs
index 3e7b8858..ffab8d77 100644
--- a/v2rayN/ServiceLib/Global.cs
+++ b/v2rayN/ServiceLib/Global.cs
@@ -48,6 +48,7 @@ public class Global
     public const string ProxyTag = "proxy";
     public const string DirectTag = "direct";
     public const string BlockTag = "block";
+    public const string DnsTag = "dns-module";
     public const string StreamSecurity = "tls";
     public const string StreamSecurityReality = "reality";
     public const string Loopback = "127.0.0.1";
diff --git a/v2rayN/ServiceLib/Models/V2rayConfig.cs b/v2rayN/ServiceLib/Models/V2rayConfig.cs
index 354e33dc..702bbae1 100644
--- a/v2rayN/ServiceLib/Models/V2rayConfig.cs
+++ b/v2rayN/ServiceLib/Models/V2rayConfig.cs
@@ -203,8 +203,15 @@ public class Response4Ray
 
 public class Dns4Ray
 {
-    public Dictionary<string, List<string>>? hosts { get; set; }
+    public Dictionary<string, object>? hosts { get; set; }
     public List<object> servers { get; set; }
+    public string? clientIp { get; set; }
+    public string? queryStrategy { get; set; }
+    public bool? disableCache { get; set; }
+    public bool? disableFallback { get; set; }
+    public bool? disableFallbackIfMatch { get; set; }
+    public bool? useSystemHosts { get; set; }
+    public string? tag { get; set; }
 }
 
 public class DnsServer4Ray
@@ -214,6 +221,12 @@ public class DnsServer4Ray
     public bool? skipFallback { get; set; }
     public List<string>? expectedIPs { get; set; }
     public List<string>? unexpectedIPs { get; set; }
+    public string? clientIp { get; set; }
+    public string? queryStrategy { get; set; }
+    public int? timeoutMs { get; set; }
+    public bool? disableCache { get; set; }
+    public bool? finalQuery { get; set; }
+    public string? tag { get; set; }
 }
 
 public class Routing4Ray
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
index e6784db2..62bf2b22 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
@@ -1143,7 +1143,21 @@ public class CoreConfigV2rayService
             var item = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
             if (item != null && item.Enabled == true)
             {
-                return await GenDnsCompatible(node, v2rayConfig);
+                var result = await GenDnsCompatible(node, v2rayConfig);
+
+                if (v2rayConfig.routing.domainStrategy == "IPIfNonMatch")
+                {
+                    // DNS routing
+                    v2rayConfig.dns.tag = Global.DnsTag;
+                    v2rayConfig.routing.rules.Add(new RulesItem4Ray
+                    {
+                        type = "field",
+                        inboundTag = new List<string> { Global.DnsTag },
+                        outboundTag = Global.ProxyTag,
+                    });
+                }
+
+                return result;
             }
             var simpleDNSItem = _config.SimpleDNSItem;
             var domainStrategy4Freedom = simpleDNSItem?.RayStrategy4Freedom;
@@ -1164,6 +1178,18 @@ public class CoreConfigV2rayService
 
             await GenDnsServers(node, v2rayConfig, simpleDNSItem);
             await GenDnsHosts(v2rayConfig, simpleDNSItem);
+
+            if (v2rayConfig.routing.domainStrategy == "IPIfNonMatch")
+            {
+                // DNS routing
+                v2rayConfig.dns.tag = Global.DnsTag;
+                v2rayConfig.routing.rules.Add(new RulesItem4Ray
+                {
+                    type = "field",
+                    inboundTag = new List<string> { Global.DnsTag },
+                    outboundTag = Global.ProxyTag,
+                });
+            }
         }
         catch (Exception ex)
         {
@@ -1340,10 +1366,13 @@ public class CoreConfigV2rayService
             return await Task.FromResult(0);
         }
         v2rayConfig.dns ??= new Dns4Ray();
-        v2rayConfig.dns.hosts ??= new Dictionary<string, List<string>>();
+        v2rayConfig.dns.hosts ??= new Dictionary<string, object>();
         if (simpleDNSItem.AddCommonHosts == true)
         {
-            v2rayConfig.dns.hosts = Global.PredefinedHosts;
+            v2rayConfig.dns.hosts = Global.PredefinedHosts.ToDictionary(
+                kvp => kvp.Key,
+                kvp => (object)kvp.Value
+            );
         }
 
         if (simpleDNSItem.UseSystemHosts == true)

From 89d6af8fc9f324ca795ac1b0c5b0da91169f1e0f Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 14 Aug 2025 20:18:22 +0800
Subject: [PATCH 042/115] Added global constants such as IPIfNonMatch

---
 v2rayN/ServiceLib/Global.cs                              | 9 ++++++---
 v2rayN/ServiceLib/Handler/ConfigHandler.cs               | 1 +
 .../Services/CoreConfig/CoreConfigSingboxService.cs      | 4 ++--
 .../Services/CoreConfig/CoreConfigV2rayService.cs        | 6 +++---
 .../ServiceLib/ViewModels/FullConfigTemplateViewModel.cs | 5 ++++-
 v2rayN/v2rayN/Views/OptionSettingWindow.xaml             | 1 -
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs
index ffab8d77..c0c99750 100644
--- a/v2rayN/ServiceLib/Global.cs
+++ b/v2rayN/ServiceLib/Global.cs
@@ -57,6 +57,9 @@ public class Global
     public const string HttpsProtocol = "https://";
     public const string SocksProtocol = "socks://";
     public const string Socks5Protocol = "socks5://";
+    public const string AsIs = "AsIs";
+    public const string IPIfNonMatch = "IPIfNonMatch";
+    public const string IPOnDemand = "IPOnDemand";
 
     public const string UserEMail = "t@t.tt";
     public const string AutoRunRegPath = @"Software\Microsoft\Windows\CurrentVersion\Run";
@@ -288,9 +291,9 @@ public class Global
 
     public static readonly List<string> DomainStrategies =
     [
-        "AsIs",
-            "IPIfNonMatch",
-            "IPOnDemand"
+        AsIs,
+        IPIfNonMatch,
+        IPOnDemand
     ];
 
     public static readonly List<string> DomainStrategies4Singbox =
diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
index c05424a2..981fd2f5 100644
--- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -2262,6 +2262,7 @@ public class ConfigHandler
 
         return 0;
     }
+
     public static async Task<int> SaveFullConfigTemplate(Config config, FullConfigTemplateItem item)
     {
         if (item == null)
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index 7d38ccfd..fa2b14d8 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -1329,7 +1329,7 @@ public class CoreConfigSingboxService
                 action = "resolve",
                 strategy = domainStrategy
             };
-            if (_config.RoutingBasicItem.DomainStrategy == "IPOnDemand")
+            if (_config.RoutingBasicItem.DomainStrategy == Global.IPOnDemand)
             {
                 singboxConfig.route.rules.Add(resolveRule);
             }
@@ -1351,7 +1351,7 @@ public class CoreConfigSingboxService
                     }
                 }
             }
-            if (_config.RoutingBasicItem.DomainStrategy == "IPIfNonMatch")
+            if (_config.RoutingBasicItem.DomainStrategy == Global.IPIfNonMatch)
             {
                 singboxConfig.route.rules.Add(resolveRule);
                 foreach (var item2 in ipRules)
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
index 62bf2b22..62c2e182 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
@@ -177,7 +177,7 @@ public class CoreConfigV2rayService
                     rule.balancerTag = balancer.tag;
                 }
             }
-            if (v2rayConfig.routing.domainStrategy == "IPIfNonMatch")
+            if (v2rayConfig.routing.domainStrategy == Global.IPIfNonMatch)
             {
                 v2rayConfig.routing.rules.Add(new()
                 {
@@ -1145,7 +1145,7 @@ public class CoreConfigV2rayService
             {
                 var result = await GenDnsCompatible(node, v2rayConfig);
 
-                if (v2rayConfig.routing.domainStrategy == "IPIfNonMatch")
+                if (v2rayConfig.routing.domainStrategy == Global.IPIfNonMatch)
                 {
                     // DNS routing
                     v2rayConfig.dns.tag = Global.DnsTag;
@@ -1179,7 +1179,7 @@ public class CoreConfigV2rayService
             await GenDnsServers(node, v2rayConfig, simpleDNSItem);
             await GenDnsHosts(v2rayConfig, simpleDNSItem);
 
-            if (v2rayConfig.routing.domainStrategy == "IPIfNonMatch")
+            if (v2rayConfig.routing.domainStrategy == Global.IPIfNonMatch)
             {
                 // DNS routing
                 v2rayConfig.dns.tag = Global.DnsTag;
diff --git a/v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs b/v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs
index 3aa618bf..f36a7fb6 100644
--- a/v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs
@@ -1,12 +1,13 @@
 using System.Reactive;
-using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 
 namespace ServiceLib.ViewModels;
+
 public class FullConfigTemplateViewModel : MyReactiveObject
 {
     #region Reactive
+
     [Reactive]
     public bool EnableFullConfigTemplate4Ray { get; set; }
 
@@ -35,6 +36,7 @@ public class FullConfigTemplateViewModel : MyReactiveObject
     public string ProxyDetour4Singbox { get; set; }
 
     public ReactiveCommand<Unit, Unit> SaveCmd { get; }
+
     #endregion Reactive
 
     public FullConfigTemplateViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
@@ -48,6 +50,7 @@ public class FullConfigTemplateViewModel : MyReactiveObject
 
         _ = Init();
     }
+
     private async Task Init()
     {
         var item = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
index bdd47f1c..e3e38992 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -1246,4 +1246,3 @@
         </TabControl>
     </DockPanel>
 </base:WindowBase>
-

From dc2877d8176a92e0d25592e5fd695609a8f53f83 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 14 Aug 2025 20:59:15 +0800
Subject: [PATCH 043/115] =?UTF-8?q?Refactor=20UpdateSubscriptionProcess=20?=
 =?UTF-8?q?=EF=BC=8Cadd=20SubscriptionHandler?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ServiceLib/Handler/SubscriptionHandler.cs | 133 ++++++++++++++++++
 v2rayN/ServiceLib/Handler/TaskHandler.cs      |   3 +-
 v2rayN/ServiceLib/Services/UpdateService.cs   | 133 +-----------------
 .../ViewModels/MainWindowViewModel.cs         |   2 +-
 4 files changed, 136 insertions(+), 135 deletions(-)
 create mode 100644 v2rayN/ServiceLib/Handler/SubscriptionHandler.cs

diff --git a/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs b/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
new file mode 100644
index 00000000..b06700f8
--- /dev/null
+++ b/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
@@ -0,0 +1,133 @@
+namespace ServiceLib.Handler;
+
+public class SubscriptionHandler
+{
+    public static async Task UpdateProcess(Config config, string subId, bool blProxy, Action<bool, string> updateFunc)
+    {
+        updateFunc?.Invoke(false, ResUI.MsgUpdateSubscriptionStart);
+        var subItem = await AppHandler.Instance.SubItems();
+
+        if (subItem is not { Count: > 0 })
+        {
+            updateFunc?.Invoke(false, ResUI.MsgNoValidSubscription);
+            return;
+        }
+
+        foreach (var item in subItem)
+        {
+            var id = item.Id.TrimEx();
+            var url = item.Url.TrimEx();
+            var userAgent = item.UserAgent.TrimEx();
+            var hashCode = $"{item.Remarks}->";
+            if (id.IsNullOrEmpty() || url.IsNullOrEmpty() || (subId.IsNotEmpty() && item.Id != subId))
+            {
+                //_updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgNoValidSubscription}");
+                continue;
+            }
+            if (!url.StartsWith(Global.HttpsProtocol) && !url.StartsWith(Global.HttpProtocol))
+            {
+                continue;
+            }
+            if (item.Enabled == false)
+            {
+                updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSkipSubscriptionUpdate}");
+                continue;
+            }
+
+            var downloadHandle = new DownloadService();
+            downloadHandle.Error += (sender2, args) =>
+            {
+                updateFunc?.Invoke(false, $"{hashCode}{args.GetException().Message}");
+            };
+
+            updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
+
+            //one url
+            url = Utils.GetPunycode(url);
+            //convert
+            if (item.ConvertTarget.IsNotEmpty())
+            {
+                var subConvertUrl = config.ConstItem.SubConvertUrl.IsNullOrEmpty() ? Global.SubConvertUrls.FirstOrDefault() : config.ConstItem.SubConvertUrl;
+                url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
+                if (!url.Contains("target="))
+                {
+                    url += string.Format("&target={0}", item.ConvertTarget);
+                }
+                if (!url.Contains("config="))
+                {
+                    url += string.Format("&config={0}", Global.SubConvertConfig.FirstOrDefault());
+                }
+            }
+            var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
+            if (blProxy && result.IsNullOrEmpty())
+            {
+                result = await downloadHandle.TryDownloadString(url, false, userAgent);
+            }
+
+            //more url
+            if (item.ConvertTarget.IsNullOrEmpty() && item.MoreUrl.TrimEx().IsNotEmpty())
+            {
+                if (result.IsNotEmpty() && Utils.IsBase64String(result))
+                {
+                    result = Utils.Base64Decode(result);
+                }
+
+                var lstUrl = item.MoreUrl.TrimEx().Split(",") ?? [];
+                foreach (var it in lstUrl)
+                {
+                    var url2 = Utils.GetPunycode(it);
+                    if (url2.IsNullOrEmpty())
+                    {
+                        continue;
+                    }
+
+                    var result2 = await downloadHandle.TryDownloadString(url2, blProxy, userAgent);
+                    if (blProxy && result2.IsNullOrEmpty())
+                    {
+                        result2 = await downloadHandle.TryDownloadString(url2, false, userAgent);
+                    }
+                    if (result2.IsNotEmpty())
+                    {
+                        if (Utils.IsBase64String(result2))
+                        {
+                            result += Environment.NewLine + Utils.Base64Decode(result2);
+                        }
+                        else
+                        {
+                            result += Environment.NewLine + result2;
+                        }
+                    }
+                }
+            }
+
+            if (result.IsNullOrEmpty())
+            {
+                updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
+            }
+            else
+            {
+                updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
+                if (result?.Length < 99)
+                {
+                    updateFunc?.Invoke(false, $"{hashCode}{result}");
+                }
+
+                var ret = await ConfigHandler.AddBatchServers(config, result, id, true);
+                if (ret <= 0)
+                {
+                    Logging.SaveLog("FailedImportSubscription");
+                    Logging.SaveLog(result);
+                }
+                updateFunc?.Invoke(false,
+                    ret > 0
+                        ? $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}"
+                        : $"{hashCode}{ResUI.MsgFailedImportSubscription}");
+            }
+            updateFunc?.Invoke(false, "-------------------------------------------------------");
+
+            //await ConfigHandler.DedupServerList(config, id);
+        }
+
+        updateFunc?.Invoke(true, $"{ResUI.MsgUpdateSubscriptionEnd}");
+    }
+}
diff --git a/v2rayN/ServiceLib/Handler/TaskHandler.cs b/v2rayN/ServiceLib/Handler/TaskHandler.cs
index ef1d4e38..b49570be 100644
--- a/v2rayN/ServiceLib/Handler/TaskHandler.cs
+++ b/v2rayN/ServiceLib/Handler/TaskHandler.cs
@@ -63,11 +63,10 @@ public class TaskHandler
         }
 
         Logging.SaveLog("Execute update subscription");
-        var updateHandle = new UpdateService();
 
         foreach (var item in lstSubs)
         {
-            await updateHandle.UpdateSubscriptionProcess(config, item.Id, true, (bool success, string msg) =>
+            await SubscriptionHandler.UpdateProcess(config, item.Id, true, (bool success, string msg) =>
             {
                 updateFunc?.Invoke(success, msg);
                 if (success)
diff --git a/v2rayN/ServiceLib/Services/UpdateService.cs b/v2rayN/ServiceLib/Services/UpdateService.cs
index 831ef2c3..b60ddc6c 100644
--- a/v2rayN/ServiceLib/Services/UpdateService.cs
+++ b/v2rayN/ServiceLib/Services/UpdateService.cs
@@ -6,7 +6,7 @@ namespace ServiceLib.Services;
 public class UpdateService
 {
     private Action<bool, string>? _updateFunc;
-    private int _timeout = 30;
+    private readonly int _timeout = 30;
     private static readonly string _tag = "UpdateService";
 
     public async Task CheckUpdateGuiN(Config config, Action<bool, string> updateFunc, bool preRelease)
@@ -104,137 +104,6 @@ public class UpdateService
         }
     }
 
-    public async Task UpdateSubscriptionProcess(Config config, string subId, bool blProxy, Action<bool, string> updateFunc)
-    {
-        _updateFunc = updateFunc;
-
-        _updateFunc?.Invoke(false, ResUI.MsgUpdateSubscriptionStart);
-        var subItem = await AppHandler.Instance.SubItems();
-
-        if (subItem is not { Count: > 0 })
-        {
-            _updateFunc?.Invoke(false, ResUI.MsgNoValidSubscription);
-            return;
-        }
-
-        foreach (var item in subItem)
-        {
-            var id = item.Id.TrimEx();
-            var url = item.Url.TrimEx();
-            var userAgent = item.UserAgent.TrimEx();
-            var hashCode = $"{item.Remarks}->";
-            if (id.IsNullOrEmpty() || url.IsNullOrEmpty() || (subId.IsNotEmpty() && item.Id != subId))
-            {
-                //_updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgNoValidSubscription}");
-                continue;
-            }
-            if (!url.StartsWith(Global.HttpsProtocol) && !url.StartsWith(Global.HttpProtocol))
-            {
-                continue;
-            }
-            if (item.Enabled == false)
-            {
-                _updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSkipSubscriptionUpdate}");
-                continue;
-            }
-
-            var downloadHandle = new DownloadService();
-            downloadHandle.Error += (sender2, args) =>
-            {
-                _updateFunc?.Invoke(false, $"{hashCode}{args.GetException().Message}");
-            };
-
-            _updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
-
-            //one url
-            url = Utils.GetPunycode(url);
-            //convert
-            if (item.ConvertTarget.IsNotEmpty())
-            {
-                var subConvertUrl = config.ConstItem.SubConvertUrl.IsNullOrEmpty() ? Global.SubConvertUrls.FirstOrDefault() : config.ConstItem.SubConvertUrl;
-                url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
-                if (!url.Contains("target="))
-                {
-                    url += string.Format("&target={0}", item.ConvertTarget);
-                }
-                if (!url.Contains("config="))
-                {
-                    url += string.Format("&config={0}", Global.SubConvertConfig.FirstOrDefault());
-                }
-            }
-            var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
-            if (blProxy && result.IsNullOrEmpty())
-            {
-                result = await downloadHandle.TryDownloadString(url, false, userAgent);
-            }
-
-            //more url
-            if (item.ConvertTarget.IsNullOrEmpty() && item.MoreUrl.TrimEx().IsNotEmpty())
-            {
-                if (result.IsNotEmpty() && Utils.IsBase64String(result))
-                {
-                    result = Utils.Base64Decode(result);
-                }
-
-                var lstUrl = item.MoreUrl.TrimEx().Split(",") ?? [];
-                foreach (var it in lstUrl)
-                {
-                    var url2 = Utils.GetPunycode(it);
-                    if (url2.IsNullOrEmpty())
-                    {
-                        continue;
-                    }
-
-                    var result2 = await downloadHandle.TryDownloadString(url2, blProxy, userAgent);
-                    if (blProxy && result2.IsNullOrEmpty())
-                    {
-                        result2 = await downloadHandle.TryDownloadString(url2, false, userAgent);
-                    }
-                    if (result2.IsNotEmpty())
-                    {
-                        if (Utils.IsBase64String(result2))
-                        {
-                            result += Environment.NewLine + Utils.Base64Decode(result2);
-                        }
-                        else
-                        {
-                            result += Environment.NewLine + result2;
-                        }
-                    }
-                }
-            }
-
-            if (result.IsNullOrEmpty())
-            {
-                _updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
-            }
-            else
-            {
-                _updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
-                if (result?.Length < 99)
-                {
-                    _updateFunc?.Invoke(false, $"{hashCode}{result}");
-                }
-
-                var ret = await ConfigHandler.AddBatchServers(config, result, id, true);
-                if (ret <= 0)
-                {
-                    Logging.SaveLog("FailedImportSubscription");
-                    Logging.SaveLog(result);
-                }
-                _updateFunc?.Invoke(false,
-                    ret > 0
-                        ? $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}"
-                        : $"{hashCode}{ResUI.MsgFailedImportSubscription}");
-            }
-            _updateFunc?.Invoke(false, "-------------------------------------------------------");
-
-            //await ConfigHandler.DedupServerList(config, id);
-        }
-
-        _updateFunc?.Invoke(true, $"{ResUI.MsgUpdateSubscriptionEnd}");
-    }
-
     public async Task UpdateGeoFileAll(Config config, Action<bool, string> updateFunc)
     {
         await UpdateGeoFiles(config, updateFunc);
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index 8355996d..8578036d 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -477,7 +477,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     public async Task UpdateSubscriptionProcess(string subId, bool blProxy)
     {
-        await (new UpdateService()).UpdateSubscriptionProcess(_config, subId, blProxy, UpdateTaskHandler);
+        await SubscriptionHandler.UpdateProcess(_config, subId, blProxy, UpdateTaskHandler);
     }
 
     #endregion Subscription

From 95e3ebd8156f2b402a6a64a576ffa21e87bd0b78 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 15 Aug 2025 17:18:16 +0800
Subject: [PATCH 044/115] up 7.14.0

---
 v2rayN/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/Directory.Build.props b/v2rayN/Directory.Build.props
index 7444d9cf..001b32fe 100644
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.13.7</Version>
+        <Version>7.14.0</Version>
     </PropertyGroup>
 
     <PropertyGroup>

From c560fe13fe83d248fd65528781f983fd3d05046c Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 16 Aug 2025 17:18:17 +0800
Subject: [PATCH 045/115] Adjust the tun mtu value list

https://github.com/2dust/v2rayN/issues/7775
---
 v2rayN/ServiceLib/Global.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs
index c0c99750..e3be7004 100644
--- a/v2rayN/ServiceLib/Global.cs
+++ b/v2rayN/ServiceLib/Global.cs
@@ -464,9 +464,11 @@ public class Global
     public static readonly List<int> TunMtus =
     [
         1280,
-            1408,
-            1500,
-            9000
+        1408,
+        1500,
+        4064,
+        9000,
+        65535
     ];
 
     public static readonly List<string> TunStacks =

From 186b56aed944c8b2ef820a15c44bb8d299bbbc28 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 16 Aug 2025 18:01:12 +0800
Subject: [PATCH 046/115] Refactor SubscriptionHandler and add exception
 capture

---
 .../ServiceLib/Handler/SubscriptionHandler.cs | 285 +++++++++++-------
 1 file changed, 183 insertions(+), 102 deletions(-)

diff --git a/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs b/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
index b06700f8..f93eb2fa 100644
--- a/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
+++ b/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
@@ -15,119 +15,200 @@ public class SubscriptionHandler
 
         foreach (var item in subItem)
         {
-            var id = item.Id.TrimEx();
-            var url = item.Url.TrimEx();
-            var userAgent = item.UserAgent.TrimEx();
-            var hashCode = $"{item.Remarks}->";
-            if (id.IsNullOrEmpty() || url.IsNullOrEmpty() || (subId.IsNotEmpty() && item.Id != subId))
+            try
             {
-                //_updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgNoValidSubscription}");
-                continue;
-            }
-            if (!url.StartsWith(Global.HttpsProtocol) && !url.StartsWith(Global.HttpProtocol))
-            {
-                continue;
-            }
-            if (item.Enabled == false)
-            {
-                updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSkipSubscriptionUpdate}");
-                continue;
-            }
-
-            var downloadHandle = new DownloadService();
-            downloadHandle.Error += (sender2, args) =>
-            {
-                updateFunc?.Invoke(false, $"{hashCode}{args.GetException().Message}");
-            };
-
-            updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
-
-            //one url
-            url = Utils.GetPunycode(url);
-            //convert
-            if (item.ConvertTarget.IsNotEmpty())
-            {
-                var subConvertUrl = config.ConstItem.SubConvertUrl.IsNullOrEmpty() ? Global.SubConvertUrls.FirstOrDefault() : config.ConstItem.SubConvertUrl;
-                url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
-                if (!url.Contains("target="))
+                if (!IsValidSubscription(item, subId))
                 {
-                    url += string.Format("&target={0}", item.ConvertTarget);
-                }
-                if (!url.Contains("config="))
-                {
-                    url += string.Format("&config={0}", Global.SubConvertConfig.FirstOrDefault());
-                }
-            }
-            var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
-            if (blProxy && result.IsNullOrEmpty())
-            {
-                result = await downloadHandle.TryDownloadString(url, false, userAgent);
-            }
-
-            //more url
-            if (item.ConvertTarget.IsNullOrEmpty() && item.MoreUrl.TrimEx().IsNotEmpty())
-            {
-                if (result.IsNotEmpty() && Utils.IsBase64String(result))
-                {
-                    result = Utils.Base64Decode(result);
+                    continue;
                 }
 
-                var lstUrl = item.MoreUrl.TrimEx().Split(",") ?? [];
-                foreach (var it in lstUrl)
+                var hashCode = $"{item.Remarks}->";
+                if (item.Enabled == false)
                 {
-                    var url2 = Utils.GetPunycode(it);
-                    if (url2.IsNullOrEmpty())
-                    {
-                        continue;
-                    }
-
-                    var result2 = await downloadHandle.TryDownloadString(url2, blProxy, userAgent);
-                    if (blProxy && result2.IsNullOrEmpty())
-                    {
-                        result2 = await downloadHandle.TryDownloadString(url2, false, userAgent);
-                    }
-                    if (result2.IsNotEmpty())
-                    {
-                        if (Utils.IsBase64String(result2))
-                        {
-                            result += Environment.NewLine + Utils.Base64Decode(result2);
-                        }
-                        else
-                        {
-                            result += Environment.NewLine + result2;
-                        }
-                    }
+                    updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSkipSubscriptionUpdate}");
+                    continue;
                 }
-            }
 
-            if (result.IsNullOrEmpty())
+                // Create download handler
+                var downloadHandle = CreateDownloadHandler(hashCode, updateFunc);
+                updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
+
+                // Get all subscription content (main subscription + additional subscriptions)
+                var result = await DownloadAllSubscriptions(config, item, blProxy, downloadHandle);
+
+                // Process download result
+                await ProcessDownloadResult(config, item.Id, result, hashCode, updateFunc);
+
+                updateFunc?.Invoke(false, "-------------------------------------------------------");
+            }
+            catch (Exception ex)
             {
-                updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
+                var hashCode = $"{item.Remarks}->";
+                Logging.SaveLog("UpdateSubscription", ex);
+                updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgFailedImportSubscription}: {ex.Message}");
+                updateFunc?.Invoke(false, "-------------------------------------------------------");
             }
-            else
-            {
-                updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
-                if (result?.Length < 99)
-                {
-                    updateFunc?.Invoke(false, $"{hashCode}{result}");
-                }
-
-                var ret = await ConfigHandler.AddBatchServers(config, result, id, true);
-                if (ret <= 0)
-                {
-                    Logging.SaveLog("FailedImportSubscription");
-                    Logging.SaveLog(result);
-                }
-                updateFunc?.Invoke(false,
-                    ret > 0
-                        ? $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}"
-                        : $"{hashCode}{ResUI.MsgFailedImportSubscription}");
-            }
-            updateFunc?.Invoke(false, "-------------------------------------------------------");
-
-            //await ConfigHandler.DedupServerList(config, id);
         }
 
         updateFunc?.Invoke(true, $"{ResUI.MsgUpdateSubscriptionEnd}");
     }
+
+    private static bool IsValidSubscription(SubItem item, string subId)
+    {
+        var id = item.Id.TrimEx();
+        var url = item.Url.TrimEx();
+
+        if (id.IsNullOrEmpty() || url.IsNullOrEmpty())
+        {
+            return false;
+        }
+
+        if (subId.IsNotEmpty() && item.Id != subId)
+        {
+            return false;
+        }
+
+        if (!url.StartsWith(Global.HttpsProtocol) && !url.StartsWith(Global.HttpProtocol))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    private static DownloadService CreateDownloadHandler(string hashCode, Action<bool, string> updateFunc)
+    {
+        var downloadHandle = new DownloadService();
+        downloadHandle.Error += (sender2, args) =>
+        {
+            updateFunc?.Invoke(false, $"{hashCode}{args.GetException().Message}");
+        };
+        return downloadHandle;
+    }
+
+    private static async Task<string> DownloadSubscriptionContent(DownloadService downloadHandle, string url, bool blProxy, string userAgent)
+    {
+        var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
+
+        // If download with proxy fails, try direct connection
+        if (blProxy && result.IsNullOrEmpty())
+        {
+            result = await downloadHandle.TryDownloadString(url, false, userAgent);
+        }
+
+        return result ?? string.Empty;
+    }
+
+    private static async Task<string> DownloadAllSubscriptions(Config config, SubItem item, bool blProxy, DownloadService downloadHandle)
+    {
+        // Download main subscription content
+        var result = await DownloadMainSubscription(config, item, blProxy, downloadHandle);
+
+        // Process additional subscription links (if any)
+        if (item.ConvertTarget.IsNullOrEmpty() && item.MoreUrl.TrimEx().IsNotEmpty())
+        {
+            result = await DownloadAdditionalSubscriptions(item, result, blProxy, downloadHandle);
+        }
+
+        return result;
+    }
+
+    private static async Task<string> DownloadMainSubscription(Config config, SubItem item, bool blProxy, DownloadService downloadHandle)
+    {
+        // Prepare subscription URL and download directly
+        var url = Utils.GetPunycode(item.Url.TrimEx());
+
+        // If conversion is needed
+        if (item.ConvertTarget.IsNotEmpty())
+        {
+            var subConvertUrl = config.ConstItem.SubConvertUrl.IsNullOrEmpty()
+                ? Global.SubConvertUrls.FirstOrDefault()
+                : config.ConstItem.SubConvertUrl;
+
+            url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
+
+            if (!url.Contains("target="))
+            {
+                url += string.Format("&target={0}", item.ConvertTarget);
+            }
+
+            if (!url.Contains("config="))
+            {
+                url += string.Format("&config={0}", Global.SubConvertConfig.FirstOrDefault());
+            }
+        }
+
+        // Download and return result directly
+        return await DownloadSubscriptionContent(downloadHandle, url, blProxy, item.UserAgent);
+    }
+
+    private static async Task<string> DownloadAdditionalSubscriptions(SubItem item, string mainResult, bool blProxy, DownloadService downloadHandle)
+    {
+        var result = mainResult;
+
+        // If main subscription result is Base64 encoded, decode it first
+        if (result.IsNotEmpty() && Utils.IsBase64String(result))
+        {
+            result = Utils.Base64Decode(result);
+        }
+
+        // Process additional URL list
+        var lstUrl = item.MoreUrl.TrimEx().Split(",") ?? [];
+        foreach (var it in lstUrl)
+        {
+            var url2 = Utils.GetPunycode(it);
+            if (url2.IsNullOrEmpty())
+            {
+                continue;
+            }
+
+            var additionalResult = await DownloadSubscriptionContent(downloadHandle, url2, blProxy, item.UserAgent);
+
+            if (additionalResult.IsNotEmpty())
+            {
+                // Process additional subscription results, add to main result
+                if (Utils.IsBase64String(additionalResult))
+                {
+                    result += Environment.NewLine + Utils.Base64Decode(additionalResult);
+                }
+                else
+                {
+                    result += Environment.NewLine + additionalResult;
+                }
+            }
+        }
+
+        return result;
+    }
+
+    private static async Task ProcessDownloadResult(Config config, string id, string result, string hashCode, Action<bool, string> updateFunc)
+    {
+        if (result.IsNullOrEmpty())
+        {
+            updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
+            return;
+        }
+
+        updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
+
+        // If result is too short, display content directly
+        if (result.Length < 99)
+        {
+            updateFunc?.Invoke(false, $"{hashCode}{result}");
+        }
+
+        // Add servers to configuration
+        var ret = await ConfigHandler.AddBatchServers(config, result, id, true);
+        if (ret <= 0)
+        {
+            Logging.SaveLog("FailedImportSubscription");
+            Logging.SaveLog(result);
+        }
+
+        // Update completion message
+        updateFunc?.Invoke(false,
+            ret > 0
+                ? $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}"
+                : $"{hashCode}{ResUI.MsgFailedImportSubscription}");
+    }
 }

From 120e8d0686157497e838af0339c2290df5ef57ac Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 16 Aug 2025 20:05:56 +0800
Subject: [PATCH 047/115] Fixed a bug in parsing subscription result

https://github.com/2dust/v2rayN/issues/7734
---
 v2rayN/ServiceLib/Handler/ConfigHandler.cs   |  5 +++++
 v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs     |  9 +--------
 v2rayN/ServiceLib/Handler/Fmt/HtmlPageFmt.cs | 11 +++++++++++
 3 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 v2rayN/ServiceLib/Handler/Fmt/HtmlPageFmt.cs

diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
index 981fd2f5..8450cba8 100644
--- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -1412,6 +1412,11 @@ public class ConfigHandler
         {
             profileItem = V2rayFmt.ResolveFull(strData, subRemarks);
         }
+        //Is Html Page
+        if (profileItem is null && HtmlPageFmt.IsHtmlPage(strData))
+        {
+            return -1;
+        }
         //Is Clash configuration
         if (profileItem is null)
         {
diff --git a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
index 61614f13..965efbb1 100644
--- a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
+++ b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
@@ -220,14 +220,7 @@ public class BaseFmt
 
     protected static bool Contains(string str, params string[] s)
     {
-        foreach (var item in s)
-        {
-            if (str.Contains(item, StringComparison.OrdinalIgnoreCase))
-            {
-                return true;
-            }
-        }
-        return false;
+        return s.All(item => str.Contains(item, StringComparison.OrdinalIgnoreCase));
     }
 
     protected static string WriteAllText(string strData, string ext = "json")
diff --git a/v2rayN/ServiceLib/Handler/Fmt/HtmlPageFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/HtmlPageFmt.cs
new file mode 100644
index 00000000..38d139d4
--- /dev/null
+++ b/v2rayN/ServiceLib/Handler/Fmt/HtmlPageFmt.cs
@@ -0,0 +1,11 @@
+using SkiaSharp;
+
+namespace ServiceLib.Handler.Fmt;
+
+public class HtmlPageFmt : BaseFmt
+{
+    public static bool IsHtmlPage(string strData)
+    {
+        return Contains(strData, "<html", "<!doctype html", "<head");
+    }
+}

From 310d2667451fab7ee5a28a721e2606442348606a Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Sun, 17 Aug 2025 09:15:06 +0800
Subject: [PATCH 048/115] Add VLESS encryption support (#7782)

---
 v2rayN/ServiceLib/Handler/ConfigHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
index 8450cba8..0b655427 100644
--- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -963,7 +963,7 @@ public class ConfigHandler
         {
             return -1;
         }
-        if (profileItem.Security.IsNotEmpty() && profileItem.Security != Global.None)
+        if (profileItem.Security.IsNullOrEmpty())
         {
             profileItem.Security = Global.None;
         }

From 6979e21628c580f21c7e5110e22b1b36221e1a46 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Sun, 17 Aug 2025 09:32:02 +0800
Subject: [PATCH 049/115] Remove DomainMatcher (#7781)

---
 v2rayN/ServiceLib/Global.cs                   |  7 ---
 v2rayN/ServiceLib/Models/ConfigItems.cs       |  1 -
 v2rayN/ServiceLib/Models/V2rayConfig.cs       |  2 -
 v2rayN/ServiceLib/Resx/ResUI.Designer.cs      |  9 ---
 v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx       |  3 -
 v2rayN/ServiceLib/Resx/ResUI.hu.resx          |  3 -
 v2rayN/ServiceLib/Resx/ResUI.resx             |  3 -
 v2rayN/ServiceLib/Resx/ResUI.ru.resx          | 59 +++++++++----------
 v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx     |  3 -
 v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx     |  3 -
 .../CoreConfig/CoreConfigV2rayService.cs      |  1 -
 .../ViewModels/RoutingSettingViewModel.cs     |  5 --
 .../Views/RoutingSettingWindow.axaml          | 17 +-----
 .../Views/RoutingSettingWindow.axaml.cs       |  2 -
 v2rayN/v2rayN/Views/RoutingSettingWindow.xaml | 18 +-----
 .../v2rayN/Views/RoutingSettingWindow.xaml.cs |  2 -
 16 files changed, 31 insertions(+), 107 deletions(-)

diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs
index e3be7004..615c0d38 100644
--- a/v2rayN/ServiceLib/Global.cs
+++ b/v2rayN/ServiceLib/Global.cs
@@ -305,13 +305,6 @@ public class Global
             ""
     ];
 
-    public static readonly List<string> DomainMatchers =
-    [
-        "linear",
-            "mph",
-            ""
-    ];
-
     public static readonly List<string> Fingerprints =
     [
         "chrome",
diff --git a/v2rayN/ServiceLib/Models/ConfigItems.cs b/v2rayN/ServiceLib/Models/ConfigItems.cs
index 1c3a57c3..148f2bd7 100644
--- a/v2rayN/ServiceLib/Models/ConfigItems.cs
+++ b/v2rayN/ServiceLib/Models/ConfigItems.cs
@@ -165,7 +165,6 @@ public class RoutingBasicItem
 {
     public string DomainStrategy { get; set; }
     public string DomainStrategy4Singbox { get; set; }
-    public string DomainMatcher { get; set; }
     public string RoutingIndexId { get; set; }
 }
 
diff --git a/v2rayN/ServiceLib/Models/V2rayConfig.cs b/v2rayN/ServiceLib/Models/V2rayConfig.cs
index 702bbae1..cff3cf8b 100644
--- a/v2rayN/ServiceLib/Models/V2rayConfig.cs
+++ b/v2rayN/ServiceLib/Models/V2rayConfig.cs
@@ -233,8 +233,6 @@ public class Routing4Ray
 {
     public string domainStrategy { get; set; }
 
-    public string? domainMatcher { get; set; }
-
     public List<RulesItem4Ray> rules { get; set; }
 
     public List<BalancersItem4Ray>? balancers { get; set; }
diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index 2adb4f8d..da0ee773 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -2463,15 +2463,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Domain Matcher 的本地化字符串。
-        /// </summary>
-        public static string TbdomainMatcher {
-            get {
-                return ResourceManager.GetString("TbdomainMatcher", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Domain strategy 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
index d35c8d20..6873e1c8 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -825,9 +825,6 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>تنظیم کردن به عنوان قانون فعال</value>
   </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>تطبیق دامنه</value>
-  </data>
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>استراتژی دامنه</value>
   </data>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
index 4bc19006..d90ac86c 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -825,9 +825,6 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>Beállítás aktív szabályként (Enter)</value>
   </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>Tartomány illesztő</value>
-  </data>
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>Tartomány stratégia</value>
   </data>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index 4cf1b91a..2b2e3abd 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -825,9 +825,6 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>Set as active rule (Enter)</value>
   </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>Domain Matcher</value>
-  </data>
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>Domain strategy</value>
   </data>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
index 97c04c81..bb1f6184 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
     Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -825,9 +825,6 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>Установить как активное правило</value>
   </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>Сопоставитель доменов</value>
-  </data>
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>Доменная стратегия</value>
   </data>
@@ -1500,4 +1497,4 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>Эта функция предназначена для продвинутых пользователей и особых случаев. После включения игнорируются базовые настройки ядра, DNS и маршрутизации. Вы должны самостоятельно корректно задать порт системного прокси, учёт трафика и другие связанные параметры — всё настраивается вручную.</value>
   </data>
-</root>
+</root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index a2506ed8..b10ff641 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -825,9 +825,6 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>设为活动规则 (Enter)</value>
   </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>域名匹配算法</value>
-  </data>
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>域名解析策略</value>
   </data>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index 3d16e5b5..b3738082 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -825,9 +825,6 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>設為活動規則 (Enter)</value>
   </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>域名匹配演算法</value>
-  </data>
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>域名解析策略</value>
   </data>
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
index 62c2e182..96a2556e 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
@@ -523,7 +523,6 @@ public class CoreConfigV2rayService
             if (v2rayConfig.routing?.rules != null)
             {
                 v2rayConfig.routing.domainStrategy = _config.RoutingBasicItem.DomainStrategy;
-                v2rayConfig.routing.domainMatcher = _config.RoutingBasicItem.DomainMatcher.IsNullOrEmpty() ? null : _config.RoutingBasicItem.DomainMatcher;
 
                 var routing = await ConfigHandler.GetDefaultRouting(_config);
                 if (routing != null)
diff --git a/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs b/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs
index 73b18fb7..e202a094 100644
--- a/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs
@@ -20,9 +20,6 @@ public class RoutingSettingViewModel : MyReactiveObject
     [Reactive]
     public string DomainStrategy { get; set; }
 
-    [Reactive]
-    public string DomainMatcher { get; set; }
-
     [Reactive]
     public string DomainStrategy4Singbox { get; set; }
 
@@ -75,7 +72,6 @@ public class RoutingSettingViewModel : MyReactiveObject
         SelectedSource = new();
 
         DomainStrategy = _config.RoutingBasicItem.DomainStrategy;
-        DomainMatcher = _config.RoutingBasicItem.DomainMatcher;
         DomainStrategy4Singbox = _config.RoutingBasicItem.DomainStrategy4Singbox;
 
         await ConfigHandler.InitBuiltinRouting(_config);
@@ -109,7 +105,6 @@ public class RoutingSettingViewModel : MyReactiveObject
     private async Task SaveRoutingAsync()
     {
         _config.RoutingBasicItem.DomainStrategy = DomainStrategy;
-        _config.RoutingBasicItem.DomainMatcher = DomainMatcher;
         _config.RoutingBasicItem.DomainStrategy4Singbox = DomainStrategy4Singbox;
 
         if (await ConfigHandler.SaveConfig(_config) == 0)
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
index fba1863d..710980c4 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
@@ -50,7 +50,7 @@
             Margin="{StaticResource Margin4}"
             ColumnDefinitions="Auto,Auto"
             DockPanel.Dock="Top"
-            RowDefinitions="Auto,Auto,Auto">
+            RowDefinitions="Auto,Auto">
 
             <TextBlock
                 Grid.Row="0"
@@ -74,19 +74,6 @@
                 Grid.Row="1"
                 Grid.Column="0"
                 Margin="{StaticResource Margin4}"
-                VerticalAlignment="Center"
-                Text="{x:Static resx:ResUI.TbdomainMatcher}" />
-            <ComboBox
-                x:Name="cmbdomainMatcher"
-                Grid.Row="1"
-                Grid.Column="1"
-                Width="300"
-                Margin="{StaticResource Margin4}" />
-
-            <TextBlock
-                Grid.Row="2"
-                Grid.Column="0"
-                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center">
                 <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy4Singbox_Click">
                     <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
@@ -94,7 +81,7 @@
             </TextBlock>
             <ComboBox
                 x:Name="cmbdomainStrategy4Singbox"
-                Grid.Row="2"
+                Grid.Row="1"
                 Grid.Column="1"
                 Width="300"
                 Margin="{StaticResource Margin4}"
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs
index 53fba00b..1b6dae74 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs
@@ -27,7 +27,6 @@ public partial class RoutingSettingWindow : WindowBase<RoutingSettingViewModel>
         ViewModel = new RoutingSettingViewModel(UpdateViewHandler);
 
         cmbdomainStrategy.ItemsSource = Global.DomainStrategies;
-        cmbdomainMatcher.ItemsSource = Global.DomainMatchers;
         cmbdomainStrategy4Singbox.ItemsSource = Global.DomainStrategies4Singbox;
 
         this.WhenActivated(disposables =>
@@ -36,7 +35,6 @@ public partial class RoutingSettingWindow : WindowBase<RoutingSettingViewModel>
             this.Bind(ViewModel, vm => vm.SelectedSource, v => v.lstRoutings.SelectedItem).DisposeWith(disposables);
 
             this.Bind(ViewModel, vm => vm.DomainStrategy, v => v.cmbdomainStrategy.SelectedValue).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.DomainMatcher, v => v.cmbdomainMatcher.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.DomainStrategy4Singbox, v => v.cmbdomainStrategy4Singbox.SelectedValue).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.RoutingAdvancedAddCmd, v => v.menuRoutingAdvancedAdd).DisposeWith(disposables);
diff --git a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
index 463a69d4..36b42409 100644
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
@@ -78,7 +78,6 @@
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
@@ -109,21 +108,6 @@
                 Grid.Column="0"
                 Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
-                Style="{StaticResource ToolbarTextBlock}"
-                Text="{x:Static resx:ResUI.TbdomainMatcher}" />
-            <ComboBox
-                x:Name="cmbdomainMatcher"
-                Grid.Row="1"
-                Grid.Column="1"
-                Width="300"
-                Margin="{StaticResource Margin4}"
-                Style="{StaticResource DefComboBox}" />
-
-            <TextBlock
-                Grid.Row="2"
-                Grid.Column="0"
-                Margin="{StaticResource Margin4}"
-                VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}">
                 <Hyperlink Click="linkdomainStrategy4Singbox_Click">
                     <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
@@ -132,7 +116,7 @@
             </TextBlock>
             <ComboBox
                 x:Name="cmbdomainStrategy4Singbox"
-                Grid.Row="2"
+                Grid.Row="1"
                 Grid.Column="1"
                 Width="300"
                 Margin="{StaticResource Margin4}"
diff --git a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
index 0c7f1518..a1782c38 100644
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
@@ -22,7 +22,6 @@ public partial class RoutingSettingWindow
         ViewModel = new RoutingSettingViewModel(UpdateViewHandler);
 
         cmbdomainStrategy.ItemsSource = Global.DomainStrategies;
-        cmbdomainMatcher.ItemsSource = Global.DomainMatchers;
         cmbdomainStrategy4Singbox.ItemsSource = Global.DomainStrategies4Singbox;
 
         this.WhenActivated(disposables =>
@@ -31,7 +30,6 @@ public partial class RoutingSettingWindow
             this.Bind(ViewModel, vm => vm.SelectedSource, v => v.lstRoutings.SelectedItem).DisposeWith(disposables);
 
             this.Bind(ViewModel, vm => vm.DomainStrategy, v => v.cmbdomainStrategy.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.DomainMatcher, v => v.cmbdomainMatcher.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.DomainStrategy4Singbox, v => v.cmbdomainStrategy4Singbox.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.RoutingAdvancedAddCmd, v => v.menuRoutingAdvancedAdd).DisposeWith(disposables);

From 06636d04ac433f157498de86337787c1445c2563 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 17 Aug 2025 11:00:13 +0800
Subject: [PATCH 050/115] PacHandler is changed to singleton mode

---
 v2rayN/ServiceLib/Handler/PacHandler.cs       | 27 ++++++++++---------
 .../Handler/SysProxy/SysProxyHandler.cs       |  4 +--
 .../ViewModels/CheckUpdateViewModel.cs        |  5 +---
 .../ViewModels/StatusBarViewModel.cs          |  5 +---
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/v2rayN/ServiceLib/Handler/PacHandler.cs b/v2rayN/ServiceLib/Handler/PacHandler.cs
index 6d2e1f19..51febada 100644
--- a/v2rayN/ServiceLib/Handler/PacHandler.cs
+++ b/v2rayN/ServiceLib/Handler/PacHandler.cs
@@ -5,15 +5,18 @@ namespace ServiceLib.Handler;
 
 public class PacHandler
 {
-    private static string _configPath;
-    private static int _httpPort;
-    private static int _pacPort;
-    private static TcpListener? _tcpListener;
-    private static byte[] _writeContent;
-    private static bool _isRunning;
-    private static bool _needRestart = true;
+    private static readonly Lazy<PacHandler> _instance = new(() => new PacHandler());
+    public static PacHandler Instance => _instance.Value;
 
-    public static async Task Start(string configPath, int httpPort, int pacPort)
+    private string _configPath;
+    private int _httpPort;
+    private int _pacPort;
+    private TcpListener? _tcpListener;
+    private byte[] _writeContent;
+    private bool _isRunning;
+    private bool _needRestart = true;
+
+    public async Task StartAsync(string configPath, int httpPort, int pacPort)
     {
         _needRestart = configPath != _configPath || httpPort != _httpPort || pacPort != _pacPort || !_isRunning;
 
@@ -30,7 +33,7 @@ public class PacHandler
         }
     }
 
-    private static async Task InitText()
+    private async Task InitText()
     {
         var path = Path.Combine(_configPath, "pac.txt");
 
@@ -59,7 +62,7 @@ public class PacHandler
         _writeContent = Encoding.UTF8.GetBytes(sb.ToString());
     }
 
-    private static void RunListener()
+    private void RunListener()
     {
         _tcpListener = TcpListener.Create(_pacPort);
         _isRunning = true;
@@ -87,14 +90,14 @@ public class PacHandler
         }, TaskCreationOptions.LongRunning);
     }
 
-    private static void WriteContent(TcpClient client)
+    private void WriteContent(TcpClient client)
     {
         var stream = client.GetStream();
         stream.Write(_writeContent, 0, _writeContent.Length);
         stream.Flush();
     }
 
-    public static void Stop()
+    public void Stop()
     {
         if (_tcpListener == null)
         {
diff --git a/v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs b/v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs
index 01361a92..ebb81325 100644
--- a/v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs
+++ b/v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs
@@ -56,7 +56,7 @@ public static class SysProxyHandler
 
             if (type != ESysProxyType.Pac && Utils.IsWindows())
             {
-                PacHandler.Stop();
+                PacHandler.Instance.Stop();
             }
         }
         catch (Exception ex)
@@ -91,7 +91,7 @@ public static class SysProxyHandler
     private static async Task SetWindowsProxyPac(int port)
     {
         var portPac = AppHandler.Instance.GetLocalPort(EInboundProtocol.pac);
-        await PacHandler.Start(Utils.GetConfigPath(), port, portPac);
+        await PacHandler.Instance.StartAsync(Utils.GetConfigPath(), port, portPac);
         var strProxy = $"{Global.HttpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
         ProxySettingWindows.SetProxy(strProxy, "", 4);
     }
diff --git a/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs b/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
index f3247798..1c93a677 100644
--- a/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
@@ -75,10 +75,7 @@ public class CheckUpdateViewModel : MyReactiveObject
 
     private async Task CheckUpdate()
     {
-        await Task.Run(async () =>
-        {
-            await CheckUpdateTask();
-        });
+        await Task.Run(CheckUpdateTask);
     }
 
     private async Task CheckUpdateTask()
diff --git a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
index 5c2acab6..211317a6 100644
--- a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
@@ -334,10 +334,7 @@ public class StatusBarViewModel : MyReactiveObject
 
         _updateView?.Invoke(EViewAction.DispatcherServerAvailability, ResUI.Speedtesting);
 
-        var msg = await Task.Run(async () =>
-        {
-            return await ConnectionHandler.Instance.RunAvailabilityCheck();
-        });
+        var msg = await Task.Run(ConnectionHandler.Instance.RunAvailabilityCheck);
 
         NoticeHandler.Instance.SendMessageEx(msg);
         _updateView?.Invoke(EViewAction.DispatcherServerAvailability, msg);

From c27651b7b7ee6355ef041b71f4334efcfd68e052 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Sun, 17 Aug 2025 13:52:57 +0800
Subject: [PATCH 051/115] Fixed Failed Gen Default Configuration (#7785)

---
 .../ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index fa2b14d8..8bb1a3f6 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -1658,6 +1658,7 @@ public class CoreConfigSingboxService
         {
             tag = Global.SingboxHostsDNSTag,
             type = "hosts",
+            predefined = new(),
         };
         if (simpleDNSItem.AddCommonHosts == true)
         {

From 4c3c1e0b5f8c3279a14253ea1452f9896a6a789e Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 17 Aug 2025 14:12:40 +0800
Subject: [PATCH 052/115] Optimization and upgrade tools

---
 v2rayN/AmazTool/UpgradeApp.cs | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/v2rayN/AmazTool/UpgradeApp.cs b/v2rayN/AmazTool/UpgradeApp.cs
index a4eb288c..caa269f4 100644
--- a/v2rayN/AmazTool/UpgradeApp.cs
+++ b/v2rayN/AmazTool/UpgradeApp.cs
@@ -79,15 +79,7 @@ internal class UpgradeApp
                         continue;
                     }
 
-                    try
-                    {
-                        entry.ExtractToFile(entryOutputPath, true);
-                    }
-                    catch
-                    {
-                        Thread.Sleep(1000);
-                        entry.ExtractToFile(entryOutputPath, true);
-                    }
+                    TryExtractToFile(entry, entryOutputPath);
 
                     Console.WriteLine(entryOutputPath);
                 }
@@ -113,4 +105,24 @@ internal class UpgradeApp
 
         Utils.StartV2RayN();
     }
+
+    private static bool TryExtractToFile(ZipArchiveEntry entry, string outputPath)
+    {
+        var retryCount = 5;
+        var delayMs = 1000;
+
+        for (var i = 1; i <= retryCount; i++)
+        {
+            try
+            {
+                entry.ExtractToFile(outputPath, true);
+                return true;
+            }
+            catch
+            {
+                Thread.Sleep(delayMs * i);
+            }
+        }
+        return false;
+    }
 }

From 5201dd5ad03691db2be83c616b720ffac2087171 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 17 Aug 2025 14:26:13 +0800
Subject: [PATCH 053/115] up 7.14.1

---
 v2rayN/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/Directory.Build.props b/v2rayN/Directory.Build.props
index 001b32fe..c7d69e20 100644
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.14.0</Version>
+        <Version>7.14.1</Version>
     </PropertyGroup>
 
     <PropertyGroup>

From c9c1cd8cbb59328903262e58d9ff4878d280e265 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 17 Aug 2025 16:26:13 +0800
Subject: [PATCH 054/115] Add Helper folder

---
 v2rayN/ServiceLib/Common/{QRCodeHelper.cs => QRCodeUtils.cs} | 2 +-
 v2rayN/ServiceLib/GlobalUsings.cs                            | 5 +++--
 v2rayN/ServiceLib/{Common => Helper}/DownloaderHelper.cs     | 2 +-
 v2rayN/ServiceLib/{Common => Helper}/HttpClientHelper.cs     | 2 +-
 v2rayN/ServiceLib/{Common => Helper}/SqliteHelper.cs         | 2 +-
 v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs          | 4 ++--
 v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs              | 2 +-
 v2rayN/v2rayN/Common/QRCodeHelper.cs                         | 2 +-
 8 files changed, 11 insertions(+), 10 deletions(-)
 rename v2rayN/ServiceLib/Common/{QRCodeHelper.cs => QRCodeUtils.cs} (98%)
 rename v2rayN/ServiceLib/{Common => Helper}/DownloaderHelper.cs (99%)
 rename v2rayN/ServiceLib/{Common => Helper}/HttpClientHelper.cs (99%)
 rename v2rayN/ServiceLib/{Common => Helper}/SqliteHelper.cs (98%)

diff --git a/v2rayN/ServiceLib/Common/QRCodeHelper.cs b/v2rayN/ServiceLib/Common/QRCodeUtils.cs
similarity index 98%
rename from v2rayN/ServiceLib/Common/QRCodeHelper.cs
rename to v2rayN/ServiceLib/Common/QRCodeUtils.cs
index 9938eadd..3d3dc90b 100644
--- a/v2rayN/ServiceLib/Common/QRCodeHelper.cs
+++ b/v2rayN/ServiceLib/Common/QRCodeUtils.cs
@@ -4,7 +4,7 @@ using ZXing.SkiaSharp;
 
 namespace ServiceLib.Common;
 
-public class QRCodeHelper
+public class QRCodeUtils
 {
     public static byte[]? GenQRCode(string? url)
     {
diff --git a/v2rayN/ServiceLib/GlobalUsings.cs b/v2rayN/ServiceLib/GlobalUsings.cs
index a4bf3ccd..7feb4705 100644
--- a/v2rayN/ServiceLib/GlobalUsings.cs
+++ b/v2rayN/ServiceLib/GlobalUsings.cs
@@ -1,11 +1,12 @@
-global using ServiceLib.Base;
+global using ServiceLib.Base;
 global using ServiceLib.Common;
 global using ServiceLib.Enums;
 global using ServiceLib.Handler;
+global using ServiceLib.Helper;
 global using ServiceLib.Handler.Fmt;
 global using ServiceLib.Services;
 global using ServiceLib.Services.Statistics;
 global using ServiceLib.Services.CoreConfig;
 global using ServiceLib.Models;
 global using ServiceLib.Resx;
-global using ServiceLib.Handler.SysProxy;
\ No newline at end of file
+global using ServiceLib.Handler.SysProxy;
diff --git a/v2rayN/ServiceLib/Common/DownloaderHelper.cs b/v2rayN/ServiceLib/Helper/DownloaderHelper.cs
similarity index 99%
rename from v2rayN/ServiceLib/Common/DownloaderHelper.cs
rename to v2rayN/ServiceLib/Helper/DownloaderHelper.cs
index 073e1ab4..3764499c 100644
--- a/v2rayN/ServiceLib/Common/DownloaderHelper.cs
+++ b/v2rayN/ServiceLib/Helper/DownloaderHelper.cs
@@ -1,7 +1,7 @@
 using System.Net;
 using Downloader;
 
-namespace ServiceLib.Common;
+namespace ServiceLib.Helper;
 
 public class DownloaderHelper
 {
diff --git a/v2rayN/ServiceLib/Common/HttpClientHelper.cs b/v2rayN/ServiceLib/Helper/HttpClientHelper.cs
similarity index 99%
rename from v2rayN/ServiceLib/Common/HttpClientHelper.cs
rename to v2rayN/ServiceLib/Helper/HttpClientHelper.cs
index 8bc1384a..3dfb45cc 100644
--- a/v2rayN/ServiceLib/Common/HttpClientHelper.cs
+++ b/v2rayN/ServiceLib/Helper/HttpClientHelper.cs
@@ -2,7 +2,7 @@ using System.Net.Http.Headers;
 using System.Net.Mime;
 using System.Text;
 
-namespace ServiceLib.Common;
+namespace ServiceLib.Helper;
 
 /// <summary>
 /// </summary>
diff --git a/v2rayN/ServiceLib/Common/SqliteHelper.cs b/v2rayN/ServiceLib/Helper/SqliteHelper.cs
similarity index 98%
rename from v2rayN/ServiceLib/Common/SqliteHelper.cs
rename to v2rayN/ServiceLib/Helper/SqliteHelper.cs
index 62b0a830..1561d3a5 100644
--- a/v2rayN/ServiceLib/Common/SqliteHelper.cs
+++ b/v2rayN/ServiceLib/Helper/SqliteHelper.cs
@@ -1,7 +1,7 @@
 using System.Collections;
 using SQLite;
 
-namespace ServiceLib.Common;
+namespace ServiceLib.Helper;
 
 public sealed class SQLiteHelper
 {
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index 8578036d..8945c1eb 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -420,7 +420,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     public async Task ScanScreenResult(byte[]? bytes)
     {
-        var result = QRCodeHelper.ParseBarcode(bytes);
+        var result = QRCodeUtils.ParseBarcode(bytes);
         await AddScanResultAsync(result);
     }
 
@@ -437,7 +437,7 @@ public class MainWindowViewModel : MyReactiveObject
             return;
         }
 
-        var result = QRCodeHelper.ParseBarcode(fileName);
+        var result = QRCodeUtils.ParseBarcode(fileName);
         await AddScanResultAsync(result);
     }
 
diff --git a/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs
index c4e3052c..3c498cb6 100644
--- a/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs
@@ -23,7 +23,7 @@ public partial class QrcodeView : UserControl
 
     private Bitmap? GetQRCode(string? url)
     {
-        var bytes = QRCodeHelper.GenQRCode(url);
+        var bytes = QRCodeUtils.GenQRCode(url);
         return ByteToBitmap(bytes);
     }
 
diff --git a/v2rayN/v2rayN/Common/QRCodeHelper.cs b/v2rayN/v2rayN/Common/QRCodeHelper.cs
index 74bf9545..6d070972 100644
--- a/v2rayN/v2rayN/Common/QRCodeHelper.cs
+++ b/v2rayN/v2rayN/Common/QRCodeHelper.cs
@@ -17,7 +17,7 @@ public class QRCodeHelper
         }
         try
         {
-            var qrCodeImage = ServiceLib.Common.QRCodeHelper.GenQRCode(strContent);
+            var qrCodeImage = QRCodeUtils.GenQRCode(strContent);
             return qrCodeImage is null ? null : ByteToImage(qrCodeImage);
         }
         catch

From 2060ac18fdaf1222868509ecb8343473cdec2664 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 17 Aug 2025 16:52:51 +0800
Subject: [PATCH 055/115] Add Manager folder

---
 v2rayN/ServiceLib/GlobalUsings.cs                        | 1 +
 v2rayN/ServiceLib/Handler/ConfigHandler.cs               | 2 +-
 v2rayN/ServiceLib/Handler/ConnectionHandler.cs           | 9 +++------
 v2rayN/ServiceLib/Handler/CoreConfigHandler.cs           | 2 +-
 v2rayN/ServiceLib/Handler/SubscriptionHandler.cs         | 2 +-
 v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs  | 2 +-
 v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs    | 2 +-
 .../ServiceLib/Handler/SysProxy/ProxySettingWindows.cs   | 2 +-
 v2rayN/ServiceLib/{Handler => Manager}/AppHandler.cs     | 4 ++--
 .../ServiceLib/{Handler => Manager}/ClashApiHandler.cs   | 2 +-
 .../ServiceLib/{Handler => Manager}/CoreAdminHandler.cs  | 2 +-
 v2rayN/ServiceLib/{Handler => Manager}/CoreHandler.cs    | 2 +-
 .../ServiceLib/{Handler => Manager}/CoreInfoHandler.cs   | 2 +-
 v2rayN/ServiceLib/{Handler => Manager}/NoticeHandler.cs  | 2 +-
 v2rayN/ServiceLib/{Handler => Manager}/PacHandler.cs     | 2 +-
 .../ServiceLib/{Handler => Manager}/ProfileExHandler.cs  | 0
 .../ServiceLib/{Handler => Manager}/StatisticsHandler.cs | 6 +++---
 v2rayN/ServiceLib/{Handler => Manager}/TaskHandler.cs    | 6 +++---
 v2rayN/ServiceLib/{Handler => Manager}/WebDavHandler.cs  | 2 +-
 v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs       | 2 +-
 v2rayN/v2rayN.Desktop/App.axaml.cs                       | 1 +
 v2rayN/v2rayN.Desktop/Base/WindowBase.cs                 | 1 +
 v2rayN/v2rayN.Desktop/Program.cs                         | 1 +
 .../v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs   | 1 +
 v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs     | 1 +
 v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs    | 1 +
 .../Views/FullConfigTemplateWindow.axaml.cs              | 1 +
 v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs          | 1 +
 v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs | 1 +
 v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs        | 1 +
 v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs       | 1 +
 .../v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs  | 1 +
 v2rayN/v2rayN/App.xaml.cs                                | 1 +
 v2rayN/v2rayN/Base/WindowBase.cs                         | 1 +
 v2rayN/v2rayN/Converters/MaterialDesignFonts.cs          | 1 +
 v2rayN/v2rayN/Handler/HotkeyHandler.cs                   | 1 +
 v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs        | 1 +
 v2rayN/v2rayN/Views/AddServer2Window.xaml.cs             | 1 +
 v2rayN/v2rayN/Views/AddServerWindow.xaml.cs              | 1 +
 v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs             | 1 +
 v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs     | 1 +
 v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs    | 1 +
 v2rayN/v2rayN/Views/MainWindow.xaml.cs                   | 1 +
 v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs          | 1 +
 v2rayN/v2rayN/Views/ProfilesView.xaml.cs                 | 1 +
 v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs     | 1 +
 v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs     | 1 +
 v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs         | 1 +
 v2rayN/v2rayN/Views/StatusBarView.xaml.cs                | 1 +
 v2rayN/v2rayN/Views/SubEditWindow.xaml.cs                | 1 +
 v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs             | 1 +
 51 files changed, 57 insertions(+), 28 deletions(-)
 rename v2rayN/ServiceLib/{Handler => Manager}/AppHandler.cs (98%)
 rename v2rayN/ServiceLib/{Handler => Manager}/ClashApiHandler.cs (99%)
 rename v2rayN/ServiceLib/{Handler => Manager}/CoreAdminHandler.cs (99%)
 rename v2rayN/ServiceLib/{Handler => Manager}/CoreHandler.cs (99%)
 rename v2rayN/ServiceLib/{Handler => Manager}/CoreInfoHandler.cs (99%)
 rename v2rayN/ServiceLib/{Handler => Manager}/NoticeHandler.cs (97%)
 rename v2rayN/ServiceLib/{Handler => Manager}/PacHandler.cs (99%)
 rename v2rayN/ServiceLib/{Handler => Manager}/ProfileExHandler.cs (100%)
 rename v2rayN/ServiceLib/{Handler => Manager}/StatisticsHandler.cs (97%)
 rename v2rayN/ServiceLib/{Handler => Manager}/TaskHandler.cs (95%)
 rename v2rayN/ServiceLib/{Handler => Manager}/WebDavHandler.cs (99%)

diff --git a/v2rayN/ServiceLib/GlobalUsings.cs b/v2rayN/ServiceLib/GlobalUsings.cs
index 7feb4705..9a78c73b 100644
--- a/v2rayN/ServiceLib/GlobalUsings.cs
+++ b/v2rayN/ServiceLib/GlobalUsings.cs
@@ -3,6 +3,7 @@ global using ServiceLib.Common;
 global using ServiceLib.Enums;
 global using ServiceLib.Handler;
 global using ServiceLib.Helper;
+global using ServiceLib.Manager;
 global using ServiceLib.Handler.Fmt;
 global using ServiceLib.Services;
 global using ServiceLib.Services.Statistics;
diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
index 0b655427..156c9d30 100644
--- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -3,7 +3,7 @@ using System.Text.RegularExpressions;
 
 namespace ServiceLib.Handler;
 
-public class ConfigHandler
+public static class ConfigHandler
 {
     private static readonly string _configRes = Global.ConfigFileName;
     private static readonly string _tag = "ConfigHandler";
diff --git a/v2rayN/ServiceLib/Handler/ConnectionHandler.cs b/v2rayN/ServiceLib/Handler/ConnectionHandler.cs
index 3cfc6020..a0db6a2b 100644
--- a/v2rayN/ServiceLib/Handler/ConnectionHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConnectionHandler.cs
@@ -1,11 +1,8 @@
 namespace ServiceLib.Handler;
 
-public class ConnectionHandler
+public static class ConnectionHandler
 {
-    private static readonly Lazy<ConnectionHandler> _instance = new(() => new());
-    public static ConnectionHandler Instance => _instance.Value;
-
-    public async Task<string> RunAvailabilityCheck()
+    public static async Task<string> RunAvailabilityCheck()
     {
         var downloadHandle = new DownloadService();
         var time = await downloadHandle.RunAvailabilityCheck(null);
@@ -14,7 +11,7 @@ public class ConnectionHandler
         return string.Format(ResUI.TestMeOutput, time, ip);
     }
 
-    private async Task<string?> GetIPInfo(DownloadService downloadHandle)
+    private static async Task<string?> GetIPInfo(DownloadService downloadHandle)
     {
         var url = AppHandler.Instance.Config.SpeedTestItem.IPAPIUrl;
         if (url.IsNullOrEmpty())
diff --git a/v2rayN/ServiceLib/Handler/CoreConfigHandler.cs b/v2rayN/ServiceLib/Handler/CoreConfigHandler.cs
index 40c5eacf..a057d4b4 100644
--- a/v2rayN/ServiceLib/Handler/CoreConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/CoreConfigHandler.cs
@@ -3,7 +3,7 @@ namespace ServiceLib.Handler;
 /// <summary>
 /// Core configuration file processing class
 /// </summary>
-public class CoreConfigHandler
+public static class CoreConfigHandler
 {
     private static readonly string _tag = "CoreConfigHandler";
 
diff --git a/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs b/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
index f93eb2fa..2916a07f 100644
--- a/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
+++ b/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
@@ -1,6 +1,6 @@
 namespace ServiceLib.Handler;
 
-public class SubscriptionHandler
+public static class SubscriptionHandler
 {
     public static async Task UpdateProcess(Config config, string subId, bool blProxy, Action<bool, string> updateFunc)
     {
diff --git a/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs b/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs
index 9c2be056..828c2102 100644
--- a/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs
+++ b/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs
@@ -1,6 +1,6 @@
 namespace ServiceLib.Handler.SysProxy;
 
-public class ProxySettingLinux
+public static class ProxySettingLinux
 {
     private static readonly string _proxySetFileName = $"{Global.ProxySetLinuxShellFileName.Replace(Global.NamespaceSample, "")}.sh";
 
diff --git a/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs b/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs
index 9d15839b..85d9b821 100644
--- a/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs
+++ b/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs
@@ -1,6 +1,6 @@
 namespace ServiceLib.Handler.SysProxy;
 
-public class ProxySettingOSX
+public static class ProxySettingOSX
 {
     private static readonly string _proxySetFileName = $"{Global.ProxySetOSXShellFileName.Replace(Global.NamespaceSample, "")}.sh";
 
diff --git a/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingWindows.cs b/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingWindows.cs
index 79b860b0..44b7e046 100644
--- a/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingWindows.cs
+++ b/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingWindows.cs
@@ -3,7 +3,7 @@ using static ServiceLib.Handler.SysProxy.ProxySettingWindows.InternetConnectionO
 
 namespace ServiceLib.Handler.SysProxy;
 
-public class ProxySettingWindows
+public static class ProxySettingWindows
 {
     private const string _regPath = @"Software\Microsoft\Windows\CurrentVersion\Internet Settings";
 
diff --git a/v2rayN/ServiceLib/Handler/AppHandler.cs b/v2rayN/ServiceLib/Manager/AppHandler.cs
similarity index 98%
rename from v2rayN/ServiceLib/Handler/AppHandler.cs
rename to v2rayN/ServiceLib/Manager/AppHandler.cs
index 18ba19b8..25c849b9 100644
--- a/v2rayN/ServiceLib/Handler/AppHandler.cs
+++ b/v2rayN/ServiceLib/Manager/AppHandler.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Handler;
+namespace ServiceLib.Manager;
 
 public sealed class AppHandler
 {
@@ -97,7 +97,7 @@ public sealed class AppHandler
         return localPort + (int)protocol;
     }
 
-    public void AddProcess(IntPtr processHandle)
+    public void AddProcess(nint processHandle)
     {
         if (Utils.IsWindows())
         {
diff --git a/v2rayN/ServiceLib/Handler/ClashApiHandler.cs b/v2rayN/ServiceLib/Manager/ClashApiHandler.cs
similarity index 99%
rename from v2rayN/ServiceLib/Handler/ClashApiHandler.cs
rename to v2rayN/ServiceLib/Manager/ClashApiHandler.cs
index af5b0c57..33b0355a 100644
--- a/v2rayN/ServiceLib/Handler/ClashApiHandler.cs
+++ b/v2rayN/ServiceLib/Manager/ClashApiHandler.cs
@@ -1,6 +1,6 @@
 using static ServiceLib.Models.ClashProxies;
 
-namespace ServiceLib.Handler;
+namespace ServiceLib.Manager;
 
 public sealed class ClashApiHandler
 {
diff --git a/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs b/v2rayN/ServiceLib/Manager/CoreAdminHandler.cs
similarity index 99%
rename from v2rayN/ServiceLib/Handler/CoreAdminHandler.cs
rename to v2rayN/ServiceLib/Manager/CoreAdminHandler.cs
index ec99b26b..e5db01ba 100644
--- a/v2rayN/ServiceLib/Handler/CoreAdminHandler.cs
+++ b/v2rayN/ServiceLib/Manager/CoreAdminHandler.cs
@@ -3,7 +3,7 @@ using System.Text;
 using CliWrap;
 using CliWrap.Buffered;
 
-namespace ServiceLib.Handler;
+namespace ServiceLib.Manager;
 
 public class CoreAdminHandler
 {
diff --git a/v2rayN/ServiceLib/Handler/CoreHandler.cs b/v2rayN/ServiceLib/Manager/CoreHandler.cs
similarity index 99%
rename from v2rayN/ServiceLib/Handler/CoreHandler.cs
rename to v2rayN/ServiceLib/Manager/CoreHandler.cs
index f7ad2285..b12c7321 100644
--- a/v2rayN/ServiceLib/Handler/CoreHandler.cs
+++ b/v2rayN/ServiceLib/Manager/CoreHandler.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using System.Text;
 
-namespace ServiceLib.Handler;
+namespace ServiceLib.Manager;
 
 /// <summary>
 /// Core process processing class
diff --git a/v2rayN/ServiceLib/Handler/CoreInfoHandler.cs b/v2rayN/ServiceLib/Manager/CoreInfoHandler.cs
similarity index 99%
rename from v2rayN/ServiceLib/Handler/CoreInfoHandler.cs
rename to v2rayN/ServiceLib/Manager/CoreInfoHandler.cs
index 6b7e1df2..d734c04e 100644
--- a/v2rayN/ServiceLib/Handler/CoreInfoHandler.cs
+++ b/v2rayN/ServiceLib/Manager/CoreInfoHandler.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Handler;
+namespace ServiceLib.Manager;
 
 public sealed class CoreInfoHandler
 {
diff --git a/v2rayN/ServiceLib/Handler/NoticeHandler.cs b/v2rayN/ServiceLib/Manager/NoticeHandler.cs
similarity index 97%
rename from v2rayN/ServiceLib/Handler/NoticeHandler.cs
rename to v2rayN/ServiceLib/Manager/NoticeHandler.cs
index 31cb2204..177fd445 100644
--- a/v2rayN/ServiceLib/Handler/NoticeHandler.cs
+++ b/v2rayN/ServiceLib/Manager/NoticeHandler.cs
@@ -1,6 +1,6 @@
 using ReactiveUI;
 
-namespace ServiceLib.Handler;
+namespace ServiceLib.Manager;
 
 public class NoticeHandler
 {
diff --git a/v2rayN/ServiceLib/Handler/PacHandler.cs b/v2rayN/ServiceLib/Manager/PacHandler.cs
similarity index 99%
rename from v2rayN/ServiceLib/Handler/PacHandler.cs
rename to v2rayN/ServiceLib/Manager/PacHandler.cs
index 51febada..7f2534e1 100644
--- a/v2rayN/ServiceLib/Handler/PacHandler.cs
+++ b/v2rayN/ServiceLib/Manager/PacHandler.cs
@@ -1,7 +1,7 @@
 using System.Net.Sockets;
 using System.Text;
 
-namespace ServiceLib.Handler;
+namespace ServiceLib.Manager;
 
 public class PacHandler
 {
diff --git a/v2rayN/ServiceLib/Handler/ProfileExHandler.cs b/v2rayN/ServiceLib/Manager/ProfileExHandler.cs
similarity index 100%
rename from v2rayN/ServiceLib/Handler/ProfileExHandler.cs
rename to v2rayN/ServiceLib/Manager/ProfileExHandler.cs
diff --git a/v2rayN/ServiceLib/Handler/StatisticsHandler.cs b/v2rayN/ServiceLib/Manager/StatisticsHandler.cs
similarity index 97%
rename from v2rayN/ServiceLib/Handler/StatisticsHandler.cs
rename to v2rayN/ServiceLib/Manager/StatisticsHandler.cs
index 890c047d..2c683aeb 100644
--- a/v2rayN/ServiceLib/Handler/StatisticsHandler.cs
+++ b/v2rayN/ServiceLib/Manager/StatisticsHandler.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Handler;
+namespace ServiceLib.Manager;
 
 public class StatisticsHandler
 {
@@ -91,7 +91,7 @@ public class StatisticsHandler
     {
         await SQLiteHelper.Instance.ExecuteAsync($"delete from ServerStatItem where indexId not in ( select indexId from ProfileItem )");
 
-        long ticks = DateTime.Now.Date.Ticks;
+        var ticks = DateTime.Now.Date.Ticks;
         await SQLiteHelper.Instance.ExecuteAsync($"update ServerStatItem set todayUp = 0,todayDown=0,dateNow={ticks} where dateNow<>{ticks}");
 
         _lstServerStat = await SQLiteHelper.Instance.TableAsync<ServerStatItem>().ToListAsync();
@@ -128,7 +128,7 @@ public class StatisticsHandler
 
     private async Task GetServerStatItem(string indexId)
     {
-        long ticks = DateTime.Now.Date.Ticks;
+        var ticks = DateTime.Now.Date.Ticks;
         if (_serverStatItem != null && _serverStatItem.IndexId != indexId)
         {
             _serverStatItem = null;
diff --git a/v2rayN/ServiceLib/Handler/TaskHandler.cs b/v2rayN/ServiceLib/Manager/TaskHandler.cs
similarity index 95%
rename from v2rayN/ServiceLib/Handler/TaskHandler.cs
rename to v2rayN/ServiceLib/Manager/TaskHandler.cs
index b49570be..0dab6d2e 100644
--- a/v2rayN/ServiceLib/Handler/TaskHandler.cs
+++ b/v2rayN/ServiceLib/Manager/TaskHandler.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Handler;
+namespace ServiceLib.Manager;
 
 public class TaskHandler
 {
@@ -66,7 +66,7 @@ public class TaskHandler
 
         foreach (var item in lstSubs)
         {
-            await SubscriptionHandler.UpdateProcess(config, item.Id, true, (bool success, string msg) =>
+            await SubscriptionHandler.UpdateProcess(config, item.Id, true, (success, msg) =>
             {
                 updateFunc?.Invoke(success, msg);
                 if (success)
@@ -87,7 +87,7 @@ public class TaskHandler
             Logging.SaveLog("Execute update geo files");
 
             var updateHandle = new UpdateService();
-            await updateHandle.UpdateGeoFileAll(config, (bool success, string msg) =>
+            await updateHandle.UpdateGeoFileAll(config, (success, msg) =>
             {
                 updateFunc?.Invoke(false, msg);
             });
diff --git a/v2rayN/ServiceLib/Handler/WebDavHandler.cs b/v2rayN/ServiceLib/Manager/WebDavHandler.cs
similarity index 99%
rename from v2rayN/ServiceLib/Handler/WebDavHandler.cs
rename to v2rayN/ServiceLib/Manager/WebDavHandler.cs
index 865f4588..cf91cc7d 100644
--- a/v2rayN/ServiceLib/Handler/WebDavHandler.cs
+++ b/v2rayN/ServiceLib/Manager/WebDavHandler.cs
@@ -1,7 +1,7 @@
 using System.Net;
 using WebDav;
 
-namespace ServiceLib.Handler;
+namespace ServiceLib.Manager;
 
 public sealed class WebDavHandler
 {
diff --git a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
index 211317a6..f9c4e6d7 100644
--- a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
@@ -334,7 +334,7 @@ public class StatusBarViewModel : MyReactiveObject
 
         _updateView?.Invoke(EViewAction.DispatcherServerAvailability, ResUI.Speedtesting);
 
-        var msg = await Task.Run(ConnectionHandler.Instance.RunAvailabilityCheck);
+        var msg = await Task.Run(ConnectionHandler.RunAvailabilityCheck);
 
         NoticeHandler.Instance.SendMessageEx(msg);
         _updateView?.Invoke(EViewAction.DispatcherServerAvailability, msg);
diff --git a/v2rayN/v2rayN.Desktop/App.axaml.cs b/v2rayN/v2rayN.Desktop/App.axaml.cs
index ebd5c29a..cfd4210b 100644
--- a/v2rayN/v2rayN.Desktop/App.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/App.axaml.cs
@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
+using ServiceLib.Manager;
 using Splat;
 using v2rayN.Desktop.Common;
 using v2rayN.Desktop.Views;
diff --git a/v2rayN/v2rayN.Desktop/Base/WindowBase.cs b/v2rayN/v2rayN.Desktop/Base/WindowBase.cs
index a84fc86c..99395add 100644
--- a/v2rayN/v2rayN.Desktop/Base/WindowBase.cs
+++ b/v2rayN/v2rayN.Desktop/Base/WindowBase.cs
@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Desktop.Base;
 
diff --git a/v2rayN/v2rayN.Desktop/Program.cs b/v2rayN/v2rayN.Desktop/Program.cs
index 52fdbf92..f15276c3 100644
--- a/v2rayN/v2rayN.Desktop/Program.cs
+++ b/v2rayN/v2rayN.Desktop/Program.cs
@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.ReactiveUI;
+using ServiceLib.Manager;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop;
diff --git a/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs b/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
index 877a3b4f..0347f330 100644
--- a/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
+++ b/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
@@ -8,6 +8,7 @@ using Avalonia.Styling;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Semi.Avalonia;
+using ServiceLib.Manager;
 
 namespace v2rayN.Desktop.ViewModels;
 
diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
index 9d24175f..c46c6ea4 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
@@ -2,6 +2,7 @@ using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
+using ServiceLib.Manager;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;
diff --git a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs
index 7b239ff4..294a1eba 100644
--- a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs
@@ -2,6 +2,7 @@ using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
+using ServiceLib.Manager;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;
diff --git a/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
index 502fef36..6b432e9d 100644
--- a/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
@@ -1,6 +1,7 @@
 using System.Reactive.Disposables;
 using Avalonia.Interactivity;
 using ReactiveUI;
+using ServiceLib.Manager;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;
diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
index 581e0a35..08a3bb81 100644
--- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
@@ -9,6 +9,7 @@ using Avalonia.Threading;
 using DialogHostAvalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
+using ServiceLib.Manager;
 using Splat;
 using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Common;
diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
index a7529369..50aefe98 100644
--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
@@ -1,6 +1,7 @@
 using System.Reactive.Disposables;
 using Avalonia.Controls;
 using ReactiveUI;
+using ServiceLib.Manager;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
index f72c1f51..7ca7cd53 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
@@ -7,6 +7,7 @@ using Avalonia.Threading;
 using DialogHostAvalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
+using ServiceLib.Manager;
 using Splat;
 using v2rayN.Desktop.Common;
 
diff --git a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
index 92472c50..570b58fd 100644
--- a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
@@ -6,6 +6,7 @@ using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using DialogHostAvalonia;
 using ReactiveUI;
+using ServiceLib.Manager;
 using Splat;
 using v2rayN.Desktop.Common;
 
diff --git a/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
index 9a5e908f..87a95cbc 100644
--- a/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
@@ -2,6 +2,7 @@ using Avalonia.Controls;
 using Avalonia.Threading;
 using CliWrap.Buffered;
 using DialogHostAvalonia;
+using ServiceLib.Manager;
 
 namespace v2rayN.Desktop.Views;
 
diff --git a/v2rayN/v2rayN/App.xaml.cs b/v2rayN/v2rayN/App.xaml.cs
index 0a282733..ba61bd52 100644
--- a/v2rayN/v2rayN/App.xaml.cs
+++ b/v2rayN/v2rayN/App.xaml.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Threading;
+using ServiceLib.Manager;
 
 namespace v2rayN;
 
diff --git a/v2rayN/v2rayN/Base/WindowBase.cs b/v2rayN/v2rayN/Base/WindowBase.cs
index f73d2b69..14c12cb3 100644
--- a/v2rayN/v2rayN/Base/WindowBase.cs
+++ b/v2rayN/v2rayN/Base/WindowBase.cs
@@ -1,5 +1,6 @@
 using System.Windows;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Base;
 
diff --git a/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs b/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs
index 1cc021c7..84827c75 100644
--- a/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs
+++ b/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs
@@ -1,4 +1,5 @@
 using System.Windows.Media;
+using ServiceLib.Manager;
 
 namespace v2rayN.Converters;
 
diff --git a/v2rayN/v2rayN/Handler/HotkeyHandler.cs b/v2rayN/v2rayN/Handler/HotkeyHandler.cs
index 5f261463..d07a9401 100644
--- a/v2rayN/v2rayN/Handler/HotkeyHandler.cs
+++ b/v2rayN/v2rayN/Handler/HotkeyHandler.cs
@@ -4,6 +4,7 @@ using System.Text;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
+using ServiceLib.Manager;
 
 namespace v2rayN.Handler;
 
diff --git a/v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs
index 37d3b654..18d3f578 100644
--- a/v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs
@@ -9,6 +9,7 @@ using MaterialDesignColors.ColorManipulation;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using ServiceLib.Manager;
 
 namespace v2rayN.ViewModels;
 
diff --git a/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs b/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs
index 87a476f6..2fb3e2a1 100644
--- a/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs
+++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs
@@ -1,6 +1,7 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
index b06002a9..0e96e236 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
@@ -2,6 +2,7 @@ using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Controls;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 
diff --git a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs
index cb6b44a8..9105b920 100644
--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs
@@ -1,6 +1,7 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 
diff --git a/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs b/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs
index 3e38bf12..b3ee400d 100644
--- a/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs
@@ -1,6 +1,7 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 
diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
index ce6aeb72..8c87595f 100644
--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
@@ -4,6 +4,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using ReactiveUI;
+using ServiceLib.Manager;
 using v2rayN.Handler;
 
 namespace v2rayN.Views;
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index 99f3fc03..6f2838ff 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -8,6 +8,7 @@ using System.Windows.Media;
 using System.Windows.Threading;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
+using ServiceLib.Manager;
 using Splat;
 using v2rayN.Handler;
 
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
index dea7302b..fbdf8e6e 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
@@ -4,6 +4,7 @@ using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Media;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 
diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
index 3501747e..0f2fe4a3 100644
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
+++ b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
@@ -7,6 +7,7 @@ using System.Windows.Media;
 using System.Windows.Threading;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
+using ServiceLib.Manager;
 using Splat;
 using v2rayN.Base;
 using Point = System.Windows.Point;
diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
index 9db3fb83..5381a23c 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
@@ -1,6 +1,7 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 
diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
index bec5d1f7..e5e2bf71 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
@@ -2,6 +2,7 @@ using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 
diff --git a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
index a1782c38..e9469a97 100644
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
@@ -2,6 +2,7 @@ using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 
diff --git a/v2rayN/v2rayN/Views/StatusBarView.xaml.cs b/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
index a5217f42..2a89cca1 100644
--- a/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
+++ b/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
@@ -3,6 +3,7 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Threading;
 using ReactiveUI;
+using ServiceLib.Manager;
 using Splat;
 using v2rayN.Handler;
 
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs b/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
index c9ab564b..d7eb71c2 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
@@ -1,6 +1,7 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 
diff --git a/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
index 9da5ed2f..19d98c70 100644
--- a/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
@@ -4,6 +4,7 @@ using System.Windows;
 using System.Windows.Input;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 

From d5c50ef27cee5bd3be1c61eeddcd715d5f892822 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 17 Aug 2025 17:31:55 +0800
Subject: [PATCH 056/115] Rename Manager

---
 v2rayN/ServiceLib/Handler/ConfigHandler.cs    | 86 +++++++++----------
 .../ServiceLib/Handler/ConnectionHandler.cs   |  2 +-
 .../ServiceLib/Handler/CoreConfigHandler.cs   |  8 +-
 .../ServiceLib/Handler/SubscriptionHandler.cs |  2 +-
 .../Handler/SysProxy/SysProxyHandler.cs       |  8 +-
 .../Manager/{AppHandler.cs => AppManager.cs}  |  6 +-
 ...{ClashApiHandler.cs => ClashApiManager.cs} | 10 +--
 ...oreAdminHandler.cs => CoreAdminManager.cs} | 10 +--
 ...{CoreInfoHandler.cs => CoreInfoManager.cs} |  8 +-
 .../{CoreHandler.cs => CoreManager.cs}        | 34 ++++----
 .../{NoticeHandler.cs => NoticeManager.cs}    |  6 +-
 .../Manager/{PacHandler.cs => PacManager.cs}  |  6 +-
 ...rofileExHandler.cs => ProfileExManager.cs} | 10 +--
 ...tisticsHandler.cs => StatisticsManager.cs} |  6 +-
 .../{TaskHandler.cs => TaskManager.cs}        | 10 +--
 .../{WebDavHandler.cs => WebDavManager.cs}    | 10 +--
 .../CoreConfig/CoreConfigClashService.cs      |  6 +-
 .../CoreConfig/CoreConfigSingboxService.cs    | 38 ++++----
 .../CoreConfig/CoreConfigV2rayService.cs      | 42 ++++-----
 v2rayN/ServiceLib/Services/DownloadService.cs | 14 +--
 .../ServiceLib/Services/SpeedtestService.cs   | 22 ++---
 .../Statistics/StatisticsSingboxService.cs    |  2 +-
 .../Statistics/StatisticsXrayService.cs       |  2 +-
 v2rayN/ServiceLib/Services/UpdateService.cs   |  8 +-
 .../ViewModels/AddServer2ViewModel.cs         | 20 ++---
 .../ViewModels/AddServerViewModel.cs          | 18 ++--
 .../ViewModels/BackupAndRestoreViewModel.cs   | 18 ++--
 .../ViewModels/CheckUpdateViewModel.cs        |  2 +-
 .../ViewModels/ClashConnectionsViewModel.cs   |  6 +-
 .../ViewModels/ClashProxiesViewModel.cs       | 16 ++--
 .../ViewModels/DNSSettingViewModel.cs         | 18 ++--
 .../ViewModels/FullConfigTemplateViewModel.cs | 12 +--
 .../GlobalHotkeySettingViewModel.cs           |  4 +-
 .../ViewModels/MainWindowViewModel.cs         | 44 +++++-----
 v2rayN/ServiceLib/ViewModels/MsgViewModel.cs  |  2 +-
 .../ViewModels/OptionSettingViewModel.cs      | 10 +--
 .../ViewModels/ProfilesViewModel.cs           | 58 ++++++-------
 .../ViewModels/RoutingRuleDetailsViewModel.cs |  4 +-
 .../ViewModels/RoutingRuleSettingViewModel.cs | 22 ++---
 .../ViewModels/RoutingSettingViewModel.cs     | 18 ++--
 .../ViewModels/StatusBarViewModel.cs          | 28 +++---
 .../ServiceLib/ViewModels/SubEditViewModel.cs | 12 +--
 .../ViewModels/SubSettingViewModel.cs         |  8 +-
 v2rayN/v2rayN.Desktop/App.axaml.cs            |  2 +-
 v2rayN/v2rayN.Desktop/Base/WindowBase.cs      |  4 +-
 v2rayN/v2rayN.Desktop/Program.cs              |  4 +-
 .../ViewModels/ThemeSettingViewModel.cs       |  4 +-
 .../Views/AddServerWindow.axaml.cs            |  2 +-
 .../Views/DNSSettingWindow.axaml.cs           |  2 +-
 .../Views/FullConfigTemplateWindow.axaml.cs   |  2 +-
 .../v2rayN.Desktop/Views/MainWindow.axaml.cs  |  6 +-
 .../Views/OptionSettingWindow.axaml.cs        |  2 +-
 .../Views/ProfilesView.axaml.cs               |  2 +-
 .../Views/StatusBarView.axaml.cs              |  4 +-
 .../Views/SudoPasswordInputView.axaml.cs      |  2 +-
 v2rayN/v2rayN/App.xaml.cs                     |  4 +-
 v2rayN/v2rayN/Base/WindowBase.cs              |  4 +-
 .../v2rayN/Converters/MaterialDesignFonts.cs  |  2 +-
 v2rayN/v2rayN/Handler/HotkeyHandler.cs        |  2 +-
 .../ViewModels/ThemeSettingViewModel.cs       |  4 +-
 v2rayN/v2rayN/Views/AddServer2Window.xaml.cs  |  2 +-
 v2rayN/v2rayN/Views/AddServerWindow.xaml.cs   |  4 +-
 v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs  |  4 +-
 .../Views/FullConfigTemplateWindow.xaml.cs    |  4 +-
 .../Views/GlobalHotkeySettingWindow.xaml.cs   |  2 +-
 v2rayN/v2rayN/Views/MainWindow.xaml.cs        |  4 +-
 .../v2rayN/Views/OptionSettingWindow.xaml.cs  |  4 +-
 v2rayN/v2rayN/Views/ProfilesView.xaml.cs      |  2 +-
 .../Views/RoutingRuleDetailsWindow.xaml.cs    |  2 +-
 .../Views/RoutingRuleSettingWindow.xaml.cs    |  2 +-
 .../v2rayN/Views/RoutingSettingWindow.xaml.cs |  2 +-
 v2rayN/v2rayN/Views/StatusBarView.xaml.cs     |  2 +-
 v2rayN/v2rayN/Views/SubEditWindow.xaml.cs     |  2 +-
 v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs  |  2 +-
 74 files changed, 383 insertions(+), 383 deletions(-)
 rename v2rayN/ServiceLib/Manager/{AppHandler.cs => AppManager.cs} (97%)
 rename v2rayN/ServiceLib/Manager/{ClashApiHandler.cs => ClashApiManager.cs} (93%)
 rename v2rayN/ServiceLib/Manager/{CoreAdminHandler.cs => CoreAdminManager.cs} (93%)
 rename v2rayN/ServiceLib/Manager/{CoreInfoHandler.cs => CoreInfoManager.cs} (97%)
 rename v2rayN/ServiceLib/Manager/{CoreHandler.cs => CoreManager.cs} (90%)
 rename v2rayN/ServiceLib/Manager/{NoticeHandler.cs => NoticeManager.cs} (84%)
 rename v2rayN/ServiceLib/Manager/{PacHandler.cs => PacManager.cs} (94%)
 rename v2rayN/ServiceLib/Manager/{ProfileExHandler.cs => ProfileExManager.cs} (95%)
 rename v2rayN/ServiceLib/Manager/{StatisticsHandler.cs => StatisticsManager.cs} (96%)
 rename v2rayN/ServiceLib/Manager/{TaskHandler.cs => TaskManager.cs} (91%)
 rename v2rayN/ServiceLib/Manager/{WebDavHandler.cs => WebDavManager.cs} (94%)

diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
index 156c9d30..9df5f6b4 100644
--- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -216,7 +216,7 @@ public static class ConfigHandler
     /// <returns>Result of the operation (0 if successful, -1 if failed)</returns>
     public static async Task<int> AddServer(Config config, ProfileItem profileItem)
     {
-        var item = await AppHandler.Instance.GetProfileItem(profileItem.IndexId);
+        var item = await AppManager.Instance.GetProfileItem(profileItem.IndexId);
         if (item is null)
         {
             item = profileItem;
@@ -336,7 +336,7 @@ public static class ConfigHandler
     {
         foreach (var it in indexes)
         {
-            var item = await AppHandler.Instance.GetProfileItem(it.IndexId);
+            var item = await AppManager.Instance.GetProfileItem(it.IndexId);
             if (item is null)
             {
                 continue;
@@ -418,7 +418,7 @@ public static class ConfigHandler
     /// <returns>The default profile item or null if none exists</returns>
     public static async Task<ProfileItem?> GetDefaultServer(Config config)
     {
-        var item = await AppHandler.Instance.GetProfileItem(config.IndexId);
+        var item = await AppManager.Instance.GetProfileItem(config.IndexId);
         if (item is null)
         {
             var item2 = await SQLiteHelper.Instance.TableAsync<ProfileItem>().FirstOrDefaultAsync();
@@ -449,7 +449,7 @@ public static class ConfigHandler
 
         for (int i = 0; i < lstProfile.Count; i++)
         {
-            ProfileExHandler.Instance.SetSort(lstProfile[i].IndexId, (i + 1) * 10);
+            ProfileExManager.Instance.SetSort(lstProfile[i].IndexId, (i + 1) * 10);
         }
 
         var sort = 0;
@@ -461,7 +461,7 @@ public static class ConfigHandler
                     {
                         return 0;
                     }
-                    sort = ProfileExHandler.Instance.GetSort(lstProfile.First().IndexId) - 1;
+                    sort = ProfileExManager.Instance.GetSort(lstProfile.First().IndexId) - 1;
 
                     break;
                 }
@@ -471,7 +471,7 @@ public static class ConfigHandler
                     {
                         return 0;
                     }
-                    sort = ProfileExHandler.Instance.GetSort(lstProfile[index - 1].IndexId) - 1;
+                    sort = ProfileExManager.Instance.GetSort(lstProfile[index - 1].IndexId) - 1;
 
                     break;
                 }
@@ -482,7 +482,7 @@ public static class ConfigHandler
                     {
                         return 0;
                     }
-                    sort = ProfileExHandler.Instance.GetSort(lstProfile[index + 1].IndexId) + 1;
+                    sort = ProfileExManager.Instance.GetSort(lstProfile[index + 1].IndexId) + 1;
 
                     break;
                 }
@@ -492,7 +492,7 @@ public static class ConfigHandler
                     {
                         return 0;
                     }
-                    sort = ProfileExHandler.Instance.GetSort(lstProfile[^1].IndexId) + 1;
+                    sort = ProfileExManager.Instance.GetSort(lstProfile[^1].IndexId) + 1;
 
                     break;
                 }
@@ -501,7 +501,7 @@ public static class ConfigHandler
                 break;
         }
 
-        ProfileExHandler.Instance.SetSort(lstProfile[index].IndexId, sort);
+        ProfileExManager.Instance.SetSort(lstProfile[index].IndexId, sort);
         return await Task.FromResult(0);
     }
 
@@ -559,7 +559,7 @@ public static class ConfigHandler
     /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> EditCustomServer(Config config, ProfileItem profileItem)
     {
-        var item = await AppHandler.Instance.GetProfileItem(profileItem.IndexId);
+        var item = await AppManager.Instance.GetProfileItem(profileItem.IndexId);
         if (item is null)
         {
             item = profileItem;
@@ -601,7 +601,7 @@ public static class ConfigHandler
         profileItem.Id = profileItem.Id.TrimEx();
         profileItem.Security = profileItem.Security.TrimEx();
 
-        if (!AppHandler.Instance.GetShadowsocksSecurities(profileItem).Contains(profileItem.Security))
+        if (!AppManager.Instance.GetShadowsocksSecurities(profileItem).Contains(profileItem.Security))
         {
             return -1;
         }
@@ -829,13 +829,13 @@ public static class ConfigHandler
     /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> SortServers(Config config, string subId, string colName, bool asc)
     {
-        var lstModel = await AppHandler.Instance.ProfileItems(subId, "");
+        var lstModel = await AppManager.Instance.ProfileItems(subId, "");
         if (lstModel.Count <= 0)
         {
             return -1;
         }
-        var lstServerStat = (config.GuiItem.EnableStatistics ? StatisticsHandler.Instance.ServerStat : null) ?? [];
-        var lstProfileExs = await ProfileExHandler.Instance.GetProfileExs();
+        var lstServerStat = (config.GuiItem.EnableStatistics ? StatisticsManager.Instance.ServerStat : null) ?? [];
+        var lstProfileExs = await ProfileExManager.Instance.GetProfileExs();
         var lstProfile = (from t in lstModel
                           join t2 in lstServerStat on t.IndexId equals t2.IndexId into t2b
                           from t22 in t2b.DefaultIfEmpty()
@@ -905,7 +905,7 @@ public static class ConfigHandler
 
         for (var i = 0; i < lstProfile.Count; i++)
         {
-            ProfileExHandler.Instance.SetSort(lstProfile[i].IndexId, (i + 1) * 10);
+            ProfileExManager.Instance.SetSort(lstProfile[i].IndexId, (i + 1) * 10);
         }
         switch (name)
         {
@@ -914,7 +914,7 @@ public static class ConfigHandler
                     var maxSort = lstProfile.Max(t => t.Sort) + 10;
                     foreach (var item in lstProfile.Where(item => item.Delay <= 0))
                     {
-                        ProfileExHandler.Instance.SetSort(item.IndexId, maxSort);
+                        ProfileExManager.Instance.SetSort(item.IndexId, maxSort);
                     }
 
                     break;
@@ -924,7 +924,7 @@ public static class ConfigHandler
                     var maxSort = lstProfile.Max(t => t.Sort) + 10;
                     foreach (var item in lstProfile.Where(item => item.Speed <= 0))
                     {
-                        ProfileExHandler.Instance.SetSort(item.IndexId, maxSort);
+                        ProfileExManager.Instance.SetSort(item.IndexId, maxSort);
                     }
 
                     break;
@@ -982,7 +982,7 @@ public static class ConfigHandler
     /// <returns>Tuple with total count and remaining count after deduplication</returns>
     public static async Task<Tuple<int, int>> DedupServerList(Config config, string subId)
     {
-        var lstProfile = await AppHandler.Instance.ProfileItems(subId);
+        var lstProfile = await AppManager.Instance.ProfileItems(subId);
         if (lstProfile == null)
         {
             return new Tuple<int, int>(0, 0);
@@ -1052,15 +1052,15 @@ public static class ConfigHandler
         if (profileItem.IndexId.IsNullOrEmpty())
         {
             profileItem.IndexId = Utils.GetGuid(false);
-            maxSort = ProfileExHandler.Instance.GetMaxSort();
+            maxSort = ProfileExManager.Instance.GetMaxSort();
         }
         if (!toFile && maxSort < 0)
         {
-            maxSort = ProfileExHandler.Instance.GetMaxSort();
+            maxSort = ProfileExManager.Instance.GetMaxSort();
         }
         if (maxSort > 0)
         {
-            ProfileExHandler.Instance.SetSort(profileItem.IndexId, maxSort + 1);
+            ProfileExManager.Instance.SetSort(profileItem.IndexId, maxSort + 1);
         }
 
         if (toFile)
@@ -1120,7 +1120,7 @@ public static class ConfigHandler
     {
         try
         {
-            var item = await AppHandler.Instance.GetProfileItem(indexId);
+            var item = await AppManager.Instance.GetProfileItem(indexId);
             if (item == null)
             {
                 return 0;
@@ -1165,7 +1165,7 @@ public static class ConfigHandler
             return result;
         }
 
-        var profileItem = await AppHandler.Instance.GetProfileItem(indexId) ?? new();
+        var profileItem = await AppManager.Instance.GetProfileItem(indexId) ?? new();
         profileItem.IndexId = indexId;
         if (coreType == ECoreType.Xray)
         {
@@ -1211,7 +1211,7 @@ public static class ConfigHandler
                 ConfigType = EConfigType.SOCKS,
                 Address = Global.Loopback,
                 Sni = node.Address, //Tun2SocksAddress
-                Port = AppHandler.Instance.GetLocalPort(EInboundProtocol.socks)
+                Port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks)
             };
         }
         else if ((node.ConfigType == EConfigType.Custom && node.PreSocksPort > 0))
@@ -1238,12 +1238,12 @@ public static class ConfigHandler
     /// <returns>Number of removed servers or -1 if failed</returns>
     public static async Task<int> RemoveInvalidServerResult(Config config, string subid)
     {
-        var lstModel = await AppHandler.Instance.ProfileItems(subid, "");
+        var lstModel = await AppManager.Instance.ProfileItems(subid, "");
         if (lstModel is { Count: <= 0 })
         {
             return -1;
         }
-        var lstProfileExs = await ProfileExHandler.Instance.GetProfileExs();
+        var lstProfileExs = await ProfileExManager.Instance.GetProfileExs();
         var lstProfile = (from t in lstModel
                           join t2 in lstProfileExs on t.IndexId equals t2.IndexId
                           where t2.Delay == -1
@@ -1279,7 +1279,7 @@ public static class ConfigHandler
         if (isSub && subid.IsNotEmpty())
         {
             await RemoveServersViaSubid(config, subid, isSub);
-            subFilter = (await AppHandler.Instance.GetSubItem(subid))?.Filter ?? "";
+            subFilter = (await AppManager.Instance.GetSubItem(subid))?.Filter ?? "";
         }
 
         var countServers = 0;
@@ -1363,7 +1363,7 @@ public static class ConfigHandler
             return -1;
         }
 
-        var subItem = await AppHandler.Instance.GetSubItem(subid);
+        var subItem = await AppManager.Instance.GetSubItem(subid);
         var subRemarks = subItem?.Remarks;
         var preSocksPort = subItem?.PreSocksPort;
 
@@ -1519,7 +1519,7 @@ public static class ConfigHandler
         ProfileItem? activeProfile = null;
         if (isSub && subid.IsNotEmpty())
         {
-            lstOriSub = await AppHandler.Instance.ProfileItems(subid);
+            lstOriSub = await AppManager.Instance.ProfileItems(subid);
             activeProfile = lstOriSub?.FirstOrDefault(t => t.IndexId == config.IndexId);
         }
 
@@ -1551,7 +1551,7 @@ public static class ConfigHandler
         //Select active node
         if (activeProfile != null)
         {
-            var lstSub = await AppHandler.Instance.ProfileItems(subid);
+            var lstSub = await AppManager.Instance.ProfileItems(subid);
             var existItem = lstSub?.FirstOrDefault(t => config.UiItem.EnableUpdateSubOnlyRemarksExist ? t.Remarks == activeProfile.Remarks : CompareProfileItem(t, activeProfile, true));
             if (existItem != null)
             {
@@ -1562,13 +1562,13 @@ public static class ConfigHandler
         //Keep the last traffic statistics
         if (lstOriSub != null)
         {
-            var lstSub = await AppHandler.Instance.ProfileItems(subid);
+            var lstSub = await AppManager.Instance.ProfileItems(subid);
             foreach (var item in lstSub)
             {
                 var existItem = lstOriSub?.FirstOrDefault(t => config.UiItem.EnableUpdateSubOnlyRemarksExist ? t.Remarks == item.Remarks : CompareProfileItem(t, item, true));
                 if (existItem != null)
                 {
-                    await StatisticsHandler.Instance.CloneServerStatItem(existItem.IndexId, item.IndexId);
+                    await StatisticsManager.Instance.CloneServerStatItem(existItem.IndexId, item.IndexId);
                 }
             }
         }
@@ -1608,7 +1608,7 @@ public static class ConfigHandler
         if (url.StartsWith(Global.HttpProtocol) && !Utils.IsPrivateNetwork(uri.IdnHost))
         {
             //TODO Temporary reminder to be removed later
-            NoticeHandler.Instance.Enqueue(ResUI.InsecureUrlProtocol);
+            NoticeManager.Instance.Enqueue(ResUI.InsecureUrlProtocol);
             //return -1;
         }
 
@@ -1626,7 +1626,7 @@ public static class ConfigHandler
     /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> AddSubItem(Config config, SubItem subItem)
     {
-        var item = await AppHandler.Instance.GetSubItem(subItem.Id);
+        var item = await AppManager.Instance.GetSubItem(subItem.Id);
         if (item is null)
         {
             item = subItem;
@@ -1658,7 +1658,7 @@ public static class ConfigHandler
                 var maxSort = 0;
                 if (await SQLiteHelper.Instance.TableAsync<SubItem>().CountAsync() > 0)
                 {
-                    var lstSubs = (await AppHandler.Instance.SubItems());
+                    var lstSubs = (await AppManager.Instance.SubItems());
                     maxSort = lstSubs.LastOrDefault()?.Sort ?? 0;
                 }
                 item.Sort = maxSort + 1;
@@ -1712,7 +1712,7 @@ public static class ConfigHandler
     /// <returns>0 if successful</returns>
     public static async Task<int> DeleteSubItem(Config config, string id)
     {
-        var item = await AppHandler.Instance.GetSubItem(id);
+        var item = await AppManager.Instance.GetSubItem(id);
         if (item is null)
         {
             return 0;
@@ -1896,7 +1896,7 @@ public static class ConfigHandler
     /// <returns>0 if successful</returns>
     public static async Task<int> SetDefaultRouting(Config config, RoutingItem routingItem)
     {
-        var items = await AppHandler.Instance.RoutingItems();
+        var items = await AppManager.Instance.RoutingItems();
         if (items.Any(t => t.Id == routingItem.Id && t.IsActive == true))
         {
             return -1;
@@ -1976,7 +1976,7 @@ public static class ConfigHandler
         if (template == null)
             return await InitBuiltinRouting(config, blImportAdvancedRules); // fallback
 
-        var items = await AppHandler.Instance.RoutingItems();
+        var items = await AppManager.Instance.RoutingItems();
         var maxSort = items.Count;
         if (!blImportAdvancedRules && items.Where(t => t.Remarks.StartsWith(template.Version)).ToList().Count > 0)
         {
@@ -2023,14 +2023,14 @@ public static class ConfigHandler
     public static async Task<int> InitBuiltinRouting(Config config, bool blImportAdvancedRules = false)
     {
         var ver = "V3-";
-        var items = await AppHandler.Instance.RoutingItems();
+        var items = await AppManager.Instance.RoutingItems();
 
         //TODO Temporary code to be removed later
         var lockItem = items?.FirstOrDefault(t => t.Locked == true);
         if (lockItem != null)
         {
             await ConfigHandler.RemoveRoutingItem(lockItem);
-            items = await AppHandler.Instance.RoutingItems();
+            items = await AppManager.Instance.RoutingItems();
         }
 
         if (!blImportAdvancedRules && items.Count > 0)
@@ -2107,7 +2107,7 @@ public static class ConfigHandler
     /// <returns>0 if successful</returns>
     public static async Task<int> InitBuiltinDNS(Config config)
     {
-        var items = await AppHandler.Instance.DNSItems();
+        var items = await AppManager.Instance.DNSItems();
 
         // Check existing DNS items and disable those with empty NormalDNS
         var needsUpdate = false;
@@ -2185,7 +2185,7 @@ public static class ConfigHandler
     /// <returns>DNS item with configuration from the URL</returns>
     public static async Task<DNSItem> GetExternalDNSItem(ECoreType type, string url)
     {
-        var currentItem = await AppHandler.Instance.GetDNSItem(type);
+        var currentItem = await AppManager.Instance.GetDNSItem(type);
 
         var downloadHandle = new DownloadService();
         var templateContent = await downloadHandle.TryDownloadString(url, true, "");
@@ -2247,7 +2247,7 @@ public static class ConfigHandler
 
     public static async Task<int> InitBuiltinFullConfigTemplate(Config config)
     {
-        var items = await AppHandler.Instance.FullConfigTemplateItem();
+        var items = await AppManager.Instance.FullConfigTemplateItem();
         if (items.Count <= 0)
         {
             var item = new FullConfigTemplateItem()
diff --git a/v2rayN/ServiceLib/Handler/ConnectionHandler.cs b/v2rayN/ServiceLib/Handler/ConnectionHandler.cs
index a0db6a2b..0d0afc3a 100644
--- a/v2rayN/ServiceLib/Handler/ConnectionHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConnectionHandler.cs
@@ -13,7 +13,7 @@ public static class ConnectionHandler
 
     private static async Task<string?> GetIPInfo(DownloadService downloadHandle)
     {
-        var url = AppHandler.Instance.Config.SpeedTestItem.IPAPIUrl;
+        var url = AppManager.Instance.Config.SpeedTestItem.IPAPIUrl;
         if (url.IsNullOrEmpty())
         {
             return null;
diff --git a/v2rayN/ServiceLib/Handler/CoreConfigHandler.cs b/v2rayN/ServiceLib/Handler/CoreConfigHandler.cs
index a057d4b4..66d261ac 100644
--- a/v2rayN/ServiceLib/Handler/CoreConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/CoreConfigHandler.cs
@@ -9,7 +9,7 @@ public static class CoreConfigHandler
 
     public static async Task<RetResult> GenerateClientConfig(ProfileItem node, string? fileName)
     {
-        var config = AppHandler.Instance.Config;
+        var config = AppManager.Instance.Config;
         var result = new RetResult();
 
         if (node.ConfigType == EConfigType.Custom)
@@ -21,7 +21,7 @@ public static class CoreConfigHandler
                 _ => await GenerateClientCustomConfig(node, fileName)
             };
         }
-        else if (AppHandler.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box)
+        else if (AppManager.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box)
         {
             result = await new CoreConfigSingboxService(config).GenerateClientConfigContent(node);
         }
@@ -112,11 +112,11 @@ public static class CoreConfigHandler
     public static async Task<RetResult> GenerateClientSpeedtestConfig(Config config, ProfileItem node, ServerTestItem testItem, string fileName)
     {
         var result = new RetResult();
-        var initPort = AppHandler.Instance.GetLocalPort(EInboundProtocol.speedtest);
+        var initPort = AppManager.Instance.GetLocalPort(EInboundProtocol.speedtest);
         var port = Utils.GetFreePort(initPort + testItem.QueueNum);
         testItem.Port = port;
 
-        if (AppHandler.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box)
+        if (AppManager.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box)
         {
             result = await new CoreConfigSingboxService(config).GenerateClientSpeedtestConfig(node, port);
         }
diff --git a/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs b/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
index 2916a07f..746cbafa 100644
--- a/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
+++ b/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
@@ -5,7 +5,7 @@ public static class SubscriptionHandler
     public static async Task UpdateProcess(Config config, string subId, bool blProxy, Action<bool, string> updateFunc)
     {
         updateFunc?.Invoke(false, ResUI.MsgUpdateSubscriptionStart);
-        var subItem = await AppHandler.Instance.SubItems();
+        var subItem = await AppManager.Instance.SubItems();
 
         if (subItem is not { Count: > 0 })
         {
diff --git a/v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs b/v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs
index ebb81325..38ea04ae 100644
--- a/v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs
+++ b/v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs
@@ -15,7 +15,7 @@ public static class SysProxyHandler
 
         try
         {
-            var port = AppHandler.Instance.GetLocalPort(EInboundProtocol.socks);
+            var port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
             var exceptions = config.SystemProxyItem.SystemProxyExceptions.Replace(" ", "");
             if (port <= 0)
             {
@@ -56,7 +56,7 @@ public static class SysProxyHandler
 
             if (type != ESysProxyType.Pac && Utils.IsWindows())
             {
-                PacHandler.Instance.Stop();
+                PacManager.Instance.Stop();
             }
         }
         catch (Exception ex)
@@ -90,8 +90,8 @@ public static class SysProxyHandler
 
     private static async Task SetWindowsProxyPac(int port)
     {
-        var portPac = AppHandler.Instance.GetLocalPort(EInboundProtocol.pac);
-        await PacHandler.Instance.StartAsync(Utils.GetConfigPath(), port, portPac);
+        var portPac = AppManager.Instance.GetLocalPort(EInboundProtocol.pac);
+        await PacManager.Instance.StartAsync(Utils.GetConfigPath(), port, portPac);
         var strProxy = $"{Global.HttpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
         ProxySettingWindows.SetProxy(strProxy, "", 4);
     }
diff --git a/v2rayN/ServiceLib/Manager/AppHandler.cs b/v2rayN/ServiceLib/Manager/AppManager.cs
similarity index 97%
rename from v2rayN/ServiceLib/Manager/AppHandler.cs
rename to v2rayN/ServiceLib/Manager/AppManager.cs
index 25c849b9..6cf0e826 100644
--- a/v2rayN/ServiceLib/Manager/AppHandler.cs
+++ b/v2rayN/ServiceLib/Manager/AppManager.cs
@@ -1,15 +1,15 @@
 namespace ServiceLib.Manager;
 
-public sealed class AppHandler
+public sealed class AppManager
 {
     #region Property
 
-    private static readonly Lazy<AppHandler> _instance = new(() => new());
+    private static readonly Lazy<AppManager> _instance = new(() => new());
     private Config _config;
     private int? _statePort;
     private int? _statePort2;
     private Job? _processJob;
-    public static AppHandler Instance => _instance.Value;
+    public static AppManager Instance => _instance.Value;
     public Config Config => _config;
 
     public int StatePort
diff --git a/v2rayN/ServiceLib/Manager/ClashApiHandler.cs b/v2rayN/ServiceLib/Manager/ClashApiManager.cs
similarity index 93%
rename from v2rayN/ServiceLib/Manager/ClashApiHandler.cs
rename to v2rayN/ServiceLib/Manager/ClashApiManager.cs
index 33b0355a..9147df05 100644
--- a/v2rayN/ServiceLib/Manager/ClashApiHandler.cs
+++ b/v2rayN/ServiceLib/Manager/ClashApiManager.cs
@@ -2,10 +2,10 @@ using static ServiceLib.Models.ClashProxies;
 
 namespace ServiceLib.Manager;
 
-public sealed class ClashApiHandler
+public sealed class ClashApiManager
 {
-    private static readonly Lazy<ClashApiHandler> instance = new(() => new());
-    public static ClashApiHandler Instance => instance.Value;
+    private static readonly Lazy<ClashApiManager> instance = new(() => new());
+    public static ClashApiManager Instance => instance.Value;
 
     private static readonly string _tag = "ClashApiHandler";
     private Dictionary<string, ProxiesItem>? _proxies;
@@ -65,7 +65,7 @@ public sealed class ClashApiHandler
                 return;
             }
             var urlBase = $"{GetApiUrl()}/proxies";
-            urlBase += @"/{0}/delay?timeout=10000&url=" + AppHandler.Instance.Config.SpeedTestItem.SpeedPingTestUrl;
+            urlBase += @"/{0}/delay?timeout=10000&url=" + AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl;
 
             var tasks = new List<Task>();
             foreach (var it in lstProxy)
@@ -182,6 +182,6 @@ public sealed class ClashApiHandler
 
     private string GetApiUrl()
     {
-        return $"{Global.HttpProtocol}{Global.Loopback}:{AppHandler.Instance.StatePort2}";
+        return $"{Global.HttpProtocol}{Global.Loopback}:{AppManager.Instance.StatePort2}";
     }
 }
diff --git a/v2rayN/ServiceLib/Manager/CoreAdminHandler.cs b/v2rayN/ServiceLib/Manager/CoreAdminManager.cs
similarity index 93%
rename from v2rayN/ServiceLib/Manager/CoreAdminHandler.cs
rename to v2rayN/ServiceLib/Manager/CoreAdminManager.cs
index e5db01ba..5ba1747b 100644
--- a/v2rayN/ServiceLib/Manager/CoreAdminHandler.cs
+++ b/v2rayN/ServiceLib/Manager/CoreAdminManager.cs
@@ -5,10 +5,10 @@ using CliWrap.Buffered;
 
 namespace ServiceLib.Manager;
 
-public class CoreAdminHandler
+public class CoreAdminManager
 {
-    private static readonly Lazy<CoreAdminHandler> _instance = new(() => new());
-    public static CoreAdminHandler Instance => _instance.Value;
+    private static readonly Lazy<CoreAdminManager> _instance = new(() => new());
+    public static CoreAdminManager Instance => _instance.Value;
     private Config _config;
     private Action<bool, string>? _updateFunc;
     private int _linuxSudoPid = -1;
@@ -72,7 +72,7 @@ public class CoreAdminHandler
         proc.BeginErrorReadLine();
 
         await Task.Delay(10);
-        await proc.StandardInput.WriteLineAsync(AppHandler.Instance.LinuxSudoPwd);
+        await proc.StandardInput.WriteLineAsync(AppManager.Instance.LinuxSudoPwd);
 
         await Task.Delay(100);
         if (proc is null or { HasExited: true })
@@ -103,7 +103,7 @@ public class CoreAdminHandler
             var arg = new List<string>() { "-c", $"sudo -S {shFilePath} {_linuxSudoPid}" };
             var result = await Cli.Wrap(Global.LinuxBash)
                 .WithArguments(arg)
-                .WithStandardInputPipe(PipeSource.FromString(AppHandler.Instance.LinuxSudoPwd))
+                .WithStandardInputPipe(PipeSource.FromString(AppManager.Instance.LinuxSudoPwd))
                 .ExecuteBufferedAsync();
 
             UpdateFunc(false, result.StandardOutput.ToString());
diff --git a/v2rayN/ServiceLib/Manager/CoreInfoHandler.cs b/v2rayN/ServiceLib/Manager/CoreInfoManager.cs
similarity index 97%
rename from v2rayN/ServiceLib/Manager/CoreInfoHandler.cs
rename to v2rayN/ServiceLib/Manager/CoreInfoManager.cs
index d734c04e..12345499 100644
--- a/v2rayN/ServiceLib/Manager/CoreInfoHandler.cs
+++ b/v2rayN/ServiceLib/Manager/CoreInfoManager.cs
@@ -1,12 +1,12 @@
 namespace ServiceLib.Manager;
 
-public sealed class CoreInfoHandler
+public sealed class CoreInfoManager
 {
-    private static readonly Lazy<CoreInfoHandler> _instance = new(() => new());
+    private static readonly Lazy<CoreInfoManager> _instance = new(() => new());
     private List<CoreInfo>? _coreInfo;
-    public static CoreInfoHandler Instance => _instance.Value;
+    public static CoreInfoManager Instance => _instance.Value;
 
-    public CoreInfoHandler()
+    public CoreInfoManager()
     {
         InitCoreInfo();
     }
diff --git a/v2rayN/ServiceLib/Manager/CoreHandler.cs b/v2rayN/ServiceLib/Manager/CoreManager.cs
similarity index 90%
rename from v2rayN/ServiceLib/Manager/CoreHandler.cs
rename to v2rayN/ServiceLib/Manager/CoreManager.cs
index b12c7321..d0fcc0fa 100644
--- a/v2rayN/ServiceLib/Manager/CoreHandler.cs
+++ b/v2rayN/ServiceLib/Manager/CoreManager.cs
@@ -6,10 +6,10 @@ namespace ServiceLib.Manager;
 /// <summary>
 /// Core process processing class
 /// </summary>
-public class CoreHandler
+public class CoreManager
 {
-    private static readonly Lazy<CoreHandler> _instance = new(() => new());
-    public static CoreHandler Instance => _instance.Value;
+    private static readonly Lazy<CoreManager> _instance = new(() => new());
+    public static CoreManager Instance => _instance.Value;
     private Config _config;
     private Process? _process;
     private Process? _processPre;
@@ -39,7 +39,7 @@ public class CoreHandler
 
         if (Utils.IsNonWindows())
         {
-            var coreInfo = CoreInfoHandler.Instance.GetCoreInfo();
+            var coreInfo = CoreInfoManager.Instance.GetCoreInfo();
             foreach (var it in coreInfo)
             {
                 if (it.CoreType == ECoreType.v2rayN)
@@ -114,7 +114,7 @@ public class CoreHandler
         UpdateFunc(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
         UpdateFunc(false, configPath);
 
-        var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
+        var coreInfo = CoreInfoManager.Instance.GetCoreInfo(coreType);
         var proc = await RunProcess(coreInfo, fileName, true, false);
         if (proc is null)
         {
@@ -126,7 +126,7 @@ public class CoreHandler
 
     public async Task<int> LoadCoreConfigSpeedtest(ServerTestItem testItem)
     {
-        var node = await AppHandler.Instance.GetProfileItem(testItem.IndexId);
+        var node = await AppManager.Instance.GetProfileItem(testItem.IndexId);
         if (node is null)
         {
             return -1;
@@ -140,8 +140,8 @@ public class CoreHandler
             return -1;
         }
 
-        var coreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
-        var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
+        var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
+        var coreInfo = CoreInfoManager.Instance.GetCoreInfo(coreType);
         var proc = await RunProcess(coreInfo, fileName, true, false);
         if (proc is null)
         {
@@ -157,7 +157,7 @@ public class CoreHandler
         {
             if (_linuxSudo)
             {
-                await CoreAdminHandler.Instance.KillProcessAsLinuxSudo();
+                await CoreAdminManager.Instance.KillProcessAsLinuxSudo();
                 _linuxSudo = false;
             }
 
@@ -183,8 +183,8 @@ public class CoreHandler
 
     private async Task CoreStart(ProfileItem node)
     {
-        var coreType = _config.RunningCoreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
-        var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
+        var coreType = _config.RunningCoreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
+        var coreInfo = CoreInfoManager.Instance.GetCoreInfo(coreType);
 
         var displayLog = node.ConfigType != EConfigType.Custom || node.DisplayLog;
         var proc = await RunProcess(coreInfo, Global.CoreConfigFileName, displayLog, true);
@@ -199,7 +199,7 @@ public class CoreHandler
     {
         if (_process != null && !_process.HasExited)
         {
-            var coreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
+            var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
             var itemSocks = await ConfigHandler.GetPreSocksItem(_config, node, coreType);
             if (itemSocks != null)
             {
@@ -208,7 +208,7 @@ public class CoreHandler
                 var result = await CoreConfigHandler.GenerateClientConfig(itemSocks, fileName);
                 if (result.Success)
                 {
-                    var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(preCoreType);
+                    var coreInfo = CoreInfoManager.Instance.GetCoreInfo(preCoreType);
                     var proc = await RunProcess(coreInfo, Global.CorePreConfigFileName, true, true);
                     if (proc is null)
                     {
@@ -231,7 +231,7 @@ public class CoreHandler
 
     private async Task<Process?> RunProcess(CoreInfo? coreInfo, string configPath, bool displayLog, bool mayNeedSudo)
     {
-        var fileName = CoreInfoHandler.Instance.GetCoreExecFile(coreInfo, out var msg);
+        var fileName = CoreInfoManager.Instance.GetCoreExecFile(coreInfo, out var msg);
         if (fileName.IsNullOrEmpty())
         {
             UpdateFunc(false, msg);
@@ -246,8 +246,8 @@ public class CoreHandler
                 && Utils.IsNonWindows())
             {
                 _linuxSudo = true;
-                await CoreAdminHandler.Instance.Init(_config, _updateFunc);
-                return await CoreAdminHandler.Instance.RunProcessAsLinuxSudo(fileName, coreInfo, configPath);
+                await CoreAdminManager.Instance.Init(_config, _updateFunc);
+                return await CoreAdminManager.Instance.RunProcessAsLinuxSudo(fileName, coreInfo, configPath);
             }
 
             return await RunProcessNormal(fileName, coreInfo, configPath, displayLog);
@@ -299,7 +299,7 @@ public class CoreHandler
         }
 
         await Task.Delay(100);
-        AppHandler.Instance.AddProcess(proc.Handle);
+        AppManager.Instance.AddProcess(proc.Handle);
         if (proc is null or { HasExited: true })
         {
             throw new Exception(ResUI.FailedToRunCore);
diff --git a/v2rayN/ServiceLib/Manager/NoticeHandler.cs b/v2rayN/ServiceLib/Manager/NoticeManager.cs
similarity index 84%
rename from v2rayN/ServiceLib/Manager/NoticeHandler.cs
rename to v2rayN/ServiceLib/Manager/NoticeManager.cs
index 177fd445..76c01a56 100644
--- a/v2rayN/ServiceLib/Manager/NoticeHandler.cs
+++ b/v2rayN/ServiceLib/Manager/NoticeManager.cs
@@ -2,10 +2,10 @@ using ReactiveUI;
 
 namespace ServiceLib.Manager;
 
-public class NoticeHandler
+public class NoticeManager
 {
-    private static readonly Lazy<NoticeHandler> _instance = new(() => new());
-    public static NoticeHandler Instance => _instance.Value;
+    private static readonly Lazy<NoticeManager> _instance = new(() => new());
+    public static NoticeManager Instance => _instance.Value;
 
     public void Enqueue(string? content)
     {
diff --git a/v2rayN/ServiceLib/Manager/PacHandler.cs b/v2rayN/ServiceLib/Manager/PacManager.cs
similarity index 94%
rename from v2rayN/ServiceLib/Manager/PacHandler.cs
rename to v2rayN/ServiceLib/Manager/PacManager.cs
index 7f2534e1..10bedc29 100644
--- a/v2rayN/ServiceLib/Manager/PacHandler.cs
+++ b/v2rayN/ServiceLib/Manager/PacManager.cs
@@ -3,10 +3,10 @@ using System.Text;
 
 namespace ServiceLib.Manager;
 
-public class PacHandler
+public class PacManager
 {
-    private static readonly Lazy<PacHandler> _instance = new(() => new PacHandler());
-    public static PacHandler Instance => _instance.Value;
+    private static readonly Lazy<PacManager> _instance = new(() => new PacManager());
+    public static PacManager Instance => _instance.Value;
 
     private string _configPath;
     private int _httpPort;
diff --git a/v2rayN/ServiceLib/Manager/ProfileExHandler.cs b/v2rayN/ServiceLib/Manager/ProfileExManager.cs
similarity index 95%
rename from v2rayN/ServiceLib/Manager/ProfileExHandler.cs
rename to v2rayN/ServiceLib/Manager/ProfileExManager.cs
index 5e8ff2e2..0a3b7399 100644
--- a/v2rayN/ServiceLib/Manager/ProfileExHandler.cs
+++ b/v2rayN/ServiceLib/Manager/ProfileExManager.cs
@@ -2,17 +2,17 @@ using System.Collections.Concurrent;
 
 //using System.Reactive.Linq;
 
-namespace ServiceLib.Handler;
+namespace ServiceLib.Manager;
 
-public class ProfileExHandler
+public class ProfileExManager
 {
-    private static readonly Lazy<ProfileExHandler> _instance = new(() => new());
+    private static readonly Lazy<ProfileExManager> _instance = new(() => new());
     private ConcurrentBag<ProfileExItem> _lstProfileEx = [];
     private readonly Queue<string> _queIndexIds = new();
-    public static ProfileExHandler Instance => _instance.Value;
+    public static ProfileExManager Instance => _instance.Value;
     private static readonly string _tag = "ProfileExHandler";
 
-    public ProfileExHandler()
+    public ProfileExManager()
     {
         //Init();
     }
diff --git a/v2rayN/ServiceLib/Manager/StatisticsHandler.cs b/v2rayN/ServiceLib/Manager/StatisticsManager.cs
similarity index 96%
rename from v2rayN/ServiceLib/Manager/StatisticsHandler.cs
rename to v2rayN/ServiceLib/Manager/StatisticsManager.cs
index 2c683aeb..69a47856 100644
--- a/v2rayN/ServiceLib/Manager/StatisticsHandler.cs
+++ b/v2rayN/ServiceLib/Manager/StatisticsManager.cs
@@ -1,9 +1,9 @@
 namespace ServiceLib.Manager;
 
-public class StatisticsHandler
+public class StatisticsManager
 {
-    private static readonly Lazy<StatisticsHandler> instance = new(() => new());
-    public static StatisticsHandler Instance => instance.Value;
+    private static readonly Lazy<StatisticsManager> instance = new(() => new());
+    public static StatisticsManager Instance => instance.Value;
 
     private Config _config;
     private ServerStatItem? _serverStatItem;
diff --git a/v2rayN/ServiceLib/Manager/TaskHandler.cs b/v2rayN/ServiceLib/Manager/TaskManager.cs
similarity index 91%
rename from v2rayN/ServiceLib/Manager/TaskHandler.cs
rename to v2rayN/ServiceLib/Manager/TaskManager.cs
index 0dab6d2e..b968dc16 100644
--- a/v2rayN/ServiceLib/Manager/TaskHandler.cs
+++ b/v2rayN/ServiceLib/Manager/TaskManager.cs
@@ -1,9 +1,9 @@
 namespace ServiceLib.Manager;
 
-public class TaskHandler
+public class TaskManager
 {
-    private static readonly Lazy<TaskHandler> _instance = new(() => new());
-    public static TaskHandler Instance => _instance.Value;
+    private static readonly Lazy<TaskManager> _instance = new(() => new());
+    public static TaskManager Instance => _instance.Value;
 
     public void RegUpdateTask(Config config, Action<bool, string> updateFunc)
     {
@@ -29,7 +29,7 @@ public class TaskHandler
                 //Logging.SaveLog("Execute save config");
 
                 await ConfigHandler.SaveConfig(config);
-                await ProfileExHandler.Instance.SaveTo();
+                await ProfileExManager.Instance.SaveTo();
             }
 
             //Execute once 1 hour
@@ -52,7 +52,7 @@ public class TaskHandler
     private async Task UpdateTaskRunSubscription(Config config, Action<bool, string> updateFunc)
     {
         var updateTime = ((DateTimeOffset)DateTime.Now).ToUnixTimeSeconds();
-        var lstSubs = (await AppHandler.Instance.SubItems())?
+        var lstSubs = (await AppManager.Instance.SubItems())?
             .Where(t => t.AutoUpdateInterval > 0)
             .Where(t => updateTime - t.UpdateTime >= t.AutoUpdateInterval * 60)
             .ToList();
diff --git a/v2rayN/ServiceLib/Manager/WebDavHandler.cs b/v2rayN/ServiceLib/Manager/WebDavManager.cs
similarity index 94%
rename from v2rayN/ServiceLib/Manager/WebDavHandler.cs
rename to v2rayN/ServiceLib/Manager/WebDavManager.cs
index cf91cc7d..3f5c9ea3 100644
--- a/v2rayN/ServiceLib/Manager/WebDavHandler.cs
+++ b/v2rayN/ServiceLib/Manager/WebDavManager.cs
@@ -3,10 +3,10 @@ using WebDav;
 
 namespace ServiceLib.Manager;
 
-public sealed class WebDavHandler
+public sealed class WebDavManager
 {
-    private static readonly Lazy<WebDavHandler> _instance = new(() => new());
-    public static WebDavHandler Instance => _instance.Value;
+    private static readonly Lazy<WebDavManager> _instance = new(() => new());
+    public static WebDavManager Instance => _instance.Value;
 
     private readonly Config? _config;
     private WebDavClient? _client;
@@ -15,9 +15,9 @@ public sealed class WebDavHandler
     private readonly string _webFileName = "backup.zip";
     private readonly string _tag = "WebDav--";
 
-    public WebDavHandler()
+    public WebDavManager()
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
     }
 
     private async Task<bool> GetClient()
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs
index 50c6df67..e102f17d 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs
@@ -73,12 +73,12 @@ public class CoreConfigClashService
             }
 
             //mixed-port
-            fileContent["mixed-port"] = AppHandler.Instance.GetLocalPort(EInboundProtocol.socks);
+            fileContent["mixed-port"] = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
             //log-level
             fileContent["log-level"] = GetLogLevel(_config.CoreBasicItem.Loglevel);
 
             //external-controller
-            fileContent["external-controller"] = $"{Global.Loopback}:{AppHandler.Instance.StatePort2}";
+            fileContent["external-controller"] = $"{Global.Loopback}:{AppManager.Instance.StatePort2}";
             //allow-lan
             if (_config.Inbound.First().AllowLANConn)
             {
@@ -139,7 +139,7 @@ public class CoreConfigClashService
                 return ret;
             }
 
-            ClashApiHandler.Instance.ProfileContent = fileContent;
+            ClashApiManager.Instance.ProfileContent = fileContent;
 
             ret.Msg = string.Format(ResUI.SuccessfulConfiguration, $"{node.GetSummary()}");
             ret.Success = true;
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index 8bb1a3f6..53db08d1 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -136,7 +136,7 @@ public class CoreConfigSingboxService
             singboxConfig.inbounds.Clear();
             singboxConfig.outbounds.RemoveAt(0);
 
-            var initPort = AppHandler.Instance.GetLocalPort(EInboundProtocol.speedtest);
+            var initPort = AppManager.Instance.GetLocalPort(EInboundProtocol.speedtest);
 
             foreach (var it in selecteds)
             {
@@ -148,7 +148,7 @@ public class CoreConfigSingboxService
                 {
                     continue;
                 }
-                var item = await AppHandler.Instance.GetProfileItem(it.IndexId);
+                var item = await AppManager.Instance.GetProfileItem(it.IndexId);
                 if (it.ConfigType is EConfigType.VMess or EConfigType.VLESS)
                 {
                     if (item is null || item.Id.IsNullOrEmpty() || !Utils.IsGuidByParse(item.Id))
@@ -242,7 +242,7 @@ public class CoreConfigSingboxService
                 singboxConfig.route.rules.Add(rule);
             }
 
-            var rawDNSItem = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+            var rawDNSItem = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
             if (rawDNSItem != null && rawDNSItem.Enabled == true)
             {
                 await GenDnsDomainsCompatible(singboxConfig, rawDNSItem);
@@ -314,7 +314,7 @@ public class CoreConfigSingboxService
                 await GenOutbound(node, singboxConfig.outbounds.First());
             }
             await GenMoreOutbounds(node, singboxConfig);
-            var item = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+            var item = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
             if (item != null && item.Enabled == true)
             {
                 await GenDnsDomainsCompatible(singboxConfig, item);
@@ -396,7 +396,7 @@ public class CoreConfigSingboxService
                 {
                     continue;
                 }
-                var item = await AppHandler.Instance.GetProfileItem(it.IndexId);
+                var item = await AppManager.Instance.GetProfileItem(it.IndexId);
                 if (item is null)
                 {
                     continue;
@@ -583,7 +583,7 @@ public class CoreConfigSingboxService
                 };
                 singboxConfig.inbounds.Add(inbound);
 
-                inbound.listen_port = AppHandler.Instance.GetLocalPort(EInboundProtocol.socks);
+                inbound.listen_port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
 
                 if (_config.Inbound.First().SecondLocalPortEnabled)
                 {
@@ -681,7 +681,7 @@ public class CoreConfigSingboxService
                     }
                 case EConfigType.Shadowsocks:
                     {
-                        outbound.method = AppHandler.Instance.GetShadowsocksSecurities(node).Contains(node.Security) ? node.Security : Global.None;
+                        outbound.method = AppManager.Instance.GetShadowsocksSecurities(node).Contains(node.Security) ? node.Security : Global.None;
                         outbound.password = node.Id;
 
                         await GenOutboundMux(node, outbound);
@@ -1007,7 +1007,7 @@ public class CoreConfigSingboxService
         }
         try
         {
-            var subItem = await AppHandler.Instance.GetSubItem(node.Subid);
+            var subItem = await AppManager.Instance.GetSubItem(node.Subid);
             if (subItem is null)
             {
                 return 0;
@@ -1020,7 +1020,7 @@ public class CoreConfigSingboxService
             var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
 
             //Previous proxy
-            var prevNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+            var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
             string? prevOutboundTag = null;
             if (prevNode is not null
                 && prevNode.ConfigType != EConfigType.Custom)
@@ -1098,7 +1098,7 @@ public class CoreConfigSingboxService
                     nextServer = JsonUtils.DeepCopy(nextServer);
                 }
 
-                var subItem = await AppHandler.Instance.GetSubItem(node.Subid);
+                var subItem = await AppManager.Instance.GetSubItem(node.Subid);
 
                 // current proxy
                 currentServer.tag = $"{Global.ProxyTag}-{index}";
@@ -1112,7 +1112,7 @@ public class CoreConfigSingboxService
                     }
                     else
                     {
-                        var prevNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+                        var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
                         if (prevNode is not null
                             && prevNode.ConfigType != EConfigType.Custom)
                         {
@@ -1219,7 +1219,7 @@ public class CoreConfigSingboxService
             }
 
             // Next proxy
-            var nextNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
+            var nextNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
             if (nextNode is not null
                 && nextNode.ConfigType != EConfigType.Custom)
             {
@@ -1248,7 +1248,7 @@ public class CoreConfigSingboxService
             var defaultDomainResolverTag = Global.SingboxOutboundResolverTag;
             var directDNSStrategy = item.SingboxStrategy4Direct.IsNullOrEmpty() ? Global.SingboxDomainStrategy4Out.FirstOrDefault() : item.SingboxStrategy4Direct;
 
-            var rawDNSItem = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+            var rawDNSItem = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
             if (rawDNSItem != null && rawDNSItem.Enabled == true)
             {
                 defaultDomainResolverTag = Global.SingboxFinalResolverTag;
@@ -1372,7 +1372,7 @@ public class CoreConfigSingboxService
         var dnsExeSet = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
         var directExeSet = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
-        var coreInfoResult = CoreInfoHandler.Instance.GetCoreInfo();
+        var coreInfoResult = CoreInfoManager.Instance.GetCoreInfo();
 
         foreach (var coreConfig in coreInfoResult)
         {
@@ -1572,7 +1572,7 @@ public class CoreConfigSingboxService
             return outboundTag;
         }
 
-        var node = await AppHandler.Instance.GetProfileItemViaRemarks(outboundTag);
+        var node = await AppManager.Instance.GetProfileItemViaRemarks(outboundTag);
         if (node == null
             || node.ConfigType == EConfigType.Custom)
         {
@@ -1603,7 +1603,7 @@ public class CoreConfigSingboxService
     {
         try
         {
-            var item = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+            var item = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
             if (item != null && item.Enabled == true)
             {
                 return await GenDnsCompatible(singboxConfig);
@@ -1890,7 +1890,7 @@ public class CoreConfigSingboxService
     {
         try
         {
-            var item = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+            var item = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
             var strDNS = string.Empty;
             if (_config.TunModeItem.EnableTun)
             {
@@ -2084,7 +2084,7 @@ public class CoreConfigSingboxService
             singboxConfig.experimental ??= new Experimental4Sbox();
             singboxConfig.experimental.clash_api = new Clash_Api4Sbox()
             {
-                external_controller = $"{Global.Loopback}:{AppHandler.Instance.StatePort2}",
+                external_controller = $"{Global.Loopback}:{AppManager.Instance.StatePort2}",
             };
         }
 
@@ -2219,7 +2219,7 @@ public class CoreConfigSingboxService
 
     private async Task<string> ApplyFullConfigTemplate(SingboxConfig singboxConfig)
     {
-        var fullConfigTemplate = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.sing_box);
+        var fullConfigTemplate = await AppManager.Instance.GetFullConfigTemplateItem(ECoreType.sing_box);
         if (fullConfigTemplate == null || !fullConfigTemplate.Enabled)
         {
             return JsonUtils.Serialize(singboxConfig);
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
index 96a2556e..041e3386 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
@@ -130,7 +130,7 @@ public class CoreConfigV2rayService
                 {
                     continue;
                 }
-                var item = await AppHandler.Instance.GetProfileItem(it.IndexId);
+                var item = await AppManager.Instance.GetProfileItem(it.IndexId);
                 if (item is null)
                 {
                     continue;
@@ -254,7 +254,7 @@ public class CoreConfigV2rayService
             v2rayConfig.outbounds.Clear();
             v2rayConfig.routing.rules.Clear();
 
-            var initPort = AppHandler.Instance.GetLocalPort(EInboundProtocol.speedtest);
+            var initPort = AppManager.Instance.GetLocalPort(EInboundProtocol.speedtest);
 
             foreach (var it in selecteds)
             {
@@ -266,7 +266,7 @@ public class CoreConfigV2rayService
                 {
                     continue;
                 }
-                var item = await AppHandler.Instance.GetProfileItem(it.IndexId);
+                var item = await AppManager.Instance.GetProfileItem(it.IndexId);
                 if (it.ConfigType is EConfigType.VMess or EConfigType.VLESS)
                 {
                     if (item is null || item.Id.IsNullOrEmpty() || !Utils.IsGuidByParse(item.Id))
@@ -638,7 +638,7 @@ public class CoreConfigV2rayService
             return outboundTag;
         }
 
-        var node = await AppHandler.Instance.GetProfileItemViaRemarks(outboundTag);
+        var node = await AppManager.Instance.GetProfileItemViaRemarks(outboundTag);
         if (node == null
             || node.ConfigType == EConfigType.Custom
             || node.ConfigType == EConfigType.Hysteria2
@@ -722,7 +722,7 @@ public class CoreConfigV2rayService
                         serversItem.address = node.Address;
                         serversItem.port = node.Port;
                         serversItem.password = node.Id;
-                        serversItem.method = AppHandler.Instance.GetShadowsocksSecurities(node).Contains(node.Security) ? node.Security : "none";
+                        serversItem.method = AppManager.Instance.GetShadowsocksSecurities(node).Contains(node.Security) ? node.Security : "none";
 
                         serversItem.ota = false;
                         serversItem.level = 1;
@@ -1139,7 +1139,7 @@ public class CoreConfigV2rayService
     {
         try
         {
-            var item = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
+            var item = await AppManager.Instance.GetDNSItem(ECoreType.Xray);
             if (item != null && item.Enabled == true)
             {
                 var result = await GenDnsCompatible(node, v2rayConfig);
@@ -1310,12 +1310,12 @@ public class CoreConfigV2rayService
 
         if (node?.Subid is not null)
         {
-            var subItem = await AppHandler.Instance.GetSubItem(node.Subid);
+            var subItem = await AppManager.Instance.GetSubItem(node.Subid);
             if (subItem is not null)
             {
                 foreach (var profile in new[] { subItem.PrevProfile, subItem.NextProfile })
                 {
-                    var profileNode = await AppHandler.Instance.GetProfileItemViaRemarks(profile);
+                    var profileNode = await AppManager.Instance.GetProfileItemViaRemarks(profile);
                     if (profileNode is not null &&
                         profileNode.ConfigType is not (EConfigType.Custom or EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls) &&
                         Utils.IsDomain(profileNode.Address))
@@ -1426,7 +1426,7 @@ public class CoreConfigV2rayService
     {
         try
         {
-            var item = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
+            var item = await AppManager.Instance.GetDNSItem(ECoreType.Xray);
             var normalDNS = item?.NormalDNS;
             var domainStrategy4Freedom = item?.DomainStrategy4Freedom;
             if (normalDNS.IsNullOrEmpty())
@@ -1514,11 +1514,11 @@ public class CoreConfigV2rayService
             {
                 domainList.Add(node.Address);
             }
-            var subItem = await AppHandler.Instance.GetSubItem(node.Subid);
+            var subItem = await AppManager.Instance.GetSubItem(node.Subid);
             if (subItem is not null)
             {
                 // Previous proxy
-                var prevNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+                var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
                 if (prevNode is not null
                     && prevNode.ConfigType != EConfigType.Custom
                     && prevNode.ConfigType != EConfigType.Hysteria2
@@ -1529,7 +1529,7 @@ public class CoreConfigV2rayService
                 }
 
                 // Next proxy
-                var nextNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
+                var nextNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
                 if (nextNode is not null
                     && nextNode.ConfigType != EConfigType.Custom
                     && nextNode.ConfigType != EConfigType.Hysteria2
@@ -1578,7 +1578,7 @@ public class CoreConfigV2rayService
                 Inboundsettings4Ray apiInboundSettings = new();
                 apiInbound.tag = tag;
                 apiInbound.listen = Global.Loopback;
-                apiInbound.port = AppHandler.Instance.StatePort;
+                apiInbound.port = AppManager.Instance.StatePort;
                 apiInbound.protocol = Global.InboundAPIProtocol;
                 apiInboundSettings.address = Global.Loopback;
                 apiInbound.settings = apiInboundSettings;
@@ -1635,7 +1635,7 @@ public class CoreConfigV2rayService
         }
         try
         {
-            var subItem = await AppHandler.Instance.GetSubItem(node.Subid);
+            var subItem = await AppManager.Instance.GetSubItem(node.Subid);
             if (subItem is null)
             {
                 return 0;
@@ -1646,7 +1646,7 @@ public class CoreConfigV2rayService
             var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
 
             //Previous proxy
-            var prevNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+            var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
             string? prevOutboundTag = null;
             if (prevNode is not null
                 && prevNode.ConfigType != EConfigType.Custom
@@ -1709,7 +1709,7 @@ public class CoreConfigV2rayService
                     nextOutbound = JsonUtils.DeepCopy(nextOutbound);
                 }
 
-                var subItem = await AppHandler.Instance.GetSubItem(node.Subid);
+                var subItem = await AppManager.Instance.GetSubItem(node.Subid);
 
                 // current proxy
                 await GenOutbound(node, currentOutbound);
@@ -1723,7 +1723,7 @@ public class CoreConfigV2rayService
                     }
                     else
                     {
-                        var prevNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+                        var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
                         if (prevNode is not null
                             && prevNode.ConfigType != EConfigType.Custom
                             && prevNode.ConfigType != EConfigType.Hysteria2
@@ -1793,7 +1793,7 @@ public class CoreConfigV2rayService
             }
 
             // Next proxy
-            var nextNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
+            var nextNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
             if (nextNode is not null
                 && nextNode.ConfigType != EConfigType.Custom
                 && nextNode.ConfigType != EConfigType.Hysteria2
@@ -1829,7 +1829,7 @@ public class CoreConfigV2rayService
             var observatory = new Observatory4Ray
             {
                 subjectSelector = [Global.ProxyTag],
-                probeUrl = AppHandler.Instance.Config.SpeedTestItem.SpeedPingTestUrl,
+                probeUrl = AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl,
                 probeInterval = "3m",
                 enableConcurrency = true,
             };
@@ -1842,7 +1842,7 @@ public class CoreConfigV2rayService
                 subjectSelector = [Global.ProxyTag],
                 pingConfig = new()
                 {
-                    destination = AppHandler.Instance.Config.SpeedTestItem.SpeedPingTestUrl,
+                    destination = AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl,
                     interval = "5m",
                     timeout = "30s",
                     sampling = 2,
@@ -1870,7 +1870,7 @@ public class CoreConfigV2rayService
 
     private async Task<string> ApplyFullConfigTemplate(V2rayConfig v2rayConfig, bool handleBalancerAndRules = false)
     {
-        var fullConfigTemplate = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
+        var fullConfigTemplate = await AppManager.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
         if (fullConfigTemplate == null || !fullConfigTemplate.Enabled || fullConfigTemplate.Config.IsNullOrEmpty())
         {
             return JsonUtils.Serialize(v2rayConfig);
diff --git a/v2rayN/ServiceLib/Services/DownloadService.cs b/v2rayN/ServiceLib/Services/DownloadService.cs
index 51dee97a..f2f406ae 100644
--- a/v2rayN/ServiceLib/Services/DownloadService.cs
+++ b/v2rayN/ServiceLib/Services/DownloadService.cs
@@ -20,7 +20,7 @@ public class DownloadService
     {
         try
         {
-            SetSecurityProtocol(AppHandler.Instance.Config.GuiItem.EnableSecurityProtocolTls13);
+            SetSecurityProtocol(AppManager.Instance.Config.GuiItem.EnableSecurityProtocolTls13);
 
             var progress = new Progress<string>();
             progress.ProgressChanged += (sender, value) => updateFunc?.Invoke(false, $"{value}");
@@ -45,7 +45,7 @@ public class DownloadService
     {
         try
         {
-            SetSecurityProtocol(AppHandler.Instance.Config.GuiItem.EnableSecurityProtocolTls13);
+            SetSecurityProtocol(AppManager.Instance.Config.GuiItem.EnableSecurityProtocolTls13);
             UpdateCompleted?.Invoke(this, new RetResult(false, $"{ResUI.Downloading}   {url}"));
 
             var progress = new Progress<double>();
@@ -72,7 +72,7 @@ public class DownloadService
 
     public async Task<string?> UrlRedirectAsync(string url, bool blProxy)
     {
-        SetSecurityProtocol(AppHandler.Instance.Config.GuiItem.EnableSecurityProtocolTls13);
+        SetSecurityProtocol(AppManager.Instance.Config.GuiItem.EnableSecurityProtocolTls13);
         var webRequestHandler = new SocketsHttpHandler
         {
             AllowAutoRedirect = false,
@@ -142,7 +142,7 @@ public class DownloadService
     {
         try
         {
-            SetSecurityProtocol(AppHandler.Instance.Config.GuiItem.EnableSecurityProtocolTls13);
+            SetSecurityProtocol(AppManager.Instance.Config.GuiItem.EnableSecurityProtocolTls13);
             var webProxy = await GetWebProxy(blProxy);
             var client = new HttpClient(new SocketsHttpHandler()
             {
@@ -187,7 +187,7 @@ public class DownloadService
     {
         try
         {
-            SetSecurityProtocol(AppHandler.Instance.Config.GuiItem.EnableSecurityProtocolTls13);
+            SetSecurityProtocol(AppManager.Instance.Config.GuiItem.EnableSecurityProtocolTls13);
 
             var webProxy = await GetWebProxy(blProxy);
 
@@ -216,7 +216,7 @@ public class DownloadService
         try
         {
             webProxy ??= await GetWebProxy(true);
-            var config = AppHandler.Instance.Config;
+            var config = AppManager.Instance.Config;
 
             for (var i = 0; i < 2; i++)
             {
@@ -273,7 +273,7 @@ public class DownloadService
         {
             return null;
         }
-        var port = AppHandler.Instance.GetLocalPort(EInboundProtocol.socks);
+        var port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
         if (await SocketCheck(Global.Loopback, port) == false)
         {
             return null;
diff --git a/v2rayN/ServiceLib/Services/SpeedtestService.cs b/v2rayN/ServiceLib/Services/SpeedtestService.cs
index 9c97a217..7b4c8ebd 100644
--- a/v2rayN/ServiceLib/Services/SpeedtestService.cs
+++ b/v2rayN/ServiceLib/Services/SpeedtestService.cs
@@ -23,7 +23,7 @@ public class SpeedtestService
         Task.Run(async () =>
         {
             await RunAsync(actionType, selecteds);
-            await ProfileExHandler.Instance.SaveTo();
+            await ProfileExManager.Instance.SaveTo();
             UpdateFunc("", ResUI.SpeedtestingCompleted);
         });
     }
@@ -98,18 +98,18 @@ public class SpeedtestService
                 case ESpeedActionType.Tcping:
                 case ESpeedActionType.Realping:
                     UpdateFunc(it.IndexId, ResUI.Speedtesting, "");
-                    ProfileExHandler.Instance.SetTestDelay(it.IndexId, 0);
+                    ProfileExManager.Instance.SetTestDelay(it.IndexId, 0);
                     break;
 
                 case ESpeedActionType.Speedtest:
                     UpdateFunc(it.IndexId, "", ResUI.SpeedtestingWait);
-                    ProfileExHandler.Instance.SetTestSpeed(it.IndexId, 0);
+                    ProfileExManager.Instance.SetTestSpeed(it.IndexId, 0);
                     break;
 
                 case ESpeedActionType.Mixedtest:
                     UpdateFunc(it.IndexId, ResUI.Speedtesting, ResUI.SpeedtestingWait);
-                    ProfileExHandler.Instance.SetTestDelay(it.IndexId, 0);
-                    ProfileExHandler.Instance.SetTestSpeed(it.IndexId, 0);
+                    ProfileExManager.Instance.SetTestDelay(it.IndexId, 0);
+                    ProfileExManager.Instance.SetTestSpeed(it.IndexId, 0);
                     break;
             }
         }
@@ -132,7 +132,7 @@ public class SpeedtestService
                 {
                     var responseTime = await GetTcpingTime(it.Address, it.Port);
 
-                    ProfileExHandler.Instance.SetTestDelay(it.IndexId, responseTime);
+                    ProfileExManager.Instance.SetTestDelay(it.IndexId, responseTime);
                     UpdateFunc(it.IndexId, responseTime.ToString());
                 }
                 catch (Exception ex)
@@ -191,7 +191,7 @@ public class SpeedtestService
         var pid = -1;
         try
         {
-            pid = await CoreHandler.Instance.LoadCoreConfigSpeedtest(selecteds);
+            pid = await CoreManager.Instance.LoadCoreConfigSpeedtest(selecteds);
             if (pid < 0)
             {
                 return false;
@@ -255,7 +255,7 @@ public class SpeedtestService
                 var pid = -1;
                 try
                 {
-                    pid = await CoreHandler.Instance.LoadCoreConfigSpeedtest(it);
+                    pid = await CoreManager.Instance.LoadCoreConfigSpeedtest(it);
                     if (pid < 0)
                     {
                         UpdateFunc(it.IndexId, "", ResUI.FailedToRunCore);
@@ -299,7 +299,7 @@ public class SpeedtestService
         var webProxy = new WebProxy($"socks5://{Global.Loopback}:{it.Port}");
         var responseTime = await downloadHandle.GetRealPingTime(_config.SpeedTestItem.SpeedPingTestUrl, webProxy, 10);
 
-        ProfileExHandler.Instance.SetTestDelay(it.IndexId, responseTime);
+        ProfileExManager.Instance.SetTestDelay(it.IndexId, responseTime);
         UpdateFunc(it.IndexId, responseTime.ToString());
         return responseTime;
     }
@@ -316,7 +316,7 @@ public class SpeedtestService
             decimal.TryParse(msg, out var dec);
             if (dec > 0)
             {
-                ProfileExHandler.Instance.SetTestSpeed(it.IndexId, dec);
+                ProfileExManager.Instance.SetTestSpeed(it.IndexId, dec);
             }
             UpdateFunc(it.IndexId, "", msg);
         });
@@ -378,7 +378,7 @@ public class SpeedtestService
         _updateFunc?.Invoke(new() { IndexId = indexId, Delay = delay, Speed = speed });
         if (indexId.IsNotEmpty() && speed.IsNotEmpty())
         {
-            ProfileExHandler.Instance.SetTestMessage(indexId, speed);
+            ProfileExManager.Instance.SetTestMessage(indexId, speed);
         }
     }
 }
diff --git a/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs b/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs
index f419f831..82a5330d 100644
--- a/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs
@@ -9,7 +9,7 @@ public class StatisticsSingboxService
     private bool _exitFlag;
     private ClientWebSocket? webSocket;
     private Action<ServerSpeedItem>? _updateFunc;
-    private string Url => $"ws://{Global.Loopback}:{AppHandler.Instance.StatePort2}/traffic";
+    private string Url => $"ws://{Global.Loopback}:{AppManager.Instance.StatePort2}/traffic";
     private static readonly string _tag = "StatisticsSingboxService";
 
     public StatisticsSingboxService(Config config, Action<ServerSpeedItem> updateFunc)
diff --git a/v2rayN/ServiceLib/Services/Statistics/StatisticsXrayService.cs b/v2rayN/ServiceLib/Services/Statistics/StatisticsXrayService.cs
index 743114c6..d09ae836 100644
--- a/v2rayN/ServiceLib/Services/Statistics/StatisticsXrayService.cs
+++ b/v2rayN/ServiceLib/Services/Statistics/StatisticsXrayService.cs
@@ -7,7 +7,7 @@ public class StatisticsXrayService
     private readonly Config _config;
     private bool _exitFlag;
     private Action<ServerSpeedItem>? _updateFunc;
-    private string Url => $"{Global.HttpProtocol}{Global.Loopback}:{AppHandler.Instance.StatePort}/debug/vars";
+    private string Url => $"{Global.HttpProtocol}{Global.Loopback}:{AppManager.Instance.StatePort}/debug/vars";
 
     public StatisticsXrayService(Config config, Action<ServerSpeedItem> updateFunc)
     {
diff --git a/v2rayN/ServiceLib/Services/UpdateService.cs b/v2rayN/ServiceLib/Services/UpdateService.cs
index b60ddc6c..e87522e2 100644
--- a/v2rayN/ServiceLib/Services/UpdateService.cs
+++ b/v2rayN/ServiceLib/Services/UpdateService.cs
@@ -135,7 +135,7 @@ public class UpdateService
 
     private async Task<RetResult> GetRemoteVersion(DownloadService downloadHandle, ECoreType type, bool preRelease)
     {
-        var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(type);
+        var coreInfo = CoreInfoManager.Instance.GetCoreInfo(type);
         var tagName = string.Empty;
         if (preRelease)
         {
@@ -169,7 +169,7 @@ public class UpdateService
     {
         try
         {
-            var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(type);
+            var coreInfo = CoreInfoManager.Instance.GetCoreInfo(type);
             string filePath = string.Empty;
             foreach (var name in coreInfo.CoreExes)
             {
@@ -221,7 +221,7 @@ public class UpdateService
     {
         try
         {
-            var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(type);
+            var coreInfo = CoreInfoManager.Instance.GetCoreInfo(type);
             var coreUrl = await GetUrlFromCore(coreInfo) ?? string.Empty;
             SemanticVersion curVersion;
             string message;
@@ -379,7 +379,7 @@ public class UpdateService
         var geoSiteFiles = new List<string>();
 
         //Collect used files list
-        var routingItems = await AppHandler.Instance.RoutingItems();
+        var routingItems = await AppManager.Instance.RoutingItems();
         foreach (var routing in routingItems)
         {
             var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet);
diff --git a/v2rayN/ServiceLib/ViewModels/AddServer2ViewModel.cs b/v2rayN/ServiceLib/ViewModels/AddServer2ViewModel.cs
index 46c5298c..a94ecf74 100644
--- a/v2rayN/ServiceLib/ViewModels/AddServer2ViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/AddServer2ViewModel.cs
@@ -19,7 +19,7 @@ public class AddServer2ViewModel : MyReactiveObject
 
     public AddServer2ViewModel(ProfileItem profileItem, Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
 
         BrowseServerCmd = ReactiveCommand.CreateFromTask(async () =>
@@ -45,25 +45,25 @@ public class AddServer2ViewModel : MyReactiveObject
         var remarks = SelectedSource.Remarks;
         if (remarks.IsNullOrEmpty())
         {
-            NoticeHandler.Instance.Enqueue(ResUI.PleaseFillRemarks);
+            NoticeManager.Instance.Enqueue(ResUI.PleaseFillRemarks);
             return;
         }
 
         if (SelectedSource.Address.IsNullOrEmpty())
         {
-            NoticeHandler.Instance.Enqueue(ResUI.FillServerAddressCustom);
+            NoticeManager.Instance.Enqueue(ResUI.FillServerAddressCustom);
             return;
         }
         SelectedSource.CoreType = CoreType.IsNullOrEmpty() ? null : (ECoreType)Enum.Parse(typeof(ECoreType), CoreType);
 
         if (await ConfigHandler.EditCustomServer(_config, SelectedSource) == 0)
         {
-            NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
+            NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
             _updateView?.Invoke(EViewAction.CloseWindow, null);
         }
         else
         {
-            NoticeHandler.Instance.Enqueue(ResUI.OperationFailed);
+            NoticeManager.Instance.Enqueue(ResUI.OperationFailed);
         }
     }
 
@@ -74,12 +74,12 @@ public class AddServer2ViewModel : MyReactiveObject
             return;
         }
 
-        var item = await AppHandler.Instance.GetProfileItem(SelectedSource.IndexId);
+        var item = await AppManager.Instance.GetProfileItem(SelectedSource.IndexId);
         item ??= SelectedSource;
         item.Address = fileName;
         if (await ConfigHandler.AddCustomServer(_config, item, false) == 0)
         {
-            NoticeHandler.Instance.Enqueue(ResUI.SuccessfullyImportedCustomServer);
+            NoticeManager.Instance.Enqueue(ResUI.SuccessfullyImportedCustomServer);
             if (item.IndexId.IsNotEmpty())
             {
                 SelectedSource = JsonUtils.DeepCopy(item);
@@ -88,7 +88,7 @@ public class AddServer2ViewModel : MyReactiveObject
         }
         else
         {
-            NoticeHandler.Instance.Enqueue(ResUI.FailedImportedCustomServer);
+            NoticeManager.Instance.Enqueue(ResUI.FailedImportedCustomServer);
         }
     }
 
@@ -97,7 +97,7 @@ public class AddServer2ViewModel : MyReactiveObject
         var address = SelectedSource.Address;
         if (address.IsNullOrEmpty())
         {
-            NoticeHandler.Instance.Enqueue(ResUI.FillServerAddressCustom);
+            NoticeManager.Instance.Enqueue(ResUI.FillServerAddressCustom);
             return;
         }
 
@@ -108,7 +108,7 @@ public class AddServer2ViewModel : MyReactiveObject
         }
         else
         {
-            NoticeHandler.Instance.Enqueue(ResUI.FailedReadConfiguration);
+            NoticeManager.Instance.Enqueue(ResUI.FailedReadConfiguration);
         }
         await Task.CompletedTask;
     }
diff --git a/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs b/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs
index c268ca42..cd2399bc 100644
--- a/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs
@@ -16,7 +16,7 @@ public class AddServerViewModel : MyReactiveObject
 
     public AddServerViewModel(ProfileItem profileItem, Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
 
         SaveCmd = ReactiveCommand.CreateFromTask(async () =>
@@ -43,32 +43,32 @@ public class AddServerViewModel : MyReactiveObject
     {
         if (SelectedSource.Remarks.IsNullOrEmpty())
         {
-            NoticeHandler.Instance.Enqueue(ResUI.PleaseFillRemarks);
+            NoticeManager.Instance.Enqueue(ResUI.PleaseFillRemarks);
             return;
         }
 
         if (SelectedSource.Address.IsNullOrEmpty())
         {
-            NoticeHandler.Instance.Enqueue(ResUI.FillServerAddress);
+            NoticeManager.Instance.Enqueue(ResUI.FillServerAddress);
             return;
         }
         var port = SelectedSource.Port.ToString();
         if (port.IsNullOrEmpty() || !Utils.IsNumeric(port)
             || SelectedSource.Port <= 0 || SelectedSource.Port >= Global.MaxPort)
         {
-            NoticeHandler.Instance.Enqueue(ResUI.FillCorrectServerPort);
+            NoticeManager.Instance.Enqueue(ResUI.FillCorrectServerPort);
             return;
         }
         if (SelectedSource.ConfigType == EConfigType.Shadowsocks)
         {
             if (SelectedSource.Id.IsNullOrEmpty())
             {
-                NoticeHandler.Instance.Enqueue(ResUI.FillPassword);
+                NoticeManager.Instance.Enqueue(ResUI.FillPassword);
                 return;
             }
             if (SelectedSource.Security.IsNullOrEmpty())
             {
-                NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectEncryption);
+                NoticeManager.Instance.Enqueue(ResUI.PleaseSelectEncryption);
                 return;
             }
         }
@@ -76,7 +76,7 @@ public class AddServerViewModel : MyReactiveObject
         {
             if (SelectedSource.Id.IsNullOrEmpty())
             {
-                NoticeHandler.Instance.Enqueue(ResUI.FillUUID);
+                NoticeManager.Instance.Enqueue(ResUI.FillUUID);
                 return;
             }
         }
@@ -84,12 +84,12 @@ public class AddServerViewModel : MyReactiveObject
 
         if (await ConfigHandler.AddServer(_config, SelectedSource) == 0)
         {
-            NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
+            NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
             _updateView?.Invoke(EViewAction.CloseWindow, null);
         }
         else
         {
-            NoticeHandler.Instance.Enqueue(ResUI.OperationFailed);
+            NoticeManager.Instance.Enqueue(ResUI.OperationFailed);
         }
     }
 }
diff --git a/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs b/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs
index 82fd80d7..e258d3b2 100644
--- a/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs
@@ -22,7 +22,7 @@ public class BackupAndRestoreViewModel : MyReactiveObject
 
     public BackupAndRestoreViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
 
         WebDavCheckCmd = ReactiveCommand.CreateFromTask(async () =>
@@ -52,14 +52,14 @@ public class BackupAndRestoreViewModel : MyReactiveObject
         _config.WebDavItem = SelectedSource;
         _ = await ConfigHandler.SaveConfig(_config);
 
-        var result = await WebDavHandler.Instance.CheckConnection();
+        var result = await WebDavManager.Instance.CheckConnection();
         if (result)
         {
             DisplayOperationMsg(ResUI.OperationSuccess);
         }
         else
         {
-            DisplayOperationMsg(WebDavHandler.Instance.GetLastError());
+            DisplayOperationMsg(WebDavManager.Instance.GetLastError());
         }
     }
 
@@ -70,7 +70,7 @@ public class BackupAndRestoreViewModel : MyReactiveObject
         var result = await CreateZipFileFromDirectory(fileName);
         if (result)
         {
-            var result2 = await WebDavHandler.Instance.PutFile(fileName);
+            var result2 = await WebDavManager.Instance.PutFile(fileName);
             if (result2)
             {
                 DisplayOperationMsg(ResUI.OperationSuccess);
@@ -78,21 +78,21 @@ public class BackupAndRestoreViewModel : MyReactiveObject
             }
         }
 
-        DisplayOperationMsg(WebDavHandler.Instance.GetLastError());
+        DisplayOperationMsg(WebDavManager.Instance.GetLastError());
     }
 
     private async Task RemoteRestore()
     {
         DisplayOperationMsg();
         var fileName = Utils.GetTempPath(Utils.GetGuid());
-        var result = await WebDavHandler.Instance.GetRawFile(fileName);
+        var result = await WebDavManager.Instance.GetRawFile(fileName);
         if (result)
         {
             await LocalRestore(fileName);
             return;
         }
 
-        DisplayOperationMsg(WebDavHandler.Instance.GetLastError());
+        DisplayOperationMsg(WebDavManager.Instance.GetLastError());
     }
 
     public async Task<bool> LocalBackup(string fileName)
@@ -105,7 +105,7 @@ public class BackupAndRestoreViewModel : MyReactiveObject
         }
         else
         {
-            DisplayOperationMsg(WebDavHandler.Instance.GetLastError());
+            DisplayOperationMsg(WebDavManager.Instance.GetLastError());
         }
 
         return result;
@@ -158,7 +158,7 @@ public class BackupAndRestoreViewModel : MyReactiveObject
         }
         else
         {
-            DisplayOperationMsg(WebDavHandler.Instance.GetLastError());
+            DisplayOperationMsg(WebDavManager.Instance.GetLastError());
         }
     }
 
diff --git a/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs b/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
index 1c93a677..642149f9 100644
--- a/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
@@ -21,7 +21,7 @@ public class CheckUpdateViewModel : MyReactiveObject
 
     public CheckUpdateViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
 
         CheckUpdateCmd = ReactiveCommand.CreateFromTask(async () =>
diff --git a/v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs b/v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs
index a042da51..222e1a8d 100644
--- a/v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs
@@ -26,7 +26,7 @@ public class ClashConnectionsViewModel : MyReactiveObject
 
     public ClashConnectionsViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
         AutoRefresh = _config.ClashUIItem.ConnectionsAutoRefresh;
 
@@ -58,7 +58,7 @@ public class ClashConnectionsViewModel : MyReactiveObject
 
     private async Task GetClashConnections()
     {
-        var ret = await ClashApiHandler.Instance.GetClashConnectionsAsync();
+        var ret = await ClashApiManager.Instance.GetClashConnectionsAsync();
         if (ret == null)
         {
             return;
@@ -118,7 +118,7 @@ public class ClashConnectionsViewModel : MyReactiveObject
         {
             _connectionItems.Clear();
         }
-        await ClashApiHandler.Instance.ClashConnectionClose(id);
+        await ClashApiManager.Instance.ClashConnectionClose(id);
         await GetClashConnections();
     }
 
diff --git a/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs b/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
index 53566726..b3a66892 100644
--- a/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
@@ -43,7 +43,7 @@ public class ClashProxiesViewModel : MyReactiveObject
 
     public ClashProxiesViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
 
         ProxiesReloadCmd = ReactiveCommand.CreateFromTask(async () =>
@@ -152,13 +152,13 @@ public class ClashProxiesViewModel : MyReactiveObject
                 {
                     { "mode", mode.ToString().ToLower() }
                 };
-            await ClashApiHandler.Instance.ClashConfigUpdate(headers);
+            await ClashApiManager.Instance.ClashConfigUpdate(headers);
         }
     }
 
     private async Task GetClashProxies(bool refreshUI)
     {
-        var ret = await ClashApiHandler.Instance.GetClashProxiesAsync();
+        var ret = await ClashApiManager.Instance.GetClashProxiesAsync();
         if (ret?.Item1 == null || ret.Item2 == null)
         {
             return;
@@ -182,7 +182,7 @@ public class ClashProxiesViewModel : MyReactiveObject
         var selectedName = SelectedGroup?.Name;
         _proxyGroups.Clear();
 
-        var proxyGroups = ClashApiHandler.Instance.GetClashProxyGroups();
+        var proxyGroups = ClashApiManager.Instance.GetClashProxyGroups();
         if (proxyGroups != null && proxyGroups.Count > 0)
         {
             foreach (var it in proxyGroups)
@@ -352,11 +352,11 @@ public class ClashProxiesViewModel : MyReactiveObject
         var selectedProxy = TryGetProxy(name);
         if (selectedProxy == null || selectedProxy.type != "Selector")
         {
-            NoticeHandler.Instance.Enqueue(ResUI.OperationFailed);
+            NoticeManager.Instance.Enqueue(ResUI.OperationFailed);
             return;
         }
 
-        await ClashApiHandler.Instance.ClashSetActiveProxy(name, nameNode);
+        await ClashApiManager.Instance.ClashSetActiveProxy(name, nameNode);
 
         selectedProxy.now = nameNode;
         var group = _proxyGroups.FirstOrDefault(it => it.Name == SelectedGroup.Name);
@@ -368,12 +368,12 @@ public class ClashProxiesViewModel : MyReactiveObject
 
             SelectedGroup = group2;
         }
-        NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
+        NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
     }
 
     private async Task ProxiesDelayTest(bool blAll = true)
     {
-        ClashApiHandler.Instance.ClashProxiesDelayTest(blAll, _proxyDetails.ToList(), (item, result) =>
+        ClashApiManager.Instance.ClashProxiesDelayTest(blAll, _proxyDetails.ToList(), (item, result) =>
         {
             if (item == null || result.IsNullOrEmpty())
             {
diff --git a/v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs b/v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs
index a679b8c1..9ca2d407 100644
--- a/v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs
@@ -38,7 +38,7 @@ public class DNSSettingViewModel : MyReactiveObject
 
     public DNSSettingViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
         SaveCmd = ReactiveCommand.CreateFromTask(SaveSettingAsync);
 
@@ -60,7 +60,7 @@ public class DNSSettingViewModel : MyReactiveObject
 
     private async Task Init()
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         var item = _config.SimpleDNSItem;
         UseSystemHosts = item.UseSystemHosts;
         AddCommonHosts = item.AddCommonHosts;
@@ -76,14 +76,14 @@ public class DNSSettingViewModel : MyReactiveObject
         Hosts = item.Hosts;
         DirectExpectedIPs = item.DirectExpectedIPs;
 
-        var item1 = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
+        var item1 = await AppManager.Instance.GetDNSItem(ECoreType.Xray);
         RayCustomDNSEnableCompatible = item1.Enabled;
         UseSystemHostsCompatible = item1.UseSystemHosts;
         DomainStrategy4FreedomCompatible = item1?.DomainStrategy4Freedom ?? string.Empty;
         DomainDNSAddressCompatible = item1?.DomainDNSAddress ?? string.Empty;
         NormalDNSCompatible = item1?.NormalDNS ?? string.Empty;
 
-        var item2 = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+        var item2 = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
         SBCustomDNSEnableCompatible = item2.Enabled;
         DomainStrategy4Freedom2Compatible = item2?.DomainStrategy4Freedom ?? string.Empty;
         DomainDNSAddress2Compatible = item2?.DomainDNSAddress ?? string.Empty;
@@ -117,7 +117,7 @@ public class DNSSettingViewModel : MyReactiveObject
             {
                 if (NormalDNSCompatible.Contains('{') || NormalDNSCompatible.Contains('}'))
                 {
-                    NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
+                    NoticeManager.Instance.Enqueue(ResUI.FillCorrectDNSText);
                     return;
                 }
             }
@@ -127,7 +127,7 @@ public class DNSSettingViewModel : MyReactiveObject
             var obj2 = JsonUtils.Deserialize<Dns4Sbox>(NormalDNS2Compatible);
             if (obj2 == null)
             {
-                NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
+                NoticeManager.Instance.Enqueue(ResUI.FillCorrectDNSText);
                 return;
             }
         }
@@ -136,12 +136,12 @@ public class DNSSettingViewModel : MyReactiveObject
             var obj2 = JsonUtils.Deserialize<Dns4Sbox>(TunDNS2Compatible);
             if (obj2 == null)
             {
-                NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
+                NoticeManager.Instance.Enqueue(ResUI.FillCorrectDNSText);
                 return;
             }
         }
 
-        var item1 = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
+        var item1 = await AppManager.Instance.GetDNSItem(ECoreType.Xray);
         item1.Enabled = RayCustomDNSEnableCompatible;
         item1.DomainStrategy4Freedom = DomainStrategy4FreedomCompatible;
         item1.DomainDNSAddress = DomainDNSAddressCompatible;
@@ -149,7 +149,7 @@ public class DNSSettingViewModel : MyReactiveObject
         item1.NormalDNS = NormalDNSCompatible;
         await ConfigHandler.SaveDNSItems(_config, item1);
 
-        var item2 = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+        var item2 = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
         item2.Enabled = SBCustomDNSEnableCompatible;
         item2.DomainStrategy4Freedom = DomainStrategy4Freedom2Compatible;
         item2.DomainDNSAddress = DomainDNSAddress2Compatible;
diff --git a/v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs b/v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs
index f36a7fb6..3619ddef 100644
--- a/v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs
@@ -41,7 +41,7 @@ public class FullConfigTemplateViewModel : MyReactiveObject
 
     public FullConfigTemplateViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
         SaveCmd = ReactiveCommand.CreateFromTask(async () =>
         {
@@ -53,13 +53,13 @@ public class FullConfigTemplateViewModel : MyReactiveObject
 
     private async Task Init()
     {
-        var item = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
+        var item = await AppManager.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
         EnableFullConfigTemplate4Ray = item?.Enabled ?? false;
         FullConfigTemplate4Ray = item?.Config ?? string.Empty;
         AddProxyOnly4Ray = item?.AddProxyOnly ?? false;
         ProxyDetour4Ray = item?.ProxyDetour ?? string.Empty;
 
-        var item2 = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.sing_box);
+        var item2 = await AppManager.Instance.GetFullConfigTemplateItem(ECoreType.sing_box);
         EnableFullConfigTemplate4Singbox = item2?.Enabled ?? false;
         FullConfigTemplate4Singbox = item2?.Config ?? string.Empty;
         FullTunConfigTemplate4Singbox = item2?.TunConfig ?? string.Empty;
@@ -75,13 +75,13 @@ public class FullConfigTemplateViewModel : MyReactiveObject
         if (!await SaveSingboxConfigAsync())
             return;
 
-        NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
+        NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
         _ = _updateView?.Invoke(EViewAction.CloseWindow, null);
     }
 
     private async Task<bool> SaveXrayConfigAsync()
     {
-        var item = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
+        var item = await AppManager.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
         item.Enabled = EnableFullConfigTemplate4Ray;
         item.Config = null;
 
@@ -96,7 +96,7 @@ public class FullConfigTemplateViewModel : MyReactiveObject
 
     private async Task<bool> SaveSingboxConfigAsync()
     {
-        var item = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.sing_box);
+        var item = await AppManager.Instance.GetFullConfigTemplateItem(ECoreType.sing_box);
         item.Enabled = EnableFullConfigTemplate4Singbox;
         item.Config = null;
         item.TunConfig = null;
diff --git a/v2rayN/ServiceLib/ViewModels/GlobalHotkeySettingViewModel.cs b/v2rayN/ServiceLib/ViewModels/GlobalHotkeySettingViewModel.cs
index ba3293c9..0acb8726 100644
--- a/v2rayN/ServiceLib/ViewModels/GlobalHotkeySettingViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/GlobalHotkeySettingViewModel.cs
@@ -11,7 +11,7 @@ public class GlobalHotkeySettingViewModel : MyReactiveObject
 
     public GlobalHotkeySettingViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
 
         _globalHotkeys = JsonUtils.DeepCopy(_config.GlobalHotkeys);
@@ -58,7 +58,7 @@ public class GlobalHotkeySettingViewModel : MyReactiveObject
         }
         else
         {
-            NoticeHandler.Instance.Enqueue(ResUI.OperationFailed);
+            NoticeManager.Instance.Enqueue(ResUI.OperationFailed);
         }
     }
 }
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index 8945c1eb..e04f6230 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -71,7 +71,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     public MainWindowViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
 
         #region WhenAnyValue && ReactiveCommand
@@ -178,7 +178,7 @@ public class MainWindowViewModel : MyReactiveObject
         {
             if (await _updateView?.Invoke(EViewAction.GlobalHotkeySettingWindow, null) == true)
             {
-                NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
+                NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
             }
         });
         RebootAsAdminCmd = ReactiveCommand.CreateFromTask(async () =>
@@ -226,13 +226,13 @@ public class MainWindowViewModel : MyReactiveObject
         await ConfigHandler.InitBuiltinRouting(_config);
         await ConfigHandler.InitBuiltinDNS(_config);
         await ConfigHandler.InitBuiltinFullConfigTemplate(_config);
-        await ProfileExHandler.Instance.Init();
-        await CoreHandler.Instance.Init(_config, UpdateHandler);
-        TaskHandler.Instance.RegUpdateTask(_config, UpdateTaskHandler);
+        await ProfileExManager.Instance.Init();
+        await CoreManager.Instance.Init(_config, UpdateHandler);
+        TaskManager.Instance.RegUpdateTask(_config, UpdateTaskHandler);
 
         if (_config.GuiItem.EnableStatistics || _config.GuiItem.DisplayRealTimeSpeed)
         {
-            await StatisticsHandler.Instance.Init(_config, UpdateStatisticsHandler);
+            await StatisticsManager.Instance.Init(_config, UpdateStatisticsHandler);
         }
 
         BlReloadEnabled = true;
@@ -247,16 +247,16 @@ public class MainWindowViewModel : MyReactiveObject
 
     private void UpdateHandler(bool notify, string msg)
     {
-        NoticeHandler.Instance.SendMessage(msg);
+        NoticeManager.Instance.SendMessage(msg);
         if (notify)
         {
-            NoticeHandler.Instance.Enqueue(msg);
+            NoticeManager.Instance.Enqueue(msg);
         }
     }
 
     private void UpdateTaskHandler(bool success, string msg)
     {
-        NoticeHandler.Instance.SendMessageEx(msg);
+        NoticeManager.Instance.SendMessageEx(msg);
         if (success)
         {
             var indexIdOld = _config.IndexId;
@@ -303,10 +303,10 @@ public class MainWindowViewModel : MyReactiveObject
             MessageBus.Current.SendMessage("", EMsgCommand.AppExit.ToString());
 
             await ConfigHandler.SaveConfig(_config);
-            await ProfileExHandler.Instance.SaveTo();
-            await StatisticsHandler.Instance.SaveTo();
-            await CoreHandler.Instance.CoreStop();
-            StatisticsHandler.Instance.Close();
+            await ProfileExManager.Instance.SaveTo();
+            await StatisticsManager.Instance.SaveTo();
+            await CoreManager.Instance.CoreStop();
+            StatisticsManager.Instance.Close();
 
             Logging.SaveLog("MyAppExitAsync End");
         }
@@ -324,7 +324,7 @@ public class MainWindowViewModel : MyReactiveObject
     {
         if (!Utils.UpgradeAppExists(out var upgradeFileName))
         {
-            NoticeHandler.Instance.SendMessageAndEnqueue(ResUI.UpgradeAppNotExistTip);
+            NoticeManager.Instance.SendMessageAndEnqueue(ResUI.UpgradeAppNotExistTip);
             Logging.SaveLog("UpgradeApp does not exist");
             return;
         }
@@ -404,11 +404,11 @@ public class MainWindowViewModel : MyReactiveObject
         {
             RefreshSubscriptions();
             RefreshServers();
-            NoticeHandler.Instance.Enqueue(string.Format(ResUI.SuccessfullyImportedServerViaClipboard, ret));
+            NoticeManager.Instance.Enqueue(string.Format(ResUI.SuccessfullyImportedServerViaClipboard, ret));
         }
         else
         {
-            NoticeHandler.Instance.Enqueue(ResUI.OperationFailed);
+            NoticeManager.Instance.Enqueue(ResUI.OperationFailed);
         }
     }
 
@@ -445,7 +445,7 @@ public class MainWindowViewModel : MyReactiveObject
     {
         if (result.IsNullOrEmpty())
         {
-            NoticeHandler.Instance.Enqueue(ResUI.NoValidQRcodeFound);
+            NoticeManager.Instance.Enqueue(ResUI.NoValidQRcodeFound);
         }
         else
         {
@@ -454,11 +454,11 @@ public class MainWindowViewModel : MyReactiveObject
             {
                 RefreshSubscriptions();
                 RefreshServers();
-                NoticeHandler.Instance.Enqueue(ResUI.SuccessfullyImportedServerViaScan);
+                NoticeManager.Instance.Enqueue(ResUI.SuccessfullyImportedServerViaScan);
             }
             else
             {
-                NoticeHandler.Instance.Enqueue(ResUI.OperationFailed);
+                NoticeManager.Instance.Enqueue(ResUI.OperationFailed);
             }
         }
     }
@@ -531,7 +531,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     private async Task ClearServerStatistics()
     {
-        await StatisticsHandler.Instance.ClearAllServerStatistics();
+        await StatisticsManager.Instance.ClearAllServerStatistics();
         RefreshServers();
     }
 
@@ -602,13 +602,13 @@ public class MainWindowViewModel : MyReactiveObject
     private async Task LoadCore()
     {
         var node = await ConfigHandler.GetDefaultServer(_config);
-        await CoreHandler.Instance.LoadCore(node);
+        await CoreManager.Instance.LoadCore(node);
     }
 
     public async Task CloseCore()
     {
         await ConfigHandler.SaveConfig(_config);
-        await CoreHandler.Instance.CoreStop();
+        await CoreManager.Instance.CoreStop();
     }
 
     private async Task AutoHideStartup()
diff --git a/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs b/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs
index 80c19ebd..4d13d007 100644
--- a/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs
@@ -20,7 +20,7 @@ public class MsgViewModel : MyReactiveObject
 
     public MsgViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
         MsgFilter = _config.MsgUIItem.MainMsgFilter ?? string.Empty;
         AutoRefresh = _config.MsgUIItem.AutoRefresh ?? true;
diff --git a/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs b/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
index b45eb30c..7f446cf2 100644
--- a/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
@@ -109,7 +109,7 @@ public class OptionSettingViewModel : MyReactiveObject
 
     public OptionSettingViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
 
         SaveCmd = ReactiveCommand.CreateFromTask(async () =>
@@ -276,7 +276,7 @@ public class OptionSettingViewModel : MyReactiveObject
         if (localPort.ToString().IsNullOrEmpty() || !Utils.IsNumeric(localPort.ToString())
            || localPort <= 0 || localPort >= Global.MaxPort)
         {
-            NoticeHandler.Instance.Enqueue(ResUI.FillLocalListeningPort);
+            NoticeManager.Instance.Enqueue(ResUI.FillLocalListeningPort);
             return;
         }
         var needReboot = (EnableStatistics != _config.GuiItem.EnableStatistics
@@ -369,14 +369,14 @@ public class OptionSettingViewModel : MyReactiveObject
         if (await ConfigHandler.SaveConfig(_config) == 0)
         {
             await AutoStartupHandler.UpdateTask(_config);
-            AppHandler.Instance.Reset();
+            AppManager.Instance.Reset();
 
-            NoticeHandler.Instance.Enqueue(needReboot ? ResUI.NeedRebootTips : ResUI.OperationSuccess);
+            NoticeManager.Instance.Enqueue(needReboot ? ResUI.NeedRebootTips : ResUI.OperationSuccess);
             _updateView?.Invoke(EViewAction.CloseWindow, null);
         }
         else
         {
-            NoticeHandler.Instance.Enqueue(ResUI.OperationFailed);
+            NoticeManager.Instance.Enqueue(ResUI.OperationFailed);
         }
     }
 
diff --git a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
index f312b890..8362ecea 100644
--- a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
@@ -100,7 +100,7 @@ public class ProfilesViewModel : MyReactiveObject
 
     public ProfilesViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
 
         #region WhenAnyValue && ReactiveCommand
@@ -284,8 +284,8 @@ public class ProfilesViewModel : MyReactiveObject
     {
         if (result.IndexId.IsNullOrEmpty())
         {
-            NoticeHandler.Instance.SendMessageEx(result.Delay);
-            NoticeHandler.Instance.Enqueue(result.Delay);
+            NoticeManager.Instance.SendMessageEx(result.Delay);
+            NoticeManager.Instance.Enqueue(result.Delay);
             return;
         }
         var item = _profileItems.FirstOrDefault(it => it.IndexId == result.IndexId);
@@ -403,7 +403,7 @@ public class ProfilesViewModel : MyReactiveObject
 
         _subItems.Add(new SubItem { Remarks = ResUI.AllGroupServers });
 
-        foreach (var item in await AppHandler.Instance.SubItems())
+        foreach (var item in await AppManager.Instance.SubItems())
         {
             _subItems.Add(item);
         }
@@ -419,12 +419,12 @@ public class ProfilesViewModel : MyReactiveObject
 
     private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)
     {
-        var lstModel = await AppHandler.Instance.ProfileItems(_config.SubIndexId, filter);
+        var lstModel = await AppManager.Instance.ProfileItems(_config.SubIndexId, filter);
 
         await ConfigHandler.SetDefaultServer(_config, lstModel);
 
-        var lstServerStat = (_config.GuiItem.EnableStatistics ? StatisticsHandler.Instance.ServerStat : null) ?? [];
-        var lstProfileExs = await ProfileExHandler.Instance.GetProfileExs();
+        var lstServerStat = (_config.GuiItem.EnableStatistics ? StatisticsManager.Instance.ServerStat : null) ?? [];
+        var lstProfileExs = await ProfileExManager.Instance.GetProfileExs();
         lstModel = (from t in lstModel
                     join t2 in lstServerStat on t.IndexId equals t2.IndexId into t2b
                     from t22 in t2b.DefaultIfEmpty()
@@ -474,7 +474,7 @@ public class ProfilesViewModel : MyReactiveObject
         {
             foreach (var profile in orderProfiles)
             {
-                var item = await AppHandler.Instance.GetProfileItem(profile.IndexId);
+                var item = await AppManager.Instance.GetProfileItem(profile.IndexId);
                 if (item is not null)
                 {
                     lstSelected.Add(item);
@@ -495,10 +495,10 @@ public class ProfilesViewModel : MyReactiveObject
         {
             return;
         }
-        var item = await AppHandler.Instance.GetProfileItem(SelectedProfile.IndexId);
+        var item = await AppManager.Instance.GetProfileItem(SelectedProfile.IndexId);
         if (item is null)
         {
-            NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectServer);
+            NoticeManager.Instance.Enqueue(ResUI.PleaseSelectServer);
             return;
         }
         eConfigType = item.ConfigType;
@@ -536,7 +536,7 @@ public class ProfilesViewModel : MyReactiveObject
         var exists = lstSelected.Exists(t => t.IndexId == _config.IndexId);
 
         await ConfigHandler.RemoveServers(_config, lstSelected);
-        NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
+        NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
         if (lstSelected.Count == _profileItems.Count)
         {
             _profileItems.Clear();
@@ -556,7 +556,7 @@ public class ProfilesViewModel : MyReactiveObject
             RefreshServers();
             Reload();
         }
-        NoticeHandler.Instance.Enqueue(string.Format(ResUI.RemoveDuplicateServerResult, tuple.Item1, tuple.Item2));
+        NoticeManager.Instance.Enqueue(string.Format(ResUI.RemoveDuplicateServerResult, tuple.Item1, tuple.Item2));
     }
 
     private async Task CopyServer()
@@ -569,7 +569,7 @@ public class ProfilesViewModel : MyReactiveObject
         if (await ConfigHandler.CopyServer(_config, lstSelected) == 0)
         {
             RefreshServers();
-            NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
+            NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
         }
     }
 
@@ -592,10 +592,10 @@ public class ProfilesViewModel : MyReactiveObject
         {
             return;
         }
-        var item = await AppHandler.Instance.GetProfileItem(indexId);
+        var item = await AppManager.Instance.GetProfileItem(indexId);
         if (item is null)
         {
-            NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectServer);
+            NoticeManager.Instance.Enqueue(ResUI.PleaseSelectServer);
             return;
         }
 
@@ -621,10 +621,10 @@ public class ProfilesViewModel : MyReactiveObject
 
     public async Task ShareServerAsync()
     {
-        var item = await AppHandler.Instance.GetProfileItem(SelectedProfile.IndexId);
+        var item = await AppManager.Instance.GetProfileItem(SelectedProfile.IndexId);
         if (item is null)
         {
-            NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectServer);
+            NoticeManager.Instance.Enqueue(ResUI.PleaseSelectServer);
             return;
         }
         var url = FmtHandler.GetShareUri(item);
@@ -647,7 +647,7 @@ public class ProfilesViewModel : MyReactiveObject
         var ret = await ConfigHandler.AddCustomServer4Multiple(_config, lstSelected, coreType, multipleLoad);
         if (ret.Success != true)
         {
-            NoticeHandler.Instance.Enqueue(ResUI.OperationFailed);
+            NoticeManager.Instance.Enqueue(ResUI.OperationFailed);
             return;
         }
         if (ret?.Data?.ToString() == _config.IndexId)
@@ -682,7 +682,7 @@ public class ProfilesViewModel : MyReactiveObject
     {
         var count = await ConfigHandler.RemoveInvalidServerResult(_config, _config.SubIndexId);
         RefreshServers();
-        NoticeHandler.Instance.Enqueue(string.Format(ResUI.RemoveInvalidServerResultTip, count));
+        NoticeManager.Instance.Enqueue(string.Format(ResUI.RemoveInvalidServerResultTip, count));
     }
 
     //move server
@@ -700,7 +700,7 @@ public class ProfilesViewModel : MyReactiveObject
         }
 
         await ConfigHandler.MoveToGroup(_config, lstSelected, SelectedMoveToGroup.Id);
-        NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
+        NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
 
         RefreshServers();
         SelectedMoveToGroup = null;
@@ -712,7 +712,7 @@ public class ProfilesViewModel : MyReactiveObject
         var item = _lstProfile.FirstOrDefault(t => t.IndexId == SelectedProfile.IndexId);
         if (item is null)
         {
-            NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectServer);
+            NoticeManager.Instance.Enqueue(ResUI.PleaseSelectServer);
             return;
         }
 
@@ -762,10 +762,10 @@ public class ProfilesViewModel : MyReactiveObject
 
     private async Task Export2ClientConfigAsync(bool blClipboard)
     {
-        var item = await AppHandler.Instance.GetProfileItem(SelectedProfile.IndexId);
+        var item = await AppManager.Instance.GetProfileItem(SelectedProfile.IndexId);
         if (item is null)
         {
-            NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectServer);
+            NoticeManager.Instance.Enqueue(ResUI.PleaseSelectServer);
             return;
         }
         if (blClipboard)
@@ -773,12 +773,12 @@ public class ProfilesViewModel : MyReactiveObject
             var result = await CoreConfigHandler.GenerateClientConfig(item, null);
             if (result.Success != true)
             {
-                NoticeHandler.Instance.Enqueue(result.Msg);
+                NoticeManager.Instance.Enqueue(result.Msg);
             }
             else
             {
                 await _updateView?.Invoke(EViewAction.SetClipboardData, result.Data);
-                NoticeHandler.Instance.SendMessage(ResUI.OperationSuccess);
+                NoticeManager.Instance.SendMessage(ResUI.OperationSuccess);
             }
         }
         else
@@ -796,11 +796,11 @@ public class ProfilesViewModel : MyReactiveObject
         var result = await CoreConfigHandler.GenerateClientConfig(item, fileName);
         if (result.Success != true)
         {
-            NoticeHandler.Instance.Enqueue(result.Msg);
+            NoticeManager.Instance.Enqueue(result.Msg);
         }
         else
         {
-            NoticeHandler.Instance.SendMessageAndEnqueue(string.Format(ResUI.SaveClientConfigurationIn, fileName));
+            NoticeManager.Instance.SendMessageAndEnqueue(string.Format(ResUI.SaveClientConfigurationIn, fileName));
         }
     }
 
@@ -833,7 +833,7 @@ public class ProfilesViewModel : MyReactiveObject
             {
                 await _updateView?.Invoke(EViewAction.SetClipboardData, sb.ToString());
             }
-            NoticeHandler.Instance.SendMessage(ResUI.BatchExportURLSuccessfully);
+            NoticeManager.Instance.SendMessage(ResUI.BatchExportURLSuccessfully);
         }
     }
 
@@ -850,7 +850,7 @@ public class ProfilesViewModel : MyReactiveObject
         }
         else
         {
-            item = await AppHandler.Instance.GetSubItem(_config.SubIndexId);
+            item = await AppManager.Instance.GetSubItem(_config.SubIndexId);
             if (item is null)
             {
                 return;
diff --git a/v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs b/v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs
index c4970f84..758aa8fe 100644
--- a/v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs
@@ -28,7 +28,7 @@ public class RoutingRuleDetailsViewModel : MyReactiveObject
 
     public RoutingRuleDetailsViewModel(RulesItem rulesItem, Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
 
         SaveCmd = ReactiveCommand.CreateFromTask(async () =>
@@ -83,7 +83,7 @@ public class RoutingRuleDetailsViewModel : MyReactiveObject
 
         if (!hasRule)
         {
-            NoticeHandler.Instance.Enqueue(string.Format(ResUI.RoutingRuleDetailRequiredTips, "Network/Port/Protocol/Domain/IP/Process"));
+            NoticeManager.Instance.Enqueue(string.Format(ResUI.RoutingRuleDetailRequiredTips, "Network/Port/Protocol/Domain/IP/Process"));
             return;
         }
         //NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
diff --git a/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs b/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs
index 93658a07..c3acc7ba 100644
--- a/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs
@@ -37,7 +37,7 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
 
     public RoutingRuleSettingViewModel(RoutingItem routingItem, Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
 
         var canEditRemove = this.WhenAnyValue(
@@ -151,7 +151,7 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
     {
         if (SelectedSource is null || SelectedSource.OutboundTag.IsNullOrEmpty())
         {
-            NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectRules);
+            NoticeManager.Instance.Enqueue(ResUI.PleaseSelectRules);
             return;
         }
         if (await _updateView?.Invoke(EViewAction.ShowYesNo, null) == false)
@@ -174,7 +174,7 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
     {
         if (SelectedSource is null || SelectedSource.OutboundTag.IsNullOrEmpty())
         {
-            NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectRules);
+            NoticeManager.Instance.Enqueue(ResUI.PleaseSelectRules);
             return;
         }
 
@@ -205,7 +205,7 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
     {
         if (SelectedSource is null || SelectedSource.OutboundTag.IsNullOrEmpty())
         {
-            NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectRules);
+            NoticeManager.Instance.Enqueue(ResUI.PleaseSelectRules);
             return;
         }
 
@@ -226,7 +226,7 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
         string remarks = SelectedRouting.Remarks;
         if (remarks.IsNullOrEmpty())
         {
-            NoticeHandler.Instance.Enqueue(ResUI.PleaseFillRemarks);
+            NoticeManager.Instance.Enqueue(ResUI.PleaseFillRemarks);
             return;
         }
         var item = SelectedRouting;
@@ -239,12 +239,12 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
 
         if (await ConfigHandler.SaveRoutingItem(_config, item) == 0)
         {
-            NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
+            NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
             _updateView?.Invoke(EViewAction.CloseWindow, null);
         }
         else
         {
-            NoticeHandler.Instance.Enqueue(ResUI.OperationFailed);
+            NoticeManager.Instance.Enqueue(ResUI.OperationFailed);
         }
     }
 
@@ -266,7 +266,7 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
         if (ret == 0)
         {
             RefreshRulesItems();
-            NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
+            NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
         }
     }
 
@@ -281,7 +281,7 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
         if (ret == 0)
         {
             RefreshRulesItems();
-            NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
+            NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
         }
     }
 
@@ -290,7 +290,7 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
         var url = SelectedRouting.Url;
         if (url.IsNullOrEmpty())
         {
-            NoticeHandler.Instance.Enqueue(ResUI.MsgNeedUrl);
+            NoticeManager.Instance.Enqueue(ResUI.MsgNeedUrl);
             return;
         }
 
@@ -300,7 +300,7 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
         if (ret == 0)
         {
             RefreshRulesItems();
-            NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
+            NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
         }
     }
 
diff --git a/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs b/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs
index e202a094..8aa36f0c 100644
--- a/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs
@@ -35,7 +35,7 @@ public class RoutingSettingViewModel : MyReactiveObject
 
     public RoutingSettingViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
 
         var canEditRemove = this.WhenAnyValue(
@@ -84,7 +84,7 @@ public class RoutingSettingViewModel : MyReactiveObject
     {
         _routingItems.Clear();
 
-        var routings = await AppHandler.Instance.RoutingItems();
+        var routings = await AppManager.Instance.RoutingItems();
         foreach (var item in routings)
         {
             var it = new RoutingItemModel()
@@ -109,12 +109,12 @@ public class RoutingSettingViewModel : MyReactiveObject
 
         if (await ConfigHandler.SaveConfig(_config) == 0)
         {
-            NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
+            NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
             _updateView?.Invoke(EViewAction.CloseWindow, null);
         }
         else
         {
-            NoticeHandler.Instance.Enqueue(ResUI.OperationFailed);
+            NoticeManager.Instance.Enqueue(ResUI.OperationFailed);
         }
     }
 
@@ -129,7 +129,7 @@ public class RoutingSettingViewModel : MyReactiveObject
         }
         else
         {
-            item = await AppHandler.Instance.GetRoutingItem(SelectedSource?.Id);
+            item = await AppManager.Instance.GetRoutingItem(SelectedSource?.Id);
             if (item is null)
             {
                 return;
@@ -146,7 +146,7 @@ public class RoutingSettingViewModel : MyReactiveObject
     {
         if (SelectedSource is null || SelectedSource.Remarks.IsNullOrEmpty())
         {
-            NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectRules);
+            NoticeManager.Instance.Enqueue(ResUI.PleaseSelectRules);
             return;
         }
         if (await _updateView?.Invoke(EViewAction.ShowYesNo, null) == false)
@@ -155,7 +155,7 @@ public class RoutingSettingViewModel : MyReactiveObject
         }
         foreach (var it in SelectedSources ?? [SelectedSource])
         {
-            var item = await AppHandler.Instance.GetRoutingItem(it?.Id);
+            var item = await AppManager.Instance.GetRoutingItem(it?.Id);
             if (item != null)
             {
                 await ConfigHandler.RemoveRoutingItem(item);
@@ -168,10 +168,10 @@ public class RoutingSettingViewModel : MyReactiveObject
 
     public async Task RoutingAdvancedSetDefault()
     {
-        var item = await AppHandler.Instance.GetRoutingItem(SelectedSource?.Id);
+        var item = await AppManager.Instance.GetRoutingItem(SelectedSource?.Id);
         if (item is null)
         {
-            NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectRules);
+            NoticeManager.Instance.Enqueue(ResUI.PleaseSelectRules);
             return;
         }
 
diff --git a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
index f9c4e6d7..ae097c3c 100644
--- a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
@@ -100,7 +100,7 @@ public class StatusBarViewModel : MyReactiveObject
 
     public StatusBarViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         SelectedRouting = new();
         SelectedServer = new();
         RunningServerToolTipText = "-";
@@ -228,7 +228,7 @@ public class StatusBarViewModel : MyReactiveObject
     private async Task CopyProxyCmdToClipboard()
     {
         var cmd = Utils.IsWindows() ? "set" : "export";
-        var address = $"{Global.Loopback}:{AppHandler.Instance.GetLocalPort(EInboundProtocol.socks)}";
+        var address = $"{Global.Loopback}:{AppManager.Instance.GetLocalPort(EInboundProtocol.socks)}";
 
         var sb = new StringBuilder();
         sb.AppendLine($"{cmd} http_proxy={Global.HttpProtocol}{address}");
@@ -283,7 +283,7 @@ public class StatusBarViewModel : MyReactiveObject
 
     private async Task RefreshServersMenu()
     {
-        var lstModel = await AppHandler.Instance.ProfileItems(_config.SubIndexId, "");
+        var lstModel = await AppManager.Instance.ProfileItems(_config.SubIndexId, "");
 
         _servers.Clear();
         if (lstModel.Count > _config.GuiItem.TrayMenuServersLimit)
@@ -336,7 +336,7 @@ public class StatusBarViewModel : MyReactiveObject
 
         var msg = await Task.Run(ConnectionHandler.RunAvailabilityCheck);
 
-        NoticeHandler.Instance.SendMessageEx(msg);
+        NoticeManager.Instance.SendMessageEx(msg);
         _updateView?.Invoke(EViewAction.DispatcherServerAvailability, msg);
     }
 
@@ -355,7 +355,7 @@ public class StatusBarViewModel : MyReactiveObject
         }
         _config.SystemProxyItem.SysProxyType = type;
         await ChangeSystemProxyAsync(type, true);
-        NoticeHandler.Instance.SendMessageEx($"{ResUI.TipChangeSystemProxy} - {_config.SystemProxyItem.SysProxyType.ToString()}");
+        NoticeManager.Instance.SendMessageEx($"{ResUI.TipChangeSystemProxy} - {_config.SystemProxyItem.SysProxyType.ToString()}");
 
         SystemProxySelected = (int)_config.SystemProxyItem.SysProxyType;
         await ConfigHandler.SaveConfig(_config);
@@ -381,7 +381,7 @@ public class StatusBarViewModel : MyReactiveObject
         _routingItems.Clear();
 
         BlRouting = true;
-        var routings = await AppHandler.Instance.RoutingItems();
+        var routings = await AppManager.Instance.RoutingItems();
         foreach (var item in routings)
         {
             _routingItems.Add(item);
@@ -404,7 +404,7 @@ public class StatusBarViewModel : MyReactiveObject
             return;
         }
 
-        var item = await AppHandler.Instance.GetRoutingItem(SelectedRouting?.Id);
+        var item = await AppManager.Instance.GetRoutingItem(SelectedRouting?.Id);
         if (item is null)
         {
             return;
@@ -412,7 +412,7 @@ public class StatusBarViewModel : MyReactiveObject
 
         if (await ConfigHandler.SetDefaultRouting(_config, item) == 0)
         {
-            NoticeHandler.Instance.SendMessageEx(ResUI.TipChangeRouting);
+            NoticeManager.Instance.SendMessageEx(ResUI.TipChangeRouting);
             Locator.Current.GetService<MainWindowViewModel>()?.Reload();
             _updateView?.Invoke(EViewAction.DispatcherRefreshIcon, null);
         }
@@ -471,11 +471,11 @@ public class StatusBarViewModel : MyReactiveObject
         }
         else if (Utils.IsLinux())
         {
-            return AppHandler.Instance.LinuxSudoPwd.IsNotEmpty();
+            return AppManager.Instance.LinuxSudoPwd.IsNotEmpty();
         }
         else if (Utils.IsOSX())
         {
-            return AppHandler.Instance.LinuxSudoPwd.IsNotEmpty();
+            return AppManager.Instance.LinuxSudoPwd.IsNotEmpty();
         }
         return false;
     }
@@ -487,10 +487,10 @@ public class StatusBarViewModel : MyReactiveObject
     public async Task InboundDisplayStatus()
     {
         StringBuilder sb = new();
-        sb.Append($"[{EInboundProtocol.mixed}:{AppHandler.Instance.GetLocalPort(EInboundProtocol.socks)}");
+        sb.Append($"[{EInboundProtocol.mixed}:{AppManager.Instance.GetLocalPort(EInboundProtocol.socks)}");
         if (_config.Inbound.First().SecondLocalPortEnabled)
         {
-            sb.Append($",{AppHandler.Instance.GetLocalPort(EInboundProtocol.socks2)}");
+            sb.Append($",{AppManager.Instance.GetLocalPort(EInboundProtocol.socks2)}");
         }
         sb.Append(']');
         InboundDisplay = $"{ResUI.LabLocal}:{sb}";
@@ -498,8 +498,8 @@ public class StatusBarViewModel : MyReactiveObject
         if (_config.Inbound.First().AllowLANConn)
         {
             var lan = _config.Inbound.First().NewPort4LAN
-                ? $"[{EInboundProtocol.mixed}:{AppHandler.Instance.GetLocalPort(EInboundProtocol.socks3)}]"
-                : $"[{EInboundProtocol.mixed}:{AppHandler.Instance.GetLocalPort(EInboundProtocol.socks)}]";
+                ? $"[{EInboundProtocol.mixed}:{AppManager.Instance.GetLocalPort(EInboundProtocol.socks3)}]"
+                : $"[{EInboundProtocol.mixed}:{AppManager.Instance.GetLocalPort(EInboundProtocol.socks)}]";
             InboundLanDisplay = $"{ResUI.LabLAN}:{lan}";
         }
         else
diff --git a/v2rayN/ServiceLib/ViewModels/SubEditViewModel.cs b/v2rayN/ServiceLib/ViewModels/SubEditViewModel.cs
index e98a8a34..bfbfbbe7 100644
--- a/v2rayN/ServiceLib/ViewModels/SubEditViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/SubEditViewModel.cs
@@ -13,7 +13,7 @@ public class SubEditViewModel : MyReactiveObject
 
     public SubEditViewModel(SubItem subItem, Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
 
         SaveCmd = ReactiveCommand.CreateFromTask(async () =>
@@ -29,7 +29,7 @@ public class SubEditViewModel : MyReactiveObject
         var remarks = SelectedSource.Remarks;
         if (remarks.IsNullOrEmpty())
         {
-            NoticeHandler.Instance.Enqueue(ResUI.PleaseFillRemarks);
+            NoticeManager.Instance.Enqueue(ResUI.PleaseFillRemarks);
             return;
         }
 
@@ -39,25 +39,25 @@ public class SubEditViewModel : MyReactiveObject
             var uri = Utils.TryUri(url);
             if (uri == null)
             {
-                NoticeHandler.Instance.Enqueue(ResUI.InvalidUrlTip);
+                NoticeManager.Instance.Enqueue(ResUI.InvalidUrlTip);
                 return;
             }
             //Do not allow http protocol
             if (url.StartsWith(Global.HttpProtocol) && !Utils.IsPrivateNetwork(uri.IdnHost))
             {
-                NoticeHandler.Instance.Enqueue(ResUI.InsecureUrlProtocol);
+                NoticeManager.Instance.Enqueue(ResUI.InsecureUrlProtocol);
                 //return;
             }
         }
 
         if (await ConfigHandler.AddSubItem(_config, SelectedSource) == 0)
         {
-            NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
+            NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
             _updateView?.Invoke(EViewAction.CloseWindow, null);
         }
         else
         {
-            NoticeHandler.Instance.Enqueue(ResUI.OperationFailed);
+            NoticeManager.Instance.Enqueue(ResUI.OperationFailed);
         }
     }
 }
diff --git a/v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs b/v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs
index 71cf1c61..e9c657c4 100644
--- a/v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs
@@ -24,7 +24,7 @@ public class SubSettingViewModel : MyReactiveObject
 
     public SubSettingViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _updateView = updateView;
 
         var canEditRemove = this.WhenAnyValue(
@@ -61,7 +61,7 @@ public class SubSettingViewModel : MyReactiveObject
     public async Task RefreshSubItems()
     {
         _subItems.Clear();
-        _subItems.AddRange(await AppHandler.Instance.SubItems());
+        _subItems.AddRange(await AppManager.Instance.SubItems());
     }
 
     public async Task EditSubAsync(bool blNew)
@@ -73,7 +73,7 @@ public class SubSettingViewModel : MyReactiveObject
         }
         else
         {
-            item = await AppHandler.Instance.GetSubItem(SelectedSource?.Id);
+            item = await AppManager.Instance.GetSubItem(SelectedSource?.Id);
             if (item is null)
             {
                 return;
@@ -98,7 +98,7 @@ public class SubSettingViewModel : MyReactiveObject
             await ConfigHandler.DeleteSubItem(_config, it.Id);
         }
         await RefreshSubItems();
-        NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
+        NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
         IsModified = true;
     }
 }
diff --git a/v2rayN/v2rayN.Desktop/App.axaml.cs b/v2rayN/v2rayN.Desktop/App.axaml.cs
index cfd4210b..a1b97b77 100644
--- a/v2rayN/v2rayN.Desktop/App.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/App.axaml.cs
@@ -26,7 +26,7 @@ public partial class App : Application
     {
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            AppHandler.Instance.InitComponents();
+            AppManager.Instance.InitComponents();
 
             desktop.Exit += OnExit;
             desktop.MainWindow = new MainWindow();
diff --git a/v2rayN/v2rayN.Desktop/Base/WindowBase.cs b/v2rayN/v2rayN.Desktop/Base/WindowBase.cs
index 99395add..c2c9a0bc 100644
--- a/v2rayN/v2rayN.Desktop/Base/WindowBase.cs
+++ b/v2rayN/v2rayN.Desktop/Base/WindowBase.cs
@@ -21,7 +21,7 @@ public class WindowBase<TViewModel> : ReactiveWindow<TViewModel> where TViewMode
     {
         try
         {
-            var sizeItem = ConfigHandler.GetWindowSizeItem(AppHandler.Instance.Config, GetType().Name);
+            var sizeItem = ConfigHandler.GetWindowSizeItem(AppManager.Instance.Config, GetType().Name);
             if (sizeItem == null)
             {
                 return;
@@ -46,7 +46,7 @@ public class WindowBase<TViewModel> : ReactiveWindow<TViewModel> where TViewMode
         base.OnClosed(e);
         try
         {
-            ConfigHandler.SaveWindowSizeItem(AppHandler.Instance.Config, GetType().Name, Width, Height);
+            ConfigHandler.SaveWindowSizeItem(AppManager.Instance.Config, GetType().Name, Width, Height);
         }
         catch { }
     }
diff --git a/v2rayN/v2rayN.Desktop/Program.cs b/v2rayN/v2rayN.Desktop/Program.cs
index f15276c3..58ddb9f9 100644
--- a/v2rayN/v2rayN.Desktop/Program.cs
+++ b/v2rayN/v2rayN.Desktop/Program.cs
@@ -47,7 +47,7 @@ internal class Program
             }
         }
 
-        if (!AppHandler.Instance.InitApp())
+        if (!AppManager.Instance.InitApp())
         {
             return false;
         }
@@ -63,6 +63,6 @@ internal class Program
             .WithFontByDefault()
             .LogToTrace()
             .UseReactiveUI()
-            .With(new MacOSPlatformOptions { ShowInDock = AppHandler.Instance.Config.UiItem.MacOSShowInDock });
+            .With(new MacOSPlatformOptions { ShowInDock = AppManager.Instance.Config.UiItem.MacOSShowInDock });
     }
 }
diff --git a/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs b/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
index 0347f330..21899bfc 100644
--- a/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
+++ b/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
@@ -22,7 +22,7 @@ public class ThemeSettingViewModel : MyReactiveObject
 
     public ThemeSettingViewModel()
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
 
         BindingUI();
         RestoreUI();
@@ -75,7 +75,7 @@ public class ThemeSettingViewModel : MyReactiveObject
                     _config.UiItem.CurrentLanguage = CurrentLanguage;
                     Thread.CurrentThread.CurrentUICulture = new(CurrentLanguage);
                     ConfigHandler.SaveConfig(_config);
-                    NoticeHandler.Instance.Enqueue(ResUI.NeedRebootTips);
+                    NoticeManager.Instance.Enqueue(ResUI.NeedRebootTips);
                 }
             });
     }
diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
index c46c6ea4..6880e23d 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
@@ -51,7 +51,7 @@ public partial class AddServerWindow : WindowBase<AddServerViewModel>
 
             case EConfigType.Shadowsocks:
                 gridSs.IsVisible = true;
-                cmbSecurity3.ItemsSource = AppHandler.Instance.GetShadowsocksSecurities(profileItem);
+                cmbSecurity3.ItemsSource = AppManager.Instance.GetShadowsocksSecurities(profileItem);
                 break;
 
             case EConfigType.SOCKS:
diff --git a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs
index 294a1eba..3bd2dec7 100644
--- a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs
@@ -15,7 +15,7 @@ public partial class DNSSettingWindow : WindowBase<DNSSettingViewModel>
     {
         InitializeComponent();
 
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         btnCancel.Click += (s, e) => this.Close();
         ViewModel = new DNSSettingViewModel(UpdateViewHandler);
 
diff --git a/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
index 6b432e9d..a9b060fe 100644
--- a/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
@@ -14,7 +14,7 @@ public partial class FullConfigTemplateWindow : WindowBase<FullConfigTemplateVie
     {
         InitializeComponent();
 
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         btnCancel.Click += (s, e) => this.Close();
         ViewModel = new FullConfigTemplateViewModel(UpdateViewHandler);
 
diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
index 08a3bb81..e808e54e 100644
--- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
@@ -29,7 +29,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
     {
         InitializeComponent();
 
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _manager = new WindowNotificationManager(TopLevel.GetTopLevel(this)) { MaxItems = 3, Position = NotificationPosition.TopRight };
 
         this.KeyDown += MainWindow_KeyDown;
@@ -352,7 +352,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
     {
         //ShowHideWindow(false);
 
-        NoticeHandler.Instance.SendMessageAndEnqueue("Not yet implemented.(还未实现)");
+        NoticeManager.Instance.SendMessageAndEnqueue("Not yet implemented.(还未实现)");
         await Task.CompletedTask;
         //if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         //{
@@ -478,7 +478,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
 
     private void AddHelpMenuItem()
     {
-        var coreInfo = CoreInfoHandler.Instance.GetCoreInfo();
+        var coreInfo = CoreInfoManager.Instance.GetCoreInfo();
         foreach (var it in coreInfo
             .Where(t => t.CoreType != ECoreType.v2fly
                         && t.CoreType != ECoreType.hysteria))
diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
index 50aefe98..82243f10 100644
--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
@@ -15,7 +15,7 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
         InitializeComponent();
 
         btnCancel.Click += (s, e) => this.Close();
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
 
         ViewModel = new OptionSettingViewModel(UpdateViewHandler);
 
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
index 7ca7cd53..492dc237 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
@@ -27,7 +27,7 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
     {
         InitializeComponent();
 
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         _window = window;
 
         menuSelectAll.Click += menuSelectAll_Click;
diff --git a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
index 570b58fd..34ae1953 100644
--- a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
@@ -20,7 +20,7 @@ public partial class StatusBarView : ReactiveUserControl<StatusBarViewModel>
     {
         InitializeComponent();
 
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         //ViewModel = new StatusBarViewModel(UpdateViewHandler);
         //Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(StatusBarViewModel));
         ViewModel = Locator.Current.GetService<StatusBarViewModel>();
@@ -113,7 +113,7 @@ public partial class StatusBarView : ReactiveUserControl<StatusBarViewModel>
             return false;
         }
 
-        AppHandler.Instance.LinuxSudoPwd = password;
+        AppManager.Instance.LinuxSudoPwd = password;
         return true;
     }
 
diff --git a/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
index 87a95cbc..90b6ba76 100644
--- a/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
@@ -47,7 +47,7 @@ public partial class SudoPasswordInputView : UserControl
             else
             {
                 // Password verification failed, display error and let user try again
-                NoticeHandler.Instance.Enqueue(ResUI.SudoIncorrectPasswordTip);
+                NoticeManager.Instance.Enqueue(ResUI.SudoIncorrectPasswordTip);
                 txtPassword.Focus();
             }
         }
diff --git a/v2rayN/v2rayN/App.xaml.cs b/v2rayN/v2rayN/App.xaml.cs
index ba61bd52..611fad72 100644
--- a/v2rayN/v2rayN/App.xaml.cs
+++ b/v2rayN/v2rayN/App.xaml.cs
@@ -36,14 +36,14 @@ public partial class App : Application
             return;
         }
 
-        if (!AppHandler.Instance.InitApp())
+        if (!AppManager.Instance.InitApp())
         {
             UI.Show($"Loading GUI configuration file is abnormal,please restart the application{Environment.NewLine}加载GUI配置文件异常,请重启应用");
             Environment.Exit(0);
             return;
         }
 
-        AppHandler.Instance.InitComponents();
+        AppManager.Instance.InitComponents();
         base.OnStartup(e);
     }
 
diff --git a/v2rayN/v2rayN/Base/WindowBase.cs b/v2rayN/v2rayN/Base/WindowBase.cs
index 14c12cb3..3e1c3004 100644
--- a/v2rayN/v2rayN/Base/WindowBase.cs
+++ b/v2rayN/v2rayN/Base/WindowBase.cs
@@ -15,7 +15,7 @@ public class WindowBase<TViewModel> : ReactiveWindow<TViewModel> where TViewMode
     {
         try
         {
-            var sizeItem = ConfigHandler.GetWindowSizeItem(AppHandler.Instance.Config, GetType().Name);
+            var sizeItem = ConfigHandler.GetWindowSizeItem(AppManager.Instance.Config, GetType().Name);
             if (sizeItem == null)
             {
                 return;
@@ -36,7 +36,7 @@ public class WindowBase<TViewModel> : ReactiveWindow<TViewModel> where TViewMode
 
         try
         {
-            ConfigHandler.SaveWindowSizeItem(AppHandler.Instance.Config, GetType().Name, Width, Height);
+            ConfigHandler.SaveWindowSizeItem(AppManager.Instance.Config, GetType().Name, Width, Height);
         }
         catch { }
     }
diff --git a/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs b/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs
index 84827c75..73fd5632 100644
--- a/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs
+++ b/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs
@@ -11,7 +11,7 @@ public class MaterialDesignFonts
     {
         try
         {
-            var fontFamily = AppHandler.Instance.Config.UiItem.CurrentFontFamily;
+            var fontFamily = AppManager.Instance.Config.UiItem.CurrentFontFamily;
             if (fontFamily.IsNotEmpty())
             {
                 var fontPath = Utils.GetFontsPath();
diff --git a/v2rayN/v2rayN/Handler/HotkeyHandler.cs b/v2rayN/v2rayN/Handler/HotkeyHandler.cs
index d07a9401..cfc2d463 100644
--- a/v2rayN/v2rayN/Handler/HotkeyHandler.cs
+++ b/v2rayN/v2rayN/Handler/HotkeyHandler.cs
@@ -30,7 +30,7 @@ public sealed class HotkeyHandler
     private void Init()
     {
         _hotkeyTriggerDic.Clear();
-        foreach (var item in AppHandler.Instance.Config.GlobalHotkeys)
+        foreach (var item in AppManager.Instance.Config.GlobalHotkeys)
         {
             if (item.KeyCode != null && (Key)item.KeyCode != Key.None)
             {
diff --git a/v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs
index 18d3f578..a9bd4b06 100644
--- a/v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs
@@ -31,7 +31,7 @@ public class ThemeSettingViewModel : MyReactiveObject
 
     public ThemeSettingViewModel()
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
 
         RegisterSystemColorSet(_config, Application.Current.MainWindow, ModifyTheme);
 
@@ -122,7 +122,7 @@ public class ThemeSettingViewModel : MyReactiveObject
                     _config.UiItem.CurrentLanguage = CurrentLanguage;
                     Thread.CurrentThread.CurrentUICulture = new(CurrentLanguage);
                     ConfigHandler.SaveConfig(_config);
-                    NoticeHandler.Instance.Enqueue(ResUI.NeedRebootTips);
+                    NoticeManager.Instance.Enqueue(ResUI.NeedRebootTips);
                 }
             });
     }
diff --git a/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs b/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs
index 2fb3e2a1..b455ecd4 100644
--- a/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs
+++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs
@@ -29,7 +29,7 @@ public partial class AddServer2Window
             this.BindCommand(ViewModel, vm => vm.EditServerCmd, v => v.btnEdit).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.SaveServerCmd, v => v.btnSave).DisposeWith(disposables);
         });
-        WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
+        WindowsUtils.SetDarkBorder(this, AppManager.Instance.Config.UiItem.CurrentTheme);
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
index 0e96e236..75f1bd1c 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
@@ -45,7 +45,7 @@ public partial class AddServerWindow
 
             case EConfigType.Shadowsocks:
                 gridSs.Visibility = Visibility.Visible;
-                cmbSecurity3.ItemsSource = AppHandler.Instance.GetShadowsocksSecurities(profileItem);
+                cmbSecurity3.ItemsSource = AppManager.Instance.GetShadowsocksSecurities(profileItem);
                 break;
 
             case EConfigType.SOCKS:
@@ -196,7 +196,7 @@ public partial class AddServerWindow
         });
 
         this.Title = $"{profileItem.ConfigType}";
-        WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
+        WindowsUtils.SetDarkBorder(this, AppManager.Instance.Config.UiItem.CurrentTheme);
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
diff --git a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs
index 9105b920..9df0cf2c 100644
--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs
@@ -14,7 +14,7 @@ public partial class DNSSettingWindow
         InitializeComponent();
 
         this.Owner = Application.Current.MainWindow;
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
 
         ViewModel = new DNSSettingViewModel(UpdateViewHandler);
 
@@ -79,7 +79,7 @@ public partial class DNSSettingWindow
                 .BindTo(this, x => x.txtAdvancedDNSSettingsInvalid.Visibility)
                 .DisposeWith(disposables);
         });
-        WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
+        WindowsUtils.SetDarkBorder(this, AppManager.Instance.Config.UiItem.CurrentTheme);
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
diff --git a/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs b/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs
index b3ee400d..583ccd22 100644
--- a/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs
@@ -14,7 +14,7 @@ public partial class FullConfigTemplateWindow
         InitializeComponent();
 
         this.Owner = Application.Current.MainWindow;
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
 
         ViewModel = new FullConfigTemplateViewModel(UpdateViewHandler);
 
@@ -32,7 +32,7 @@ public partial class FullConfigTemplateWindow
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });
-        WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
+        WindowsUtils.SetDarkBorder(this, AppManager.Instance.Config.UiItem.CurrentTheme);
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
index 8c87595f..d6d25445 100644
--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
@@ -30,7 +30,7 @@ public partial class GlobalHotkeySettingWindow
         {
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });
-        WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
+        WindowsUtils.SetDarkBorder(this, AppManager.Instance.Config.UiItem.CurrentTheme);
 
         Init();
         BindingData();
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index 6f2838ff..95f3b218 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -24,7 +24,7 @@ public partial class MainWindow
     {
         InitializeComponent();
 
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         ThreadPool.RegisterWaitForSingleObject(App.ProgramStarted, OnProgramStarted, null, -1, false);
 
         App.Current.SessionEnding += Current_SessionEnding;
@@ -439,7 +439,7 @@ public partial class MainWindow
 
     private void AddHelpMenuItem()
     {
-        var coreInfo = CoreInfoHandler.Instance.GetCoreInfo();
+        var coreInfo = CoreInfoManager.Instance.GetCoreInfo();
         foreach (var it in coreInfo
             .Where(t => t.CoreType != ECoreType.v2fly
                         && t.CoreType != ECoreType.hysteria))
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
index fbdf8e6e..16347710 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
@@ -17,7 +17,7 @@ public partial class OptionSettingWindow
         InitializeComponent();
 
         this.Owner = Application.Current.MainWindow;
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
 
         ViewModel = new OptionSettingViewModel(UpdateViewHandler);
 
@@ -135,7 +135,7 @@ public partial class OptionSettingWindow
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });
-        WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
+        WindowsUtils.SetDarkBorder(this, AppManager.Instance.Config.UiItem.CurrentTheme);
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
index 0f2fe4a3..a17e0585 100644
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
+++ b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
@@ -23,7 +23,7 @@ public partial class ProfilesView
         InitializeComponent();
         lstGroup.MaxHeight = Math.Floor(SystemParameters.WorkArea.Height * 0.20 / 40) * 40;
 
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
 
         btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
         txtServerFilter.PreviewKeyDown += TxtServerFilter_PreviewKeyDown;
diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
index 5381a23c..86490e8b 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
@@ -49,7 +49,7 @@ public partial class RoutingRuleDetailsWindow
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });
-        WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
+        WindowsUtils.SetDarkBorder(this, AppManager.Instance.Config.UiItem.CurrentTheme);
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
index e5e2bf71..8b836a02 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
@@ -55,7 +55,7 @@ public partial class RoutingRuleSettingWindow
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });
-        WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
+        WindowsUtils.SetDarkBorder(this, AppManager.Instance.Config.UiItem.CurrentTheme);
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
diff --git a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
index e9469a97..ee2ab9cb 100644
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
@@ -42,7 +42,7 @@ public partial class RoutingSettingWindow
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });
-        WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
+        WindowsUtils.SetDarkBorder(this, AppManager.Instance.Config.UiItem.CurrentTheme);
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
diff --git a/v2rayN/v2rayN/Views/StatusBarView.xaml.cs b/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
index 2a89cca1..683767a7 100644
--- a/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
+++ b/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
@@ -16,7 +16,7 @@ public partial class StatusBarView
     public StatusBarView()
     {
         InitializeComponent();
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
         ViewModel = new StatusBarViewModel(UpdateViewHandler);
         Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(StatusBarViewModel));
 
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs b/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
index d7eb71c2..7c3cb847 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
@@ -36,7 +36,7 @@ public partial class SubEditWindow
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });
-        WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
+        WindowsUtils.SetDarkBorder(this, AppManager.Instance.Config.UiItem.CurrentTheme);
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
diff --git a/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
index 19d98c70..797f3cdc 100644
--- a/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
@@ -32,7 +32,7 @@ public partial class SubSettingWindow
             this.BindCommand(ViewModel, vm => vm.SubEditCmd, v => v.menuSubEdit).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.SubShareCmd, v => v.menuSubShare).DisposeWith(disposables);
         });
-        WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
+        WindowsUtils.SetDarkBorder(this, AppManager.Instance.Config.UiItem.CurrentTheme);
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

From f66226c103b6a23857b080ddbb8efdb396dc2d42 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 17 Aug 2025 20:09:41 +0800
Subject: [PATCH 057/115] Simple refactoring of CoreConfig generated code

---
 .../CoreConfig/CoreConfigSingboxService.cs    | 2278 -----------------
 .../CoreConfig/CoreConfigV2rayService.cs      | 1952 --------------
 .../Singbox/CoreConfigSingboxService.cs       |  522 ++++
 .../Singbox/SingboxConfigTemplateService.cs   |   63 +
 .../CoreConfig/Singbox/SingboxDnsService.cs   |  482 ++++
 .../Singbox/SingboxInboundService.cs          |   92 +
 .../CoreConfig/Singbox/SingboxLogService.cs   |   40 +
 .../Singbox/SingboxOutboundService.cs         |  577 +++++
 .../Singbox/SingboxRoutingService.cs          |  365 +++
 .../Singbox/SingboxRulesetService.cs          |  119 +
 .../Singbox/SingboxStatisticService.cs        |   29 +
 .../V2ray/CoreConfigV2rayService.cs           |  415 +++
 .../CoreConfig/V2ray/V2rayBalancerService.cs  |   50 +
 .../V2ray/V2rayConfigTemplateService.cs       |   86 +
 .../CoreConfig/V2ray/V2rayDnsService.cs       |  426 +++
 .../CoreConfig/V2ray/V2rayInboundService.cs   |   72 +
 .../CoreConfig/V2ray/V2rayLogService.cs       |   29 +
 .../CoreConfig/V2ray/V2rayOutboundService.cs  |  704 +++++
 .../CoreConfig/V2ray/V2rayRoutingService.cs   |  145 ++
 .../CoreConfig/V2ray/V2rayStatisticService.cs |   51 +
 20 files changed, 4267 insertions(+), 4230 deletions(-)
 delete mode 100644 v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
 delete mode 100644 v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxConfigTemplateService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxInboundService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxLogService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRulesetService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxStatisticService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayBalancerService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayConfigTemplateService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayInboundService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayLogService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs
 create mode 100644 v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayStatisticService.cs

diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
deleted file mode 100644
index 53db08d1..00000000
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ /dev/null
@@ -1,2278 +0,0 @@
-using System.Data;
-using System.Net;
-using System.Net.NetworkInformation;
-using System.Text.Json.Nodes;
-
-namespace ServiceLib.Services.CoreConfig;
-
-public class CoreConfigSingboxService
-{
-    private Config _config;
-    private static readonly string _tag = "CoreConfigSingboxService";
-
-    public CoreConfigSingboxService(Config config)
-    {
-        _config = config;
-    }
-
-    #region public gen function
-
-    public async Task<RetResult> GenerateClientConfigContent(ProfileItem node)
-    {
-        var ret = new RetResult();
-        try
-        {
-            if (node == null
-                || node.Port <= 0)
-            {
-                ret.Msg = ResUI.CheckServerSettings;
-                return ret;
-            }
-            if (node.GetNetwork() is nameof(ETransport.kcp) or nameof(ETransport.xhttp))
-            {
-                ret.Msg = ResUI.Incorrectconfiguration + $" - {node.GetNetwork()}";
-                return ret;
-            }
-
-            ret.Msg = ResUI.InitialConfiguration;
-
-            string result = EmbedUtils.GetEmbedText(Global.SingboxSampleClient);
-            if (result.IsNullOrEmpty())
-            {
-                ret.Msg = ResUI.FailedGetDefaultConfiguration;
-                return ret;
-            }
-
-            var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
-            if (singboxConfig == null)
-            {
-                ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                return ret;
-            }
-
-            await GenLog(singboxConfig);
-
-            await GenInbounds(singboxConfig);
-
-            if (node.ConfigType == EConfigType.WireGuard)
-            {
-                singboxConfig.outbounds.RemoveAt(0);
-                var endpoints = new Endpoints4Sbox();
-                await GenEndpoint(node, endpoints);
-                endpoints.tag = Global.ProxyTag;
-                singboxConfig.endpoints = new() { endpoints };
-            }
-            else
-            {
-                await GenOutbound(node, singboxConfig.outbounds.First());
-            }
-
-            await GenMoreOutbounds(node, singboxConfig);
-
-            await GenRouting(singboxConfig);
-
-            await GenDns(singboxConfig);
-
-            await GenExperimental(singboxConfig);
-
-            await ConvertGeo2Ruleset(singboxConfig);
-
-            ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
-            ret.Success = true;
-
-            ret.Data = await ApplyFullConfigTemplate(singboxConfig);
-            return ret;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-            ret.Msg = ResUI.FailedGenDefaultConfiguration;
-            return ret;
-        }
-    }
-
-    public async Task<RetResult> GenerateClientSpeedtestConfig(List<ServerTestItem> selecteds)
-    {
-        var ret = new RetResult();
-        try
-        {
-            if (_config == null)
-            {
-                ret.Msg = ResUI.CheckServerSettings;
-                return ret;
-            }
-
-            ret.Msg = ResUI.InitialConfiguration;
-
-            var result = EmbedUtils.GetEmbedText(Global.SingboxSampleClient);
-            var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
-            if (result.IsNullOrEmpty() || txtOutbound.IsNullOrEmpty())
-            {
-                ret.Msg = ResUI.FailedGetDefaultConfiguration;
-                return ret;
-            }
-
-            var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
-            if (singboxConfig == null)
-            {
-                ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                return ret;
-            }
-            List<IPEndPoint> lstIpEndPoints = new();
-            List<TcpConnectionInformation> lstTcpConns = new();
-            try
-            {
-                lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
-                lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
-                lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-
-            await GenLog(singboxConfig);
-            //GenDns(new(), singboxConfig);
-            singboxConfig.inbounds.Clear();
-            singboxConfig.outbounds.RemoveAt(0);
-
-            var initPort = AppManager.Instance.GetLocalPort(EInboundProtocol.speedtest);
-
-            foreach (var it in selecteds)
-            {
-                if (it.ConfigType == EConfigType.Custom)
-                {
-                    continue;
-                }
-                if (it.Port <= 0)
-                {
-                    continue;
-                }
-                var item = await AppManager.Instance.GetProfileItem(it.IndexId);
-                if (it.ConfigType is EConfigType.VMess or EConfigType.VLESS)
-                {
-                    if (item is null || item.Id.IsNullOrEmpty() || !Utils.IsGuidByParse(item.Id))
-                    {
-                        continue;
-                    }
-                }
-
-                //find unused port
-                var port = initPort;
-                for (int k = initPort; k < Global.MaxPort; k++)
-                {
-                    if (lstIpEndPoints?.FindIndex(_it => _it.Port == k) >= 0)
-                    {
-                        continue;
-                    }
-                    if (lstTcpConns?.FindIndex(_it => _it.LocalEndPoint.Port == k) >= 0)
-                    {
-                        continue;
-                    }
-                    //found
-                    port = k;
-                    initPort = port + 1;
-                    break;
-                }
-
-                //Port In Used
-                if (lstIpEndPoints?.FindIndex(_it => _it.Port == port) >= 0)
-                {
-                    continue;
-                }
-                it.Port = port;
-                it.AllowTest = true;
-
-                //inbound
-                Inbound4Sbox inbound = new()
-                {
-                    listen = Global.Loopback,
-                    listen_port = port,
-                    type = EInboundProtocol.mixed.ToString(),
-                };
-                inbound.tag = inbound.type + inbound.listen_port.ToString();
-                singboxConfig.inbounds.Add(inbound);
-
-                //outbound
-                if (item is null)
-                {
-                    continue;
-                }
-                if (item.ConfigType == EConfigType.Shadowsocks
-                    && !Global.SsSecuritiesInSingbox.Contains(item.Security))
-                {
-                    continue;
-                }
-                if (item.ConfigType == EConfigType.VLESS
-                 && !Global.Flows.Contains(item.Flow))
-                {
-                    continue;
-                }
-                if (it.ConfigType is EConfigType.VLESS or EConfigType.Trojan
-                    && item.StreamSecurity == Global.StreamSecurityReality
-                    && item.PublicKey.IsNullOrEmpty())
-                {
-                    continue;
-                }
-
-                var server = await GenServer(item);
-                if (server is null)
-                {
-                    ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                    return ret;
-                }
-                var tag = Global.ProxyTag + inbound.listen_port.ToString();
-                server.tag = tag;
-                if (server is Endpoints4Sbox endpoint)
-                {
-                    singboxConfig.endpoints ??= new();
-                    singboxConfig.endpoints.Add(endpoint);
-                }
-                else if (server is Outbound4Sbox outbound)
-                {
-                    singboxConfig.outbounds.Add(outbound);
-                }
-
-                //rule
-                Rule4Sbox rule = new()
-                {
-                    inbound = new List<string> { inbound.tag },
-                    outbound = tag
-                };
-                singboxConfig.route.rules.Add(rule);
-            }
-
-            var rawDNSItem = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
-            if (rawDNSItem != null && rawDNSItem.Enabled == true)
-            {
-                await GenDnsDomainsCompatible(singboxConfig, rawDNSItem);
-            }
-            else
-            {
-                await GenDnsDomains(singboxConfig, _config.SimpleDNSItem);
-            }
-            singboxConfig.route.default_domain_resolver = new()
-            {
-                server = Global.SingboxFinalResolverTag
-            };
-
-            ret.Success = true;
-            ret.Data = JsonUtils.Serialize(singboxConfig);
-            return ret;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-            ret.Msg = ResUI.FailedGenDefaultConfiguration;
-            return ret;
-        }
-    }
-
-    public async Task<RetResult> GenerateClientSpeedtestConfig(ProfileItem node, int port)
-    {
-        var ret = new RetResult();
-        try
-        {
-            if (node is not { Port: > 0 })
-            {
-                ret.Msg = ResUI.CheckServerSettings;
-                return ret;
-            }
-            if (node.GetNetwork() is nameof(ETransport.kcp) or nameof(ETransport.xhttp))
-            {
-                ret.Msg = ResUI.Incorrectconfiguration + $" - {node.GetNetwork()}";
-                return ret;
-            }
-
-            ret.Msg = ResUI.InitialConfiguration;
-
-            var result = EmbedUtils.GetEmbedText(Global.SingboxSampleClient);
-            if (result.IsNullOrEmpty())
-            {
-                ret.Msg = ResUI.FailedGetDefaultConfiguration;
-                return ret;
-            }
-
-            var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
-            if (singboxConfig == null)
-            {
-                ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                return ret;
-            }
-
-            await GenLog(singboxConfig);
-            if (node.ConfigType == EConfigType.WireGuard)
-            {
-                singboxConfig.outbounds.RemoveAt(0);
-                var endpoints = new Endpoints4Sbox();
-                await GenEndpoint(node, endpoints);
-                endpoints.tag = Global.ProxyTag;
-                singboxConfig.endpoints = new() { endpoints };
-            }
-            else
-            {
-                await GenOutbound(node, singboxConfig.outbounds.First());
-            }
-            await GenMoreOutbounds(node, singboxConfig);
-            var item = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
-            if (item != null && item.Enabled == true)
-            {
-                await GenDnsDomainsCompatible(singboxConfig, item);
-            }
-            else
-            {
-                await GenDnsDomains(singboxConfig, _config.SimpleDNSItem);
-            }
-            singboxConfig.route.default_domain_resolver = new()
-            {
-                server = Global.SingboxFinalResolverTag
-            };
-
-            singboxConfig.route.rules.Clear();
-            singboxConfig.inbounds.Clear();
-            singboxConfig.inbounds.Add(new()
-            {
-                tag = $"{EInboundProtocol.mixed}{port}",
-                listen = Global.Loopback,
-                listen_port = port,
-                type = EInboundProtocol.mixed.ToString(),
-            });
-
-            ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
-            ret.Success = true;
-            ret.Data = JsonUtils.Serialize(singboxConfig);
-            return ret;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-            ret.Msg = ResUI.FailedGenDefaultConfiguration;
-            return ret;
-        }
-    }
-
-    public async Task<RetResult> GenerateClientMultipleLoadConfig(List<ProfileItem> selecteds)
-    {
-        var ret = new RetResult();
-        try
-        {
-            if (_config == null)
-            {
-                ret.Msg = ResUI.CheckServerSettings;
-                return ret;
-            }
-
-            ret.Msg = ResUI.InitialConfiguration;
-
-            string result = EmbedUtils.GetEmbedText(Global.SingboxSampleClient);
-            string txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
-            if (result.IsNullOrEmpty() || txtOutbound.IsNullOrEmpty())
-            {
-                ret.Msg = ResUI.FailedGetDefaultConfiguration;
-                return ret;
-            }
-
-            var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
-            if (singboxConfig == null)
-            {
-                ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                return ret;
-            }
-
-            await GenLog(singboxConfig);
-            await GenInbounds(singboxConfig);
-            await GenRouting(singboxConfig);
-            await GenExperimental(singboxConfig);
-            singboxConfig.outbounds.RemoveAt(0);
-
-            var proxyProfiles = new List<ProfileItem>();
-            foreach (var it in selecteds)
-            {
-                if (it.ConfigType == EConfigType.Custom)
-                {
-                    continue;
-                }
-                if (it.Port <= 0)
-                {
-                    continue;
-                }
-                var item = await AppManager.Instance.GetProfileItem(it.IndexId);
-                if (item is null)
-                {
-                    continue;
-                }
-                if (it.ConfigType is EConfigType.VMess or EConfigType.VLESS)
-                {
-                    if (item.Id.IsNullOrEmpty() || !Utils.IsGuidByParse(item.Id))
-                    {
-                        continue;
-                    }
-                }
-                if (item.ConfigType == EConfigType.Shadowsocks
-                  && !Global.SsSecuritiesInSingbox.Contains(item.Security))
-                {
-                    continue;
-                }
-                if (item.ConfigType == EConfigType.VLESS && !Global.Flows.Contains(item.Flow))
-                {
-                    continue;
-                }
-
-                //outbound
-                proxyProfiles.Add(item);
-            }
-            if (proxyProfiles.Count <= 0)
-            {
-                ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                return ret;
-            }
-            await GenOutboundsList(proxyProfiles, singboxConfig);
-
-            await GenDns(singboxConfig);
-            await ConvertGeo2Ruleset(singboxConfig);
-
-            ret.Success = true;
-
-            ret.Data = await ApplyFullConfigTemplate(singboxConfig);
-            return ret;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-            ret.Msg = ResUI.FailedGenDefaultConfiguration;
-            return ret;
-        }
-    }
-
-    public async Task<RetResult> GenerateClientCustomConfig(ProfileItem node, string? fileName)
-    {
-        var ret = new RetResult();
-        if (node == null || fileName is null)
-        {
-            ret.Msg = ResUI.CheckServerSettings;
-            return ret;
-        }
-
-        ret.Msg = ResUI.InitialConfiguration;
-
-        try
-        {
-            if (node == null)
-            {
-                ret.Msg = ResUI.CheckServerSettings;
-                return ret;
-            }
-
-            if (File.Exists(fileName))
-            {
-                File.Delete(fileName);
-            }
-
-            string addressFileName = node.Address;
-            if (addressFileName.IsNullOrEmpty())
-            {
-                ret.Msg = ResUI.FailedGetDefaultConfiguration;
-                return ret;
-            }
-            if (!File.Exists(addressFileName))
-            {
-                addressFileName = Path.Combine(Utils.GetConfigPath(), addressFileName);
-            }
-            if (!File.Exists(addressFileName))
-            {
-                ret.Msg = ResUI.FailedReadConfiguration + "1";
-                return ret;
-            }
-
-            if (node.Address == Global.CoreMultipleLoadConfigFileName)
-            {
-                var txtFile = File.ReadAllText(addressFileName);
-                var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(txtFile);
-                if (singboxConfig == null)
-                {
-                    File.Copy(addressFileName, fileName);
-                }
-                else
-                {
-                    await GenInbounds(singboxConfig);
-                    await GenExperimental(singboxConfig);
-
-                    var content = JsonUtils.Serialize(singboxConfig, true);
-                    await File.WriteAllTextAsync(fileName, content);
-                }
-            }
-            else
-            {
-                File.Copy(addressFileName, fileName);
-            }
-
-            //check again
-            if (!File.Exists(fileName))
-            {
-                ret.Msg = ResUI.FailedReadConfiguration + "2";
-                return ret;
-            }
-
-            ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
-            ret.Success = true;
-            return ret;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-            ret.Msg = ResUI.FailedGenDefaultConfiguration;
-            return ret;
-        }
-    }
-
-    #endregion public gen function
-
-    #region private gen function
-
-    private async Task<int> GenLog(SingboxConfig singboxConfig)
-    {
-        try
-        {
-            switch (_config.CoreBasicItem.Loglevel)
-            {
-                case "debug":
-                case "info":
-                case "error":
-                    singboxConfig.log.level = _config.CoreBasicItem.Loglevel;
-                    break;
-
-                case "warning":
-                    singboxConfig.log.level = "warn";
-                    break;
-
-                default:
-                    break;
-            }
-            if (_config.CoreBasicItem.Loglevel == Global.None)
-            {
-                singboxConfig.log.disabled = true;
-            }
-            if (_config.CoreBasicItem.LogEnabled)
-            {
-                var dtNow = DateTime.Now;
-                singboxConfig.log.output = Utils.GetLogPath($"sbox_{dtNow:yyyy-MM-dd}.txt");
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return await Task.FromResult(0);
-    }
-
-    private async Task<int> GenInbounds(SingboxConfig singboxConfig)
-    {
-        try
-        {
-            var listen = "0.0.0.0";
-            singboxConfig.inbounds = [];
-
-            if (!_config.TunModeItem.EnableTun
-                || (_config.TunModeItem.EnableTun && _config.TunModeItem.EnableExInbound && _config.RunningCoreType == ECoreType.sing_box))
-            {
-                var inbound = new Inbound4Sbox()
-                {
-                    type = EInboundProtocol.mixed.ToString(),
-                    tag = EInboundProtocol.socks.ToString(),
-                    listen = Global.Loopback,
-                };
-                singboxConfig.inbounds.Add(inbound);
-
-                inbound.listen_port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
-
-                if (_config.Inbound.First().SecondLocalPortEnabled)
-                {
-                    var inbound2 = GetInbound(inbound, EInboundProtocol.socks2, true);
-                    singboxConfig.inbounds.Add(inbound2);
-                }
-
-                if (_config.Inbound.First().AllowLANConn)
-                {
-                    if (_config.Inbound.First().NewPort4LAN)
-                    {
-                        var inbound3 = GetInbound(inbound, EInboundProtocol.socks3, true);
-                        inbound3.listen = listen;
-                        singboxConfig.inbounds.Add(inbound3);
-
-                        //auth
-                        if (_config.Inbound.First().User.IsNotEmpty() && _config.Inbound.First().Pass.IsNotEmpty())
-                        {
-                            inbound3.users = new() { new() { username = _config.Inbound.First().User, password = _config.Inbound.First().Pass } };
-                        }
-                    }
-                    else
-                    {
-                        inbound.listen = listen;
-                    }
-                }
-            }
-
-            if (_config.TunModeItem.EnableTun)
-            {
-                if (_config.TunModeItem.Mtu <= 0)
-                {
-                    _config.TunModeItem.Mtu = Global.TunMtus.First();
-                }
-                if (_config.TunModeItem.Stack.IsNullOrEmpty())
-                {
-                    _config.TunModeItem.Stack = Global.TunStacks.First();
-                }
-
-                var tunInbound = JsonUtils.Deserialize<Inbound4Sbox>(EmbedUtils.GetEmbedText(Global.TunSingboxInboundFileName)) ?? new Inbound4Sbox { };
-                tunInbound.interface_name = Utils.IsOSX() ? $"utun{new Random().Next(99)}" : "singbox_tun";
-                tunInbound.mtu = _config.TunModeItem.Mtu;
-                tunInbound.auto_route = _config.TunModeItem.AutoRoute;
-                tunInbound.strict_route = _config.TunModeItem.StrictRoute;
-                tunInbound.stack = _config.TunModeItem.Stack;
-                if (_config.TunModeItem.EnableIPv6Address == false)
-                {
-                    tunInbound.address = ["172.18.0.1/30"];
-                }
-
-                singboxConfig.inbounds.Add(tunInbound);
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return 0;
-    }
-
-    private Inbound4Sbox GetInbound(Inbound4Sbox inItem, EInboundProtocol protocol, bool bSocks)
-    {
-        var inbound = JsonUtils.DeepCopy(inItem);
-        inbound.tag = protocol.ToString();
-        inbound.listen_port = inItem.listen_port + (int)protocol;
-        inbound.type = EInboundProtocol.mixed.ToString();
-        return inbound;
-    }
-
-    private async Task<int> GenOutbound(ProfileItem node, Outbound4Sbox outbound)
-    {
-        try
-        {
-            outbound.server = node.Address;
-            outbound.server_port = node.Port;
-            outbound.type = Global.ProtocolTypes[node.ConfigType];
-
-            switch (node.ConfigType)
-            {
-                case EConfigType.VMess:
-                    {
-                        outbound.uuid = node.Id;
-                        outbound.alter_id = node.AlterId;
-                        if (Global.VmessSecurities.Contains(node.Security))
-                        {
-                            outbound.security = node.Security;
-                        }
-                        else
-                        {
-                            outbound.security = Global.DefaultSecurity;
-                        }
-
-                        await GenOutboundMux(node, outbound);
-                        break;
-                    }
-                case EConfigType.Shadowsocks:
-                    {
-                        outbound.method = AppManager.Instance.GetShadowsocksSecurities(node).Contains(node.Security) ? node.Security : Global.None;
-                        outbound.password = node.Id;
-
-                        await GenOutboundMux(node, outbound);
-                        break;
-                    }
-                case EConfigType.SOCKS:
-                    {
-                        outbound.version = "5";
-                        if (node.Security.IsNotEmpty()
-                          && node.Id.IsNotEmpty())
-                        {
-                            outbound.username = node.Security;
-                            outbound.password = node.Id;
-                        }
-                        break;
-                    }
-                case EConfigType.HTTP:
-                    {
-                        if (node.Security.IsNotEmpty()
-                          && node.Id.IsNotEmpty())
-                        {
-                            outbound.username = node.Security;
-                            outbound.password = node.Id;
-                        }
-                        break;
-                    }
-                case EConfigType.VLESS:
-                    {
-                        outbound.uuid = node.Id;
-
-                        outbound.packet_encoding = "xudp";
-
-                        if (node.Flow.IsNullOrEmpty())
-                        {
-                            await GenOutboundMux(node, outbound);
-                        }
-                        else
-                        {
-                            outbound.flow = node.Flow;
-                        }
-                        break;
-                    }
-                case EConfigType.Trojan:
-                    {
-                        outbound.password = node.Id;
-
-                        await GenOutboundMux(node, outbound);
-                        break;
-                    }
-                case EConfigType.Hysteria2:
-                    {
-                        outbound.password = node.Id;
-
-                        if (node.Path.IsNotEmpty())
-                        {
-                            outbound.obfs = new()
-                            {
-                                type = "salamander",
-                                password = node.Path.TrimEx(),
-                            };
-                        }
-
-                        outbound.up_mbps = _config.HysteriaItem.UpMbps > 0 ? _config.HysteriaItem.UpMbps : null;
-                        outbound.down_mbps = _config.HysteriaItem.DownMbps > 0 ? _config.HysteriaItem.DownMbps : null;
-                        if (node.Ports.IsNotEmpty() && (node.Ports.Contains(':') || node.Ports.Contains('-') || node.Ports.Contains(',')))
-                        {
-                            outbound.server_port = null;
-                            outbound.server_ports = node.Ports.Split(',')
-                                .Select(p => p.Trim())
-                                .Where(p => p.IsNotEmpty())
-                                .Select(p =>
-                                {
-                                    var port = p.Replace('-', ':');
-                                    return port.Contains(':') ? port : $"{port}:{port}";
-                                })
-                                .ToList();
-                            outbound.hop_interval = _config.HysteriaItem.HopInterval > 0 ? $"{_config.HysteriaItem.HopInterval}s" : null;
-                        }
-
-                        break;
-                    }
-                case EConfigType.TUIC:
-                    {
-                        outbound.uuid = node.Id;
-                        outbound.password = node.Security;
-                        outbound.congestion_control = node.HeaderType;
-                        break;
-                    }
-                case EConfigType.Anytls:
-                    {
-                        outbound.password = node.Id;
-                        break;
-                    }
-            }
-
-            await GenOutboundTls(node, outbound);
-
-            await GenOutboundTransport(node, outbound);
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return 0;
-    }
-
-    private async Task<int> GenEndpoint(ProfileItem node, Endpoints4Sbox endpoint)
-    {
-        try
-        {
-            endpoint.address = Utils.String2List(node.RequestHost);
-            endpoint.type = Global.ProtocolTypes[node.ConfigType];
-
-            switch (node.ConfigType)
-            {
-                case EConfigType.WireGuard:
-                    {
-                        var peer = new Peer4Sbox
-                        {
-                            public_key = node.PublicKey,
-                            reserved = Utils.String2List(node.Path)?.Select(int.Parse).ToList(),
-                            address = node.Address,
-                            port = node.Port,
-                            // TODO default ["0.0.0.0/0", "::/0"]
-                            allowed_ips = new() { "0.0.0.0/0", "::/0" },
-                        };
-                        endpoint.private_key = node.Id;
-                        endpoint.mtu = node.ShortId.IsNullOrEmpty() ? Global.TunMtus.First() : node.ShortId.ToInt();
-                        endpoint.peers = new() { peer };
-                        break;
-                    }
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return await Task.FromResult(0);
-    }
-
-    private async Task<BaseServer4Sbox?> GenServer(ProfileItem node)
-    {
-        try
-        {
-            var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
-            if (node.ConfigType == EConfigType.WireGuard)
-            {
-                var endpoint = JsonUtils.Deserialize<Endpoints4Sbox>(txtOutbound);
-                await GenEndpoint(node, endpoint);
-                return endpoint;
-            }
-            else
-            {
-                var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
-                await GenOutbound(node, outbound);
-                return outbound;
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return await Task.FromResult<BaseServer4Sbox?>(null);
-    }
-
-    private async Task<int> GenOutboundMux(ProfileItem node, Outbound4Sbox outbound)
-    {
-        try
-        {
-            var muxEnabled = node.MuxEnabled ?? _config.CoreBasicItem.MuxEnabled;
-            if (muxEnabled && _config.Mux4SboxItem.Protocol.IsNotEmpty())
-            {
-                var mux = new Multiplex4Sbox()
-                {
-                    enabled = true,
-                    protocol = _config.Mux4SboxItem.Protocol,
-                    max_connections = _config.Mux4SboxItem.MaxConnections,
-                    padding = _config.Mux4SboxItem.Padding,
-                };
-                outbound.multiplex = mux;
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return await Task.FromResult(0);
-    }
-
-    private async Task<int> GenOutboundTls(ProfileItem node, Outbound4Sbox outbound)
-    {
-        try
-        {
-            if (node.StreamSecurity == Global.StreamSecurityReality || node.StreamSecurity == Global.StreamSecurity)
-            {
-                var server_name = string.Empty;
-                if (node.Sni.IsNotEmpty())
-                {
-                    server_name = node.Sni;
-                }
-                else if (node.RequestHost.IsNotEmpty())
-                {
-                    server_name = Utils.String2List(node.RequestHost)?.First();
-                }
-                var tls = new Tls4Sbox()
-                {
-                    enabled = true,
-                    record_fragment = _config.CoreBasicItem.EnableFragment,
-                    server_name = server_name,
-                    insecure = Utils.ToBool(node.AllowInsecure.IsNullOrEmpty() ? _config.CoreBasicItem.DefAllowInsecure.ToString().ToLower() : node.AllowInsecure),
-                    alpn = node.GetAlpn(),
-                };
-                if (node.Fingerprint.IsNotEmpty())
-                {
-                    tls.utls = new Utls4Sbox()
-                    {
-                        enabled = true,
-                        fingerprint = node.Fingerprint.IsNullOrEmpty() ? _config.CoreBasicItem.DefFingerprint : node.Fingerprint
-                    };
-                }
-                if (node.StreamSecurity == Global.StreamSecurityReality)
-                {
-                    tls.reality = new Reality4Sbox()
-                    {
-                        enabled = true,
-                        public_key = node.PublicKey,
-                        short_id = node.ShortId
-                    };
-                    tls.insecure = false;
-                }
-                outbound.tls = tls;
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return await Task.FromResult(0);
-    }
-
-    private async Task<int> GenOutboundTransport(ProfileItem node, Outbound4Sbox outbound)
-    {
-        try
-        {
-            var transport = new Transport4Sbox();
-
-            switch (node.GetNetwork())
-            {
-                case nameof(ETransport.h2):
-                    transport.type = nameof(ETransport.http);
-                    transport.host = node.RequestHost.IsNullOrEmpty() ? null : Utils.String2List(node.RequestHost);
-                    transport.path = node.Path.IsNullOrEmpty() ? null : node.Path;
-                    break;
-
-                case nameof(ETransport.tcp):   //http
-                    if (node.HeaderType == Global.TcpHeaderHttp)
-                    {
-                        if (node.ConfigType == EConfigType.Shadowsocks)
-                        {
-                            outbound.plugin = "obfs-local";
-                            outbound.plugin_opts = $"obfs=http;obfs-host={node.RequestHost};";
-                        }
-                        else
-                        {
-                            transport.type = nameof(ETransport.http);
-                            transport.host = node.RequestHost.IsNullOrEmpty() ? null : Utils.String2List(node.RequestHost);
-                            transport.path = node.Path.IsNullOrEmpty() ? null : node.Path;
-                        }
-                    }
-                    break;
-
-                case nameof(ETransport.ws):
-                    transport.type = nameof(ETransport.ws);
-                    transport.path = node.Path.IsNullOrEmpty() ? null : node.Path;
-                    if (node.RequestHost.IsNotEmpty())
-                    {
-                        transport.headers = new()
-                        {
-                            Host = node.RequestHost
-                        };
-                    }
-                    break;
-
-                case nameof(ETransport.httpupgrade):
-                    transport.type = nameof(ETransport.httpupgrade);
-                    transport.path = node.Path.IsNullOrEmpty() ? null : node.Path;
-                    transport.host = node.RequestHost.IsNullOrEmpty() ? null : node.RequestHost;
-
-                    break;
-
-                case nameof(ETransport.quic):
-                    transport.type = nameof(ETransport.quic);
-                    break;
-
-                case nameof(ETransport.grpc):
-                    transport.type = nameof(ETransport.grpc);
-                    transport.service_name = node.Path;
-                    transport.idle_timeout = _config.GrpcItem.IdleTimeout?.ToString("##s");
-                    transport.ping_timeout = _config.GrpcItem.HealthCheckTimeout?.ToString("##s");
-                    transport.permit_without_stream = _config.GrpcItem.PermitWithoutStream;
-                    break;
-
-                default:
-                    break;
-            }
-            if (transport.type != null)
-            {
-                outbound.transport = transport;
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return await Task.FromResult(0);
-    }
-
-    private async Task<int> GenMoreOutbounds(ProfileItem node, SingboxConfig singboxConfig)
-    {
-        if (node.Subid.IsNullOrEmpty())
-        {
-            return 0;
-        }
-        try
-        {
-            var subItem = await AppManager.Instance.GetSubItem(node.Subid);
-            if (subItem is null)
-            {
-                return 0;
-            }
-
-            //current proxy
-            BaseServer4Sbox? outbound = singboxConfig.endpoints?.FirstOrDefault(t => t.tag == Global.ProxyTag, null);
-            outbound ??= singboxConfig.outbounds.First();
-
-            var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
-
-            //Previous proxy
-            var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
-            string? prevOutboundTag = null;
-            if (prevNode is not null
-                && prevNode.ConfigType != EConfigType.Custom)
-            {
-                prevOutboundTag = $"prev-{Global.ProxyTag}";
-                var prevServer = await GenServer(prevNode);
-                prevServer.tag = prevOutboundTag;
-                if (prevServer is Endpoints4Sbox endpoint)
-                {
-                    singboxConfig.endpoints ??= new();
-                    singboxConfig.endpoints.Add(endpoint);
-                }
-                else if (prevServer is Outbound4Sbox outboundPrev)
-                {
-                    singboxConfig.outbounds.Add(outboundPrev);
-                }
-            }
-            var nextServer = await GenChainOutbounds(subItem, outbound, prevOutboundTag);
-
-            if (nextServer is not null)
-            {
-                if (nextServer is Endpoints4Sbox endpoint)
-                {
-                    singboxConfig.endpoints ??= new();
-                    singboxConfig.endpoints.Insert(0, endpoint);
-                }
-                else if (nextServer is Outbound4Sbox outboundNext)
-                {
-                    singboxConfig.outbounds.Insert(0, outboundNext);
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-
-        return 0;
-    }
-
-    private async Task<int> GenOutboundsList(List<ProfileItem> nodes, SingboxConfig singboxConfig)
-    {
-        try
-        {
-            // Get outbound template and initialize lists
-            var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
-            if (txtOutbound.IsNullOrEmpty())
-            {
-                return 0;
-            }
-
-            var resultOutbounds = new List<Outbound4Sbox>();
-            var resultEndpoints = new List<Endpoints4Sbox>(); // For endpoints
-            var prevOutbounds = new List<Outbound4Sbox>(); // Separate list for prev outbounds
-            var prevEndpoints = new List<Endpoints4Sbox>(); // Separate list for prev endpoints
-            var proxyTags = new List<string>(); // For selector and urltest outbounds
-
-            // Cache for chain proxies to avoid duplicate generation
-            var nextProxyCache = new Dictionary<string, BaseServer4Sbox?>();
-            var prevProxyTags = new Dictionary<string, string?>(); // Map from profile name to tag
-            int prevIndex = 0; // Index for prev outbounds
-
-            // Process each node
-            int index = 0;
-            foreach (var node in nodes)
-            {
-                index++;
-
-                // Handle proxy chain
-                string? prevTag = null;
-                var currentServer = await GenServer(node);
-                var nextServer = nextProxyCache.GetValueOrDefault(node.Subid, null);
-                if (nextServer != null)
-                {
-                    nextServer = JsonUtils.DeepCopy(nextServer);
-                }
-
-                var subItem = await AppManager.Instance.GetSubItem(node.Subid);
-
-                // current proxy
-                currentServer.tag = $"{Global.ProxyTag}-{index}";
-                proxyTags.Add(currentServer.tag);
-
-                if (!node.Subid.IsNullOrEmpty())
-                {
-                    if (prevProxyTags.TryGetValue(node.Subid, out var value))
-                    {
-                        prevTag = value; // maybe null
-                    }
-                    else
-                    {
-                        var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
-                        if (prevNode is not null
-                            && prevNode.ConfigType != EConfigType.Custom)
-                        {
-                            var prevOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
-                            await GenOutbound(prevNode, prevOutbound);
-                            prevTag = $"prev-{Global.ProxyTag}-{++prevIndex}";
-                            prevOutbound.tag = prevTag;
-                            prevOutbounds.Add(prevOutbound);
-                        }
-                        prevProxyTags[node.Subid] = prevTag;
-                    }
-
-                    nextServer = await GenChainOutbounds(subItem, currentServer, prevTag, nextServer);
-                    if (!nextProxyCache.ContainsKey(node.Subid))
-                    {
-                        nextProxyCache[node.Subid] = nextServer;
-                    }
-                }
-
-                if (nextServer is not null)
-                {
-                    if (nextServer is Endpoints4Sbox nextEndpoint)
-                    {
-                        resultEndpoints.Add(nextEndpoint);
-                    }
-                    else if (nextServer is Outbound4Sbox nextOutbound)
-                    {
-                        resultOutbounds.Add(nextOutbound);
-                    }
-                }
-                if (currentServer is Endpoints4Sbox currentEndpoint)
-                {
-                    resultEndpoints.Add(currentEndpoint);
-                }
-                else if (currentServer is Outbound4Sbox currentOutbound)
-                {
-                    resultOutbounds.Add(currentOutbound);
-                }
-            }
-
-            // Add urltest outbound (auto selection based on latency)
-            if (proxyTags.Count > 0)
-            {
-                var outUrltest = new Outbound4Sbox
-                {
-                    type = "urltest",
-                    tag = $"{Global.ProxyTag}-auto",
-                    outbounds = proxyTags,
-                    interrupt_exist_connections = false,
-                };
-
-                // Add selector outbound (manual selection)
-                var outSelector = new Outbound4Sbox
-                {
-                    type = "selector",
-                    tag = Global.ProxyTag,
-                    outbounds = JsonUtils.DeepCopy(proxyTags),
-                    interrupt_exist_connections = false,
-                };
-                outSelector.outbounds.Insert(0, outUrltest.tag);
-
-                // Insert these at the beginning
-                resultOutbounds.Insert(0, outUrltest);
-                resultOutbounds.Insert(0, outSelector);
-            }
-
-            // Merge results: first the selector/urltest/proxies, then other outbounds, and finally prev outbounds
-            resultOutbounds.AddRange(prevOutbounds);
-            resultOutbounds.AddRange(singboxConfig.outbounds);
-            singboxConfig.outbounds = resultOutbounds;
-            singboxConfig.endpoints ??= new List<Endpoints4Sbox>();
-            resultEndpoints.AddRange(singboxConfig.endpoints);
-            singboxConfig.endpoints = resultEndpoints;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-
-        return 0;
-    }
-
-    /// <summary>
-    /// Generates a chained outbound configuration for the given subItem and outbound.
-    /// The outbound's tag must be set before calling this method.
-    /// Returns the next proxy's outbound configuration, which may be null if no next proxy exists.
-    /// </summary>
-    /// <param name="subItem">The subscription item containing proxy chain information.</param>
-    /// <param name="outbound">The current outbound configuration. Its tag must be set before calling this method.</param>
-    /// <param name="prevOutboundTag">The tag of the previous outbound in the chain, if any.</param>
-    /// <param name="nextOutbound">The outbound for the next proxy in the chain, if already created. If null, will be created inside.</param>
-    /// <returns>
-    /// The outbound configuration for the next proxy in the chain, or null if no next proxy exists.
-    /// </returns>
-    private async Task<BaseServer4Sbox?> GenChainOutbounds(SubItem subItem, BaseServer4Sbox outbound, string? prevOutboundTag, BaseServer4Sbox? nextOutbound = null)
-    {
-        try
-        {
-            var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
-
-            if (!prevOutboundTag.IsNullOrEmpty())
-            {
-                outbound.detour = prevOutboundTag;
-            }
-
-            // Next proxy
-            var nextNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
-            if (nextNode is not null
-                && nextNode.ConfigType != EConfigType.Custom)
-            {
-                nextOutbound ??= await GenServer(nextNode);
-                nextOutbound.tag = outbound.tag;
-
-                outbound.tag = $"mid-{outbound.tag}";
-                nextOutbound.detour = outbound.tag;
-            }
-            return nextOutbound;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return null;
-    }
-
-    private async Task<int> GenRouting(SingboxConfig singboxConfig)
-    {
-        try
-        {
-            singboxConfig.route.final = Global.ProxyTag;
-            var item = _config.SimpleDNSItem;
-
-            var defaultDomainResolverTag = Global.SingboxOutboundResolverTag;
-            var directDNSStrategy = item.SingboxStrategy4Direct.IsNullOrEmpty() ? Global.SingboxDomainStrategy4Out.FirstOrDefault() : item.SingboxStrategy4Direct;
-
-            var rawDNSItem = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
-            if (rawDNSItem != null && rawDNSItem.Enabled == true)
-            {
-                defaultDomainResolverTag = Global.SingboxFinalResolverTag;
-                directDNSStrategy = rawDNSItem.DomainStrategy4Freedom.IsNullOrEmpty() ? Global.SingboxDomainStrategy4Out.FirstOrDefault() : rawDNSItem.DomainStrategy4Freedom;
-            }
-            singboxConfig.route.default_domain_resolver = new()
-            {
-                server = defaultDomainResolverTag,
-                strategy = directDNSStrategy
-            };
-
-            if (_config.TunModeItem.EnableTun)
-            {
-                singboxConfig.route.auto_detect_interface = true;
-
-                var tunRules = JsonUtils.Deserialize<List<Rule4Sbox>>(EmbedUtils.GetEmbedText(Global.TunSingboxRulesFileName));
-                if (tunRules != null)
-                {
-                    singboxConfig.route.rules.AddRange(tunRules);
-                }
-
-                GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe);
-                singboxConfig.route.rules.Add(new()
-                {
-                    port = new() { 53 },
-                    action = "hijack-dns",
-                    process_name = lstDnsExe
-                });
-
-                singboxConfig.route.rules.Add(new()
-                {
-                    outbound = Global.DirectTag,
-                    process_name = lstDirectExe
-                });
-            }
-
-            if (_config.Inbound.First().SniffingEnabled)
-            {
-                singboxConfig.route.rules.Add(new()
-                {
-                    action = "sniff"
-                });
-                singboxConfig.route.rules.Add(new()
-                {
-                    protocol = new() { "dns" },
-                    action = "hijack-dns"
-                });
-            }
-            else
-            {
-                singboxConfig.route.rules.Add(new()
-                {
-                    port = new() { 53 },
-                    network = new() { "udp" },
-                    action = "hijack-dns"
-                });
-            }
-
-            singboxConfig.route.rules.Add(new()
-            {
-                outbound = Global.DirectTag,
-                clash_mode = ERuleMode.Direct.ToString()
-            });
-            singboxConfig.route.rules.Add(new()
-            {
-                outbound = Global.ProxyTag,
-                clash_mode = ERuleMode.Global.ToString()
-            });
-
-            var domainStrategy = _config.RoutingBasicItem.DomainStrategy4Singbox.IsNullOrEmpty() ? null : _config.RoutingBasicItem.DomainStrategy4Singbox;
-            var defaultRouting = await ConfigHandler.GetDefaultRouting(_config);
-            if (defaultRouting.DomainStrategy4Singbox.IsNotEmpty())
-            {
-                domainStrategy = defaultRouting.DomainStrategy4Singbox;
-            }
-            var resolveRule = new Rule4Sbox
-            {
-                action = "resolve",
-                strategy = domainStrategy
-            };
-            if (_config.RoutingBasicItem.DomainStrategy == Global.IPOnDemand)
-            {
-                singboxConfig.route.rules.Add(resolveRule);
-            }
-
-            var routing = await ConfigHandler.GetDefaultRouting(_config);
-            var ipRules = new List<RulesItem>();
-            if (routing != null)
-            {
-                var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet);
-                foreach (var item1 in rules ?? [])
-                {
-                    if (item1.Enabled)
-                    {
-                        await GenRoutingUserRule(item1, singboxConfig);
-                        if (item1.Ip != null && item1.Ip.Count > 0)
-                        {
-                            ipRules.Add(item1);
-                        }
-                    }
-                }
-            }
-            if (_config.RoutingBasicItem.DomainStrategy == Global.IPIfNonMatch)
-            {
-                singboxConfig.route.rules.Add(resolveRule);
-                foreach (var item2 in ipRules)
-                {
-                    await GenRoutingUserRule(item2, singboxConfig);
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return 0;
-    }
-
-    private void GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe)
-    {
-        var dnsExeSet = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-        var directExeSet = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-
-        var coreInfoResult = CoreInfoManager.Instance.GetCoreInfo();
-
-        foreach (var coreConfig in coreInfoResult)
-        {
-            if (coreConfig.CoreType == ECoreType.v2rayN)
-            {
-                continue;
-            }
-
-            foreach (var baseExeName in coreConfig.CoreExes)
-            {
-                if (coreConfig.CoreType != ECoreType.sing_box)
-                {
-                    dnsExeSet.Add(Utils.GetExeName(baseExeName));
-                }
-                directExeSet.Add(Utils.GetExeName(baseExeName));
-            }
-        }
-
-        lstDnsExe = new List<string>(dnsExeSet);
-        lstDirectExe = new List<string>(directExeSet);
-    }
-
-    private async Task<int> GenRoutingUserRule(RulesItem item, SingboxConfig singboxConfig)
-    {
-        try
-        {
-            if (item == null)
-            {
-                return 0;
-            }
-            item.OutboundTag = await GenRoutingUserRuleOutbound(item.OutboundTag, singboxConfig);
-            var rules = singboxConfig.route.rules;
-
-            var rule = new Rule4Sbox();
-            if (item.OutboundTag == "block")
-            {
-                rule.action = "reject";
-            }
-            else
-            {
-                rule.outbound = item.OutboundTag;
-            }
-
-            if (item.Port.IsNotEmpty())
-            {
-                var portRanges = item.Port.Split(',').Where(it => it.Contains('-')).Select(it => it.Replace("-", ":")).ToList();
-                var ports = item.Port.Split(',').Where(it => !it.Contains('-')).Select(it => it.ToInt()).ToList();
-
-                rule.port_range = portRanges.Count > 0 ? portRanges : null;
-                rule.port = ports.Count > 0 ? ports : null;
-            }
-            if (item.Network.IsNotEmpty())
-            {
-                rule.network = Utils.String2List(item.Network);
-            }
-            if (item.Protocol?.Count > 0)
-            {
-                rule.protocol = item.Protocol;
-            }
-            if (item.InboundTag?.Count >= 0)
-            {
-                rule.inbound = item.InboundTag;
-            }
-            var rule1 = JsonUtils.DeepCopy(rule);
-            var rule2 = JsonUtils.DeepCopy(rule);
-            var rule3 = JsonUtils.DeepCopy(rule);
-
-            var hasDomainIp = false;
-            if (item.Domain?.Count > 0)
-            {
-                var countDomain = 0;
-                foreach (var it in item.Domain)
-                {
-                    if (ParseV2Domain(it, rule1))
-                        countDomain++;
-                }
-                if (countDomain > 0)
-                {
-                    rules.Add(rule1);
-                    hasDomainIp = true;
-                }
-            }
-
-            if (item.Ip?.Count > 0)
-            {
-                var countIp = 0;
-                foreach (var it in item.Ip)
-                {
-                    if (ParseV2Address(it, rule2))
-                        countIp++;
-                }
-                if (countIp > 0)
-                {
-                    rules.Add(rule2);
-                    hasDomainIp = true;
-                }
-            }
-
-            if (_config.TunModeItem.EnableTun && item.Process?.Count > 0)
-            {
-                rule3.process_name = item.Process;
-                rules.Add(rule3);
-                hasDomainIp = true;
-            }
-
-            if (!hasDomainIp
-                && (rule.port != null || rule.port_range != null || rule.protocol != null || rule.inbound != null || rule.network != null))
-            {
-                rules.Add(rule);
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return await Task.FromResult(0);
-    }
-
-    private bool ParseV2Domain(string domain, Rule4Sbox rule)
-    {
-        if (domain.StartsWith("#") || domain.StartsWith("ext:") || domain.StartsWith("ext-domain:"))
-        {
-            return false;
-        }
-        else if (domain.StartsWith("geosite:"))
-        {
-            rule.geosite ??= [];
-            rule.geosite?.Add(domain.Substring(8));
-        }
-        else if (domain.StartsWith("regexp:"))
-        {
-            rule.domain_regex ??= [];
-            rule.domain_regex?.Add(domain.Replace(Global.RoutingRuleComma, ",").Substring(7));
-        }
-        else if (domain.StartsWith("domain:"))
-        {
-            rule.domain ??= [];
-            rule.domain_suffix ??= [];
-            rule.domain?.Add(domain.Substring(7));
-            rule.domain_suffix?.Add("." + domain.Substring(7));
-        }
-        else if (domain.StartsWith("full:"))
-        {
-            rule.domain ??= [];
-            rule.domain?.Add(domain.Substring(5));
-        }
-        else if (domain.StartsWith("keyword:"))
-        {
-            rule.domain_keyword ??= [];
-            rule.domain_keyword?.Add(domain.Substring(8));
-        }
-        else
-        {
-            rule.domain_keyword ??= [];
-            rule.domain_keyword?.Add(domain);
-        }
-        return true;
-    }
-
-    private bool ParseV2Address(string address, Rule4Sbox rule)
-    {
-        if (address.StartsWith("ext:") || address.StartsWith("ext-ip:"))
-        {
-            return false;
-        }
-        else if (address.Equals("geoip:private"))
-        {
-            rule.ip_is_private = true;
-        }
-        else if (address.StartsWith("geoip:"))
-        {
-            rule.geoip ??= new();
-            rule.geoip?.Add(address.Substring(6));
-        }
-        else if (address.Equals("geoip:!private"))
-        {
-            rule.ip_is_private = false;
-        }
-        else if (address.StartsWith("geoip:!"))
-        {
-            rule.geoip ??= new();
-            rule.geoip?.Add(address.Substring(6));
-            rule.invert = true;
-        }
-        else
-        {
-            rule.ip_cidr ??= new();
-            rule.ip_cidr?.Add(address);
-        }
-        return true;
-    }
-
-    private async Task<string?> GenRoutingUserRuleOutbound(string outboundTag, SingboxConfig singboxConfig)
-    {
-        if (Global.OutboundTags.Contains(outboundTag))
-        {
-            return outboundTag;
-        }
-
-        var node = await AppManager.Instance.GetProfileItemViaRemarks(outboundTag);
-        if (node == null
-            || node.ConfigType == EConfigType.Custom)
-        {
-            return Global.ProxyTag;
-        }
-
-        var server = await GenServer(node);
-        if (server is null)
-        {
-            return Global.ProxyTag;
-        }
-
-        server.tag = Global.ProxyTag + node.IndexId.ToString();
-        if (server is Endpoints4Sbox endpoint)
-        {
-            singboxConfig.endpoints ??= new();
-            singboxConfig.endpoints.Add(endpoint);
-        }
-        else if (server is Outbound4Sbox outbound)
-        {
-            singboxConfig.outbounds.Add(outbound);
-        }
-
-        return server.tag;
-    }
-
-    private async Task<int> GenDns(SingboxConfig singboxConfig)
-    {
-        try
-        {
-            var item = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
-            if (item != null && item.Enabled == true)
-            {
-                return await GenDnsCompatible(singboxConfig);
-            }
-
-            var simpleDNSItem = _config.SimpleDNSItem;
-            await GenDnsServers(singboxConfig, simpleDNSItem);
-            await GenDnsRules(singboxConfig, simpleDNSItem);
-
-            singboxConfig.dns ??= new Dns4Sbox();
-            singboxConfig.dns.independent_cache = true;
-
-            var routing = await ConfigHandler.GetDefaultRouting(_config);
-            var useDirectDns = false;
-            if (routing != null)
-            {
-                var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet) ?? [];
-
-                useDirectDns = rules?.LastOrDefault() is { } lastRule &&
-                                  lastRule.OutboundTag == Global.DirectTag &&
-                                  (lastRule.Port == "0-65535" ||
-                                   lastRule.Network == "tcp,udp" ||
-                                   lastRule.Ip?.Contains("0.0.0.0/0") == true);
-            }
-            singboxConfig.dns.final = useDirectDns ? Global.SingboxDirectDNSTag : Global.SingboxRemoteDNSTag;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return 0;
-    }
-
-    private async Task<int> GenDnsServers(SingboxConfig singboxConfig, SimpleDNSItem simpleDNSItem)
-    {
-        var finalDns = await GenDnsDomains(singboxConfig, simpleDNSItem);
-
-        var directDns = ParseDnsAddress(simpleDNSItem.DirectDNS);
-        directDns.tag = Global.SingboxDirectDNSTag;
-        directDns.domain_resolver = Global.SingboxFinalResolverTag;
-
-        var remoteDns = ParseDnsAddress(simpleDNSItem.RemoteDNS);
-        remoteDns.tag = Global.SingboxRemoteDNSTag;
-        remoteDns.detour = Global.ProxyTag;
-        remoteDns.domain_resolver = Global.SingboxFinalResolverTag;
-
-        var resolverDns = ParseDnsAddress(simpleDNSItem.SingboxOutboundsResolveDNS);
-        resolverDns.tag = Global.SingboxOutboundResolverTag;
-        resolverDns.domain_resolver = Global.SingboxFinalResolverTag;
-
-        var hostsDns = new Server4Sbox
-        {
-            tag = Global.SingboxHostsDNSTag,
-            type = "hosts",
-            predefined = new(),
-        };
-        if (simpleDNSItem.AddCommonHosts == true)
-        {
-            hostsDns.predefined = Global.PredefinedHosts;
-        }
-        var userHostsMap = simpleDNSItem.Hosts?
-            .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
-            .Where(line => !string.IsNullOrWhiteSpace(line))
-            .Where(line => line.Contains(' '))
-            .ToDictionary(
-                line =>
-                {
-                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                    return parts[0];
-                },
-                line =>
-                {
-                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                    var values = parts.Skip(1).ToList();
-                    return values;
-                }
-            );
-
-        if (userHostsMap != null)
-        {
-            foreach (var kvp in userHostsMap)
-            {
-                hostsDns.predefined[kvp.Key] = kvp.Value;
-            }
-        }
-
-        if (simpleDNSItem.UseSystemHosts == true)
-        {
-            var systemHosts = Utils.GetSystemHosts();
-            if (systemHosts.Count > 0)
-            {
-                foreach (var host in systemHosts)
-                {
-                    if (userHostsMap[host.Key] != null)
-                    {
-                        continue;
-                    }
-                    userHostsMap[host.Key] = new List<string> { host.Value };
-                }
-            }
-        }
-
-        foreach (var host in hostsDns.predefined)
-        {
-            if (finalDns.server == host.Key)
-            {
-                finalDns.domain_resolver = Global.SingboxHostsDNSTag;
-            }
-            if (remoteDns.server == host.Key)
-            {
-                remoteDns.domain_resolver = Global.SingboxHostsDNSTag;
-            }
-            if (resolverDns.server == host.Key)
-            {
-                resolverDns.domain_resolver = Global.SingboxHostsDNSTag;
-            }
-            if (directDns.server == host.Key)
-            {
-                directDns.domain_resolver = Global.SingboxHostsDNSTag;
-            }
-        }
-
-        singboxConfig.dns ??= new Dns4Sbox();
-        singboxConfig.dns.servers ??= new List<Server4Sbox>();
-        singboxConfig.dns.servers.Add(remoteDns);
-        singboxConfig.dns.servers.Add(directDns);
-        singboxConfig.dns.servers.Add(resolverDns);
-        singboxConfig.dns.servers.Add(hostsDns);
-
-        // fake ip
-        if (simpleDNSItem.FakeIP == true)
-        {
-            var fakeip = new Server4Sbox
-            {
-                tag = Global.SingboxFakeDNSTag,
-                type = "fakeip",
-                inet4_range = "198.18.0.0/15",
-                inet6_range = "fc00::/18",
-            };
-            singboxConfig.dns.servers.Add(fakeip);
-        }
-
-        return await Task.FromResult(0);
-    }
-
-    private async Task<Server4Sbox> GenDnsDomains(SingboxConfig singboxConfig, SimpleDNSItem? simpleDNSItem)
-    {
-        var finalDns = ParseDnsAddress(simpleDNSItem.SingboxFinalResolveDNS);
-        finalDns.tag = Global.SingboxFinalResolverTag;
-        singboxConfig.dns ??= new Dns4Sbox();
-        singboxConfig.dns.servers ??= new List<Server4Sbox>();
-        singboxConfig.dns.servers.Add(finalDns);
-        return await Task.FromResult(finalDns);
-    }
-
-    private async Task<int> GenDnsRules(SingboxConfig singboxConfig, SimpleDNSItem simpleDNSItem)
-    {
-        singboxConfig.dns ??= new Dns4Sbox();
-        singboxConfig.dns.rules ??= new List<Rule4Sbox>();
-
-        singboxConfig.dns.rules.AddRange(new[]
-            {
-            new Rule4Sbox { ip_accept_any = true, server = Global.SingboxHostsDNSTag },
-            new Rule4Sbox
-            {
-                server = Global.SingboxRemoteDNSTag,
-                strategy = simpleDNSItem.SingboxStrategy4Proxy.IsNullOrEmpty() ? null : simpleDNSItem.SingboxStrategy4Proxy,
-                clash_mode = ERuleMode.Global.ToString()
-            },
-            new Rule4Sbox
-            {
-                server = Global.SingboxDirectDNSTag,
-                strategy = simpleDNSItem.SingboxStrategy4Direct.IsNullOrEmpty() ? null : simpleDNSItem.SingboxStrategy4Direct,
-                clash_mode = ERuleMode.Direct.ToString()
-            }
-        });
-
-        if (simpleDNSItem.BlockBindingQuery == true)
-        {
-            singboxConfig.dns.rules.Add(new()
-            {
-                query_type = new List<int> { 64, 65 },
-                action = "predefined",
-                rcode = "NOTIMP"
-            });
-        }
-
-        var routing = await ConfigHandler.GetDefaultRouting(_config);
-        if (routing == null)
-            return 0;
-
-        var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet) ?? [];
-        var expectedIPCidr = new List<string>();
-        var expectedIPsRegions = new List<string>();
-        var regionNames = new HashSet<string>();
-
-        if (!string.IsNullOrEmpty(simpleDNSItem?.DirectExpectedIPs))
-        {
-            var ipItems = simpleDNSItem.DirectExpectedIPs
-                .Split(new[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(s => s.Trim())
-                .Where(s => !string.IsNullOrEmpty(s))
-                .ToList();
-
-            foreach (var ip in ipItems)
-            {
-                if (ip.StartsWith("geoip:", StringComparison.OrdinalIgnoreCase))
-                {
-                    var region = ip["geoip:".Length..];
-                    if (!string.IsNullOrEmpty(region))
-                    {
-                        expectedIPsRegions.Add(region);
-                        regionNames.Add(region);
-                        regionNames.Add($"geolocation-{region}");
-                        regionNames.Add($"tld-{region}");
-                    }
-                }
-                else
-                {
-                    expectedIPCidr.Add(ip);
-                }
-            }
-        }
-
-        foreach (var item in rules)
-        {
-            if (!item.Enabled || item.Domain is null || item.Domain.Count == 0)
-            {
-                continue;
-            }
-
-            var rule = new Rule4Sbox();
-            var validDomains = item.Domain.Count(it => ParseV2Domain(it, rule));
-            if (validDomains <= 0)
-            {
-                continue;
-            }
-
-            if (item.OutboundTag == Global.DirectTag)
-            {
-                rule.server = Global.SingboxDirectDNSTag;
-                rule.strategy = string.IsNullOrEmpty(simpleDNSItem.SingboxStrategy4Direct) ? null : simpleDNSItem.SingboxStrategy4Direct;
-
-                if (expectedIPsRegions.Count > 0 && rule.geosite?.Count > 0)
-                {
-                    var geositeSet = new HashSet<string>(rule.geosite);
-                    if (regionNames.Intersect(geositeSet).Any())
-                    {
-                        if (expectedIPsRegions.Count > 0)
-                        {
-                            rule.geoip = expectedIPsRegions;
-                        }
-                        if (expectedIPCidr.Count > 0)
-                        {
-                            rule.ip_cidr = expectedIPCidr;
-                        }
-                    }
-                }
-            }
-            else if (item.OutboundTag == Global.BlockTag)
-            {
-                rule.action = "predefined";
-                rule.rcode = "NXDOMAIN";
-            }
-            else
-            {
-                if (simpleDNSItem.FakeIP == true)
-                {
-                    var rule4Fake = JsonUtils.DeepCopy(rule);
-                    rule4Fake.server = Global.SingboxFakeDNSTag;
-                    singboxConfig.dns.rules.Add(rule4Fake);
-                }
-                rule.server = Global.SingboxRemoteDNSTag;
-                rule.strategy = string.IsNullOrEmpty(simpleDNSItem.SingboxStrategy4Proxy) ? null : simpleDNSItem.SingboxStrategy4Proxy;
-            }
-
-            singboxConfig.dns.rules.Add(rule);
-        }
-
-        return 0;
-    }
-
-    private async Task<int> GenDnsCompatible(SingboxConfig singboxConfig)
-    {
-        try
-        {
-            var item = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
-            var strDNS = string.Empty;
-            if (_config.TunModeItem.EnableTun)
-            {
-                strDNS = string.IsNullOrEmpty(item?.TunDNS) ? EmbedUtils.GetEmbedText(Global.TunSingboxDNSFileName) : item?.TunDNS;
-            }
-            else
-            {
-                strDNS = string.IsNullOrEmpty(item?.NormalDNS) ? EmbedUtils.GetEmbedText(Global.DNSSingboxNormalFileName) : item?.NormalDNS;
-            }
-
-            var dns4Sbox = JsonUtils.Deserialize<Dns4Sbox>(strDNS);
-            if (dns4Sbox is null)
-            {
-                return 0;
-            }
-            singboxConfig.dns = dns4Sbox;
-
-            if (dns4Sbox.servers != null && dns4Sbox.servers.Count > 0 && dns4Sbox.servers.First().address.IsNullOrEmpty())
-            {
-                await GenDnsDomainsCompatible(singboxConfig, item);
-            }
-            else
-            {
-                await GenDnsDomainsLegacyCompatible(singboxConfig, item);
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return 0;
-    }
-
-    private async Task<int> GenDnsDomainsCompatible(SingboxConfig singboxConfig, DNSItem? dNSItem)
-    {
-        var dns4Sbox = singboxConfig.dns ?? new();
-        dns4Sbox.servers ??= [];
-        dns4Sbox.rules ??= [];
-
-        var tag = Global.SingboxFinalResolverTag;
-        var localDnsAddress = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainPureIPDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress;
-
-        var localDnsServer = ParseDnsAddress(localDnsAddress);
-        localDnsServer.tag = tag;
-
-        dns4Sbox.servers.Add(localDnsServer);
-
-        singboxConfig.dns = dns4Sbox;
-        return await Task.FromResult(0);
-    }
-
-    private async Task<int> GenDnsDomainsLegacyCompatible(SingboxConfig singboxConfig, DNSItem? dNSItem)
-    {
-        var dns4Sbox = singboxConfig.dns ?? new();
-        dns4Sbox.servers ??= [];
-        dns4Sbox.rules ??= [];
-
-        var tag = Global.SingboxFinalResolverTag;
-        dns4Sbox.servers.Add(new()
-        {
-            tag = tag,
-            address = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainPureIPDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress,
-            detour = Global.DirectTag,
-            strategy = string.IsNullOrEmpty(dNSItem?.DomainStrategy4Freedom) ? null : dNSItem?.DomainStrategy4Freedom,
-        });
-        dns4Sbox.rules.Insert(0, new()
-        {
-            server = tag,
-            clash_mode = ERuleMode.Direct.ToString()
-        });
-        dns4Sbox.rules.Insert(0, new()
-        {
-            server = dns4Sbox.servers.Where(t => t.detour == Global.ProxyTag).Select(t => t.tag).FirstOrDefault() ?? "remote",
-            clash_mode = ERuleMode.Global.ToString()
-        });
-
-        var lstDomain = singboxConfig.outbounds
-                       .Where(t => t.server.IsNotEmpty() && Utils.IsDomain(t.server))
-                       .Select(t => t.server)
-                       .Distinct()
-                       .ToList();
-        if (lstDomain != null && lstDomain.Count > 0)
-        {
-            dns4Sbox.rules.Insert(0, new()
-            {
-                server = tag,
-                domain = lstDomain
-            });
-        }
-
-        singboxConfig.dns = dns4Sbox;
-        return await Task.FromResult(0);
-    }
-
-    private static Server4Sbox? ParseDnsAddress(string address)
-    {
-        var addressFirst = address?.Split(address.Contains(',') ? ',' : ';').FirstOrDefault()?.Trim();
-        if (string.IsNullOrEmpty(addressFirst))
-        {
-            return null;
-        }
-
-        var server = new Server4Sbox();
-
-        if (addressFirst is "local" or "localhost")
-        {
-            server.type = "local";
-            return server;
-        }
-
-        if (addressFirst.StartsWith("dhcp://", StringComparison.OrdinalIgnoreCase))
-        {
-            var interface_name = addressFirst.Substring(7);
-            server.type = "dhcp";
-            server.Interface = interface_name == "auto" ? null : interface_name;
-            return server;
-        }
-
-        if (!addressFirst.Contains("://"))
-        {
-            // udp dns
-            server.type = "udp";
-            server.server = addressFirst;
-            return server;
-        }
-
-        try
-        {
-            var protocolEndIndex = addressFirst.IndexOf("://", StringComparison.Ordinal);
-            server.type = addressFirst.Substring(0, protocolEndIndex).ToLower();
-
-            var uri = new Uri(addressFirst);
-            server.server = uri.Host;
-
-            if (!uri.IsDefaultPort)
-            {
-                server.server_port = uri.Port;
-            }
-
-            if ((server.type == "https" || server.type == "h3") && !string.IsNullOrEmpty(uri.AbsolutePath) && uri.AbsolutePath != "/")
-            {
-                server.path = uri.AbsolutePath;
-            }
-        }
-        catch (UriFormatException)
-        {
-            var protocolEndIndex = addressFirst.IndexOf("://", StringComparison.Ordinal);
-            if (protocolEndIndex > 0)
-            {
-                server.type = addressFirst.Substring(0, protocolEndIndex).ToLower();
-                var remaining = addressFirst.Substring(protocolEndIndex + 3);
-
-                var portIndex = remaining.IndexOf(':');
-                var pathIndex = remaining.IndexOf('/');
-
-                if (portIndex > 0)
-                {
-                    server.server = remaining.Substring(0, portIndex);
-                    var portPart = pathIndex > portIndex
-                        ? remaining.Substring(portIndex + 1, pathIndex - portIndex - 1)
-                        : remaining.Substring(portIndex + 1);
-
-                    if (int.TryParse(portPart, out var parsedPort))
-                    {
-                        server.server_port = parsedPort;
-                    }
-                }
-                else if (pathIndex > 0)
-                {
-                    server.server = remaining.Substring(0, pathIndex);
-                }
-                else
-                {
-                    server.server = remaining;
-                }
-
-                if (pathIndex > 0 && (server.type == "https" || server.type == "h3"))
-                {
-                    server.path = remaining.Substring(pathIndex);
-                }
-            }
-        }
-
-        return server;
-    }
-
-    private async Task<int> GenExperimental(SingboxConfig singboxConfig)
-    {
-        //if (_config.guiItem.enableStatistics)
-        {
-            singboxConfig.experimental ??= new Experimental4Sbox();
-            singboxConfig.experimental.clash_api = new Clash_Api4Sbox()
-            {
-                external_controller = $"{Global.Loopback}:{AppManager.Instance.StatePort2}",
-            };
-        }
-
-        if (_config.CoreBasicItem.EnableCacheFile4Sbox)
-        {
-            singboxConfig.experimental ??= new Experimental4Sbox();
-            singboxConfig.experimental.cache_file = new CacheFile4Sbox()
-            {
-                enabled = true,
-                path = Utils.GetBinPath("cache.db"),
-                store_fakeip = _config.SimpleDNSItem.FakeIP == true
-            };
-        }
-
-        return await Task.FromResult(0);
-    }
-
-    private async Task<int> ConvertGeo2Ruleset(SingboxConfig singboxConfig)
-    {
-        static void AddRuleSets(List<string> ruleSets, List<string>? rule_set)
-        {
-            if (rule_set != null)
-                ruleSets.AddRange(rule_set);
-        }
-        var geosite = "geosite";
-        var geoip = "geoip";
-        var ruleSets = new List<string>();
-
-        //convert route geosite & geoip to ruleset
-        foreach (var rule in singboxConfig.route.rules.Where(t => t.geosite?.Count > 0).ToList() ?? [])
-        {
-            rule.rule_set ??= new List<string>();
-            rule.rule_set.AddRange(rule?.geosite?.Select(t => $"{geosite}-{t}").ToList());
-            rule.geosite = null;
-            AddRuleSets(ruleSets, rule.rule_set);
-        }
-        foreach (var rule in singboxConfig.route.rules.Where(t => t.geoip?.Count > 0).ToList() ?? [])
-        {
-            rule.rule_set ??= new List<string>();
-            rule.rule_set.AddRange(rule?.geoip?.Select(t => $"{geoip}-{t}").ToList());
-            rule.geoip = null;
-            AddRuleSets(ruleSets, rule.rule_set);
-        }
-
-        //convert dns geosite & geoip to ruleset
-        foreach (var rule in singboxConfig.dns?.rules.Where(t => t.geosite?.Count > 0).ToList() ?? [])
-        {
-            rule.rule_set ??= new List<string>();
-            rule.rule_set.AddRange(rule?.geosite?.Select(t => $"{geosite}-{t}").ToList());
-            rule.geosite = null;
-        }
-        foreach (var rule in singboxConfig.dns?.rules.Where(t => t.geoip?.Count > 0).ToList() ?? [])
-        {
-            rule.rule_set ??= new List<string>();
-            rule.rule_set.AddRange(rule?.geoip?.Select(t => $"{geoip}-{t}").ToList());
-            rule.geoip = null;
-        }
-        foreach (var dnsRule in singboxConfig.dns?.rules.Where(t => t.rule_set?.Count > 0).ToList() ?? [])
-        {
-            AddRuleSets(ruleSets, dnsRule.rule_set);
-        }
-        //rules in rules
-        foreach (var item in singboxConfig.dns?.rules.Where(t => t.rules?.Count > 0).Select(t => t.rules).ToList() ?? [])
-        {
-            foreach (var item2 in item ?? [])
-            {
-                AddRuleSets(ruleSets, item2.rule_set);
-            }
-        }
-
-        //load custom ruleset file
-        List<Ruleset4Sbox> customRulesets = [];
-
-        var routing = await ConfigHandler.GetDefaultRouting(_config);
-        if (routing.CustomRulesetPath4Singbox.IsNotEmpty())
-        {
-            var result = EmbedUtils.LoadResource(routing.CustomRulesetPath4Singbox);
-            if (result.IsNotEmpty())
-            {
-                customRulesets = (JsonUtils.Deserialize<List<Ruleset4Sbox>>(result) ?? [])
-                    .Where(t => t.tag != null)
-                    .Where(t => t.type != null)
-                    .Where(t => t.format != null)
-                    .ToList();
-            }
-        }
-
-        //Local srs files address
-        var localSrss = Utils.GetBinPath("srss");
-
-        //Add ruleset srs
-        singboxConfig.route.rule_set = [];
-        foreach (var item in new HashSet<string>(ruleSets))
-        {
-            if (item.IsNullOrEmpty())
-            { continue; }
-            var customRuleset = customRulesets.FirstOrDefault(t => t.tag != null && t.tag.Equals(item));
-            if (customRuleset is null)
-            {
-                var pathSrs = Path.Combine(localSrss, $"{item}.srs");
-                if (File.Exists(pathSrs))
-                {
-                    customRuleset = new()
-                    {
-                        type = "local",
-                        format = "binary",
-                        tag = item,
-                        path = pathSrs
-                    };
-                }
-                else
-                {
-                    var srsUrl = string.IsNullOrEmpty(_config.ConstItem.SrsSourceUrl)
-                        ? Global.SingboxRulesetUrl
-                        : _config.ConstItem.SrsSourceUrl;
-
-                    customRuleset = new()
-                    {
-                        type = "remote",
-                        format = "binary",
-                        tag = item,
-                        url = string.Format(srsUrl, item.StartsWith(geosite) ? geosite : geoip, item),
-                        download_detour = Global.ProxyTag
-                    };
-                }
-            }
-            singboxConfig.route.rule_set.Add(customRuleset);
-        }
-
-        return 0;
-    }
-
-    private async Task<string> ApplyFullConfigTemplate(SingboxConfig singboxConfig)
-    {
-        var fullConfigTemplate = await AppManager.Instance.GetFullConfigTemplateItem(ECoreType.sing_box);
-        if (fullConfigTemplate == null || !fullConfigTemplate.Enabled)
-        {
-            return JsonUtils.Serialize(singboxConfig);
-        }
-
-        var fullConfigTemplateItem = _config.TunModeItem.EnableTun ? fullConfigTemplate.TunConfig : fullConfigTemplate.Config;
-        if (fullConfigTemplateItem.IsNullOrEmpty())
-        {
-            return JsonUtils.Serialize(singboxConfig);
-        }
-
-        var fullConfigTemplateNode = JsonNode.Parse(fullConfigTemplateItem);
-        if (fullConfigTemplateNode == null)
-        {
-            return JsonUtils.Serialize(singboxConfig);
-        }
-
-        // Process outbounds
-        var customOutboundsNode = fullConfigTemplateNode["outbounds"] is JsonArray outbounds ? outbounds : new JsonArray();
-        foreach (var outbound in singboxConfig.outbounds)
-        {
-            if (outbound.type.ToLower() is "direct" or "block")
-            {
-                if (fullConfigTemplate.AddProxyOnly == true)
-                {
-                    continue;
-                }
-            }
-            else if (outbound.detour.IsNullOrEmpty() && (!fullConfigTemplate.ProxyDetour.IsNullOrEmpty()) && !Utils.IsPrivateNetwork(outbound.server ?? string.Empty))
-            {
-                outbound.detour = fullConfigTemplate.ProxyDetour;
-            }
-            customOutboundsNode.Add(JsonUtils.DeepCopy(outbound));
-        }
-        fullConfigTemplateNode["outbounds"] = customOutboundsNode;
-
-        // Process endpoints
-        if (singboxConfig.endpoints != null && singboxConfig.endpoints.Count > 0)
-        {
-            var customEndpointsNode = fullConfigTemplateNode["endpoints"] is JsonArray endpoints ? endpoints : new JsonArray();
-            foreach (var endpoint in singboxConfig.endpoints)
-            {
-                if (endpoint.detour.IsNullOrEmpty() && (!fullConfigTemplate.ProxyDetour.IsNullOrEmpty()))
-                {
-                    endpoint.detour = fullConfigTemplate.ProxyDetour;
-                }
-                customEndpointsNode.Add(JsonUtils.DeepCopy(endpoint));
-            }
-            fullConfigTemplateNode["endpoints"] = customEndpointsNode;
-        }
-
-        return await Task.FromResult(JsonUtils.Serialize(fullConfigTemplateNode));
-    }
-
-    #endregion private gen function
-}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
deleted file mode 100644
index 041e3386..00000000
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
+++ /dev/null
@@ -1,1952 +0,0 @@
-using System.Net;
-using System.Net.NetworkInformation;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
-
-namespace ServiceLib.Services.CoreConfig;
-
-public class CoreConfigV2rayService
-{
-    private Config _config;
-    private static readonly string _tag = "CoreConfigV2rayService";
-
-    public CoreConfigV2rayService(Config config)
-    {
-        _config = config;
-    }
-
-    #region public gen function
-
-    public async Task<RetResult> GenerateClientConfigContent(ProfileItem node)
-    {
-        var ret = new RetResult();
-        try
-        {
-            if (node == null
-                || node.Port <= 0)
-            {
-                ret.Msg = ResUI.CheckServerSettings;
-                return ret;
-            }
-
-            if (node.GetNetwork() is nameof(ETransport.quic))
-            {
-                ret.Msg = ResUI.Incorrectconfiguration + $" - {node.GetNetwork()}";
-                return ret;
-            }
-
-            ret.Msg = ResUI.InitialConfiguration;
-
-            var result = EmbedUtils.GetEmbedText(Global.V2raySampleClient);
-            if (result.IsNullOrEmpty())
-            {
-                ret.Msg = ResUI.FailedGetDefaultConfiguration;
-                return ret;
-            }
-
-            var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
-            if (v2rayConfig == null)
-            {
-                ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                return ret;
-            }
-
-            await GenLog(v2rayConfig);
-
-            await GenInbounds(v2rayConfig);
-
-            await GenOutbound(node, v2rayConfig.outbounds.First());
-
-            await GenMoreOutbounds(node, v2rayConfig);
-
-            await GenRouting(v2rayConfig);
-
-            await GenDns(node, v2rayConfig);
-
-            await GenStatistic(v2rayConfig);
-
-            ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
-            ret.Success = true;
-            ret.Data = await ApplyFullConfigTemplate(v2rayConfig);
-            return ret;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-            ret.Msg = ResUI.FailedGenDefaultConfiguration;
-            return ret;
-        }
-    }
-
-    public async Task<RetResult> GenerateClientMultipleLoadConfig(List<ProfileItem> selecteds, EMultipleLoad multipleLoad)
-    {
-        var ret = new RetResult();
-
-        try
-        {
-            if (_config == null)
-            {
-                ret.Msg = ResUI.CheckServerSettings;
-                return ret;
-            }
-
-            ret.Msg = ResUI.InitialConfiguration;
-
-            string result = EmbedUtils.GetEmbedText(Global.V2raySampleClient);
-            string txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
-            if (result.IsNullOrEmpty() || txtOutbound.IsNullOrEmpty())
-            {
-                ret.Msg = ResUI.FailedGetDefaultConfiguration;
-                return ret;
-            }
-
-            var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
-            if (v2rayConfig == null)
-            {
-                ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                return ret;
-            }
-
-            await GenLog(v2rayConfig);
-            await GenInbounds(v2rayConfig);
-            await GenRouting(v2rayConfig);
-            await GenDns(null, v2rayConfig);
-            await GenStatistic(v2rayConfig);
-            v2rayConfig.outbounds.RemoveAt(0);
-
-            var proxyProfiles = new List<ProfileItem>();
-            foreach (var it in selecteds)
-            {
-                if (it.ConfigType == EConfigType.Custom)
-                {
-                    continue;
-                }
-                if (it.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls)
-                {
-                    continue;
-                }
-                if (it.Port <= 0)
-                {
-                    continue;
-                }
-                var item = await AppManager.Instance.GetProfileItem(it.IndexId);
-                if (item is null)
-                {
-                    continue;
-                }
-                if (it.ConfigType is EConfigType.VMess or EConfigType.VLESS)
-                {
-                    if (item.Id.IsNullOrEmpty() || !Utils.IsGuidByParse(item.Id))
-                    {
-                        continue;
-                    }
-                }
-                if (item.ConfigType == EConfigType.Shadowsocks
-                  && !Global.SsSecuritiesInSingbox.Contains(item.Security))
-                {
-                    continue;
-                }
-                if (item.ConfigType == EConfigType.VLESS && !Global.Flows.Contains(item.Flow))
-                {
-                    continue;
-                }
-
-                //outbound
-                proxyProfiles.Add(item);
-            }
-            if (proxyProfiles.Count <= 0)
-            {
-                ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                return ret;
-            }
-            await GenOutboundsList(proxyProfiles, v2rayConfig);
-
-            //add balancers
-            await GenBalancer(v2rayConfig, multipleLoad);
-
-            var balancer = v2rayConfig.routing.balancers.First();
-
-            //add rule
-            var rules = v2rayConfig.routing.rules.Where(t => t.outboundTag == Global.ProxyTag).ToList();
-            if (rules?.Count > 0)
-            {
-                foreach (var rule in rules)
-                {
-                    rule.outboundTag = null;
-                    rule.balancerTag = balancer.tag;
-                }
-            }
-            if (v2rayConfig.routing.domainStrategy == Global.IPIfNonMatch)
-            {
-                v2rayConfig.routing.rules.Add(new()
-                {
-                    ip = ["0.0.0.0/0", "::/0"],
-                    balancerTag = balancer.tag,
-                    type = "field"
-                });
-            }
-            else
-            {
-                v2rayConfig.routing.rules.Add(new()
-                {
-                    network = "tcp,udp",
-                    balancerTag = balancer.tag,
-                    type = "field"
-                });
-            }
-
-            ret.Success = true;
-
-            ret.Data = await ApplyFullConfigTemplate(v2rayConfig, true);
-            return ret;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-            ret.Msg = ResUI.FailedGenDefaultConfiguration;
-            return ret;
-        }
-    }
-
-    public async Task<RetResult> GenerateClientSpeedtestConfig(List<ServerTestItem> selecteds)
-    {
-        var ret = new RetResult();
-        try
-        {
-            if (_config == null)
-            {
-                ret.Msg = ResUI.CheckServerSettings;
-                return ret;
-            }
-
-            ret.Msg = ResUI.InitialConfiguration;
-
-            var result = EmbedUtils.GetEmbedText(Global.V2raySampleClient);
-            var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
-            if (result.IsNullOrEmpty() || txtOutbound.IsNullOrEmpty())
-            {
-                ret.Msg = ResUI.FailedGetDefaultConfiguration;
-                return ret;
-            }
-
-            var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
-            if (v2rayConfig == null)
-            {
-                ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                return ret;
-            }
-            List<IPEndPoint> lstIpEndPoints = new();
-            List<TcpConnectionInformation> lstTcpConns = new();
-            try
-            {
-                lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
-                lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
-                lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-
-            await GenLog(v2rayConfig);
-            v2rayConfig.inbounds.Clear();
-            v2rayConfig.outbounds.Clear();
-            v2rayConfig.routing.rules.Clear();
-
-            var initPort = AppManager.Instance.GetLocalPort(EInboundProtocol.speedtest);
-
-            foreach (var it in selecteds)
-            {
-                if (it.ConfigType == EConfigType.Custom)
-                {
-                    continue;
-                }
-                if (it.Port <= 0)
-                {
-                    continue;
-                }
-                var item = await AppManager.Instance.GetProfileItem(it.IndexId);
-                if (it.ConfigType is EConfigType.VMess or EConfigType.VLESS)
-                {
-                    if (item is null || item.Id.IsNullOrEmpty() || !Utils.IsGuidByParse(item.Id))
-                    {
-                        continue;
-                    }
-                }
-
-                //find unused port
-                var port = initPort;
-                for (var k = initPort; k < Global.MaxPort; k++)
-                {
-                    if (lstIpEndPoints?.FindIndex(_it => _it.Port == k) >= 0)
-                    {
-                        continue;
-                    }
-                    if (lstTcpConns?.FindIndex(_it => _it.LocalEndPoint.Port == k) >= 0)
-                    {
-                        continue;
-                    }
-                    //found
-                    port = k;
-                    initPort = port + 1;
-                    break;
-                }
-
-                //Port In Used
-                if (lstIpEndPoints?.FindIndex(_it => _it.Port == port) >= 0)
-                {
-                    continue;
-                }
-                it.Port = port;
-                it.AllowTest = true;
-
-                //outbound
-                if (item is null)
-                {
-                    continue;
-                }
-                if (item.ConfigType == EConfigType.Shadowsocks
-                    && !Global.SsSecuritiesInXray.Contains(item.Security))
-                {
-                    continue;
-                }
-                if (item.ConfigType == EConfigType.VLESS
-                 && !Global.Flows.Contains(item.Flow))
-                {
-                    continue;
-                }
-                if (it.ConfigType is EConfigType.VLESS or EConfigType.Trojan
-                    && item.StreamSecurity == Global.StreamSecurityReality
-                    && item.PublicKey.IsNullOrEmpty())
-                {
-                    continue;
-                }
-
-                //inbound
-                Inbounds4Ray inbound = new()
-                {
-                    listen = Global.Loopback,
-                    port = port,
-                    protocol = EInboundProtocol.mixed.ToString(),
-                };
-                inbound.tag = inbound.protocol + inbound.port.ToString();
-                v2rayConfig.inbounds.Add(inbound);
-
-                var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
-                await GenOutbound(item, outbound);
-                outbound.tag = Global.ProxyTag + inbound.port.ToString();
-                v2rayConfig.outbounds.Add(outbound);
-
-                //rule
-                RulesItem4Ray rule = new()
-                {
-                    inboundTag = new List<string> { inbound.tag },
-                    outboundTag = outbound.tag,
-                    type = "field"
-                };
-                v2rayConfig.routing.rules.Add(rule);
-            }
-
-            //ret.Msg =string.Format(ResUI.SuccessfulConfiguration"), node.getSummary());
-            ret.Success = true;
-            ret.Data = JsonUtils.Serialize(v2rayConfig);
-            return ret;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-            ret.Msg = ResUI.FailedGenDefaultConfiguration;
-            return ret;
-        }
-    }
-
-    public async Task<RetResult> GenerateClientSpeedtestConfig(ProfileItem node, int port)
-    {
-        var ret = new RetResult();
-        try
-        {
-            if (node is not { Port: > 0 })
-            {
-                ret.Msg = ResUI.CheckServerSettings;
-                return ret;
-            }
-
-            if (node.GetNetwork() is nameof(ETransport.quic))
-            {
-                ret.Msg = ResUI.Incorrectconfiguration + $" - {node.GetNetwork()}";
-                return ret;
-            }
-
-            var result = EmbedUtils.GetEmbedText(Global.V2raySampleClient);
-            if (result.IsNullOrEmpty())
-            {
-                ret.Msg = ResUI.FailedGetDefaultConfiguration;
-                return ret;
-            }
-
-            var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
-            if (v2rayConfig == null)
-            {
-                ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                return ret;
-            }
-
-            await GenLog(v2rayConfig);
-            await GenOutbound(node, v2rayConfig.outbounds.First());
-            await GenMoreOutbounds(node, v2rayConfig);
-
-            v2rayConfig.routing.rules.Clear();
-            v2rayConfig.inbounds.Clear();
-            v2rayConfig.inbounds.Add(new()
-            {
-                tag = $"{EInboundProtocol.socks}{port}",
-                listen = Global.Loopback,
-                port = port,
-                protocol = EInboundProtocol.mixed.ToString(),
-            });
-
-            ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
-            ret.Success = true;
-            ret.Data = JsonUtils.Serialize(v2rayConfig);
-            return ret;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-            ret.Msg = ResUI.FailedGenDefaultConfiguration;
-            return ret;
-        }
-    }
-
-    #endregion public gen function
-
-    #region private gen function
-
-    private async Task<int> GenLog(V2rayConfig v2rayConfig)
-    {
-        try
-        {
-            if (_config.CoreBasicItem.LogEnabled)
-            {
-                var dtNow = DateTime.Now;
-                v2rayConfig.log.loglevel = _config.CoreBasicItem.Loglevel;
-                v2rayConfig.log.access = Utils.GetLogPath($"Vaccess_{dtNow:yyyy-MM-dd}.txt");
-                v2rayConfig.log.error = Utils.GetLogPath($"Verror_{dtNow:yyyy-MM-dd}.txt");
-            }
-            else
-            {
-                v2rayConfig.log.loglevel = _config.CoreBasicItem.Loglevel;
-                v2rayConfig.log.access = null;
-                v2rayConfig.log.error = null;
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return await Task.FromResult(0);
-    }
-
-    private async Task<int> GenInbounds(V2rayConfig v2rayConfig)
-    {
-        try
-        {
-            var listen = "0.0.0.0";
-            v2rayConfig.inbounds = [];
-
-            var inbound = GetInbound(_config.Inbound.First(), EInboundProtocol.socks, true);
-            v2rayConfig.inbounds.Add(inbound);
-
-            if (_config.Inbound.First().SecondLocalPortEnabled)
-            {
-                var inbound2 = GetInbound(_config.Inbound.First(), EInboundProtocol.socks2, true);
-                v2rayConfig.inbounds.Add(inbound2);
-            }
-
-            if (_config.Inbound.First().AllowLANConn)
-            {
-                if (_config.Inbound.First().NewPort4LAN)
-                {
-                    var inbound3 = GetInbound(_config.Inbound.First(), EInboundProtocol.socks3, true);
-                    inbound3.listen = listen;
-                    v2rayConfig.inbounds.Add(inbound3);
-
-                    //auth
-                    if (_config.Inbound.First().User.IsNotEmpty() && _config.Inbound.First().Pass.IsNotEmpty())
-                    {
-                        inbound3.settings.auth = "password";
-                        inbound3.settings.accounts = new List<AccountsItem4Ray> { new AccountsItem4Ray() { user = _config.Inbound.First().User, pass = _config.Inbound.First().Pass } };
-                    }
-                }
-                else
-                {
-                    inbound.listen = listen;
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return await Task.FromResult(0);
-    }
-
-    private Inbounds4Ray GetInbound(InItem inItem, EInboundProtocol protocol, bool bSocks)
-    {
-        string result = EmbedUtils.GetEmbedText(Global.V2raySampleInbound);
-        if (result.IsNullOrEmpty())
-        {
-            return new();
-        }
-
-        var inbound = JsonUtils.Deserialize<Inbounds4Ray>(result);
-        if (inbound == null)
-        {
-            return new();
-        }
-        inbound.tag = protocol.ToString();
-        inbound.port = inItem.LocalPort + (int)protocol;
-        inbound.protocol = EInboundProtocol.mixed.ToString();
-        inbound.settings.udp = inItem.UdpEnabled;
-        inbound.sniffing.enabled = inItem.SniffingEnabled;
-        inbound.sniffing.destOverride = inItem.DestOverride;
-        inbound.sniffing.routeOnly = inItem.RouteOnly;
-
-        return inbound;
-    }
-
-    private async Task<int> GenRouting(V2rayConfig v2rayConfig)
-    {
-        try
-        {
-            if (v2rayConfig.routing?.rules != null)
-            {
-                v2rayConfig.routing.domainStrategy = _config.RoutingBasicItem.DomainStrategy;
-
-                var routing = await ConfigHandler.GetDefaultRouting(_config);
-                if (routing != null)
-                {
-                    if (routing.DomainStrategy.IsNotEmpty())
-                    {
-                        v2rayConfig.routing.domainStrategy = routing.DomainStrategy;
-                    }
-                    var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet);
-                    foreach (var item in rules)
-                    {
-                        if (item.Enabled)
-                        {
-                            var item2 = JsonUtils.Deserialize<RulesItem4Ray>(JsonUtils.Serialize(item));
-                            await GenRoutingUserRule(item2, v2rayConfig);
-                        }
-                    }
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return 0;
-    }
-
-    private async Task<int> GenRoutingUserRule(RulesItem4Ray? rule, V2rayConfig v2rayConfig)
-    {
-        try
-        {
-            if (rule == null)
-            {
-                return 0;
-            }
-            rule.outboundTag = await GenRoutingUserRuleOutbound(rule.outboundTag, v2rayConfig);
-
-            if (rule.port.IsNullOrEmpty())
-            {
-                rule.port = null;
-            }
-            if (rule.network.IsNullOrEmpty())
-            {
-                rule.network = null;
-            }
-            if (rule.domain?.Count == 0)
-            {
-                rule.domain = null;
-            }
-            if (rule.ip?.Count == 0)
-            {
-                rule.ip = null;
-            }
-            if (rule.protocol?.Count == 0)
-            {
-                rule.protocol = null;
-            }
-            if (rule.inboundTag?.Count == 0)
-            {
-                rule.inboundTag = null;
-            }
-
-            var hasDomainIp = false;
-            if (rule.domain?.Count > 0)
-            {
-                var it = JsonUtils.DeepCopy(rule);
-                it.ip = null;
-                it.type = "field";
-                for (var k = it.domain.Count - 1; k >= 0; k--)
-                {
-                    if (it.domain[k].StartsWith("#"))
-                    {
-                        it.domain.RemoveAt(k);
-                    }
-                    it.domain[k] = it.domain[k].Replace(Global.RoutingRuleComma, ",");
-                }
-                v2rayConfig.routing.rules.Add(it);
-                hasDomainIp = true;
-            }
-            if (rule.ip?.Count > 0)
-            {
-                var it = JsonUtils.DeepCopy(rule);
-                it.domain = null;
-                it.type = "field";
-                v2rayConfig.routing.rules.Add(it);
-                hasDomainIp = true;
-            }
-            if (!hasDomainIp)
-            {
-                if (rule.port.IsNotEmpty()
-                    || rule.protocol?.Count > 0
-                    || rule.inboundTag?.Count > 0
-                    || rule.network != null
-                    )
-                {
-                    var it = JsonUtils.DeepCopy(rule);
-                    it.type = "field";
-                    v2rayConfig.routing.rules.Add(it);
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return await Task.FromResult(0);
-    }
-
-    private async Task<string?> GenRoutingUserRuleOutbound(string outboundTag, V2rayConfig v2rayConfig)
-    {
-        if (Global.OutboundTags.Contains(outboundTag))
-        {
-            return outboundTag;
-        }
-
-        var node = await AppManager.Instance.GetProfileItemViaRemarks(outboundTag);
-        if (node == null
-            || node.ConfigType == EConfigType.Custom
-            || node.ConfigType == EConfigType.Hysteria2
-            || node.ConfigType == EConfigType.TUIC
-            || node.ConfigType == EConfigType.Anytls)
-        {
-            return Global.ProxyTag;
-        }
-
-        var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
-        var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
-        await GenOutbound(node, outbound);
-        outbound.tag = Global.ProxyTag + node.IndexId.ToString();
-        v2rayConfig.outbounds.Add(outbound);
-
-        return outbound.tag;
-    }
-
-    private async Task<int> GenOutbound(ProfileItem node, Outbounds4Ray outbound)
-    {
-        try
-        {
-            var muxEnabled = node.MuxEnabled ?? _config.CoreBasicItem.MuxEnabled;
-            switch (node.ConfigType)
-            {
-                case EConfigType.VMess:
-                    {
-                        VnextItem4Ray vnextItem;
-                        if (outbound.settings.vnext.Count <= 0)
-                        {
-                            vnextItem = new VnextItem4Ray();
-                            outbound.settings.vnext.Add(vnextItem);
-                        }
-                        else
-                        {
-                            vnextItem = outbound.settings.vnext.First();
-                        }
-                        vnextItem.address = node.Address;
-                        vnextItem.port = node.Port;
-
-                        UsersItem4Ray usersItem;
-                        if (vnextItem.users.Count <= 0)
-                        {
-                            usersItem = new UsersItem4Ray();
-                            vnextItem.users.Add(usersItem);
-                        }
-                        else
-                        {
-                            usersItem = vnextItem.users.First();
-                        }
-
-                        usersItem.id = node.Id;
-                        usersItem.alterId = node.AlterId;
-                        usersItem.email = Global.UserEMail;
-                        if (Global.VmessSecurities.Contains(node.Security))
-                        {
-                            usersItem.security = node.Security;
-                        }
-                        else
-                        {
-                            usersItem.security = Global.DefaultSecurity;
-                        }
-
-                        await GenOutboundMux(node, outbound, muxEnabled, muxEnabled);
-
-                        outbound.settings.servers = null;
-                        break;
-                    }
-                case EConfigType.Shadowsocks:
-                    {
-                        ServersItem4Ray serversItem;
-                        if (outbound.settings.servers.Count <= 0)
-                        {
-                            serversItem = new ServersItem4Ray();
-                            outbound.settings.servers.Add(serversItem);
-                        }
-                        else
-                        {
-                            serversItem = outbound.settings.servers.First();
-                        }
-                        serversItem.address = node.Address;
-                        serversItem.port = node.Port;
-                        serversItem.password = node.Id;
-                        serversItem.method = AppManager.Instance.GetShadowsocksSecurities(node).Contains(node.Security) ? node.Security : "none";
-
-                        serversItem.ota = false;
-                        serversItem.level = 1;
-
-                        await GenOutboundMux(node, outbound);
-
-                        outbound.settings.vnext = null;
-                        break;
-                    }
-                case EConfigType.SOCKS:
-                case EConfigType.HTTP:
-                    {
-                        ServersItem4Ray serversItem;
-                        if (outbound.settings.servers.Count <= 0)
-                        {
-                            serversItem = new ServersItem4Ray();
-                            outbound.settings.servers.Add(serversItem);
-                        }
-                        else
-                        {
-                            serversItem = outbound.settings.servers.First();
-                        }
-                        serversItem.address = node.Address;
-                        serversItem.port = node.Port;
-                        serversItem.method = null;
-                        serversItem.password = null;
-
-                        if (node.Security.IsNotEmpty()
-                            && node.Id.IsNotEmpty())
-                        {
-                            SocksUsersItem4Ray socksUsersItem = new()
-                            {
-                                user = node.Security,
-                                pass = node.Id,
-                                level = 1
-                            };
-
-                            serversItem.users = new List<SocksUsersItem4Ray>() { socksUsersItem };
-                        }
-
-                        await GenOutboundMux(node, outbound);
-
-                        outbound.settings.vnext = null;
-                        break;
-                    }
-                case EConfigType.VLESS:
-                    {
-                        VnextItem4Ray vnextItem;
-                        if (outbound.settings.vnext?.Count <= 0)
-                        {
-                            vnextItem = new VnextItem4Ray();
-                            outbound.settings.vnext.Add(vnextItem);
-                        }
-                        else
-                        {
-                            vnextItem = outbound.settings.vnext.First();
-                        }
-                        vnextItem.address = node.Address;
-                        vnextItem.port = node.Port;
-
-                        UsersItem4Ray usersItem;
-                        if (vnextItem.users.Count <= 0)
-                        {
-                            usersItem = new UsersItem4Ray();
-                            vnextItem.users.Add(usersItem);
-                        }
-                        else
-                        {
-                            usersItem = vnextItem.users.First();
-                        }
-                        usersItem.id = node.Id;
-                        usersItem.email = Global.UserEMail;
-                        usersItem.encryption = node.Security;
-
-                        if (node.Flow.IsNullOrEmpty())
-                        {
-                            await GenOutboundMux(node, outbound, muxEnabled, muxEnabled);
-                        }
-                        else
-                        {
-                            usersItem.flow = node.Flow;
-                            await GenOutboundMux(node, outbound, false, muxEnabled);
-                        }
-                        outbound.settings.servers = null;
-                        break;
-                    }
-                case EConfigType.Trojan:
-                    {
-                        ServersItem4Ray serversItem;
-                        if (outbound.settings.servers.Count <= 0)
-                        {
-                            serversItem = new ServersItem4Ray();
-                            outbound.settings.servers.Add(serversItem);
-                        }
-                        else
-                        {
-                            serversItem = outbound.settings.servers.First();
-                        }
-                        serversItem.address = node.Address;
-                        serversItem.port = node.Port;
-                        serversItem.password = node.Id;
-
-                        serversItem.ota = false;
-                        serversItem.level = 1;
-
-                        await GenOutboundMux(node, outbound);
-
-                        outbound.settings.vnext = null;
-                        break;
-                    }
-                case EConfigType.WireGuard:
-                    {
-                        var peer = new WireguardPeer4Ray
-                        {
-                            publicKey = node.PublicKey,
-                            endpoint = node.Address + ":" + node.Port.ToString()
-                        };
-                        var setting = new Outboundsettings4Ray
-                        {
-                            address = Utils.String2List(node.RequestHost),
-                            secretKey = node.Id,
-                            reserved = Utils.String2List(node.Path)?.Select(int.Parse).ToList(),
-                            mtu = node.ShortId.IsNullOrEmpty() ? Global.TunMtus.First() : node.ShortId.ToInt(),
-                            peers = new List<WireguardPeer4Ray> { peer }
-                        };
-                        outbound.settings = setting;
-                        outbound.settings.vnext = null;
-                        outbound.settings.servers = null;
-                        break;
-                    }
-            }
-
-            outbound.protocol = Global.ProtocolTypes[node.ConfigType];
-            await GenBoundStreamSettings(node, outbound);
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return 0;
-    }
-
-    private async Task<int> GenOutboundMux(ProfileItem node, Outbounds4Ray outbound, bool enabledTCP = false, bool enabledUDP = false)
-    {
-        try
-        {
-            outbound.mux.enabled = false;
-            outbound.mux.concurrency = -1;
-
-            if (enabledTCP)
-            {
-                outbound.mux.enabled = true;
-                outbound.mux.concurrency = _config.Mux4RayItem.Concurrency;
-            }
-            else if (enabledUDP)
-            {
-                outbound.mux.enabled = true;
-                outbound.mux.xudpConcurrency = _config.Mux4RayItem.XudpConcurrency;
-                outbound.mux.xudpProxyUDP443 = _config.Mux4RayItem.XudpProxyUDP443;
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return await Task.FromResult(0);
-    }
-
-    private async Task<int> GenBoundStreamSettings(ProfileItem node, Outbounds4Ray outbound)
-    {
-        try
-        {
-            var streamSettings = outbound.streamSettings;
-            streamSettings.network = node.GetNetwork();
-            var host = node.RequestHost.TrimEx();
-            var path = node.Path.TrimEx();
-            var sni = node.Sni.TrimEx();
-            var useragent = "";
-            if (!_config.CoreBasicItem.DefUserAgent.IsNullOrEmpty())
-            {
-                try
-                {
-                    useragent = Global.UserAgentTexts[_config.CoreBasicItem.DefUserAgent];
-                }
-                catch (KeyNotFoundException)
-                {
-                    useragent = _config.CoreBasicItem.DefUserAgent;
-                }
-            }
-
-            //if tls
-            if (node.StreamSecurity == Global.StreamSecurity)
-            {
-                streamSettings.security = node.StreamSecurity;
-
-                TlsSettings4Ray tlsSettings = new()
-                {
-                    allowInsecure = Utils.ToBool(node.AllowInsecure.IsNullOrEmpty() ? _config.CoreBasicItem.DefAllowInsecure.ToString().ToLower() : node.AllowInsecure),
-                    alpn = node.GetAlpn(),
-                    fingerprint = node.Fingerprint.IsNullOrEmpty() ? _config.CoreBasicItem.DefFingerprint : node.Fingerprint
-                };
-                if (sni.IsNotEmpty())
-                {
-                    tlsSettings.serverName = sni;
-                }
-                else if (host.IsNotEmpty())
-                {
-                    tlsSettings.serverName = Utils.String2List(host)?.First();
-                }
-                streamSettings.tlsSettings = tlsSettings;
-            }
-
-            //if Reality
-            if (node.StreamSecurity == Global.StreamSecurityReality)
-            {
-                streamSettings.security = node.StreamSecurity;
-
-                TlsSettings4Ray realitySettings = new()
-                {
-                    fingerprint = node.Fingerprint.IsNullOrEmpty() ? _config.CoreBasicItem.DefFingerprint : node.Fingerprint,
-                    serverName = sni,
-                    publicKey = node.PublicKey,
-                    shortId = node.ShortId,
-                    spiderX = node.SpiderX,
-                    mldsa65Verify = node.Mldsa65Verify,
-                    show = false,
-                };
-
-                streamSettings.realitySettings = realitySettings;
-            }
-
-            //streamSettings
-            switch (node.GetNetwork())
-            {
-                case nameof(ETransport.kcp):
-                    KcpSettings4Ray kcpSettings = new()
-                    {
-                        mtu = _config.KcpItem.Mtu,
-                        tti = _config.KcpItem.Tti
-                    };
-
-                    kcpSettings.uplinkCapacity = _config.KcpItem.UplinkCapacity;
-                    kcpSettings.downlinkCapacity = _config.KcpItem.DownlinkCapacity;
-
-                    kcpSettings.congestion = _config.KcpItem.Congestion;
-                    kcpSettings.readBufferSize = _config.KcpItem.ReadBufferSize;
-                    kcpSettings.writeBufferSize = _config.KcpItem.WriteBufferSize;
-                    kcpSettings.header = new Header4Ray
-                    {
-                        type = node.HeaderType,
-                        domain = host.IsNullOrEmpty() ? null : host
-                    };
-                    if (path.IsNotEmpty())
-                    {
-                        kcpSettings.seed = path;
-                    }
-                    streamSettings.kcpSettings = kcpSettings;
-                    break;
-                //ws
-                case nameof(ETransport.ws):
-                    WsSettings4Ray wsSettings = new();
-                    wsSettings.headers = new Headers4Ray();
-
-                    if (host.IsNotEmpty())
-                    {
-                        wsSettings.host = host;
-                        wsSettings.headers.Host = host;
-                    }
-                    if (path.IsNotEmpty())
-                    {
-                        wsSettings.path = path;
-                    }
-                    if (useragent.IsNotEmpty())
-                    {
-                        wsSettings.headers.UserAgent = useragent;
-                    }
-                    streamSettings.wsSettings = wsSettings;
-
-                    break;
-                //httpupgrade
-                case nameof(ETransport.httpupgrade):
-                    HttpupgradeSettings4Ray httpupgradeSettings = new();
-
-                    if (path.IsNotEmpty())
-                    {
-                        httpupgradeSettings.path = path;
-                    }
-                    if (host.IsNotEmpty())
-                    {
-                        httpupgradeSettings.host = host;
-                    }
-                    streamSettings.httpupgradeSettings = httpupgradeSettings;
-
-                    break;
-                //xhttp
-                case nameof(ETransport.xhttp):
-                    streamSettings.network = ETransport.xhttp.ToString();
-                    XhttpSettings4Ray xhttpSettings = new();
-
-                    if (path.IsNotEmpty())
-                    {
-                        xhttpSettings.path = path;
-                    }
-                    if (host.IsNotEmpty())
-                    {
-                        xhttpSettings.host = host;
-                    }
-                    if (node.HeaderType.IsNotEmpty() && Global.XhttpMode.Contains(node.HeaderType))
-                    {
-                        xhttpSettings.mode = node.HeaderType;
-                    }
-                    if (node.Extra.IsNotEmpty())
-                    {
-                        xhttpSettings.extra = JsonUtils.ParseJson(node.Extra);
-                    }
-
-                    streamSettings.xhttpSettings = xhttpSettings;
-                    await GenOutboundMux(node, outbound);
-
-                    break;
-                //h2
-                case nameof(ETransport.h2):
-                    HttpSettings4Ray httpSettings = new();
-
-                    if (host.IsNotEmpty())
-                    {
-                        httpSettings.host = Utils.String2List(host);
-                    }
-                    httpSettings.path = path;
-
-                    streamSettings.httpSettings = httpSettings;
-
-                    break;
-                //quic
-                case nameof(ETransport.quic):
-                    QuicSettings4Ray quicsettings = new()
-                    {
-                        security = host,
-                        key = path,
-                        header = new Header4Ray
-                        {
-                            type = node.HeaderType
-                        }
-                    };
-                    streamSettings.quicSettings = quicsettings;
-                    if (node.StreamSecurity == Global.StreamSecurity)
-                    {
-                        if (sni.IsNotEmpty())
-                        {
-                            streamSettings.tlsSettings.serverName = sni;
-                        }
-                        else
-                        {
-                            streamSettings.tlsSettings.serverName = node.Address;
-                        }
-                    }
-                    break;
-
-                case nameof(ETransport.grpc):
-                    GrpcSettings4Ray grpcSettings = new()
-                    {
-                        authority = host.IsNullOrEmpty() ? null : host,
-                        serviceName = path,
-                        multiMode = node.HeaderType == Global.GrpcMultiMode,
-                        idle_timeout = _config.GrpcItem.IdleTimeout,
-                        health_check_timeout = _config.GrpcItem.HealthCheckTimeout,
-                        permit_without_stream = _config.GrpcItem.PermitWithoutStream,
-                        initial_windows_size = _config.GrpcItem.InitialWindowsSize,
-                    };
-                    streamSettings.grpcSettings = grpcSettings;
-                    break;
-
-                default:
-                    //tcp
-                    if (node.HeaderType == Global.TcpHeaderHttp)
-                    {
-                        TcpSettings4Ray tcpSettings = new()
-                        {
-                            header = new Header4Ray
-                            {
-                                type = node.HeaderType
-                            }
-                        };
-
-                        //request Host
-                        string request = EmbedUtils.GetEmbedText(Global.V2raySampleHttpRequestFileName);
-                        string[] arrHost = host.Split(',');
-                        string host2 = string.Join(",".AppendQuotes(), arrHost);
-                        request = request.Replace("$requestHost$", $"{host2.AppendQuotes()}");
-                        request = request.Replace("$requestUserAgent$", $"{useragent.AppendQuotes()}");
-                        //Path
-                        string pathHttp = @"/";
-                        if (path.IsNotEmpty())
-                        {
-                            string[] arrPath = path.Split(',');
-                            pathHttp = string.Join(",".AppendQuotes(), arrPath);
-                        }
-                        request = request.Replace("$requestPath$", $"{pathHttp.AppendQuotes()}");
-                        tcpSettings.header.request = JsonUtils.Deserialize<object>(request);
-
-                        streamSettings.tcpSettings = tcpSettings;
-                    }
-                    break;
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return 0;
-    }
-
-    private async Task<int> GenDns(ProfileItem? node, V2rayConfig v2rayConfig)
-    {
-        try
-        {
-            var item = await AppManager.Instance.GetDNSItem(ECoreType.Xray);
-            if (item != null && item.Enabled == true)
-            {
-                var result = await GenDnsCompatible(node, v2rayConfig);
-
-                if (v2rayConfig.routing.domainStrategy == Global.IPIfNonMatch)
-                {
-                    // DNS routing
-                    v2rayConfig.dns.tag = Global.DnsTag;
-                    v2rayConfig.routing.rules.Add(new RulesItem4Ray
-                    {
-                        type = "field",
-                        inboundTag = new List<string> { Global.DnsTag },
-                        outboundTag = Global.ProxyTag,
-                    });
-                }
-
-                return result;
-            }
-            var simpleDNSItem = _config.SimpleDNSItem;
-            var domainStrategy4Freedom = simpleDNSItem?.RayStrategy4Freedom;
-
-            //Outbound Freedom domainStrategy
-            if (domainStrategy4Freedom.IsNotEmpty())
-            {
-                var outbound = v2rayConfig.outbounds.FirstOrDefault(t => t is { protocol: "freedom", tag: Global.DirectTag });
-                if (outbound != null)
-                {
-                    outbound.settings = new()
-                    {
-                        domainStrategy = domainStrategy4Freedom,
-                        userLevel = 0
-                    };
-                }
-            }
-
-            await GenDnsServers(node, v2rayConfig, simpleDNSItem);
-            await GenDnsHosts(v2rayConfig, simpleDNSItem);
-
-            if (v2rayConfig.routing.domainStrategy == Global.IPIfNonMatch)
-            {
-                // DNS routing
-                v2rayConfig.dns.tag = Global.DnsTag;
-                v2rayConfig.routing.rules.Add(new RulesItem4Ray
-                {
-                    type = "field",
-                    inboundTag = new List<string> { Global.DnsTag },
-                    outboundTag = Global.ProxyTag,
-                });
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return 0;
-    }
-
-    private async Task<int> GenDnsServers(ProfileItem? node, V2rayConfig v2rayConfig, SimpleDNSItem simpleDNSItem)
-    {
-        static List<string> ParseDnsAddresses(string? dnsInput, string defaultAddress)
-        {
-            var addresses = dnsInput?.Split(dnsInput.Contains(',') ? ',' : ';')
-                .Select(addr => addr.Trim())
-                .Where(addr => !string.IsNullOrEmpty(addr))
-                .Select(addr => addr.StartsWith("dhcp", StringComparison.OrdinalIgnoreCase) ? "localhost" : addr)
-                .Distinct()
-                .ToList() ?? new List<string> { defaultAddress };
-            return addresses.Count > 0 ? addresses : new List<string> { defaultAddress };
-        }
-
-        static object CreateDnsServer(string dnsAddress, List<string> domains, List<string>? expectedIPs = null)
-        {
-            var dnsServer = new DnsServer4Ray
-            {
-                address = dnsAddress,
-                skipFallback = true,
-                domains = domains.Count > 0 ? domains : null,
-                expectedIPs = expectedIPs?.Count > 0 ? expectedIPs : null
-            };
-            return JsonUtils.SerializeToNode(dnsServer, new JsonSerializerOptions
-            {
-                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-            });
-        }
-
-        var directDNSAddress = ParseDnsAddresses(simpleDNSItem?.DirectDNS, Global.DomainDirectDNSAddress.FirstOrDefault());
-        var remoteDNSAddress = ParseDnsAddresses(simpleDNSItem?.RemoteDNS, Global.DomainRemoteDNSAddress.FirstOrDefault());
-
-        var directDomainList = new List<string>();
-        var directGeositeList = new List<string>();
-        var proxyDomainList = new List<string>();
-        var proxyGeositeList = new List<string>();
-        var expectedDomainList = new List<string>();
-        var expectedIPs = new List<string>();
-        var regionNames = new HashSet<string>();
-
-        if (!string.IsNullOrEmpty(simpleDNSItem?.DirectExpectedIPs))
-        {
-            expectedIPs = simpleDNSItem.DirectExpectedIPs
-                .Split(new[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(s => s.Trim())
-                .Where(s => !string.IsNullOrEmpty(s))
-                .ToList();
-
-            foreach (var ip in expectedIPs)
-            {
-                if (ip.StartsWith("geoip:", StringComparison.OrdinalIgnoreCase))
-                {
-                    var region = ip["geoip:".Length..];
-                    if (!string.IsNullOrEmpty(region))
-                    {
-                        regionNames.Add($"geosite:{region}");
-                        regionNames.Add($"geosite:geolocation-{region}");
-                        regionNames.Add($"geosite:tld-{region}");
-                    }
-                }
-            }
-        }
-
-        var routing = await ConfigHandler.GetDefaultRouting(_config);
-        List<RulesItem>? rules = null;
-        if (routing != null)
-        {
-            rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet) ?? [];
-            foreach (var item in rules)
-            {
-                if (!item.Enabled || item.Domain is null || item.Domain.Count == 0)
-                {
-                    continue;
-                }
-
-                foreach (var domain in item.Domain)
-                {
-                    if (domain.StartsWith('#'))
-                        continue;
-                    var normalizedDomain = domain.Replace(Global.RoutingRuleComma, ",");
-
-                    if (item.OutboundTag == Global.DirectTag)
-                    {
-                        if (normalizedDomain.StartsWith("geosite:"))
-                        {
-                            (regionNames.Contains(normalizedDomain) ? expectedDomainList : directGeositeList).Add(normalizedDomain);
-                        }
-                        else
-                        {
-                            directDomainList.Add(normalizedDomain);
-                        }
-                    }
-                    else if (item.OutboundTag != Global.BlockTag)
-                    {
-                        if (normalizedDomain.StartsWith("geosite:"))
-                        {
-                            proxyGeositeList.Add(normalizedDomain);
-                        }
-                        else
-                        {
-                            proxyDomainList.Add(normalizedDomain);
-                        }
-                    }
-                }
-            }
-        }
-
-        if (Utils.IsDomain(node?.Address))
-        {
-            directDomainList.Add(node.Address);
-        }
-
-        if (node?.Subid is not null)
-        {
-            var subItem = await AppManager.Instance.GetSubItem(node.Subid);
-            if (subItem is not null)
-            {
-                foreach (var profile in new[] { subItem.PrevProfile, subItem.NextProfile })
-                {
-                    var profileNode = await AppManager.Instance.GetProfileItemViaRemarks(profile);
-                    if (profileNode is not null &&
-                        profileNode.ConfigType is not (EConfigType.Custom or EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls) &&
-                        Utils.IsDomain(profileNode.Address))
-                    {
-                        directDomainList.Add(profileNode.Address);
-                    }
-                }
-            }
-        }
-
-        v2rayConfig.dns ??= new Dns4Ray();
-        v2rayConfig.dns.servers ??= new List<object>();
-
-        void AddDnsServers(List<string> dnsAddresses, List<string> domains, List<string>? expectedIPs = null)
-        {
-            if (domains.Count > 0)
-            {
-                foreach (var dnsAddress in dnsAddresses)
-                {
-                    v2rayConfig.dns.servers.Add(CreateDnsServer(dnsAddress, domains, expectedIPs));
-                }
-            }
-        }
-
-        AddDnsServers(remoteDNSAddress, proxyDomainList);
-        AddDnsServers(directDNSAddress, directDomainList);
-        AddDnsServers(remoteDNSAddress, proxyGeositeList);
-        AddDnsServers(directDNSAddress, directGeositeList);
-        AddDnsServers(directDNSAddress, expectedDomainList, expectedIPs);
-
-        var useDirectDns = rules?.LastOrDefault() is { } lastRule &&
-                          lastRule.OutboundTag == Global.DirectTag &&
-                          (lastRule.Port == "0-65535" ||
-                           lastRule.Network == "tcp,udp" ||
-                           lastRule.Ip?.Contains("0.0.0.0/0") == true);
-
-        var defaultDnsServers = useDirectDns ? directDNSAddress : remoteDNSAddress;
-        v2rayConfig.dns.servers.AddRange(defaultDnsServers);
-
-        return 0;
-    }
-
-    private async Task<int> GenDnsHosts(V2rayConfig v2rayConfig, SimpleDNSItem simpleDNSItem)
-    {
-        if (simpleDNSItem.AddCommonHosts == false && simpleDNSItem.UseSystemHosts == false && simpleDNSItem.Hosts.IsNullOrEmpty())
-        {
-            return await Task.FromResult(0);
-        }
-        v2rayConfig.dns ??= new Dns4Ray();
-        v2rayConfig.dns.hosts ??= new Dictionary<string, object>();
-        if (simpleDNSItem.AddCommonHosts == true)
-        {
-            v2rayConfig.dns.hosts = Global.PredefinedHosts.ToDictionary(
-                kvp => kvp.Key,
-                kvp => (object)kvp.Value
-            );
-        }
-
-        if (simpleDNSItem.UseSystemHosts == true)
-        {
-            var systemHosts = Utils.GetSystemHosts();
-            if (systemHosts.Count > 0)
-            {
-                var normalHost = v2rayConfig.dns.hosts;
-                if (normalHost != null)
-                {
-                    foreach (var host in systemHosts)
-                    {
-                        if (normalHost[host.Key] != null)
-                        {
-                            continue;
-                        }
-                        normalHost[host.Key] = new List<string> { host.Value };
-                    }
-                }
-            }
-        }
-
-        var userHostsMap = simpleDNSItem.Hosts?
-            .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
-            .Where(line => !string.IsNullOrWhiteSpace(line))
-            .Where(line => line.Contains(' '))
-            .ToDictionary(
-                line =>
-                {
-                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                    return parts[0];
-                },
-                line =>
-                {
-                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                    var values = parts.Skip(1).ToList();
-                    return values;
-                }
-            );
-
-        if (userHostsMap != null)
-        {
-            foreach (var kvp in userHostsMap)
-            {
-                v2rayConfig.dns.hosts[kvp.Key] = kvp.Value;
-            }
-        }
-        return await Task.FromResult(0);
-    }
-
-    private async Task<int> GenDnsCompatible(ProfileItem? node, V2rayConfig v2rayConfig)
-    {
-        try
-        {
-            var item = await AppManager.Instance.GetDNSItem(ECoreType.Xray);
-            var normalDNS = item?.NormalDNS;
-            var domainStrategy4Freedom = item?.DomainStrategy4Freedom;
-            if (normalDNS.IsNullOrEmpty())
-            {
-                normalDNS = EmbedUtils.GetEmbedText(Global.DNSV2rayNormalFileName);
-            }
-
-            //Outbound Freedom domainStrategy
-            if (domainStrategy4Freedom.IsNotEmpty())
-            {
-                var outbound = v2rayConfig.outbounds.FirstOrDefault(t => t is { protocol: "freedom", tag: Global.DirectTag });
-                if (outbound != null)
-                {
-                    outbound.settings = new();
-                    outbound.settings.domainStrategy = domainStrategy4Freedom;
-                    outbound.settings.userLevel = 0;
-                }
-            }
-
-            var obj = JsonUtils.ParseJson(normalDNS);
-            if (obj is null)
-            {
-                List<string> servers = [];
-                string[] arrDNS = normalDNS.Split(',');
-                foreach (string str in arrDNS)
-                {
-                    servers.Add(str);
-                }
-                obj = JsonUtils.ParseJson("{}");
-                obj["servers"] = JsonUtils.SerializeToNode(servers);
-            }
-
-            // Append to dns settings
-            if (item.UseSystemHosts)
-            {
-                var systemHosts = Utils.GetSystemHosts();
-                if (systemHosts.Count > 0)
-                {
-                    var normalHost1 = obj["hosts"];
-                    if (normalHost1 != null)
-                    {
-                        foreach (var host in systemHosts)
-                        {
-                            if (normalHost1[host.Key] != null)
-                                continue;
-                            normalHost1[host.Key] = host.Value;
-                        }
-                    }
-                }
-            }
-            var normalHost = obj["hosts"];
-            if (normalHost != null)
-            {
-                foreach (var hostProp in normalHost.AsObject().ToList())
-                {
-                    if (hostProp.Value is JsonValue value && value.TryGetValue<string>(out var ip))
-                    {
-                        normalHost[hostProp.Key] = new JsonArray(ip);
-                    }
-                }
-            }
-
-            await GenDnsDomainsCompatible(node, obj, item);
-
-            v2rayConfig.dns = JsonUtils.Deserialize<Dns4Ray>(JsonUtils.Serialize(obj));
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return 0;
-    }
-
-    private async Task<int> GenDnsDomainsCompatible(ProfileItem? node, JsonNode dns, DNSItem? dNSItem)
-    {
-        if (node == null)
-        {
-            return 0;
-        }
-        var servers = dns["servers"];
-        if (servers != null)
-        {
-            var domainList = new List<string>();
-            if (Utils.IsDomain(node.Address))
-            {
-                domainList.Add(node.Address);
-            }
-            var subItem = await AppManager.Instance.GetSubItem(node.Subid);
-            if (subItem is not null)
-            {
-                // Previous proxy
-                var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
-                if (prevNode is not null
-                    && prevNode.ConfigType != EConfigType.Custom
-                    && prevNode.ConfigType != EConfigType.Hysteria2
-                    && prevNode.ConfigType != EConfigType.TUIC
-                    && Utils.IsDomain(prevNode.Address))
-                {
-                    domainList.Add(prevNode.Address);
-                }
-
-                // Next proxy
-                var nextNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
-                if (nextNode is not null
-                    && nextNode.ConfigType != EConfigType.Custom
-                    && nextNode.ConfigType != EConfigType.Hysteria2
-                    && nextNode.ConfigType != EConfigType.TUIC
-                    && Utils.IsDomain(nextNode.Address))
-                {
-                    domainList.Add(nextNode.Address);
-                }
-            }
-            if (domainList.Count > 0)
-            {
-                var dnsServer = new DnsServer4Ray()
-                {
-                    address = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainPureIPDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress,
-                    skipFallback = true,
-                    domains = domainList
-                };
-                servers.AsArray().Add(JsonUtils.SerializeToNode(dnsServer));
-            }
-        }
-        return await Task.FromResult(0);
-    }
-
-    private async Task<int> GenStatistic(V2rayConfig v2rayConfig)
-    {
-        if (_config.GuiItem.EnableStatistics || _config.GuiItem.DisplayRealTimeSpeed)
-        {
-            string tag = EInboundProtocol.api.ToString();
-            Metrics4Ray apiObj = new();
-            Policy4Ray policyObj = new();
-            SystemPolicy4Ray policySystemSetting = new();
-
-            v2rayConfig.stats = new Stats4Ray();
-
-            apiObj.tag = tag;
-            v2rayConfig.metrics = apiObj;
-
-            policySystemSetting.statsOutboundDownlink = true;
-            policySystemSetting.statsOutboundUplink = true;
-            policyObj.system = policySystemSetting;
-            v2rayConfig.policy = policyObj;
-
-            if (!v2rayConfig.inbounds.Exists(item => item.tag == tag))
-            {
-                Inbounds4Ray apiInbound = new();
-                Inboundsettings4Ray apiInboundSettings = new();
-                apiInbound.tag = tag;
-                apiInbound.listen = Global.Loopback;
-                apiInbound.port = AppManager.Instance.StatePort;
-                apiInbound.protocol = Global.InboundAPIProtocol;
-                apiInboundSettings.address = Global.Loopback;
-                apiInbound.settings = apiInboundSettings;
-                v2rayConfig.inbounds.Add(apiInbound);
-            }
-
-            if (!v2rayConfig.routing.rules.Exists(item => item.outboundTag == tag))
-            {
-                RulesItem4Ray apiRoutingRule = new()
-                {
-                    inboundTag = new List<string> { tag },
-                    outboundTag = tag,
-                    type = "field"
-                };
-
-                v2rayConfig.routing.rules.Add(apiRoutingRule);
-            }
-        }
-        return await Task.FromResult(0);
-    }
-
-    private async Task<int> GenMoreOutbounds(ProfileItem node, V2rayConfig v2rayConfig)
-    {
-        //fragment proxy
-        if (_config.CoreBasicItem.EnableFragment
-            && v2rayConfig.outbounds.First().streamSettings?.security.IsNullOrEmpty() == false)
-        {
-            var fragmentOutbound = new Outbounds4Ray
-            {
-                protocol = "freedom",
-                tag = $"{Global.ProxyTag}3",
-                settings = new()
-                {
-                    fragment = new()
-                    {
-                        packets = _config.Fragment4RayItem?.Packets,
-                        length = _config.Fragment4RayItem?.Length,
-                        interval = _config.Fragment4RayItem?.Interval
-                    }
-                }
-            };
-
-            v2rayConfig.outbounds.Add(fragmentOutbound);
-            v2rayConfig.outbounds.First().streamSettings.sockopt = new()
-            {
-                dialerProxy = fragmentOutbound.tag
-            };
-            return 0;
-        }
-
-        if (node.Subid.IsNullOrEmpty())
-        {
-            return 0;
-        }
-        try
-        {
-            var subItem = await AppManager.Instance.GetSubItem(node.Subid);
-            if (subItem is null)
-            {
-                return 0;
-            }
-
-            //current proxy
-            var outbound = v2rayConfig.outbounds.First();
-            var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
-
-            //Previous proxy
-            var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
-            string? prevOutboundTag = null;
-            if (prevNode is not null
-                && prevNode.ConfigType != EConfigType.Custom
-                && prevNode.ConfigType != EConfigType.Hysteria2
-                && prevNode.ConfigType != EConfigType.TUIC
-                && prevNode.ConfigType != EConfigType.Anytls)
-            {
-                var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
-                await GenOutbound(prevNode, prevOutbound);
-                prevOutboundTag = $"prev-{Global.ProxyTag}";
-                prevOutbound.tag = prevOutboundTag;
-                v2rayConfig.outbounds.Add(prevOutbound);
-            }
-            var nextOutbound = await GenChainOutbounds(subItem, outbound, prevOutboundTag);
-
-            if (nextOutbound is not null)
-            {
-                v2rayConfig.outbounds.Insert(0, nextOutbound);
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-
-        return 0;
-    }
-
-    private async Task<int> GenOutboundsList(List<ProfileItem> nodes, V2rayConfig v2rayConfig)
-    {
-        try
-        {
-            // Get template and initialize list
-            var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
-            if (txtOutbound.IsNullOrEmpty())
-            {
-                return 0;
-            }
-
-            var resultOutbounds = new List<Outbounds4Ray>();
-            var prevOutbounds = new List<Outbounds4Ray>(); // Separate list for prev outbounds and fragment
-
-            // Cache for chain proxies to avoid duplicate generation
-            var nextProxyCache = new Dictionary<string, Outbounds4Ray?>();
-            var prevProxyTags = new Dictionary<string, string?>(); // Map from profile name to tag
-            int prevIndex = 0; // Index for prev outbounds
-
-            // Process nodes
-            int index = 0;
-            foreach (var node in nodes)
-            {
-                index++;
-
-                // Handle proxy chain
-                string? prevTag = null;
-                var currentOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
-                var nextOutbound = nextProxyCache.GetValueOrDefault(node.Subid, null);
-                if (nextOutbound != null)
-                {
-                    nextOutbound = JsonUtils.DeepCopy(nextOutbound);
-                }
-
-                var subItem = await AppManager.Instance.GetSubItem(node.Subid);
-
-                // current proxy
-                await GenOutbound(node, currentOutbound);
-                currentOutbound.tag = $"{Global.ProxyTag}-{index}";
-
-                if (!node.Subid.IsNullOrEmpty())
-                {
-                    if (prevProxyTags.TryGetValue(node.Subid, out var value))
-                    {
-                        prevTag = value; // maybe null
-                    }
-                    else
-                    {
-                        var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
-                        if (prevNode is not null
-                            && prevNode.ConfigType != EConfigType.Custom
-                            && prevNode.ConfigType != EConfigType.Hysteria2
-                            && prevNode.ConfigType != EConfigType.TUIC
-                            && prevNode.ConfigType != EConfigType.Anytls)
-                        {
-                            var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
-                            await GenOutbound(prevNode, prevOutbound);
-                            prevTag = $"prev-{Global.ProxyTag}-{++prevIndex}";
-                            prevOutbound.tag = prevTag;
-                            prevOutbounds.Add(prevOutbound);
-                        }
-                        prevProxyTags[node.Subid] = prevTag;
-                    }
-
-                    nextOutbound = await GenChainOutbounds(subItem, currentOutbound, prevTag, nextOutbound);
-                    if (!nextProxyCache.ContainsKey(node.Subid))
-                    {
-                        nextProxyCache[node.Subid] = nextOutbound;
-                    }
-                }
-
-                if (nextOutbound is not null)
-                {
-                    resultOutbounds.Add(nextOutbound);
-                }
-                resultOutbounds.Add(currentOutbound);
-            }
-
-            // Merge results: first the main chain outbounds, then other outbounds, and finally utility outbounds
-            resultOutbounds.AddRange(prevOutbounds);
-            resultOutbounds.AddRange(v2rayConfig.outbounds);
-            v2rayConfig.outbounds = resultOutbounds;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-
-        return 0;
-    }
-
-    /// <summary>
-    /// Generates a chained outbound configuration for the given subItem and outbound.
-    /// The outbound's tag must be set before calling this method.
-    /// Returns the next proxy's outbound configuration, which may be null if no next proxy exists.
-    /// </summary>
-    /// <param name="subItem">The subscription item containing proxy chain information.</param>
-    /// <param name="outbound">The current outbound configuration. Its tag must be set before calling this method.</param>
-    /// <param name="prevOutboundTag">The tag of the previous outbound in the chain, if any.</param>
-    /// <param name="nextOutbound">The outbound for the next proxy in the chain, if already created. If null, will be created inside.</param>
-    /// <returns>
-    /// The outbound configuration for the next proxy in the chain, or null if no next proxy exists.
-    /// </returns>
-    private async Task<Outbounds4Ray?> GenChainOutbounds(SubItem subItem, Outbounds4Ray outbound, string? prevOutboundTag, Outbounds4Ray? nextOutbound = null)
-    {
-        try
-        {
-            var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
-
-            if (!prevOutboundTag.IsNullOrEmpty())
-            {
-                outbound.streamSettings.sockopt = new()
-                {
-                    dialerProxy = prevOutboundTag
-                };
-            }
-
-            // Next proxy
-            var nextNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
-            if (nextNode is not null
-                && nextNode.ConfigType != EConfigType.Custom
-                && nextNode.ConfigType != EConfigType.Hysteria2
-                && nextNode.ConfigType != EConfigType.TUIC
-                && nextNode.ConfigType != EConfigType.Anytls)
-            {
-                if (nextOutbound == null)
-                {
-                    nextOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
-                    await GenOutbound(nextNode, nextOutbound);
-                }
-                nextOutbound.tag = outbound.tag;
-
-                outbound.tag = $"mid-{outbound.tag}";
-                nextOutbound.streamSettings.sockopt = new()
-                {
-                    dialerProxy = outbound.tag
-                };
-            }
-            return nextOutbound;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-        return null;
-    }
-
-    private async Task<int> GenBalancer(V2rayConfig v2rayConfig, EMultipleLoad multipleLoad)
-    {
-        if (multipleLoad == EMultipleLoad.LeastPing)
-        {
-            var observatory = new Observatory4Ray
-            {
-                subjectSelector = [Global.ProxyTag],
-                probeUrl = AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl,
-                probeInterval = "3m",
-                enableConcurrency = true,
-            };
-            v2rayConfig.observatory = observatory;
-        }
-        else if (multipleLoad == EMultipleLoad.LeastLoad)
-        {
-            var burstObservatory = new BurstObservatory4Ray
-            {
-                subjectSelector = [Global.ProxyTag],
-                pingConfig = new()
-                {
-                    destination = AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl,
-                    interval = "5m",
-                    timeout = "30s",
-                    sampling = 2,
-                }
-            };
-            v2rayConfig.burstObservatory = burstObservatory;
-        }
-        var strategyType = multipleLoad switch
-        {
-            EMultipleLoad.Random => "random",
-            EMultipleLoad.RoundRobin => "roundRobin",
-            EMultipleLoad.LeastPing => "leastPing",
-            EMultipleLoad.LeastLoad => "leastLoad",
-            _ => "roundRobin",
-        };
-        var balancer = new BalancersItem4Ray
-        {
-            selector = [Global.ProxyTag],
-            strategy = new() { type = strategyType },
-            tag = $"{Global.ProxyTag}-round",
-        };
-        v2rayConfig.routing.balancers = [balancer];
-        return await Task.FromResult(0);
-    }
-
-    private async Task<string> ApplyFullConfigTemplate(V2rayConfig v2rayConfig, bool handleBalancerAndRules = false)
-    {
-        var fullConfigTemplate = await AppManager.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
-        if (fullConfigTemplate == null || !fullConfigTemplate.Enabled || fullConfigTemplate.Config.IsNullOrEmpty())
-        {
-            return JsonUtils.Serialize(v2rayConfig);
-        }
-
-        var fullConfigTemplateNode = JsonNode.Parse(fullConfigTemplate.Config);
-        if (fullConfigTemplateNode == null)
-        {
-            return JsonUtils.Serialize(v2rayConfig);
-        }
-
-        // Handle balancer and rules modifications (for multiple load scenarios)
-        if (handleBalancerAndRules && v2rayConfig.routing?.balancers?.Count > 0)
-        {
-            var balancer = v2rayConfig.routing.balancers.First();
-
-            // Modify existing rules in custom config
-            var rulesNode = fullConfigTemplateNode["routing"]?["rules"];
-            if (rulesNode != null)
-            {
-                foreach (var rule in rulesNode.AsArray())
-                {
-                    if (rule["outboundTag"]?.GetValue<string>() == Global.ProxyTag)
-                    {
-                        rule.AsObject().Remove("outboundTag");
-                        rule["balancerTag"] = balancer.tag;
-                    }
-                }
-            }
-
-            // Ensure routing node exists
-            if (fullConfigTemplateNode["routing"] == null)
-            {
-                fullConfigTemplateNode["routing"] = new JsonObject();
-            }
-
-            // Handle balancers - append instead of override
-            if (fullConfigTemplateNode["routing"]["balancers"] is JsonArray customBalancersNode)
-            {
-                if (JsonNode.Parse(JsonUtils.Serialize(v2rayConfig.routing.balancers)) is JsonArray newBalancers)
-                {
-                    foreach (var balancerNode in newBalancers)
-                    {
-                        customBalancersNode.Add(balancerNode?.DeepClone());
-                    }
-                }
-            }
-            else
-            {
-                fullConfigTemplateNode["routing"]["balancers"] = JsonNode.Parse(JsonUtils.Serialize(v2rayConfig.routing.balancers));
-            }
-        }
-
-        // Handle outbounds - append instead of override
-        var customOutboundsNode = fullConfigTemplateNode["outbounds"] is JsonArray outbounds ? outbounds : new JsonArray();
-        foreach (var outbound in v2rayConfig.outbounds)
-        {
-            if (outbound.protocol.ToLower() is "blackhole" or "dns" or "freedom")
-            {
-                if (fullConfigTemplate.AddProxyOnly == true)
-                {
-                    continue;
-                }
-            }
-            else if ((outbound.streamSettings?.sockopt?.dialerProxy.IsNullOrEmpty() == true) && (!fullConfigTemplate.ProxyDetour.IsNullOrEmpty()) && !(Utils.IsPrivateNetwork(outbound.settings?.servers?.FirstOrDefault()?.address ?? string.Empty) || Utils.IsPrivateNetwork(outbound.settings?.vnext?.FirstOrDefault()?.address ?? string.Empty)))
-            {
-                outbound.streamSettings ??= new StreamSettings4Ray();
-                outbound.streamSettings.sockopt ??= new Sockopt4Ray();
-                outbound.streamSettings.sockopt.dialerProxy = fullConfigTemplate.ProxyDetour;
-            }
-            customOutboundsNode.Add(JsonUtils.DeepCopy(outbound));
-        }
-        fullConfigTemplateNode["outbounds"] = customOutboundsNode;
-
-        return await Task.FromResult(JsonUtils.Serialize(fullConfigTemplateNode));
-    }
-
-    #endregion private gen function
-}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs
new file mode 100644
index 00000000..7c41418c
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs
@@ -0,0 +1,522 @@
+using System.Net;
+using System.Net.NetworkInformation;
+
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigSingboxService(Config config)
+{
+    private readonly Config _config = config;
+    private static readonly string _tag = "CoreConfigSingboxService";
+
+    #region public gen function
+
+    public async Task<RetResult> GenerateClientConfigContent(ProfileItem node)
+    {
+        var ret = new RetResult();
+        try
+        {
+            if (node == null
+                || node.Port <= 0)
+            {
+                ret.Msg = ResUI.CheckServerSettings;
+                return ret;
+            }
+            if (node.GetNetwork() is nameof(ETransport.kcp) or nameof(ETransport.xhttp))
+            {
+                ret.Msg = ResUI.Incorrectconfiguration + $" - {node.GetNetwork()}";
+                return ret;
+            }
+
+            ret.Msg = ResUI.InitialConfiguration;
+
+            var result = EmbedUtils.GetEmbedText(Global.SingboxSampleClient);
+            if (result.IsNullOrEmpty())
+            {
+                ret.Msg = ResUI.FailedGetDefaultConfiguration;
+                return ret;
+            }
+
+            var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
+            if (singboxConfig == null)
+            {
+                ret.Msg = ResUI.FailedGenDefaultConfiguration;
+                return ret;
+            }
+
+            await GenLog(singboxConfig);
+
+            await GenInbounds(singboxConfig);
+
+            if (node.ConfigType == EConfigType.WireGuard)
+            {
+                singboxConfig.outbounds.RemoveAt(0);
+                var endpoints = new Endpoints4Sbox();
+                await GenEndpoint(node, endpoints);
+                endpoints.tag = Global.ProxyTag;
+                singboxConfig.endpoints = new() { endpoints };
+            }
+            else
+            {
+                await GenOutbound(node, singboxConfig.outbounds.First());
+            }
+
+            await GenMoreOutbounds(node, singboxConfig);
+
+            await GenRouting(singboxConfig);
+
+            await GenDns(singboxConfig);
+
+            await GenExperimental(singboxConfig);
+
+            await ConvertGeo2Ruleset(singboxConfig);
+
+            ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
+            ret.Success = true;
+
+            ret.Data = await ApplyFullConfigTemplate(singboxConfig);
+            return ret;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            ret.Msg = ResUI.FailedGenDefaultConfiguration;
+            return ret;
+        }
+    }
+
+    public async Task<RetResult> GenerateClientSpeedtestConfig(List<ServerTestItem> selecteds)
+    {
+        var ret = new RetResult();
+        try
+        {
+            if (_config == null)
+            {
+                ret.Msg = ResUI.CheckServerSettings;
+                return ret;
+            }
+
+            ret.Msg = ResUI.InitialConfiguration;
+
+            var result = EmbedUtils.GetEmbedText(Global.SingboxSampleClient);
+            var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
+            if (result.IsNullOrEmpty() || txtOutbound.IsNullOrEmpty())
+            {
+                ret.Msg = ResUI.FailedGetDefaultConfiguration;
+                return ret;
+            }
+
+            var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
+            if (singboxConfig == null)
+            {
+                ret.Msg = ResUI.FailedGenDefaultConfiguration;
+                return ret;
+            }
+            List<IPEndPoint> lstIpEndPoints = new();
+            List<TcpConnectionInformation> lstTcpConns = new();
+            try
+            {
+                lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
+                lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
+                lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(_tag, ex);
+            }
+
+            await GenLog(singboxConfig);
+            //GenDns(new(), singboxConfig);
+            singboxConfig.inbounds.Clear();
+            singboxConfig.outbounds.RemoveAt(0);
+
+            var initPort = AppManager.Instance.GetLocalPort(EInboundProtocol.speedtest);
+
+            foreach (var it in selecteds)
+            {
+                if (it.ConfigType == EConfigType.Custom)
+                {
+                    continue;
+                }
+                if (it.Port <= 0)
+                {
+                    continue;
+                }
+                var item = await AppManager.Instance.GetProfileItem(it.IndexId);
+                if (it.ConfigType is EConfigType.VMess or EConfigType.VLESS)
+                {
+                    if (item is null || item.Id.IsNullOrEmpty() || !Utils.IsGuidByParse(item.Id))
+                    {
+                        continue;
+                    }
+                }
+
+                //find unused port
+                var port = initPort;
+                for (var k = initPort; k < Global.MaxPort; k++)
+                {
+                    if (lstIpEndPoints?.FindIndex(_it => _it.Port == k) >= 0)
+                    {
+                        continue;
+                    }
+                    if (lstTcpConns?.FindIndex(_it => _it.LocalEndPoint.Port == k) >= 0)
+                    {
+                        continue;
+                    }
+                    //found
+                    port = k;
+                    initPort = port + 1;
+                    break;
+                }
+
+                //Port In Used
+                if (lstIpEndPoints?.FindIndex(_it => _it.Port == port) >= 0)
+                {
+                    continue;
+                }
+                it.Port = port;
+                it.AllowTest = true;
+
+                //inbound
+                Inbound4Sbox inbound = new()
+                {
+                    listen = Global.Loopback,
+                    listen_port = port,
+                    type = EInboundProtocol.mixed.ToString(),
+                };
+                inbound.tag = inbound.type + inbound.listen_port.ToString();
+                singboxConfig.inbounds.Add(inbound);
+
+                //outbound
+                if (item is null)
+                {
+                    continue;
+                }
+                if (item.ConfigType == EConfigType.Shadowsocks
+                    && !Global.SsSecuritiesInSingbox.Contains(item.Security))
+                {
+                    continue;
+                }
+                if (item.ConfigType == EConfigType.VLESS
+                 && !Global.Flows.Contains(item.Flow))
+                {
+                    continue;
+                }
+                if (it.ConfigType is EConfigType.VLESS or EConfigType.Trojan
+                    && item.StreamSecurity == Global.StreamSecurityReality
+                    && item.PublicKey.IsNullOrEmpty())
+                {
+                    continue;
+                }
+
+                var server = await GenServer(item);
+                if (server is null)
+                {
+                    ret.Msg = ResUI.FailedGenDefaultConfiguration;
+                    return ret;
+                }
+                var tag = Global.ProxyTag + inbound.listen_port.ToString();
+                server.tag = tag;
+                if (server is Endpoints4Sbox endpoint)
+                {
+                    singboxConfig.endpoints ??= new();
+                    singboxConfig.endpoints.Add(endpoint);
+                }
+                else if (server is Outbound4Sbox outbound)
+                {
+                    singboxConfig.outbounds.Add(outbound);
+                }
+
+                //rule
+                Rule4Sbox rule = new()
+                {
+                    inbound = new List<string> { inbound.tag },
+                    outbound = tag
+                };
+                singboxConfig.route.rules.Add(rule);
+            }
+
+            var rawDNSItem = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
+            if (rawDNSItem != null && rawDNSItem.Enabled == true)
+            {
+                await GenDnsDomainsCompatible(singboxConfig, rawDNSItem);
+            }
+            else
+            {
+                await GenDnsDomains(singboxConfig, _config.SimpleDNSItem);
+            }
+            singboxConfig.route.default_domain_resolver = new()
+            {
+                server = Global.SingboxFinalResolverTag
+            };
+
+            ret.Success = true;
+            ret.Data = JsonUtils.Serialize(singboxConfig);
+            return ret;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            ret.Msg = ResUI.FailedGenDefaultConfiguration;
+            return ret;
+        }
+    }
+
+    public async Task<RetResult> GenerateClientSpeedtestConfig(ProfileItem node, int port)
+    {
+        var ret = new RetResult();
+        try
+        {
+            if (node is not { Port: > 0 })
+            {
+                ret.Msg = ResUI.CheckServerSettings;
+                return ret;
+            }
+            if (node.GetNetwork() is nameof(ETransport.kcp) or nameof(ETransport.xhttp))
+            {
+                ret.Msg = ResUI.Incorrectconfiguration + $" - {node.GetNetwork()}";
+                return ret;
+            }
+
+            ret.Msg = ResUI.InitialConfiguration;
+
+            var result = EmbedUtils.GetEmbedText(Global.SingboxSampleClient);
+            if (result.IsNullOrEmpty())
+            {
+                ret.Msg = ResUI.FailedGetDefaultConfiguration;
+                return ret;
+            }
+
+            var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
+            if (singboxConfig == null)
+            {
+                ret.Msg = ResUI.FailedGenDefaultConfiguration;
+                return ret;
+            }
+
+            await GenLog(singboxConfig);
+            if (node.ConfigType == EConfigType.WireGuard)
+            {
+                singboxConfig.outbounds.RemoveAt(0);
+                var endpoints = new Endpoints4Sbox();
+                await GenEndpoint(node, endpoints);
+                endpoints.tag = Global.ProxyTag;
+                singboxConfig.endpoints = new() { endpoints };
+            }
+            else
+            {
+                await GenOutbound(node, singboxConfig.outbounds.First());
+            }
+            await GenMoreOutbounds(node, singboxConfig);
+            var item = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
+            if (item != null && item.Enabled == true)
+            {
+                await GenDnsDomainsCompatible(singboxConfig, item);
+            }
+            else
+            {
+                await GenDnsDomains(singboxConfig, _config.SimpleDNSItem);
+            }
+            singboxConfig.route.default_domain_resolver = new()
+            {
+                server = Global.SingboxFinalResolverTag
+            };
+
+            singboxConfig.route.rules.Clear();
+            singboxConfig.inbounds.Clear();
+            singboxConfig.inbounds.Add(new()
+            {
+                tag = $"{EInboundProtocol.mixed}{port}",
+                listen = Global.Loopback,
+                listen_port = port,
+                type = EInboundProtocol.mixed.ToString(),
+            });
+
+            ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
+            ret.Success = true;
+            ret.Data = JsonUtils.Serialize(singboxConfig);
+            return ret;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            ret.Msg = ResUI.FailedGenDefaultConfiguration;
+            return ret;
+        }
+    }
+
+    public async Task<RetResult> GenerateClientMultipleLoadConfig(List<ProfileItem> selecteds)
+    {
+        var ret = new RetResult();
+        try
+        {
+            if (_config == null)
+            {
+                ret.Msg = ResUI.CheckServerSettings;
+                return ret;
+            }
+
+            ret.Msg = ResUI.InitialConfiguration;
+
+            var result = EmbedUtils.GetEmbedText(Global.SingboxSampleClient);
+            var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
+            if (result.IsNullOrEmpty() || txtOutbound.IsNullOrEmpty())
+            {
+                ret.Msg = ResUI.FailedGetDefaultConfiguration;
+                return ret;
+            }
+
+            var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
+            if (singboxConfig == null)
+            {
+                ret.Msg = ResUI.FailedGenDefaultConfiguration;
+                return ret;
+            }
+
+            await GenLog(singboxConfig);
+            await GenInbounds(singboxConfig);
+            await GenRouting(singboxConfig);
+            await GenExperimental(singboxConfig);
+            singboxConfig.outbounds.RemoveAt(0);
+
+            var proxyProfiles = new List<ProfileItem>();
+            foreach (var it in selecteds)
+            {
+                if (it.ConfigType == EConfigType.Custom)
+                {
+                    continue;
+                }
+                if (it.Port <= 0)
+                {
+                    continue;
+                }
+                var item = await AppManager.Instance.GetProfileItem(it.IndexId);
+                if (item is null)
+                {
+                    continue;
+                }
+                if (it.ConfigType is EConfigType.VMess or EConfigType.VLESS)
+                {
+                    if (item.Id.IsNullOrEmpty() || !Utils.IsGuidByParse(item.Id))
+                    {
+                        continue;
+                    }
+                }
+                if (item.ConfigType == EConfigType.Shadowsocks
+                  && !Global.SsSecuritiesInSingbox.Contains(item.Security))
+                {
+                    continue;
+                }
+                if (item.ConfigType == EConfigType.VLESS && !Global.Flows.Contains(item.Flow))
+                {
+                    continue;
+                }
+
+                //outbound
+                proxyProfiles.Add(item);
+            }
+            if (proxyProfiles.Count <= 0)
+            {
+                ret.Msg = ResUI.FailedGenDefaultConfiguration;
+                return ret;
+            }
+            await GenOutboundsList(proxyProfiles, singboxConfig);
+
+            await GenDns(singboxConfig);
+            await ConvertGeo2Ruleset(singboxConfig);
+
+            ret.Success = true;
+
+            ret.Data = await ApplyFullConfigTemplate(singboxConfig);
+            return ret;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            ret.Msg = ResUI.FailedGenDefaultConfiguration;
+            return ret;
+        }
+    }
+
+    public async Task<RetResult> GenerateClientCustomConfig(ProfileItem node, string? fileName)
+    {
+        var ret = new RetResult();
+        if (node == null || fileName is null)
+        {
+            ret.Msg = ResUI.CheckServerSettings;
+            return ret;
+        }
+
+        ret.Msg = ResUI.InitialConfiguration;
+
+        try
+        {
+            if (node == null)
+            {
+                ret.Msg = ResUI.CheckServerSettings;
+                return ret;
+            }
+
+            if (File.Exists(fileName))
+            {
+                File.Delete(fileName);
+            }
+
+            var addressFileName = node.Address;
+            if (addressFileName.IsNullOrEmpty())
+            {
+                ret.Msg = ResUI.FailedGetDefaultConfiguration;
+                return ret;
+            }
+            if (!File.Exists(addressFileName))
+            {
+                addressFileName = Path.Combine(Utils.GetConfigPath(), addressFileName);
+            }
+            if (!File.Exists(addressFileName))
+            {
+                ret.Msg = ResUI.FailedReadConfiguration + "1";
+                return ret;
+            }
+
+            if (node.Address == Global.CoreMultipleLoadConfigFileName)
+            {
+                var txtFile = File.ReadAllText(addressFileName);
+                var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(txtFile);
+                if (singboxConfig == null)
+                {
+                    File.Copy(addressFileName, fileName);
+                }
+                else
+                {
+                    await GenInbounds(singboxConfig);
+                    await GenExperimental(singboxConfig);
+
+                    var content = JsonUtils.Serialize(singboxConfig, true);
+                    await File.WriteAllTextAsync(fileName, content);
+                }
+            }
+            else
+            {
+                File.Copy(addressFileName, fileName);
+            }
+
+            //check again
+            if (!File.Exists(fileName))
+            {
+                ret.Msg = ResUI.FailedReadConfiguration + "2";
+                return ret;
+            }
+
+            ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
+            ret.Success = true;
+            return ret;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            ret.Msg = ResUI.FailedGenDefaultConfiguration;
+            return ret;
+        }
+    }
+
+    #endregion public gen function
+}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxConfigTemplateService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxConfigTemplateService.cs
new file mode 100644
index 00000000..c6bec22b
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxConfigTemplateService.cs
@@ -0,0 +1,63 @@
+using System.Text.Json.Nodes;
+
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigSingboxService
+{
+    private async Task<string> ApplyFullConfigTemplate(SingboxConfig singboxConfig)
+    {
+        var fullConfigTemplate = await AppManager.Instance.GetFullConfigTemplateItem(ECoreType.sing_box);
+        if (fullConfigTemplate == null || !fullConfigTemplate.Enabled)
+        {
+            return JsonUtils.Serialize(singboxConfig);
+        }
+
+        var fullConfigTemplateItem = _config.TunModeItem.EnableTun ? fullConfigTemplate.TunConfig : fullConfigTemplate.Config;
+        if (fullConfigTemplateItem.IsNullOrEmpty())
+        {
+            return JsonUtils.Serialize(singboxConfig);
+        }
+
+        var fullConfigTemplateNode = JsonNode.Parse(fullConfigTemplateItem);
+        if (fullConfigTemplateNode == null)
+        {
+            return JsonUtils.Serialize(singboxConfig);
+        }
+
+        // Process outbounds
+        var customOutboundsNode = fullConfigTemplateNode["outbounds"] is JsonArray outbounds ? outbounds : new JsonArray();
+        foreach (var outbound in singboxConfig.outbounds)
+        {
+            if (outbound.type.ToLower() is "direct" or "block")
+            {
+                if (fullConfigTemplate.AddProxyOnly == true)
+                {
+                    continue;
+                }
+            }
+            else if (outbound.detour.IsNullOrEmpty() && !fullConfigTemplate.ProxyDetour.IsNullOrEmpty() && !Utils.IsPrivateNetwork(outbound.server ?? string.Empty))
+            {
+                outbound.detour = fullConfigTemplate.ProxyDetour;
+            }
+            customOutboundsNode.Add(JsonUtils.DeepCopy(outbound));
+        }
+        fullConfigTemplateNode["outbounds"] = customOutboundsNode;
+
+        // Process endpoints
+        if (singboxConfig.endpoints != null && singboxConfig.endpoints.Count > 0)
+        {
+            var customEndpointsNode = fullConfigTemplateNode["endpoints"] is JsonArray endpoints ? endpoints : new JsonArray();
+            foreach (var endpoint in singboxConfig.endpoints)
+            {
+                if (endpoint.detour.IsNullOrEmpty() && !fullConfigTemplate.ProxyDetour.IsNullOrEmpty())
+                {
+                    endpoint.detour = fullConfigTemplate.ProxyDetour;
+                }
+                customEndpointsNode.Add(JsonUtils.DeepCopy(endpoint));
+            }
+            fullConfigTemplateNode["endpoints"] = customEndpointsNode;
+        }
+
+        return await Task.FromResult(JsonUtils.Serialize(fullConfigTemplateNode));
+    }
+}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
new file mode 100644
index 00000000..ef22d926
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
@@ -0,0 +1,482 @@
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigSingboxService
+{
+    private async Task<int> GenDns(SingboxConfig singboxConfig)
+    {
+        try
+        {
+            var item = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
+            if (item != null && item.Enabled == true)
+            {
+                return await GenDnsCompatible(singboxConfig);
+            }
+
+            var simpleDNSItem = _config.SimpleDNSItem;
+            await GenDnsServers(singboxConfig, simpleDNSItem);
+            await GenDnsRules(singboxConfig, simpleDNSItem);
+
+            singboxConfig.dns ??= new Dns4Sbox();
+            singboxConfig.dns.independent_cache = true;
+
+            var routing = await ConfigHandler.GetDefaultRouting(_config);
+            var useDirectDns = false;
+            if (routing != null)
+            {
+                var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet) ?? [];
+
+                useDirectDns = rules?.LastOrDefault() is { } lastRule &&
+                                  lastRule.OutboundTag == Global.DirectTag &&
+                                  (lastRule.Port == "0-65535" ||
+                                   lastRule.Network == "tcp,udp" ||
+                                   lastRule.Ip?.Contains("0.0.0.0/0") == true);
+            }
+            singboxConfig.dns.final = useDirectDns ? Global.SingboxDirectDNSTag : Global.SingboxRemoteDNSTag;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return 0;
+    }
+
+    private async Task<int> GenDnsServers(SingboxConfig singboxConfig, SimpleDNSItem simpleDNSItem)
+    {
+        var finalDns = await GenDnsDomains(singboxConfig, simpleDNSItem);
+
+        var directDns = ParseDnsAddress(simpleDNSItem.DirectDNS);
+        directDns.tag = Global.SingboxDirectDNSTag;
+        directDns.domain_resolver = Global.SingboxFinalResolverTag;
+
+        var remoteDns = ParseDnsAddress(simpleDNSItem.RemoteDNS);
+        remoteDns.tag = Global.SingboxRemoteDNSTag;
+        remoteDns.detour = Global.ProxyTag;
+        remoteDns.domain_resolver = Global.SingboxFinalResolverTag;
+
+        var resolverDns = ParseDnsAddress(simpleDNSItem.SingboxOutboundsResolveDNS);
+        resolverDns.tag = Global.SingboxOutboundResolverTag;
+        resolverDns.domain_resolver = Global.SingboxFinalResolverTag;
+
+        var hostsDns = new Server4Sbox
+        {
+            tag = Global.SingboxHostsDNSTag,
+            type = "hosts",
+            predefined = new(),
+        };
+        if (simpleDNSItem.AddCommonHosts == true)
+        {
+            hostsDns.predefined = Global.PredefinedHosts;
+        }
+        var userHostsMap = simpleDNSItem.Hosts?
+            .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
+            .Where(line => !string.IsNullOrWhiteSpace(line))
+            .Where(line => line.Contains(' '))
+            .ToDictionary(
+                line =>
+                {
+                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                    return parts[0];
+                },
+                line =>
+                {
+                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                    var values = parts.Skip(1).ToList();
+                    return values;
+                }
+            );
+
+        if (userHostsMap != null)
+        {
+            foreach (var kvp in userHostsMap)
+            {
+                hostsDns.predefined[kvp.Key] = kvp.Value;
+            }
+        }
+
+        if (simpleDNSItem.UseSystemHosts == true)
+        {
+            var systemHosts = Utils.GetSystemHosts();
+            if (systemHosts.Count > 0)
+            {
+                foreach (var host in systemHosts)
+                {
+                    if (userHostsMap[host.Key] != null)
+                    {
+                        continue;
+                    }
+                    userHostsMap[host.Key] = new List<string> { host.Value };
+                }
+            }
+        }
+
+        foreach (var host in hostsDns.predefined)
+        {
+            if (finalDns.server == host.Key)
+            {
+                finalDns.domain_resolver = Global.SingboxHostsDNSTag;
+            }
+            if (remoteDns.server == host.Key)
+            {
+                remoteDns.domain_resolver = Global.SingboxHostsDNSTag;
+            }
+            if (resolverDns.server == host.Key)
+            {
+                resolverDns.domain_resolver = Global.SingboxHostsDNSTag;
+            }
+            if (directDns.server == host.Key)
+            {
+                directDns.domain_resolver = Global.SingboxHostsDNSTag;
+            }
+        }
+
+        singboxConfig.dns ??= new Dns4Sbox();
+        singboxConfig.dns.servers ??= new List<Server4Sbox>();
+        singboxConfig.dns.servers.Add(remoteDns);
+        singboxConfig.dns.servers.Add(directDns);
+        singboxConfig.dns.servers.Add(resolverDns);
+        singboxConfig.dns.servers.Add(hostsDns);
+
+        // fake ip
+        if (simpleDNSItem.FakeIP == true)
+        {
+            var fakeip = new Server4Sbox
+            {
+                tag = Global.SingboxFakeDNSTag,
+                type = "fakeip",
+                inet4_range = "198.18.0.0/15",
+                inet6_range = "fc00::/18",
+            };
+            singboxConfig.dns.servers.Add(fakeip);
+        }
+
+        return await Task.FromResult(0);
+    }
+
+    private async Task<Server4Sbox> GenDnsDomains(SingboxConfig singboxConfig, SimpleDNSItem? simpleDNSItem)
+    {
+        var finalDns = ParseDnsAddress(simpleDNSItem.SingboxFinalResolveDNS);
+        finalDns.tag = Global.SingboxFinalResolverTag;
+        singboxConfig.dns ??= new Dns4Sbox();
+        singboxConfig.dns.servers ??= new List<Server4Sbox>();
+        singboxConfig.dns.servers.Add(finalDns);
+        return await Task.FromResult(finalDns);
+    }
+
+    private async Task<int> GenDnsRules(SingboxConfig singboxConfig, SimpleDNSItem simpleDNSItem)
+    {
+        singboxConfig.dns ??= new Dns4Sbox();
+        singboxConfig.dns.rules ??= new List<Rule4Sbox>();
+
+        singboxConfig.dns.rules.AddRange(new[]
+            {
+            new Rule4Sbox { ip_accept_any = true, server = Global.SingboxHostsDNSTag },
+            new Rule4Sbox
+            {
+                server = Global.SingboxRemoteDNSTag,
+                strategy = simpleDNSItem.SingboxStrategy4Proxy.IsNullOrEmpty() ? null : simpleDNSItem.SingboxStrategy4Proxy,
+                clash_mode = ERuleMode.Global.ToString()
+            },
+            new Rule4Sbox
+            {
+                server = Global.SingboxDirectDNSTag,
+                strategy = simpleDNSItem.SingboxStrategy4Direct.IsNullOrEmpty() ? null : simpleDNSItem.SingboxStrategy4Direct,
+                clash_mode = ERuleMode.Direct.ToString()
+            }
+        });
+
+        if (simpleDNSItem.BlockBindingQuery == true)
+        {
+            singboxConfig.dns.rules.Add(new()
+            {
+                query_type = new List<int> { 64, 65 },
+                action = "predefined",
+                rcode = "NOTIMP"
+            });
+        }
+
+        var routing = await ConfigHandler.GetDefaultRouting(_config);
+        if (routing == null)
+            return 0;
+
+        var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet) ?? [];
+        var expectedIPCidr = new List<string>();
+        var expectedIPsRegions = new List<string>();
+        var regionNames = new HashSet<string>();
+
+        if (!string.IsNullOrEmpty(simpleDNSItem?.DirectExpectedIPs))
+        {
+            var ipItems = simpleDNSItem.DirectExpectedIPs
+                .Split(new[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(s => s.Trim())
+                .Where(s => !string.IsNullOrEmpty(s))
+                .ToList();
+
+            foreach (var ip in ipItems)
+            {
+                if (ip.StartsWith("geoip:", StringComparison.OrdinalIgnoreCase))
+                {
+                    var region = ip["geoip:".Length..];
+                    if (!string.IsNullOrEmpty(region))
+                    {
+                        expectedIPsRegions.Add(region);
+                        regionNames.Add(region);
+                        regionNames.Add($"geolocation-{region}");
+                        regionNames.Add($"tld-{region}");
+                    }
+                }
+                else
+                {
+                    expectedIPCidr.Add(ip);
+                }
+            }
+        }
+
+        foreach (var item in rules)
+        {
+            if (!item.Enabled || item.Domain is null || item.Domain.Count == 0)
+            {
+                continue;
+            }
+
+            var rule = new Rule4Sbox();
+            var validDomains = item.Domain.Count(it => ParseV2Domain(it, rule));
+            if (validDomains <= 0)
+            {
+                continue;
+            }
+
+            if (item.OutboundTag == Global.DirectTag)
+            {
+                rule.server = Global.SingboxDirectDNSTag;
+                rule.strategy = string.IsNullOrEmpty(simpleDNSItem.SingboxStrategy4Direct) ? null : simpleDNSItem.SingboxStrategy4Direct;
+
+                if (expectedIPsRegions.Count > 0 && rule.geosite?.Count > 0)
+                {
+                    var geositeSet = new HashSet<string>(rule.geosite);
+                    if (regionNames.Intersect(geositeSet).Any())
+                    {
+                        if (expectedIPsRegions.Count > 0)
+                        {
+                            rule.geoip = expectedIPsRegions;
+                        }
+                        if (expectedIPCidr.Count > 0)
+                        {
+                            rule.ip_cidr = expectedIPCidr;
+                        }
+                    }
+                }
+            }
+            else if (item.OutboundTag == Global.BlockTag)
+            {
+                rule.action = "predefined";
+                rule.rcode = "NXDOMAIN";
+            }
+            else
+            {
+                if (simpleDNSItem.FakeIP == true)
+                {
+                    var rule4Fake = JsonUtils.DeepCopy(rule);
+                    rule4Fake.server = Global.SingboxFakeDNSTag;
+                    singboxConfig.dns.rules.Add(rule4Fake);
+                }
+                rule.server = Global.SingboxRemoteDNSTag;
+                rule.strategy = string.IsNullOrEmpty(simpleDNSItem.SingboxStrategy4Proxy) ? null : simpleDNSItem.SingboxStrategy4Proxy;
+            }
+
+            singboxConfig.dns.rules.Add(rule);
+        }
+
+        return 0;
+    }
+
+    private async Task<int> GenDnsCompatible(SingboxConfig singboxConfig)
+    {
+        try
+        {
+            var item = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
+            var strDNS = string.Empty;
+            if (_config.TunModeItem.EnableTun)
+            {
+                strDNS = string.IsNullOrEmpty(item?.TunDNS) ? EmbedUtils.GetEmbedText(Global.TunSingboxDNSFileName) : item?.TunDNS;
+            }
+            else
+            {
+                strDNS = string.IsNullOrEmpty(item?.NormalDNS) ? EmbedUtils.GetEmbedText(Global.DNSSingboxNormalFileName) : item?.NormalDNS;
+            }
+
+            var dns4Sbox = JsonUtils.Deserialize<Dns4Sbox>(strDNS);
+            if (dns4Sbox is null)
+            {
+                return 0;
+            }
+            singboxConfig.dns = dns4Sbox;
+
+            if (dns4Sbox.servers != null && dns4Sbox.servers.Count > 0 && dns4Sbox.servers.First().address.IsNullOrEmpty())
+            {
+                await GenDnsDomainsCompatible(singboxConfig, item);
+            }
+            else
+            {
+                await GenDnsDomainsLegacyCompatible(singboxConfig, item);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return 0;
+    }
+
+    private async Task<int> GenDnsDomainsCompatible(SingboxConfig singboxConfig, DNSItem? dNSItem)
+    {
+        var dns4Sbox = singboxConfig.dns ?? new();
+        dns4Sbox.servers ??= [];
+        dns4Sbox.rules ??= [];
+
+        var tag = Global.SingboxFinalResolverTag;
+        var localDnsAddress = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainPureIPDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress;
+
+        var localDnsServer = ParseDnsAddress(localDnsAddress);
+        localDnsServer.tag = tag;
+
+        dns4Sbox.servers.Add(localDnsServer);
+
+        singboxConfig.dns = dns4Sbox;
+        return await Task.FromResult(0);
+    }
+
+    private async Task<int> GenDnsDomainsLegacyCompatible(SingboxConfig singboxConfig, DNSItem? dNSItem)
+    {
+        var dns4Sbox = singboxConfig.dns ?? new();
+        dns4Sbox.servers ??= [];
+        dns4Sbox.rules ??= [];
+
+        var tag = Global.SingboxFinalResolverTag;
+        dns4Sbox.servers.Add(new()
+        {
+            tag = tag,
+            address = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainPureIPDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress,
+            detour = Global.DirectTag,
+            strategy = string.IsNullOrEmpty(dNSItem?.DomainStrategy4Freedom) ? null : dNSItem?.DomainStrategy4Freedom,
+        });
+        dns4Sbox.rules.Insert(0, new()
+        {
+            server = tag,
+            clash_mode = ERuleMode.Direct.ToString()
+        });
+        dns4Sbox.rules.Insert(0, new()
+        {
+            server = dns4Sbox.servers.Where(t => t.detour == Global.ProxyTag).Select(t => t.tag).FirstOrDefault() ?? "remote",
+            clash_mode = ERuleMode.Global.ToString()
+        });
+
+        var lstDomain = singboxConfig.outbounds
+                       .Where(t => t.server.IsNotEmpty() && Utils.IsDomain(t.server))
+                       .Select(t => t.server)
+                       .Distinct()
+                       .ToList();
+        if (lstDomain != null && lstDomain.Count > 0)
+        {
+            dns4Sbox.rules.Insert(0, new()
+            {
+                server = tag,
+                domain = lstDomain
+            });
+        }
+
+        singboxConfig.dns = dns4Sbox;
+        return await Task.FromResult(0);
+    }
+
+    private static Server4Sbox? ParseDnsAddress(string address)
+    {
+        var addressFirst = address?.Split(address.Contains(',') ? ',' : ';').FirstOrDefault()?.Trim();
+        if (string.IsNullOrEmpty(addressFirst))
+        {
+            return null;
+        }
+
+        var server = new Server4Sbox();
+
+        if (addressFirst is "local" or "localhost")
+        {
+            server.type = "local";
+            return server;
+        }
+
+        if (addressFirst.StartsWith("dhcp://", StringComparison.OrdinalIgnoreCase))
+        {
+            var interface_name = addressFirst.Substring(7);
+            server.type = "dhcp";
+            server.Interface = interface_name == "auto" ? null : interface_name;
+            return server;
+        }
+
+        if (!addressFirst.Contains("://"))
+        {
+            // udp dns
+            server.type = "udp";
+            server.server = addressFirst;
+            return server;
+        }
+
+        try
+        {
+            var protocolEndIndex = addressFirst.IndexOf("://", StringComparison.Ordinal);
+            server.type = addressFirst.Substring(0, protocolEndIndex).ToLower();
+
+            var uri = new Uri(addressFirst);
+            server.server = uri.Host;
+
+            if (!uri.IsDefaultPort)
+            {
+                server.server_port = uri.Port;
+            }
+
+            if ((server.type == "https" || server.type == "h3") && !string.IsNullOrEmpty(uri.AbsolutePath) && uri.AbsolutePath != "/")
+            {
+                server.path = uri.AbsolutePath;
+            }
+        }
+        catch (UriFormatException)
+        {
+            var protocolEndIndex = addressFirst.IndexOf("://", StringComparison.Ordinal);
+            if (protocolEndIndex > 0)
+            {
+                server.type = addressFirst.Substring(0, protocolEndIndex).ToLower();
+                var remaining = addressFirst.Substring(protocolEndIndex + 3);
+
+                var portIndex = remaining.IndexOf(':');
+                var pathIndex = remaining.IndexOf('/');
+
+                if (portIndex > 0)
+                {
+                    server.server = remaining.Substring(0, portIndex);
+                    var portPart = pathIndex > portIndex
+                        ? remaining.Substring(portIndex + 1, pathIndex - portIndex - 1)
+                        : remaining.Substring(portIndex + 1);
+
+                    if (int.TryParse(portPart, out var parsedPort))
+                    {
+                        server.server_port = parsedPort;
+                    }
+                }
+                else if (pathIndex > 0)
+                {
+                    server.server = remaining.Substring(0, pathIndex);
+                }
+                else
+                {
+                    server.server = remaining;
+                }
+
+                if (pathIndex > 0 && (server.type == "https" || server.type == "h3"))
+                {
+                    server.path = remaining.Substring(pathIndex);
+                }
+            }
+        }
+
+        return server;
+    }
+}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxInboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxInboundService.cs
new file mode 100644
index 00000000..c79d5b42
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxInboundService.cs
@@ -0,0 +1,92 @@
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigSingboxService
+{
+    private async Task<int> GenInbounds(SingboxConfig singboxConfig)
+    {
+        try
+        {
+            var listen = "0.0.0.0";
+            singboxConfig.inbounds = [];
+
+            if (!_config.TunModeItem.EnableTun
+                || _config.TunModeItem.EnableTun && _config.TunModeItem.EnableExInbound && _config.RunningCoreType == ECoreType.sing_box)
+            {
+                var inbound = new Inbound4Sbox()
+                {
+                    type = EInboundProtocol.mixed.ToString(),
+                    tag = EInboundProtocol.socks.ToString(),
+                    listen = Global.Loopback,
+                };
+                singboxConfig.inbounds.Add(inbound);
+
+                inbound.listen_port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
+
+                if (_config.Inbound.First().SecondLocalPortEnabled)
+                {
+                    var inbound2 = GetInbound(inbound, EInboundProtocol.socks2, true);
+                    singboxConfig.inbounds.Add(inbound2);
+                }
+
+                if (_config.Inbound.First().AllowLANConn)
+                {
+                    if (_config.Inbound.First().NewPort4LAN)
+                    {
+                        var inbound3 = GetInbound(inbound, EInboundProtocol.socks3, true);
+                        inbound3.listen = listen;
+                        singboxConfig.inbounds.Add(inbound3);
+
+                        //auth
+                        if (_config.Inbound.First().User.IsNotEmpty() && _config.Inbound.First().Pass.IsNotEmpty())
+                        {
+                            inbound3.users = new() { new() { username = _config.Inbound.First().User, password = _config.Inbound.First().Pass } };
+                        }
+                    }
+                    else
+                    {
+                        inbound.listen = listen;
+                    }
+                }
+            }
+
+            if (_config.TunModeItem.EnableTun)
+            {
+                if (_config.TunModeItem.Mtu <= 0)
+                {
+                    _config.TunModeItem.Mtu = Global.TunMtus.First();
+                }
+                if (_config.TunModeItem.Stack.IsNullOrEmpty())
+                {
+                    _config.TunModeItem.Stack = Global.TunStacks.First();
+                }
+
+                var tunInbound = JsonUtils.Deserialize<Inbound4Sbox>(EmbedUtils.GetEmbedText(Global.TunSingboxInboundFileName)) ?? new Inbound4Sbox { };
+                tunInbound.interface_name = Utils.IsOSX() ? $"utun{new Random().Next(99)}" : "singbox_tun";
+                tunInbound.mtu = _config.TunModeItem.Mtu;
+                tunInbound.auto_route = _config.TunModeItem.AutoRoute;
+                tunInbound.strict_route = _config.TunModeItem.StrictRoute;
+                tunInbound.stack = _config.TunModeItem.Stack;
+                if (_config.TunModeItem.EnableIPv6Address == false)
+                {
+                    tunInbound.address = ["172.18.0.1/30"];
+                }
+
+                singboxConfig.inbounds.Add(tunInbound);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return 0;
+    }
+
+    private Inbound4Sbox GetInbound(Inbound4Sbox inItem, EInboundProtocol protocol, bool bSocks)
+    {
+        var inbound = JsonUtils.DeepCopy(inItem);
+        inbound.tag = protocol.ToString();
+        inbound.listen_port = inItem.listen_port + (int)protocol;
+        inbound.type = EInboundProtocol.mixed.ToString();
+        return inbound;
+    }
+}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxLogService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxLogService.cs
new file mode 100644
index 00000000..59e65471
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxLogService.cs
@@ -0,0 +1,40 @@
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigSingboxService
+{
+    private async Task<int> GenLog(SingboxConfig singboxConfig)
+    {
+        try
+        {
+            switch (_config.CoreBasicItem.Loglevel)
+            {
+                case "debug":
+                case "info":
+                case "error":
+                    singboxConfig.log.level = _config.CoreBasicItem.Loglevel;
+                    break;
+
+                case "warning":
+                    singboxConfig.log.level = "warn";
+                    break;
+
+                default:
+                    break;
+            }
+            if (_config.CoreBasicItem.Loglevel == Global.None)
+            {
+                singboxConfig.log.disabled = true;
+            }
+            if (_config.CoreBasicItem.LogEnabled)
+            {
+                var dtNow = DateTime.Now;
+                singboxConfig.log.output = Utils.GetLogPath($"sbox_{dtNow:yyyy-MM-dd}.txt");
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return await Task.FromResult(0);
+    }
+}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs
new file mode 100644
index 00000000..5c48c014
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs
@@ -0,0 +1,577 @@
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigSingboxService
+{
+    private async Task<int> GenOutbound(ProfileItem node, Outbound4Sbox outbound)
+    {
+        try
+        {
+            outbound.server = node.Address;
+            outbound.server_port = node.Port;
+            outbound.type = Global.ProtocolTypes[node.ConfigType];
+
+            switch (node.ConfigType)
+            {
+                case EConfigType.VMess:
+                    {
+                        outbound.uuid = node.Id;
+                        outbound.alter_id = node.AlterId;
+                        if (Global.VmessSecurities.Contains(node.Security))
+                        {
+                            outbound.security = node.Security;
+                        }
+                        else
+                        {
+                            outbound.security = Global.DefaultSecurity;
+                        }
+
+                        await GenOutboundMux(node, outbound);
+                        break;
+                    }
+                case EConfigType.Shadowsocks:
+                    {
+                        outbound.method = AppManager.Instance.GetShadowsocksSecurities(node).Contains(node.Security) ? node.Security : Global.None;
+                        outbound.password = node.Id;
+
+                        await GenOutboundMux(node, outbound);
+                        break;
+                    }
+                case EConfigType.SOCKS:
+                    {
+                        outbound.version = "5";
+                        if (node.Security.IsNotEmpty()
+                          && node.Id.IsNotEmpty())
+                        {
+                            outbound.username = node.Security;
+                            outbound.password = node.Id;
+                        }
+                        break;
+                    }
+                case EConfigType.HTTP:
+                    {
+                        if (node.Security.IsNotEmpty()
+                          && node.Id.IsNotEmpty())
+                        {
+                            outbound.username = node.Security;
+                            outbound.password = node.Id;
+                        }
+                        break;
+                    }
+                case EConfigType.VLESS:
+                    {
+                        outbound.uuid = node.Id;
+
+                        outbound.packet_encoding = "xudp";
+
+                        if (node.Flow.IsNullOrEmpty())
+                        {
+                            await GenOutboundMux(node, outbound);
+                        }
+                        else
+                        {
+                            outbound.flow = node.Flow;
+                        }
+                        break;
+                    }
+                case EConfigType.Trojan:
+                    {
+                        outbound.password = node.Id;
+
+                        await GenOutboundMux(node, outbound);
+                        break;
+                    }
+                case EConfigType.Hysteria2:
+                    {
+                        outbound.password = node.Id;
+
+                        if (node.Path.IsNotEmpty())
+                        {
+                            outbound.obfs = new()
+                            {
+                                type = "salamander",
+                                password = node.Path.TrimEx(),
+                            };
+                        }
+
+                        outbound.up_mbps = _config.HysteriaItem.UpMbps > 0 ? _config.HysteriaItem.UpMbps : null;
+                        outbound.down_mbps = _config.HysteriaItem.DownMbps > 0 ? _config.HysteriaItem.DownMbps : null;
+                        if (node.Ports.IsNotEmpty() && (node.Ports.Contains(':') || node.Ports.Contains('-') || node.Ports.Contains(',')))
+                        {
+                            outbound.server_port = null;
+                            outbound.server_ports = node.Ports.Split(',')
+                                .Select(p => p.Trim())
+                                .Where(p => p.IsNotEmpty())
+                                .Select(p =>
+                                {
+                                    var port = p.Replace('-', ':');
+                                    return port.Contains(':') ? port : $"{port}:{port}";
+                                })
+                                .ToList();
+                            outbound.hop_interval = _config.HysteriaItem.HopInterval > 0 ? $"{_config.HysteriaItem.HopInterval}s" : null;
+                        }
+
+                        break;
+                    }
+                case EConfigType.TUIC:
+                    {
+                        outbound.uuid = node.Id;
+                        outbound.password = node.Security;
+                        outbound.congestion_control = node.HeaderType;
+                        break;
+                    }
+                case EConfigType.Anytls:
+                    {
+                        outbound.password = node.Id;
+                        break;
+                    }
+            }
+
+            await GenOutboundTls(node, outbound);
+
+            await GenOutboundTransport(node, outbound);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return 0;
+    }
+
+    private async Task<int> GenEndpoint(ProfileItem node, Endpoints4Sbox endpoint)
+    {
+        try
+        {
+            endpoint.address = Utils.String2List(node.RequestHost);
+            endpoint.type = Global.ProtocolTypes[node.ConfigType];
+
+            switch (node.ConfigType)
+            {
+                case EConfigType.WireGuard:
+                    {
+                        var peer = new Peer4Sbox
+                        {
+                            public_key = node.PublicKey,
+                            reserved = Utils.String2List(node.Path)?.Select(int.Parse).ToList(),
+                            address = node.Address,
+                            port = node.Port,
+                            // TODO default ["0.0.0.0/0", "::/0"]
+                            allowed_ips = new() { "0.0.0.0/0", "::/0" },
+                        };
+                        endpoint.private_key = node.Id;
+                        endpoint.mtu = node.ShortId.IsNullOrEmpty() ? Global.TunMtus.First() : node.ShortId.ToInt();
+                        endpoint.peers = new() { peer };
+                        break;
+                    }
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return await Task.FromResult(0);
+    }
+
+    private async Task<BaseServer4Sbox?> GenServer(ProfileItem node)
+    {
+        try
+        {
+            var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
+            if (node.ConfigType == EConfigType.WireGuard)
+            {
+                var endpoint = JsonUtils.Deserialize<Endpoints4Sbox>(txtOutbound);
+                await GenEndpoint(node, endpoint);
+                return endpoint;
+            }
+            else
+            {
+                var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                await GenOutbound(node, outbound);
+                return outbound;
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return await Task.FromResult<BaseServer4Sbox?>(null);
+    }
+
+    private async Task<int> GenOutboundMux(ProfileItem node, Outbound4Sbox outbound)
+    {
+        try
+        {
+            var muxEnabled = node.MuxEnabled ?? _config.CoreBasicItem.MuxEnabled;
+            if (muxEnabled && _config.Mux4SboxItem.Protocol.IsNotEmpty())
+            {
+                var mux = new Multiplex4Sbox()
+                {
+                    enabled = true,
+                    protocol = _config.Mux4SboxItem.Protocol,
+                    max_connections = _config.Mux4SboxItem.MaxConnections,
+                    padding = _config.Mux4SboxItem.Padding,
+                };
+                outbound.multiplex = mux;
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return await Task.FromResult(0);
+    }
+
+    private async Task<int> GenOutboundTls(ProfileItem node, Outbound4Sbox outbound)
+    {
+        try
+        {
+            if (node.StreamSecurity == Global.StreamSecurityReality || node.StreamSecurity == Global.StreamSecurity)
+            {
+                var server_name = string.Empty;
+                if (node.Sni.IsNotEmpty())
+                {
+                    server_name = node.Sni;
+                }
+                else if (node.RequestHost.IsNotEmpty())
+                {
+                    server_name = Utils.String2List(node.RequestHost)?.First();
+                }
+                var tls = new Tls4Sbox()
+                {
+                    enabled = true,
+                    record_fragment = _config.CoreBasicItem.EnableFragment,
+                    server_name = server_name,
+                    insecure = Utils.ToBool(node.AllowInsecure.IsNullOrEmpty() ? _config.CoreBasicItem.DefAllowInsecure.ToString().ToLower() : node.AllowInsecure),
+                    alpn = node.GetAlpn(),
+                };
+                if (node.Fingerprint.IsNotEmpty())
+                {
+                    tls.utls = new Utls4Sbox()
+                    {
+                        enabled = true,
+                        fingerprint = node.Fingerprint.IsNullOrEmpty() ? _config.CoreBasicItem.DefFingerprint : node.Fingerprint
+                    };
+                }
+                if (node.StreamSecurity == Global.StreamSecurityReality)
+                {
+                    tls.reality = new Reality4Sbox()
+                    {
+                        enabled = true,
+                        public_key = node.PublicKey,
+                        short_id = node.ShortId
+                    };
+                    tls.insecure = false;
+                }
+                outbound.tls = tls;
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return await Task.FromResult(0);
+    }
+
+    private async Task<int> GenOutboundTransport(ProfileItem node, Outbound4Sbox outbound)
+    {
+        try
+        {
+            var transport = new Transport4Sbox();
+
+            switch (node.GetNetwork())
+            {
+                case nameof(ETransport.h2):
+                    transport.type = nameof(ETransport.http);
+                    transport.host = node.RequestHost.IsNullOrEmpty() ? null : Utils.String2List(node.RequestHost);
+                    transport.path = node.Path.IsNullOrEmpty() ? null : node.Path;
+                    break;
+
+                case nameof(ETransport.tcp):   //http
+                    if (node.HeaderType == Global.TcpHeaderHttp)
+                    {
+                        if (node.ConfigType == EConfigType.Shadowsocks)
+                        {
+                            outbound.plugin = "obfs-local";
+                            outbound.plugin_opts = $"obfs=http;obfs-host={node.RequestHost};";
+                        }
+                        else
+                        {
+                            transport.type = nameof(ETransport.http);
+                            transport.host = node.RequestHost.IsNullOrEmpty() ? null : Utils.String2List(node.RequestHost);
+                            transport.path = node.Path.IsNullOrEmpty() ? null : node.Path;
+                        }
+                    }
+                    break;
+
+                case nameof(ETransport.ws):
+                    transport.type = nameof(ETransport.ws);
+                    transport.path = node.Path.IsNullOrEmpty() ? null : node.Path;
+                    if (node.RequestHost.IsNotEmpty())
+                    {
+                        transport.headers = new()
+                        {
+                            Host = node.RequestHost
+                        };
+                    }
+                    break;
+
+                case nameof(ETransport.httpupgrade):
+                    transport.type = nameof(ETransport.httpupgrade);
+                    transport.path = node.Path.IsNullOrEmpty() ? null : node.Path;
+                    transport.host = node.RequestHost.IsNullOrEmpty() ? null : node.RequestHost;
+
+                    break;
+
+                case nameof(ETransport.quic):
+                    transport.type = nameof(ETransport.quic);
+                    break;
+
+                case nameof(ETransport.grpc):
+                    transport.type = nameof(ETransport.grpc);
+                    transport.service_name = node.Path;
+                    transport.idle_timeout = _config.GrpcItem.IdleTimeout?.ToString("##s");
+                    transport.ping_timeout = _config.GrpcItem.HealthCheckTimeout?.ToString("##s");
+                    transport.permit_without_stream = _config.GrpcItem.PermitWithoutStream;
+                    break;
+
+                default:
+                    break;
+            }
+            if (transport.type != null)
+            {
+                outbound.transport = transport;
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return await Task.FromResult(0);
+    }
+
+    private async Task<int> GenMoreOutbounds(ProfileItem node, SingboxConfig singboxConfig)
+    {
+        if (node.Subid.IsNullOrEmpty())
+        {
+            return 0;
+        }
+        try
+        {
+            var subItem = await AppManager.Instance.GetSubItem(node.Subid);
+            if (subItem is null)
+            {
+                return 0;
+            }
+
+            //current proxy
+            BaseServer4Sbox? outbound = singboxConfig.endpoints?.FirstOrDefault(t => t.tag == Global.ProxyTag, null);
+            outbound ??= singboxConfig.outbounds.First();
+
+            var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
+
+            //Previous proxy
+            var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+            string? prevOutboundTag = null;
+            if (prevNode is not null
+                && prevNode.ConfigType != EConfigType.Custom)
+            {
+                prevOutboundTag = $"prev-{Global.ProxyTag}";
+                var prevServer = await GenServer(prevNode);
+                prevServer.tag = prevOutboundTag;
+                if (prevServer is Endpoints4Sbox endpoint)
+                {
+                    singboxConfig.endpoints ??= new();
+                    singboxConfig.endpoints.Add(endpoint);
+                }
+                else if (prevServer is Outbound4Sbox outboundPrev)
+                {
+                    singboxConfig.outbounds.Add(outboundPrev);
+                }
+            }
+            var nextServer = await GenChainOutbounds(subItem, outbound, prevOutboundTag);
+
+            if (nextServer is not null)
+            {
+                if (nextServer is Endpoints4Sbox endpoint)
+                {
+                    singboxConfig.endpoints ??= new();
+                    singboxConfig.endpoints.Insert(0, endpoint);
+                }
+                else if (nextServer is Outbound4Sbox outboundNext)
+                {
+                    singboxConfig.outbounds.Insert(0, outboundNext);
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+
+        return 0;
+    }
+
+    private async Task<int> GenOutboundsList(List<ProfileItem> nodes, SingboxConfig singboxConfig)
+    {
+        try
+        {
+            // Get outbound template and initialize lists
+            var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
+            if (txtOutbound.IsNullOrEmpty())
+            {
+                return 0;
+            }
+
+            var resultOutbounds = new List<Outbound4Sbox>();
+            var resultEndpoints = new List<Endpoints4Sbox>(); // For endpoints
+            var prevOutbounds = new List<Outbound4Sbox>(); // Separate list for prev outbounds
+            var prevEndpoints = new List<Endpoints4Sbox>(); // Separate list for prev endpoints
+            var proxyTags = new List<string>(); // For selector and urltest outbounds
+
+            // Cache for chain proxies to avoid duplicate generation
+            var nextProxyCache = new Dictionary<string, BaseServer4Sbox?>();
+            var prevProxyTags = new Dictionary<string, string?>(); // Map from profile name to tag
+            var prevIndex = 0; // Index for prev outbounds
+
+            // Process each node
+            var index = 0;
+            foreach (var node in nodes)
+            {
+                index++;
+
+                // Handle proxy chain
+                string? prevTag = null;
+                var currentServer = await GenServer(node);
+                var nextServer = nextProxyCache.GetValueOrDefault(node.Subid, null);
+                if (nextServer != null)
+                {
+                    nextServer = JsonUtils.DeepCopy(nextServer);
+                }
+
+                var subItem = await AppManager.Instance.GetSubItem(node.Subid);
+
+                // current proxy
+                currentServer.tag = $"{Global.ProxyTag}-{index}";
+                proxyTags.Add(currentServer.tag);
+
+                if (!node.Subid.IsNullOrEmpty())
+                {
+                    if (prevProxyTags.TryGetValue(node.Subid, out var value))
+                    {
+                        prevTag = value; // maybe null
+                    }
+                    else
+                    {
+                        var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+                        if (prevNode is not null
+                            && prevNode.ConfigType != EConfigType.Custom)
+                        {
+                            var prevOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                            await GenOutbound(prevNode, prevOutbound);
+                            prevTag = $"prev-{Global.ProxyTag}-{++prevIndex}";
+                            prevOutbound.tag = prevTag;
+                            prevOutbounds.Add(prevOutbound);
+                        }
+                        prevProxyTags[node.Subid] = prevTag;
+                    }
+
+                    nextServer = await GenChainOutbounds(subItem, currentServer, prevTag, nextServer);
+                    if (!nextProxyCache.ContainsKey(node.Subid))
+                    {
+                        nextProxyCache[node.Subid] = nextServer;
+                    }
+                }
+
+                if (nextServer is not null)
+                {
+                    if (nextServer is Endpoints4Sbox nextEndpoint)
+                    {
+                        resultEndpoints.Add(nextEndpoint);
+                    }
+                    else if (nextServer is Outbound4Sbox nextOutbound)
+                    {
+                        resultOutbounds.Add(nextOutbound);
+                    }
+                }
+                if (currentServer is Endpoints4Sbox currentEndpoint)
+                {
+                    resultEndpoints.Add(currentEndpoint);
+                }
+                else if (currentServer is Outbound4Sbox currentOutbound)
+                {
+                    resultOutbounds.Add(currentOutbound);
+                }
+            }
+
+            // Add urltest outbound (auto selection based on latency)
+            if (proxyTags.Count > 0)
+            {
+                var outUrltest = new Outbound4Sbox
+                {
+                    type = "urltest",
+                    tag = $"{Global.ProxyTag}-auto",
+                    outbounds = proxyTags,
+                    interrupt_exist_connections = false,
+                };
+
+                // Add selector outbound (manual selection)
+                var outSelector = new Outbound4Sbox
+                {
+                    type = "selector",
+                    tag = Global.ProxyTag,
+                    outbounds = JsonUtils.DeepCopy(proxyTags),
+                    interrupt_exist_connections = false,
+                };
+                outSelector.outbounds.Insert(0, outUrltest.tag);
+
+                // Insert these at the beginning
+                resultOutbounds.Insert(0, outUrltest);
+                resultOutbounds.Insert(0, outSelector);
+            }
+
+            // Merge results: first the selector/urltest/proxies, then other outbounds, and finally prev outbounds
+            resultOutbounds.AddRange(prevOutbounds);
+            resultOutbounds.AddRange(singboxConfig.outbounds);
+            singboxConfig.outbounds = resultOutbounds;
+            singboxConfig.endpoints ??= new List<Endpoints4Sbox>();
+            resultEndpoints.AddRange(singboxConfig.endpoints);
+            singboxConfig.endpoints = resultEndpoints;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+
+        return 0;
+    }
+
+    private async Task<BaseServer4Sbox?> GenChainOutbounds(SubItem subItem, BaseServer4Sbox outbound, string? prevOutboundTag, BaseServer4Sbox? nextOutbound = null)
+    {
+        try
+        {
+            var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
+
+            if (!prevOutboundTag.IsNullOrEmpty())
+            {
+                outbound.detour = prevOutboundTag;
+            }
+
+            // Next proxy
+            var nextNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
+            if (nextNode is not null
+                && nextNode.ConfigType != EConfigType.Custom)
+            {
+                nextOutbound ??= await GenServer(nextNode);
+                nextOutbound.tag = outbound.tag;
+
+                outbound.tag = $"mid-{outbound.tag}";
+                nextOutbound.detour = outbound.tag;
+            }
+            return nextOutbound;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return null;
+    }
+}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs
new file mode 100644
index 00000000..69492d9b
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs
@@ -0,0 +1,365 @@
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigSingboxService
+{
+    private async Task<int> GenRouting(SingboxConfig singboxConfig)
+    {
+        try
+        {
+            singboxConfig.route.final = Global.ProxyTag;
+            var item = _config.SimpleDNSItem;
+
+            var defaultDomainResolverTag = Global.SingboxOutboundResolverTag;
+            var directDNSStrategy = item.SingboxStrategy4Direct.IsNullOrEmpty() ? Global.SingboxDomainStrategy4Out.FirstOrDefault() : item.SingboxStrategy4Direct;
+
+            var rawDNSItem = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
+            if (rawDNSItem != null && rawDNSItem.Enabled == true)
+            {
+                defaultDomainResolverTag = Global.SingboxFinalResolverTag;
+                directDNSStrategy = rawDNSItem.DomainStrategy4Freedom.IsNullOrEmpty() ? Global.SingboxDomainStrategy4Out.FirstOrDefault() : rawDNSItem.DomainStrategy4Freedom;
+            }
+            singboxConfig.route.default_domain_resolver = new()
+            {
+                server = defaultDomainResolverTag,
+                strategy = directDNSStrategy
+            };
+
+            if (_config.TunModeItem.EnableTun)
+            {
+                singboxConfig.route.auto_detect_interface = true;
+
+                var tunRules = JsonUtils.Deserialize<List<Rule4Sbox>>(EmbedUtils.GetEmbedText(Global.TunSingboxRulesFileName));
+                if (tunRules != null)
+                {
+                    singboxConfig.route.rules.AddRange(tunRules);
+                }
+
+                GenRoutingDirectExe(out var lstDnsExe, out var lstDirectExe);
+                singboxConfig.route.rules.Add(new()
+                {
+                    port = new() { 53 },
+                    action = "hijack-dns",
+                    process_name = lstDnsExe
+                });
+
+                singboxConfig.route.rules.Add(new()
+                {
+                    outbound = Global.DirectTag,
+                    process_name = lstDirectExe
+                });
+            }
+
+            if (_config.Inbound.First().SniffingEnabled)
+            {
+                singboxConfig.route.rules.Add(new()
+                {
+                    action = "sniff"
+                });
+                singboxConfig.route.rules.Add(new()
+                {
+                    protocol = new() { "dns" },
+                    action = "hijack-dns"
+                });
+            }
+            else
+            {
+                singboxConfig.route.rules.Add(new()
+                {
+                    port = new() { 53 },
+                    network = new() { "udp" },
+                    action = "hijack-dns"
+                });
+            }
+
+            singboxConfig.route.rules.Add(new()
+            {
+                outbound = Global.DirectTag,
+                clash_mode = ERuleMode.Direct.ToString()
+            });
+            singboxConfig.route.rules.Add(new()
+            {
+                outbound = Global.ProxyTag,
+                clash_mode = ERuleMode.Global.ToString()
+            });
+
+            var domainStrategy = _config.RoutingBasicItem.DomainStrategy4Singbox.IsNullOrEmpty() ? null : _config.RoutingBasicItem.DomainStrategy4Singbox;
+            var defaultRouting = await ConfigHandler.GetDefaultRouting(_config);
+            if (defaultRouting.DomainStrategy4Singbox.IsNotEmpty())
+            {
+                domainStrategy = defaultRouting.DomainStrategy4Singbox;
+            }
+            var resolveRule = new Rule4Sbox
+            {
+                action = "resolve",
+                strategy = domainStrategy
+            };
+            if (_config.RoutingBasicItem.DomainStrategy == Global.IPOnDemand)
+            {
+                singboxConfig.route.rules.Add(resolveRule);
+            }
+
+            var routing = await ConfigHandler.GetDefaultRouting(_config);
+            var ipRules = new List<RulesItem>();
+            if (routing != null)
+            {
+                var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet);
+                foreach (var item1 in rules ?? [])
+                {
+                    if (item1.Enabled)
+                    {
+                        await GenRoutingUserRule(item1, singboxConfig);
+                        if (item1.Ip != null && item1.Ip.Count > 0)
+                        {
+                            ipRules.Add(item1);
+                        }
+                    }
+                }
+            }
+            if (_config.RoutingBasicItem.DomainStrategy == Global.IPIfNonMatch)
+            {
+                singboxConfig.route.rules.Add(resolveRule);
+                foreach (var item2 in ipRules)
+                {
+                    await GenRoutingUserRule(item2, singboxConfig);
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return 0;
+    }
+
+    private void GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe)
+    {
+        var dnsExeSet = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        var directExeSet = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+        var coreInfoResult = CoreInfoManager.Instance.GetCoreInfo();
+
+        foreach (var coreConfig in coreInfoResult)
+        {
+            if (coreConfig.CoreType == ECoreType.v2rayN)
+            {
+                continue;
+            }
+
+            foreach (var baseExeName in coreConfig.CoreExes)
+            {
+                if (coreConfig.CoreType != ECoreType.sing_box)
+                {
+                    dnsExeSet.Add(Utils.GetExeName(baseExeName));
+                }
+                directExeSet.Add(Utils.GetExeName(baseExeName));
+            }
+        }
+
+        lstDnsExe = new List<string>(dnsExeSet);
+        lstDirectExe = new List<string>(directExeSet);
+    }
+
+    private async Task<int> GenRoutingUserRule(RulesItem item, SingboxConfig singboxConfig)
+    {
+        try
+        {
+            if (item == null)
+            {
+                return 0;
+            }
+            item.OutboundTag = await GenRoutingUserRuleOutbound(item.OutboundTag, singboxConfig);
+            var rules = singboxConfig.route.rules;
+
+            var rule = new Rule4Sbox();
+            if (item.OutboundTag == "block")
+            {
+                rule.action = "reject";
+            }
+            else
+            {
+                rule.outbound = item.OutboundTag;
+            }
+
+            if (item.Port.IsNotEmpty())
+            {
+                var portRanges = item.Port.Split(',').Where(it => it.Contains('-')).Select(it => it.Replace("-", ":")).ToList();
+                var ports = item.Port.Split(',').Where(it => !it.Contains('-')).Select(it => it.ToInt()).ToList();
+
+                rule.port_range = portRanges.Count > 0 ? portRanges : null;
+                rule.port = ports.Count > 0 ? ports : null;
+            }
+            if (item.Network.IsNotEmpty())
+            {
+                rule.network = Utils.String2List(item.Network);
+            }
+            if (item.Protocol?.Count > 0)
+            {
+                rule.protocol = item.Protocol;
+            }
+            if (item.InboundTag?.Count >= 0)
+            {
+                rule.inbound = item.InboundTag;
+            }
+            var rule1 = JsonUtils.DeepCopy(rule);
+            var rule2 = JsonUtils.DeepCopy(rule);
+            var rule3 = JsonUtils.DeepCopy(rule);
+
+            var hasDomainIp = false;
+            if (item.Domain?.Count > 0)
+            {
+                var countDomain = 0;
+                foreach (var it in item.Domain)
+                {
+                    if (ParseV2Domain(it, rule1))
+                        countDomain++;
+                }
+                if (countDomain > 0)
+                {
+                    rules.Add(rule1);
+                    hasDomainIp = true;
+                }
+            }
+
+            if (item.Ip?.Count > 0)
+            {
+                var countIp = 0;
+                foreach (var it in item.Ip)
+                {
+                    if (ParseV2Address(it, rule2))
+                        countIp++;
+                }
+                if (countIp > 0)
+                {
+                    rules.Add(rule2);
+                    hasDomainIp = true;
+                }
+            }
+
+            if (_config.TunModeItem.EnableTun && item.Process?.Count > 0)
+            {
+                rule3.process_name = item.Process;
+                rules.Add(rule3);
+                hasDomainIp = true;
+            }
+
+            if (!hasDomainIp
+                && (rule.port != null || rule.port_range != null || rule.protocol != null || rule.inbound != null || rule.network != null))
+            {
+                rules.Add(rule);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return await Task.FromResult(0);
+    }
+
+    private bool ParseV2Domain(string domain, Rule4Sbox rule)
+    {
+        if (domain.StartsWith("#") || domain.StartsWith("ext:") || domain.StartsWith("ext-domain:"))
+        {
+            return false;
+        }
+        else if (domain.StartsWith("geosite:"))
+        {
+            rule.geosite ??= [];
+            rule.geosite?.Add(domain.Substring(8));
+        }
+        else if (domain.StartsWith("regexp:"))
+        {
+            rule.domain_regex ??= [];
+            rule.domain_regex?.Add(domain.Replace(Global.RoutingRuleComma, ",").Substring(7));
+        }
+        else if (domain.StartsWith("domain:"))
+        {
+            rule.domain ??= [];
+            rule.domain_suffix ??= [];
+            rule.domain?.Add(domain.Substring(7));
+            rule.domain_suffix?.Add("." + domain.Substring(7));
+        }
+        else if (domain.StartsWith("full:"))
+        {
+            rule.domain ??= [];
+            rule.domain?.Add(domain.Substring(5));
+        }
+        else if (domain.StartsWith("keyword:"))
+        {
+            rule.domain_keyword ??= [];
+            rule.domain_keyword?.Add(domain.Substring(8));
+        }
+        else
+        {
+            rule.domain_keyword ??= [];
+            rule.domain_keyword?.Add(domain);
+        }
+        return true;
+    }
+
+    private bool ParseV2Address(string address, Rule4Sbox rule)
+    {
+        if (address.StartsWith("ext:") || address.StartsWith("ext-ip:"))
+        {
+            return false;
+        }
+        else if (address.Equals("geoip:private"))
+        {
+            rule.ip_is_private = true;
+        }
+        else if (address.StartsWith("geoip:"))
+        {
+            rule.geoip ??= new();
+            rule.geoip?.Add(address.Substring(6));
+        }
+        else if (address.Equals("geoip:!private"))
+        {
+            rule.ip_is_private = false;
+        }
+        else if (address.StartsWith("geoip:!"))
+        {
+            rule.geoip ??= new();
+            rule.geoip?.Add(address.Substring(6));
+            rule.invert = true;
+        }
+        else
+        {
+            rule.ip_cidr ??= new();
+            rule.ip_cidr?.Add(address);
+        }
+        return true;
+    }
+
+    private async Task<string?> GenRoutingUserRuleOutbound(string outboundTag, SingboxConfig singboxConfig)
+    {
+        if (Global.OutboundTags.Contains(outboundTag))
+        {
+            return outboundTag;
+        }
+
+        var node = await AppManager.Instance.GetProfileItemViaRemarks(outboundTag);
+        if (node == null
+            || node.ConfigType == EConfigType.Custom)
+        {
+            return Global.ProxyTag;
+        }
+
+        var server = await GenServer(node);
+        if (server is null)
+        {
+            return Global.ProxyTag;
+        }
+
+        server.tag = Global.ProxyTag + node.IndexId.ToString();
+        if (server is Endpoints4Sbox endpoint)
+        {
+            singboxConfig.endpoints ??= new();
+            singboxConfig.endpoints.Add(endpoint);
+        }
+        else if (server is Outbound4Sbox outbound)
+        {
+            singboxConfig.outbounds.Add(outbound);
+        }
+
+        return server.tag;
+    }
+}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRulesetService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRulesetService.cs
new file mode 100644
index 00000000..ef611c91
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRulesetService.cs
@@ -0,0 +1,119 @@
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigSingboxService
+{
+    private async Task<int> ConvertGeo2Ruleset(SingboxConfig singboxConfig)
+    {
+        static void AddRuleSets(List<string> ruleSets, List<string>? rule_set)
+        {
+            if (rule_set != null)
+                ruleSets.AddRange(rule_set);
+        }
+        var geosite = "geosite";
+        var geoip = "geoip";
+        var ruleSets = new List<string>();
+
+        //convert route geosite & geoip to ruleset
+        foreach (var rule in singboxConfig.route.rules.Where(t => t.geosite?.Count > 0).ToList() ?? [])
+        {
+            rule.rule_set ??= new List<string>();
+            rule.rule_set.AddRange(rule?.geosite?.Select(t => $"{geosite}-{t}").ToList());
+            rule.geosite = null;
+            AddRuleSets(ruleSets, rule.rule_set);
+        }
+        foreach (var rule in singboxConfig.route.rules.Where(t => t.geoip?.Count > 0).ToList() ?? [])
+        {
+            rule.rule_set ??= new List<string>();
+            rule.rule_set.AddRange(rule?.geoip?.Select(t => $"{geoip}-{t}").ToList());
+            rule.geoip = null;
+            AddRuleSets(ruleSets, rule.rule_set);
+        }
+
+        //convert dns geosite & geoip to ruleset
+        foreach (var rule in singboxConfig.dns?.rules.Where(t => t.geosite?.Count > 0).ToList() ?? [])
+        {
+            rule.rule_set ??= new List<string>();
+            rule.rule_set.AddRange(rule?.geosite?.Select(t => $"{geosite}-{t}").ToList());
+            rule.geosite = null;
+        }
+        foreach (var rule in singboxConfig.dns?.rules.Where(t => t.geoip?.Count > 0).ToList() ?? [])
+        {
+            rule.rule_set ??= new List<string>();
+            rule.rule_set.AddRange(rule?.geoip?.Select(t => $"{geoip}-{t}").ToList());
+            rule.geoip = null;
+        }
+        foreach (var dnsRule in singboxConfig.dns?.rules.Where(t => t.rule_set?.Count > 0).ToList() ?? [])
+        {
+            AddRuleSets(ruleSets, dnsRule.rule_set);
+        }
+        //rules in rules
+        foreach (var item in singboxConfig.dns?.rules.Where(t => t.rules?.Count > 0).Select(t => t.rules).ToList() ?? [])
+        {
+            foreach (var item2 in item ?? [])
+            {
+                AddRuleSets(ruleSets, item2.rule_set);
+            }
+        }
+
+        //load custom ruleset file
+        List<Ruleset4Sbox> customRulesets = [];
+
+        var routing = await ConfigHandler.GetDefaultRouting(_config);
+        if (routing.CustomRulesetPath4Singbox.IsNotEmpty())
+        {
+            var result = EmbedUtils.LoadResource(routing.CustomRulesetPath4Singbox);
+            if (result.IsNotEmpty())
+            {
+                customRulesets = (JsonUtils.Deserialize<List<Ruleset4Sbox>>(result) ?? [])
+                    .Where(t => t.tag != null)
+                    .Where(t => t.type != null)
+                    .Where(t => t.format != null)
+                    .ToList();
+            }
+        }
+
+        //Local srs files address
+        var localSrss = Utils.GetBinPath("srss");
+
+        //Add ruleset srs
+        singboxConfig.route.rule_set = [];
+        foreach (var item in new HashSet<string>(ruleSets))
+        {
+            if (item.IsNullOrEmpty())
+            { continue; }
+            var customRuleset = customRulesets.FirstOrDefault(t => t.tag != null && t.tag.Equals(item));
+            if (customRuleset is null)
+            {
+                var pathSrs = Path.Combine(localSrss, $"{item}.srs");
+                if (File.Exists(pathSrs))
+                {
+                    customRuleset = new()
+                    {
+                        type = "local",
+                        format = "binary",
+                        tag = item,
+                        path = pathSrs
+                    };
+                }
+                else
+                {
+                    var srsUrl = string.IsNullOrEmpty(_config.ConstItem.SrsSourceUrl)
+                        ? Global.SingboxRulesetUrl
+                        : _config.ConstItem.SrsSourceUrl;
+
+                    customRuleset = new()
+                    {
+                        type = "remote",
+                        format = "binary",
+                        tag = item,
+                        url = string.Format(srsUrl, item.StartsWith(geosite) ? geosite : geoip, item),
+                        download_detour = Global.ProxyTag
+                    };
+                }
+            }
+            singboxConfig.route.rule_set.Add(customRuleset);
+        }
+
+        return 0;
+    }
+}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxStatisticService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxStatisticService.cs
new file mode 100644
index 00000000..c3acd810
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxStatisticService.cs
@@ -0,0 +1,29 @@
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigSingboxService
+{
+    private async Task<int> GenExperimental(SingboxConfig singboxConfig)
+    {
+        //if (_config.guiItem.enableStatistics)
+        {
+            singboxConfig.experimental ??= new Experimental4Sbox();
+            singboxConfig.experimental.clash_api = new Clash_Api4Sbox()
+            {
+                external_controller = $"{Global.Loopback}:{AppManager.Instance.StatePort2}",
+            };
+        }
+
+        if (_config.CoreBasicItem.EnableCacheFile4Sbox)
+        {
+            singboxConfig.experimental ??= new Experimental4Sbox();
+            singboxConfig.experimental.cache_file = new CacheFile4Sbox()
+            {
+                enabled = true,
+                path = Utils.GetBinPath("cache.db"),
+                store_fakeip = _config.SimpleDNSItem.FakeIP == true
+            };
+        }
+
+        return await Task.FromResult(0);
+    }
+}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs
new file mode 100644
index 00000000..7f1ada5d
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs
@@ -0,0 +1,415 @@
+using System.Net;
+using System.Net.NetworkInformation;
+
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigV2rayService(Config config)
+{
+    private readonly Config _config = config;
+    private static readonly string _tag = "CoreConfigV2rayService";
+
+    #region public gen function
+
+    public async Task<RetResult> GenerateClientConfigContent(ProfileItem node)
+    {
+        var ret = new RetResult();
+        try
+        {
+            if (node == null
+                || node.Port <= 0)
+            {
+                ret.Msg = ResUI.CheckServerSettings;
+                return ret;
+            }
+
+            if (node.GetNetwork() is nameof(ETransport.quic))
+            {
+                ret.Msg = ResUI.Incorrectconfiguration + $" - {node.GetNetwork()}";
+                return ret;
+            }
+
+            ret.Msg = ResUI.InitialConfiguration;
+
+            var result = EmbedUtils.GetEmbedText(Global.V2raySampleClient);
+            if (result.IsNullOrEmpty())
+            {
+                ret.Msg = ResUI.FailedGetDefaultConfiguration;
+                return ret;
+            }
+
+            var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
+            if (v2rayConfig == null)
+            {
+                ret.Msg = ResUI.FailedGenDefaultConfiguration;
+                return ret;
+            }
+
+            await GenLog(v2rayConfig);
+
+            await GenInbounds(v2rayConfig);
+
+            await GenOutbound(node, v2rayConfig.outbounds.First());
+
+            await GenMoreOutbounds(node, v2rayConfig);
+
+            await GenRouting(v2rayConfig);
+
+            await GenDns(node, v2rayConfig);
+
+            await GenStatistic(v2rayConfig);
+
+            ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
+            ret.Success = true;
+            ret.Data = await ApplyFullConfigTemplate(v2rayConfig);
+            return ret;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            ret.Msg = ResUI.FailedGenDefaultConfiguration;
+            return ret;
+        }
+    }
+
+    public async Task<RetResult> GenerateClientMultipleLoadConfig(List<ProfileItem> selecteds, EMultipleLoad multipleLoad)
+    {
+        var ret = new RetResult();
+
+        try
+        {
+            if (_config == null)
+            {
+                ret.Msg = ResUI.CheckServerSettings;
+                return ret;
+            }
+
+            ret.Msg = ResUI.InitialConfiguration;
+
+            string result = EmbedUtils.GetEmbedText(Global.V2raySampleClient);
+            string txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
+            if (result.IsNullOrEmpty() || txtOutbound.IsNullOrEmpty())
+            {
+                ret.Msg = ResUI.FailedGetDefaultConfiguration;
+                return ret;
+            }
+
+            var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
+            if (v2rayConfig == null)
+            {
+                ret.Msg = ResUI.FailedGenDefaultConfiguration;
+                return ret;
+            }
+
+            await GenLog(v2rayConfig);
+            await GenInbounds(v2rayConfig);
+            await GenRouting(v2rayConfig);
+            await GenDns(null, v2rayConfig);
+            await GenStatistic(v2rayConfig);
+            v2rayConfig.outbounds.RemoveAt(0);
+
+            var proxyProfiles = new List<ProfileItem>();
+            foreach (var it in selecteds)
+            {
+                if (it.ConfigType == EConfigType.Custom)
+                {
+                    continue;
+                }
+                if (it.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls)
+                {
+                    continue;
+                }
+                if (it.Port <= 0)
+                {
+                    continue;
+                }
+                var item = await AppManager.Instance.GetProfileItem(it.IndexId);
+                if (item is null)
+                {
+                    continue;
+                }
+                if (it.ConfigType is EConfigType.VMess or EConfigType.VLESS)
+                {
+                    if (item.Id.IsNullOrEmpty() || !Utils.IsGuidByParse(item.Id))
+                    {
+                        continue;
+                    }
+                }
+                if (item.ConfigType == EConfigType.Shadowsocks
+                  && !Global.SsSecuritiesInSingbox.Contains(item.Security))
+                {
+                    continue;
+                }
+                if (item.ConfigType == EConfigType.VLESS && !Global.Flows.Contains(item.Flow))
+                {
+                    continue;
+                }
+
+                //outbound
+                proxyProfiles.Add(item);
+            }
+            if (proxyProfiles.Count <= 0)
+            {
+                ret.Msg = ResUI.FailedGenDefaultConfiguration;
+                return ret;
+            }
+            await GenOutboundsList(proxyProfiles, v2rayConfig);
+
+            //add balancers
+            await GenBalancer(v2rayConfig, multipleLoad);
+
+            var balancer = v2rayConfig.routing.balancers.First();
+
+            //add rule
+            var rules = v2rayConfig.routing.rules.Where(t => t.outboundTag == Global.ProxyTag).ToList();
+            if (rules?.Count > 0)
+            {
+                foreach (var rule in rules)
+                {
+                    rule.outboundTag = null;
+                    rule.balancerTag = balancer.tag;
+                }
+            }
+            if (v2rayConfig.routing.domainStrategy == Global.IPIfNonMatch)
+            {
+                v2rayConfig.routing.rules.Add(new()
+                {
+                    ip = ["0.0.0.0/0", "::/0"],
+                    balancerTag = balancer.tag,
+                    type = "field"
+                });
+            }
+            else
+            {
+                v2rayConfig.routing.rules.Add(new()
+                {
+                    network = "tcp,udp",
+                    balancerTag = balancer.tag,
+                    type = "field"
+                });
+            }
+
+            ret.Success = true;
+
+            ret.Data = await ApplyFullConfigTemplate(v2rayConfig, true);
+            return ret;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            ret.Msg = ResUI.FailedGenDefaultConfiguration;
+            return ret;
+        }
+    }
+
+    public async Task<RetResult> GenerateClientSpeedtestConfig(List<ServerTestItem> selecteds)
+    {
+        var ret = new RetResult();
+        try
+        {
+            if (_config == null)
+            {
+                ret.Msg = ResUI.CheckServerSettings;
+                return ret;
+            }
+
+            ret.Msg = ResUI.InitialConfiguration;
+
+            var result = EmbedUtils.GetEmbedText(Global.V2raySampleClient);
+            var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
+            if (result.IsNullOrEmpty() || txtOutbound.IsNullOrEmpty())
+            {
+                ret.Msg = ResUI.FailedGetDefaultConfiguration;
+                return ret;
+            }
+
+            var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
+            if (v2rayConfig == null)
+            {
+                ret.Msg = ResUI.FailedGenDefaultConfiguration;
+                return ret;
+            }
+            List<IPEndPoint> lstIpEndPoints = new();
+            List<TcpConnectionInformation> lstTcpConns = new();
+            try
+            {
+                lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
+                lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
+                lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(_tag, ex);
+            }
+
+            await GenLog(v2rayConfig);
+            v2rayConfig.inbounds.Clear();
+            v2rayConfig.outbounds.Clear();
+            v2rayConfig.routing.rules.Clear();
+
+            var initPort = AppManager.Instance.GetLocalPort(EInboundProtocol.speedtest);
+
+            foreach (var it in selecteds)
+            {
+                if (it.ConfigType == EConfigType.Custom)
+                {
+                    continue;
+                }
+                if (it.Port <= 0)
+                {
+                    continue;
+                }
+                var item = await AppManager.Instance.GetProfileItem(it.IndexId);
+                if (it.ConfigType is EConfigType.VMess or EConfigType.VLESS)
+                {
+                    if (item is null || item.Id.IsNullOrEmpty() || !Utils.IsGuidByParse(item.Id))
+                    {
+                        continue;
+                    }
+                }
+
+                //find unused port
+                var port = initPort;
+                for (var k = initPort; k < Global.MaxPort; k++)
+                {
+                    if (lstIpEndPoints?.FindIndex(_it => _it.Port == k) >= 0)
+                    {
+                        continue;
+                    }
+                    if (lstTcpConns?.FindIndex(_it => _it.LocalEndPoint.Port == k) >= 0)
+                    {
+                        continue;
+                    }
+                    //found
+                    port = k;
+                    initPort = port + 1;
+                    break;
+                }
+
+                //Port In Used
+                if (lstIpEndPoints?.FindIndex(_it => _it.Port == port) >= 0)
+                {
+                    continue;
+                }
+                it.Port = port;
+                it.AllowTest = true;
+
+                //outbound
+                if (item is null)
+                {
+                    continue;
+                }
+                if (item.ConfigType == EConfigType.Shadowsocks
+                    && !Global.SsSecuritiesInXray.Contains(item.Security))
+                {
+                    continue;
+                }
+                if (item.ConfigType == EConfigType.VLESS
+                 && !Global.Flows.Contains(item.Flow))
+                {
+                    continue;
+                }
+                if (it.ConfigType is EConfigType.VLESS or EConfigType.Trojan
+                    && item.StreamSecurity == Global.StreamSecurityReality
+                    && item.PublicKey.IsNullOrEmpty())
+                {
+                    continue;
+                }
+
+                //inbound
+                Inbounds4Ray inbound = new()
+                {
+                    listen = Global.Loopback,
+                    port = port,
+                    protocol = EInboundProtocol.mixed.ToString(),
+                };
+                inbound.tag = inbound.protocol + inbound.port.ToString();
+                v2rayConfig.inbounds.Add(inbound);
+
+                var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
+                await GenOutbound(item, outbound);
+                outbound.tag = Global.ProxyTag + inbound.port.ToString();
+                v2rayConfig.outbounds.Add(outbound);
+
+                //rule
+                RulesItem4Ray rule = new()
+                {
+                    inboundTag = new List<string> { inbound.tag },
+                    outboundTag = outbound.tag,
+                    type = "field"
+                };
+                v2rayConfig.routing.rules.Add(rule);
+            }
+
+            //ret.Msg =string.Format(ResUI.SuccessfulConfiguration"), node.getSummary());
+            ret.Success = true;
+            ret.Data = JsonUtils.Serialize(v2rayConfig);
+            return ret;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            ret.Msg = ResUI.FailedGenDefaultConfiguration;
+            return ret;
+        }
+    }
+
+    public async Task<RetResult> GenerateClientSpeedtestConfig(ProfileItem node, int port)
+    {
+        var ret = new RetResult();
+        try
+        {
+            if (node is not { Port: > 0 })
+            {
+                ret.Msg = ResUI.CheckServerSettings;
+                return ret;
+            }
+
+            if (node.GetNetwork() is nameof(ETransport.quic))
+            {
+                ret.Msg = ResUI.Incorrectconfiguration + $" - {node.GetNetwork()}";
+                return ret;
+            }
+
+            var result = EmbedUtils.GetEmbedText(Global.V2raySampleClient);
+            if (result.IsNullOrEmpty())
+            {
+                ret.Msg = ResUI.FailedGetDefaultConfiguration;
+                return ret;
+            }
+
+            var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
+            if (v2rayConfig == null)
+            {
+                ret.Msg = ResUI.FailedGenDefaultConfiguration;
+                return ret;
+            }
+
+            await GenLog(v2rayConfig);
+            await GenOutbound(node, v2rayConfig.outbounds.First());
+            await GenMoreOutbounds(node, v2rayConfig);
+
+            v2rayConfig.routing.rules.Clear();
+            v2rayConfig.inbounds.Clear();
+            v2rayConfig.inbounds.Add(new()
+            {
+                tag = $"{EInboundProtocol.socks}{port}",
+                listen = Global.Loopback,
+                port = port,
+                protocol = EInboundProtocol.mixed.ToString(),
+            });
+
+            ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
+            ret.Success = true;
+            ret.Data = JsonUtils.Serialize(v2rayConfig);
+            return ret;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            ret.Msg = ResUI.FailedGenDefaultConfiguration;
+            return ret;
+        }
+    }
+
+    #endregion public gen function
+}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayBalancerService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayBalancerService.cs
new file mode 100644
index 00000000..8d2476e6
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayBalancerService.cs
@@ -0,0 +1,50 @@
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigV2rayService
+{
+    private async Task<int> GenBalancer(V2rayConfig v2rayConfig, EMultipleLoad multipleLoad)
+    {
+        if (multipleLoad == EMultipleLoad.LeastPing)
+        {
+            var observatory = new Observatory4Ray
+            {
+                subjectSelector = [Global.ProxyTag],
+                probeUrl = AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl,
+                probeInterval = "3m",
+                enableConcurrency = true,
+            };
+            v2rayConfig.observatory = observatory;
+        }
+        else if (multipleLoad == EMultipleLoad.LeastLoad)
+        {
+            var burstObservatory = new BurstObservatory4Ray
+            {
+                subjectSelector = [Global.ProxyTag],
+                pingConfig = new()
+                {
+                    destination = AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl,
+                    interval = "5m",
+                    timeout = "30s",
+                    sampling = 2,
+                }
+            };
+            v2rayConfig.burstObservatory = burstObservatory;
+        }
+        var strategyType = multipleLoad switch
+        {
+            EMultipleLoad.Random => "random",
+            EMultipleLoad.RoundRobin => "roundRobin",
+            EMultipleLoad.LeastPing => "leastPing",
+            EMultipleLoad.LeastLoad => "leastLoad",
+            _ => "roundRobin",
+        };
+        var balancer = new BalancersItem4Ray
+        {
+            selector = [Global.ProxyTag],
+            strategy = new() { type = strategyType },
+            tag = $"{Global.ProxyTag}-round",
+        };
+        v2rayConfig.routing.balancers = [balancer];
+        return await Task.FromResult(0);
+    }
+}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayConfigTemplateService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayConfigTemplateService.cs
new file mode 100644
index 00000000..5d1f7d63
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayConfigTemplateService.cs
@@ -0,0 +1,86 @@
+using System.Text.Json.Nodes;
+
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigV2rayService
+{
+    private async Task<string> ApplyFullConfigTemplate(V2rayConfig v2rayConfig, bool handleBalancerAndRules = false)
+    {
+        var fullConfigTemplate = await AppManager.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
+        if (fullConfigTemplate == null || !fullConfigTemplate.Enabled || fullConfigTemplate.Config.IsNullOrEmpty())
+        {
+            return JsonUtils.Serialize(v2rayConfig);
+        }
+
+        var fullConfigTemplateNode = JsonNode.Parse(fullConfigTemplate.Config);
+        if (fullConfigTemplateNode == null)
+        {
+            return JsonUtils.Serialize(v2rayConfig);
+        }
+
+        // Handle balancer and rules modifications (for multiple load scenarios)
+        if (handleBalancerAndRules && v2rayConfig.routing?.balancers?.Count > 0)
+        {
+            var balancer = v2rayConfig.routing.balancers.First();
+
+            // Modify existing rules in custom config
+            var rulesNode = fullConfigTemplateNode["routing"]?["rules"];
+            if (rulesNode != null)
+            {
+                foreach (var rule in rulesNode.AsArray())
+                {
+                    if (rule["outboundTag"]?.GetValue<string>() == Global.ProxyTag)
+                    {
+                        rule.AsObject().Remove("outboundTag");
+                        rule["balancerTag"] = balancer.tag;
+                    }
+                }
+            }
+
+            // Ensure routing node exists
+            if (fullConfigTemplateNode["routing"] == null)
+            {
+                fullConfigTemplateNode["routing"] = new JsonObject();
+            }
+
+            // Handle balancers - append instead of override
+            if (fullConfigTemplateNode["routing"]["balancers"] is JsonArray customBalancersNode)
+            {
+                if (JsonNode.Parse(JsonUtils.Serialize(v2rayConfig.routing.balancers)) is JsonArray newBalancers)
+                {
+                    foreach (var balancerNode in newBalancers)
+                    {
+                        customBalancersNode.Add(balancerNode?.DeepClone());
+                    }
+                }
+            }
+            else
+            {
+                fullConfigTemplateNode["routing"]["balancers"] = JsonNode.Parse(JsonUtils.Serialize(v2rayConfig.routing.balancers));
+            }
+        }
+
+        // Handle outbounds - append instead of override
+        var customOutboundsNode = fullConfigTemplateNode["outbounds"] is JsonArray outbounds ? outbounds : new JsonArray();
+        foreach (var outbound in v2rayConfig.outbounds)
+        {
+            if (outbound.protocol.ToLower() is "blackhole" or "dns" or "freedom")
+            {
+                if (fullConfigTemplate.AddProxyOnly == true)
+                {
+                    continue;
+                }
+            }
+            else if ((outbound.streamSettings?.sockopt?.dialerProxy.IsNullOrEmpty() == true) && (!fullConfigTemplate.ProxyDetour.IsNullOrEmpty()) && !(Utils.IsPrivateNetwork(outbound.settings?.servers?.FirstOrDefault()?.address ?? string.Empty) || Utils.IsPrivateNetwork(outbound.settings?.vnext?.FirstOrDefault()?.address ?? string.Empty)))
+            {
+                outbound.streamSettings ??= new StreamSettings4Ray();
+                outbound.streamSettings.sockopt ??= new Sockopt4Ray();
+                outbound.streamSettings.sockopt.dialerProxy = fullConfigTemplate.ProxyDetour;
+            }
+            customOutboundsNode.Add(JsonUtils.DeepCopy(outbound));
+        }
+        fullConfigTemplateNode["outbounds"] = customOutboundsNode;
+
+        return await Task.FromResult(JsonUtils.Serialize(fullConfigTemplateNode));
+    }
+}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs
new file mode 100644
index 00000000..ddb47c99
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs
@@ -0,0 +1,426 @@
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigV2rayService
+{
+    private async Task<int> GenDns(ProfileItem? node, V2rayConfig v2rayConfig)
+    {
+        try
+        {
+            var item = await AppManager.Instance.GetDNSItem(ECoreType.Xray);
+            if (item != null && item.Enabled == true)
+            {
+                var result = await GenDnsCompatible(node, v2rayConfig);
+
+                if (v2rayConfig.routing.domainStrategy == Global.IPIfNonMatch)
+                {
+                    // DNS routing
+                    v2rayConfig.dns.tag = Global.DnsTag;
+                    v2rayConfig.routing.rules.Add(new RulesItem4Ray
+                    {
+                        type = "field",
+                        inboundTag = new List<string> { Global.DnsTag },
+                        outboundTag = Global.ProxyTag,
+                    });
+                }
+
+                return result;
+            }
+            var simpleDNSItem = _config.SimpleDNSItem;
+            var domainStrategy4Freedom = simpleDNSItem?.RayStrategy4Freedom;
+
+            //Outbound Freedom domainStrategy
+            if (domainStrategy4Freedom.IsNotEmpty())
+            {
+                var outbound = v2rayConfig.outbounds.FirstOrDefault(t => t is { protocol: "freedom", tag: Global.DirectTag });
+                if (outbound != null)
+                {
+                    outbound.settings = new()
+                    {
+                        domainStrategy = domainStrategy4Freedom,
+                        userLevel = 0
+                    };
+                }
+            }
+
+            await GenDnsServers(node, v2rayConfig, simpleDNSItem);
+            await GenDnsHosts(v2rayConfig, simpleDNSItem);
+
+            if (v2rayConfig.routing.domainStrategy == Global.IPIfNonMatch)
+            {
+                // DNS routing
+                v2rayConfig.dns.tag = Global.DnsTag;
+                v2rayConfig.routing.rules.Add(new RulesItem4Ray
+                {
+                    type = "field",
+                    inboundTag = new List<string> { Global.DnsTag },
+                    outboundTag = Global.ProxyTag,
+                });
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return 0;
+    }
+
+    private async Task<int> GenDnsServers(ProfileItem? node, V2rayConfig v2rayConfig, SimpleDNSItem simpleDNSItem)
+    {
+        static List<string> ParseDnsAddresses(string? dnsInput, string defaultAddress)
+        {
+            var addresses = dnsInput?.Split(dnsInput.Contains(',') ? ',' : ';')
+                .Select(addr => addr.Trim())
+                .Where(addr => !string.IsNullOrEmpty(addr))
+                .Select(addr => addr.StartsWith("dhcp", StringComparison.OrdinalIgnoreCase) ? "localhost" : addr)
+                .Distinct()
+                .ToList() ?? new List<string> { defaultAddress };
+            return addresses.Count > 0 ? addresses : new List<string> { defaultAddress };
+        }
+
+        static object CreateDnsServer(string dnsAddress, List<string> domains, List<string>? expectedIPs = null)
+        {
+            var dnsServer = new DnsServer4Ray
+            {
+                address = dnsAddress,
+                skipFallback = true,
+                domains = domains.Count > 0 ? domains : null,
+                expectedIPs = expectedIPs?.Count > 0 ? expectedIPs : null
+            };
+            return JsonUtils.SerializeToNode(dnsServer, new JsonSerializerOptions
+            {
+                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+            });
+        }
+
+        var directDNSAddress = ParseDnsAddresses(simpleDNSItem?.DirectDNS, Global.DomainDirectDNSAddress.FirstOrDefault());
+        var remoteDNSAddress = ParseDnsAddresses(simpleDNSItem?.RemoteDNS, Global.DomainRemoteDNSAddress.FirstOrDefault());
+
+        var directDomainList = new List<string>();
+        var directGeositeList = new List<string>();
+        var proxyDomainList = new List<string>();
+        var proxyGeositeList = new List<string>();
+        var expectedDomainList = new List<string>();
+        var expectedIPs = new List<string>();
+        var regionNames = new HashSet<string>();
+
+        if (!string.IsNullOrEmpty(simpleDNSItem?.DirectExpectedIPs))
+        {
+            expectedIPs = simpleDNSItem.DirectExpectedIPs
+                .Split(new[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(s => s.Trim())
+                .Where(s => !string.IsNullOrEmpty(s))
+                .ToList();
+
+            foreach (var ip in expectedIPs)
+            {
+                if (ip.StartsWith("geoip:", StringComparison.OrdinalIgnoreCase))
+                {
+                    var region = ip["geoip:".Length..];
+                    if (!string.IsNullOrEmpty(region))
+                    {
+                        regionNames.Add($"geosite:{region}");
+                        regionNames.Add($"geosite:geolocation-{region}");
+                        regionNames.Add($"geosite:tld-{region}");
+                    }
+                }
+            }
+        }
+
+        var routing = await ConfigHandler.GetDefaultRouting(_config);
+        List<RulesItem>? rules = null;
+        if (routing != null)
+        {
+            rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet) ?? [];
+            foreach (var item in rules)
+            {
+                if (!item.Enabled || item.Domain is null || item.Domain.Count == 0)
+                {
+                    continue;
+                }
+
+                foreach (var domain in item.Domain)
+                {
+                    if (domain.StartsWith('#'))
+                        continue;
+                    var normalizedDomain = domain.Replace(Global.RoutingRuleComma, ",");
+
+                    if (item.OutboundTag == Global.DirectTag)
+                    {
+                        if (normalizedDomain.StartsWith("geosite:"))
+                        {
+                            (regionNames.Contains(normalizedDomain) ? expectedDomainList : directGeositeList).Add(normalizedDomain);
+                        }
+                        else
+                        {
+                            directDomainList.Add(normalizedDomain);
+                        }
+                    }
+                    else if (item.OutboundTag != Global.BlockTag)
+                    {
+                        if (normalizedDomain.StartsWith("geosite:"))
+                        {
+                            proxyGeositeList.Add(normalizedDomain);
+                        }
+                        else
+                        {
+                            proxyDomainList.Add(normalizedDomain);
+                        }
+                    }
+                }
+            }
+        }
+
+        if (Utils.IsDomain(node?.Address))
+        {
+            directDomainList.Add(node.Address);
+        }
+
+        if (node?.Subid is not null)
+        {
+            var subItem = await AppManager.Instance.GetSubItem(node.Subid);
+            if (subItem is not null)
+            {
+                foreach (var profile in new[] { subItem.PrevProfile, subItem.NextProfile })
+                {
+                    var profileNode = await AppManager.Instance.GetProfileItemViaRemarks(profile);
+                    if (profileNode is not null &&
+                        profileNode.ConfigType is not (EConfigType.Custom or EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls) &&
+                        Utils.IsDomain(profileNode.Address))
+                    {
+                        directDomainList.Add(profileNode.Address);
+                    }
+                }
+            }
+        }
+
+        v2rayConfig.dns ??= new Dns4Ray();
+        v2rayConfig.dns.servers ??= new List<object>();
+
+        void AddDnsServers(List<string> dnsAddresses, List<string> domains, List<string>? expectedIPs = null)
+        {
+            if (domains.Count > 0)
+            {
+                foreach (var dnsAddress in dnsAddresses)
+                {
+                    v2rayConfig.dns.servers.Add(CreateDnsServer(dnsAddress, domains, expectedIPs));
+                }
+            }
+        }
+
+        AddDnsServers(remoteDNSAddress, proxyDomainList);
+        AddDnsServers(directDNSAddress, directDomainList);
+        AddDnsServers(remoteDNSAddress, proxyGeositeList);
+        AddDnsServers(directDNSAddress, directGeositeList);
+        AddDnsServers(directDNSAddress, expectedDomainList, expectedIPs);
+
+        var useDirectDns = rules?.LastOrDefault() is { } lastRule &&
+                          lastRule.OutboundTag == Global.DirectTag &&
+                          (lastRule.Port == "0-65535" ||
+                           lastRule.Network == "tcp,udp" ||
+                           lastRule.Ip?.Contains("0.0.0.0/0") == true);
+
+        var defaultDnsServers = useDirectDns ? directDNSAddress : remoteDNSAddress;
+        v2rayConfig.dns.servers.AddRange(defaultDnsServers);
+
+        return 0;
+    }
+
+    private async Task<int> GenDnsHosts(V2rayConfig v2rayConfig, SimpleDNSItem simpleDNSItem)
+    {
+        if (simpleDNSItem.AddCommonHosts == false && simpleDNSItem.UseSystemHosts == false && simpleDNSItem.Hosts.IsNullOrEmpty())
+        {
+            return await Task.FromResult(0);
+        }
+        v2rayConfig.dns ??= new Dns4Ray();
+        v2rayConfig.dns.hosts ??= new Dictionary<string, object>();
+        if (simpleDNSItem.AddCommonHosts == true)
+        {
+            v2rayConfig.dns.hosts = Global.PredefinedHosts.ToDictionary(
+                kvp => kvp.Key,
+                kvp => (object)kvp.Value
+            );
+        }
+
+        if (simpleDNSItem.UseSystemHosts == true)
+        {
+            var systemHosts = Utils.GetSystemHosts();
+            if (systemHosts.Count > 0)
+            {
+                var normalHost = v2rayConfig.dns.hosts;
+                if (normalHost != null)
+                {
+                    foreach (var host in systemHosts)
+                    {
+                        if (normalHost[host.Key] != null)
+                        {
+                            continue;
+                        }
+                        normalHost[host.Key] = new List<string> { host.Value };
+                    }
+                }
+            }
+        }
+
+        var userHostsMap = simpleDNSItem.Hosts?
+            .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
+            .Where(line => !string.IsNullOrWhiteSpace(line))
+            .Where(line => line.Contains(' '))
+            .ToDictionary(
+                line =>
+                {
+                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                    return parts[0];
+                },
+                line =>
+                {
+                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                    var values = parts.Skip(1).ToList();
+                    return values;
+                }
+            );
+
+        if (userHostsMap != null)
+        {
+            foreach (var kvp in userHostsMap)
+            {
+                v2rayConfig.dns.hosts[kvp.Key] = kvp.Value;
+            }
+        }
+        return await Task.FromResult(0);
+    }
+
+    private async Task<int> GenDnsCompatible(ProfileItem? node, V2rayConfig v2rayConfig)
+    {
+        try
+        {
+            var item = await AppManager.Instance.GetDNSItem(ECoreType.Xray);
+            var normalDNS = item?.NormalDNS;
+            var domainStrategy4Freedom = item?.DomainStrategy4Freedom;
+            if (normalDNS.IsNullOrEmpty())
+            {
+                normalDNS = EmbedUtils.GetEmbedText(Global.DNSV2rayNormalFileName);
+            }
+
+            //Outbound Freedom domainStrategy
+            if (domainStrategy4Freedom.IsNotEmpty())
+            {
+                var outbound = v2rayConfig.outbounds.FirstOrDefault(t => t is { protocol: "freedom", tag: Global.DirectTag });
+                if (outbound != null)
+                {
+                    outbound.settings = new();
+                    outbound.settings.domainStrategy = domainStrategy4Freedom;
+                    outbound.settings.userLevel = 0;
+                }
+            }
+
+            var obj = JsonUtils.ParseJson(normalDNS);
+            if (obj is null)
+            {
+                List<string> servers = [];
+                string[] arrDNS = normalDNS.Split(',');
+                foreach (string str in arrDNS)
+                {
+                    servers.Add(str);
+                }
+                obj = JsonUtils.ParseJson("{}");
+                obj["servers"] = JsonUtils.SerializeToNode(servers);
+            }
+
+            // Append to dns settings
+            if (item.UseSystemHosts)
+            {
+                var systemHosts = Utils.GetSystemHosts();
+                if (systemHosts.Count > 0)
+                {
+                    var normalHost1 = obj["hosts"];
+                    if (normalHost1 != null)
+                    {
+                        foreach (var host in systemHosts)
+                        {
+                            if (normalHost1[host.Key] != null)
+                                continue;
+                            normalHost1[host.Key] = host.Value;
+                        }
+                    }
+                }
+            }
+            var normalHost = obj["hosts"];
+            if (normalHost != null)
+            {
+                foreach (var hostProp in normalHost.AsObject().ToList())
+                {
+                    if (hostProp.Value is JsonValue value && value.TryGetValue<string>(out var ip))
+                    {
+                        normalHost[hostProp.Key] = new JsonArray(ip);
+                    }
+                }
+            }
+
+            await GenDnsDomainsCompatible(node, obj, item);
+
+            v2rayConfig.dns = JsonUtils.Deserialize<Dns4Ray>(JsonUtils.Serialize(obj));
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return 0;
+    }
+
+    private async Task<int> GenDnsDomainsCompatible(ProfileItem? node, JsonNode dns, DNSItem? dNSItem)
+    {
+        if (node == null)
+        {
+            return 0;
+        }
+        var servers = dns["servers"];
+        if (servers != null)
+        {
+            var domainList = new List<string>();
+            if (Utils.IsDomain(node.Address))
+            {
+                domainList.Add(node.Address);
+            }
+            var subItem = await AppManager.Instance.GetSubItem(node.Subid);
+            if (subItem is not null)
+            {
+                // Previous proxy
+                var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+                if (prevNode is not null
+                    && prevNode.ConfigType != EConfigType.Custom
+                    && prevNode.ConfigType != EConfigType.Hysteria2
+                    && prevNode.ConfigType != EConfigType.TUIC
+                    && Utils.IsDomain(prevNode.Address))
+                {
+                    domainList.Add(prevNode.Address);
+                }
+
+                // Next proxy
+                var nextNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
+                if (nextNode is not null
+                    && nextNode.ConfigType != EConfigType.Custom
+                    && nextNode.ConfigType != EConfigType.Hysteria2
+                    && nextNode.ConfigType != EConfigType.TUIC
+                    && Utils.IsDomain(nextNode.Address))
+                {
+                    domainList.Add(nextNode.Address);
+                }
+            }
+            if (domainList.Count > 0)
+            {
+                var dnsServer = new DnsServer4Ray()
+                {
+                    address = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainPureIPDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress,
+                    skipFallback = true,
+                    domains = domainList
+                };
+                servers.AsArray().Add(JsonUtils.SerializeToNode(dnsServer));
+            }
+        }
+        return await Task.FromResult(0);
+    }
+}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayInboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayInboundService.cs
new file mode 100644
index 00000000..7753c21e
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayInboundService.cs
@@ -0,0 +1,72 @@
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigV2rayService
+{
+    private async Task<int> GenInbounds(V2rayConfig v2rayConfig)
+    {
+        try
+        {
+            var listen = "0.0.0.0";
+            v2rayConfig.inbounds = [];
+
+            var inbound = GetInbound(_config.Inbound.First(), EInboundProtocol.socks, true);
+            v2rayConfig.inbounds.Add(inbound);
+
+            if (_config.Inbound.First().SecondLocalPortEnabled)
+            {
+                var inbound2 = GetInbound(_config.Inbound.First(), EInboundProtocol.socks2, true);
+                v2rayConfig.inbounds.Add(inbound2);
+            }
+
+            if (_config.Inbound.First().AllowLANConn)
+            {
+                if (_config.Inbound.First().NewPort4LAN)
+                {
+                    var inbound3 = GetInbound(_config.Inbound.First(), EInboundProtocol.socks3, true);
+                    inbound3.listen = listen;
+                    v2rayConfig.inbounds.Add(inbound3);
+
+                    //auth
+                    if (_config.Inbound.First().User.IsNotEmpty() && _config.Inbound.First().Pass.IsNotEmpty())
+                    {
+                        inbound3.settings.auth = "password";
+                        inbound3.settings.accounts = new List<AccountsItem4Ray> { new AccountsItem4Ray() { user = _config.Inbound.First().User, pass = _config.Inbound.First().Pass } };
+                    }
+                }
+                else
+                {
+                    inbound.listen = listen;
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return await Task.FromResult(0);
+    }
+
+    private Inbounds4Ray GetInbound(InItem inItem, EInboundProtocol protocol, bool bSocks)
+    {
+        string result = EmbedUtils.GetEmbedText(Global.V2raySampleInbound);
+        if (result.IsNullOrEmpty())
+        {
+            return new();
+        }
+
+        var inbound = JsonUtils.Deserialize<Inbounds4Ray>(result);
+        if (inbound == null)
+        {
+            return new();
+        }
+        inbound.tag = protocol.ToString();
+        inbound.port = inItem.LocalPort + (int)protocol;
+        inbound.protocol = EInboundProtocol.mixed.ToString();
+        inbound.settings.udp = inItem.UdpEnabled;
+        inbound.sniffing.enabled = inItem.SniffingEnabled;
+        inbound.sniffing.destOverride = inItem.DestOverride;
+        inbound.sniffing.routeOnly = inItem.RouteOnly;
+
+        return inbound;
+    }
+}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayLogService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayLogService.cs
new file mode 100644
index 00000000..5b9344fb
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayLogService.cs
@@ -0,0 +1,29 @@
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigV2rayService
+{
+    private async Task<int> GenLog(V2rayConfig v2rayConfig)
+    {
+        try
+        {
+            if (_config.CoreBasicItem.LogEnabled)
+            {
+                var dtNow = DateTime.Now;
+                v2rayConfig.log.loglevel = _config.CoreBasicItem.Loglevel;
+                v2rayConfig.log.access = Utils.GetLogPath($"Vaccess_{dtNow:yyyy-MM-dd}.txt");
+                v2rayConfig.log.error = Utils.GetLogPath($"Verror_{dtNow:yyyy-MM-dd}.txt");
+            }
+            else
+            {
+                v2rayConfig.log.loglevel = _config.CoreBasicItem.Loglevel;
+                v2rayConfig.log.access = null;
+                v2rayConfig.log.error = null;
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return await Task.FromResult(0);
+    }
+}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs
new file mode 100644
index 00000000..a40f2d73
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs
@@ -0,0 +1,704 @@
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigV2rayService
+{
+    private async Task<int> GenOutbound(ProfileItem node, Outbounds4Ray outbound)
+    {
+        try
+        {
+            var muxEnabled = node.MuxEnabled ?? _config.CoreBasicItem.MuxEnabled;
+            switch (node.ConfigType)
+            {
+                case EConfigType.VMess:
+                    {
+                        VnextItem4Ray vnextItem;
+                        if (outbound.settings.vnext.Count <= 0)
+                        {
+                            vnextItem = new VnextItem4Ray();
+                            outbound.settings.vnext.Add(vnextItem);
+                        }
+                        else
+                        {
+                            vnextItem = outbound.settings.vnext.First();
+                        }
+                        vnextItem.address = node.Address;
+                        vnextItem.port = node.Port;
+
+                        UsersItem4Ray usersItem;
+                        if (vnextItem.users.Count <= 0)
+                        {
+                            usersItem = new UsersItem4Ray();
+                            vnextItem.users.Add(usersItem);
+                        }
+                        else
+                        {
+                            usersItem = vnextItem.users.First();
+                        }
+
+                        usersItem.id = node.Id;
+                        usersItem.alterId = node.AlterId;
+                        usersItem.email = Global.UserEMail;
+                        if (Global.VmessSecurities.Contains(node.Security))
+                        {
+                            usersItem.security = node.Security;
+                        }
+                        else
+                        {
+                            usersItem.security = Global.DefaultSecurity;
+                        }
+
+                        await GenOutboundMux(node, outbound, muxEnabled, muxEnabled);
+
+                        outbound.settings.servers = null;
+                        break;
+                    }
+                case EConfigType.Shadowsocks:
+                    {
+                        ServersItem4Ray serversItem;
+                        if (outbound.settings.servers.Count <= 0)
+                        {
+                            serversItem = new ServersItem4Ray();
+                            outbound.settings.servers.Add(serversItem);
+                        }
+                        else
+                        {
+                            serversItem = outbound.settings.servers.First();
+                        }
+                        serversItem.address = node.Address;
+                        serversItem.port = node.Port;
+                        serversItem.password = node.Id;
+                        serversItem.method = AppManager.Instance.GetShadowsocksSecurities(node).Contains(node.Security) ? node.Security : "none";
+
+                        serversItem.ota = false;
+                        serversItem.level = 1;
+
+                        await GenOutboundMux(node, outbound);
+
+                        outbound.settings.vnext = null;
+                        break;
+                    }
+                case EConfigType.SOCKS:
+                case EConfigType.HTTP:
+                    {
+                        ServersItem4Ray serversItem;
+                        if (outbound.settings.servers.Count <= 0)
+                        {
+                            serversItem = new ServersItem4Ray();
+                            outbound.settings.servers.Add(serversItem);
+                        }
+                        else
+                        {
+                            serversItem = outbound.settings.servers.First();
+                        }
+                        serversItem.address = node.Address;
+                        serversItem.port = node.Port;
+                        serversItem.method = null;
+                        serversItem.password = null;
+
+                        if (node.Security.IsNotEmpty()
+                            && node.Id.IsNotEmpty())
+                        {
+                            SocksUsersItem4Ray socksUsersItem = new()
+                            {
+                                user = node.Security,
+                                pass = node.Id,
+                                level = 1
+                            };
+
+                            serversItem.users = new List<SocksUsersItem4Ray>() { socksUsersItem };
+                        }
+
+                        await GenOutboundMux(node, outbound);
+
+                        outbound.settings.vnext = null;
+                        break;
+                    }
+                case EConfigType.VLESS:
+                    {
+                        VnextItem4Ray vnextItem;
+                        if (outbound.settings.vnext?.Count <= 0)
+                        {
+                            vnextItem = new VnextItem4Ray();
+                            outbound.settings.vnext.Add(vnextItem);
+                        }
+                        else
+                        {
+                            vnextItem = outbound.settings.vnext.First();
+                        }
+                        vnextItem.address = node.Address;
+                        vnextItem.port = node.Port;
+
+                        UsersItem4Ray usersItem;
+                        if (vnextItem.users.Count <= 0)
+                        {
+                            usersItem = new UsersItem4Ray();
+                            vnextItem.users.Add(usersItem);
+                        }
+                        else
+                        {
+                            usersItem = vnextItem.users.First();
+                        }
+                        usersItem.id = node.Id;
+                        usersItem.email = Global.UserEMail;
+                        usersItem.encryption = node.Security;
+
+                        if (node.Flow.IsNullOrEmpty())
+                        {
+                            await GenOutboundMux(node, outbound, muxEnabled, muxEnabled);
+                        }
+                        else
+                        {
+                            usersItem.flow = node.Flow;
+                            await GenOutboundMux(node, outbound, false, muxEnabled);
+                        }
+                        outbound.settings.servers = null;
+                        break;
+                    }
+                case EConfigType.Trojan:
+                    {
+                        ServersItem4Ray serversItem;
+                        if (outbound.settings.servers.Count <= 0)
+                        {
+                            serversItem = new ServersItem4Ray();
+                            outbound.settings.servers.Add(serversItem);
+                        }
+                        else
+                        {
+                            serversItem = outbound.settings.servers.First();
+                        }
+                        serversItem.address = node.Address;
+                        serversItem.port = node.Port;
+                        serversItem.password = node.Id;
+
+                        serversItem.ota = false;
+                        serversItem.level = 1;
+
+                        await GenOutboundMux(node, outbound);
+
+                        outbound.settings.vnext = null;
+                        break;
+                    }
+                case EConfigType.WireGuard:
+                    {
+                        var peer = new WireguardPeer4Ray
+                        {
+                            publicKey = node.PublicKey,
+                            endpoint = node.Address + ":" + node.Port.ToString()
+                        };
+                        var setting = new Outboundsettings4Ray
+                        {
+                            address = Utils.String2List(node.RequestHost),
+                            secretKey = node.Id,
+                            reserved = Utils.String2List(node.Path)?.Select(int.Parse).ToList(),
+                            mtu = node.ShortId.IsNullOrEmpty() ? Global.TunMtus.First() : node.ShortId.ToInt(),
+                            peers = new List<WireguardPeer4Ray> { peer }
+                        };
+                        outbound.settings = setting;
+                        outbound.settings.vnext = null;
+                        outbound.settings.servers = null;
+                        break;
+                    }
+            }
+
+            outbound.protocol = Global.ProtocolTypes[node.ConfigType];
+            await GenBoundStreamSettings(node, outbound);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return 0;
+    }
+
+    private async Task<int> GenOutboundMux(ProfileItem node, Outbounds4Ray outbound, bool enabledTCP = false, bool enabledUDP = false)
+    {
+        try
+        {
+            outbound.mux.enabled = false;
+            outbound.mux.concurrency = -1;
+
+            if (enabledTCP)
+            {
+                outbound.mux.enabled = true;
+                outbound.mux.concurrency = _config.Mux4RayItem.Concurrency;
+            }
+            else if (enabledUDP)
+            {
+                outbound.mux.enabled = true;
+                outbound.mux.xudpConcurrency = _config.Mux4RayItem.XudpConcurrency;
+                outbound.mux.xudpProxyUDP443 = _config.Mux4RayItem.XudpProxyUDP443;
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return await Task.FromResult(0);
+    }
+
+    private async Task<int> GenBoundStreamSettings(ProfileItem node, Outbounds4Ray outbound)
+    {
+        try
+        {
+            var streamSettings = outbound.streamSettings;
+            streamSettings.network = node.GetNetwork();
+            var host = node.RequestHost.TrimEx();
+            var path = node.Path.TrimEx();
+            var sni = node.Sni.TrimEx();
+            var useragent = "";
+            if (!_config.CoreBasicItem.DefUserAgent.IsNullOrEmpty())
+            {
+                try
+                {
+                    useragent = Global.UserAgentTexts[_config.CoreBasicItem.DefUserAgent];
+                }
+                catch (KeyNotFoundException)
+                {
+                    useragent = _config.CoreBasicItem.DefUserAgent;
+                }
+            }
+
+            //if tls
+            if (node.StreamSecurity == Global.StreamSecurity)
+            {
+                streamSettings.security = node.StreamSecurity;
+
+                TlsSettings4Ray tlsSettings = new()
+                {
+                    allowInsecure = Utils.ToBool(node.AllowInsecure.IsNullOrEmpty() ? _config.CoreBasicItem.DefAllowInsecure.ToString().ToLower() : node.AllowInsecure),
+                    alpn = node.GetAlpn(),
+                    fingerprint = node.Fingerprint.IsNullOrEmpty() ? _config.CoreBasicItem.DefFingerprint : node.Fingerprint
+                };
+                if (sni.IsNotEmpty())
+                {
+                    tlsSettings.serverName = sni;
+                }
+                else if (host.IsNotEmpty())
+                {
+                    tlsSettings.serverName = Utils.String2List(host)?.First();
+                }
+                streamSettings.tlsSettings = tlsSettings;
+            }
+
+            //if Reality
+            if (node.StreamSecurity == Global.StreamSecurityReality)
+            {
+                streamSettings.security = node.StreamSecurity;
+
+                TlsSettings4Ray realitySettings = new()
+                {
+                    fingerprint = node.Fingerprint.IsNullOrEmpty() ? _config.CoreBasicItem.DefFingerprint : node.Fingerprint,
+                    serverName = sni,
+                    publicKey = node.PublicKey,
+                    shortId = node.ShortId,
+                    spiderX = node.SpiderX,
+                    mldsa65Verify = node.Mldsa65Verify,
+                    show = false,
+                };
+
+                streamSettings.realitySettings = realitySettings;
+            }
+
+            //streamSettings
+            switch (node.GetNetwork())
+            {
+                case nameof(ETransport.kcp):
+                    KcpSettings4Ray kcpSettings = new()
+                    {
+                        mtu = _config.KcpItem.Mtu,
+                        tti = _config.KcpItem.Tti
+                    };
+
+                    kcpSettings.uplinkCapacity = _config.KcpItem.UplinkCapacity;
+                    kcpSettings.downlinkCapacity = _config.KcpItem.DownlinkCapacity;
+
+                    kcpSettings.congestion = _config.KcpItem.Congestion;
+                    kcpSettings.readBufferSize = _config.KcpItem.ReadBufferSize;
+                    kcpSettings.writeBufferSize = _config.KcpItem.WriteBufferSize;
+                    kcpSettings.header = new Header4Ray
+                    {
+                        type = node.HeaderType,
+                        domain = host.IsNullOrEmpty() ? null : host
+                    };
+                    if (path.IsNotEmpty())
+                    {
+                        kcpSettings.seed = path;
+                    }
+                    streamSettings.kcpSettings = kcpSettings;
+                    break;
+                //ws
+                case nameof(ETransport.ws):
+                    WsSettings4Ray wsSettings = new();
+                    wsSettings.headers = new Headers4Ray();
+
+                    if (host.IsNotEmpty())
+                    {
+                        wsSettings.host = host;
+                        wsSettings.headers.Host = host;
+                    }
+                    if (path.IsNotEmpty())
+                    {
+                        wsSettings.path = path;
+                    }
+                    if (useragent.IsNotEmpty())
+                    {
+                        wsSettings.headers.UserAgent = useragent;
+                    }
+                    streamSettings.wsSettings = wsSettings;
+
+                    break;
+                //httpupgrade
+                case nameof(ETransport.httpupgrade):
+                    HttpupgradeSettings4Ray httpupgradeSettings = new();
+
+                    if (path.IsNotEmpty())
+                    {
+                        httpupgradeSettings.path = path;
+                    }
+                    if (host.IsNotEmpty())
+                    {
+                        httpupgradeSettings.host = host;
+                    }
+                    streamSettings.httpupgradeSettings = httpupgradeSettings;
+
+                    break;
+                //xhttp
+                case nameof(ETransport.xhttp):
+                    streamSettings.network = ETransport.xhttp.ToString();
+                    XhttpSettings4Ray xhttpSettings = new();
+
+                    if (path.IsNotEmpty())
+                    {
+                        xhttpSettings.path = path;
+                    }
+                    if (host.IsNotEmpty())
+                    {
+                        xhttpSettings.host = host;
+                    }
+                    if (node.HeaderType.IsNotEmpty() && Global.XhttpMode.Contains(node.HeaderType))
+                    {
+                        xhttpSettings.mode = node.HeaderType;
+                    }
+                    if (node.Extra.IsNotEmpty())
+                    {
+                        xhttpSettings.extra = JsonUtils.ParseJson(node.Extra);
+                    }
+
+                    streamSettings.xhttpSettings = xhttpSettings;
+                    await GenOutboundMux(node, outbound);
+
+                    break;
+                //h2
+                case nameof(ETransport.h2):
+                    HttpSettings4Ray httpSettings = new();
+
+                    if (host.IsNotEmpty())
+                    {
+                        httpSettings.host = Utils.String2List(host);
+                    }
+                    httpSettings.path = path;
+
+                    streamSettings.httpSettings = httpSettings;
+
+                    break;
+                //quic
+                case nameof(ETransport.quic):
+                    QuicSettings4Ray quicsettings = new()
+                    {
+                        security = host,
+                        key = path,
+                        header = new Header4Ray
+                        {
+                            type = node.HeaderType
+                        }
+                    };
+                    streamSettings.quicSettings = quicsettings;
+                    if (node.StreamSecurity == Global.StreamSecurity)
+                    {
+                        if (sni.IsNotEmpty())
+                        {
+                            streamSettings.tlsSettings.serverName = sni;
+                        }
+                        else
+                        {
+                            streamSettings.tlsSettings.serverName = node.Address;
+                        }
+                    }
+                    break;
+
+                case nameof(ETransport.grpc):
+                    GrpcSettings4Ray grpcSettings = new()
+                    {
+                        authority = host.IsNullOrEmpty() ? null : host,
+                        serviceName = path,
+                        multiMode = node.HeaderType == Global.GrpcMultiMode,
+                        idle_timeout = _config.GrpcItem.IdleTimeout,
+                        health_check_timeout = _config.GrpcItem.HealthCheckTimeout,
+                        permit_without_stream = _config.GrpcItem.PermitWithoutStream,
+                        initial_windows_size = _config.GrpcItem.InitialWindowsSize,
+                    };
+                    streamSettings.grpcSettings = grpcSettings;
+                    break;
+
+                default:
+                    //tcp
+                    if (node.HeaderType == Global.TcpHeaderHttp)
+                    {
+                        TcpSettings4Ray tcpSettings = new()
+                        {
+                            header = new Header4Ray
+                            {
+                                type = node.HeaderType
+                            }
+                        };
+
+                        //request Host
+                        string request = EmbedUtils.GetEmbedText(Global.V2raySampleHttpRequestFileName);
+                        string[] arrHost = host.Split(',');
+                        string host2 = string.Join(",".AppendQuotes(), arrHost);
+                        request = request.Replace("$requestHost$", $"{host2.AppendQuotes()}");
+                        request = request.Replace("$requestUserAgent$", $"{useragent.AppendQuotes()}");
+                        //Path
+                        string pathHttp = @"/";
+                        if (path.IsNotEmpty())
+                        {
+                            string[] arrPath = path.Split(',');
+                            pathHttp = string.Join(",".AppendQuotes(), arrPath);
+                        }
+                        request = request.Replace("$requestPath$", $"{pathHttp.AppendQuotes()}");
+                        tcpSettings.header.request = JsonUtils.Deserialize<object>(request);
+
+                        streamSettings.tcpSettings = tcpSettings;
+                    }
+                    break;
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return 0;
+    }
+
+    private async Task<int> GenMoreOutbounds(ProfileItem node, V2rayConfig v2rayConfig)
+    {
+        //fragment proxy
+        if (_config.CoreBasicItem.EnableFragment
+            && v2rayConfig.outbounds.First().streamSettings?.security.IsNullOrEmpty() == false)
+        {
+            var fragmentOutbound = new Outbounds4Ray
+            {
+                protocol = "freedom",
+                tag = $"{Global.ProxyTag}3",
+                settings = new()
+                {
+                    fragment = new()
+                    {
+                        packets = _config.Fragment4RayItem?.Packets,
+                        length = _config.Fragment4RayItem?.Length,
+                        interval = _config.Fragment4RayItem?.Interval
+                    }
+                }
+            };
+
+            v2rayConfig.outbounds.Add(fragmentOutbound);
+            v2rayConfig.outbounds.First().streamSettings.sockopt = new()
+            {
+                dialerProxy = fragmentOutbound.tag
+            };
+            return 0;
+        }
+
+        if (node.Subid.IsNullOrEmpty())
+        {
+            return 0;
+        }
+        try
+        {
+            var subItem = await AppManager.Instance.GetSubItem(node.Subid);
+            if (subItem is null)
+            {
+                return 0;
+            }
+
+            //current proxy
+            var outbound = v2rayConfig.outbounds.First();
+            var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
+
+            //Previous proxy
+            var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+            string? prevOutboundTag = null;
+            if (prevNode is not null
+                && prevNode.ConfigType != EConfigType.Custom
+                && prevNode.ConfigType != EConfigType.Hysteria2
+                && prevNode.ConfigType != EConfigType.TUIC
+                && prevNode.ConfigType != EConfigType.Anytls)
+            {
+                var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
+                await GenOutbound(prevNode, prevOutbound);
+                prevOutboundTag = $"prev-{Global.ProxyTag}";
+                prevOutbound.tag = prevOutboundTag;
+                v2rayConfig.outbounds.Add(prevOutbound);
+            }
+            var nextOutbound = await GenChainOutbounds(subItem, outbound, prevOutboundTag);
+
+            if (nextOutbound is not null)
+            {
+                v2rayConfig.outbounds.Insert(0, nextOutbound);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+
+        return 0;
+    }
+
+    private async Task<int> GenOutboundsList(List<ProfileItem> nodes, V2rayConfig v2rayConfig)
+    {
+        try
+        {
+            // Get template and initialize list
+            var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
+            if (txtOutbound.IsNullOrEmpty())
+            {
+                return 0;
+            }
+
+            var resultOutbounds = new List<Outbounds4Ray>();
+            var prevOutbounds = new List<Outbounds4Ray>(); // Separate list for prev outbounds and fragment
+
+            // Cache for chain proxies to avoid duplicate generation
+            var nextProxyCache = new Dictionary<string, Outbounds4Ray?>();
+            var prevProxyTags = new Dictionary<string, string?>(); // Map from profile name to tag
+            int prevIndex = 0; // Index for prev outbounds
+
+            // Process nodes
+            int index = 0;
+            foreach (var node in nodes)
+            {
+                index++;
+
+                // Handle proxy chain
+                string? prevTag = null;
+                var currentOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
+                var nextOutbound = nextProxyCache.GetValueOrDefault(node.Subid, null);
+                if (nextOutbound != null)
+                {
+                    nextOutbound = JsonUtils.DeepCopy(nextOutbound);
+                }
+
+                var subItem = await AppManager.Instance.GetSubItem(node.Subid);
+
+                // current proxy
+                await GenOutbound(node, currentOutbound);
+                currentOutbound.tag = $"{Global.ProxyTag}-{index}";
+
+                if (!node.Subid.IsNullOrEmpty())
+                {
+                    if (prevProxyTags.TryGetValue(node.Subid, out var value))
+                    {
+                        prevTag = value; // maybe null
+                    }
+                    else
+                    {
+                        var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+                        if (prevNode is not null
+                            && prevNode.ConfigType != EConfigType.Custom
+                            && prevNode.ConfigType != EConfigType.Hysteria2
+                            && prevNode.ConfigType != EConfigType.TUIC
+                            && prevNode.ConfigType != EConfigType.Anytls)
+                        {
+                            var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
+                            await GenOutbound(prevNode, prevOutbound);
+                            prevTag = $"prev-{Global.ProxyTag}-{++prevIndex}";
+                            prevOutbound.tag = prevTag;
+                            prevOutbounds.Add(prevOutbound);
+                        }
+                        prevProxyTags[node.Subid] = prevTag;
+                    }
+
+                    nextOutbound = await GenChainOutbounds(subItem, currentOutbound, prevTag, nextOutbound);
+                    if (!nextProxyCache.ContainsKey(node.Subid))
+                    {
+                        nextProxyCache[node.Subid] = nextOutbound;
+                    }
+                }
+
+                if (nextOutbound is not null)
+                {
+                    resultOutbounds.Add(nextOutbound);
+                }
+                resultOutbounds.Add(currentOutbound);
+            }
+
+            // Merge results: first the main chain outbounds, then other outbounds, and finally utility outbounds
+            resultOutbounds.AddRange(prevOutbounds);
+            resultOutbounds.AddRange(v2rayConfig.outbounds);
+            v2rayConfig.outbounds = resultOutbounds;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+
+        return 0;
+    }
+
+    /// <summary>
+    /// Generates a chained outbound configuration for the given subItem and outbound.
+    /// The outbound's tag must be set before calling this method.
+    /// Returns the next proxy's outbound configuration, which may be null if no next proxy exists.
+    /// </summary>
+    /// <param name="subItem">The subscription item containing proxy chain information.</param>
+    /// <param name="outbound">The current outbound configuration. Its tag must be set before calling this method.</param>
+    /// <param name="prevOutboundTag">The tag of the previous outbound in the chain, if any.</param>
+    /// <param name="nextOutbound">The outbound for the next proxy in the chain, if already created. If null, will be created inside.</param>
+    /// <returns>
+    /// The outbound configuration for the next proxy in the chain, or null if no next proxy exists.
+    /// </returns>
+    private async Task<Outbounds4Ray?> GenChainOutbounds(SubItem subItem, Outbounds4Ray outbound, string? prevOutboundTag, Outbounds4Ray? nextOutbound = null)
+    {
+        try
+        {
+            var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
+
+            if (!prevOutboundTag.IsNullOrEmpty())
+            {
+                outbound.streamSettings.sockopt = new()
+                {
+                    dialerProxy = prevOutboundTag
+                };
+            }
+
+            // Next proxy
+            var nextNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
+            if (nextNode is not null
+                && nextNode.ConfigType != EConfigType.Custom
+                && nextNode.ConfigType != EConfigType.Hysteria2
+                && nextNode.ConfigType != EConfigType.TUIC
+                && nextNode.ConfigType != EConfigType.Anytls)
+            {
+                if (nextOutbound == null)
+                {
+                    nextOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
+                    await GenOutbound(nextNode, nextOutbound);
+                }
+                nextOutbound.tag = outbound.tag;
+
+                outbound.tag = $"mid-{outbound.tag}";
+                nextOutbound.streamSettings.sockopt = new()
+                {
+                    dialerProxy = outbound.tag
+                };
+            }
+            return nextOutbound;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return null;
+    }
+}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs
new file mode 100644
index 00000000..fe5d64dc
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs
@@ -0,0 +1,145 @@
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigV2rayService
+{
+    private async Task<int> GenRouting(V2rayConfig v2rayConfig)
+    {
+        try
+        {
+            if (v2rayConfig.routing?.rules != null)
+            {
+                v2rayConfig.routing.domainStrategy = _config.RoutingBasicItem.DomainStrategy;
+
+                var routing = await ConfigHandler.GetDefaultRouting(_config);
+                if (routing != null)
+                {
+                    if (routing.DomainStrategy.IsNotEmpty())
+                    {
+                        v2rayConfig.routing.domainStrategy = routing.DomainStrategy;
+                    }
+                    var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet);
+                    foreach (var item in rules)
+                    {
+                        if (item.Enabled)
+                        {
+                            var item2 = JsonUtils.Deserialize<RulesItem4Ray>(JsonUtils.Serialize(item));
+                            await GenRoutingUserRule(item2, v2rayConfig);
+                        }
+                    }
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return 0;
+    }
+
+    private async Task<int> GenRoutingUserRule(RulesItem4Ray? rule, V2rayConfig v2rayConfig)
+    {
+        try
+        {
+            if (rule == null)
+            {
+                return 0;
+            }
+            rule.outboundTag = await GenRoutingUserRuleOutbound(rule.outboundTag, v2rayConfig);
+
+            if (rule.port.IsNullOrEmpty())
+            {
+                rule.port = null;
+            }
+            if (rule.network.IsNullOrEmpty())
+            {
+                rule.network = null;
+            }
+            if (rule.domain?.Count == 0)
+            {
+                rule.domain = null;
+            }
+            if (rule.ip?.Count == 0)
+            {
+                rule.ip = null;
+            }
+            if (rule.protocol?.Count == 0)
+            {
+                rule.protocol = null;
+            }
+            if (rule.inboundTag?.Count == 0)
+            {
+                rule.inboundTag = null;
+            }
+
+            var hasDomainIp = false;
+            if (rule.domain?.Count > 0)
+            {
+                var it = JsonUtils.DeepCopy(rule);
+                it.ip = null;
+                it.type = "field";
+                for (var k = it.domain.Count - 1; k >= 0; k--)
+                {
+                    if (it.domain[k].StartsWith("#"))
+                    {
+                        it.domain.RemoveAt(k);
+                    }
+                    it.domain[k] = it.domain[k].Replace(Global.RoutingRuleComma, ",");
+                }
+                v2rayConfig.routing.rules.Add(it);
+                hasDomainIp = true;
+            }
+            if (rule.ip?.Count > 0)
+            {
+                var it = JsonUtils.DeepCopy(rule);
+                it.domain = null;
+                it.type = "field";
+                v2rayConfig.routing.rules.Add(it);
+                hasDomainIp = true;
+            }
+            if (!hasDomainIp)
+            {
+                if (rule.port.IsNotEmpty()
+                    || rule.protocol?.Count > 0
+                    || rule.inboundTag?.Count > 0
+                    || rule.network != null
+                    )
+                {
+                    var it = JsonUtils.DeepCopy(rule);
+                    it.type = "field";
+                    v2rayConfig.routing.rules.Add(it);
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return await Task.FromResult(0);
+    }
+
+    private async Task<string?> GenRoutingUserRuleOutbound(string outboundTag, V2rayConfig v2rayConfig)
+    {
+        if (Global.OutboundTags.Contains(outboundTag))
+        {
+            return outboundTag;
+        }
+
+        var node = await AppManager.Instance.GetProfileItemViaRemarks(outboundTag);
+        if (node == null
+            || node.ConfigType == EConfigType.Custom
+            || node.ConfigType == EConfigType.Hysteria2
+            || node.ConfigType == EConfigType.TUIC
+            || node.ConfigType == EConfigType.Anytls)
+        {
+            return Global.ProxyTag;
+        }
+
+        var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
+        var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
+        await GenOutbound(node, outbound);
+        outbound.tag = Global.ProxyTag + node.IndexId.ToString();
+        v2rayConfig.outbounds.Add(outbound);
+
+        return outbound.tag;
+    }
+}
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayStatisticService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayStatisticService.cs
new file mode 100644
index 00000000..1269a11f
--- /dev/null
+++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayStatisticService.cs
@@ -0,0 +1,51 @@
+namespace ServiceLib.Services.CoreConfig;
+
+public partial class CoreConfigV2rayService
+{
+    private async Task<int> GenStatistic(V2rayConfig v2rayConfig)
+    {
+        if (_config.GuiItem.EnableStatistics || _config.GuiItem.DisplayRealTimeSpeed)
+        {
+            string tag = EInboundProtocol.api.ToString();
+            Metrics4Ray apiObj = new();
+            Policy4Ray policyObj = new();
+            SystemPolicy4Ray policySystemSetting = new();
+
+            v2rayConfig.stats = new Stats4Ray();
+
+            apiObj.tag = tag;
+            v2rayConfig.metrics = apiObj;
+
+            policySystemSetting.statsOutboundDownlink = true;
+            policySystemSetting.statsOutboundUplink = true;
+            policyObj.system = policySystemSetting;
+            v2rayConfig.policy = policyObj;
+
+            if (!v2rayConfig.inbounds.Exists(item => item.tag == tag))
+            {
+                Inbounds4Ray apiInbound = new();
+                Inboundsettings4Ray apiInboundSettings = new();
+                apiInbound.tag = tag;
+                apiInbound.listen = Global.Loopback;
+                apiInbound.port = AppManager.Instance.StatePort;
+                apiInbound.protocol = Global.InboundAPIProtocol;
+                apiInboundSettings.address = Global.Loopback;
+                apiInbound.settings = apiInboundSettings;
+                v2rayConfig.inbounds.Add(apiInbound);
+            }
+
+            if (!v2rayConfig.routing.rules.Exists(item => item.outboundTag == tag))
+            {
+                RulesItem4Ray apiRoutingRule = new()
+                {
+                    inboundTag = new List<string> { tag },
+                    outboundTag = tag,
+                    type = "field"
+                };
+
+                v2rayConfig.routing.rules.Add(apiRoutingRule);
+            }
+        }
+        return await Task.FromResult(0);
+    }
+}

From 7b7fe0ef46e50368b6bdda4a7a10dd6796e299fe Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 17 Aug 2025 20:51:49 +0800
Subject: [PATCH 058/115] Refactoring GetRealPingTime

---
 .../ServiceLib/Handler/ConnectionHandler.cs   | 39 +++++++++++--
 v2rayN/ServiceLib/Helper/HttpClientHelper.cs  | 33 +++++++++++
 v2rayN/ServiceLib/Services/DownloadService.cs | 57 -------------------
 .../ServiceLib/Services/SpeedtestService.cs   | 10 ++--
 4 files changed, 72 insertions(+), 67 deletions(-)

diff --git a/v2rayN/ServiceLib/Handler/ConnectionHandler.cs b/v2rayN/ServiceLib/Handler/ConnectionHandler.cs
index 0d0afc3a..38f3ae51 100644
--- a/v2rayN/ServiceLib/Handler/ConnectionHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConnectionHandler.cs
@@ -1,17 +1,20 @@
+using System.Net;
+
 namespace ServiceLib.Handler;
 
 public static class ConnectionHandler
 {
+    private static readonly string _tag = "ConnectionHandler";
+
     public static async Task<string> RunAvailabilityCheck()
     {
-        var downloadHandle = new DownloadService();
-        var time = await downloadHandle.RunAvailabilityCheck(null);
-        var ip = time > 0 ? await GetIPInfo(downloadHandle) ?? Global.None : Global.None;
+        var time = await GetRealPingTime();
+        var ip = time > 0 ? await GetIPInfo() ?? Global.None : Global.None;
 
         return string.Format(ResUI.TestMeOutput, time, ip);
     }
 
-    private static async Task<string?> GetIPInfo(DownloadService downloadHandle)
+    private static async Task<string?> GetIPInfo()
     {
         var url = AppManager.Instance.Config.SpeedTestItem.IPAPIUrl;
         if (url.IsNullOrEmpty())
@@ -19,6 +22,7 @@ public static class ConnectionHandler
             return null;
         }
 
+        var downloadHandle = new DownloadService();
         var result = await downloadHandle.TryDownloadString(url, true, "");
         if (result == null)
         {
@@ -36,4 +40,31 @@ public static class ConnectionHandler
 
         return $"({country ?? "unknown"}) {ip}";
     }
+
+    private static async Task<int> GetRealPingTime()
+    {
+        var responseTime = -1;
+        try
+        {
+            var port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
+            var webProxy = new WebProxy($"socks5://{Global.Loopback}:{port}");
+            var url = AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl;
+
+            for (var i = 0; i < 2; i++)
+            {
+                responseTime = await HttpClientHelper.Instance.GetRealPingTime(url, webProxy, 10);
+                if (responseTime > 0)
+                {
+                    break;
+                }
+                await Task.Delay(500);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            return -1;
+        }
+        return responseTime;
+    }
 }
diff --git a/v2rayN/ServiceLib/Helper/HttpClientHelper.cs b/v2rayN/ServiceLib/Helper/HttpClientHelper.cs
index 3dfb45cc..a559800f 100644
--- a/v2rayN/ServiceLib/Helper/HttpClientHelper.cs
+++ b/v2rayN/ServiceLib/Helper/HttpClientHelper.cs
@@ -1,3 +1,5 @@
+using System.Diagnostics;
+using System.Net;
 using System.Net.Http.Headers;
 using System.Net.Mime;
 using System.Text;
@@ -202,4 +204,35 @@ public class HttpClientHelper
             }
         } while (isMoreToRead);
     }
+
+    public async Task<int> GetRealPingTime(string url, IWebProxy? webProxy, int downloadTimeout)
+    {
+        var responseTime = -1;
+        try
+        {
+            using var cts = new CancellationTokenSource();
+            cts.CancelAfter(TimeSpan.FromSeconds(downloadTimeout));
+            using var client = new HttpClient(new SocketsHttpHandler()
+            {
+                Proxy = webProxy,
+                UseProxy = webProxy != null
+            });
+
+            List<int> oneTime = new();
+            for (var i = 0; i < 2; i++)
+            {
+                var timer = Stopwatch.StartNew();
+                await client.GetAsync(url, cts.Token).ConfigureAwait(false);
+                timer.Stop();
+                oneTime.Add((int)timer.Elapsed.TotalMilliseconds);
+                await Task.Delay(100);
+            }
+            responseTime = oneTime.Where(x => x > 0).OrderBy(x => x).FirstOrDefault();
+        }
+        catch //(Exception ex)
+        {
+            //Utile.SaveLog(ex.Message, ex);
+        }
+        return responseTime;
+    }
 }
diff --git a/v2rayN/ServiceLib/Services/DownloadService.cs b/v2rayN/ServiceLib/Services/DownloadService.cs
index f2f406ae..fe17d523 100644
--- a/v2rayN/ServiceLib/Services/DownloadService.cs
+++ b/v2rayN/ServiceLib/Services/DownloadService.cs
@@ -210,63 +210,6 @@ public class DownloadService
         return null;
     }
 
-    public async Task<int> RunAvailabilityCheck(IWebProxy? webProxy)
-    {
-        var responseTime = -1;
-        try
-        {
-            webProxy ??= await GetWebProxy(true);
-            var config = AppManager.Instance.Config;
-
-            for (var i = 0; i < 2; i++)
-            {
-                responseTime = await GetRealPingTime(config.SpeedTestItem.SpeedPingTestUrl, webProxy, 10);
-                if (responseTime > 0)
-                {
-                    break;
-                }
-                await Task.Delay(500);
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-            return -1;
-        }
-        return responseTime;
-    }
-
-    public async Task<int> GetRealPingTime(string url, IWebProxy? webProxy, int downloadTimeout)
-    {
-        var responseTime = -1;
-        try
-        {
-            using var cts = new CancellationTokenSource();
-            cts.CancelAfter(TimeSpan.FromSeconds(downloadTimeout));
-            using var client = new HttpClient(new SocketsHttpHandler()
-            {
-                Proxy = webProxy,
-                UseProxy = webProxy != null
-            });
-
-            List<int> oneTime = new();
-            for (var i = 0; i < 2; i++)
-            {
-                var timer = Stopwatch.StartNew();
-                await client.GetAsync(url, cts.Token).ConfigureAwait(false);
-                timer.Stop();
-                oneTime.Add((int)timer.Elapsed.TotalMilliseconds);
-                await Task.Delay(100);
-            }
-            responseTime = oneTime.Where(x => x > 0).OrderBy(x => x).FirstOrDefault();
-        }
-        catch //(Exception ex)
-        {
-            //Utile.SaveLog(ex.Message, ex);
-        }
-        return responseTime;
-    }
-
     private async Task<WebProxy?> GetWebProxy(bool blProxy)
     {
         if (!blProxy)
diff --git a/v2rayN/ServiceLib/Services/SpeedtestService.cs b/v2rayN/ServiceLib/Services/SpeedtestService.cs
index 7b4c8ebd..67b9bc94 100644
--- a/v2rayN/ServiceLib/Services/SpeedtestService.cs
+++ b/v2rayN/ServiceLib/Services/SpeedtestService.cs
@@ -198,8 +198,6 @@ public class SpeedtestService
             }
             await Task.Delay(1000);
 
-            var downloadHandle = new DownloadService();
-
             List<Task> tasks = new();
             foreach (var it in selecteds)
             {
@@ -213,7 +211,7 @@ public class SpeedtestService
                 }
                 tasks.Add(Task.Run(async () =>
                 {
-                    await DoRealPing(downloadHandle, it);
+                    await DoRealPing(it);
                 }));
             }
             await Task.WhenAll(tasks);
@@ -263,7 +261,7 @@ public class SpeedtestService
                     else
                     {
                         await Task.Delay(1000);
-                        var delay = await DoRealPing(downloadHandle, it);
+                        var delay = await DoRealPing(it);
                         if (blSpeedTest)
                         {
                             if (delay > 0)
@@ -294,10 +292,10 @@ public class SpeedtestService
         await Task.WhenAll(tasks);
     }
 
-    private async Task<int> DoRealPing(DownloadService downloadHandle, ServerTestItem it)
+    private async Task<int> DoRealPing(ServerTestItem it)
     {
         var webProxy = new WebProxy($"socks5://{Global.Loopback}:{it.Port}");
-        var responseTime = await downloadHandle.GetRealPingTime(_config.SpeedTestItem.SpeedPingTestUrl, webProxy, 10);
+        var responseTime = await HttpClientHelper.Instance.GetRealPingTime(_config.SpeedTestItem.SpeedPingTestUrl, webProxy, 10);
 
         ProfileExManager.Instance.SetTestDelay(it.IndexId, responseTime);
         UpdateFunc(it.IndexId, responseTime.ToString());

From 89893c0945ec5100e1c1712dd92b08fc9116050e Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Mon, 18 Aug 2025 17:28:49 +0800
Subject: [PATCH 059/115] Adds Xray and Singbox support config type (#7789)

* Adds Xray and Singbox config type support

* Unify multiline logical expression formatting
---
 v2rayN/ServiceLib/Global.cs                   | 25 +++++++++++++++++++
 .../Singbox/CoreConfigSingboxService.cs       |  4 +--
 .../Singbox/SingboxOutboundService.cs         |  6 ++---
 .../Singbox/SingboxRoutingService.cs          |  2 +-
 .../V2ray/CoreConfigV2rayService.cs           |  8 ++----
 .../CoreConfig/V2ray/V2rayDnsService.cs       | 24 ++++++++----------
 .../CoreConfig/V2ray/V2rayOutboundService.cs  | 15 +++--------
 .../CoreConfig/V2ray/V2rayRoutingService.cs   |  5 +---
 .../ServiceLib/Services/SpeedtestService.cs   |  4 +--
 9 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs
index 615c0d38..733c569d 100644
--- a/v2rayN/ServiceLib/Global.cs
+++ b/v2rayN/ServiceLib/Global.cs
@@ -289,6 +289,31 @@ public class Global
             "sing_box"
     ];
 
+    public static readonly HashSet<EConfigType> XraySupportConfigType =
+    [
+        EConfigType.VMess,
+            EConfigType.VLESS,
+            EConfigType.Shadowsocks,
+            EConfigType.Trojan,
+            EConfigType.WireGuard,
+            EConfigType.SOCKS,
+            EConfigType.HTTP,
+    ];
+
+    public static readonly HashSet<EConfigType> SingboxSupportConfigType =
+    [
+        EConfigType.VMess,
+            EConfigType.VLESS,
+            EConfigType.Shadowsocks,
+            EConfigType.Trojan,
+            EConfigType.Hysteria2,
+            EConfigType.TUIC,
+            EConfigType.Anytls,
+            EConfigType.WireGuard,
+            EConfigType.SOCKS,
+            EConfigType.HTTP,
+    ];
+
     public static readonly List<string> DomainStrategies =
     [
         AsIs,
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs
index 7c41418c..7ee82af1 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs
@@ -133,7 +133,7 @@ public partial class CoreConfigSingboxService(Config config)
 
             foreach (var it in selecteds)
             {
-                if (it.ConfigType == EConfigType.Custom)
+                if (!Global.SingboxSupportConfigType.Contains(it.ConfigType))
                 {
                     continue;
                 }
@@ -381,7 +381,7 @@ public partial class CoreConfigSingboxService(Config config)
             var proxyProfiles = new List<ProfileItem>();
             foreach (var it in selecteds)
             {
-                if (it.ConfigType == EConfigType.Custom)
+                if (!Global.SingboxSupportConfigType.Contains(it.ConfigType))
                 {
                     continue;
                 }
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs
index 5c48c014..3f03b93c 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs
@@ -372,7 +372,7 @@ public partial class CoreConfigSingboxService
             var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
             string? prevOutboundTag = null;
             if (prevNode is not null
-                && prevNode.ConfigType != EConfigType.Custom)
+                && Global.SingboxSupportConfigType.Contains(prevNode.ConfigType))
             {
                 prevOutboundTag = $"prev-{Global.ProxyTag}";
                 var prevServer = await GenServer(prevNode);
@@ -463,7 +463,7 @@ public partial class CoreConfigSingboxService
                     {
                         var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
                         if (prevNode is not null
-                            && prevNode.ConfigType != EConfigType.Custom)
+                            && Global.SingboxSupportConfigType.Contains(prevNode.ConfigType))
                         {
                             var prevOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
                             await GenOutbound(prevNode, prevOutbound);
@@ -558,7 +558,7 @@ public partial class CoreConfigSingboxService
             // Next proxy
             var nextNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
             if (nextNode is not null
-                && nextNode.ConfigType != EConfigType.Custom)
+                && Global.SingboxSupportConfigType.Contains(nextNode.ConfigType))
             {
                 nextOutbound ??= await GenServer(nextNode);
                 nextOutbound.tag = outbound.tag;
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs
index 69492d9b..24804c50 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs
@@ -338,7 +338,7 @@ public partial class CoreConfigSingboxService
 
         var node = await AppManager.Instance.GetProfileItemViaRemarks(outboundTag);
         if (node == null
-            || node.ConfigType == EConfigType.Custom)
+            || !Global.SingboxSupportConfigType.Contains(node.ConfigType))
         {
             return Global.ProxyTag;
         }
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs
index 7f1ada5d..b6148580 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs
@@ -110,11 +110,7 @@ public partial class CoreConfigV2rayService(Config config)
             var proxyProfiles = new List<ProfileItem>();
             foreach (var it in selecteds)
             {
-                if (it.ConfigType == EConfigType.Custom)
-                {
-                    continue;
-                }
-                if (it.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls)
+                if (!Global.XraySupportConfigType.Contains(it.ConfigType))
                 {
                     continue;
                 }
@@ -250,7 +246,7 @@ public partial class CoreConfigV2rayService(Config config)
 
             foreach (var it in selecteds)
             {
-                if (it.ConfigType == EConfigType.Custom)
+                if (!Global.XraySupportConfigType.Contains(it.ConfigType))
                 {
                     continue;
                 }
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs
index ddb47c99..9faf4df3 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs
@@ -187,9 +187,9 @@ public partial class CoreConfigV2rayService
                 foreach (var profile in new[] { subItem.PrevProfile, subItem.NextProfile })
                 {
                     var profileNode = await AppManager.Instance.GetProfileItemViaRemarks(profile);
-                    if (profileNode is not null &&
-                        profileNode.ConfigType is not (EConfigType.Custom or EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls) &&
-                        Utils.IsDomain(profileNode.Address))
+                    if (profileNode is not null
+                        && Global.XraySupportConfigType.Contains(profileNode.ConfigType)
+                        && Utils.IsDomain(profileNode.Address))
                     {
                         directDomainList.Add(profileNode.Address);
                     }
@@ -217,11 +217,11 @@ public partial class CoreConfigV2rayService
         AddDnsServers(directDNSAddress, directGeositeList);
         AddDnsServers(directDNSAddress, expectedDomainList, expectedIPs);
 
-        var useDirectDns = rules?.LastOrDefault() is { } lastRule &&
-                          lastRule.OutboundTag == Global.DirectTag &&
-                          (lastRule.Port == "0-65535" ||
-                           lastRule.Network == "tcp,udp" ||
-                           lastRule.Ip?.Contains("0.0.0.0/0") == true);
+        var useDirectDns = rules?.LastOrDefault() is { } lastRule
+            && lastRule.OutboundTag == Global.DirectTag
+            && (lastRule.Port == "0-65535"
+                || lastRule.Network == "tcp,udp"
+                || lastRule.Ip?.Contains("0.0.0.0/0") == true);
 
         var defaultDnsServers = useDirectDns ? directDNSAddress : remoteDNSAddress;
         v2rayConfig.dns.servers.AddRange(defaultDnsServers);
@@ -391,9 +391,7 @@ public partial class CoreConfigV2rayService
                 // Previous proxy
                 var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
                 if (prevNode is not null
-                    && prevNode.ConfigType != EConfigType.Custom
-                    && prevNode.ConfigType != EConfigType.Hysteria2
-                    && prevNode.ConfigType != EConfigType.TUIC
+                    && Global.SingboxSupportConfigType.Contains(prevNode.ConfigType)
                     && Utils.IsDomain(prevNode.Address))
                 {
                     domainList.Add(prevNode.Address);
@@ -402,9 +400,7 @@ public partial class CoreConfigV2rayService
                 // Next proxy
                 var nextNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
                 if (nextNode is not null
-                    && nextNode.ConfigType != EConfigType.Custom
-                    && nextNode.ConfigType != EConfigType.Hysteria2
-                    && nextNode.ConfigType != EConfigType.TUIC
+                    && Global.SingboxSupportConfigType.Contains(nextNode.ConfigType)
                     && Utils.IsDomain(nextNode.Address))
                 {
                     domainList.Add(nextNode.Address);
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs
index a40f2d73..11e8a8fa 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs
@@ -529,10 +529,7 @@ public partial class CoreConfigV2rayService
             var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
             string? prevOutboundTag = null;
             if (prevNode is not null
-                && prevNode.ConfigType != EConfigType.Custom
-                && prevNode.ConfigType != EConfigType.Hysteria2
-                && prevNode.ConfigType != EConfigType.TUIC
-                && prevNode.ConfigType != EConfigType.Anytls)
+                && Global.XraySupportConfigType.Contains(prevNode.ConfigType))
             {
                 var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                 await GenOutbound(prevNode, prevOutbound);
@@ -605,10 +602,7 @@ public partial class CoreConfigV2rayService
                     {
                         var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
                         if (prevNode is not null
-                            && prevNode.ConfigType != EConfigType.Custom
-                            && prevNode.ConfigType != EConfigType.Hysteria2
-                            && prevNode.ConfigType != EConfigType.TUIC
-                            && prevNode.ConfigType != EConfigType.Anytls)
+                            && Global.XraySupportConfigType.Contains(prevNode.ConfigType))
                         {
                             var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                             await GenOutbound(prevNode, prevOutbound);
@@ -675,10 +669,7 @@ public partial class CoreConfigV2rayService
             // Next proxy
             var nextNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
             if (nextNode is not null
-                && nextNode.ConfigType != EConfigType.Custom
-                && nextNode.ConfigType != EConfigType.Hysteria2
-                && nextNode.ConfigType != EConfigType.TUIC
-                && nextNode.ConfigType != EConfigType.Anytls)
+                && Global.XraySupportConfigType.Contains(nextNode.ConfigType))
             {
                 if (nextOutbound == null)
                 {
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs
index fe5d64dc..1cb46bf2 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs
@@ -126,10 +126,7 @@ public partial class CoreConfigV2rayService
 
         var node = await AppManager.Instance.GetProfileItemViaRemarks(outboundTag);
         if (node == null
-            || node.ConfigType == EConfigType.Custom
-            || node.ConfigType == EConfigType.Hysteria2
-            || node.ConfigType == EConfigType.TUIC
-            || node.ConfigType == EConfigType.Anytls)
+            || !Global.XraySupportConfigType.Contains(node.ConfigType))
         {
             return Global.ProxyTag;
         }
diff --git a/v2rayN/ServiceLib/Services/SpeedtestService.cs b/v2rayN/ServiceLib/Services/SpeedtestService.cs
index 67b9bc94..002a6251 100644
--- a/v2rayN/ServiceLib/Services/SpeedtestService.cs
+++ b/v2rayN/ServiceLib/Services/SpeedtestService.cs
@@ -356,8 +356,8 @@ public class SpeedtestService
     private List<List<ServerTestItem>> GetTestBatchItem(List<ServerTestItem> lstSelected, int pageSize)
     {
         List<List<ServerTestItem>> lstTest = new();
-        var lst1 = lstSelected.Where(t => t.ConfigType is not (EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls)).ToList();
-        var lst2 = lstSelected.Where(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls).ToList();
+        var lst1 = lstSelected.Where(t => Global.XraySupportConfigType.Contains(t.ConfigType)).ToList();
+        var lst2 = lstSelected.Where(t => Global.SingboxSupportConfigType.Contains(t.ConfigType) && !Global.XraySupportConfigType.Contains(t.ConfigType)).ToList();
 
         for (var num = 0; num < (int)Math.Ceiling(lst1.Count * 1.0 / pageSize); num++)
         {

From 4f711b1bd3db520c35b2d47a51c996d63ef007f2 Mon Sep 17 00:00:00 2001
From: Miheichev Aleksandr Sergeevich <ya.saska20@gmail.com>
Date: Mon, 18 Aug 2025 12:28:59 +0300
Subject: [PATCH 060/115] i18n(ru/zh-Hans/zh-Hant/hu/fa): translate TUN
 settings, unify MTU, use resx (#7787)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(i18n,ui): externalize TUN settings labels, add translations

- Replace hard-coded labels "Auto Route", "Strict Route", "Stack",
  and "Mtu/mtu" with resource keys in both Avalonia and WPF views:
  - v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
  - v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
  - v2rayN/v2rayN/Views/AddServerWindow.xaml
  - v2rayN/v2rayN/Views/OptionSettingWindow.xaml
- Add new resource keys in ResUI:
  TbSettingsTunAutoRoute, TbSettingsTunStrictRoute,
  TbSettingsTunStack, TbSettingsTunMtu (unified casing as "MTU").
  Files:
  - v2rayN/ServiceLib/Resx/ResUI.resx
- Provide translations in:
  - v2rayN/ServiceLib/Resx/ResUI.ru.resx
  - v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
  - v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
  - v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
  - v2rayN/ServiceLib/Resx/ResUI.hu.resx
- Normalize XML comments/whitespace in .resx files.
- Update submodule v2rayN/GlobalHotKeys to 5201dd5.

No breaking changes.

* i18n: TUN labels across locales; unify MTU

* chore: ignore local IDE/venv files

* chore(resx): regenerate ResUI.Designer with TUN string accessors

- Add strongly-typed accessors in ServiceLib.Resx.ResUI:
  - TbSettingsTunAutoRoute → "Auto Route"
  - TbSettingsTunStrictRoute → "Strict Route"
  - TbSettingsTunStack → "Stack"
  - TbSettingsTunMtu → "MTU"
- Keep auto-generated structure intact; normalize minor whitespace.

Refs: v2rayN/ServiceLib/Resx/ResUI.resx
No functional changes beyond exposing new i18n keys.

* chore(gitignore): ignore JetBrains Rider artifacts (.idea/, *.sln.iml)

---------

Co-authored-by: Aleksandr Miheichev <alexandr.gmail@tuta.com>
---
 .gitignore                                    |   3 +-
 v2rayN/ServiceLib/Resx/ResUI.Designer.cs      | 962 +++++++++---------
 v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx       |  68 +-
 v2rayN/ServiceLib/Resx/ResUI.hu.resx          |  68 +-
 v2rayN/ServiceLib/Resx/ResUI.resx             |  68 +-
 v2rayN/ServiceLib/Resx/ResUI.ru.resx          |  68 +-
 v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx     |  68 +-
 v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx     |  68 +-
 .../Views/AddServerWindow.axaml               |   2 +-
 .../Views/OptionSettingWindow.axaml           |   8 +-
 v2rayN/v2rayN/Views/AddServerWindow.xaml      |   2 +-
 v2rayN/v2rayN/Views/OptionSettingWindow.xaml  |  10 +-
 12 files changed, 748 insertions(+), 647 deletions(-)

diff --git a/.gitignore b/.gitignore
index 524d236b..7d5416b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -397,4 +397,5 @@ FodyWeavers.xsd
 *.msp
 
 # JetBrains Rider
-*.sln.iml
\ No newline at end of file
+.idea/
+*.sln.iml
diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index da0ee773..54fc88ba 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -10,8 +10,8 @@
 
 namespace ServiceLib.Resx {
     using System;
-    
-    
+
+
     /// <summary>
     ///   一个强类型的资源类，用于查找本地化的字符串等。
     /// </summary>
@@ -23,15 +23,15 @@ namespace ServiceLib.Resx {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class ResUI {
-        
+
         private static global::System.Resources.ResourceManager resourceMan;
-        
+
         private static global::System.Globalization.CultureInfo resourceCulture;
-        
+
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal ResUI() {
         }
-        
+
         /// <summary>
         ///   返回此类使用的缓存的 ResourceManager 实例。
         /// </summary>
@@ -45,7 +45,7 @@ namespace ServiceLib.Resx {
                 return resourceMan;
             }
         }
-        
+
         /// <summary>
         ///   重写当前线程的 CurrentUICulture 属性，对
         ///   使用此强类型资源类的所有资源查找执行重写。
@@ -59,7 +59,7 @@ namespace ServiceLib.Resx {
                 resourceCulture = value;
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Do you want to append rules? Choose yes to append, no to replace. 的本地化字符串。
         /// </summary>
@@ -68,7 +68,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("AddBatchRoutingRulesYesNo", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 All 的本地化字符串。
         /// </summary>
@@ -77,7 +77,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("AllGroupServers", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Export share link to clipboard successfully 的本地化字符串。
         /// </summary>
@@ -86,7 +86,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("BatchExportURLSuccessfully", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please check the Configuration settings first. 的本地化字符串。
         /// </summary>
@@ -95,7 +95,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("CheckServerSettings", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Invalid configuration format. 的本地化字符串。
         /// </summary>
@@ -104,7 +104,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("ConfigurationFormatIncorrect", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Host filter 的本地化字符串。
         /// </summary>
@@ -113,7 +113,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("ConnectionsHostFilterTitle", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Note that custom configuration relies entirely on your own configuration and does not work with all settings. If you want to use the system proxy, please modify the listening port manually. 的本地化字符串。
         /// </summary>
@@ -122,7 +122,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("CustomServerTips", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Downloading... 的本地化字符串。
         /// </summary>
@@ -131,7 +131,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("Downloading", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Failed to convert configuration file 的本地化字符串。
         /// </summary>
@@ -140,7 +140,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FailedConversionConfiguration", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Failed to generate default configuration file 的本地化字符串。
         /// </summary>
@@ -149,7 +149,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FailedGenDefaultConfiguration", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Failed to get the default configuration 的本地化字符串。
         /// </summary>
@@ -158,7 +158,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FailedGetDefaultConfiguration", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Failed to import custom configuration Configuration 的本地化字符串。
         /// </summary>
@@ -167,7 +167,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FailedImportedCustomServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Failed to read configuration file 的本地化字符串。
         /// </summary>
@@ -176,7 +176,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FailedReadConfiguration", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Failed to run Core, please check the prompt information 的本地化字符串。
         /// </summary>
@@ -185,7 +185,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FailedToRunCore", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please fill in the correct config template 的本地化字符串。
         /// </summary>
@@ -194,7 +194,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FillCorrectConfigTemplateText", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please fill in the correct custom DNS 的本地化字符串。
         /// </summary>
@@ -203,7 +203,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FillCorrectDNSText", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please enter the correct port format. 的本地化字符串。
         /// </summary>
@@ -212,7 +212,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FillCorrectServerPort", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please enter the local listening port. 的本地化字符串。
         /// </summary>
@@ -221,7 +221,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FillLocalListeningPort", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please enter the password. 的本地化字符串。
         /// </summary>
@@ -230,7 +230,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FillPassword", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please enter the address. 的本地化字符串。
         /// </summary>
@@ -239,7 +239,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FillServerAddress", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please browse to import Configuration configuration 的本地化字符串。
         /// </summary>
@@ -248,7 +248,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FillServerAddressCustom", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please enter the user ID. 的本地化字符串。
         /// </summary>
@@ -257,7 +257,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FillUUID", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Transport 的本地化字符串。
         /// </summary>
@@ -266,7 +266,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("GbTransport", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 This is not the correct configuration, please check 的本地化字符串。
         /// </summary>
@@ -275,7 +275,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("Incorrectconfiguration", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Initial Configuration 的本地化字符串。
         /// </summary>
@@ -284,7 +284,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("InitialConfiguration", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please do not use the insecure HTTP protocol subscription address 的本地化字符串。
         /// </summary>
@@ -293,7 +293,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("InsecureUrlProtocol", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Invalid address (URL) 的本地化字符串。
         /// </summary>
@@ -302,7 +302,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("InvalidUrlTip", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 {0} {1} already up to date. 的本地化字符串。
         /// </summary>
@@ -311,7 +311,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("IsLatestCore", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 {0} {1} already up to date. 的本地化字符串。
         /// </summary>
@@ -320,7 +320,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("IsLatestN", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 LAN 的本地化字符串。
         /// </summary>
@@ -329,7 +329,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LabLAN", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Local 的本地化字符串。
         /// </summary>
@@ -338,7 +338,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LabLocal", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Invalid backup file 的本地化字符串。
         /// </summary>
@@ -347,7 +347,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LocalRestoreInvalidZipTips", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Address 的本地化字符串。
         /// </summary>
@@ -356,7 +356,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvAddress", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Automatic update interval (minutes) 的本地化字符串。
         /// </summary>
@@ -365,7 +365,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvAutoUpdateInterval", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Convert target type 的本地化字符串。
         /// </summary>
@@ -374,7 +374,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvConvertTarget", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please leave blank if no conversion is required 的本地化字符串。
         /// </summary>
@@ -383,7 +383,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvConvertTargetTip", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Count 的本地化字符串。
         /// </summary>
@@ -392,7 +392,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvCount", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Custom icon 的本地化字符串。
         /// </summary>
@@ -401,7 +401,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvCustomIcon", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Customize the rule-set of sing-box 的本地化字符串。
         /// </summary>
@@ -410,7 +410,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvCustomRulesetPath4Singbox", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Enable update 的本地化字符串。
         /// </summary>
@@ -419,7 +419,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvEnabled", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Security 的本地化字符串。
         /// </summary>
@@ -428,7 +428,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvEncryptionMethod", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Remarks regular filter 的本地化字符串。
         /// </summary>
@@ -437,7 +437,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvFilter", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Remarks Memo 的本地化字符串。
         /// </summary>
@@ -446,7 +446,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvMemo", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 More URLs, separated by commas; Subscription conversion will be invalid 的本地化字符串。
         /// </summary>
@@ -455,7 +455,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvMoreUrl", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Next proxy Configuration remarks 的本地化字符串。
         /// </summary>
@@ -464,7 +464,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvNextProfile", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Port 的本地化字符串。
         /// </summary>
@@ -473,7 +473,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvPort", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Previous proxy Configuration remarks 的本地化字符串。
         /// </summary>
@@ -482,7 +482,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvPrevProfile", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please make sure the Configuration remarks exist and are unique 的本地化字符串。
         /// </summary>
@@ -491,7 +491,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvPrevProfileTip", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Remarks 的本地化字符串。
         /// </summary>
@@ -500,7 +500,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvRemarks", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Type 的本地化字符串。
         /// </summary>
@@ -509,7 +509,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvServiceType", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Sort 的本地化字符串。
         /// </summary>
@@ -518,7 +518,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvSort", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Subs group 的本地化字符串。
         /// </summary>
@@ -527,7 +527,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvSubscription", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Delay (ms) 的本地化字符串。
         /// </summary>
@@ -536,7 +536,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvTestDelay", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Speed (M/s) 的本地化字符串。
         /// </summary>
@@ -545,7 +545,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvTestSpeed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 TLS 的本地化字符串。
         /// </summary>
@@ -554,7 +554,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvTLS", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Download traffic today 的本地化字符串。
         /// </summary>
@@ -563,7 +563,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvTodayDownloadDataAmount", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Upload traffic today 的本地化字符串。
         /// </summary>
@@ -572,7 +572,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvTodayUploadDataAmount", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Total download traffic 的本地化字符串。
         /// </summary>
@@ -581,7 +581,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvTotalDownloadDataAmount", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Total upload traffic 的本地化字符串。
         /// </summary>
@@ -590,7 +590,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvTotalUploadDataAmount", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Transport 的本地化字符串。
         /// </summary>
@@ -599,7 +599,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvTransportProtocol", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 URL (optional) 的本地化字符串。
         /// </summary>
@@ -608,7 +608,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvUrl", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 User Agent 的本地化字符串。
         /// </summary>
@@ -617,7 +617,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvUserAgent", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 WebDAV Check 的本地化字符串。
         /// </summary>
@@ -626,7 +626,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvWebDavCheck", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Remote folder name (optional) 的本地化字符串。
         /// </summary>
@@ -635,7 +635,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvWebDavDirName", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 WebDAV Password 的本地化字符串。
         /// </summary>
@@ -644,7 +644,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvWebDavPassword", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 WebDAV URL 的本地化字符串。
         /// </summary>
@@ -653,7 +653,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvWebDavUrl", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 WebDAV User Name 的本地化字符串。
         /// </summary>
@@ -662,7 +662,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvWebDavUserName", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Add [Anytls] Configuration 的本地化字符串。
         /// </summary>
@@ -671,7 +671,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddAnytlsServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Add a custom configuration Configuration 的本地化字符串。
         /// </summary>
@@ -680,7 +680,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddCustomServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Add [HTTP] Configuration 的本地化字符串。
         /// </summary>
@@ -689,7 +689,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddHttpServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Add [Hysteria2] Configuration 的本地化字符串。
         /// </summary>
@@ -698,7 +698,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddHysteria2Server", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Import Share Links from clipboard (Ctrl+V) 的本地化字符串。
         /// </summary>
@@ -707,7 +707,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddServerViaClipboard", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Scan QR code in the image 的本地化字符串。
         /// </summary>
@@ -716,7 +716,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddServerViaImage", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Scan QR code on the screen (Ctrl+S) 的本地化字符串。
         /// </summary>
@@ -725,7 +725,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddServerViaScan", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Add [Shadowsocks] Configuration 的本地化字符串。
         /// </summary>
@@ -734,7 +734,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddShadowsocksServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Add [SOCKS] Configuration 的本地化字符串。
         /// </summary>
@@ -743,7 +743,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddSocksServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Add [Trojan] Configuration 的本地化字符串。
         /// </summary>
@@ -752,7 +752,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddTrojanServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Add [TUIC] Configuration 的本地化字符串。
         /// </summary>
@@ -761,7 +761,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddTuicServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Add [VLESS] Configuration 的本地化字符串。
         /// </summary>
@@ -770,7 +770,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddVlessServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Add [VMess] Configuration 的本地化字符串。
         /// </summary>
@@ -779,7 +779,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddVmessServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Add [WireGuard] Configuration 的本地化字符串。
         /// </summary>
@@ -788,7 +788,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddWireguardServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Backup and Restore 的本地化字符串。
         /// </summary>
@@ -797,7 +797,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuBackupAndRestore", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Check Update 的本地化字符串。
         /// </summary>
@@ -806,7 +806,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuCheckUpdate", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Clear all service statistics 的本地化字符串。
         /// </summary>
@@ -815,7 +815,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuClearServerStatistics", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Close 的本地化字符串。
         /// </summary>
@@ -824,7 +824,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuClose", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Close Connection 的本地化字符串。
         /// </summary>
@@ -833,7 +833,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuConnectionClose", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Close All Connections 的本地化字符串。
         /// </summary>
@@ -842,7 +842,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuConnectionCloseAll", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Copy proxy command to clipboard 的本地化字符串。
         /// </summary>
@@ -851,7 +851,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuCopyProxyCmdToClipboard", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Clone selected Configuration 的本地化字符串。
         /// </summary>
@@ -860,7 +860,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuCopyServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 DNS Settings 的本地化字符串。
         /// </summary>
@@ -869,7 +869,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuDNSSetting", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Edit Configuration (Ctrl+D) 的本地化字符串。
         /// </summary>
@@ -878,7 +878,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuEditServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Exit 的本地化字符串。
         /// </summary>
@@ -887,7 +887,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuExit", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Are you sure you want to exit? 的本地化字符串。
         /// </summary>
@@ -896,7 +896,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuExitTips", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Export selected Configuration for complete configuration 的本地化字符串。
         /// </summary>
@@ -905,7 +905,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuExport2ClientConfig", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Export selected Configuration for complete configuration to clipboard 的本地化字符串。
         /// </summary>
@@ -914,7 +914,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuExport2ClientConfigClipboard", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Export Share Link to Clipboard (Ctrl+C) 的本地化字符串。
         /// </summary>
@@ -923,7 +923,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuExport2ShareUrl", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Export Base64-encoded Share Links to Clipboard 的本地化字符串。
         /// </summary>
@@ -932,7 +932,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuExport2ShareUrlBase64", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Export Configuration 的本地化字符串。
         /// </summary>
@@ -941,7 +941,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuExportConfig", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Full Config Template Setting 的本地化字符串。
         /// </summary>
@@ -950,7 +950,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuFullConfigTemplate", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Global Hotkey Setting 的本地化字符串。
         /// </summary>
@@ -959,7 +959,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuGlobalHotkeySetting", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Help 的本地化字符串。
         /// </summary>
@@ -968,7 +968,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuHelp", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Import Rules From Clipboard 的本地化字符串。
         /// </summary>
@@ -977,7 +977,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuImportRulesFromClipboard", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Import Rules From File 的本地化字符串。
         /// </summary>
@@ -986,7 +986,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuImportRulesFromFile", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Import Rules From Subscription URL 的本地化字符串。
         /// </summary>
@@ -995,7 +995,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuImportRulesFromUrl", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Backup to local 的本地化字符串。
         /// </summary>
@@ -1004,7 +1004,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuLocalBackup", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Local 的本地化字符串。
         /// </summary>
@@ -1013,7 +1013,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuLocalBackupAndRestore", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Restore from local 的本地化字符串。
         /// </summary>
@@ -1022,7 +1022,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuLocalRestore", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 One-click multi-test latency and speed (Ctrl+E) 的本地化字符串。
         /// </summary>
@@ -1031,7 +1031,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMixedTestServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Direct 的本地化字符串。
         /// </summary>
@@ -1040,7 +1040,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuModeDirect", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Global 的本地化字符串。
         /// </summary>
@@ -1049,7 +1049,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuModeGlobal", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Do not change 的本地化字符串。
         /// </summary>
@@ -1058,7 +1058,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuModeNothing", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Rule 的本地化字符串。
         /// </summary>
@@ -1067,7 +1067,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuModeRule", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Move to bottom (B) 的本地化字符串。
         /// </summary>
@@ -1076,7 +1076,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMoveBottom", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Down (D) 的本地化字符串。
         /// </summary>
@@ -1085,7 +1085,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMoveDown", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Move up and down 的本地化字符串。
         /// </summary>
@@ -1094,7 +1094,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMoveTo", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Move to group 的本地化字符串。
         /// </summary>
@@ -1103,7 +1103,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMoveToGroup", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Move to top (T) 的本地化字符串。
         /// </summary>
@@ -1112,7 +1112,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMoveTop", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Up (U) 的本地化字符串。
         /// </summary>
@@ -1121,7 +1121,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMoveUp", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Clear all 的本地化字符串。
         /// </summary>
@@ -1130,7 +1130,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMsgViewClear", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Copy (Ctrl+C) 的本地化字符串。
         /// </summary>
@@ -1139,7 +1139,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMsgViewCopy", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Copy all 的本地化字符串。
         /// </summary>
@@ -1148,7 +1148,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMsgViewCopyAll", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Select all (Ctrl+A) 的本地化字符串。
         /// </summary>
@@ -1157,7 +1157,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMsgViewSelectAll", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Open the storage location 的本地化字符串。
         /// </summary>
@@ -1166,7 +1166,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuOpenTheFileLocation", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Option Setting 的本地化字符串。
         /// </summary>
@@ -1175,7 +1175,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuOptionSetting", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Auto column width adjustment 的本地化字符串。
         /// </summary>
@@ -1184,7 +1184,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuProfileAutofitColumnWidth", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Promotion 的本地化字符串。
         /// </summary>
@@ -1193,7 +1193,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuPromotion", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Latency Test 的本地化字符串。
         /// </summary>
@@ -1202,7 +1202,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuProxiesDelaytest", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Part Node Latency Test 的本地化字符串。
         /// </summary>
@@ -1211,7 +1211,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuProxiesDelaytestPart", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Refresh Proxies 的本地化字符串。
         /// </summary>
@@ -1220,7 +1220,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuProxiesReload", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Select active node (Enter) 的本地化字符串。
         /// </summary>
@@ -1229,7 +1229,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuProxiesSelectActivity", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Test Configurations real delay (Ctrl+R) 的本地化字符串。
         /// </summary>
@@ -1238,7 +1238,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRealPingServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Restart as Administrator 的本地化字符串。
         /// </summary>
@@ -1247,7 +1247,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRebootAsAdmin", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Regional presets setting 的本地化字符串。
         /// </summary>
@@ -1256,7 +1256,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRegionalPresets", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Default 的本地化字符串。
         /// </summary>
@@ -1265,7 +1265,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRegionalPresetsDefault", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Iran 的本地化字符串。
         /// </summary>
@@ -1274,7 +1274,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRegionalPresetsIran", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Russia 的本地化字符串。
         /// </summary>
@@ -1283,7 +1283,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRegionalPresetsRussia", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Reload 的本地化字符串。
         /// </summary>
@@ -1292,7 +1292,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuReload", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Backup to remote (WebDAV) 的本地化字符串。
         /// </summary>
@@ -1301,7 +1301,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRemoteBackup", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Remote (WebDAV) 的本地化字符串。
         /// </summary>
@@ -1310,7 +1310,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRemoteBackupAndRestore", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Restore from remote (WebDAV) 的本地化字符串。
         /// </summary>
@@ -1319,7 +1319,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRemoteRestore", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Remove duplicate Configurations 的本地化字符串。
         /// </summary>
@@ -1328,7 +1328,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRemoveDuplicateServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Remove invalid by test results 的本地化字符串。
         /// </summary>
@@ -1337,7 +1337,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRemoveInvalidServerResult", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Remove selected Configurations (Delete) 的本地化字符串。
         /// </summary>
@@ -1346,7 +1346,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRemoveServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Routing 的本地化字符串。
         /// </summary>
@@ -1355,7 +1355,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRouting", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Add 的本地化字符串。
         /// </summary>
@@ -1364,7 +1364,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRoutingAdvancedAdd", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Import Rules 的本地化字符串。
         /// </summary>
@@ -1373,7 +1373,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRoutingAdvancedImportRules", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Remove selected (Delete) 的本地化字符串。
         /// </summary>
@@ -1382,7 +1382,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRoutingAdvancedRemove", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Set as active rule (Enter) 的本地化字符串。
         /// </summary>
@@ -1391,7 +1391,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRoutingAdvancedSetDefault", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Routing Rule Details Setting 的本地化字符串。
         /// </summary>
@@ -1400,7 +1400,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRoutingRuleDetailsSetting", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Rule Settings 的本地化字符串。
         /// </summary>
@@ -1409,7 +1409,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRoutingRuleSetting", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Routing Setting 的本地化字符串。
         /// </summary>
@@ -1418,7 +1418,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRoutingSetting", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Add Rule 的本地化字符串。
         /// </summary>
@@ -1427,7 +1427,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRuleAdd", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Export Selected Rules 的本地化字符串。
         /// </summary>
@@ -1436,7 +1436,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRuleExportSelected", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Rule List 的本地化字符串。
         /// </summary>
@@ -1445,7 +1445,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRuleList", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Rule mode 的本地化字符串。
         /// </summary>
@@ -1454,7 +1454,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRulemode", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Remove Rule (Delete) 的本地化字符串。
         /// </summary>
@@ -1463,7 +1463,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRuleRemove", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Select all (Ctrl+A) 的本地化字符串。
         /// </summary>
@@ -1472,7 +1472,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSelectAll", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Configurations 的本地化字符串。
         /// </summary>
@@ -1481,7 +1481,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuServers", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Multi-Configuration to custom configuration 的本地化字符串。
         /// </summary>
@@ -1490,7 +1490,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSetDefaultMultipleServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Multi-Configuration LeastPing by sing-box 的本地化字符串。
         /// </summary>
@@ -1499,7 +1499,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSetDefaultMultipleServerSingBoxLeastPing", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Multi-Configuration LeastLoad by Xray 的本地化字符串。
         /// </summary>
@@ -1508,7 +1508,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSetDefaultMultipleServerXrayLeastLoad", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Multi-Configuration LeastPing by Xray 的本地化字符串。
         /// </summary>
@@ -1517,7 +1517,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSetDefaultMultipleServerXrayLeastPing", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Multi-Configuration Random by Xray 的本地化字符串。
         /// </summary>
@@ -1526,7 +1526,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSetDefaultMultipleServerXrayRandom", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Multi-Configuration RoundRobin by Xray 的本地化字符串。
         /// </summary>
@@ -1535,7 +1535,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSetDefaultMultipleServerXrayRoundRobin", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Set as active Configuration (Enter) 的本地化字符串。
         /// </summary>
@@ -1544,7 +1544,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSetDefaultServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Settings 的本地化字符串。
         /// </summary>
@@ -1553,7 +1553,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSetting", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Share Configuration (Ctrl+F) 的本地化字符串。
         /// </summary>
@@ -1562,7 +1562,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuShareServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Show or hide the main window 的本地化字符串。
         /// </summary>
@@ -1571,7 +1571,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuShowOrHideMainWindow", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Sort by test result 的本地化字符串。
         /// </summary>
@@ -1580,7 +1580,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSortServerResult", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Test Configurations download speed (Ctrl+T) 的本地化字符串。
         /// </summary>
@@ -1589,7 +1589,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSpeedServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Add 的本地化字符串。
         /// </summary>
@@ -1598,7 +1598,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubAdd", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Delete 的本地化字符串。
         /// </summary>
@@ -1607,7 +1607,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubDelete", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Edit 的本地化字符串。
         /// </summary>
@@ -1616,7 +1616,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubEdit", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Update current subscription without proxy 的本地化字符串。
         /// </summary>
@@ -1625,7 +1625,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubGroupUpdate", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Update current subscription with proxy 的本地化字符串。
         /// </summary>
@@ -1634,7 +1634,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubGroupUpdateViaProxy", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Subscription Group 的本地化字符串。
         /// </summary>
@@ -1643,7 +1643,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubscription", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Subscription group settings 的本地化字符串。
         /// </summary>
@@ -1652,7 +1652,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubSetting", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Share 的本地化字符串。
         /// </summary>
@@ -1661,7 +1661,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubShare", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Update subscriptions without proxy 的本地化字符串。
         /// </summary>
@@ -1670,7 +1670,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubUpdate", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Update subscriptions with proxy 的本地化字符串。
         /// </summary>
@@ -1679,7 +1679,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubUpdateViaProxy", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 System proxy 的本地化字符串。
         /// </summary>
@@ -1688,7 +1688,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSystemproxy", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Clear system proxy 的本地化字符串。
         /// </summary>
@@ -1697,7 +1697,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSystemProxyClear", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Do not change system proxy 的本地化字符串。
         /// </summary>
@@ -1706,7 +1706,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSystemProxyNothing", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 PAC mode 的本地化字符串。
         /// </summary>
@@ -1715,7 +1715,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSystemProxyPac", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Set system proxy 的本地化字符串。
         /// </summary>
@@ -1724,7 +1724,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSystemProxySet", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Test Configurations with tcping (Ctrl+O) 的本地化字符串。
         /// </summary>
@@ -1733,7 +1733,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuTcpingServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 By test result 的本地化字符串。
         /// </summary>
@@ -1742,7 +1742,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuTestServerResult", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 {0} Website 的本地化字符串。
         /// </summary>
@@ -1751,7 +1751,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuWebsiteItem", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Downloaded GeoFile: {0} successfully 的本地化字符串。
         /// </summary>
@@ -1760,7 +1760,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgDownloadGeoFileSuccessfully", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Downloaded Core successfully 的本地化字符串。
         /// </summary>
@@ -1769,7 +1769,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgDownloadV2rayCoreSuccessfully", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Failed to import subscription content 的本地化字符串。
         /// </summary>
@@ -1778,7 +1778,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgFailedImportSubscription", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Filter, supports regular expressions 的本地化字符串。
         /// </summary>
@@ -1787,7 +1787,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgFilterTitle", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Got subscription content successfully 的本地化字符串。
         /// </summary>
@@ -1796,7 +1796,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgGetSubscriptionSuccessfully", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Information 的本地化字符串。
         /// </summary>
@@ -1805,7 +1805,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgInformationTitle", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please enter the URL 的本地化字符串。
         /// </summary>
@@ -1814,7 +1814,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgNeedUrl", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 No valid subscriptions set 的本地化字符串。
         /// </summary>
@@ -1823,7 +1823,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgNoValidSubscription", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Resolved {0} successfully 的本地化字符串。
         /// </summary>
@@ -1832,7 +1832,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgParsingSuccessfully", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Configuration filter, press Enter to execute 的本地化字符串。
         /// </summary>
@@ -1841,7 +1841,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgServerTitle", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Updates are not enabled, skip this subscription 的本地化字符串。
         /// </summary>
@@ -1850,7 +1850,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgSkipSubscriptionUpdate", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Started getting subscriptions 的本地化字符串。
         /// </summary>
@@ -1859,7 +1859,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgStartGettingSubscriptions", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Started updating {0}... 的本地化字符串。
         /// </summary>
@@ -1868,7 +1868,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgStartUpdating", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Invalid subscription content 的本地化字符串。
         /// </summary>
@@ -1877,7 +1877,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgSubscriptionDecodingFailed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Unpacking... 的本地化字符串。
         /// </summary>
@@ -1886,7 +1886,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgUnpacking", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Subscription update ended 的本地化字符串。
         /// </summary>
@@ -1895,7 +1895,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgUpdateSubscriptionEnd", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Subscription update started 的本地化字符串。
         /// </summary>
@@ -1904,7 +1904,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgUpdateSubscriptionStart", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Updated Core successfully 的本地化字符串。
         /// </summary>
@@ -1913,7 +1913,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgUpdateV2rayCoreSuccessfully", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Updated Core successfully! Restarting service... 的本地化字符串。
         /// </summary>
@@ -1922,7 +1922,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgUpdateV2rayCoreSuccessfullyMore", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Successful operation. Click the settings menu to reboot the app. 的本地化字符串。
         /// </summary>
@@ -1931,7 +1931,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("NeedRebootTips", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Non-VMess or SS protocol 的本地化字符串。
         /// </summary>
@@ -1940,7 +1940,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("NonvmessOrssProtocol", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 The Core file (file name: {1}) was not found under the folder ({0}), please download and put it in the folder, download address: {2} 的本地化字符串。
         /// </summary>
@@ -1949,7 +1949,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("NotFoundCore", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Not run as Admin 的本地化字符串。
         /// </summary>
@@ -1958,7 +1958,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("NotRunAsAdmin", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Scan completed, no valid QR code found 的本地化字符串。
         /// </summary>
@@ -1967,7 +1967,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("NoValidQRcodeFound", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Operation failed, please check and retry 的本地化字符串。
         /// </summary>
@@ -1976,7 +1976,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("OperationFailed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Operation successful 的本地化字符串。
         /// </summary>
@@ -1985,7 +1985,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("OperationSuccess", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please fill Remarks 的本地化字符串。
         /// </summary>
@@ -1994,7 +1994,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("PleaseFillRemarks", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please select the encryption method 的本地化字符串。
         /// </summary>
@@ -2003,7 +2003,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("PleaseSelectEncryption", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please select a protocol 的本地化字符串。
         /// </summary>
@@ -2012,7 +2012,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("PleaseSelectProtocol", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please select rules 的本地化字符串。
         /// </summary>
@@ -2021,7 +2021,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("PleaseSelectRules", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please select the Configuration first 的本地化字符串。
         /// </summary>
@@ -2030,7 +2030,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("PleaseSelectServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Global hotkey {0} registration failed, reason: {1} 的本地化字符串。
         /// </summary>
@@ -2039,7 +2039,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("RegisterGlobalHotkeyFailed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Global hotkey {0} registered successfully 的本地化字符串。
         /// </summary>
@@ -2048,7 +2048,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("RegisterGlobalHotkeySuccessfully", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Configurations deduplication completed. Old: {0}, New: {1}. 的本地化字符串。
         /// </summary>
@@ -2057,7 +2057,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("RemoveDuplicateServerResult", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Removed {0} invalid test results. 的本地化字符串。
         /// </summary>
@@ -2066,7 +2066,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("RemoveInvalidServerResultTip", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Are you sure you want to remove the rules? 的本地化字符串。
         /// </summary>
@@ -2075,7 +2075,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("RemoveRules", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Are you sure you want to remove the Configuration? 的本地化字符串。
         /// </summary>
@@ -2084,7 +2084,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("RemoveServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 {0}, one of the required fields. 的本地化字符串。
         /// </summary>
@@ -2093,7 +2093,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("RoutingRuleDetailRequiredTips", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Run as Admin 的本地化字符串。
         /// </summary>
@@ -2102,7 +2102,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("RunAsAdmin", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 The client configuration file is saved at: {0} 的本地化字符串。
         /// </summary>
@@ -2111,7 +2111,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SaveClientConfigurationIn", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 {0} : {1}/s↑ | {2}/s↓ 的本地化字符串。
         /// </summary>
@@ -2120,7 +2120,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SpeedDisplayText", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Testing... 的本地化字符串。
         /// </summary>
@@ -2129,7 +2129,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("Speedtesting", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Test completed 的本地化字符串。
         /// </summary>
@@ -2138,7 +2138,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SpeedtestingCompleted", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Skip test 的本地化字符串。
         /// </summary>
@@ -2147,7 +2147,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SpeedtestingSkip", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Test terminating... 的本地化字符串。
         /// </summary>
@@ -2156,7 +2156,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SpeedtestingStop", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Starting retesting failed parts, {0} remaining. Press ESC to terminate... 的本地化字符串。
         /// </summary>
@@ -2165,7 +2165,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SpeedtestingTestFailedPart", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Waiting for testing (press ESC to terminate)... 的本地化字符串。
         /// </summary>
@@ -2174,7 +2174,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SpeedtestingWait", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Starting service ({0})... 的本地化字符串。
         /// </summary>
@@ -2183,7 +2183,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("StartService", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 For group please leave blank here 的本地化字符串。
         /// </summary>
@@ -2192,7 +2192,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SubUrlTips", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Configuration successful. {0} 的本地化字符串。
         /// </summary>
@@ -2201,7 +2201,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SuccessfulConfiguration", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Custom configuration Configuration imported successfully 的本地化字符串。
         /// </summary>
@@ -2210,7 +2210,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SuccessfullyImportedCustomServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 {0} Configurations have been imported from clipboard 的本地化字符串。
         /// </summary>
@@ -2219,7 +2219,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SuccessfullyImportedServerViaClipboard", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Successfully scanned and imported the shared link 的本地化字符串。
         /// </summary>
@@ -2228,7 +2228,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SuccessfullyImportedServerViaScan", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Incorrect password, please try again. 的本地化字符串。
         /// </summary>
@@ -2237,7 +2237,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SudoIncorrectPasswordTip", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Add Common DNS Hosts 的本地化字符串。
         /// </summary>
@@ -2246,7 +2246,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAddCommonDNSHosts", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Do Not Add Non-Proxy Protocol Outbound 的本地化字符串。
         /// </summary>
@@ -2255,7 +2255,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAddProxyProtocolOutboundOnly", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Address 的本地化字符串。
         /// </summary>
@@ -2264,7 +2264,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAddress", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Allow Insecure 的本地化字符串。
         /// </summary>
@@ -2273,7 +2273,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAllowInsecure", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 ALPN 的本地化字符串。
         /// </summary>
@@ -2282,7 +2282,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAlpn", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Alter ID 的本地化字符串。
         /// </summary>
@@ -2291,7 +2291,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAlterId", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Apply to Proxy Domains Only 的本地化字符串。
         /// </summary>
@@ -2300,7 +2300,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbApplyProxyDomainsOnly", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Auto refresh 的本地化字符串。
         /// </summary>
@@ -2309,7 +2309,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAutoRefresh", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Auto scroll to end 的本地化字符串。
         /// </summary>
@@ -2318,7 +2318,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAutoScrollToEnd", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Domain, IP, process are auto-sorted when saving 的本地化字符串。
         /// </summary>
@@ -2327,7 +2327,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAutoSort", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Block SVCB and HTTPS Queries 的本地化字符串。
         /// </summary>
@@ -2336,7 +2336,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbBlockSVCBHTTPSQueries", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Prevent domain-based routing rules from failing 的本地化字符串。
         /// </summary>
@@ -2345,7 +2345,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbBlockSVCBHTTPSQueriesTips", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Browse 的本地化字符串。
         /// </summary>
@@ -2354,7 +2354,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbBrowse", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Cancel 的本地化字符串。
         /// </summary>
@@ -2363,7 +2363,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbCancel", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Clear system proxy 的本地化字符串。
         /// </summary>
@@ -2372,7 +2372,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbClearSystemProxy", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Confirm 的本地化字符串。
         /// </summary>
@@ -2381,7 +2381,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbConfirm", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Connections 的本地化字符串。
         /// </summary>
@@ -2390,7 +2390,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbConnections", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Core Type 的本地化字符串。
         /// </summary>
@@ -2399,7 +2399,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbCoreType", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Enable Custom DNS 的本地化字符串。
         /// </summary>
@@ -2408,7 +2408,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbCustomDNSEnable", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Custom DNS Enabled, This Page&apos;s Settings Invalid 的本地化字符串。
         /// </summary>
@@ -2417,7 +2417,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbCustomDNSEnabledPageInvalid", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Display GUI 的本地化字符串。
         /// </summary>
@@ -2426,7 +2426,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbDisplayGUI", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Display Log 的本地化字符串。
         /// </summary>
@@ -2435,7 +2435,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbDisplayLog", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 DNS Hosts: (&quot;domain1 ip1 ip2&quot; per line) 的本地化字符串。
         /// </summary>
@@ -2444,7 +2444,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbDNSHostsConfig", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Supports DNS Object; Click to view documentation 的本地化字符串。
         /// </summary>
@@ -2453,7 +2453,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbDnsObjectDoc", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please fill in DNS Structure, Click to view the document 的本地化字符串。
         /// </summary>
@@ -2462,7 +2462,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbDnsSingboxObjectDoc", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Domain strategy 的本地化字符串。
         /// </summary>
@@ -2471,7 +2471,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbdomainStrategy", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 sing-box domain strategy 的本地化字符串。
         /// </summary>
@@ -2480,7 +2480,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbdomainStrategy4Singbox", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Domestic DNS 的本地化字符串。
         /// </summary>
@@ -2489,7 +2489,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbDomesticDNS", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Edit 的本地化字符串。
         /// </summary>
@@ -2498,7 +2498,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbEdit", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Enable Tun 的本地化字符串。
         /// </summary>
@@ -2507,7 +2507,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbEnableTunAs", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 FakeIP 的本地化字符串。
         /// </summary>
@@ -2516,7 +2516,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbFakeIP", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Fingerprint 的本地化字符串。
         /// </summary>
@@ -2525,7 +2525,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbFingerprint", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Flow 的本地化字符串。
         /// </summary>
@@ -2534,7 +2534,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbFlow5", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core&apos;s basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you. 的本地化字符串。
         /// </summary>
@@ -2543,7 +2543,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbFullConfigTemplateDesc", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Enable Full Config Template 的本地化字符串。
         /// </summary>
@@ -2552,7 +2552,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbFullConfigTemplateEnable", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Global Hotkey Settings 的本地化字符串。
         /// </summary>
@@ -2561,7 +2561,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbGlobalHotkeySetting", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Set directly by pressing the keyboard; takes effect after restart 的本地化字符串。
         /// </summary>
@@ -2570,7 +2570,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbGlobalHotkeySettingTip", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Generate 的本地化字符串。
         /// </summary>
@@ -2579,7 +2579,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbGUID", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Camouflage type 的本地化字符串。
         /// </summary>
@@ -2588,7 +2588,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbHeaderType", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Congestion control 的本地化字符串。
         /// </summary>
@@ -2597,7 +2597,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbHeaderType8", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 UUID(id) 的本地化字符串。
         /// </summary>
@@ -2606,7 +2606,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbId", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Password 的本地化字符串。
         /// </summary>
@@ -2615,7 +2615,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbId3", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Password(Optional) 的本地化字符串。
         /// </summary>
@@ -2624,7 +2624,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbId4", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 UUID(id) 的本地化字符串。
         /// </summary>
@@ -2633,7 +2633,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbId5", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Address (IPv4, IPv6) 的本地化字符串。
         /// </summary>
@@ -2642,7 +2642,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbLocalAddress", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Mldsa65Verify 的本地化字符串。
         /// </summary>
@@ -2651,7 +2651,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbMldsa65Verify", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Transport protocol(network) 的本地化字符串。
         /// </summary>
@@ -2660,7 +2660,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbNetwork", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Do not change system proxy 的本地化字符串。
         /// </summary>
@@ -2669,7 +2669,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbNotChangeSystemProxy", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Path 的本地化字符串。
         /// </summary>
@@ -2678,7 +2678,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPath", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 obfs password 的本地化字符串。
         /// </summary>
@@ -2687,7 +2687,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPath7", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Port 的本地化字符串。
         /// </summary>
@@ -2696,7 +2696,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPort", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Configuration port range 的本地化字符串。
         /// </summary>
@@ -2705,7 +2705,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPorts7", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Will cover the port, separate with commas (,) 的本地化字符串。
         /// </summary>
@@ -2714,7 +2714,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPorts7Tips", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Socks port 的本地化字符串。
         /// </summary>
@@ -2723,7 +2723,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPreSocksPort", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Custom config socks port 的本地化字符串。
         /// </summary>
@@ -2732,7 +2732,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPreSocksPort4Sub", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Private Key 的本地化字符串。
         /// </summary>
@@ -2741,7 +2741,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPrivateKey", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Proxies 的本地化字符串。
         /// </summary>
@@ -2750,7 +2750,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbProxies", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Public Key 的本地化字符串。
         /// </summary>
@@ -2759,7 +2759,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPublicKey", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 v2ray Full Config Template 的本地化字符串。
         /// </summary>
@@ -2768,7 +2768,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRayFullConfigTemplate", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Add Outbound Config Only, routing.balancers and routing.rules.outboundTag, Click to view the document 的本地化字符串。
         /// </summary>
@@ -2777,7 +2777,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRayFullConfigTemplateDesc", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Alias (remarks) 的本地化字符串。
         /// </summary>
@@ -2786,7 +2786,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRemarks", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Remote DNS 的本地化字符串。
         /// </summary>
@@ -2795,7 +2795,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRemoteDNS", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Camouflage domain(host) 的本地化字符串。
         /// </summary>
@@ -2804,7 +2804,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRequestHost", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Reserved (2,3,4) 的本地化字符串。
         /// </summary>
@@ -2813,7 +2813,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbReserved", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Reset 的本地化字符串。
         /// </summary>
@@ -2822,7 +2822,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbReset", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 socks: local port, socks2: second local port, socks3: LAN port 的本地化字符串。
         /// </summary>
@@ -2831,7 +2831,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRoutingInboundTagTips", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Domain 的本地化字符串。
         /// </summary>
@@ -2840,7 +2840,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRoutingRuleDomain", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 IP or IP CIDR 的本地化字符串。
         /// </summary>
@@ -2849,7 +2849,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRoutingRuleIP", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Full process name (Tun mode) 的本地化字符串。
         /// </summary>
@@ -2858,7 +2858,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRoutingRuleProcess", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Pre-defined Rule Set List 的本地化字符串。
         /// </summary>
@@ -2867,7 +2867,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRoutingTabRuleList", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 *Separate rules by commas (,); For a literal comma use &lt;COMMA&gt;; Prefix # to ignore a rule 的本地化字符串。
         /// </summary>
@@ -2876,7 +2876,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRoutingTips", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 (Domain or IP or Proc Name) and Port and Protocol and Inbound Tag =&gt; Outbound Tag 的本地化字符串。
         /// </summary>
@@ -2885,7 +2885,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRuleMatchingTips", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Rule object Doc 的本地化字符串。
         /// </summary>
@@ -2894,7 +2894,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRuleobjectDoc", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Can fill in the configuration remarks, please make sure it exist and are unique 的本地化字符串。
         /// </summary>
@@ -2903,7 +2903,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRuleOutboundTagTip", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 sing-box Direct Resolution Strategy 的本地化字符串。
         /// </summary>
@@ -2912,7 +2912,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBDirectResolveStrategy", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 The sing-box DoH resolution server can be overwritten 的本地化字符串。
         /// </summary>
@@ -2921,7 +2921,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBDoHOverride", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 sing-box DoH Resolver Server 的本地化字符串。
         /// </summary>
@@ -2930,7 +2930,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBDoHResolverServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Fallback DNS Resolution, Suggest IP 的本地化字符串。
         /// </summary>
@@ -2939,7 +2939,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBFallbackDNSResolve", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 sing-box Full Config Template 的本地化字符串。
         /// </summary>
@@ -2948,7 +2948,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBFullConfigTemplate", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Add Outbound and Endpoint Config Only, Click to view the document 的本地化字符串。
         /// </summary>
@@ -2957,7 +2957,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBFullConfigTemplateDesc", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Resolve Outbound Domains 的本地化字符串。
         /// </summary>
@@ -2966,7 +2966,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBOutboundDomainResolve", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Outbound DNS Resolution (sing-box) 的本地化字符串。
         /// </summary>
@@ -2975,7 +2975,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBOutboundsResolverDNS", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 sing-box Remote Resolution Strategy 的本地化字符串。
         /// </summary>
@@ -2984,7 +2984,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBRemoteResolveStrategy", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Encryption method (security) 的本地化字符串。
         /// </summary>
@@ -2993,7 +2993,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSecurity", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Encryption 的本地化字符串。
         /// </summary>
@@ -3002,7 +3002,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSecurity3", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 User(Optional) 的本地化字符串。
         /// </summary>
@@ -3011,7 +3011,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSecurity4", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Encryption 的本地化字符串。
         /// </summary>
@@ -3020,7 +3020,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSecurity5", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Set system proxy 的本地化字符串。
         /// </summary>
@@ -3029,7 +3029,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSetSystemProxy", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Click to import default DNS config 的本地化字符串。
         /// </summary>
@@ -3038,7 +3038,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingDnsImportDefConfig", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Advanced proxy settings, protocol selection (optional) 的本地化字符串。
         /// </summary>
@@ -3047,7 +3047,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsAdvancedProtocol", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Allow connections from the LAN 的本地化字符串。
         /// </summary>
@@ -3056,7 +3056,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsAllowLAN", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Auto hide on startup 的本地化字符串。
         /// </summary>
@@ -3065,7 +3065,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsAutoHideStartup", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Automatic update interval for Geo files (hours) 的本地化字符串。
         /// </summary>
@@ -3074,7 +3074,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsAutoUpdateInterval", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Users in China region can ignore this item 的本地化字符串。
         /// </summary>
@@ -3083,7 +3083,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsChinaUserTip", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Color 的本地化字符串。
         /// </summary>
@@ -3092,7 +3092,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsColor", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Core: basic settings 的本地化字符串。
         /// </summary>
@@ -3101,7 +3101,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsCore", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 V2ray DNS settings 的本地化字符串。
         /// </summary>
@@ -3110,7 +3110,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsCoreDns", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 sing-box DNS settings 的本地化字符串。
         /// </summary>
@@ -3119,7 +3119,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsCoreDnsSingbox", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Core: KCP settings 的本地化字符串。
         /// </summary>
@@ -3128,7 +3128,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsCoreKcp", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Core Type settings 的本地化字符串。
         /// </summary>
@@ -3137,7 +3137,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsCoreType", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Font family (requires restart) 的本地化字符串。
         /// </summary>
@@ -3146,7 +3146,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsCurrentFontFamily", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Install the font to the system, select or fill in the font name, restart the settings 的本地化字符串。
         /// </summary>
@@ -3155,7 +3155,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsCurrentFontFamilyLinuxTip", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Copy the font TTF/TTC file to the directory gui Fonts; Reopen the settings window 的本地化字符串。
         /// </summary>
@@ -3164,7 +3164,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsCurrentFontFamilyTip", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Allow Insecure 的本地化字符串。
         /// </summary>
@@ -3173,7 +3173,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDefAllowInsecure", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Default TLS fingerprint 的本地化字符串。
         /// </summary>
@@ -3182,7 +3182,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDefFingerprint", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 User-Agent 的本地化字符串。
         /// </summary>
@@ -3191,7 +3191,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDefUserAgent", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 This parameter is valid only for tcp/http and ws 的本地化字符串。
         /// </summary>
@@ -3200,7 +3200,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDefUserAgentTips", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Sniffing type 的本地化字符串。
         /// </summary>
@@ -3209,7 +3209,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDestOverride", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Display real-time speed (requires restart) 的本地化字符串。
         /// </summary>
@@ -3218,7 +3218,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDisplayRealTimeSpeed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Outbound DNS address 的本地化字符串。
         /// </summary>
@@ -3227,7 +3227,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDomainDNSAddress", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Outbound Freedom domain Strategy 的本地化字符串。
         /// </summary>
@@ -3236,7 +3236,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDomainStrategy4Freedom", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Default domain strategy for outbound 的本地化字符串。
         /// </summary>
@@ -3245,7 +3245,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDomainStrategy4Out", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Double-clicking Configuration makes it active 的本地化字符串。
         /// </summary>
@@ -3254,7 +3254,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDoubleClick2Activate", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Automatically adjust column width after subscription update 的本地化字符串。
         /// </summary>
@@ -3263,7 +3263,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableAutoAdjustMainLvColWidth", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Enable cache file for sing-box (ruleset files) 的本地化字符串。
         /// </summary>
@@ -3272,7 +3272,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableCacheFile4Sbox", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Check for pre-release updates 的本地化字符串。
         /// </summary>
@@ -3281,7 +3281,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableCheckPreReleaseUpdate", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Enable sorting Configurations by drag-n-drop (requires restart) 的本地化字符串。
         /// </summary>
@@ -3290,7 +3290,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableDragDropSort", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Enable additional Inbound 的本地化字符串。
         /// </summary>
@@ -3299,7 +3299,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableExInbound", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Enable fragment 的本地化字符串。
         /// </summary>
@@ -3308,7 +3308,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableFragment", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 which conflicts with the group previous proxy 的本地化字符串。
         /// </summary>
@@ -3317,7 +3317,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableFragmentTips", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Enable hardware acceleration (requires restart) 的本地化字符串。
         /// </summary>
@@ -3326,7 +3326,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableHWA", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Enable IPv6 Address 的本地化字符串。
         /// </summary>
@@ -3335,7 +3335,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableIPv6Address", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Updating subscription, only determining if remarks exist 的本地化字符串。
         /// </summary>
@@ -3344,7 +3344,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableUpdateSubOnlyRemarksExist", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Exception 的本地化字符串。
         /// </summary>
@@ -3353,7 +3353,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsException", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Exclusions: Do not use proxy server for addresses beginning with the following. Use semicolon (;) to separate entries. 的本地化字符串。
         /// </summary>
@@ -3362,7 +3362,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsExceptionTip", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Exclusions: Do not use proxy server for the following addresses. Use comma (,) to separate entries. 的本地化字符串。
         /// </summary>
@@ -3371,7 +3371,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsExceptionTip2", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Font Size 的本地化字符串。
         /// </summary>
@@ -3380,7 +3380,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsFontSize", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Geo files source (optional) 的本地化字符串。
         /// </summary>
@@ -3389,7 +3389,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsGeoFilesSource", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Hide to tray when closing the window 的本地化字符串。
         /// </summary>
@@ -3398,7 +3398,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsHide2TrayWhenClose", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Hysteria Max bandwidth (Up/Down) 的本地化字符串。
         /// </summary>
@@ -3407,7 +3407,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsHysteriaBandwidth", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Current connection info test URL 的本地化字符串。
         /// </summary>
@@ -3416,7 +3416,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsIPAPIUrl", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Keep older entries when de-duplicating 的本地化字符串。
         /// </summary>
@@ -3425,7 +3425,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsKeepOlderDedupl", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Language (Restart) 的本地化字符串。
         /// </summary>
@@ -3434,7 +3434,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsLanguage", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 System sudo password 的本地化字符串。
         /// </summary>
@@ -3443,7 +3443,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsLinuxSudoPassword", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 The password will be validated via the command line. If a validation error causes the application to malfunction, please restart the application. The password will not be stored and must be entered again after each restart. 的本地化字符串。
         /// </summary>
@@ -3452,7 +3452,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsLinuxSudoPasswordTip", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Enable Log 的本地化字符串。
         /// </summary>
@@ -3461,7 +3461,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsLogEnabled", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Enable logging to file 的本地化字符串。
         /// </summary>
@@ -3470,7 +3470,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsLogEnabledToFile", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Log Level 的本地化字符串。
         /// </summary>
@@ -3479,7 +3479,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsLogLevel", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Main layout orientation (requires restart) 的本地化字符串。
         /// </summary>
@@ -3488,7 +3488,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsMainGirdOrientation", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 The number of concurrent tests during multi-test 的本地化字符串。
         /// </summary>
@@ -3497,7 +3497,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsMixedConcurrencyCount", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 sing-box Mux Protocol 的本地化字符串。
         /// </summary>
@@ -3506,7 +3506,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsMux4SboxProtocol", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Turn on Mux Multiplexing 的本地化字符串。
         /// </summary>
@@ -3515,7 +3515,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsMuxEnabled", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 v2rayN settings 的本地化字符串。
         /// </summary>
@@ -3524,7 +3524,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsN", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 New Port for LAN 的本地化字符串。
         /// </summary>
@@ -3533,7 +3533,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsNewPort4LAN", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Do not use proxy servers for local (intranet) addresses 的本地化字符串。
         /// </summary>
@@ -3542,7 +3542,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsNotProxyLocalAddress", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Auth pass 的本地化字符串。
         /// </summary>
@@ -3551,7 +3551,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsPass", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Custom DNS (multiple, separated by commas (,)) 的本地化字符串。
         /// </summary>
@@ -3560,7 +3560,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsRemoteDNS", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Route Only 的本地化字符串。
         /// </summary>
@@ -3569,7 +3569,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsRouteOnly", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Routing rules source (optional) 的本地化字符串。
         /// </summary>
@@ -3578,7 +3578,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsRoutingRulesSource", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Enable second mixed port 的本地化字符串。
         /// </summary>
@@ -3587,7 +3587,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSecondLocalPortEnabled", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Set Win10 UWP Loopback 的本地化字符串。
         /// </summary>
@@ -3596,7 +3596,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSetUWP", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Turn on Sniffing 的本地化字符串。
         /// </summary>
@@ -3605,7 +3605,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSniffingEnabled", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Mixed Port 的本地化字符串。
         /// </summary>
@@ -3614,7 +3614,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSocksPort", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Pac port = +3; Xray API port = +4; mihomo API port = +5; 的本地化字符串。
         /// </summary>
@@ -3623,7 +3623,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSocksPortTip", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Speed Ping Test URL 的本地化字符串。
         /// </summary>
@@ -3632,7 +3632,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSpeedPingTestUrl", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Speed Test Single Timeout Value 的本地化字符串。
         /// </summary>
@@ -3641,7 +3641,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSpeedTestTimeout", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Speed Test URL 的本地化字符串。
         /// </summary>
@@ -3650,7 +3650,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSpeedTestUrl", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 sing-box ruleset files source (optional) 的本地化字符串。
         /// </summary>
@@ -3659,7 +3659,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSrsFilesSource", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Start on boot 的本地化字符串。
         /// </summary>
@@ -3668,7 +3668,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsStartBoot", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Set this with admin privileges, get admin privileges after startup 的本地化字符串。
         /// </summary>
@@ -3677,7 +3677,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsStartBootTip", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Enable traffic statistics (requires restart) 的本地化字符串。
         /// </summary>
@@ -3686,7 +3686,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsStatistics", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Subscription conversion URL 的本地化字符串。
         /// </summary>
@@ -3695,7 +3695,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSubConvert", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 System proxy settings 的本地化字符串。
         /// </summary>
@@ -3704,7 +3704,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSystemproxy", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Theme 的本地化字符串。
         /// </summary>
@@ -3713,7 +3713,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsTheme", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Enable Security Protocol TLS v1.3 (subscription/update) 的本地化字符串。
         /// </summary>
@@ -3722,7 +3722,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsTLS13", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Tray right-click menu Configurations display limit 的本地化字符串。
         /// </summary>
@@ -3731,7 +3731,35 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsTrayMenuServersLimit", resourceCulture);
             }
         }
-        
+
+        /// <summary>
+        ///   查找类似 Auto Route 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTunAutoRoute {
+            get { return ResourceManager.GetString("TbSettingsTunAutoRoute", resourceCulture); }
+        }
+
+        /// <summary>
+        ///   查找类似 Strict Route 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTunStrictRoute {
+            get { return ResourceManager.GetString("TbSettingsTunStrictRoute", resourceCulture); }
+        }
+
+        /// <summary>
+        ///   查找类似 Stack 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTunStack {
+            get { return ResourceManager.GetString("TbSettingsTunStack", resourceCulture); }
+        }
+
+        /// <summary>
+        ///   查找类似 MTU 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTunMtu {
+            get { return ResourceManager.GetString("TbSettingsTunMtu", resourceCulture); }
+        }
+
         /// <summary>
         ///   查找类似 Tun Mode settings 的本地化字符串。
         /// </summary>
@@ -3740,7 +3768,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsTunMode", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Enable UDP 的本地化字符串。
         /// </summary>
@@ -3749,7 +3777,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsUdpEnabled", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Auth user 的本地化字符串。
         /// </summary>
@@ -3758,7 +3786,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsUser", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Use System Hosts 的本地化字符串。
         /// </summary>
@@ -3767,7 +3795,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsUseSystemHosts", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Set Upstream Proxy Tag 的本地化字符串。
         /// </summary>
@@ -3776,7 +3804,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSetUpstreamProxyDetour", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Short Id 的本地化字符串。
         /// </summary>
@@ -3785,7 +3813,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbShortId", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 SNI 的本地化字符串。
         /// </summary>
@@ -3794,7 +3822,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSNI", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Sorting 的本地化字符串。
         /// </summary>
@@ -3803,7 +3831,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSorting", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Chain 的本地化字符串。
         /// </summary>
@@ -3812,7 +3840,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingChain", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Default 的本地化字符串。
         /// </summary>
@@ -3821,7 +3849,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingDefault", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Delay 的本地化字符串。
         /// </summary>
@@ -3830,7 +3858,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingDelay", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Download Speed 的本地化字符串。
         /// </summary>
@@ -3839,7 +3867,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingDownSpeed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Download Traffic 的本地化字符串。
         /// </summary>
@@ -3848,7 +3876,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingDownTraffic", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Host 的本地化字符串。
         /// </summary>
@@ -3857,7 +3885,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingHost", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Name 的本地化字符串。
         /// </summary>
@@ -3866,7 +3894,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingName", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Network 的本地化字符串。
         /// </summary>
@@ -3875,7 +3903,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingNetwork", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Time 的本地化字符串。
         /// </summary>
@@ -3884,7 +3912,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingTime", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Type 的本地化字符串。
         /// </summary>
@@ -3893,7 +3921,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingType", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Upload Speed 的本地化字符串。
         /// </summary>
@@ -3902,7 +3930,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingUpSpeed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Upload Traffic 的本地化字符串。
         /// </summary>
@@ -3911,7 +3939,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingUpTraffic", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Spider X 的本地化字符串。
         /// </summary>
@@ -3920,7 +3948,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSpiderX", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 TLS 的本地化字符串。
         /// </summary>
@@ -3929,7 +3957,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbStreamSecurity", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 PAC mode 的本地化字符串。
         /// </summary>
@@ -3938,7 +3966,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSystemProxyPac", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Validate Regional Domain IPs 的本地化字符串。
         /// </summary>
@@ -3947,7 +3975,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbValidateDirectExpectedIPs", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs 的本地化字符串。
         /// </summary>
@@ -3956,7 +3984,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbValidateDirectExpectedIPsDesc", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 xray Freedom Resolution Strategy 的本地化字符串。
         /// </summary>
@@ -3965,7 +3993,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbXrayFreedomResolveStrategy", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 The delay: {0} ms, {1} 的本地化字符串。
         /// </summary>
@@ -3974,7 +4002,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TestMeOutput", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Advanced DNS Settings 的本地化字符串。
         /// </summary>
@@ -3983,7 +4011,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("ThAdvancedDNSSettings", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Basic DNS Settings 的本地化字符串。
         /// </summary>
@@ -3992,7 +4020,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("ThBasicDNSSettings", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Active 的本地化字符串。
         /// </summary>
@@ -4001,7 +4029,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TipActiveServer", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Routing setting has changed 的本地化字符串。
         /// </summary>
@@ -4010,7 +4038,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TipChangeRouting", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 System proxy setting has changed 的本地化字符串。
         /// </summary>
@@ -4019,7 +4047,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TipChangeSystemProxy", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Please turn off when there is an abnormal disconnection 的本地化字符串。
         /// </summary>
@@ -4028,7 +4056,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TipDisplayLog", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 *Default value tcp 的本地化字符串。
         /// </summary>
@@ -4037,7 +4065,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TipNetwork", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 * After setting this value, a socks service will be started using Xray/sing-box(Tun) to provide functions such as speed display 的本地化字符串。
         /// </summary>
@@ -4046,7 +4074,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TipPreSocksPort", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 XHTTP Extra raw JSON, format: { XHTTP Object } 的本地化字符串。
         /// </summary>
@@ -4055,7 +4083,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportExtraTip", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 *tcp camouflage type 的本地化字符串。
         /// </summary>
@@ -4064,7 +4092,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportHeaderTypeTip1", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 *kcp camouflage type 的本地化字符串。
         /// </summary>
@@ -4073,7 +4101,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportHeaderTypeTip2", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 *QUIC camouflage type 的本地化字符串。
         /// </summary>
@@ -4082,7 +4110,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportHeaderTypeTip3", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 *grpc mode 的本地化字符串。
         /// </summary>
@@ -4091,7 +4119,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportHeaderTypeTip4", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 *xhttp mode 的本地化字符串。
         /// </summary>
@@ -4100,7 +4128,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportHeaderTypeTip5", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 *ws/http upgrade/xhttp path 的本地化字符串。
         /// </summary>
@@ -4109,7 +4137,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportPathTip1", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 *h2 path 的本地化字符串。
         /// </summary>
@@ -4118,7 +4146,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportPathTip2", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 *QUIC key/KCP seed 的本地化字符串。
         /// </summary>
@@ -4127,7 +4155,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportPathTip3", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 *grpc service name 的本地化字符串。
         /// </summary>
@@ -4136,7 +4164,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportPathTip4", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 *kcp seed 的本地化字符串。
         /// </summary>
@@ -4145,7 +4173,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportPathTip5", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 *http host separated by commas (,) 的本地化字符串。
         /// </summary>
@@ -4154,7 +4182,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportRequestHostTip1", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 *ws/http upgrade/xhttp host 的本地化字符串。
         /// </summary>
@@ -4163,7 +4191,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportRequestHostTip2", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 *h2 host separated by commas (,) 的本地化字符串。
         /// </summary>
@@ -4172,7 +4200,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportRequestHostTip3", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 *QUIC security 的本地化字符串。
         /// </summary>
@@ -4181,7 +4209,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportRequestHostTip4", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 *grpc Authority 的本地化字符串。
         /// </summary>
@@ -4190,7 +4218,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportRequestHostTip5", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   查找类似 Upgrade App does not exist 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
index 6873e1c8..cd15f976 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -1059,6 +1059,18 @@
   <data name="LvPrevProfileTip" xml:space="preserve">
     <value>لطفاً مطمئن شوید که ملاحظات وجود دارند و منحصر به فرد هستند</value>
   </data>
+  <data name="TbSettingsTunAutoRoute" xml:space="preserve">
+    <value>مسیریابی خودکار</value>
+  </data>
+  <data name="TbSettingsTunStrictRoute" xml:space="preserve">
+    <value>مسیریابی سخت‌گیرانه</value>
+  </data>
+  <data name="TbSettingsTunStack" xml:space="preserve">
+    <value>پشته شبکه</value>
+  </data>
+  <data name="TbSettingsTunMtu" xml:space="preserve">
+    <value>MTU</value>
+  </data>
   <data name="TbSettingsEnableExInbound" xml:space="preserve">
     <value>فعال سازی additional Inbound</value>
   </data>
@@ -1497,4 +1509,4 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
index d90ac86c..8f451953 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -1059,6 +1059,18 @@
   <data name="LvPrevProfileTip" xml:space="preserve">
     <value>Kérjük, győződjön meg arról, hogy a konfigurációs megjegyzések léteznek és egyediek</value>
   </data>
+  <data name="TbSettingsTunAutoRoute" xml:space="preserve">
+    <value>Automatikus útválasztás</value>
+  </data>
+  <data name="TbSettingsTunStrictRoute" xml:space="preserve">
+    <value>Szigorú útválasztás</value>
+  </data>
+  <data name="TbSettingsTunStack" xml:space="preserve">
+    <value>Hálózati verem</value>
+  </data>
+  <data name="TbSettingsTunMtu" xml:space="preserve">
+    <value>MTU</value>
+  </data>
   <data name="TbSettingsEnableExInbound" xml:space="preserve">
     <value>További bejövő engedélyezése</value>
   </data>
@@ -1497,4 +1509,4 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index 2b2e3abd..104a3925 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -1059,6 +1059,18 @@
   <data name="LvPrevProfileTip" xml:space="preserve">
     <value>Please make sure the Configuration remarks exist and are unique</value>
   </data>
+  <data name="TbSettingsTunAutoRoute" xml:space="preserve">
+    <value>Auto Route</value>
+  </data>
+  <data name="TbSettingsTunStrictRoute" xml:space="preserve">
+    <value>Strict Route</value>
+  </data>
+  <data name="TbSettingsTunStack" xml:space="preserve">
+    <value>Stack</value>
+  </data>
+  <data name="TbSettingsTunMtu" xml:space="preserve">
+    <value>MTU</value>
+  </data>
   <data name="TbSettingsEnableExInbound" xml:space="preserve">
     <value>Enable additional Inbound</value>
   </data>
@@ -1497,4 +1509,4 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
index bb1f6184..2b02e3ed 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -1059,6 +1059,18 @@
   <data name="LvPrevProfileTip" xml:space="preserve">
     <value>Убедитесь, что примечание существует и является уникальным</value>
   </data>
+  <data name="TbSettingsTunAutoRoute" xml:space="preserve">
+    <value>Автоматическая маршрутизация</value>
+  </data>
+  <data name="TbSettingsTunStrictRoute" xml:space="preserve">
+    <value>Строгая маршрутизация</value>
+  </data>
+  <data name="TbSettingsTunStack" xml:space="preserve">
+    <value>Сетевой стек</value>
+  </data>
+  <data name="TbSettingsTunMtu" xml:space="preserve">
+    <value>MTU</value>
+  </data>
   <data name="TbSettingsEnableExInbound" xml:space="preserve">
     <value>Включить дополнительный входящий канал</value>
   </data>
@@ -1497,4 +1509,4 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>Эта функция предназначена для продвинутых пользователей и особых случаев. После включения игнорируются базовые настройки ядра, DNS и маршрутизации. Вы должны самостоятельно корректно задать порт системного прокси, учёт трафика и другие связанные параметры — всё настраивается вручную.</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index b10ff641..ff9035d3 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -1056,6 +1056,18 @@
   <data name="LvPrevProfileTip" xml:space="preserve">
     <value>请确保配置文件别名存在并唯一</value>
   </data>
+  <data name="TbSettingsTunAutoRoute" xml:space="preserve">
+    <value>自动路由</value>
+  </data>
+  <data name="TbSettingsTunStrictRoute" xml:space="preserve">
+    <value>严格路由</value>
+  </data>
+  <data name="TbSettingsTunStack" xml:space="preserve">
+    <value>协议栈</value>
+  </data>
+  <data name="TbSettingsTunMtu" xml:space="preserve">
+    <value>MTU</value>
+  </data>
   <data name="TbSettingsEnableExInbound" xml:space="preserve">
     <value>启用额外监听端口</value>
   </data>
@@ -1494,4 +1506,4 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>此功能供高级用户和有特殊需求的用户使用。 启用此功能后，将忽略 Core 的基础设置，DNS 设置 ，路由设置。你需要保证系统代理的端口和流量统计等功能的配置正确，一切都由你来设置。</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index b3738082..34a90e21 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -1056,6 +1056,18 @@
   <data name="LvPrevProfileTip" xml:space="preserve">
     <value>請確保設定檔別名存在並且唯一</value>
   </data>
+  <data name="TbSettingsTunAutoRoute" xml:space="preserve">
+    <value>自動路由</value>
+  </data>
+  <data name="TbSettingsTunStrictRoute" xml:space="preserve">
+    <value>嚴格路由</value>
+  </data>
+  <data name="TbSettingsTunStack" xml:space="preserve">
+    <value>協定堆疊</value>
+  </data>
+  <data name="TbSettingsTunMtu" xml:space="preserve">
+    <value>MTU</value>
+  </data>
   <data name="TbSettingsEnableExInbound" xml:space="preserve">
     <value>啟用額外偵聽連接埠</value>
   </data>
@@ -1494,4 +1506,4 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
index 56cc82a0..9cb462d1 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
@@ -523,7 +523,7 @@
                         Grid.Column="0"
                         Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Text="Mtu" />
+                        Text="{x:Static resx:ResUI.TbSettingsTunMtu}" />
                     <TextBox
                         x:Name="txtShortId9"
                         Grid.Row="5"
diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
index ba174a62..df8ac68a 100644
--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
@@ -736,7 +736,7 @@
                         Grid.Column="0"
                         Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Text="Auto Route" />
+                        Text="{x:Static resx:ResUI.TbSettingsTunAutoRoute}" />
                     <ToggleSwitch
                         x:Name="togAutoRoute"
                         Grid.Row="2"
@@ -749,7 +749,7 @@
                         Grid.Column="0"
                         Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Text="Strict Route" />
+                        Text="{x:Static resx:ResUI.TbSettingsTunStrictRoute}" />
                     <ToggleSwitch
                         x:Name="togStrictRoute"
                         Grid.Row="3"
@@ -762,7 +762,7 @@
                         Grid.Column="0"
                         Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Text="Stack" />
+                        Text="{x:Static resx:ResUI.TbSettingsTunStack}" />
                     <ComboBox
                         x:Name="cmbStack"
                         Grid.Row="4"
@@ -776,7 +776,7 @@
                         Grid.Column="0"
                         Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Text="Mtu" />
+                        Text="{x:Static resx:ResUI.TbSettingsTunMtu}" />
                     <ComboBox
                         x:Name="cmbMtu"
                         Grid.Row="5"
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml
index acea0c28..7276a1fc 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -696,7 +696,7 @@
                         Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
-                        Text="Mtu" />
+                        Text="{x:Static resx:ResUI.TbSettingsTunMtu}" />
                     <TextBox
                         x:Name="txtShortId9"
                         Grid.Row="5"
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
index e3e38992..6b92ba2d 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -430,7 +430,7 @@
                         Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
-                        Text="mtu" />
+                        Text="{x:Static resx:ResUI.TbSettingsTunMtu}" />
                     <TextBox Style="{StaticResource DefTextBox}"
                         x:Name="txtKcpmtu"
                         Grid.Row="1"
@@ -1037,7 +1037,7 @@
                         Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
-                        Text="Auto Route" />
+                        Text="{x:Static resx:ResUI.TbSettingsTunAutoRoute}" />
                     <ToggleButton
                         x:Name="togAutoRoute"
                         Grid.Row="2"
@@ -1051,7 +1051,7 @@
                         Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
-                        Text="Strict Route" />
+                        Text="{x:Static resx:ResUI.TbSettingsTunStrictRoute}" />
                     <ToggleButton
                         x:Name="togStrictRoute"
                         Grid.Row="3"
@@ -1065,7 +1065,7 @@
                         Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
-                        Text="Stack" />
+                        Text="{x:Static resx:ResUI.TbSettingsTunStack}" />
                     <ComboBox
                         x:Name="cmbStack"
                         Grid.Row="4"
@@ -1081,7 +1081,7 @@
                         Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
-                        Text="Mtu" />
+                        Text="{x:Static resx:ResUI.TbSettingsTunMtu}" />
                     <ComboBox
                         x:Name="cmbMtu"
                         Grid.Row="5"

From 876381a7fb5ceedf61eda60cd1ccbc1869758da5 Mon Sep 17 00:00:00 2001
From: JieXu <xujie0739@gmail.com>
Date: Mon, 18 Aug 2025 17:29:10 +0800
Subject: [PATCH 061/115] Create package-rhel.sh (#7770)

* Create package-rhel.sh

* Update package-rhel.sh

* Update package-rhel.sh

* Update package-rhel.sh

* Update package-rhel.sh

* Update package-rhel.sh

* Update package-rhel.sh

* Update package-rhel.sh

* Update package-rhel.sh

* Update package-rhel.sh

* Update package-rhel.sh

* Update package-rhel.sh
---
 package-rhel.sh | 511 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 511 insertions(+)
 create mode 100644 package-rhel.sh

diff --git a/package-rhel.sh b/package-rhel.sh
new file mode 100644
index 00000000..2bfe1ad2
--- /dev/null
+++ b/package-rhel.sh
@@ -0,0 +1,511 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# ===== Require Red Hat Enterprise Linux / Rocky Linux / AlmaLinux / CentOS Stream =======
+if [[ -r /etc/os-release ]]; then
+  . /etc/os-release
+  case "$ID" in
+    rhel|rocky|almalinux|centos)
+      echo "[OK] Detected supported system: $NAME $VERSION_ID"
+      ;;
+    *)
+      echo "[ERROR] Unsupported system: $NAME ($ID)."
+      echo "This script only supports Red Hat Enterprise Linux / Rocky Linux / AlmaLinux / CentOS Stream."
+      exit 1
+      ;;
+  esac
+else
+  echo "[ERROR] Cannot detect system (missing /etc/os-release)."
+  exit 1
+fi
+
+# ===== Config & Parse arguments =========================================================
+VERSION_ARG="${1:-}"     # Pass version number like 7.13.8, or leave empty
+WITH_CORE="both"         # Default: bundle both xray+sing-box
+AUTOSTART=0              # 1 = enable system-wide autostart (/etc/xdg/autostart)
+FORCE_NETCORE=0          # --netcore => skip archive bundle, use separate downloads
+
+# If the first argument starts with --, don’t treat it as version number
+if [[ "${VERSION_ARG:-}" == --* ]]; then
+  VERSION_ARG=""
+fi
+# Take the first non --* argument as version, discard it
+if [[ -n "${VERSION_ARG:-}" ]]; then shift || true; fi
+
+# Parse remaining optional arguments
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --with-core)     WITH_CORE="${2:-both}"; shift 2;;
+    --autostart)     AUTOSTART=1; shift;;
+    --xray-ver)      XRAY_VER="${2:-}"; shift 2;;        # Specify xray version (optional)
+    --singbox-ver)   SING_VER="${2:-}"; shift 2;;        # Specify sing-box version (optional)
+    --netcore)       FORCE_NETCORE=1; shift;;            # NEW: force old mode (no bundle zip)
+    *)
+      if [[ -z "${VERSION_ARG:-}" ]]; then VERSION_ARG="$1"; fi
+      shift;;
+  esac
+done
+
+# ===== Environment check ===============================================================
+arch="$(uname -m)"
+[[ "$arch" == "aarch64" || "$arch" == "x86_64" ]] || { echo "Only supports aarch64 / x86_64"; exit 1; }
+
+# Dependencies (packaging shouldn’t be run as root, but this line needs sudo)
+sudo dnf -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar || sudo dnf -y install dotnet-sdk
+command -v curl >/dev/null
+
+# Root directory = the script's location
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
+# Git submodules (tolerant)
+if [[ -f .gitmodules ]]; then
+  git submodule sync --recursive || true
+  git submodule update --init --recursive || true
+fi
+
+# ===== Locate project ================================================================
+PROJECT="v2rayN.Desktop/v2rayN.Desktop.csproj"
+if [[ ! -f "$PROJECT" ]]; then
+  PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)"
+fi
+[[ -f "$PROJECT" ]] || { echo "v2rayN.Desktop.csproj not found"; exit 1; }
+
+# ===== Resolve GUI version & auto checkout ============================================
+# Rules:
+# - If VERSION_ARG provided: try to checkout that tag (vX.Y.Z or X.Y.Z). If not found, ask which channel (Latest vs Pre-release),
+#   default to Latest, then fetch the chosen channel's latest tag and checkout.
+# - If VERSION_ARG not provided: ask the channel first (default Latest), then checkout to that tag.
+# - If not a git repo, warn and continue without switching (keep current branch).
+VERSION=""  # final GUI version string without 'v' prefix
+
+choose_channel() {
+  # Print menu to stderr first, then read from stdin; only echo the chosen token to stdout.
+  local ch="latest" sel=""
+  if [[ -t 0 ]]; then
+    >&2 echo "[?] Choose v2rayN release channel:"
+    >&2 echo "    1) Latest (stable)  [default]"
+    >&2 echo "    2) Pre-release (preview)"
+    read -r -p "Enter 1 or 2 (default 1): " sel
+    case "${sel:-}" in
+      2) ch="prerelease" ;;
+      *) ch="latest" ;;
+    esac
+  else
+    ch="latest"
+  fi
+  echo "$ch"
+}
+
+get_latest_tag_latest() {
+  # Use GitHub API: /releases/latest → tag_name
+  curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \
+    | grep -Eo '"tag_name":\s*"v?[^"]+"' \
+    | head -n1 \
+    | sed -E 's/.*"tag_name":\s*"v?([^"]+)".*/\1/'
+}
+
+get_latest_tag_prerelease() {
+  # Use GitHub API: /releases?per_page=20 and pick the newest prerelease=true's tag_name
+  local json
+  json="$(curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20")" || return 1
+  echo "$json" \
+    | awk -v RS='},' '/"prerelease":[[:space:]]*true/ { if (match($0, /"tag_name":[[:space:]]*"v?[^"]+"/, m)) { t=m[0]; sub(/.*"tag_name":[[:space:]]*"?v?/, "", t); sub(/".*/, "", t); print t; exit } }'
+}
+
+git_try_checkout() {
+  # Try a series of refs and checkout when found.
+  # Args: version-like string (may contain leading 'v')
+  local want="$1" ref=""
+  if git rev-parse --git-dir >/dev/null 2>&1; then
+    git fetch --tags --force --prune --depth=1 || true
+    if git rev-parse "refs/tags/v${want}" >/dev/null 2>&1; then
+      ref="v${want}"
+    elif git rev-parse "refs/tags/${want}" >/dev/null 2>&1; then
+      ref="${want}"
+    elif git rev-parse --verify "${want}" >/dev/null 2>&1; then
+      ref="${want}"
+    fi
+    if [[ -n "$ref" ]]; then
+      echo "[OK] Found ref '${ref}', checking out..."
+      git checkout -f "${ref}"
+      if [[ -f .gitmodules ]]; then
+        git submodule sync --recursive || true
+        git submodule update --init --recursive || true
+      fi
+      return 0
+    fi
+  fi
+  return 1
+}
+
+if git rev-parse --git-dir >/dev/null 2>&1; then
+  if [[ -n "${VERSION_ARG:-}" ]]; then
+    echo "[*] Trying to switch v2rayN repo to version: ${VERSION_ARG}"
+    if git_try_checkout "${VERSION_ARG#v}"; then
+      VERSION="${VERSION_ARG#v}"
+    else
+      echo "[WARN] Tag '${VERSION_ARG}' not found."
+      ch="$(choose_channel)"
+      echo "[*] Resolving ${ch} tag from GitHub releases..."
+      tag=""
+      if [[ "$ch" == "prerelease" ]]; then
+        tag="$(get_latest_tag_prerelease || true)"
+      else
+        tag="$(get_latest_tag_latest || true)"
+      fi
+      [[ -n "$tag" ]] || { echo "[ERROR] Failed to resolve latest tag for channel '${ch}'."; exit 1; }
+      echo "[*] Latest tag for '${ch}': ${tag}"
+      git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; }
+      VERSION="${tag#v}"
+    fi
+  else
+    # No explicit GUI version passed: ask channel first
+    ch="$(choose_channel)"
+    echo "[*] Resolving ${ch} tag from GitHub releases..."
+    tag=""
+    if [[ "$ch" == "prerelease" ]]; then
+      tag="$(get_latest_tag_prerelease || true)"
+    else
+      tag="$(get_latest_tag_latest || true)"
+    fi
+    [[ -n "$tag" ]] || { echo "[ERROR] Failed to resolve latest tag for channel '${ch}'."; exit 1; }
+    echo "[*] Latest tag for '${ch}': ${tag}"
+    git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; }
+    VERSION="${tag#v}"
+  fi
+else
+  echo "[WARN] Current directory is not a git repo; cannot checkout version. Proceeding on current tree."
+  VERSION="${VERSION_ARG:-}"
+  if [[ -z "$VERSION" ]]; then
+    if git describe --tags --abbrev=0 >/dev/null 2>&1; then
+      VERSION="$(git describe --tags --abbrev=0)"
+    else
+      VERSION="0.0.0+git"
+    fi
+  fi
+  VERSION="${VERSION#v}"
+fi
+echo "[*] GUI version resolved as: ${VERSION}"
+
+# ===== .NET publish (non-single file, self-contained) ===========================================
+dotnet clean "$PROJECT" -c Release
+rm -rf "$(dirname "$PROJECT")/bin/Release/net8.0" || true
+
+dotnet restore "$PROJECT"
+dotnet publish "$PROJECT" \
+  -c Release -r "$( [[ "$arch" == "aarch64" ]] && echo linux-arm64 || echo linux-x64 )" \
+  -p:PublishSingleFile=false \
+  -p:SelfContained=true \
+  -p:IncludeNativeLibrariesForSelfExtract=true
+
+RID_DIR="$( [[ "$arch" == "aarch64" ]] && echo linux-arm64 || echo linux-x64 )"
+PUBDIR="$(dirname "$PROJECT")/bin/Release/net8.0/${RID_DIR}/publish"
+[[ -d "$PUBDIR" ]]
+
+# ===== Download Core（Optional） ========================================================
+download_xray() {
+  local outdir="$1" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
+  mkdir -p "$outdir"
+  if [[ -z "$ver" ]]; then
+    # Latest version
+    ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
+        | grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
+  fi
+  [[ -n "$ver" ]] || { echo "[xray] Failed to get version"; return 1; }
+
+  if [[ "$arch" == "aarch64" ]]; then
+    url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-arm64-v8a.zip"
+  else
+    url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-64.zip"
+  fi
+  echo "[+] Download xray: $url"
+  tmp="$(mktemp -d)"; trap 'rm -rf "$tmp"' RETURN
+  curl -fL "$url" -o "$tmp/$zipname"
+  unzip -q "$tmp/$zipname" -d "$tmp"
+  install -Dm755 "$tmp/xray" "$outdir/xray"
+}
+
+download_singbox() {
+  local outdir="$1" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin
+  mkdir -p "$outdir"
+  if [[ -z "$ver" ]]; then
+    ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest \
+        | grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
+  fi
+  [[ -n "$ver" ]] || { echo "[sing-box] Failed to get version"; return 1; }
+
+  if [[ "$arch" == "aarch64" ]]; then
+    url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-arm64.tar.gz"
+  else
+    url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-amd64.tar.gz"
+  fi
+  echo "[+] Download sing-box: $url"
+  tmp="$(mktemp -d)"; trap 'rm -rf "$tmp"' RETURN
+  curl -fL "$url" -o "$tmp/$tarname"
+  tar -C "$tmp" -xzf "$tmp/$tarname"
+  bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
+  [[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; return 1; }
+  install -Dm755 "$bin" "$outdir/sing-box"
+}
+
+# === Geo rule download (ZIP-LIKE LAYOUT for netcore mode) =====================
+# Make netcore output match the ZIP bundle structure:
+# - All geo databases at    outroot/bin/ (geosite.dat, geoip.dat, Country.mmdb, geoip-only-cn-private.dat, geoip.metadb)
+# - All *.srs rule-sets at  outroot/bin/srss/
+# (Binaries stay under outroot/bin/xray and outroot/bin/sing_box as before.)
+download_geo_assets() {
+  local outroot="$1"
+  local bin_dir="$outroot/bin"
+  local srss_dir="$bin_dir/srss"
+  mkdir -p "$bin_dir" "$srss_dir"
+
+  echo "[+] Download Xray Geo (geosite/geoip/...) to ${bin_dir}"
+  curl -fsSL -o "$bin_dir/geosite.dat" \
+    "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat"
+  curl -fsSL -o "$bin_dir/geoip.dat" \
+    "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
+  curl -fsSL -o "$bin_dir/geoip-only-cn-private.dat" \
+    "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat"
+  curl -fsSL -o "$bin_dir/Country.mmdb" \
+    "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
+
+  echo "[+] Download sing-box rule DB & rule-sets to ZIP-like paths"
+  curl -fsSL -o "$bin_dir/geoip.metadb" \
+    "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb" || true
+
+  for f in \
+    geoip-private.srs geoip-cn.srs geoip-facebook.srs geoip-fastly.srs \
+    geoip-google.srs geoip-netflix.srs geoip-telegram.srs geoip-twitter.srs; do
+    curl -fsSL -o "$srss_dir/$f" \
+      "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geoip/$f" || true
+  done
+
+  for f in \
+    geosite-cn.srs geosite-gfw.srs geosite-greatfire.srs \
+    geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do
+    curl -fsSL -o "$srss_dir/$f" \
+      "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geosite/$f" || true
+  done
+}
+
+# === NEW: Prefer the all-in-one v2rayN bundle zip first =======================
+download_v2rayn_bundle() {
+  local outroot="$1"
+  local url=""
+  if [[ "$arch" == "aarch64" ]]; then
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64.zip"
+  else
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64.zip"
+  fi
+  echo "[+] Try v2rayN bundle archive: $url"
+  local tmp zipname
+  tmp="$(mktemp -d)"; zipname="$tmp/v2rayn.zip"
+  curl -fL "$url" -o "$zipname" || { echo "[!] Bundle download failed"; return 1; }
+  unzip -q "$zipname" -d "$tmp" || { echo "[!] Bundle unzip failed"; return 1; }
+
+  # Normalize layout: copy 'bin/' if present; otherwise copy all
+  if [[ -d "$tmp/bin" ]]; then
+    mkdir -p "$outroot/bin"
+    rsync -a "$tmp/bin/" "$outroot/bin/"
+  else
+    rsync -a "$tmp/" "$outroot/"
+  fi
+
+  # --- CLEANUPS (keep bundle-only adjustments) -------------------------------
+  rm -f "$outroot/v2rayn.zip" 2>/dev/null || true
+  find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
+
+  local nested_dir
+  nested_dir="$(find "$outroot" -maxdepth 1 -type d -name 'v2rayN-linux-*' | head -n1 || true)"
+  if [[ -n "${nested_dir:-}" && -d "$nested_dir/bin" ]]; then
+    mkdir -p "$outroot/bin"
+    rsync -a "$nested_dir/bin/" "$outroot/bin/"
+    rm -rf "$nested_dir"
+  fi
+  # ---------------------------------------------------------------------------
+
+  echo "[+] Bundle extracted to $outroot"
+}
+
+# ===== Copy publish files to RPM build root ==================================================
+rpmdev-setuptree
+TOPDIR="${HOME}/rpmbuild"
+SPECDIR="${TOPDIR}/SPECS"
+SOURCEDIR="${TOPDIR}/SOURCES"
+
+PKGROOT="v2rayN-publish"
+WORKDIR="$(mktemp -d)"
+trap 'rm -rf "$WORKDIR"' EXIT
+
+mkdir -p "$WORKDIR/$PKGROOT"
+cp -a "$PUBDIR/." "$WORKDIR/$PKGROOT/"
+
+# icon（Optional）
+ICON_CANDIDATE="$(dirname "$PROJECT")/../v2rayN.Desktop/v2rayN.png"
+[[ -f "$ICON_CANDIDATE" ]] && cp "$ICON_CANDIDATE" "$WORKDIR/$PKGROOT/v2rayn.png" || true
+
+# bin directory structure
+mkdir -p "$WORKDIR/$PKGROOT/bin/xray" "$WORKDIR/$PKGROOT/bin/sing_box"
+
+# ====== NEW decision: prefer bundle zip unless --netcore, else fall back ======
+if [[ "$FORCE_NETCORE" -eq 0 ]]; then
+  if download_v2rayn_bundle "$WORKDIR/$PKGROOT"; then
+    echo "[*] Using v2rayN bundle archive."
+  else
+    echo "[*] Bundle failed, fallback to separate core + rules."
+    if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
+      download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray download failed (skipped)"
+    fi
+    if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
+      download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box download failed (skipped)"
+    fi
+    download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)"
+  fi
+else
+  echo "[*] --netcore specified: use separate core + rules."
+  if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
+    download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray download failed (skipped)"
+  fi
+  if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
+    download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box download failed (skipped)"
+  fi
+  download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)"
+fi
+
+tar -C "$WORKDIR" -czf "$SOURCEDIR/$PKGROOT.tar.gz" "$PKGROOT"
+
+# ===== Generate SPEC (heredoc with placeholders) ===================================
+SPECFILE="$SPECDIR/v2rayN.spec"
+cat > "$SPECFILE" <<'SPEC'
+%global debug_package %{nil}
+%undefine _debuginfo_subpackages
+%undefine _debugsource_packages
+# Ignore outdated LTTng dependencies incorrectly reported by the .NET runtime (to avoid installation failures)
+%global __requires_exclude ^liblttng-ust\.so\..*$
+
+Name:           v2rayN
+Version:        __VERSION__
+Release:        1%{?dist}
+Summary:        v2rayN (Avalonia) GUI client for Linux (x86_64/aarch64)
+License:        GPL-3.0-only
+URL:            https://github.com/2dust/v2rayN
+ExclusiveArch:  aarch64 x86_64
+Source0:        __PKGROOT__.tar.gz
+
+# Runtime dependencies (Avalonia / X11 / Fonts / GL)
+Requires:       libX11, libXrandr, libXcursor, libXi, libXext, libxcb, libXrender, libXfixes, libXinerama, libxkbcommon
+Requires:       fontconfig, freetype, cairo, pango, mesa-libEGL, mesa-libGL
+
+%description
+v2rayN GUI client built with Avalonia.
+Installs self-contained publish under /opt/v2rayN and a launcher 'v2rayn'.
+Cores (if bundled): /opt/v2rayN/bin/xray, /opt/v2rayN/bin/sing_box.
+Geo files for Xray are placed at /opt/v2rayN/bin/xray; launcher will symlink them into user's XDG data dir on first run.
+
+%prep
+%setup -q -n __PKGROOT__
+
+%build
+# no build
+
+%install
+install -dm0755 %{buildroot}/opt/v2rayN
+cp -a * %{buildroot}/opt/v2rayN/
+
+# Launcher (prioritize ELF first, then fall back to DLL; also create Geo symlinks for the user)
+install -dm0755 %{buildroot}%{_bindir}
+cat > %{buildroot}%{_bindir}/v2rayn << 'EOF'
+#!/usr/bin/bash
+set -euo pipefail
+DIR="/opt/v2rayN"
+
+# --- SYMLINK GEO into user's XDG dir (new) ---
+XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
+USR_GEO_DIR="$XDG_DATA_HOME/v2rayN/bin"
+SYS_XRAY_DIR="$DIR/bin/xray"
+mkdir -p "$USR_GEO_DIR"
+for f in geosite.dat geoip.dat geoip-only-cn-private.dat Country.mmdb; do
+  if [[ -f "$SYS_XRAY_DIR/$f" && ! -e "$USR_GEO_DIR/$f" ]]; then
+    ln -s "$SYS_XRAY_DIR/$f" "$USR_GEO_DIR/$f" || true
+  fi
+done
+# --- end GEO ---
+
+# Prefer native ELF（apphost）
+if [[ -x "$DIR/v2rayN" ]]; then exec "$DIR/v2rayN" "$@"; fi
+
+# DLL fallback (for framework-dependent publish)
+for dll in v2rayN.Desktop.dll v2rayN.dll; do
+  if [[ -f "$DIR/$dll" ]]; then exec /usr/bin/dotnet "$DIR/$dll" "$@"; fi
+done
+
+echo "v2rayN launcher: no executable found in $DIR" >&2
+ls -l "$DIR" >&2 || true
+exit 1
+EOF
+chmod 0755 %{buildroot}%{_bindir}/v2rayn
+
+# Desktop File
+install -dm0755 %{buildroot}%{_datadir}/applications
+cat > %{buildroot}%{_datadir}/applications/v2rayn.desktop << 'EOF'
+[Desktop Entry]
+Type=Application
+Name=v2rayN
+Comment=GUI client for Xray / sing-box
+Exec=v2rayn
+Icon=v2rayn
+Terminal=false
+Categories=Network;
+EOF
+
+# icon
+if [ -f "%{_builddir}/__PKGROOT__/v2rayn.png" ]; then
+  install -dm0755 %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
+  install -m0644 %{_builddir}/__PKGROOT__/v2rayn.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
+fi
+
+%post
+/usr/bin/update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || true
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor >/dev/null 2>&1 || true
+
+%postun
+/usr/bin/update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || true
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor >/dev/null 2>&1 || true
+
+%files
+%{_bindir}/v2rayn
+/opt/v2rayN
+%{_datadir}/applications/v2rayn.desktop
+%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
+SPEC
+
+# Optional: system-wide autostart (append block, keep original logic unchanged)
+if [[ "$AUTOSTART" -eq 1 ]]; then
+cat >> "$SPECFILE" <<'SPEC'
+# System-wide autostart entry
+%install
+install -dm0755 %{buildroot}/etc/xdg/autostart
+cat > %{buildroot}/etc/xdg/autostart/v2rayn.desktop << 'EOF'
+[Desktop Entry]
+Type=Application
+Name=v2rayN (Autostart)
+Exec=v2rayn
+X-GNOME-Autostart-enabled=true
+NoDisplay=false
+EOF
+
+%files
+%config(noreplace) /etc/xdg/autostart/v2rayn.desktop
+SPEC
+fi
+
+# Injecting version/package root placeholders
+sed -i "s/__VERSION__/${VERSION}/g" "$SPECFILE"
+sed -i "s/__PKGROOT__/${PKGROOT}/g" "$SPECFILE"
+
+# ===== Build RPM ================================================================
+rpmbuild -ba "$SPECFILE"
+
+echo "Build done. RPM at:"
+ls -1 "${TOPDIR}/RPMS/$( [[ "$arch" == "aarch64" ]] && echo aarch64 || echo x86_64 )/v2rayN-${VERSION}-1"*.rpm

From e104f9f9b21bd70b210c397774d10edbaf776e55 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 18 Aug 2025 20:09:58 +0800
Subject: [PATCH 062/115] Rename Manager

---
 .../HotkeyManager.cs}                         |  8 +++----
 .../Views/GlobalHotkeySettingWindow.axaml.cs  |  6 ++---
 .../v2rayN.Desktop/Views/MainWindow.axaml.cs  |  6 ++---
 .../{QRCodeHelper.cs => QRCodeUtils.cs}       |  4 ++--
 .../HotkeyManager.cs}                         | 22 +++++++++----------
 .../WindowsManager.cs}                        | 15 +++++++------
 .../Views/GlobalHotkeySettingWindow.xaml.cs   |  6 ++---
 v2rayN/v2rayN/Views/MainWindow.xaml           |  1 +
 v2rayN/v2rayN/Views/MainWindow.xaml.cs        |  6 ++---
 v2rayN/v2rayN/Views/ProfilesView.xaml.cs      |  2 +-
 v2rayN/v2rayN/Views/StatusBarView.xaml.cs     |  6 ++---
 v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs  |  2 +-
 12 files changed, 43 insertions(+), 41 deletions(-)
 rename v2rayN/v2rayN.Desktop/{Handler/HotkeyHandler.cs => Manager/HotkeyManager.cs} (91%)
 rename v2rayN/v2rayN/Common/{QRCodeHelper.cs => QRCodeUtils.cs} (94%)
 rename v2rayN/v2rayN/{Handler/HotkeyHandler.cs => Manager/HotkeyManager.cs} (89%)
 rename v2rayN/v2rayN/{Handler/WindowsHandler.cs => Manager/WindowsManager.cs} (89%)

diff --git a/v2rayN/v2rayN.Desktop/Handler/HotkeyHandler.cs b/v2rayN/v2rayN.Desktop/Manager/HotkeyManager.cs
similarity index 91%
rename from v2rayN/v2rayN.Desktop/Handler/HotkeyHandler.cs
rename to v2rayN/v2rayN.Desktop/Manager/HotkeyManager.cs
index a8d257c8..5ce6ff60 100644
--- a/v2rayN/v2rayN.Desktop/Handler/HotkeyHandler.cs
+++ b/v2rayN/v2rayN.Desktop/Manager/HotkeyManager.cs
@@ -4,12 +4,12 @@ using Avalonia.ReactiveUI;
 using Avalonia.Win32.Input;
 using GlobalHotKeys;
 
-namespace v2rayN.Desktop.Handler;
+namespace v2rayN.Desktop.Manager;
 
-public sealed class HotkeyHandler
+public sealed class HotkeyManager
 {
-    private static readonly Lazy<HotkeyHandler> _instance = new(() => new());
-    public static HotkeyHandler Instance = _instance.Value;
+    private static readonly Lazy<HotkeyManager> _instance = new(() => new());
+    public static HotkeyManager Instance = _instance.Value;
     private readonly Dictionary<int, EGlobalHotkey> _hotkeyTriggerDic = new();
     private HotKeyManager? _hotKeyManager;
 
diff --git a/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs
index a9f79765..f676ccfc 100644
--- a/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs
@@ -5,7 +5,7 @@ using Avalonia.Input;
 using Avalonia.Interactivity;
 using ReactiveUI;
 using v2rayN.Desktop.Base;
-using v2rayN.Desktop.Handler;
+using v2rayN.Desktop.Manager;
 
 namespace v2rayN.Desktop.Views;
 
@@ -21,8 +21,8 @@ public partial class GlobalHotkeySettingWindow : WindowBase<GlobalHotkeySettingV
 
         btnReset.Click += btnReset_Click;
 
-        HotkeyHandler.Instance.IsPause = true;
-        this.Closing += (s, e) => HotkeyHandler.Instance.IsPause = false;
+        HotkeyManager.Instance.IsPause = true;
+        this.Closing += (s, e) => HotkeyManager.Instance.IsPause = false;
         btnCancel.Click += (s, e) => this.Close();
 
         this.WhenActivated(disposables =>
diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
index e808e54e..0633e9af 100644
--- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
@@ -13,7 +13,7 @@ using ServiceLib.Manager;
 using Splat;
 using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Common;
-using v2rayN.Desktop.Handler;
+using v2rayN.Desktop.Manager;
 
 namespace v2rayN.Desktop.Views;
 
@@ -143,7 +143,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
             this.Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
 
             ThreadPool.RegisterWaitForSingleObject(Program.ProgramStarted, OnProgramStarted, null, -1, false);
-            HotkeyHandler.Instance.Init(_config, OnHotkeyHandler);
+            HotkeyManager.Instance.Init(_config, OnHotkeyHandler);
         }
         else
         {
@@ -235,7 +235,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
                 StorageUI();
                 if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
                 {
-                    HotkeyHandler.Instance.Dispose();
+                    HotkeyManager.Instance.Dispose();
                     desktop.Shutdown();
                 }
                 break;
diff --git a/v2rayN/v2rayN/Common/QRCodeHelper.cs b/v2rayN/v2rayN/Common/QRCodeUtils.cs
similarity index 94%
rename from v2rayN/v2rayN/Common/QRCodeHelper.cs
rename to v2rayN/v2rayN/Common/QRCodeUtils.cs
index 6d070972..3013e45f 100644
--- a/v2rayN/v2rayN/Common/QRCodeHelper.cs
+++ b/v2rayN/v2rayN/Common/QRCodeUtils.cs
@@ -7,7 +7,7 @@ using System.Windows.Media.Imaging;
 
 namespace v2rayN;
 
-public class QRCodeHelper
+public class QRCodeUtils
 {
     public static ImageSource? GetQRCode(string? strContent)
     {
@@ -17,7 +17,7 @@ public class QRCodeHelper
         }
         try
         {
-            var qrCodeImage = QRCodeUtils.GenQRCode(strContent);
+            var qrCodeImage = ServiceLib.Common.QRCodeUtils.GenQRCode(strContent);
             return qrCodeImage is null ? null : ByteToImage(qrCodeImage);
         }
         catch
diff --git a/v2rayN/v2rayN/Handler/HotkeyHandler.cs b/v2rayN/v2rayN/Manager/HotkeyManager.cs
similarity index 89%
rename from v2rayN/v2rayN/Handler/HotkeyHandler.cs
rename to v2rayN/v2rayN/Manager/HotkeyManager.cs
index cfc2d463..9301cfad 100644
--- a/v2rayN/v2rayN/Handler/HotkeyHandler.cs
+++ b/v2rayN/v2rayN/Manager/HotkeyManager.cs
@@ -6,12 +6,12 @@ using System.Windows.Input;
 using System.Windows.Interop;
 using ServiceLib.Manager;
 
-namespace v2rayN.Handler;
+namespace v2rayN.Manager;
 
-public sealed class HotkeyHandler
+public sealed class HotkeyManager
 {
-    private static readonly Lazy<HotkeyHandler> _instance = new(() => new());
-    public static HotkeyHandler Instance = _instance.Value;
+    private static readonly Lazy<HotkeyManager> _instance = new(() => new());
+    public static HotkeyManager Instance = _instance.Value;
     private const int WmHotkey = 0x0312;
     private readonly Dictionary<int, List<EGlobalHotkey>> _hotkeyTriggerDic = new();
 
@@ -21,7 +21,7 @@ public sealed class HotkeyHandler
 
     public event Action<EGlobalHotkey>? HotkeyTriggerEvent;
 
-    public HotkeyHandler()
+    public HotkeyManager()
     {
         ComponentDispatcher.ThreadPreprocessMessage += OnThreadPreProcessMessage;
         Init();
@@ -51,7 +51,7 @@ public sealed class HotkeyHandler
                     modifiers |= KeyModifiers.Alt;
                 }
 
-                key = (key << 16) | (int)modifiers;
+                key = key << 16 | (int)modifiers;
                 if (!_hotkeyTriggerDic.ContainsKey(key))
                 {
                     _hotkeyTriggerDic.Add(key, new() { item.EGlobalHotkey });
@@ -77,7 +77,7 @@ public sealed class HotkeyHandler
 
             Application.Current?.Dispatcher.Invoke(() =>
             {
-                isSuccess = RegisterHotKey(IntPtr.Zero, _hotkeyCode, hotkeyInfo.fsModifiers, hotkeyInfo.vKey);
+                isSuccess = RegisterHotKey(nint.Zero, _hotkeyCode, hotkeyInfo.fsModifiers, hotkeyInfo.vKey);
             });
             foreach (var name in hotkeyInfo.Names)
             {
@@ -101,7 +101,7 @@ public sealed class HotkeyHandler
         {
             Application.Current?.Dispatcher.Invoke(() =>
             {
-                UnregisterHotKey(IntPtr.Zero, hotkey);
+                UnregisterHotKey(nint.Zero, hotkey);
             });
         }
         Init();
@@ -111,7 +111,7 @@ public sealed class HotkeyHandler
     private (int fsModifiers, int vKey, string hotkeyStr, List<string> Names) GetHotkeyInfo(int hotkeyCode)
     {
         var fsModifiers = hotkeyCode & 0xffff;
-        var vKey = (hotkeyCode >> 16) & 0xffff;
+        var vKey = hotkeyCode >> 16 & 0xffff;
         var hotkeyStr = new StringBuilder();
         var names = new List<string>();
 
@@ -174,10 +174,10 @@ public sealed class HotkeyHandler
     }
 
     [DllImport("user32.dll", SetLastError = true)]
-    private static extern bool RegisterHotKey(IntPtr hWnd, int id, int fsModifiers, int vlc);
+    private static extern bool RegisterHotKey(nint hWnd, int id, int fsModifiers, int vlc);
 
     [DllImport("user32.dll", SetLastError = true)]
-    private static extern bool UnregisterHotKey(IntPtr hWnd, int id);
+    private static extern bool UnregisterHotKey(nint hWnd, int id);
 
     [Flags]
     private enum KeyModifiers
diff --git a/v2rayN/v2rayN/Handler/WindowsHandler.cs b/v2rayN/v2rayN/Manager/WindowsManager.cs
similarity index 89%
rename from v2rayN/v2rayN/Handler/WindowsHandler.cs
rename to v2rayN/v2rayN/Manager/WindowsManager.cs
index 2e4ba33b..8e8b116d 100644
--- a/v2rayN/v2rayN/Handler/WindowsHandler.cs
+++ b/v2rayN/v2rayN/Manager/WindowsManager.cs
@@ -1,13 +1,14 @@
 using System.Drawing;
 using System.IO;
 using System.Windows.Media.Imaging;
+using v2rayN.Manager;
 
-namespace v2rayN.Handler;
+namespace v2rayN.Manager;
 
-public sealed class WindowsHandler
+public sealed class WindowsManager
 {
-    private static readonly Lazy<WindowsHandler> instance = new(() => new());
-    public static WindowsHandler Instance => instance.Value;
+    private static readonly Lazy<WindowsManager> instance = new(() => new());
+    public static WindowsManager Instance => instance.Value;
     private static readonly string _tag = "WindowsHandler";
 
     public async Task<Icon> GetNotifyIcon(Config config)
@@ -97,8 +98,8 @@ public sealed class WindowsHandler
 
     public void RegisterGlobalHotkey(Config config, Action<EGlobalHotkey> handler, Action<bool, string>? update)
     {
-        HotkeyHandler.Instance.UpdateViewEvent += update;
-        HotkeyHandler.Instance.HotkeyTriggerEvent += handler;
-        HotkeyHandler.Instance.Load();
+        HotkeyManager.Instance.UpdateViewEvent += update;
+        HotkeyManager.Instance.HotkeyTriggerEvent += handler;
+        HotkeyManager.Instance.Load();
     }
 }
diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
index d6d25445..54dc6c8b 100644
--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
@@ -5,7 +5,7 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using ReactiveUI;
 using ServiceLib.Manager;
-using v2rayN.Handler;
+using v2rayN.Manager;
 
 namespace v2rayN.Views;
 
@@ -23,8 +23,8 @@ public partial class GlobalHotkeySettingWindow
 
         btnReset.Click += btnReset_Click;
 
-        HotkeyHandler.Instance.IsPause = true;
-        this.Closing += (s, e) => HotkeyHandler.Instance.IsPause = false;
+        HotkeyManager.Instance.IsPause = true;
+        this.Closing += (s, e) => HotkeyManager.Instance.IsPause = false;
 
         this.WhenActivated(disposables =>
         {
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index 14fe809a..b12b17ec 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -15,6 +15,7 @@
     Height="700"
     MinWidth="900"
     x:TypeArguments="vms:MainWindowViewModel"
+    Icon="/Resources/v2rayN.ico"
     ResizeMode="CanResizeWithGrip"
     ShowInTaskbar="True"
     Style="{StaticResource WindowGlobal}"
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index 95f3b218..37c6bba7 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -10,7 +10,7 @@ using MaterialDesignThemes.Wpf;
 using ReactiveUI;
 using ServiceLib.Manager;
 using Splat;
-using v2rayN.Handler;
+using v2rayN.Manager;
 
 namespace v2rayN.Views;
 
@@ -143,7 +143,7 @@ public partial class MainWindow
         }
 
         AddHelpMenuItem();
-        WindowsHandler.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, null);
+        WindowsManager.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, null);
         MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
     }
 
@@ -344,7 +344,7 @@ public partial class MainWindow
 
         if (Application.Current?.MainWindow is Window window)
         {
-            var bytes = QRCodeHelper.CaptureScreen(window);
+            var bytes = QRCodeUtils.CaptureScreen(window);
             await ViewModel?.ScanScreenResult(bytes);
         }
 
diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
index a17e0585..265325d3 100644
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
+++ b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
@@ -180,7 +180,7 @@ public partial class ProfilesView
 
     public async void ShareServer(string url)
     {
-        var img = QRCodeHelper.GetQRCode(url);
+        var img = QRCodeUtils.GetQRCode(url);
         var dialog = new QrcodeView()
         {
             imgQrcode = { Source = img },
diff --git a/v2rayN/v2rayN/Views/StatusBarView.xaml.cs b/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
index 683767a7..db92793d 100644
--- a/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
+++ b/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
@@ -5,7 +5,7 @@ using System.Windows.Threading;
 using ReactiveUI;
 using ServiceLib.Manager;
 using Splat;
-using v2rayN.Handler;
+using v2rayN.Manager;
 
 namespace v2rayN.Views;
 
@@ -96,8 +96,8 @@ public partial class StatusBarView
             case EViewAction.DispatcherRefreshIcon:
                 Application.Current?.Dispatcher.Invoke((async () =>
                 {
-                    tbNotify.Icon = await WindowsHandler.Instance.GetNotifyIcon(_config);
-                    Application.Current.MainWindow.Icon = WindowsHandler.Instance.GetAppIcon(_config);
+                    tbNotify.Icon = await WindowsManager.Instance.GetNotifyIcon(_config);
+                    Application.Current.MainWindow.Icon = WindowsManager.Instance.GetAppIcon(_config);
                 }), DispatcherPriority.Normal);
                 break;
 
diff --git a/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
index 797f3cdc..c8e694d4 100644
--- a/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
@@ -70,7 +70,7 @@ public partial class SubSettingWindow
         {
             return;
         }
-        var img = QRCodeHelper.GetQRCode(url);
+        var img = QRCodeUtils.GetQRCode(url);
         var dialog = new QrcodeView()
         {
             imgQrcode = { Source = img },

From 4853e2348d768a986bc46b736bbdf84cf2b6da71 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Tue, 19 Aug 2025 09:09:35 +0800
Subject: [PATCH 063/115] Fix dns (#7797)

---
 .../CoreConfig/Singbox/SingboxDnsService.cs   | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
index ef22d926..c317ef53 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
@@ -67,26 +67,27 @@ public partial class CoreConfigSingboxService
         {
             hostsDns.predefined = Global.PredefinedHosts;
         }
-        var userHostsMap = simpleDNSItem.Hosts?
-            .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
-            .Where(line => !string.IsNullOrWhiteSpace(line))
-            .Where(line => line.Contains(' '))
-            .ToDictionary(
-                line =>
-                {
-                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                    return parts[0];
-                },
-                line =>
-                {
-                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                    var values = parts.Skip(1).ToList();
-                    return values;
-                }
-            );
 
-        if (userHostsMap != null)
+        if (!simpleDNSItem.Hosts.IsNullOrEmpty())
         {
+            var userHostsMap = simpleDNSItem.Hosts?
+                .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
+                .Where(line => !string.IsNullOrWhiteSpace(line))
+                .Where(line => line.Contains(' '))
+                .ToDictionary(
+                    line =>
+                    {
+                        var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                        return parts[0];
+                    },
+                    line =>
+                    {
+                        var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                        var values = parts.Skip(1).ToList();
+                        return values;
+                    }
+                ) ?? new Dictionary<string, List<string>>();
+
             foreach (var kvp in userHostsMap)
             {
                 hostsDns.predefined[kvp.Key] = kvp.Value;
@@ -100,11 +101,11 @@ public partial class CoreConfigSingboxService
             {
                 foreach (var host in systemHosts)
                 {
-                    if (userHostsMap[host.Key] != null)
+                    if (hostsDns.predefined[host.Key] != null)
                     {
                         continue;
                     }
-                    userHostsMap[host.Key] = new List<string> { host.Value };
+                    hostsDns.predefined[host.Key] = new List<string> { host.Value };
                 }
             }
         }

From 4a40b87bba31e7c0f1660e4623b82b0dcaa1c192 Mon Sep 17 00:00:00 2001
From: JieXu <xujie0739@gmail.com>
Date: Tue, 19 Aug 2025 09:09:52 +0800
Subject: [PATCH 064/115] Update package-rhel.sh (#7799)

---
 package-rhel.sh | 376 +++++++++++++++++++++++++++++++++++-------------
 1 file changed, 274 insertions(+), 102 deletions(-)

diff --git a/package-rhel.sh b/package-rhel.sh
index 2bfe1ad2..d7cf00ec 100644
--- a/package-rhel.sh
+++ b/package-rhel.sh
@@ -1,16 +1,16 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# ===== Require Red Hat Enterprise Linux / Rocky Linux / AlmaLinux / CentOS Stream =======
+# ===== Require Red Hat Enterprise Linux/RockyLinux/AlmaLinux/CentOS OR Ubuntu/Debian ====
 if [[ -r /etc/os-release ]]; then
   . /etc/os-release
   case "$ID" in
-    rhel|rocky|almalinux|centos)
+    rhel|rocky|almalinux|centos|ubuntu|debian)
       echo "[OK] Detected supported system: $NAME $VERSION_ID"
       ;;
     *)
       echo "[ERROR] Unsupported system: $NAME ($ID)."
-      echo "This script only supports Red Hat Enterprise Linux / Rocky Linux / AlmaLinux / CentOS Stream."
+      echo "This script only supports Red Hat Enterprise Linux/RockyLinux/AlmaLinux/CentOS or Ubuntu/Debian."
       exit 1
       ;;
   esac
@@ -24,8 +24,9 @@ VERSION_ARG="${1:-}"     # Pass version number like 7.13.8, or leave empty
 WITH_CORE="both"         # Default: bundle both xray+sing-box
 AUTOSTART=0              # 1 = enable system-wide autostart (/etc/xdg/autostart)
 FORCE_NETCORE=0          # --netcore => skip archive bundle, use separate downloads
+ARCH_OVERRIDE=""         # --arch x64|arm64 (optional override for RID)
 
-# If the first argument starts with --, don’t treat it as version number
+# If the first argument starts with --, do not treat it as a version number
 if [[ "${VERSION_ARG:-}" == --* ]]; then
   VERSION_ARG=""
 fi
@@ -37,28 +38,99 @@ while [[ $# -gt 0 ]]; do
   case "$1" in
     --with-core)     WITH_CORE="${2:-both}"; shift 2;;
     --autostart)     AUTOSTART=1; shift;;
-    --xray-ver)      XRAY_VER="${2:-}"; shift 2;;        # Specify xray version (optional)
-    --singbox-ver)   SING_VER="${2:-}"; shift 2;;        # Specify sing-box version (optional)
-    --netcore)       FORCE_NETCORE=1; shift;;            # NEW: force old mode (no bundle zip)
+    --xray-ver)      XRAY_VER="${2:-}"; shift 2;;
+    --singbox-ver)   SING_VER="${2:-}"; shift 2;;
+    --netcore)       FORCE_NETCORE=1; shift;;
+    --arch)          ARCH_OVERRIDE="${2:-}"; shift 2;;
     *)
       if [[ -z "${VERSION_ARG:-}" ]]; then VERSION_ARG="$1"; fi
       shift;;
   esac
 done
 
-# ===== Environment check ===============================================================
+# ===== Environment check + Dependencies ========================================
 arch="$(uname -m)"
 [[ "$arch" == "aarch64" || "$arch" == "x86_64" ]] || { echo "Only supports aarch64 / x86_64"; exit 1; }
 
-# Dependencies (packaging shouldn’t be run as root, but this line needs sudo)
-sudo dnf -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar || sudo dnf -y install dotnet-sdk
+install_ok=0
+case "$ID" in
+  # ------------------------------ RHEL family (UNCHANGED) ------------------------------
+  rhel|rocky|almalinux|centos)
+    if command -v dnf >/dev/null 2>&1; then
+      sudo dnf -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar rsync || \
+      sudo dnf -y install dotnet-sdk rpm-build rpmdevtools curl unzip tar rsync
+      install_ok=1
+    elif command -v yum >/dev/null 2>&1; then
+      sudo yum -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar rsync || \
+      sudo yum -y install dotnet-sdk rpm-build rpmdevtools curl unzip tar rsync
+      install_ok=1
+    fi
+    ;;
+  # ------------------------------ Ubuntu (KEEP AS-IS) ---------------------------------
+  ubuntu)
+    sudo apt-get update
+    # Ensure 'universe' (Ubuntu) to get 'rpm'
+    if ! apt-cache policy | grep -q '^500 .*ubuntu.com/ubuntu.* universe'; then
+      sudo apt-get -y install software-properties-common || true
+      sudo add-apt-repository -y universe || true
+      sudo apt-get update
+    fi
+    # Base tools + rpm (provides rpmbuild)
+    sudo apt-get -y install curl unzip tar rsync rpm || true
+    # rpmbuild presence check
+    if ! command -v rpmbuild >/dev/null 2>&1; then
+      echo "[ERROR] 'rpmbuild' not found after installing 'rpm'."
+      echo "        Please ensure the 'rpm' package is available from your repos (universe on Ubuntu)."
+      exit 1
+    fi
+    # .NET SDK 8 (best effort via apt)
+    if ! command -v dotnet >/dev/null 2>&1; then
+      sudo apt-get -y install dotnet-sdk-8.0 || true
+      sudo apt-get -y install dotnet-sdk-8 || true
+      sudo apt-get -y install dotnet-sdk || true
+    fi
+    install_ok=1
+    ;;
+  # ------------------------------ Debian (KEEP, with local dotnet install) ------------
+  debian)
+    sudo apt-get update
+    # Base tools + rpm (provides rpmbuild on Debian)
+    sudo apt-get -y install curl unzip tar rsync rpm || true
+    # rpmbuild presence check
+    if ! command -v rpmbuild >/dev/null 2>&1; then
+      echo "[ERROR] 'rpmbuild' not found after installing 'rpm'."
+      echo "        Please ensure 'rpm' is available from Debian repos."
+      exit 1
+    fi
+    # Try apt for dotnet; fallback to official installer into $HOME/.dotnet
+    if ! command -v dotnet >/dev/null 2>&1; then
+      echo "[INFO] 'dotnet' not found. Installing .NET 8 SDK locally to \$HOME/.dotnet ..."
+      tmp="$(mktemp -d)"; trap 'rm -rf "$tmp"' RETURN
+      curl -fsSL https://dot.net/v1/dotnet-install.sh -o "$tmp/dotnet-install.sh"
+      bash "$tmp/dotnet-install.sh" --channel 8.0 --install-dir "$HOME/.dotnet"
+      export PATH="$HOME/.dotnet:$HOME/.dotnet/tools:$PATH"
+      export DOTNET_ROOT="$HOME/.dotnet"
+      if ! command -v dotnet >/dev/null 2>&1; then
+        echo "[ERROR] dotnet installation failed."
+        exit 1
+      fi
+    fi
+    install_ok=1
+    ;;
+esac
+
+if [[ "$install_ok" -ne 1 ]]; then
+  echo "[WARN] Could not auto-install dependencies for '$ID'. Make sure these are available:"
+  echo "       dotnet-sdk 8.x, curl, unzip, tar, rsync, rpm, rpmdevtools, rpm-build (on RPM-based distros)"
+fi
+
 command -v curl >/dev/null
 
 # Root directory = the script's location
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
 cd "$SCRIPT_DIR"
 
-# Git submodules (tolerant)
+# Git submodules (best effort)
 if [[ -f .gitmodules ]]; then
   git submodule sync --recursive || true
   git submodule update --init --recursive || true
@@ -72,25 +144,26 @@ fi
 [[ -f "$PROJECT" ]] || { echo "v2rayN.Desktop.csproj not found"; exit 1; }
 
 # ===== Resolve GUI version & auto checkout ============================================
-# Rules:
-# - If VERSION_ARG provided: try to checkout that tag (vX.Y.Z or X.Y.Z). If not found, ask which channel (Latest vs Pre-release),
-#   default to Latest, then fetch the chosen channel's latest tag and checkout.
-# - If VERSION_ARG not provided: ask the channel first (default Latest), then checkout to that tag.
-# - If not a git repo, warn and continue without switching (keep current branch).
-VERSION=""  # final GUI version string without 'v' prefix
+VERSION=""
 
 choose_channel() {
-  # Print menu to stderr first, then read from stdin; only echo the chosen token to stdout.
+  # Print menu to stderr and read from /dev/tty so stdout only carries the token.
   local ch="latest" sel=""
   if [[ -t 0 ]]; then
-    >&2 echo "[?] Choose v2rayN release channel:"
-    >&2 echo "    1) Latest (stable)  [default]"
-    >&2 echo "    2) Pre-release (preview)"
-    read -r -p "Enter 1 or 2 (default 1): " sel
-    case "${sel:-}" in
-      2) ch="prerelease" ;;
-      *) ch="latest" ;;
-    esac
+    echo "[?] Choose v2rayN release channel:" >&2
+    echo "    1) Latest (stable)  [default]" >&2
+    echo "    2) Pre-release (preview)" >&2
+    echo "    3) Keep current (do nothing)" >&2
+    printf "Enter 1, 2 or 3 [default 1]: " >&2
+    if read -r sel </dev/tty; then
+      case "${sel:-}" in
+        2) ch="prerelease" ;;
+        3) ch="keep" ;;
+        *) ch="latest" ;;
+      esac
+    else
+      ch="latest"
+    fi
   else
     ch="latest"
   fi
@@ -98,7 +171,7 @@ choose_channel() {
 }
 
 get_latest_tag_latest() {
-  # Use GitHub API: /releases/latest → tag_name
+  # Resolve /releases/latest → tag_name
   curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \
     | grep -Eo '"tag_name":\s*"v?[^"]+"' \
     | head -n1 \
@@ -106,16 +179,34 @@ get_latest_tag_latest() {
 }
 
 get_latest_tag_prerelease() {
-  # Use GitHub API: /releases?per_page=20 and pick the newest prerelease=true's tag_name
-  local json
+  # Resolve newest prerelease=true tag; prefer jq, fallback to sed/grep (no awk)
+  local json tag
   json="$(curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20")" || return 1
-  echo "$json" \
-    | awk -v RS='},' '/"prerelease":[[:space:]]*true/ { if (match($0, /"tag_name":[[:space:]]*"v?[^"]+"/, m)) { t=m[0]; sub(/.*"tag_name":[[:space:]]*"?v?/, "", t); sub(/".*/, "", t); print t; exit } }'
+
+  # 1) Use jq if present
+  if command -v jq >/dev/null 2>&1; then
+    tag="$(printf '%s' "$json" \
+      | jq -r '[.[] | select(.prerelease==true)][0].tag_name' 2>/dev/null \
+      | sed 's/^v//')" || true
+  fi
+
+  # 2) Fallback to sed/grep only
+  if [[ -z "${tag:-}" || "${tag:-}" == "null" ]]; then
+    tag="$(printf '%s' "$json" \
+      | tr '\n' ' ' \
+      | sed 's/},[[:space:]]*{/\n/g' \
+      | grep -m1 -E '"prerelease"[[:space:]]*:[[:space:]]*true' \
+      | grep -Eo '"tag_name"[[:space:]]*:[[:space:]]*"v?[^"]+"' \
+      | head -n1 \
+      | sed -E 's/.*"tag_name"[[:space:]]*:[[:space:]]*"v?([^"]+)".*/\1/')" || true
+  fi
+
+  [[ -n "${tag:-}" && "${tag:-}" != "null" ]] || return 1
+  printf '%s\n' "$tag"
 }
 
 git_try_checkout() {
   # Try a series of refs and checkout when found.
-  # Args: version-like string (may contain leading 'v')
   local want="$1" ref=""
   if git rev-parse --git-dir >/dev/null 2>&1; then
     git fetch --tags --force --prune --depth=1 || true
@@ -147,10 +238,51 @@ if git rev-parse --git-dir >/dev/null 2>&1; then
     else
       echo "[WARN] Tag '${VERSION_ARG}' not found."
       ch="$(choose_channel)"
+      if [[ "$ch" == "keep" ]]; then
+        echo "[*] Keep current repository state (no checkout)."
+        if git describe --tags --abbrev=0 >/dev/null 2>&1; then
+          VERSION="$(git describe --tags --abbrev=0)"
+        else
+          VERSION="0.0.0+git"
+        fi
+        VERSION="${VERSION#v}"
+      else
+        echo "[*] Resolving ${ch} tag from GitHub releases..."
+        tag=""
+        if [[ "$ch" == "prerelease" ]]; then
+          tag="$(get_latest_tag_prerelease || true)"
+          if [[ -z "$tag" ]]; then
+            echo "[WARN] Failed to resolve prerelease tag, falling back to latest."
+            tag="$(get_latest_tag_latest || true)"
+          fi
+        else
+          tag="$(get_latest_tag_latest || true)"
+        fi
+        [[ -n "$tag" ]] || { echo "[ERROR] Failed to resolve latest tag for channel '${ch}'."; exit 1; }
+        echo "[*] Latest tag for '${ch}': ${tag}"
+        git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; }
+        VERSION="${tag#v}"
+      fi
+    fi
+  else
+    ch="$(choose_channel)"
+    if [[ "$ch" == "keep" ]]; then
+      echo "[*] Keep current repository state (no checkout)."
+      if git describe --tags --abbrev=0 >/dev/null 2>&1; then
+        VERSION="$(git describe --tags --abbrev=0)"
+      else
+        VERSION="0.0.0+git"
+      fi
+      VERSION="${VERSION#v}"
+    else
       echo "[*] Resolving ${ch} tag from GitHub releases..."
       tag=""
       if [[ "$ch" == "prerelease" ]]; then
         tag="$(get_latest_tag_prerelease || true)"
+        if [[ -z "$tag" ]]; then
+          echo "[WARN] Failed to resolve prerelease tag, falling back to latest."
+          tag="$(get_latest_tag_latest || true)"
+        fi
       else
         tag="$(get_latest_tag_latest || true)"
       fi
@@ -159,20 +291,6 @@ if git rev-parse --git-dir >/dev/null 2>&1; then
       git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; }
       VERSION="${tag#v}"
     fi
-  else
-    # No explicit GUI version passed: ask channel first
-    ch="$(choose_channel)"
-    echo "[*] Resolving ${ch} tag from GitHub releases..."
-    tag=""
-    if [[ "$ch" == "prerelease" ]]; then
-      tag="$(get_latest_tag_prerelease || true)"
-    else
-      tag="$(get_latest_tag_latest || true)"
-    fi
-    [[ -n "$tag" ]] || { echo "[ERROR] Failed to resolve latest tag for channel '${ch}'."; exit 1; }
-    echo "[*] Latest tag for '${ch}': ${tag}"
-    git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; }
-    VERSION="${tag#v}"
   fi
 else
   echo "[WARN] Current directory is not a git repo; cannot checkout version. Proceeding on current tree."
@@ -188,33 +306,44 @@ else
 fi
 echo "[*] GUI version resolved as: ${VERSION}"
 
-# ===== .NET publish (non-single file, self-contained) ===========================================
+# ===== .NET publish ===========================================================
+# RID resolve: allow --arch override (x64|arm64)
+rid=""
+if [[ -n "$ARCH_OVERRIDE" ]]; then
+  case "$ARCH_OVERRIDE" in
+    x64|amd64)  rid="linux-x64" ;;
+    arm64|aarch64) rid="linux-arm64" ;;
+    *) echo "[ERROR] Unknown --arch '$ARCH_OVERRIDE' (use x64|arm64)"; exit 1;;
+  esac
+else
+  rid="$( [[ "$arch" == "aarch64" ]] && echo linux-arm64 || echo linux-x64 )"
+fi
+
 dotnet clean "$PROJECT" -c Release
 rm -rf "$(dirname "$PROJECT")/bin/Release/net8.0" || true
 
 dotnet restore "$PROJECT"
 dotnet publish "$PROJECT" \
-  -c Release -r "$( [[ "$arch" == "aarch64" ]] && echo linux-arm64 || echo linux-x64 )" \
+  -c Release -r "$rid" \
   -p:PublishSingleFile=false \
   -p:SelfContained=true \
   -p:IncludeNativeLibrariesForSelfExtract=true
 
-RID_DIR="$( [[ "$arch" == "aarch64" ]] && echo linux-arm64 || echo linux-x64 )"
+RID_DIR="$rid"
 PUBDIR="$(dirname "$PROJECT")/bin/Release/net8.0/${RID_DIR}/publish"
 [[ -d "$PUBDIR" ]]
 
-# ===== Download Core（Optional） ========================================================
+# ===== Helpers for core/rules download =======================================
 download_xray() {
+  # Download Xray core and install to outdir/xray
   local outdir="$1" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
   mkdir -p "$outdir"
   if [[ -z "$ver" ]]; then
-    # Latest version
     ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
         | grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
   fi
   [[ -n "$ver" ]] || { echo "[xray] Failed to get version"; return 1; }
-
-  if [[ "$arch" == "aarch64" ]]; then
+  if [[ "$RID_DIR" == "linux-arm64" ]]; then
     url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-arm64-v8a.zip"
   else
     url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-64.zip"
@@ -227,6 +356,7 @@ download_xray() {
 }
 
 download_singbox() {
+  # Download sing-box core and install to outdir/sing-box
   local outdir="$1" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin
   mkdir -p "$outdir"
   if [[ -z "$ver" ]]; then
@@ -234,8 +364,7 @@ download_singbox() {
         | grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
   fi
   [[ -n "$ver" ]] || { echo "[sing-box] Failed to get version"; return 1; }
-
-  if [[ "$arch" == "aarch64" ]]; then
+  if [[ "$RID_DIR" == "linux-arm64" ]]; then
     url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-arm64.tar.gz"
   else
     url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-amd64.tar.gz"
@@ -249,18 +378,32 @@ download_singbox() {
   install -Dm755 "$bin" "$outdir/sing-box"
 }
 
-# === Geo rule download (ZIP-LIKE LAYOUT for netcore mode) =====================
-# Make netcore output match the ZIP bundle structure:
-# - All geo databases at    outroot/bin/ (geosite.dat, geoip.dat, Country.mmdb, geoip-only-cn-private.dat, geoip.metadb)
-# - All *.srs rule-sets at  outroot/bin/srss/
-# (Binaries stay under outroot/bin/xray and outroot/bin/sing_box as before.)
+# Move geo files to a unified path: outroot/bin/xray/
+unify_geo_layout() {
+  local outroot="$1"
+  mkdir -p "$outroot/bin/xray"
+  local srcs=( \
+    "$outroot/bin/geosite.dat" \
+    "$outroot/bin/geoip.dat" \
+    "$outroot/bin/geoip-only-cn-private.dat" \
+    "$outroot/bin/Country.mmdb" \
+    "$outroot/bin/geoip.metadb" \
+  )
+  for s in "${srcs[@]}"; do
+    if [[ -f "$s" ]]; then
+      mv -f "$s" "$outroot/bin/xray/$(basename "$s")"
+    fi
+  done
+}
+
+# Download geo/rule assets; then unify to bin/xray/
 download_geo_assets() {
   local outroot="$1"
   local bin_dir="$outroot/bin"
   local srss_dir="$bin_dir/srss"
   mkdir -p "$bin_dir" "$srss_dir"
 
-  echo "[+] Download Xray Geo (geosite/geoip/...) to ${bin_dir}"
+  echo "[+] Download Xray Geo to ${bin_dir}"
   curl -fsSL -o "$bin_dir/geosite.dat" \
     "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat"
   curl -fsSL -o "$bin_dir/geoip.dat" \
@@ -270,7 +413,7 @@ download_geo_assets() {
   curl -fsSL -o "$bin_dir/Country.mmdb" \
     "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
 
-  echo "[+] Download sing-box rule DB & rule-sets to ZIP-like paths"
+  echo "[+] Download sing-box rule DB & rule-sets"
   curl -fsSL -o "$bin_dir/geoip.metadb" \
     "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb" || true
 
@@ -280,20 +423,22 @@ download_geo_assets() {
     curl -fsSL -o "$srss_dir/$f" \
       "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geoip/$f" || true
   done
-
   for f in \
     geosite-cn.srs geosite-gfw.srs geosite-greatfire.srs \
     geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do
     curl -fsSL -o "$srss_dir/$f" \
       "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geosite/$f" || true
   done
+
+  # Unify to bin/xray/
+  unify_geo_layout "$outroot"
 }
 
-# === NEW: Prefer the all-in-one v2rayN bundle zip first =======================
+# Prefer the prebuilt v2rayN core bundle; then unify geo layout
 download_v2rayn_bundle() {
   local outroot="$1"
   local url=""
-  if [[ "$arch" == "aarch64" ]]; then
+  if [[ "$RID_DIR" == "linux-arm64" ]]; then
     url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64.zip"
   else
     url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64.zip"
@@ -304,7 +449,6 @@ download_v2rayn_bundle() {
   curl -fL "$url" -o "$zipname" || { echo "[!] Bundle download failed"; return 1; }
   unzip -q "$zipname" -d "$tmp" || { echo "[!] Bundle unzip failed"; return 1; }
 
-  # Normalize layout: copy 'bin/' if present; otherwise copy all
   if [[ -d "$tmp/bin" ]]; then
     mkdir -p "$outroot/bin"
     rsync -a "$tmp/bin/" "$outroot/bin/"
@@ -312,7 +456,6 @@ download_v2rayn_bundle() {
     rsync -a "$tmp/" "$outroot/"
   fi
 
-  # --- CLEANUPS (keep bundle-only adjustments) -------------------------------
   rm -f "$outroot/v2rayn.zip" 2>/dev/null || true
   find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
 
@@ -323,32 +466,45 @@ download_v2rayn_bundle() {
     rsync -a "$nested_dir/bin/" "$outroot/bin/"
     rm -rf "$nested_dir"
   fi
-  # ---------------------------------------------------------------------------
+
+  # Unify to bin/xray/
+  unify_geo_layout "$outroot"
 
   echo "[+] Bundle extracted to $outroot"
 }
 
-# ===== Copy publish files to RPM build root ==================================================
-rpmdev-setuptree
-TOPDIR="${HOME}/rpmbuild"
-SPECDIR="${TOPDIR}/SPECS"
-SOURCEDIR="${TOPDIR}/SOURCES"
-
+# ===== Copy publish files to RPM build root ====================================
 PKGROOT="v2rayN-publish"
 WORKDIR="$(mktemp -d)"
 trap 'rm -rf "$WORKDIR"' EXIT
 
+if [[ "$ID" =~ ^(rhel|rocky|almalinux|centos)$ ]]; then
+  # --- RHEL path (UNCHANGED) ---
+  rpmdev-setuptree
+  TOPDIR="${HOME}/rpmbuild"
+  SPECDIR="${TOPDIR}/SPECS"
+  SOURCEDIR="${TOPDIR}/SOURCES"
+  USE_TOPDIR_DEFINE=0
+else
+  # --- Ubuntu/Debian path (temporary _topdir) ---
+  TOPDIR="${WORKDIR}/rpmbuild"
+  SPECDIR="${TOPDIR}/SPECS"
+  SOURCEDIR="${TOPDIR}/SOURCES"
+  mkdir -p "${SPECDIR}" "${SOURCEDIR}" "${TOPDIR}/BUILD" "${TOPDIR}/RPMS" "${TOPDIR}/SRPMS"
+  USE_TOPDIR_DEFINE=1
+fi
+
 mkdir -p "$WORKDIR/$PKGROOT"
 cp -a "$PUBDIR/." "$WORKDIR/$PKGROOT/"
 
-# icon（Optional）
+# Optional icon
 ICON_CANDIDATE="$(dirname "$PROJECT")/../v2rayN.Desktop/v2rayN.png"
 [[ -f "$ICON_CANDIDATE" ]] && cp "$ICON_CANDIDATE" "$WORKDIR/$PKGROOT/v2rayn.png" || true
 
-# bin directory structure
+# Prepare bin structure
 mkdir -p "$WORKDIR/$PKGROOT/bin/xray" "$WORKDIR/$PKGROOT/bin/sing_box"
 
-# ====== NEW decision: prefer bundle zip unless --netcore, else fall back ======
+# Prefer the bundle; fallback to separate core + rules
 if [[ "$FORCE_NETCORE" -eq 0 ]]; then
   if download_v2rayn_bundle "$WORKDIR/$PKGROOT"; then
     echo "[*] Using v2rayN bundle archive."
@@ -413,14 +569,14 @@ Geo files for Xray are placed at /opt/v2rayN/bin/xray; launcher will symlink the
 install -dm0755 %{buildroot}/opt/v2rayN
 cp -a * %{buildroot}/opt/v2rayN/
 
-# Launcher (prioritize ELF first, then fall back to DLL; also create Geo symlinks for the user)
+# Launcher (prefer native ELF first, then DLL fallback; also create Geo symlinks for the user)
 install -dm0755 %{buildroot}%{_bindir}
 cat > %{buildroot}%{_bindir}/v2rayn << 'EOF'
 #!/usr/bin/bash
 set -euo pipefail
 DIR="/opt/v2rayN"
 
-# --- SYMLINK GEO into user's XDG dir (new) ---
+# --- Symlink GEO files into user's XDG dir (first-run convenience) ---
 XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
 USR_GEO_DIR="$XDG_DATA_HOME/v2rayN/bin"
 SYS_XRAY_DIR="$DIR/bin/xray"
@@ -432,10 +588,10 @@ for f in geosite.dat geoip.dat geoip-only-cn-private.dat Country.mmdb; do
 done
 # --- end GEO ---
 
-# Prefer native ELF（apphost）
+# Prefer native apphost
 if [[ -x "$DIR/v2rayN" ]]; then exec "$DIR/v2rayN" "$@"; fi
 
-# DLL fallback (for framework-dependent publish)
+# DLL fallback
 for dll in v2rayN.Desktop.dll v2rayN.dll; do
   if [[ -f "$DIR/$dll" ]]; then exec /usr/bin/dotnet "$DIR/$dll" "$@"; fi
 done
@@ -446,7 +602,7 @@ exit 1
 EOF
 chmod 0755 %{buildroot}%{_bindir}/v2rayn
 
-# Desktop File
+# Desktop file
 install -dm0755 %{buildroot}%{_datadir}/applications
 cat > %{buildroot}%{_datadir}/applications/v2rayn.desktop << 'EOF'
 [Desktop Entry]
@@ -459,7 +615,7 @@ Terminal=false
 Categories=Network;
 EOF
 
-# icon
+# Icon
 if [ -f "%{_builddir}/__PKGROOT__/v2rayn.png" ]; then
   install -dm0755 %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
   install -m0644 %{_builddir}/__PKGROOT__/v2rayn.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
@@ -480,32 +636,48 @@ fi
 %{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
 SPEC
 
-# Optional: system-wide autostart (append block, keep original logic unchanged)
+# ===== FIX: inline autostart into existing sections (avoid second %install/%files) ====
 if [[ "$AUTOSTART" -eq 1 ]]; then
-cat >> "$SPECFILE" <<'SPEC'
-# System-wide autostart entry
-%install
-install -dm0755 %{buildroot}/etc/xdg/autostart
-cat > %{buildroot}/etc/xdg/autostart/v2rayn.desktop << 'EOF'
-[Desktop Entry]
-Type=Application
-Name=v2rayN (Autostart)
-Exec=v2rayn
-X-GNOME-Autostart-enabled=true
-NoDisplay=false
-EOF
+  # Insert autostart creation commands into the existing %install section,
+  # right before %post (so still inside %install).
+  sed -i '/^%post/i \
+# --- Autostart (.desktop) ---\n\
+install -dm0755 %{buildroot}/etc/xdg/autostart\n\
+cat > %{buildroot}/etc/xdg/autostart/v2rayn.desktop << '"'"'EOF'"'"'\n\
+[Desktop Entry]\n\
+Type=Application\n\
+Name=v2rayN (Autostart)\n\
+Exec=v2rayn\n\
+X-GNOME-Autostart-enabled=true\n\
+NoDisplay=false\n\
+EOF\n' "$SPECFILE"
 
-%files
-%config(noreplace) /etc/xdg/autostart/v2rayn.desktop
-SPEC
+  # Append the autostart file to the existing %files list.
+  # We insert after the icon line to keep ordering tidy.
+  sed -i '0,|%{_datadir}/icons/hicolor/256x256/apps/v2rayn\.png|{
+    s|%{_datadir}/icons/hicolor/256x256/apps/v2rayn\.png|%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png\
+%config(noreplace) /etc/xdg/autostart/v2rayn.desktop|
+  }' "$SPECFILE"
 fi
 
-# Injecting version/package root placeholders
+# Inject placeholders
 sed -i "s/__VERSION__/${VERSION}/g" "$SPECFILE"
 sed -i "s/__PKGROOT__/${PKGROOT}/g" "$SPECFILE"
 
 # ===== Build RPM ================================================================
-rpmbuild -ba "$SPECFILE"
+if [[ "$USE_TOPDIR_DEFINE" -eq 1 ]]; then
+  rpmbuild -ba "$SPECFILE" --define "_topdir $TOPDIR"
+else
+  rpmbuild -ba "$SPECFILE"
+fi
+
+# ===== Ubuntu/Debian: move temporary rpmbuild to ~/rpmbuild ====================
+if [[ "$USE_TOPDIR_DEFINE" -eq 1 ]]; then
+  mkdir -p "$HOME/rpmbuild"
+  rsync -a "$TOPDIR"/ "$HOME/rpmbuild"/
+  TOPDIR="$HOME/rpmbuild"
+fi
 
 echo "Build done. RPM at:"
-ls -1 "${TOPDIR}/RPMS/$( [[ "$arch" == "aarch64" ]] && echo aarch64 || echo x86_64 )/v2rayN-${VERSION}-1"*.rpm
+archdir="$( [[ "$RID_DIR" == "linux-arm64" ]] && echo aarch64 || echo x86_64 )"
+ls -1 "${TOPDIR}/RPMS/${archdir}/v2rayN-${VERSION}-1"*.rpm

From dc94962900e6364824ef8f9b40f857f555ca248b Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Tue, 19 Aug 2025 09:10:54 +0800
Subject: [PATCH 065/115] Fix tun (#7802)

---
 .../Singbox/CoreConfigSingboxService.cs       |  4 +--
 .../CoreConfig/Singbox/SingboxDnsService.cs   | 29 +++++++++++++++++--
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs
index 7ee82af1..4e24d8e2 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs
@@ -64,7 +64,7 @@ public partial class CoreConfigSingboxService(Config config)
 
             await GenRouting(singboxConfig);
 
-            await GenDns(singboxConfig);
+            await GenDns(node, singboxConfig);
 
             await GenExperimental(singboxConfig);
 
@@ -421,7 +421,7 @@ public partial class CoreConfigSingboxService(Config config)
             }
             await GenOutboundsList(proxyProfiles, singboxConfig);
 
-            await GenDns(singboxConfig);
+            await GenDns(null, singboxConfig);
             await ConvertGeo2Ruleset(singboxConfig);
 
             ret.Success = true;
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
index c317ef53..15f2c43b 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
@@ -2,14 +2,14 @@ namespace ServiceLib.Services.CoreConfig;
 
 public partial class CoreConfigSingboxService
 {
-    private async Task<int> GenDns(SingboxConfig singboxConfig)
+    private async Task<int> GenDns(ProfileItem? node, SingboxConfig singboxConfig)
     {
         try
         {
             var item = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
             if (item != null && item.Enabled == true)
             {
-                return await GenDnsCompatible(singboxConfig);
+                return await GenDnsCompatible(node, singboxConfig);
             }
 
             var simpleDNSItem = _config.SimpleDNSItem;
@@ -19,6 +19,7 @@ public partial class CoreConfigSingboxService
             singboxConfig.dns ??= new Dns4Sbox();
             singboxConfig.dns.independent_cache = true;
 
+            // final dns
             var routing = await ConfigHandler.GetDefaultRouting(_config);
             var useDirectDns = false;
             if (routing != null)
@@ -32,6 +33,17 @@ public partial class CoreConfigSingboxService
                                    lastRule.Ip?.Contains("0.0.0.0/0") == true);
             }
             singboxConfig.dns.final = useDirectDns ? Global.SingboxDirectDNSTag : Global.SingboxRemoteDNSTag;
+
+            // Tun2SocksAddress
+            if (node != null && Utils.IsDomain(node.Address))
+            {
+                singboxConfig.dns.rules ??= new List<Rule4Sbox>();
+                singboxConfig.dns.rules.Insert(0, new Rule4Sbox
+                {
+                    server = Global.SingboxOutboundResolverTag,
+                    domain = [node.Address],
+                });
+            }
         }
         catch (Exception ex)
         {
@@ -290,7 +302,7 @@ public partial class CoreConfigSingboxService
         return 0;
     }
 
-    private async Task<int> GenDnsCompatible(SingboxConfig singboxConfig)
+    private async Task<int> GenDnsCompatible(ProfileItem? node, SingboxConfig singboxConfig)
     {
         try
         {
@@ -320,6 +332,17 @@ public partial class CoreConfigSingboxService
             {
                 await GenDnsDomainsLegacyCompatible(singboxConfig, item);
             }
+
+            // Tun2SocksAddress
+            if (node != null && Utils.IsDomain(node.Address))
+            {
+                singboxConfig.dns.rules ??= new List<Rule4Sbox>();
+                singboxConfig.dns.rules.Insert(0, new Rule4Sbox
+                {
+                    server = Global.SingboxFinalResolverTag,
+                    domain = [node.Address],
+                });
+            }
         }
         catch (Exception ex)
         {

From a861020828ccf8dd52b70dbbe62a3110a69effe1 Mon Sep 17 00:00:00 2001
From: JieXu <xujie0739@gmail.com>
Date: Tue, 19 Aug 2025 16:59:52 +0800
Subject: [PATCH 066/115] Update package-rhel.sh (#7806)

---
 package-rhel.sh | 359 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 234 insertions(+), 125 deletions(-)

diff --git a/package-rhel.sh b/package-rhel.sh
index d7cf00ec..e852d174 100644
--- a/package-rhel.sh
+++ b/package-rhel.sh
@@ -24,7 +24,8 @@ VERSION_ARG="${1:-}"     # Pass version number like 7.13.8, or leave empty
 WITH_CORE="both"         # Default: bundle both xray+sing-box
 AUTOSTART=0              # 1 = enable system-wide autostart (/etc/xdg/autostart)
 FORCE_NETCORE=0          # --netcore => skip archive bundle, use separate downloads
-ARCH_OVERRIDE=""         # --arch x64|arm64 (optional override for RID)
+ARCH_OVERRIDE=""         # --arch x64|arm64|all (optional compile target)
+BUILD_FROM=""            # --buildfrom 1|2|3 to select channel non-interactively
 
 # If the first argument starts with --, do not treat it as a version number
 if [[ "${VERSION_ARG:-}" == --* ]]; then
@@ -42,15 +43,23 @@ while [[ $# -gt 0 ]]; do
     --singbox-ver)   SING_VER="${2:-}"; shift 2;;
     --netcore)       FORCE_NETCORE=1; shift;;
     --arch)          ARCH_OVERRIDE="${2:-}"; shift 2;;
+    --buildfrom)     BUILD_FROM="${2:-}"; shift 2;;
     *)
       if [[ -z "${VERSION_ARG:-}" ]]; then VERSION_ARG="$1"; fi
       shift;;
   esac
 done
 
+# Conflict: version number AND --buildfrom cannot be used together
+if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
+  echo "[ERROR] You cannot specify both an explicit version and --buildfrom at the same time."
+  echo "        Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
+  exit 1
+fi
+
 # ===== Environment check + Dependencies ========================================
-arch="$(uname -m)"
-[[ "$arch" == "aarch64" || "$arch" == "x86_64" ]] || { echo "Only supports aarch64 / x86_64"; exit 1; }
+host_arch="$(uname -m)"
+[[ "$host_arch" == "aarch64" || "$host_arch" == "x86_64" ]] || { echo "Only supports aarch64 / x86_64"; exit 1; }
 
 install_ok=0
 case "$ID" in
@@ -66,7 +75,7 @@ case "$ID" in
       install_ok=1
     fi
     ;;
-  # ------------------------------ Ubuntu (KEEP AS-IS) ---------------------------------
+  # ------------------------------ Ubuntu ----------------------------------------------
   ubuntu)
     sudo apt-get update
     # Ensure 'universe' (Ubuntu) to get 'rpm'
@@ -77,6 +86,8 @@ case "$ID" in
     fi
     # Base tools + rpm (provides rpmbuild)
     sudo apt-get -y install curl unzip tar rsync rpm || true
+    # Cross-arch binutils so strip matches target arch + objdump for brp scripts
+    sudo apt-get -y install binutils binutils-x86-64-linux-gnu binutils-aarch64-linux-gnu || true
     # rpmbuild presence check
     if ! command -v rpmbuild >/dev/null 2>&1; then
       echo "[ERROR] 'rpmbuild' not found after installing 'rpm'."
@@ -94,8 +105,8 @@ case "$ID" in
   # ------------------------------ Debian (KEEP, with local dotnet install) ------------
   debian)
     sudo apt-get update
-    # Base tools + rpm (provides rpmbuild on Debian)
-    sudo apt-get -y install curl unzip tar rsync rpm || true
+    # Base tools + rpm (provides rpmbuild on Debian) + objdump/strip
+    sudo apt-get -y install curl unzip tar rsync rpm binutils || true
     # rpmbuild presence check
     if ! command -v rpmbuild >/dev/null 2>&1; then
       echo "[ERROR] 'rpmbuild' not found after installing 'rpm'."
@@ -105,7 +116,7 @@ case "$ID" in
     # Try apt for dotnet; fallback to official installer into $HOME/.dotnet
     if ! command -v dotnet >/dev/null 2>&1; then
       echo "[INFO] 'dotnet' not found. Installing .NET 8 SDK locally to \$HOME/.dotnet ..."
-      tmp="$(mktemp -d)"; trap 'rm -rf "$tmp"' RETURN
+      tmp="$(mktemp -d)"; trap '[[ -n "${tmp:-}" ]] && rm -rf "$tmp"' RETURN
       curl -fsSL https://dot.net/v1/dotnet-install.sh -o "$tmp/dotnet-install.sh"
       bash "$tmp/dotnet-install.sh" --channel 8.0 --install-dir "$HOME/.dotnet"
       export PATH="$HOME/.dotnet:$HOME/.dotnet/tools:$PATH"
@@ -147,6 +158,16 @@ fi
 VERSION=""
 
 choose_channel() {
+  # If --buildfrom provided, map it directly and skip interaction.
+  if [[ -n "${BUILD_FROM:-}" ]]; then
+    case "$BUILD_FROM" in
+      1) echo "latest"; return 0;;
+      2) echo "prerelease"; return 0;;
+      3) echo "keep"; return 0;;
+      *) echo "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." >&2; exit 1;;
+    esac
+  fi
+
   # Print menu to stderr and read from /dev/tty so stdout only carries the token.
   local ch="latest" sel=""
   if [[ -t 0 ]]; then
@@ -306,34 +327,7 @@ else
 fi
 echo "[*] GUI version resolved as: ${VERSION}"
 
-# ===== .NET publish ===========================================================
-# RID resolve: allow --arch override (x64|arm64)
-rid=""
-if [[ -n "$ARCH_OVERRIDE" ]]; then
-  case "$ARCH_OVERRIDE" in
-    x64|amd64)  rid="linux-x64" ;;
-    arm64|aarch64) rid="linux-arm64" ;;
-    *) echo "[ERROR] Unknown --arch '$ARCH_OVERRIDE' (use x64|arm64)"; exit 1;;
-  esac
-else
-  rid="$( [[ "$arch" == "aarch64" ]] && echo linux-arm64 || echo linux-x64 )"
-fi
-
-dotnet clean "$PROJECT" -c Release
-rm -rf "$(dirname "$PROJECT")/bin/Release/net8.0" || true
-
-dotnet restore "$PROJECT"
-dotnet publish "$PROJECT" \
-  -c Release -r "$rid" \
-  -p:PublishSingleFile=false \
-  -p:SelfContained=true \
-  -p:IncludeNativeLibrariesForSelfExtract=true
-
-RID_DIR="$rid"
-PUBDIR="$(dirname "$PROJECT")/bin/Release/net8.0/${RID_DIR}/publish"
-[[ -d "$PUBDIR" ]]
-
-# ===== Helpers for core/rules download =======================================
+# ===== Helpers for core/rules download (use RID_DIR for arch sync) =====================
 download_xray() {
   # Download Xray core and install to outdir/xray
   local outdir="$1" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
@@ -349,7 +343,7 @@ download_xray() {
     url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-64.zip"
   fi
   echo "[+] Download xray: $url"
-  tmp="$(mktemp -d)"; trap 'rm -rf "$tmp"' RETURN
+  tmp="$(mktemp -d)"; trap '[[ -n "${tmp:-}" ]] && rm -rf "$tmp"' RETURN
   curl -fL "$url" -o "$tmp/$zipname"
   unzip -q "$tmp/$zipname" -d "$tmp"
   install -Dm755 "$tmp/xray" "$outdir/xray"
@@ -370,7 +364,7 @@ download_singbox() {
     url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-amd64.tar.gz"
   fi
   echo "[+] Download sing-box: $url"
-  tmp="$(mktemp -d)"; trap 'rm -rf "$tmp"' RETURN
+  tmp="$(mktemp -d)"; trap '[[ -n "${tmp:-}" ]] && rm -rf "$tmp"' RETURN
   curl -fL "$url" -o "$tmp/$tarname"
   tar -C "$tmp" -xzf "$tmp/$tarname"
   bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
@@ -473,43 +467,93 @@ download_v2rayn_bundle() {
   echo "[+] Bundle extracted to $outroot"
 }
 
-# ===== Copy publish files to RPM build root ====================================
-PKGROOT="v2rayN-publish"
-WORKDIR="$(mktemp -d)"
-trap 'rm -rf "$WORKDIR"' EXIT
+# ===== Build results collection for --arch all ========================================
+BUILT_RPMS=()     # Will collect absolute paths of built RPMs
+BUILT_ALL=0       # Flag to know if we should print the final summary
 
-if [[ "$ID" =~ ^(rhel|rocky|almalinux|centos)$ ]]; then
-  # --- RHEL path (UNCHANGED) ---
-  rpmdev-setuptree
-  TOPDIR="${HOME}/rpmbuild"
-  SPECDIR="${TOPDIR}/SPECS"
-  SOURCEDIR="${TOPDIR}/SOURCES"
-  USE_TOPDIR_DEFINE=0
-else
-  # --- Ubuntu/Debian path (temporary _topdir) ---
-  TOPDIR="${WORKDIR}/rpmbuild"
-  SPECDIR="${TOPDIR}/SPECS"
-  SOURCEDIR="${TOPDIR}/SOURCES"
-  mkdir -p "${SPECDIR}" "${SOURCEDIR}" "${TOPDIR}/BUILD" "${TOPDIR}/RPMS" "${TOPDIR}/SRPMS"
-  USE_TOPDIR_DEFINE=1
-fi
+# ===== Build (single-arch) function ====================================================
+build_for_arch() {
+  # $1: target short arch: x64 | arm64
+  local short="$1"
+  local rid rpm_target archdir
+  case "$short" in
+    x64)   rid="linux-x64";   rpm_target="x86_64"; archdir="x86_64" ;;
+    arm64) rid="linux-arm64"; rpm_target="aarch64"; archdir="aarch64" ;;
+    *) echo "[ERROR] Unknown arch '$short' (use x64|arm64)"; return 1;;
+  esac
 
-mkdir -p "$WORKDIR/$PKGROOT"
-cp -a "$PUBDIR/." "$WORKDIR/$PKGROOT/"
+  echo "[*] Building for target: $short  (RID=$rid, RPM --target $rpm_target)"
 
-# Optional icon
-ICON_CANDIDATE="$(dirname "$PROJECT")/../v2rayN.Desktop/v2rayN.png"
-[[ -f "$ICON_CANDIDATE" ]] && cp "$ICON_CANDIDATE" "$WORKDIR/$PKGROOT/v2rayn.png" || true
+  # .NET publish (self-contained) for this RID
+  dotnet clean "$PROJECT" -c Release
+  rm -rf "$(dirname "$PROJECT")/bin/Release/net8.0" || true
 
-# Prepare bin structure
-mkdir -p "$WORKDIR/$PKGROOT/bin/xray" "$WORKDIR/$PKGROOT/bin/sing_box"
+  dotnet restore "$PROJECT"
+  dotnet publish "$PROJECT" \
+    -c Release -r "$rid" \
+    -p:PublishSingleFile=false \
+    -p:SelfContained=true \
+    -p:IncludeNativeLibrariesForSelfExtract=true
 
-# Prefer the bundle; fallback to separate core + rules
-if [[ "$FORCE_NETCORE" -eq 0 ]]; then
-  if download_v2rayn_bundle "$WORKDIR/$PKGROOT"; then
-    echo "[*] Using v2rayN bundle archive."
+  # Per-arch variables (scoped)
+  local RID_DIR="$rid"
+  local PUBDIR
+  PUBDIR="$(dirname "$PROJECT")/bin/Release/net8.0/${RID_DIR}/publish"
+  [[ -d "$PUBDIR" ]]
+
+  # Make RID_DIR visible to download helpers (they read this var)
+  export RID_DIR
+
+  # Per-arch working area
+  local PKGROOT="v2rayN-publish"
+  local WORKDIR
+  WORKDIR="$(mktemp -d)"
+  trap '[[ -n "${WORKDIR:-}" ]] && rm -rf "$WORKDIR"' RETURN
+
+  # rpmbuild topdir selection
+  local TOPDIR SPECDIR SOURCEDIR USE_TOPDIR_DEFINE
+  if [[ "$ID" =~ ^(rhel|rocky|almalinux|centos)$ ]]; then
+    rpmdev-setuptree
+    TOPDIR="${HOME}/rpmbuild"
+    SPECDIR="${TOPDIR}/SPECS"
+    SOURCEDIR="${TOPDIR}/SOURCES"
+    USE_TOPDIR_DEFINE=0
   else
-    echo "[*] Bundle failed, fallback to separate core + rules."
+    TOPDIR="${WORKDIR}/rpmbuild"
+    SPECDIR="${TOPDIR}/SPECS}"
+    SOURCEDIR="${TOPDIR}/SOURCES"
+    mkdir -p "${SPECDIR}" "${SOURCEDIR}" "${TOPDIR}/BUILD" "${TOPDIR}/RPMS" "${TOPDIR}/SRPMS"
+    USE_TOPDIR_DEFINE=1
+  fi
+
+  # Stage publish content
+  mkdir -p "$WORKDIR/$PKGROOT"
+  cp -a "$PUBDIR/." "$WORKDIR/$PKGROOT/"
+
+  # Optional icon
+  local ICON_CANDIDATE
+  ICON_CANDIDATE="$(dirname "$PROJECT")/../v2rayN.Desktop/v2rayN.png"
+  [[ -f "$ICON_CANDIDATE" ]] && cp "$ICON_CANDIDATE" "$WORKDIR/$PKGROOT/v2rayn.png" || true
+
+  # Prepare bin structure
+  mkdir -p "$WORKDIR/$PKGROOT/bin/xray" "$WORKDIR/$PKGROOT/bin/sing_box"
+
+  # Bundle / cores per-arch
+  if [[ "$FORCE_NETCORE" -eq 0 ]]; then
+    if download_v2rayn_bundle "$WORKDIR/$PKGROOT"; then
+      echo "[*] Using v2rayN bundle archive."
+    else
+      echo "[*] Bundle failed, fallback to separate core + rules."
+      if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
+        download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray download failed (skipped)"
+      fi
+      if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
+        download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box download failed (skipped)"
+      fi
+      download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)"
+    fi
+  else
+    echo "[*] --netcore specified: use separate core + rules."
     if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
       download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray download failed (skipped)"
     fi
@@ -518,22 +562,15 @@ if [[ "$FORCE_NETCORE" -eq 0 ]]; then
     fi
     download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)"
   fi
-else
-  echo "[*] --netcore specified: use separate core + rules."
-  if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
-    download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray download failed (skipped)"
-  fi
-  if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
-    download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box download failed (skipped)"
-  fi
-  download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)"
-fi
 
-tar -C "$WORKDIR" -czf "$SOURCEDIR/$PKGROOT.tar.gz" "$PKGROOT"
+  # Tarball
+  mkdir -p "$SOURCEDIR"
+  tar -C "$WORKDIR" -czf "$SOURCEDIR/$PKGROOT.tar.gz" "$PKGROOT"
 
-# ===== Generate SPEC (heredoc with placeholders) ===================================
-SPECFILE="$SPECDIR/v2rayN.spec"
-cat > "$SPECFILE" <<'SPEC'
+  # SPEC
+  local SPECFILE="$SPECDIR/v2rayN.spec"
+  mkdir -p "$SPECDIR"
+  cat > "$SPECFILE" <<'SPEC'
 %global debug_package %{nil}
 %undefine _debuginfo_subpackages
 %undefine _debugsource_packages
@@ -636,48 +673,120 @@ fi
 %{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
 SPEC
 
-# ===== FIX: inline autostart into existing sections (avoid second %install/%files) ====
-if [[ "$AUTOSTART" -eq 1 ]]; then
-  # Insert autostart creation commands into the existing %install section,
-  # right before %post (so still inside %install).
-  sed -i '/^%post/i \
-# --- Autostart (.desktop) ---\n\
-install -dm0755 %{buildroot}/etc/xdg/autostart\n\
-cat > %{buildroot}/etc/xdg/autostart/v2rayn.desktop << '"'"'EOF'"'"'\n\
-[Desktop Entry]\n\
-Type=Application\n\
-Name=v2rayN (Autostart)\n\
-Exec=v2rayn\n\
-X-GNOME-Autostart-enabled=true\n\
-NoDisplay=false\n\
-EOF\n' "$SPECFILE"
+  # Autostart injection (inside %install) and %files entry
+  if [[ "$AUTOSTART" -eq 1 ]]; then
+    awk '
+      BEGIN{ins=0}
+      /^%post$/ && !ins {
+        print "# --- Autostart (.desktop) ---"
+        print "install -dm0755 %{buildroot}/etc/xdg/autostart"
+        print "cat > %{buildroot}/etc/xdg/autostart/v2rayn.desktop << '\''EOF'\''"
+        print "[Desktop Entry]"
+        print "Type=Application"
+        print "Name=v2rayN (Autostart)"
+        print "Exec=v2rayn"
+        print "X-GNOME-Autostart-enabled=true"
+        print "NoDisplay=false"
+        print "EOF"
+        ins=1
+      }
+      {print}
+    ' "$SPECFILE" > "${SPECFILE}.tmp" && mv "${SPECFILE}.tmp" "$SPECFILE"
 
-  # Append the autostart file to the existing %files list.
-  # We insert after the icon line to keep ordering tidy.
-  sed -i '0,|%{_datadir}/icons/hicolor/256x256/apps/v2rayn\.png|{
-    s|%{_datadir}/icons/hicolor/256x256/apps/v2rayn\.png|%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png\
-%config(noreplace) /etc/xdg/autostart/v2rayn.desktop|
-  }' "$SPECFILE"
+    awk '
+      BEGIN{infiles=0; done=0}
+      /^%files$/        {infiles=1}
+      infiles && done==0 && $0 ~ /%{_datadir}\/icons\/hicolor\/256x256\/apps\/v2rayn\.png/ {
+        print
+        print "%config(noreplace) /etc/xdg/autostart/v2rayn.desktop"
+        done=1
+        next
+      }
+      {print}
+    ' "$SPECFILE" > "${SPECFILE}.tmp" && mv "${SPECFILE}.tmp" "$SPECFILE"
+  fi
+
+  # Replace placeholders
+  sed -i "s/__VERSION__/${VERSION}/g" "$SPECFILE"
+  sed -i "s/__PKGROOT__/${PKGROOT}/g" "$SPECFILE"
+
+  # ----- Select proper 'strip' per target arch on Ubuntu only (cross-binutils) -----
+  # NOTE: We define only __strip to point to the target-arch strip.
+  #       DO NOT override __brp_strip (it must stay the brp script path).
+  local STRIP_ARGS=()
+  if [[ "$ID" == "ubuntu" ]]; then
+    local STRIP_BIN=""
+    if [[ "$short" == "x64" ]]; then
+      STRIP_BIN="/usr/bin/x86_64-linux-gnu-strip"
+    else
+      STRIP_BIN="/usr/bin/aarch64-linux-gnu-strip"
+    fi
+    if [[ -x "$STRIP_BIN" ]]; then
+      STRIP_ARGS=( --define "__strip $STRIP_BIN" )
+    fi
+  fi
+
+  # Build RPM for this arch (force rpm --target to match compile arch)
+  if [[ "$USE_TOPDIR_DEFINE" -eq 1 ]]; then
+    rpmbuild -ba "$SPECFILE" --define "_topdir $TOPDIR" --target "$rpm_target" "${STRIP_ARGS[@]}"
+  else
+    rpmbuild -ba "$SPECFILE" --target "$rpm_target" "${STRIP_ARGS[@]}"
+  fi
+
+  # Copy temporary rpmbuild to ~/rpmbuild on Debian/Ubuntu path
+  if [[ "$USE_TOPDIR_DEFINE" -eq 1 ]]; then
+    mkdir -p "$HOME/rpmbuild"
+    rsync -a "$TOPDIR"/ "$HOME/rpmbuild"/
+    TOPDIR="$HOME/rpmbuild"
+  fi
+
+  echo "Build done for $short. RPM at:"
+  local f
+  for f in "${TOPDIR}/RPMS/${archdir}/v2rayN-${VERSION}-1"*.rpm; do
+    [[ -e "$f" ]] || continue
+    echo "  $f"
+    BUILT_RPMS+=("$f")
+  done
+}
+
+# ===== Arch selection and build orchestration =========================================
+case "${ARCH_OVERRIDE:-}" in
+  "")
+    # No --arch: use host architecture
+    if [[ "$host_arch" == "aarch64" ]]; then
+      build_for_arch arm64
+    else
+      build_for_arch x64
+    fi
+    ;;
+  x64|amd64)
+    build_for_arch x64
+    ;;
+  arm64|aarch64)
+    build_for_arch arm64
+    ;;
+  all)
+    BUILT_ALL=1
+    # Build x64 and arm64 separately; each package contains its own arch-only binaries.
+    build_for_arch x64
+    build_for_arch arm64
+    ;;
+  *)
+    echo "[ERROR] Unknown --arch '${ARCH_OVERRIDE}'. Use x64|arm64|all."
+    exit 1
+    ;;
+esac
+
+# ===== Final summary if building both arches ==========================================
+if [[ "$BUILT_ALL" -eq 1 ]]; then
+  echo ""
+  echo "================ Build Summary (both architectures) ================"
+  if [[ "${#BUILT_RPMS[@]}" -gt 0 ]]; then
+    for rp in "${BUILT_RPMS[@]}"; do
+      echo "$rp"
+    done
+  else
+    echo "[WARN] No RPMs detected in summary (check build logs above)."
+  fi
+  echo "==================================================================="
 fi
-
-# Inject placeholders
-sed -i "s/__VERSION__/${VERSION}/g" "$SPECFILE"
-sed -i "s/__PKGROOT__/${PKGROOT}/g" "$SPECFILE"
-
-# ===== Build RPM ================================================================
-if [[ "$USE_TOPDIR_DEFINE" -eq 1 ]]; then
-  rpmbuild -ba "$SPECFILE" --define "_topdir $TOPDIR"
-else
-  rpmbuild -ba "$SPECFILE"
-fi
-
-# ===== Ubuntu/Debian: move temporary rpmbuild to ~/rpmbuild ====================
-if [[ "$USE_TOPDIR_DEFINE" -eq 1 ]]; then
-  mkdir -p "$HOME/rpmbuild"
-  rsync -a "$TOPDIR"/ "$HOME/rpmbuild"/
-  TOPDIR="$HOME/rpmbuild"
-fi
-
-echo "Build done. RPM at:"
-archdir="$( [[ "$RID_DIR" == "linux-arm64" ]] && echo aarch64 || echo x86_64 )"
-ls -1 "${TOPDIR}/RPMS/${archdir}/v2rayN-${VERSION}-1"*.rpm

From f8995b78f6c5a7841e855795b2c096395addc0a1 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Tue, 19 Aug 2025 17:00:27 +0800
Subject: [PATCH 067/115] Passes srsName as third format argument (#7805)

---
 v2rayN/ServiceLib/Services/UpdateService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/ServiceLib/Services/UpdateService.cs b/v2rayN/ServiceLib/Services/UpdateService.cs
index e87522e2..95d51d4b 100644
--- a/v2rayN/ServiceLib/Services/UpdateService.cs
+++ b/v2rayN/ServiceLib/Services/UpdateService.cs
@@ -434,7 +434,7 @@ public class UpdateService
 
         var fileName = $"{type}-{srsName}.srs";
         var targetPath = Path.Combine(Utils.GetBinPath("srss"), fileName);
-        var url = string.Format(srsUrl, type, $"{type}-{srsName}");
+        var url = string.Format(srsUrl, type, $"{type}-{srsName}", srsName);
 
         await DownloadGeoFile(url, fileName, targetPath, updateFunc);
     }

From f748f1849cde508dca4627d5965c262e2b572f79 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 19 Aug 2025 19:05:20 +0800
Subject: [PATCH 068/115] Update Directory.Packages.props

---
 v2rayN/Directory.Packages.props | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/v2rayN/Directory.Packages.props b/v2rayN/Directory.Packages.props
index e923397d..ab71be95 100644
--- a/v2rayN/Directory.Packages.props
+++ b/v2rayN/Directory.Packages.props
@@ -5,10 +5,10 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.3" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.3" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.3" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.3" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.4" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.4" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.4" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.4" />
     <PackageVersion Include="CliWrap" Version="3.9.0" />
     <PackageVersion Include="Downloader" Version="4.0.3" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
@@ -20,7 +20,7 @@
     <PackageVersion Include="ReactiveUI.WPF" Version="20.4.1" />
     <PackageVersion Include="Semi.Avalonia" Version="11.2.1.9" />
     <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.9" />
-    <PackageVersion Include="Splat.NLog" Version="15.4.1" />
+    <PackageVersion Include="Splat.NLog" Version="15.5.3" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
     <PackageVersion Include="TaskScheduler" Version="2.12.2" />
     <PackageVersion Include="WebDav.Client" Version="2.9.0" />

From e6da14f4a8fc250bcc56341fccd9ebb7aa2bc56d Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 19 Aug 2025 19:05:55 +0800
Subject: [PATCH 069/115] up 7.14.2

---
 v2rayN/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/Directory.Build.props b/v2rayN/Directory.Build.props
index c7d69e20..d4baa207 100644
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.14.1</Version>
+        <Version>7.14.2</Version>
     </PropertyGroup>
 
     <PropertyGroup>

From 0035e836d762394f1e55a5fae7bc17356244865f Mon Sep 17 00:00:00 2001
From: JieXu <xujie0739@gmail.com>
Date: Thu, 21 Aug 2025 17:18:19 +0800
Subject: [PATCH 070/115] Update build-linux.yml, Add RPM package for RHEL.
 (#7813)

* Update build-linux.yml

* Update build-linux.yml

* Update build-linux.yml

* Update build-linux.yml

* Update package-rhel.sh

* Update package-rhel.sh. Change describe information

* Update package-rhel.sh

* Update package-rhel.sh

* Update package-rhel.sh
---
 .github/workflows/build-linux.yml | 36 ++++++++++++++++++++++++++++++-
 package-rhel.sh                   | 35 ++++++++++++++++++++++++------
 2 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index f793a1cb..0fb8574f 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -98,4 +98,38 @@ jobs:
         file: ${{ github.workspace }}/v2rayN*.zip
         tag: ${{ github.event.inputs.release_tag }}
         file_glob: true
-        prerelease: true
\ No newline at end of file
+        prerelease: true
+
+    # release RHEL package
+    - name: Package RPM (RHEL-family)
+      if: github.event.inputs.release_tag != ''
+      run: |
+        chmod 755 package-rhel.sh
+        # Build for both x86_64 and aarch64 in one go (explicit version passed; no --buildfrom)
+        ./package-rhel.sh "${{ github.event.inputs.release_tag }}" --arch all
+
+    - name: Collect RPMs into workspace
+      if: github.event.inputs.release_tag != ''
+      run: |
+        mkdir -p "${{ github.workspace }}/dist/rpm"
+        rsync -av "$HOME/rpmbuild/RPMS/" "${{ github.workspace }}/dist/rpm/"
+        # Rename to requested filenames
+        find "${{ github.workspace }}/dist/rpm" -name "v2rayN-*-1.x86_64.rpm" -exec mv {} "${{ github.workspace }}/dist/rpm/v2rayN-linux-rhel-x64.rpm" \; || true
+        find "${{ github.workspace }}/dist/rpm" -name "v2rayN-*-1.aarch64.rpm" -exec mv {} "${{ github.workspace }}/dist/rpm/v2rayN-linux-rhel-arm64.rpm" \; || true
+
+    - name: Upload RPM artifacts
+      if: github.event.inputs.release_tag != ''
+      uses: actions/upload-artifact@v4.6.2
+      with:
+        name: v2rayN-rpm
+        path: |
+          ${{ github.workspace }}/dist/rpm/**/*.rpm
+
+    - name: Upload RPMs to release
+      uses: svenstaro/upload-release-action@v2
+      if: github.event.inputs.release_tag != ''
+      with:
+        file: ${{ github.workspace }}/dist/rpm/**/*.rpm
+        tag: ${{ github.event.inputs.release_tag }}
+        file_glob: true
+        prerelease: true
diff --git a/package-rhel.sh b/package-rhel.sh
index e852d174..0eeee8c7 100644
--- a/package-rhel.sh
+++ b/package-rhel.sh
@@ -332,6 +332,7 @@ download_xray() {
   # Download Xray core and install to outdir/xray
   local outdir="$1" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
   mkdir -p "$outdir"
+  if [[ -n "${XRAY_VER:-}" ]]; then ver="${XRAY_VER}"; fi
   if [[ -z "$ver" ]]; then
     ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
         | grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
@@ -353,6 +354,7 @@ download_singbox() {
   # Download sing-box core and install to outdir/sing-box
   local outdir="$1" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin
   mkdir -p "$outdir"
+  if [[ -n "${SING_VER:-}" ]]; then ver="${SING_VER}"; fi
   if [[ -z "$ver" ]]; then
     ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest \
         | grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
@@ -372,6 +374,22 @@ download_singbox() {
   install -Dm755 "$bin" "$outdir/sing-box"
 }
 
+# ---- NEW: download_mihomo (REQUIRED in --netcore mode) ----
+download_mihomo() {
+  # Download mihomo into outroot/bin/mihomo/mihomo
+  local outroot="$1"
+  local url=""
+  if [[ "$RID_DIR" == "linux-arm64" ]]; then
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64/bin/mihomo/mihomo"
+  else
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64/bin/mihomo/mihomo"
+  fi
+  echo "[+] Download mihomo: $url"
+  mkdir -p "$outroot/bin/mihomo"
+  curl -fL "$url" -o "$outroot/bin/mihomo/mihomo"
+  chmod +x "$outroot/bin/mihomo/mihomo" || true
+}
+
 # Move geo files to a unified path: outroot/bin/xray/
 unify_geo_layout() {
   local outroot="$1"
@@ -451,7 +469,8 @@ download_v2rayn_bundle() {
   fi
 
   rm -f "$outroot/v2rayn.zip" 2>/dev/null || true
-  find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
+  # keep mihomo
+  # find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
 
   local nested_dir
   nested_dir="$(find "$outroot" -maxdepth 1 -type d -name 'v2rayN-linux-*' | head -n1 || true)"
@@ -561,6 +580,8 @@ build_for_arch() {
       download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box download failed (skipped)"
     fi
     download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)"
+    # ---- REQUIRED: always fetch mihomo in netcore mode, per-arch ----
+    download_mihomo "$WORKDIR/$PKGROOT" || echo "[!] mihomo download failed (skipped)"
   fi
 
   # Tarball
@@ -583,6 +604,7 @@ Release:        1%{?dist}
 Summary:        v2rayN (Avalonia) GUI client for Linux (x86_64/aarch64)
 License:        GPL-3.0-only
 URL:            https://github.com/2dust/v2rayN
+BugURL:         https://github.com/2dust/v2rayN/issues
 ExclusiveArch:  aarch64 x86_64
 Source0:        __PKGROOT__.tar.gz
 
@@ -591,10 +613,11 @@ Requires:       libX11, libXrandr, libXcursor, libXi, libXext, libxcb, libXrende
 Requires:       fontconfig, freetype, cairo, pango, mesa-libEGL, mesa-libGL
 
 %description
-v2rayN GUI client built with Avalonia.
-Installs self-contained publish under /opt/v2rayN and a launcher 'v2rayn'.
-Cores (if bundled): /opt/v2rayN/bin/xray, /opt/v2rayN/bin/sing_box.
-Geo files for Xray are placed at /opt/v2rayN/bin/xray; launcher will symlink them into user's XDG data dir on first run.
+v2rayN Linux for Red Hat Enterprise Linux
+Support vless / vmess / Trojan / http / socks / Anytls / Hysteria2 / Shadowsocks / tuic / WireGuard
+Support Red Hat Enterprise Linux / Fedora Linux / Rocky Linux / AlmaLinux / CentOS
+For more information, Please visit our website
+https://github.com/2dust/v2rayN
 
 %prep
 %setup -q -n __PKGROOT__
@@ -645,7 +668,7 @@ cat > %{buildroot}%{_datadir}/applications/v2rayn.desktop << 'EOF'
 [Desktop Entry]
 Type=Application
 Name=v2rayN
-Comment=GUI client for Xray / sing-box
+Comment=v2rayN for Red Hat Enterprise Linux
 Exec=v2rayn
 Icon=v2rayn
 Terminal=false

From c7f3e53f280da1c7e0a420b4ce62bd64eb178024 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 21 Aug 2025 19:32:39 +0800
Subject: [PATCH 071/115] Customize MenuFlyoutMaxHeight for desktop version

---
 v2rayN/v2rayN.Desktop/Assets/GlobalResources.axaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/v2rayN/v2rayN.Desktop/Assets/GlobalResources.axaml b/v2rayN/v2rayN.Desktop/Assets/GlobalResources.axaml
index cdfff108..f58db043 100644
--- a/v2rayN/v2rayN.Desktop/Assets/GlobalResources.axaml
+++ b/v2rayN/v2rayN.Desktop/Assets/GlobalResources.axaml
@@ -10,6 +10,7 @@
 
     <x:Double x:Key="IconButtonWidth">32</x:Double>
     <x:Double x:Key="IconButtonHeight">32</x:Double>
+    <x:Double x:Key="MenuFlyoutMaxHeight">1000</x:Double>
 
     <Thickness x:Key="Margin2">2</Thickness>
     <Thickness x:Key="MarginLr4">4,0</Thickness>

From bb4f33559f78dc1d55175ee1ada7a9ca6cfc373d Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 21 Aug 2025 19:55:17 +0800
Subject: [PATCH 072/115] Code clean

---
 v2rayN/ServiceLib/Handler/Fmt/HtmlPageFmt.cs  | 2 --
 v2rayN/ServiceLib/Services/DownloadService.cs | 1 -
 v2rayN/v2rayN/Manager/WindowsManager.cs       | 1 -
 3 files changed, 4 deletions(-)

diff --git a/v2rayN/ServiceLib/Handler/Fmt/HtmlPageFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/HtmlPageFmt.cs
index 38d139d4..d7c014ae 100644
--- a/v2rayN/ServiceLib/Handler/Fmt/HtmlPageFmt.cs
+++ b/v2rayN/ServiceLib/Handler/Fmt/HtmlPageFmt.cs
@@ -1,5 +1,3 @@
-using SkiaSharp;
-
 namespace ServiceLib.Handler.Fmt;
 
 public class HtmlPageFmt : BaseFmt
diff --git a/v2rayN/ServiceLib/Services/DownloadService.cs b/v2rayN/ServiceLib/Services/DownloadService.cs
index fe17d523..f37c8939 100644
--- a/v2rayN/ServiceLib/Services/DownloadService.cs
+++ b/v2rayN/ServiceLib/Services/DownloadService.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics;
 using System.Net;
 using System.Net.Http.Headers;
 using System.Net.Sockets;
diff --git a/v2rayN/v2rayN/Manager/WindowsManager.cs b/v2rayN/v2rayN/Manager/WindowsManager.cs
index 8e8b116d..db5818f9 100644
--- a/v2rayN/v2rayN/Manager/WindowsManager.cs
+++ b/v2rayN/v2rayN/Manager/WindowsManager.cs
@@ -1,7 +1,6 @@
 using System.Drawing;
 using System.IO;
 using System.Windows.Media.Imaging;
-using v2rayN.Manager;
 
 namespace v2rayN.Manager;
 

From 606b216cd0d01d5355dc742ec2aa35d8bbf75a62 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 23 Aug 2025 16:23:30 +0800
Subject: [PATCH 073/115] Press the Esc button to close the window

https://github.com/2dust/v2rayN/issues/7819
---
 v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs  |  6 ++++++
 .../Views/FullConfigTemplateWindow.axaml.cs            |  5 +++++
 .../Views/GlobalHotkeySettingWindow.axaml.cs           |  5 +++++
 .../v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs  |  6 ++++++
 .../v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs |  5 +++++
 v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs  | 10 ++++++++++
 6 files changed, 37 insertions(+)

diff --git a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs
index 3bd2dec7..54f8e443 100644
--- a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs
@@ -16,6 +16,7 @@ public partial class DNSSettingWindow : WindowBase<DNSSettingViewModel>
         InitializeComponent();
 
         _config = AppManager.Instance.Config;
+        Loaded += Window_Loaded;
         btnCancel.Click += (s, e) => this.Close();
         ViewModel = new DNSSettingViewModel(UpdateViewHandler);
 
@@ -100,4 +101,9 @@ public partial class DNSSettingWindow : WindowBase<DNSSettingViewModel>
     {
         ProcUtils.ProcessStart("https://sing-box.sagernet.org/zh/configuration/dns/");
     }
+
+    private void Window_Loaded(object? sender, RoutedEventArgs e)
+    {
+        btnCancel.Focus();
+    }
 }
diff --git a/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
index a9b060fe..974b2823 100644
--- a/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
@@ -15,6 +15,7 @@ public partial class FullConfigTemplateWindow : WindowBase<FullConfigTemplateVie
         InitializeComponent();
 
         _config = AppManager.Instance.Config;
+        Loaded += Window_Loaded;
         btnCancel.Click += (s, e) => this.Close();
         ViewModel = new FullConfigTemplateViewModel(UpdateViewHandler);
 
@@ -49,4 +50,8 @@ public partial class FullConfigTemplateWindow : WindowBase<FullConfigTemplateVie
     {
         ProcUtils.ProcessStart("https://github.com/2dust/v2rayN/wiki/Description-of-some-ui#%E5%AE%8C%E6%95%B4%E9%85%8D%E7%BD%AE%E6%A8%A1%E6%9D%BF%E8%AE%BE%E7%BD%AE");
     }
+    private void Window_Loaded(object? sender, RoutedEventArgs e)
+    {
+        btnCancel.Focus();
+    }
 }
diff --git a/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs
index f676ccfc..966f4da0 100644
--- a/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs
@@ -22,6 +22,7 @@ public partial class GlobalHotkeySettingWindow : WindowBase<GlobalHotkeySettingV
         btnReset.Click += btnReset_Click;
 
         HotkeyManager.Instance.IsPause = true;
+        Loaded += Window_Loaded;
         this.Closing += (s, e) => HotkeyManager.Instance.IsPause = false;
         btnCancel.Click += (s, e) => this.Close();
 
@@ -134,4 +135,8 @@ public partial class GlobalHotkeySettingWindow : WindowBase<GlobalHotkeySettingV
 
         return res.ToString();
     }
+    private void Window_Loaded(object? sender, RoutedEventArgs e)
+    {
+        btnCancel.Focus();
+    }
 }
diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
index 82243f10..673fc819 100644
--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
@@ -1,5 +1,6 @@
 using System.Reactive.Disposables;
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 using ReactiveUI;
 using ServiceLib.Manager;
 using v2rayN.Desktop.Base;
@@ -14,6 +15,7 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
     {
         InitializeComponent();
 
+        Loaded += Window_Loaded;
         btnCancel.Click += (s, e) => this.Close();
         _config = AppManager.Instance.Config;
 
@@ -209,4 +211,8 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
             ViewModel.destOverride = clbdestOverride.SelectedItems.Cast<string>().ToList();
         }
     }
+    private void Window_Loaded(object? sender, RoutedEventArgs e)
+    {
+        btnCancel.Focus();
+    }
 }
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs
index 1b6dae74..b0ff1e89 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs
@@ -17,6 +17,7 @@ public partial class RoutingSettingWindow : WindowBase<RoutingSettingViewModel>
     {
         InitializeComponent();
 
+        Loaded += Window_Loaded;
         this.Closing += RoutingSettingWindow_Closing;
         btnCancel.Click += (s, e) => this.Close();
         this.KeyDown += RoutingSettingWindow_KeyDown;
@@ -134,4 +135,8 @@ public partial class RoutingSettingWindow : WindowBase<RoutingSettingViewModel>
             }
         }
     }
+    private void Window_Loaded(object? sender, RoutedEventArgs e)
+    {
+        btnCancel.Focus();
+    }
 }
diff --git a/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs
index 9ff0bcbd..d6702986 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs
@@ -1,5 +1,6 @@
 using System.Reactive.Disposables;
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 using DialogHostAvalonia;
 using DynamicData;
@@ -20,6 +21,7 @@ public partial class SubSettingWindow : WindowBase<SubSettingViewModel>
 
         menuClose.Click += menuClose_Click;
         this.Closing += SubSettingWindow_Closing;
+        this.KeyDown += SubSettingWindow_KeyDown;
         ViewModel = new SubSettingViewModel(UpdateViewHandler);
         lstSubscription.DoubleTapped += LstSubscription_DoubleTapped;
         lstSubscription.SelectionChanged += LstSubscription_SelectionChanged;
@@ -106,4 +108,12 @@ public partial class SubSettingWindow : WindowBase<SubSettingViewModel>
             }
         }
     }
+
+    private void SubSettingWindow_KeyDown(object? sender, KeyEventArgs e)
+    {
+        if (e.Key == Key.Escape)
+        {
+            menuClose_Click(null, null);
+        }
+    }
 }

From 7bec05ec23fa2192632e81bbc1cdb94e891623f5 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 23 Aug 2025 16:28:52 +0800
Subject: [PATCH 074/115] Fix

https://github.com/2dust/v2rayN/issues/7819
---
 v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs
index d6702986..b708f610 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs
@@ -20,6 +20,7 @@ public partial class SubSettingWindow : WindowBase<SubSettingViewModel>
         InitializeComponent();
 
         menuClose.Click += menuClose_Click;
+        Loaded += Window_Loaded;
         this.Closing += SubSettingWindow_Closing;
         this.KeyDown += SubSettingWindow_KeyDown;
         ViewModel = new SubSettingViewModel(UpdateViewHandler);
@@ -116,4 +117,8 @@ public partial class SubSettingWindow : WindowBase<SubSettingViewModel>
             menuClose_Click(null, null);
         }
     }
+    private void Window_Loaded(object? sender, RoutedEventArgs e)
+    {
+        lstSubscription.Focus();
+    }
 }

From 45c987fd86052fea33153e52731df8180bf223af Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 23 Aug 2025 16:36:12 +0800
Subject: [PATCH 075/115] up 7.14.3

---
 v2rayN/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/Directory.Build.props b/v2rayN/Directory.Build.props
index d4baa207..6c954fe4 100644
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.14.2</Version>
+        <Version>7.14.3</Version>
     </PropertyGroup>
 
     <PropertyGroup>

From 3eb49aa24c700c0e7bf4652a62e184dd42025fd0 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Mon, 25 Aug 2025 17:43:53 +0800
Subject: [PATCH 076/115] Add mieru support (#7828)

---
 v2rayN/ServiceLib/Enums/ECoreType.cs         |  1 +
 v2rayN/ServiceLib/Global.cs                  |  1 +
 v2rayN/ServiceLib/Manager/CoreInfoManager.cs | 29 ++++++++++++++++++--
 v2rayN/ServiceLib/Manager/CoreManager.cs     |  8 +++---
 v2rayN/ServiceLib/Models/CoreInfo.cs         |  1 +
 5 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/v2rayN/ServiceLib/Enums/ECoreType.cs b/v2rayN/ServiceLib/Enums/ECoreType.cs
index e164a2ab..9310a0a9 100644
--- a/v2rayN/ServiceLib/Enums/ECoreType.cs
+++ b/v2rayN/ServiceLib/Enums/ECoreType.cs
@@ -15,5 +15,6 @@ public enum ECoreType
     brook = 27,
     overtls = 28,
     shadowquic = 29,
+    mieru = 30,
     v2rayN = 99
 }
diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs
index 733c569d..a7c74c08 100644
--- a/v2rayN/ServiceLib/Global.cs
+++ b/v2rayN/ServiceLib/Global.cs
@@ -560,6 +560,7 @@ public class Global
             { ECoreType.brook, "txthinking/brook" },
             { ECoreType.overtls, "ShadowsocksR-Live/overtls" },
             { ECoreType.shadowquic, "spongebob888/shadowquic" },
+            { ECoreType.mieru, "enfein/mieru" },
             { ECoreType.v2rayN, "2dust/v2rayN" },
         };
 
diff --git a/v2rayN/ServiceLib/Manager/CoreInfoManager.cs b/v2rayN/ServiceLib/Manager/CoreInfoManager.cs
index 12345499..790e8839 100644
--- a/v2rayN/ServiceLib/Manager/CoreInfoManager.cs
+++ b/v2rayN/ServiceLib/Manager/CoreInfoManager.cs
@@ -80,6 +80,10 @@ public sealed class CoreInfoManager
                     Url = GetCoreUrl(ECoreType.v2fly),
                     Match = "V2Ray",
                     VersionArg = "-version",
+                    Environment = new Dictionary<string, string?>()
+                    {
+                        { Global.V2RayLocalAsset, Utils.GetBinPath("") },
+                    },
                 },
 
                 new CoreInfo
@@ -90,6 +94,10 @@ public sealed class CoreInfoManager
                     Url = GetCoreUrl(ECoreType.v2fly_v5),
                     Match = "V2Ray",
                     VersionArg = "version",
+                    Environment = new Dictionary<string, string?>()
+                    {
+                        { Global.V2RayLocalAsset, Utils.GetBinPath("") },
+                    },
                 },
 
                 new CoreInfo
@@ -107,6 +115,11 @@ public sealed class CoreInfoManager
                     DownloadUrlOSXArm64 = urlXray + "/download/{0}/Xray-macos-arm64-v8a.zip",
                     Match = "Xray",
                     VersionArg = "-version",
+                    Environment = new Dictionary<string, string?>()
+                    {
+                        { Global.XrayLocalAsset, Utils.GetBinPath("") },
+                        { Global.XrayLocalCert, Utils.GetBinPath("") },
+                    },
                 },
 
                 new CoreInfo
@@ -205,12 +218,24 @@ public sealed class CoreInfoManager
                 new CoreInfo
                 {
                     CoreType = ECoreType.shadowquic,
-                    CoreExes = [ "shadowquic", "shadowquic"],
+                    CoreExes = [ "shadowquic" ],
                     Arguments = "-c {0}",
                     Url =  GetCoreUrl(ECoreType.shadowquic),
                     AbsolutePath = false,
-                }
+                },
 
+                new CoreInfo
+                {
+                    CoreType = ECoreType.mieru,
+                    CoreExes = [ "mieru" ],
+                    Arguments = "run",
+                    Url =  GetCoreUrl(ECoreType.mieru),
+                    AbsolutePath = false,
+                    Environment = new Dictionary<string, string?>()
+                    {
+                        { "MIERU_CONFIG_JSON_FILE", "{0}" },
+                    },
+                },
         ];
     }
 
diff --git a/v2rayN/ServiceLib/Manager/CoreManager.cs b/v2rayN/ServiceLib/Manager/CoreManager.cs
index d0fcc0fa..74cdaf91 100644
--- a/v2rayN/ServiceLib/Manager/CoreManager.cs
+++ b/v2rayN/ServiceLib/Manager/CoreManager.cs
@@ -22,10 +22,6 @@ public class CoreManager
         _config = config;
         _updateFunc = updateFunc;
 
-        Environment.SetEnvironmentVariable(Global.V2RayLocalAsset, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
-        Environment.SetEnvironmentVariable(Global.XrayLocalAsset, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
-        Environment.SetEnvironmentVariable(Global.XrayLocalCert, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
-
         //Copy the bin folder to the storage location (for init)
         if (Environment.GetEnvironmentVariable(Global.LocalAppData) == "1")
         {
@@ -277,6 +273,10 @@ public class CoreManager
                 StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
             }
         };
+        foreach (var kv in coreInfo.Environment)
+        {
+            proc.StartInfo.Environment[kv.Key] = string.Format(kv.Value, coreInfo.AbsolutePath ? Utils.GetBinConfigPath(configPath).AppendQuotes() : configPath);
+        }
 
         if (displayLog)
         {
diff --git a/v2rayN/ServiceLib/Models/CoreInfo.cs b/v2rayN/ServiceLib/Models/CoreInfo.cs
index faf899a9..eb4404cb 100644
--- a/v2rayN/ServiceLib/Models/CoreInfo.cs
+++ b/v2rayN/ServiceLib/Models/CoreInfo.cs
@@ -17,4 +17,5 @@ public class CoreInfo
     public string? Match { get; set; }
     public string? VersionArg { get; set; }
     public bool AbsolutePath { get; set; }
+    public IDictionary<string, string?> Environment { get; set; } = new Dictionary<string, string?>();
 }

From cddf88730f570f8249f81d9da68c69932e6f336b Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Tue, 26 Aug 2025 17:34:12 +0800
Subject: [PATCH 077/115] Fix dns (#7834)

---
 .../CoreConfig/Singbox/SingboxDnsService.cs   | 52 ++++++++-----------
 .../CoreConfig/V2ray/V2rayDnsService.cs       | 48 +++++++----------
 2 files changed, 39 insertions(+), 61 deletions(-)

diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
index 15f2c43b..2f0f8015 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
@@ -80,25 +80,31 @@ public partial class CoreConfigSingboxService
             hostsDns.predefined = Global.PredefinedHosts;
         }
 
+        if (simpleDNSItem.UseSystemHosts == true)
+        {
+            var systemHosts = Utils.GetSystemHosts();
+            if (systemHosts != null && systemHosts.Count > 0)
+            {
+                foreach (var host in systemHosts)
+                {
+                    hostsDns.predefined.TryAdd(host.Key, new List<string> { host.Value });
+                }
+            }
+        }
+
         if (!simpleDNSItem.Hosts.IsNullOrEmpty())
         {
-            var userHostsMap = simpleDNSItem.Hosts?
+            var userHostsMap = simpleDNSItem.Hosts
                 .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
-                .Where(line => !string.IsNullOrWhiteSpace(line))
-                .Where(line => line.Contains(' '))
+                .Select(line => line.Trim())
+                .Where(line => !string.IsNullOrWhiteSpace(line) && line.Contains(' '))
+                .Select(line => line.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries))
+                .Where(parts => parts.Length >= 2)
+                .GroupBy(parts => parts[0])
                 .ToDictionary(
-                    line =>
-                    {
-                        var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                        return parts[0];
-                    },
-                    line =>
-                    {
-                        var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                        var values = parts.Skip(1).ToList();
-                        return values;
-                    }
-                ) ?? new Dictionary<string, List<string>>();
+                    group => group.Key,
+                    group => group.SelectMany(parts => parts.Skip(1)).ToList()
+                );
 
             foreach (var kvp in userHostsMap)
             {
@@ -106,22 +112,6 @@ public partial class CoreConfigSingboxService
             }
         }
 
-        if (simpleDNSItem.UseSystemHosts == true)
-        {
-            var systemHosts = Utils.GetSystemHosts();
-            if (systemHosts.Count > 0)
-            {
-                foreach (var host in systemHosts)
-                {
-                    if (hostsDns.predefined[host.Key] != null)
-                    {
-                        continue;
-                    }
-                    hostsDns.predefined[host.Key] = new List<string> { host.Value };
-                }
-            }
-        }
-
         foreach (var host in hostsDns.predefined)
         {
             if (finalDns.server == host.Key)
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs
index 9faf4df3..6f64e923 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs
@@ -248,43 +248,31 @@ public partial class CoreConfigV2rayService
         if (simpleDNSItem.UseSystemHosts == true)
         {
             var systemHosts = Utils.GetSystemHosts();
-            if (systemHosts.Count > 0)
+            var normalHost = v2rayConfig?.dns?.hosts;
+
+            if (normalHost != null && systemHosts?.Count > 0)
             {
-                var normalHost = v2rayConfig.dns.hosts;
-                if (normalHost != null)
+                foreach (var host in systemHosts)
                 {
-                    foreach (var host in systemHosts)
-                    {
-                        if (normalHost[host.Key] != null)
-                        {
-                            continue;
-                        }
-                        normalHost[host.Key] = new List<string> { host.Value };
-                    }
+                    normalHost.TryAdd(host.Key, new List<string> { host.Value });
                 }
             }
         }
 
-        var userHostsMap = simpleDNSItem.Hosts?
-            .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
-            .Where(line => !string.IsNullOrWhiteSpace(line))
-            .Where(line => line.Contains(' '))
-            .ToDictionary(
-                line =>
-                {
-                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                    return parts[0];
-                },
-                line =>
-                {
-                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                    var values = parts.Skip(1).ToList();
-                    return values;
-                }
-            );
-
-        if (userHostsMap != null)
+        if (!simpleDNSItem.Hosts.IsNullOrEmpty())
         {
+            var userHostsMap = simpleDNSItem.Hosts
+                .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(line => line.Trim())
+                .Where(line => !string.IsNullOrWhiteSpace(line) && line.Contains(' '))
+                .Select(line => line.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries))
+                .Where(parts => parts.Length >= 2)
+                .GroupBy(parts => parts[0])
+                .ToDictionary(
+                    group => group.Key,
+                    group => group.SelectMany(parts => parts.Skip(1)).ToList()
+                );
+
             foreach (var kvp in userHostsMap)
             {
                 v2rayConfig.dns.hosts[kvp.Key] = kvp.Value;

From 2ad716a4ad9ac00f0c2becbea688e5dfaff14708 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 26 Aug 2025 17:46:43 +0800
Subject: [PATCH 078/115] Remove Cursor="Hand"

---
 .../Views/AddServer2Window.axaml              |  2 --
 .../Views/AddServerWindow.axaml               |  2 --
 .../Views/DNSSettingWindow.axaml              |  8 ++----
 .../Views/FullConfigTemplateWindow.axaml      |  2 --
 .../Views/GlobalHotkeySettingWindow.axaml     |  2 --
 .../Views/OptionSettingWindow.axaml           |  2 --
 .../Views/RoutingRuleDetailsWindow.axaml      |  2 --
 .../Views/RoutingRuleSettingWindow.axaml      | 28 +++++++++----------
 .../Views/RoutingSettingWindow.axaml          |  2 --
 .../v2rayN.Desktop/Views/SubEditWindow.axaml  |  2 --
 .../Views/SudoPasswordInputView.axaml         |  2 --
 v2rayN/v2rayN/Views/AddServer2Window.xaml     |  2 --
 v2rayN/v2rayN/Views/AddServerWindow.xaml      |  2 --
 v2rayN/v2rayN/Views/DNSSettingWindow.xaml     |  4 ---
 .../Views/FullConfigTemplateWindow.xaml       |  2 --
 .../Views/GlobalHotkeySettingWindow.xaml      |  2 --
 v2rayN/v2rayN/Views/OptionSettingWindow.xaml  |  2 --
 .../Views/RoutingRuleDetailsWindow.xaml       |  2 --
 .../Views/RoutingRuleSettingWindow.xaml       |  2 --
 v2rayN/v2rayN/Views/RoutingSettingWindow.xaml |  2 --
 v2rayN/v2rayN/Views/SubEditWindow.xaml        |  2 --
 21 files changed, 15 insertions(+), 61 deletions(-)

diff --git a/v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml b/v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml
index 6b547b65..0c9d89a4 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml
@@ -23,14 +23,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
index 9cb462d1..ab6bc223 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
@@ -23,14 +23,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
diff --git a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
index afb3dd97..c9cf690b 100644
--- a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
@@ -24,14 +24,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 
@@ -331,8 +329,7 @@
                             <Button
                                 x:Name="btnImportDefConfig4V2rayCompatible"
                                 Margin="{StaticResource Margin4}"
-                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
-                                Cursor="Hand" />
+                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}" />
                         </StackPanel>
                     </Grid>
 
@@ -415,8 +412,7 @@
                             <Button
                                 x:Name="btnImportDefConfig4SingboxCompatible"
                                 Margin="{StaticResource Margin4}"
-                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
-                                Cursor="Hand" />
+                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}" />
                         </StackPanel>
                     </Grid>
 
diff --git a/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml b/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml
index bdeb1c93..63f29ed0 100644
--- a/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml
@@ -23,14 +23,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 
diff --git a/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml
index 6a16d523..8eb3b473 100644
--- a/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml
@@ -28,14 +28,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
index df8ac68a..3c6e7231 100644
--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
@@ -24,14 +24,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml b/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
index 460f0107..f310f260 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
@@ -167,14 +167,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml
index e2abe9c0..9e372f68 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml
@@ -27,22 +27,20 @@
         </StackPanel>
 
         <StackPanel
-            HorizontalAlignment="Right"
             Margin="{StaticResource Margin4}"
+            HorizontalAlignment="Right"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <Button
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 
@@ -54,8 +52,8 @@
             <TextBlock
                 Grid.Row="0"
                 Grid.Column="0"
-                VerticalAlignment="Center"
                 Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center"
                 Text="{x:Static resx:ResUI.LvRemarks}" />
             <StackPanel
                 Grid.Row="0"
@@ -67,27 +65,27 @@
                     Grid.Row="0"
                     Grid.Column="1"
                     Width="300"
+                    Margin="{StaticResource Margin4}"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
-                    Margin="{StaticResource Margin4}"
                     TextWrapping="Wrap" />
 
                 <TextBlock
-                    VerticalAlignment="Center"
                     Margin="{StaticResource Margin4}"
+                    VerticalAlignment="Center"
                     Text="{x:Static resx:ResUI.LvSort}" />
                 <TextBox
                     x:Name="txtSort"
                     Width="100"
-                    HorizontalAlignment="Left"
-                    Margin="{StaticResource Margin4}" />
+                    Margin="{StaticResource Margin4}"
+                    HorizontalAlignment="Left" />
             </StackPanel>
 
             <TextBlock
                 Grid.Row="1"
                 Grid.Column="0"
-                VerticalAlignment="Center"
                 Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center"
                 Text="{x:Static resx:ResUI.TbdomainStrategy}" />
             <StackPanel
                 Grid.Row="1"
@@ -98,8 +96,8 @@
                     Width="200"
                     Margin="{StaticResource Margin4}" />
                 <TextBlock
-                    VerticalAlignment="Center"
                     Margin="{StaticResource Margin4}"
+                    VerticalAlignment="Center"
                     Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
                 <ComboBox
                     x:Name="cmbdomainStrategy4Singbox"
@@ -110,17 +108,17 @@
             <TextBlock
                 Grid.Row="2"
                 Grid.Column="0"
-                VerticalAlignment="Center"
                 Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center"
                 Text="{x:Static resx:ResUI.LvUrl}" />
             <TextBox
                 x:Name="txtUrl"
                 Grid.Row="2"
                 Grid.Column="1"
                 Width="600"
+                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
-                Margin="{StaticResource Margin4}"
                 TextWrapping="Wrap" />
 
             <!--
@@ -150,8 +148,8 @@
             <TextBlock
                 Grid.Row="4"
                 Grid.Column="0"
-                VerticalAlignment="Center"
-                Margin="{StaticResource Margin4}">
+                Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center">
                 <HyperlinkButton Classes="WithIcon" Click="linkCustomRulesetPath4Singbox">
                     <TextBlock Text="{x:Static resx:ResUI.LvCustomRulesetPath4Singbox}" />
                 </HyperlinkButton>
@@ -161,9 +159,9 @@
                 Grid.Row="4"
                 Grid.Column="1"
                 Width="600"
+                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
-                Margin="{StaticResource Margin4}"
                 TextWrapping="Wrap" />
             <Button
                 x:Name="btnBrowseCustomRulesetPath4Singbox"
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
index 710980c4..bf15ab13 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
@@ -35,14 +35,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 
diff --git a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
index 91a5f032..21c52189 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
@@ -22,14 +22,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
diff --git a/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml b/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml
index 507cbb49..507a28d0 100644
--- a/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml
@@ -24,14 +24,12 @@
                     x:Name="btnSave"
                     Width="100"
                     Content="{x:Static resx:ResUI.TbConfirm}"
-                    Cursor="Hand"
                     IsDefault="True" />
                 <Button
                     x:Name="btnCancel"
                     Width="100"
                     Margin="{StaticResource MarginLr8}"
                     Content="{x:Static resx:ResUI.TbCancel}"
-                    Cursor="Hand"
                     IsCancel="True" />
             </StackPanel>
         </Border>
diff --git a/v2rayN/v2rayN/Views/AddServer2Window.xaml b/v2rayN/v2rayN/Views/AddServer2Window.xaml
index 04ae6750..0c875ffd 100644
--- a/v2rayN/v2rayN/Views/AddServer2Window.xaml
+++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml
@@ -27,7 +27,6 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -35,7 +34,6 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml
index 7276a1fc..c50bd2e6 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -35,7 +35,6 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -43,7 +42,6 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>
diff --git a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
index b3d2e0fd..38be6091 100644
--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
@@ -27,7 +27,6 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -35,7 +34,6 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>
@@ -396,7 +394,6 @@
                                 x:Name="btnImportDefConfig4V2rayCompatible"
                                 Margin="{StaticResource Margin8}"
                                 Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
-                                Cursor="Hand"
                                 Style="{StaticResource DefButton}" />
                         </StackPanel>
                     </Grid>
@@ -489,7 +486,6 @@
                                 x:Name="btnImportDefConfig4SingboxCompatible"
                                 Margin="{StaticResource Margin8}"
                                 Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
-                                Cursor="Hand"
                                 Style="{StaticResource DefButton}" />
                         </StackPanel>
                     </Grid>
diff --git a/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml b/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml
index 5a62cc11..d3ca8af7 100644
--- a/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml
+++ b/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml
@@ -27,7 +27,6 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -35,7 +34,6 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>
diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
index 6a9a4ffa..9a147655 100644
--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
@@ -33,7 +33,6 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -41,7 +40,6 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
index 6b92ba2d..98b90235 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -27,7 +27,6 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -35,7 +34,6 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>
diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
index 9c710cd7..baa4d543 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
@@ -198,7 +198,6 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -206,7 +205,6 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>
diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
index 3489d4c2..b26a8902 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@@ -76,7 +76,6 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -84,7 +83,6 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>
diff --git a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
index 36b42409..c4595292 100644
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
@@ -61,7 +61,6 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -69,7 +68,6 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml b/v2rayN/v2rayN/Views/SubEditWindow.xaml
index 497d9271..2d863a96 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml
@@ -34,7 +34,6 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -42,7 +41,6 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>

From 0d5afa4ff5fcce34192a0e71e59e41091062aa56 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 26 Aug 2025 20:56:28 +0800
Subject: [PATCH 079/115] Optimizing SQLite performance

https://github.com/2dust/v2rayN/issues/7835
---
 v2rayN/ServiceLib/Helper/SqliteHelper.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2rayN/ServiceLib/Helper/SqliteHelper.cs b/v2rayN/ServiceLib/Helper/SqliteHelper.cs
index 1561d3a5..959d5ff6 100644
--- a/v2rayN/ServiceLib/Helper/SqliteHelper.cs
+++ b/v2rayN/ServiceLib/Helper/SqliteHelper.cs
@@ -26,7 +26,7 @@ public sealed class SQLiteHelper
 
     public async Task<int> InsertAllAsync(IEnumerable models)
     {
-        return await _dbAsync.InsertAllAsync(models);
+        return await _dbAsync.InsertAllAsync(models, runInTransaction: true).ConfigureAwait(false);
     }
 
     public async Task<int> InsertAsync(object model)
@@ -46,7 +46,7 @@ public sealed class SQLiteHelper
 
     public async Task<int> UpdateAllAsync(IEnumerable models)
     {
-        return await _dbAsync.UpdateAllAsync(models);
+        return await _dbAsync.UpdateAllAsync(models, runInTransaction: true).ConfigureAwait(false);
     }
 
     public async Task<int> DeleteAsync(object model)

From fe7c505cc99a336c818234a5d693fdbd956ee697 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 27 Aug 2025 17:14:24 +0800
Subject: [PATCH 080/115] Update subscription using Task.Run

---
 .../ServiceLib/Handler/SubscriptionHandler.cs |   2 +
 v2rayN/ServiceLib/Resx/ResUI.Designer.cs      | 997 +++++++++---------
 v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx       |   5 +-
 v2rayN/ServiceLib/Resx/ResUI.hu.resx          |   5 +-
 v2rayN/ServiceLib/Resx/ResUI.resx             |   5 +-
 v2rayN/ServiceLib/Resx/ResUI.ru.resx          |   5 +-
 v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx     |   5 +-
 v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx     |   5 +-
 .../ViewModels/MainWindowViewModel.cs         |   2 +-
 9 files changed, 534 insertions(+), 497 deletions(-)

diff --git a/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs b/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
index 746cbafa..03d97f13 100644
--- a/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
+++ b/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
@@ -197,6 +197,8 @@ public static class SubscriptionHandler
             updateFunc?.Invoke(false, $"{hashCode}{result}");
         }
 
+        updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartParsingSubscription}");
+
         // Add servers to configuration
         var ret = await ConfigHandler.AddBatchServers(config, result, id, true);
         if (ret <= 0)
diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index 54fc88ba..82d1203f 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -10,8 +10,8 @@
 
 namespace ServiceLib.Resx {
     using System;
-
-
+    
+    
     /// <summary>
     ///   一个强类型的资源类，用于查找本地化的字符串等。
     /// </summary>
@@ -23,15 +23,15 @@ namespace ServiceLib.Resx {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class ResUI {
-
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal ResUI() {
         }
-
+        
         /// <summary>
         ///   返回此类使用的缓存的 ResourceManager 实例。
         /// </summary>
@@ -45,7 +45,7 @@ namespace ServiceLib.Resx {
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   重写当前线程的 CurrentUICulture 属性，对
         ///   使用此强类型资源类的所有资源查找执行重写。
@@ -59,7 +59,7 @@ namespace ServiceLib.Resx {
                 resourceCulture = value;
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Do you want to append rules? Choose yes to append, no to replace. 的本地化字符串。
         /// </summary>
@@ -68,7 +68,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("AddBatchRoutingRulesYesNo", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 All 的本地化字符串。
         /// </summary>
@@ -77,7 +77,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("AllGroupServers", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Export share link to clipboard successfully 的本地化字符串。
         /// </summary>
@@ -86,7 +86,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("BatchExportURLSuccessfully", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please check the Configuration settings first. 的本地化字符串。
         /// </summary>
@@ -95,7 +95,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("CheckServerSettings", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Invalid configuration format. 的本地化字符串。
         /// </summary>
@@ -104,7 +104,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("ConfigurationFormatIncorrect", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Host filter 的本地化字符串。
         /// </summary>
@@ -113,7 +113,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("ConnectionsHostFilterTitle", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Note that custom configuration relies entirely on your own configuration and does not work with all settings. If you want to use the system proxy, please modify the listening port manually. 的本地化字符串。
         /// </summary>
@@ -122,7 +122,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("CustomServerTips", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Downloading... 的本地化字符串。
         /// </summary>
@@ -131,7 +131,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("Downloading", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Failed to convert configuration file 的本地化字符串。
         /// </summary>
@@ -140,7 +140,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FailedConversionConfiguration", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Failed to generate default configuration file 的本地化字符串。
         /// </summary>
@@ -149,7 +149,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FailedGenDefaultConfiguration", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Failed to get the default configuration 的本地化字符串。
         /// </summary>
@@ -158,7 +158,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FailedGetDefaultConfiguration", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Failed to import custom configuration Configuration 的本地化字符串。
         /// </summary>
@@ -167,7 +167,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FailedImportedCustomServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Failed to read configuration file 的本地化字符串。
         /// </summary>
@@ -176,7 +176,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FailedReadConfiguration", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Failed to run Core, please check the prompt information 的本地化字符串。
         /// </summary>
@@ -185,7 +185,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FailedToRunCore", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please fill in the correct config template 的本地化字符串。
         /// </summary>
@@ -194,7 +194,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FillCorrectConfigTemplateText", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please fill in the correct custom DNS 的本地化字符串。
         /// </summary>
@@ -203,7 +203,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FillCorrectDNSText", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please enter the correct port format. 的本地化字符串。
         /// </summary>
@@ -212,7 +212,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FillCorrectServerPort", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please enter the local listening port. 的本地化字符串。
         /// </summary>
@@ -221,7 +221,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FillLocalListeningPort", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please enter the password. 的本地化字符串。
         /// </summary>
@@ -230,7 +230,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FillPassword", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please enter the address. 的本地化字符串。
         /// </summary>
@@ -239,7 +239,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FillServerAddress", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please browse to import Configuration configuration 的本地化字符串。
         /// </summary>
@@ -248,7 +248,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FillServerAddressCustom", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please enter the user ID. 的本地化字符串。
         /// </summary>
@@ -257,7 +257,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("FillUUID", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Transport 的本地化字符串。
         /// </summary>
@@ -266,7 +266,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("GbTransport", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 This is not the correct configuration, please check 的本地化字符串。
         /// </summary>
@@ -275,7 +275,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("Incorrectconfiguration", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Initial Configuration 的本地化字符串。
         /// </summary>
@@ -284,7 +284,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("InitialConfiguration", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please do not use the insecure HTTP protocol subscription address 的本地化字符串。
         /// </summary>
@@ -293,7 +293,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("InsecureUrlProtocol", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Invalid address (URL) 的本地化字符串。
         /// </summary>
@@ -302,7 +302,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("InvalidUrlTip", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 {0} {1} already up to date. 的本地化字符串。
         /// </summary>
@@ -311,7 +311,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("IsLatestCore", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 {0} {1} already up to date. 的本地化字符串。
         /// </summary>
@@ -320,7 +320,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("IsLatestN", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 LAN 的本地化字符串。
         /// </summary>
@@ -329,7 +329,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LabLAN", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Local 的本地化字符串。
         /// </summary>
@@ -338,7 +338,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LabLocal", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Invalid backup file 的本地化字符串。
         /// </summary>
@@ -347,7 +347,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LocalRestoreInvalidZipTips", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Address 的本地化字符串。
         /// </summary>
@@ -356,7 +356,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvAddress", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Automatic update interval (minutes) 的本地化字符串。
         /// </summary>
@@ -365,7 +365,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvAutoUpdateInterval", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Convert target type 的本地化字符串。
         /// </summary>
@@ -374,7 +374,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvConvertTarget", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please leave blank if no conversion is required 的本地化字符串。
         /// </summary>
@@ -383,7 +383,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvConvertTargetTip", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Count 的本地化字符串。
         /// </summary>
@@ -392,7 +392,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvCount", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Custom icon 的本地化字符串。
         /// </summary>
@@ -401,7 +401,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvCustomIcon", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Customize the rule-set of sing-box 的本地化字符串。
         /// </summary>
@@ -410,7 +410,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvCustomRulesetPath4Singbox", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Enable update 的本地化字符串。
         /// </summary>
@@ -419,7 +419,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvEnabled", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Security 的本地化字符串。
         /// </summary>
@@ -428,7 +428,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvEncryptionMethod", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Remarks regular filter 的本地化字符串。
         /// </summary>
@@ -437,7 +437,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvFilter", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Remarks Memo 的本地化字符串。
         /// </summary>
@@ -446,7 +446,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvMemo", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 More URLs, separated by commas; Subscription conversion will be invalid 的本地化字符串。
         /// </summary>
@@ -455,7 +455,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvMoreUrl", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Next proxy Configuration remarks 的本地化字符串。
         /// </summary>
@@ -464,7 +464,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvNextProfile", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Port 的本地化字符串。
         /// </summary>
@@ -473,7 +473,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvPort", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Previous proxy Configuration remarks 的本地化字符串。
         /// </summary>
@@ -482,7 +482,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvPrevProfile", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please make sure the Configuration remarks exist and are unique 的本地化字符串。
         /// </summary>
@@ -491,7 +491,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvPrevProfileTip", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Remarks 的本地化字符串。
         /// </summary>
@@ -500,7 +500,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvRemarks", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Type 的本地化字符串。
         /// </summary>
@@ -509,7 +509,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvServiceType", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Sort 的本地化字符串。
         /// </summary>
@@ -518,7 +518,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvSort", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Subs group 的本地化字符串。
         /// </summary>
@@ -527,7 +527,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvSubscription", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Delay (ms) 的本地化字符串。
         /// </summary>
@@ -536,7 +536,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvTestDelay", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Speed (M/s) 的本地化字符串。
         /// </summary>
@@ -545,7 +545,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvTestSpeed", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 TLS 的本地化字符串。
         /// </summary>
@@ -554,7 +554,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvTLS", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Download traffic today 的本地化字符串。
         /// </summary>
@@ -563,7 +563,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvTodayDownloadDataAmount", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Upload traffic today 的本地化字符串。
         /// </summary>
@@ -572,7 +572,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvTodayUploadDataAmount", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Total download traffic 的本地化字符串。
         /// </summary>
@@ -581,7 +581,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvTotalDownloadDataAmount", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Total upload traffic 的本地化字符串。
         /// </summary>
@@ -590,7 +590,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvTotalUploadDataAmount", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Transport 的本地化字符串。
         /// </summary>
@@ -599,7 +599,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvTransportProtocol", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 URL (optional) 的本地化字符串。
         /// </summary>
@@ -608,7 +608,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvUrl", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 User Agent 的本地化字符串。
         /// </summary>
@@ -617,7 +617,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvUserAgent", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 WebDAV Check 的本地化字符串。
         /// </summary>
@@ -626,7 +626,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvWebDavCheck", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Remote folder name (optional) 的本地化字符串。
         /// </summary>
@@ -635,7 +635,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvWebDavDirName", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 WebDAV Password 的本地化字符串。
         /// </summary>
@@ -644,7 +644,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvWebDavPassword", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 WebDAV URL 的本地化字符串。
         /// </summary>
@@ -653,7 +653,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvWebDavUrl", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 WebDAV User Name 的本地化字符串。
         /// </summary>
@@ -662,7 +662,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("LvWebDavUserName", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Add [Anytls] Configuration 的本地化字符串。
         /// </summary>
@@ -671,7 +671,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddAnytlsServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Add a custom configuration Configuration 的本地化字符串。
         /// </summary>
@@ -680,7 +680,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddCustomServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Add [HTTP] Configuration 的本地化字符串。
         /// </summary>
@@ -689,7 +689,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddHttpServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Add [Hysteria2] Configuration 的本地化字符串。
         /// </summary>
@@ -698,7 +698,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddHysteria2Server", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Import Share Links from clipboard (Ctrl+V) 的本地化字符串。
         /// </summary>
@@ -707,7 +707,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddServerViaClipboard", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Scan QR code in the image 的本地化字符串。
         /// </summary>
@@ -716,7 +716,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddServerViaImage", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Scan QR code on the screen (Ctrl+S) 的本地化字符串。
         /// </summary>
@@ -725,7 +725,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddServerViaScan", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Add [Shadowsocks] Configuration 的本地化字符串。
         /// </summary>
@@ -734,7 +734,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddShadowsocksServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Add [SOCKS] Configuration 的本地化字符串。
         /// </summary>
@@ -743,7 +743,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddSocksServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Add [Trojan] Configuration 的本地化字符串。
         /// </summary>
@@ -752,7 +752,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddTrojanServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Add [TUIC] Configuration 的本地化字符串。
         /// </summary>
@@ -761,7 +761,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddTuicServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Add [VLESS] Configuration 的本地化字符串。
         /// </summary>
@@ -770,7 +770,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddVlessServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Add [VMess] Configuration 的本地化字符串。
         /// </summary>
@@ -779,7 +779,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddVmessServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Add [WireGuard] Configuration 的本地化字符串。
         /// </summary>
@@ -788,7 +788,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuAddWireguardServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Backup and Restore 的本地化字符串。
         /// </summary>
@@ -797,7 +797,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuBackupAndRestore", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Check Update 的本地化字符串。
         /// </summary>
@@ -806,7 +806,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuCheckUpdate", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Clear all service statistics 的本地化字符串。
         /// </summary>
@@ -815,7 +815,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuClearServerStatistics", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Close 的本地化字符串。
         /// </summary>
@@ -824,7 +824,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuClose", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Close Connection 的本地化字符串。
         /// </summary>
@@ -833,7 +833,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuConnectionClose", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Close All Connections 的本地化字符串。
         /// </summary>
@@ -842,7 +842,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuConnectionCloseAll", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Copy proxy command to clipboard 的本地化字符串。
         /// </summary>
@@ -851,7 +851,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuCopyProxyCmdToClipboard", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Clone selected Configuration 的本地化字符串。
         /// </summary>
@@ -860,7 +860,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuCopyServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 DNS Settings 的本地化字符串。
         /// </summary>
@@ -869,7 +869,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuDNSSetting", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Edit Configuration (Ctrl+D) 的本地化字符串。
         /// </summary>
@@ -878,7 +878,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuEditServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Exit 的本地化字符串。
         /// </summary>
@@ -887,7 +887,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuExit", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Are you sure you want to exit? 的本地化字符串。
         /// </summary>
@@ -896,7 +896,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuExitTips", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Export selected Configuration for complete configuration 的本地化字符串。
         /// </summary>
@@ -905,7 +905,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuExport2ClientConfig", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Export selected Configuration for complete configuration to clipboard 的本地化字符串。
         /// </summary>
@@ -914,7 +914,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuExport2ClientConfigClipboard", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Export Share Link to Clipboard (Ctrl+C) 的本地化字符串。
         /// </summary>
@@ -923,7 +923,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuExport2ShareUrl", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Export Base64-encoded Share Links to Clipboard 的本地化字符串。
         /// </summary>
@@ -932,7 +932,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuExport2ShareUrlBase64", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Export Configuration 的本地化字符串。
         /// </summary>
@@ -941,7 +941,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuExportConfig", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Full Config Template Setting 的本地化字符串。
         /// </summary>
@@ -950,7 +950,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuFullConfigTemplate", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Global Hotkey Setting 的本地化字符串。
         /// </summary>
@@ -959,7 +959,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuGlobalHotkeySetting", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Help 的本地化字符串。
         /// </summary>
@@ -968,7 +968,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuHelp", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Import Rules From Clipboard 的本地化字符串。
         /// </summary>
@@ -977,7 +977,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuImportRulesFromClipboard", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Import Rules From File 的本地化字符串。
         /// </summary>
@@ -986,7 +986,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuImportRulesFromFile", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Import Rules From Subscription URL 的本地化字符串。
         /// </summary>
@@ -995,7 +995,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuImportRulesFromUrl", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Backup to local 的本地化字符串。
         /// </summary>
@@ -1004,7 +1004,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuLocalBackup", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Local 的本地化字符串。
         /// </summary>
@@ -1013,7 +1013,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuLocalBackupAndRestore", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Restore from local 的本地化字符串。
         /// </summary>
@@ -1022,7 +1022,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuLocalRestore", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 One-click multi-test latency and speed (Ctrl+E) 的本地化字符串。
         /// </summary>
@@ -1031,7 +1031,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMixedTestServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Direct 的本地化字符串。
         /// </summary>
@@ -1040,7 +1040,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuModeDirect", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Global 的本地化字符串。
         /// </summary>
@@ -1049,7 +1049,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuModeGlobal", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Do not change 的本地化字符串。
         /// </summary>
@@ -1058,7 +1058,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuModeNothing", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Rule 的本地化字符串。
         /// </summary>
@@ -1067,7 +1067,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuModeRule", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Move to bottom (B) 的本地化字符串。
         /// </summary>
@@ -1076,7 +1076,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMoveBottom", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Down (D) 的本地化字符串。
         /// </summary>
@@ -1085,7 +1085,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMoveDown", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Move up and down 的本地化字符串。
         /// </summary>
@@ -1094,7 +1094,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMoveTo", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Move to group 的本地化字符串。
         /// </summary>
@@ -1103,7 +1103,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMoveToGroup", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Move to top (T) 的本地化字符串。
         /// </summary>
@@ -1112,7 +1112,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMoveTop", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Up (U) 的本地化字符串。
         /// </summary>
@@ -1121,7 +1121,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMoveUp", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Clear all 的本地化字符串。
         /// </summary>
@@ -1130,7 +1130,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMsgViewClear", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Copy (Ctrl+C) 的本地化字符串。
         /// </summary>
@@ -1139,7 +1139,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMsgViewCopy", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Copy all 的本地化字符串。
         /// </summary>
@@ -1148,7 +1148,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMsgViewCopyAll", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Select all (Ctrl+A) 的本地化字符串。
         /// </summary>
@@ -1157,7 +1157,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuMsgViewSelectAll", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Open the storage location 的本地化字符串。
         /// </summary>
@@ -1166,7 +1166,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuOpenTheFileLocation", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Option Setting 的本地化字符串。
         /// </summary>
@@ -1175,7 +1175,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuOptionSetting", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Auto column width adjustment 的本地化字符串。
         /// </summary>
@@ -1184,7 +1184,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuProfileAutofitColumnWidth", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Promotion 的本地化字符串。
         /// </summary>
@@ -1193,7 +1193,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuPromotion", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Latency Test 的本地化字符串。
         /// </summary>
@@ -1202,7 +1202,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuProxiesDelaytest", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Part Node Latency Test 的本地化字符串。
         /// </summary>
@@ -1211,7 +1211,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuProxiesDelaytestPart", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Refresh Proxies 的本地化字符串。
         /// </summary>
@@ -1220,7 +1220,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuProxiesReload", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Select active node (Enter) 的本地化字符串。
         /// </summary>
@@ -1229,7 +1229,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuProxiesSelectActivity", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Test Configurations real delay (Ctrl+R) 的本地化字符串。
         /// </summary>
@@ -1238,7 +1238,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRealPingServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Restart as Administrator 的本地化字符串。
         /// </summary>
@@ -1247,7 +1247,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRebootAsAdmin", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Regional presets setting 的本地化字符串。
         /// </summary>
@@ -1256,7 +1256,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRegionalPresets", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Default 的本地化字符串。
         /// </summary>
@@ -1265,7 +1265,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRegionalPresetsDefault", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Iran 的本地化字符串。
         /// </summary>
@@ -1274,7 +1274,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRegionalPresetsIran", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Russia 的本地化字符串。
         /// </summary>
@@ -1283,7 +1283,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRegionalPresetsRussia", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Reload 的本地化字符串。
         /// </summary>
@@ -1292,7 +1292,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuReload", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Backup to remote (WebDAV) 的本地化字符串。
         /// </summary>
@@ -1301,7 +1301,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRemoteBackup", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Remote (WebDAV) 的本地化字符串。
         /// </summary>
@@ -1310,7 +1310,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRemoteBackupAndRestore", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Restore from remote (WebDAV) 的本地化字符串。
         /// </summary>
@@ -1319,7 +1319,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRemoteRestore", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Remove duplicate Configurations 的本地化字符串。
         /// </summary>
@@ -1328,7 +1328,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRemoveDuplicateServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Remove invalid by test results 的本地化字符串。
         /// </summary>
@@ -1337,7 +1337,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRemoveInvalidServerResult", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Remove selected Configurations (Delete) 的本地化字符串。
         /// </summary>
@@ -1346,7 +1346,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRemoveServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Routing 的本地化字符串。
         /// </summary>
@@ -1355,7 +1355,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRouting", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Add 的本地化字符串。
         /// </summary>
@@ -1364,7 +1364,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRoutingAdvancedAdd", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Import Rules 的本地化字符串。
         /// </summary>
@@ -1373,7 +1373,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRoutingAdvancedImportRules", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Remove selected (Delete) 的本地化字符串。
         /// </summary>
@@ -1382,7 +1382,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRoutingAdvancedRemove", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Set as active rule (Enter) 的本地化字符串。
         /// </summary>
@@ -1391,7 +1391,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRoutingAdvancedSetDefault", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Routing Rule Details Setting 的本地化字符串。
         /// </summary>
@@ -1400,7 +1400,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRoutingRuleDetailsSetting", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Rule Settings 的本地化字符串。
         /// </summary>
@@ -1409,7 +1409,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRoutingRuleSetting", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Routing Setting 的本地化字符串。
         /// </summary>
@@ -1418,7 +1418,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRoutingSetting", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Add Rule 的本地化字符串。
         /// </summary>
@@ -1427,7 +1427,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRuleAdd", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Export Selected Rules 的本地化字符串。
         /// </summary>
@@ -1436,7 +1436,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRuleExportSelected", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Rule List 的本地化字符串。
         /// </summary>
@@ -1445,7 +1445,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRuleList", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Rule mode 的本地化字符串。
         /// </summary>
@@ -1454,7 +1454,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRulemode", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Remove Rule (Delete) 的本地化字符串。
         /// </summary>
@@ -1463,7 +1463,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuRuleRemove", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Select all (Ctrl+A) 的本地化字符串。
         /// </summary>
@@ -1472,7 +1472,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSelectAll", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Configurations 的本地化字符串。
         /// </summary>
@@ -1481,7 +1481,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuServers", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Multi-Configuration to custom configuration 的本地化字符串。
         /// </summary>
@@ -1490,7 +1490,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSetDefaultMultipleServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Multi-Configuration LeastPing by sing-box 的本地化字符串。
         /// </summary>
@@ -1499,7 +1499,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSetDefaultMultipleServerSingBoxLeastPing", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Multi-Configuration LeastLoad by Xray 的本地化字符串。
         /// </summary>
@@ -1508,7 +1508,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSetDefaultMultipleServerXrayLeastLoad", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Multi-Configuration LeastPing by Xray 的本地化字符串。
         /// </summary>
@@ -1517,7 +1517,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSetDefaultMultipleServerXrayLeastPing", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Multi-Configuration Random by Xray 的本地化字符串。
         /// </summary>
@@ -1526,7 +1526,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSetDefaultMultipleServerXrayRandom", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Multi-Configuration RoundRobin by Xray 的本地化字符串。
         /// </summary>
@@ -1535,7 +1535,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSetDefaultMultipleServerXrayRoundRobin", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Set as active Configuration (Enter) 的本地化字符串。
         /// </summary>
@@ -1544,7 +1544,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSetDefaultServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Settings 的本地化字符串。
         /// </summary>
@@ -1553,7 +1553,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSetting", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Share Configuration (Ctrl+F) 的本地化字符串。
         /// </summary>
@@ -1562,7 +1562,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuShareServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Show or hide the main window 的本地化字符串。
         /// </summary>
@@ -1571,7 +1571,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuShowOrHideMainWindow", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Sort by test result 的本地化字符串。
         /// </summary>
@@ -1580,7 +1580,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSortServerResult", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Test Configurations download speed (Ctrl+T) 的本地化字符串。
         /// </summary>
@@ -1589,7 +1589,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSpeedServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Add 的本地化字符串。
         /// </summary>
@@ -1598,7 +1598,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubAdd", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Delete 的本地化字符串。
         /// </summary>
@@ -1607,7 +1607,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubDelete", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Edit 的本地化字符串。
         /// </summary>
@@ -1616,7 +1616,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubEdit", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Update current subscription without proxy 的本地化字符串。
         /// </summary>
@@ -1625,7 +1625,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubGroupUpdate", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Update current subscription with proxy 的本地化字符串。
         /// </summary>
@@ -1634,7 +1634,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubGroupUpdateViaProxy", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Subscription Group 的本地化字符串。
         /// </summary>
@@ -1643,7 +1643,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubscription", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Subscription group settings 的本地化字符串。
         /// </summary>
@@ -1652,7 +1652,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubSetting", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Share 的本地化字符串。
         /// </summary>
@@ -1661,7 +1661,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubShare", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Update subscriptions without proxy 的本地化字符串。
         /// </summary>
@@ -1670,7 +1670,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubUpdate", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Update subscriptions with proxy 的本地化字符串。
         /// </summary>
@@ -1679,7 +1679,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSubUpdateViaProxy", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 System proxy 的本地化字符串。
         /// </summary>
@@ -1688,7 +1688,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSystemproxy", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Clear system proxy 的本地化字符串。
         /// </summary>
@@ -1697,7 +1697,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSystemProxyClear", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Do not change system proxy 的本地化字符串。
         /// </summary>
@@ -1706,7 +1706,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSystemProxyNothing", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 PAC mode 的本地化字符串。
         /// </summary>
@@ -1715,7 +1715,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSystemProxyPac", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Set system proxy 的本地化字符串。
         /// </summary>
@@ -1724,7 +1724,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuSystemProxySet", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Test Configurations with tcping (Ctrl+O) 的本地化字符串。
         /// </summary>
@@ -1733,7 +1733,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuTcpingServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 By test result 的本地化字符串。
         /// </summary>
@@ -1742,7 +1742,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuTestServerResult", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 {0} Website 的本地化字符串。
         /// </summary>
@@ -1751,7 +1751,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("menuWebsiteItem", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Downloaded GeoFile: {0} successfully 的本地化字符串。
         /// </summary>
@@ -1760,7 +1760,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgDownloadGeoFileSuccessfully", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Downloaded Core successfully 的本地化字符串。
         /// </summary>
@@ -1769,7 +1769,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgDownloadV2rayCoreSuccessfully", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Failed to import subscription content 的本地化字符串。
         /// </summary>
@@ -1778,7 +1778,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgFailedImportSubscription", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Filter, supports regular expressions 的本地化字符串。
         /// </summary>
@@ -1787,7 +1787,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgFilterTitle", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Got subscription content successfully 的本地化字符串。
         /// </summary>
@@ -1796,7 +1796,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgGetSubscriptionSuccessfully", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Information 的本地化字符串。
         /// </summary>
@@ -1805,7 +1805,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgInformationTitle", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please enter the URL 的本地化字符串。
         /// </summary>
@@ -1814,7 +1814,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgNeedUrl", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 No valid subscriptions set 的本地化字符串。
         /// </summary>
@@ -1823,7 +1823,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgNoValidSubscription", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Resolved {0} successfully 的本地化字符串。
         /// </summary>
@@ -1832,7 +1832,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgParsingSuccessfully", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Configuration filter, press Enter to execute 的本地化字符串。
         /// </summary>
@@ -1841,7 +1841,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgServerTitle", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Updates are not enabled, skip this subscription 的本地化字符串。
         /// </summary>
@@ -1850,7 +1850,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgSkipSubscriptionUpdate", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Started getting subscriptions 的本地化字符串。
         /// </summary>
@@ -1859,7 +1859,16 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgStartGettingSubscriptions", resourceCulture);
             }
         }
-
+        
+        /// <summary>
+        ///   查找类似 Start parsing and processing subscription content 的本地化字符串。
+        /// </summary>
+        public static string MsgStartParsingSubscription {
+            get {
+                return ResourceManager.GetString("MsgStartParsingSubscription", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Started updating {0}... 的本地化字符串。
         /// </summary>
@@ -1868,7 +1877,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgStartUpdating", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Invalid subscription content 的本地化字符串。
         /// </summary>
@@ -1877,7 +1886,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgSubscriptionDecodingFailed", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Unpacking... 的本地化字符串。
         /// </summary>
@@ -1886,7 +1895,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgUnpacking", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Subscription update ended 的本地化字符串。
         /// </summary>
@@ -1895,7 +1904,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgUpdateSubscriptionEnd", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Subscription update started 的本地化字符串。
         /// </summary>
@@ -1904,7 +1913,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgUpdateSubscriptionStart", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Updated Core successfully 的本地化字符串。
         /// </summary>
@@ -1913,7 +1922,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgUpdateV2rayCoreSuccessfully", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Updated Core successfully! Restarting service... 的本地化字符串。
         /// </summary>
@@ -1922,7 +1931,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("MsgUpdateV2rayCoreSuccessfullyMore", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Successful operation. Click the settings menu to reboot the app. 的本地化字符串。
         /// </summary>
@@ -1931,7 +1940,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("NeedRebootTips", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Non-VMess or SS protocol 的本地化字符串。
         /// </summary>
@@ -1940,7 +1949,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("NonvmessOrssProtocol", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 The Core file (file name: {1}) was not found under the folder ({0}), please download and put it in the folder, download address: {2} 的本地化字符串。
         /// </summary>
@@ -1949,7 +1958,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("NotFoundCore", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Not run as Admin 的本地化字符串。
         /// </summary>
@@ -1958,7 +1967,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("NotRunAsAdmin", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Scan completed, no valid QR code found 的本地化字符串。
         /// </summary>
@@ -1967,7 +1976,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("NoValidQRcodeFound", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Operation failed, please check and retry 的本地化字符串。
         /// </summary>
@@ -1976,7 +1985,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("OperationFailed", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Operation successful 的本地化字符串。
         /// </summary>
@@ -1985,7 +1994,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("OperationSuccess", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please fill Remarks 的本地化字符串。
         /// </summary>
@@ -1994,7 +2003,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("PleaseFillRemarks", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please select the encryption method 的本地化字符串。
         /// </summary>
@@ -2003,7 +2012,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("PleaseSelectEncryption", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please select a protocol 的本地化字符串。
         /// </summary>
@@ -2012,7 +2021,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("PleaseSelectProtocol", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please select rules 的本地化字符串。
         /// </summary>
@@ -2021,7 +2030,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("PleaseSelectRules", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please select the Configuration first 的本地化字符串。
         /// </summary>
@@ -2030,7 +2039,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("PleaseSelectServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Global hotkey {0} registration failed, reason: {1} 的本地化字符串。
         /// </summary>
@@ -2039,7 +2048,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("RegisterGlobalHotkeyFailed", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Global hotkey {0} registered successfully 的本地化字符串。
         /// </summary>
@@ -2048,7 +2057,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("RegisterGlobalHotkeySuccessfully", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Configurations deduplication completed. Old: {0}, New: {1}. 的本地化字符串。
         /// </summary>
@@ -2057,7 +2066,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("RemoveDuplicateServerResult", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Removed {0} invalid test results. 的本地化字符串。
         /// </summary>
@@ -2066,7 +2075,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("RemoveInvalidServerResultTip", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Are you sure you want to remove the rules? 的本地化字符串。
         /// </summary>
@@ -2075,7 +2084,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("RemoveRules", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Are you sure you want to remove the Configuration? 的本地化字符串。
         /// </summary>
@@ -2084,7 +2093,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("RemoveServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 {0}, one of the required fields. 的本地化字符串。
         /// </summary>
@@ -2093,7 +2102,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("RoutingRuleDetailRequiredTips", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Run as Admin 的本地化字符串。
         /// </summary>
@@ -2102,7 +2111,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("RunAsAdmin", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 The client configuration file is saved at: {0} 的本地化字符串。
         /// </summary>
@@ -2111,7 +2120,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SaveClientConfigurationIn", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 {0} : {1}/s↑ | {2}/s↓ 的本地化字符串。
         /// </summary>
@@ -2120,7 +2129,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SpeedDisplayText", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Testing... 的本地化字符串。
         /// </summary>
@@ -2129,7 +2138,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("Speedtesting", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Test completed 的本地化字符串。
         /// </summary>
@@ -2138,7 +2147,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SpeedtestingCompleted", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Skip test 的本地化字符串。
         /// </summary>
@@ -2147,7 +2156,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SpeedtestingSkip", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Test terminating... 的本地化字符串。
         /// </summary>
@@ -2156,7 +2165,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SpeedtestingStop", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Starting retesting failed parts, {0} remaining. Press ESC to terminate... 的本地化字符串。
         /// </summary>
@@ -2165,7 +2174,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SpeedtestingTestFailedPart", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Waiting for testing (press ESC to terminate)... 的本地化字符串。
         /// </summary>
@@ -2174,7 +2183,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SpeedtestingWait", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Starting service ({0})... 的本地化字符串。
         /// </summary>
@@ -2183,7 +2192,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("StartService", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 For group please leave blank here 的本地化字符串。
         /// </summary>
@@ -2192,7 +2201,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SubUrlTips", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Configuration successful. {0} 的本地化字符串。
         /// </summary>
@@ -2201,7 +2210,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SuccessfulConfiguration", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Custom configuration Configuration imported successfully 的本地化字符串。
         /// </summary>
@@ -2210,7 +2219,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SuccessfullyImportedCustomServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 {0} Configurations have been imported from clipboard 的本地化字符串。
         /// </summary>
@@ -2219,7 +2228,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SuccessfullyImportedServerViaClipboard", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Successfully scanned and imported the shared link 的本地化字符串。
         /// </summary>
@@ -2228,7 +2237,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SuccessfullyImportedServerViaScan", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Incorrect password, please try again. 的本地化字符串。
         /// </summary>
@@ -2237,7 +2246,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("SudoIncorrectPasswordTip", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Add Common DNS Hosts 的本地化字符串。
         /// </summary>
@@ -2246,7 +2255,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAddCommonDNSHosts", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Do Not Add Non-Proxy Protocol Outbound 的本地化字符串。
         /// </summary>
@@ -2255,7 +2264,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAddProxyProtocolOutboundOnly", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Address 的本地化字符串。
         /// </summary>
@@ -2264,7 +2273,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAddress", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Allow Insecure 的本地化字符串。
         /// </summary>
@@ -2273,7 +2282,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAllowInsecure", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 ALPN 的本地化字符串。
         /// </summary>
@@ -2282,7 +2291,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAlpn", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Alter ID 的本地化字符串。
         /// </summary>
@@ -2291,7 +2300,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAlterId", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Apply to Proxy Domains Only 的本地化字符串。
         /// </summary>
@@ -2300,7 +2309,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbApplyProxyDomainsOnly", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Auto refresh 的本地化字符串。
         /// </summary>
@@ -2309,7 +2318,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAutoRefresh", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Auto scroll to end 的本地化字符串。
         /// </summary>
@@ -2318,7 +2327,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAutoScrollToEnd", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Domain, IP, process are auto-sorted when saving 的本地化字符串。
         /// </summary>
@@ -2327,7 +2336,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbAutoSort", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Block SVCB and HTTPS Queries 的本地化字符串。
         /// </summary>
@@ -2336,7 +2345,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbBlockSVCBHTTPSQueries", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Prevent domain-based routing rules from failing 的本地化字符串。
         /// </summary>
@@ -2345,7 +2354,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbBlockSVCBHTTPSQueriesTips", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Browse 的本地化字符串。
         /// </summary>
@@ -2354,7 +2363,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbBrowse", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Cancel 的本地化字符串。
         /// </summary>
@@ -2363,7 +2372,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbCancel", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Clear system proxy 的本地化字符串。
         /// </summary>
@@ -2372,7 +2381,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbClearSystemProxy", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Confirm 的本地化字符串。
         /// </summary>
@@ -2381,7 +2390,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbConfirm", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Connections 的本地化字符串。
         /// </summary>
@@ -2390,7 +2399,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbConnections", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Core Type 的本地化字符串。
         /// </summary>
@@ -2399,7 +2408,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbCoreType", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Enable Custom DNS 的本地化字符串。
         /// </summary>
@@ -2408,7 +2417,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbCustomDNSEnable", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Custom DNS Enabled, This Page&apos;s Settings Invalid 的本地化字符串。
         /// </summary>
@@ -2417,7 +2426,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbCustomDNSEnabledPageInvalid", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Display GUI 的本地化字符串。
         /// </summary>
@@ -2426,7 +2435,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbDisplayGUI", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Display Log 的本地化字符串。
         /// </summary>
@@ -2435,7 +2444,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbDisplayLog", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 DNS Hosts: (&quot;domain1 ip1 ip2&quot; per line) 的本地化字符串。
         /// </summary>
@@ -2444,7 +2453,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbDNSHostsConfig", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Supports DNS Object; Click to view documentation 的本地化字符串。
         /// </summary>
@@ -2453,7 +2462,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbDnsObjectDoc", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please fill in DNS Structure, Click to view the document 的本地化字符串。
         /// </summary>
@@ -2462,7 +2471,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbDnsSingboxObjectDoc", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Domain strategy 的本地化字符串。
         /// </summary>
@@ -2471,7 +2480,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbdomainStrategy", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 sing-box domain strategy 的本地化字符串。
         /// </summary>
@@ -2480,7 +2489,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbdomainStrategy4Singbox", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Domestic DNS 的本地化字符串。
         /// </summary>
@@ -2489,7 +2498,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbDomesticDNS", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Edit 的本地化字符串。
         /// </summary>
@@ -2498,7 +2507,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbEdit", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Enable Tun 的本地化字符串。
         /// </summary>
@@ -2507,7 +2516,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbEnableTunAs", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 FakeIP 的本地化字符串。
         /// </summary>
@@ -2516,7 +2525,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbFakeIP", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Fingerprint 的本地化字符串。
         /// </summary>
@@ -2525,7 +2534,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbFingerprint", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Flow 的本地化字符串。
         /// </summary>
@@ -2534,7 +2543,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbFlow5", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core&apos;s basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you. 的本地化字符串。
         /// </summary>
@@ -2543,7 +2552,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbFullConfigTemplateDesc", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Enable Full Config Template 的本地化字符串。
         /// </summary>
@@ -2552,7 +2561,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbFullConfigTemplateEnable", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Global Hotkey Settings 的本地化字符串。
         /// </summary>
@@ -2561,7 +2570,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbGlobalHotkeySetting", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Set directly by pressing the keyboard; takes effect after restart 的本地化字符串。
         /// </summary>
@@ -2570,7 +2579,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbGlobalHotkeySettingTip", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Generate 的本地化字符串。
         /// </summary>
@@ -2579,7 +2588,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbGUID", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Camouflage type 的本地化字符串。
         /// </summary>
@@ -2588,7 +2597,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbHeaderType", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Congestion control 的本地化字符串。
         /// </summary>
@@ -2597,7 +2606,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbHeaderType8", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 UUID(id) 的本地化字符串。
         /// </summary>
@@ -2606,7 +2615,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbId", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Password 的本地化字符串。
         /// </summary>
@@ -2615,7 +2624,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbId3", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Password(Optional) 的本地化字符串。
         /// </summary>
@@ -2624,7 +2633,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbId4", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 UUID(id) 的本地化字符串。
         /// </summary>
@@ -2633,7 +2642,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbId5", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Address (IPv4, IPv6) 的本地化字符串。
         /// </summary>
@@ -2642,7 +2651,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbLocalAddress", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Mldsa65Verify 的本地化字符串。
         /// </summary>
@@ -2651,7 +2660,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbMldsa65Verify", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Transport protocol(network) 的本地化字符串。
         /// </summary>
@@ -2660,7 +2669,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbNetwork", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Do not change system proxy 的本地化字符串。
         /// </summary>
@@ -2669,7 +2678,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbNotChangeSystemProxy", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Path 的本地化字符串。
         /// </summary>
@@ -2678,7 +2687,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPath", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 obfs password 的本地化字符串。
         /// </summary>
@@ -2687,7 +2696,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPath7", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Port 的本地化字符串。
         /// </summary>
@@ -2696,7 +2705,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPort", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Configuration port range 的本地化字符串。
         /// </summary>
@@ -2705,7 +2714,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPorts7", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Will cover the port, separate with commas (,) 的本地化字符串。
         /// </summary>
@@ -2714,7 +2723,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPorts7Tips", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Socks port 的本地化字符串。
         /// </summary>
@@ -2723,7 +2732,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPreSocksPort", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Custom config socks port 的本地化字符串。
         /// </summary>
@@ -2732,7 +2741,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPreSocksPort4Sub", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Private Key 的本地化字符串。
         /// </summary>
@@ -2741,7 +2750,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPrivateKey", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Proxies 的本地化字符串。
         /// </summary>
@@ -2750,7 +2759,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbProxies", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Public Key 的本地化字符串。
         /// </summary>
@@ -2759,7 +2768,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbPublicKey", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 v2ray Full Config Template 的本地化字符串。
         /// </summary>
@@ -2768,7 +2777,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRayFullConfigTemplate", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Add Outbound Config Only, routing.balancers and routing.rules.outboundTag, Click to view the document 的本地化字符串。
         /// </summary>
@@ -2777,7 +2786,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRayFullConfigTemplateDesc", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Alias (remarks) 的本地化字符串。
         /// </summary>
@@ -2786,7 +2795,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRemarks", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Remote DNS 的本地化字符串。
         /// </summary>
@@ -2795,7 +2804,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRemoteDNS", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Camouflage domain(host) 的本地化字符串。
         /// </summary>
@@ -2804,7 +2813,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRequestHost", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Reserved (2,3,4) 的本地化字符串。
         /// </summary>
@@ -2813,7 +2822,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbReserved", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Reset 的本地化字符串。
         /// </summary>
@@ -2822,7 +2831,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbReset", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 socks: local port, socks2: second local port, socks3: LAN port 的本地化字符串。
         /// </summary>
@@ -2831,7 +2840,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRoutingInboundTagTips", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Domain 的本地化字符串。
         /// </summary>
@@ -2840,7 +2849,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRoutingRuleDomain", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 IP or IP CIDR 的本地化字符串。
         /// </summary>
@@ -2849,7 +2858,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRoutingRuleIP", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Full process name (Tun mode) 的本地化字符串。
         /// </summary>
@@ -2858,7 +2867,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRoutingRuleProcess", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Pre-defined Rule Set List 的本地化字符串。
         /// </summary>
@@ -2867,7 +2876,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRoutingTabRuleList", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 *Separate rules by commas (,); For a literal comma use &lt;COMMA&gt;; Prefix # to ignore a rule 的本地化字符串。
         /// </summary>
@@ -2876,7 +2885,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRoutingTips", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 (Domain or IP or Proc Name) and Port and Protocol and Inbound Tag =&gt; Outbound Tag 的本地化字符串。
         /// </summary>
@@ -2885,7 +2894,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRuleMatchingTips", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Rule object Doc 的本地化字符串。
         /// </summary>
@@ -2894,7 +2903,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRuleobjectDoc", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Can fill in the configuration remarks, please make sure it exist and are unique 的本地化字符串。
         /// </summary>
@@ -2903,7 +2912,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbRuleOutboundTagTip", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 sing-box Direct Resolution Strategy 的本地化字符串。
         /// </summary>
@@ -2912,7 +2921,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBDirectResolveStrategy", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 The sing-box DoH resolution server can be overwritten 的本地化字符串。
         /// </summary>
@@ -2921,7 +2930,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBDoHOverride", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 sing-box DoH Resolver Server 的本地化字符串。
         /// </summary>
@@ -2930,7 +2939,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBDoHResolverServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Fallback DNS Resolution, Suggest IP 的本地化字符串。
         /// </summary>
@@ -2939,7 +2948,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBFallbackDNSResolve", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 sing-box Full Config Template 的本地化字符串。
         /// </summary>
@@ -2948,7 +2957,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBFullConfigTemplate", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Add Outbound and Endpoint Config Only, Click to view the document 的本地化字符串。
         /// </summary>
@@ -2957,7 +2966,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBFullConfigTemplateDesc", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Resolve Outbound Domains 的本地化字符串。
         /// </summary>
@@ -2966,7 +2975,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBOutboundDomainResolve", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Outbound DNS Resolution (sing-box) 的本地化字符串。
         /// </summary>
@@ -2975,7 +2984,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBOutboundsResolverDNS", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 sing-box Remote Resolution Strategy 的本地化字符串。
         /// </summary>
@@ -2984,7 +2993,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSBRemoteResolveStrategy", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Encryption method (security) 的本地化字符串。
         /// </summary>
@@ -2993,7 +3002,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSecurity", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Encryption 的本地化字符串。
         /// </summary>
@@ -3002,7 +3011,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSecurity3", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 User(Optional) 的本地化字符串。
         /// </summary>
@@ -3011,7 +3020,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSecurity4", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Encryption 的本地化字符串。
         /// </summary>
@@ -3020,7 +3029,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSecurity5", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Set system proxy 的本地化字符串。
         /// </summary>
@@ -3029,7 +3038,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSetSystemProxy", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Click to import default DNS config 的本地化字符串。
         /// </summary>
@@ -3038,7 +3047,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingDnsImportDefConfig", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Advanced proxy settings, protocol selection (optional) 的本地化字符串。
         /// </summary>
@@ -3047,7 +3056,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsAdvancedProtocol", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Allow connections from the LAN 的本地化字符串。
         /// </summary>
@@ -3056,7 +3065,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsAllowLAN", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Auto hide on startup 的本地化字符串。
         /// </summary>
@@ -3065,7 +3074,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsAutoHideStartup", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Automatic update interval for Geo files (hours) 的本地化字符串。
         /// </summary>
@@ -3074,7 +3083,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsAutoUpdateInterval", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Users in China region can ignore this item 的本地化字符串。
         /// </summary>
@@ -3083,7 +3092,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsChinaUserTip", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Color 的本地化字符串。
         /// </summary>
@@ -3092,7 +3101,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsColor", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Core: basic settings 的本地化字符串。
         /// </summary>
@@ -3101,7 +3110,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsCore", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 V2ray DNS settings 的本地化字符串。
         /// </summary>
@@ -3110,7 +3119,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsCoreDns", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 sing-box DNS settings 的本地化字符串。
         /// </summary>
@@ -3119,7 +3128,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsCoreDnsSingbox", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Core: KCP settings 的本地化字符串。
         /// </summary>
@@ -3128,7 +3137,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsCoreKcp", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Core Type settings 的本地化字符串。
         /// </summary>
@@ -3137,7 +3146,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsCoreType", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Font family (requires restart) 的本地化字符串。
         /// </summary>
@@ -3146,7 +3155,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsCurrentFontFamily", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Install the font to the system, select or fill in the font name, restart the settings 的本地化字符串。
         /// </summary>
@@ -3155,7 +3164,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsCurrentFontFamilyLinuxTip", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Copy the font TTF/TTC file to the directory gui Fonts; Reopen the settings window 的本地化字符串。
         /// </summary>
@@ -3164,7 +3173,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsCurrentFontFamilyTip", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Allow Insecure 的本地化字符串。
         /// </summary>
@@ -3173,7 +3182,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDefAllowInsecure", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Default TLS fingerprint 的本地化字符串。
         /// </summary>
@@ -3182,7 +3191,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDefFingerprint", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 User-Agent 的本地化字符串。
         /// </summary>
@@ -3191,7 +3200,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDefUserAgent", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 This parameter is valid only for tcp/http and ws 的本地化字符串。
         /// </summary>
@@ -3200,7 +3209,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDefUserAgentTips", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Sniffing type 的本地化字符串。
         /// </summary>
@@ -3209,7 +3218,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDestOverride", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Display real-time speed (requires restart) 的本地化字符串。
         /// </summary>
@@ -3218,7 +3227,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDisplayRealTimeSpeed", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Outbound DNS address 的本地化字符串。
         /// </summary>
@@ -3227,7 +3236,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDomainDNSAddress", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Outbound Freedom domain Strategy 的本地化字符串。
         /// </summary>
@@ -3236,7 +3245,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDomainStrategy4Freedom", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Default domain strategy for outbound 的本地化字符串。
         /// </summary>
@@ -3245,7 +3254,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDomainStrategy4Out", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Double-clicking Configuration makes it active 的本地化字符串。
         /// </summary>
@@ -3254,7 +3263,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsDoubleClick2Activate", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Automatically adjust column width after subscription update 的本地化字符串。
         /// </summary>
@@ -3263,7 +3272,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableAutoAdjustMainLvColWidth", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Enable cache file for sing-box (ruleset files) 的本地化字符串。
         /// </summary>
@@ -3272,7 +3281,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableCacheFile4Sbox", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Check for pre-release updates 的本地化字符串。
         /// </summary>
@@ -3281,7 +3290,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableCheckPreReleaseUpdate", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Enable sorting Configurations by drag-n-drop (requires restart) 的本地化字符串。
         /// </summary>
@@ -3290,7 +3299,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableDragDropSort", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Enable additional Inbound 的本地化字符串。
         /// </summary>
@@ -3299,7 +3308,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableExInbound", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Enable fragment 的本地化字符串。
         /// </summary>
@@ -3308,7 +3317,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableFragment", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 which conflicts with the group previous proxy 的本地化字符串。
         /// </summary>
@@ -3317,7 +3326,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableFragmentTips", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Enable hardware acceleration (requires restart) 的本地化字符串。
         /// </summary>
@@ -3326,7 +3335,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableHWA", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Enable IPv6 Address 的本地化字符串。
         /// </summary>
@@ -3335,7 +3344,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableIPv6Address", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Updating subscription, only determining if remarks exist 的本地化字符串。
         /// </summary>
@@ -3344,7 +3353,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableUpdateSubOnlyRemarksExist", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Exception 的本地化字符串。
         /// </summary>
@@ -3353,7 +3362,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsException", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Exclusions: Do not use proxy server for addresses beginning with the following. Use semicolon (;) to separate entries. 的本地化字符串。
         /// </summary>
@@ -3362,7 +3371,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsExceptionTip", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Exclusions: Do not use proxy server for the following addresses. Use comma (,) to separate entries. 的本地化字符串。
         /// </summary>
@@ -3371,7 +3380,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsExceptionTip2", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Font Size 的本地化字符串。
         /// </summary>
@@ -3380,7 +3389,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsFontSize", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Geo files source (optional) 的本地化字符串。
         /// </summary>
@@ -3389,7 +3398,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsGeoFilesSource", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Hide to tray when closing the window 的本地化字符串。
         /// </summary>
@@ -3398,7 +3407,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsHide2TrayWhenClose", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Hysteria Max bandwidth (Up/Down) 的本地化字符串。
         /// </summary>
@@ -3407,7 +3416,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsHysteriaBandwidth", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Current connection info test URL 的本地化字符串。
         /// </summary>
@@ -3416,7 +3425,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsIPAPIUrl", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Keep older entries when de-duplicating 的本地化字符串。
         /// </summary>
@@ -3425,7 +3434,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsKeepOlderDedupl", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Language (Restart) 的本地化字符串。
         /// </summary>
@@ -3434,7 +3443,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsLanguage", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 System sudo password 的本地化字符串。
         /// </summary>
@@ -3443,7 +3452,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsLinuxSudoPassword", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 The password will be validated via the command line. If a validation error causes the application to malfunction, please restart the application. The password will not be stored and must be entered again after each restart. 的本地化字符串。
         /// </summary>
@@ -3452,7 +3461,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsLinuxSudoPasswordTip", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Enable Log 的本地化字符串。
         /// </summary>
@@ -3461,7 +3470,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsLogEnabled", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Enable logging to file 的本地化字符串。
         /// </summary>
@@ -3470,7 +3479,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsLogEnabledToFile", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Log Level 的本地化字符串。
         /// </summary>
@@ -3479,7 +3488,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsLogLevel", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Main layout orientation (requires restart) 的本地化字符串。
         /// </summary>
@@ -3488,7 +3497,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsMainGirdOrientation", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 The number of concurrent tests during multi-test 的本地化字符串。
         /// </summary>
@@ -3497,7 +3506,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsMixedConcurrencyCount", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 sing-box Mux Protocol 的本地化字符串。
         /// </summary>
@@ -3506,7 +3515,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsMux4SboxProtocol", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Turn on Mux Multiplexing 的本地化字符串。
         /// </summary>
@@ -3515,7 +3524,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsMuxEnabled", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 v2rayN settings 的本地化字符串。
         /// </summary>
@@ -3524,7 +3533,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsN", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 New Port for LAN 的本地化字符串。
         /// </summary>
@@ -3533,7 +3542,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsNewPort4LAN", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Do not use proxy servers for local (intranet) addresses 的本地化字符串。
         /// </summary>
@@ -3542,7 +3551,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsNotProxyLocalAddress", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Auth pass 的本地化字符串。
         /// </summary>
@@ -3551,7 +3560,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsPass", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Custom DNS (multiple, separated by commas (,)) 的本地化字符串。
         /// </summary>
@@ -3560,7 +3569,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsRemoteDNS", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Route Only 的本地化字符串。
         /// </summary>
@@ -3569,7 +3578,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsRouteOnly", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Routing rules source (optional) 的本地化字符串。
         /// </summary>
@@ -3578,7 +3587,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsRoutingRulesSource", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Enable second mixed port 的本地化字符串。
         /// </summary>
@@ -3587,7 +3596,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSecondLocalPortEnabled", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Set Win10 UWP Loopback 的本地化字符串。
         /// </summary>
@@ -3596,7 +3605,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSetUWP", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Turn on Sniffing 的本地化字符串。
         /// </summary>
@@ -3605,7 +3614,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSniffingEnabled", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Mixed Port 的本地化字符串。
         /// </summary>
@@ -3614,7 +3623,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSocksPort", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Pac port = +3; Xray API port = +4; mihomo API port = +5; 的本地化字符串。
         /// </summary>
@@ -3623,7 +3632,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSocksPortTip", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Speed Ping Test URL 的本地化字符串。
         /// </summary>
@@ -3632,7 +3641,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSpeedPingTestUrl", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Speed Test Single Timeout Value 的本地化字符串。
         /// </summary>
@@ -3641,7 +3650,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSpeedTestTimeout", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Speed Test URL 的本地化字符串。
         /// </summary>
@@ -3650,7 +3659,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSpeedTestUrl", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 sing-box ruleset files source (optional) 的本地化字符串。
         /// </summary>
@@ -3659,7 +3668,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSrsFilesSource", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Start on boot 的本地化字符串。
         /// </summary>
@@ -3668,7 +3677,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsStartBoot", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Set this with admin privileges, get admin privileges after startup 的本地化字符串。
         /// </summary>
@@ -3677,7 +3686,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsStartBootTip", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Enable traffic statistics (requires restart) 的本地化字符串。
         /// </summary>
@@ -3686,7 +3695,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsStatistics", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Subscription conversion URL 的本地化字符串。
         /// </summary>
@@ -3695,7 +3704,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSubConvert", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 System proxy settings 的本地化字符串。
         /// </summary>
@@ -3704,7 +3713,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsSystemproxy", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Theme 的本地化字符串。
         /// </summary>
@@ -3713,7 +3722,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsTheme", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Enable Security Protocol TLS v1.3 (subscription/update) 的本地化字符串。
         /// </summary>
@@ -3722,7 +3731,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsTLS13", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Tray right-click menu Configurations display limit 的本地化字符串。
         /// </summary>
@@ -3731,35 +3740,16 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsTrayMenuServersLimit", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Auto Route 的本地化字符串。
         /// </summary>
         public static string TbSettingsTunAutoRoute {
-            get { return ResourceManager.GetString("TbSettingsTunAutoRoute", resourceCulture); }
+            get {
+                return ResourceManager.GetString("TbSettingsTunAutoRoute", resourceCulture);
+            }
         }
-
-        /// <summary>
-        ///   查找类似 Strict Route 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsTunStrictRoute {
-            get { return ResourceManager.GetString("TbSettingsTunStrictRoute", resourceCulture); }
-        }
-
-        /// <summary>
-        ///   查找类似 Stack 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsTunStack {
-            get { return ResourceManager.GetString("TbSettingsTunStack", resourceCulture); }
-        }
-
-        /// <summary>
-        ///   查找类似 MTU 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsTunMtu {
-            get { return ResourceManager.GetString("TbSettingsTunMtu", resourceCulture); }
-        }
-
+        
         /// <summary>
         ///   查找类似 Tun Mode settings 的本地化字符串。
         /// </summary>
@@ -3768,7 +3758,34 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsTunMode", resourceCulture);
             }
         }
-
+        
+        /// <summary>
+        ///   查找类似 MTU 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTunMtu {
+            get {
+                return ResourceManager.GetString("TbSettingsTunMtu", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Stack 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTunStack {
+            get {
+                return ResourceManager.GetString("TbSettingsTunStack", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Strict Route 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTunStrictRoute {
+            get {
+                return ResourceManager.GetString("TbSettingsTunStrictRoute", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Enable UDP 的本地化字符串。
         /// </summary>
@@ -3777,7 +3794,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsUdpEnabled", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Auth user 的本地化字符串。
         /// </summary>
@@ -3786,7 +3803,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsUser", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Use System Hosts 的本地化字符串。
         /// </summary>
@@ -3795,7 +3812,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsUseSystemHosts", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Set Upstream Proxy Tag 的本地化字符串。
         /// </summary>
@@ -3804,7 +3821,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSetUpstreamProxyDetour", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Short Id 的本地化字符串。
         /// </summary>
@@ -3813,7 +3830,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbShortId", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 SNI 的本地化字符串。
         /// </summary>
@@ -3822,7 +3839,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSNI", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Sorting 的本地化字符串。
         /// </summary>
@@ -3831,7 +3848,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSorting", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Chain 的本地化字符串。
         /// </summary>
@@ -3840,7 +3857,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingChain", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Default 的本地化字符串。
         /// </summary>
@@ -3849,7 +3866,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingDefault", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Delay 的本地化字符串。
         /// </summary>
@@ -3858,7 +3875,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingDelay", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Download Speed 的本地化字符串。
         /// </summary>
@@ -3867,7 +3884,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingDownSpeed", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Download Traffic 的本地化字符串。
         /// </summary>
@@ -3876,7 +3893,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingDownTraffic", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Host 的本地化字符串。
         /// </summary>
@@ -3885,7 +3902,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingHost", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Name 的本地化字符串。
         /// </summary>
@@ -3894,7 +3911,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingName", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Network 的本地化字符串。
         /// </summary>
@@ -3903,7 +3920,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingNetwork", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Time 的本地化字符串。
         /// </summary>
@@ -3912,7 +3929,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingTime", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Type 的本地化字符串。
         /// </summary>
@@ -3921,7 +3938,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingType", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Upload Speed 的本地化字符串。
         /// </summary>
@@ -3930,7 +3947,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingUpSpeed", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Upload Traffic 的本地化字符串。
         /// </summary>
@@ -3939,7 +3956,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSortingUpTraffic", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Spider X 的本地化字符串。
         /// </summary>
@@ -3948,7 +3965,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSpiderX", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 TLS 的本地化字符串。
         /// </summary>
@@ -3957,7 +3974,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbStreamSecurity", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 PAC mode 的本地化字符串。
         /// </summary>
@@ -3966,7 +3983,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSystemProxyPac", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Validate Regional Domain IPs 的本地化字符串。
         /// </summary>
@@ -3975,7 +3992,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbValidateDirectExpectedIPs", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs 的本地化字符串。
         /// </summary>
@@ -3984,7 +4001,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbValidateDirectExpectedIPsDesc", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 xray Freedom Resolution Strategy 的本地化字符串。
         /// </summary>
@@ -3993,7 +4010,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbXrayFreedomResolveStrategy", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 The delay: {0} ms, {1} 的本地化字符串。
         /// </summary>
@@ -4002,7 +4019,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TestMeOutput", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Advanced DNS Settings 的本地化字符串。
         /// </summary>
@@ -4011,7 +4028,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("ThAdvancedDNSSettings", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Basic DNS Settings 的本地化字符串。
         /// </summary>
@@ -4020,7 +4037,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("ThBasicDNSSettings", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Active 的本地化字符串。
         /// </summary>
@@ -4029,7 +4046,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TipActiveServer", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Routing setting has changed 的本地化字符串。
         /// </summary>
@@ -4038,7 +4055,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TipChangeRouting", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 System proxy setting has changed 的本地化字符串。
         /// </summary>
@@ -4047,7 +4064,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TipChangeSystemProxy", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Please turn off when there is an abnormal disconnection 的本地化字符串。
         /// </summary>
@@ -4056,7 +4073,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TipDisplayLog", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 *Default value tcp 的本地化字符串。
         /// </summary>
@@ -4065,7 +4082,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TipNetwork", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 * After setting this value, a socks service will be started using Xray/sing-box(Tun) to provide functions such as speed display 的本地化字符串。
         /// </summary>
@@ -4074,7 +4091,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TipPreSocksPort", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 XHTTP Extra raw JSON, format: { XHTTP Object } 的本地化字符串。
         /// </summary>
@@ -4083,7 +4100,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportExtraTip", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 *tcp camouflage type 的本地化字符串。
         /// </summary>
@@ -4092,7 +4109,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportHeaderTypeTip1", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 *kcp camouflage type 的本地化字符串。
         /// </summary>
@@ -4101,7 +4118,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportHeaderTypeTip2", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 *QUIC camouflage type 的本地化字符串。
         /// </summary>
@@ -4110,7 +4127,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportHeaderTypeTip3", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 *grpc mode 的本地化字符串。
         /// </summary>
@@ -4119,7 +4136,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportHeaderTypeTip4", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 *xhttp mode 的本地化字符串。
         /// </summary>
@@ -4128,7 +4145,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportHeaderTypeTip5", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 *ws/http upgrade/xhttp path 的本地化字符串。
         /// </summary>
@@ -4137,7 +4154,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportPathTip1", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 *h2 path 的本地化字符串。
         /// </summary>
@@ -4146,7 +4163,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportPathTip2", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 *QUIC key/KCP seed 的本地化字符串。
         /// </summary>
@@ -4155,7 +4172,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportPathTip3", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 *grpc service name 的本地化字符串。
         /// </summary>
@@ -4164,7 +4181,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportPathTip4", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 *kcp seed 的本地化字符串。
         /// </summary>
@@ -4173,7 +4190,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportPathTip5", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 *http host separated by commas (,) 的本地化字符串。
         /// </summary>
@@ -4182,7 +4199,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportRequestHostTip1", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 *ws/http upgrade/xhttp host 的本地化字符串。
         /// </summary>
@@ -4191,7 +4208,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportRequestHostTip2", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 *h2 host separated by commas (,) 的本地化字符串。
         /// </summary>
@@ -4200,7 +4217,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportRequestHostTip3", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 *QUIC security 的本地化字符串。
         /// </summary>
@@ -4209,7 +4226,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportRequestHostTip4", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 *grpc Authority 的本地化字符串。
         /// </summary>
@@ -4218,7 +4235,7 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TransportRequestHostTip5", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   查找类似 Upgrade App does not exist 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
index cd15f976..302c91c4 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1509,4 +1509,7 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
   </data>
-</root>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>Start parsing and processing subscription content</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
index 8f451953..8f6079fd 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1509,4 +1509,7 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
   </data>
-</root>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>Start parsing and processing subscription content</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index 104a3925..05bcf901 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1509,4 +1509,7 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
   </data>
-</root>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>Start parsing and processing subscription content</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
index 2b02e3ed..fd2f5400 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1509,4 +1509,7 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>Эта функция предназначена для продвинутых пользователей и особых случаев. После включения игнорируются базовые настройки ядра, DNS и маршрутизации. Вы должны самостоятельно корректно задать порт системного прокси, учёт трафика и другие связанные параметры — всё настраивается вручную.</value>
   </data>
-</root>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>Start parsing and processing subscription content</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index ff9035d3..7176222a 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1506,4 +1506,7 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>此功能供高级用户和有特殊需求的用户使用。 启用此功能后，将忽略 Core 的基础设置，DNS 设置 ，路由设置。你需要保证系统代理的端口和流量统计等功能的配置正确，一切都由你来设置。</value>
   </data>
-</root>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>开始解析和处理订阅内容</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index 34a90e21..58239c8c 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1506,4 +1506,7 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
   </data>
-</root>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>開始解析和處理訂閱內容</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index e04f6230..c297ffc5 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -477,7 +477,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     public async Task UpdateSubscriptionProcess(string subId, bool blProxy)
     {
-        await SubscriptionHandler.UpdateProcess(_config, subId, blProxy, UpdateTaskHandler);
+        await Task.Run(async () => await SubscriptionHandler.UpdateProcess(_config, subId, blProxy, UpdateTaskHandler));
     }
 
     #endregion Subscription

From 8f93c501510456885a96504e2d777afcce2c8183 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 27 Aug 2025 17:22:13 +0800
Subject: [PATCH 081/115] Bug fix

---
 .../Services/CoreConfig/Singbox/SingboxInboundService.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxInboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxInboundService.cs
index c79d5b42..91f76ad9 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxInboundService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxInboundService.cs
@@ -10,7 +10,7 @@ public partial class CoreConfigSingboxService
             singboxConfig.inbounds = [];
 
             if (!_config.TunModeItem.EnableTun
-                || _config.TunModeItem.EnableTun && _config.TunModeItem.EnableExInbound && _config.RunningCoreType == ECoreType.sing_box)
+                || (_config.TunModeItem.EnableTun && _config.TunModeItem.EnableExInbound && _config.RunningCoreType == ECoreType.sing_box))
             {
                 var inbound = new Inbound4Sbox()
                 {
@@ -78,7 +78,7 @@ public partial class CoreConfigSingboxService
         {
             Logging.SaveLog(_tag, ex);
         }
-        return 0;
+        return await Task.FromResult(0);
     }
 
     private Inbound4Sbox GetInbound(Inbound4Sbox inItem, EInboundProtocol protocol, bool bSocks)

From abdafc9b3be60cc26a0a09b206384f37b31d01d3 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 27 Aug 2025 20:29:16 +0800
Subject: [PATCH 082/115] up 7.14.4

---
 v2rayN/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/Directory.Build.props b/v2rayN/Directory.Build.props
index 6c954fe4..589eb889 100644
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.14.3</Version>
+        <Version>7.14.4</Version>
     </PropertyGroup>
 
     <PropertyGroup>

From f83e83de13cb9f9ea5a7b51b4169cbcc9dc60352 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 29 Aug 2025 09:49:30 +0800
Subject: [PATCH 083/115] Optimization and Improvement

Changed callback from synchronous Action<bool, string> to asynchronous Func<bool, string, Task>
---
 v2rayN/ServiceLib/Manager/CoreAdminManager.cs | 12 +++----
 v2rayN/ServiceLib/Manager/CoreManager.cs      | 32 +++++++++----------
 .../ViewModels/MainWindowViewModel.cs         |  4 +--
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/v2rayN/ServiceLib/Manager/CoreAdminManager.cs b/v2rayN/ServiceLib/Manager/CoreAdminManager.cs
index 5ba1747b..90b47106 100644
--- a/v2rayN/ServiceLib/Manager/CoreAdminManager.cs
+++ b/v2rayN/ServiceLib/Manager/CoreAdminManager.cs
@@ -10,11 +10,11 @@ public class CoreAdminManager
     private static readonly Lazy<CoreAdminManager> _instance = new(() => new());
     public static CoreAdminManager Instance => _instance.Value;
     private Config _config;
-    private Action<bool, string>? _updateFunc;
+    private Func<bool, string, Task>? _updateFunc;
     private int _linuxSudoPid = -1;
     private const string _tag = "CoreAdminHandler";
 
-    public async Task Init(Config config, Action<bool, string> updateFunc)
+    public async Task Init(Config config, Func<bool, string, Task> updateFunc)
     {
         if (_config != null)
         {
@@ -26,9 +26,9 @@ public class CoreAdminManager
         await Task.CompletedTask;
     }
 
-    private void UpdateFunc(bool notify, string msg)
+    private async Task UpdateFunc(bool notify, string msg)
     {
-        _updateFunc?.Invoke(notify, msg);
+        await _updateFunc?.Invoke(notify, msg);
     }
 
     public async Task<Process?> RunProcessAsLinuxSudo(string fileName, CoreInfo coreInfo, string configPath)
@@ -60,7 +60,7 @@ public class CoreAdminManager
         {
             if (e.Data.IsNotEmpty())
             {
-                UpdateFunc(false, e.Data + Environment.NewLine);
+                _ = UpdateFunc(false, e.Data + Environment.NewLine);
             }
         }
 
@@ -106,7 +106,7 @@ public class CoreAdminManager
                 .WithStandardInputPipe(PipeSource.FromString(AppManager.Instance.LinuxSudoPwd))
                 .ExecuteBufferedAsync();
 
-            UpdateFunc(false, result.StandardOutput.ToString());
+            await UpdateFunc(false, result.StandardOutput.ToString());
         }
         catch (Exception ex)
         {
diff --git a/v2rayN/ServiceLib/Manager/CoreManager.cs b/v2rayN/ServiceLib/Manager/CoreManager.cs
index 74cdaf91..695508c2 100644
--- a/v2rayN/ServiceLib/Manager/CoreManager.cs
+++ b/v2rayN/ServiceLib/Manager/CoreManager.cs
@@ -14,10 +14,10 @@ public class CoreManager
     private Process? _process;
     private Process? _processPre;
     private bool _linuxSudo = false;
-    private Action<bool, string>? _updateFunc;
+    private Func<bool, string, Task>? _updateFunc;
     private const string _tag = "CoreHandler";
 
-    public async Task Init(Config config, Action<bool, string> updateFunc)
+    public async Task Init(Config config, Func<bool, string, Task> updateFunc)
     {
         _config = config;
         _updateFunc = updateFunc;
@@ -63,7 +63,7 @@ public class CoreManager
     {
         if (node == null)
         {
-            UpdateFunc(false, ResUI.CheckServerSettings);
+            await UpdateFunc(false, ResUI.CheckServerSettings);
             return;
         }
 
@@ -71,13 +71,13 @@ public class CoreManager
         var result = await CoreConfigHandler.GenerateClientConfig(node, fileName);
         if (result.Success != true)
         {
-            UpdateFunc(true, result.Msg);
+            await UpdateFunc(true, result.Msg);
             return;
         }
 
-        UpdateFunc(false, $"{node.GetSummary()}");
-        UpdateFunc(false, $"{Utils.GetRuntimeInfo()}");
-        UpdateFunc(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
+        await UpdateFunc(false, $"{node.GetSummary()}");
+        await UpdateFunc(false, $"{Utils.GetRuntimeInfo()}");
+        await UpdateFunc(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
         await CoreStop();
         await Task.Delay(100);
 
@@ -91,7 +91,7 @@ public class CoreManager
         await CoreStartPreService(node);
         if (_process != null)
         {
-            UpdateFunc(true, $"{node.GetSummary()}");
+            await UpdateFunc(true, $"{node.GetSummary()}");
         }
     }
 
@@ -101,14 +101,14 @@ public class CoreManager
         var fileName = string.Format(Global.CoreSpeedtestConfigFileName, Utils.GetGuid(false));
         var configPath = Utils.GetBinConfigPath(fileName);
         var result = await CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType);
-        UpdateFunc(false, result.Msg);
+        await UpdateFunc(false, result.Msg);
         if (result.Success != true)
         {
             return -1;
         }
 
-        UpdateFunc(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
-        UpdateFunc(false, configPath);
+        await UpdateFunc(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
+        await UpdateFunc(false, configPath);
 
         var coreInfo = CoreInfoManager.Instance.GetCoreInfo(coreType);
         var proc = await RunProcess(coreInfo, fileName, true, false);
@@ -216,9 +216,9 @@ public class CoreManager
         }
     }
 
-    private void UpdateFunc(bool notify, string msg)
+    private async Task UpdateFunc(bool notify, string msg)
     {
-        _updateFunc?.Invoke(notify, msg);
+        await _updateFunc?.Invoke(notify, msg);
     }
 
     #endregion Private
@@ -230,7 +230,7 @@ public class CoreManager
         var fileName = CoreInfoManager.Instance.GetCoreExecFile(coreInfo, out var msg);
         if (fileName.IsNullOrEmpty())
         {
-            UpdateFunc(false, msg);
+            await UpdateFunc(false, msg);
             return null;
         }
 
@@ -251,7 +251,7 @@ public class CoreManager
         catch (Exception ex)
         {
             Logging.SaveLog(_tag, ex);
-            UpdateFunc(mayNeedSudo, ex.Message);
+            await UpdateFunc(mayNeedSudo, ex.Message);
             return null;
         }
     }
@@ -284,7 +284,7 @@ public class CoreManager
             {
                 if (e.Data.IsNotEmpty())
                 {
-                    UpdateFunc(false, e.Data + Environment.NewLine);
+                    _ = UpdateFunc(false, e.Data + Environment.NewLine);
                 }
             }
             proc.OutputDataReceived += dataHandler;
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index c297ffc5..f272b9f9 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -245,7 +245,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     #region Actions
 
-    private void UpdateHandler(bool notify, string msg)
+    private async Task UpdateHandler(bool notify, string msg)
     {
         NoticeManager.Instance.SendMessage(msg);
         if (notify)
@@ -631,7 +631,7 @@ public class MainWindowViewModel : MyReactiveObject
         Locator.Current.GetService<StatusBarViewModel>()?.RefreshRoutingsMenu();
 
         await ConfigHandler.SaveConfig(_config);
-        await new UpdateService().UpdateGeoFileAll(_config, UpdateHandler);
+        await new UpdateService().UpdateGeoFileAll(_config, UpdateTaskHandler);
         await Reload();
     }
 

From f39d966a332dea959ca0b864ca8938c7dee4139d Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 29 Aug 2025 10:31:09 +0800
Subject: [PATCH 084/115] Optimization and Improvement.

Changed callback from synchronous Action<bool, string> to asynchronous Func<bool, string, Task>
---
 .../ServiceLib/Handler/SubscriptionHandler.cs | 43 +++++++++++--------
 v2rayN/ServiceLib/Manager/TaskManager.cs      | 33 ++++++++------
 .../ViewModels/MainWindowViewModel.cs         | 10 +++--
 3 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs b/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
index 03d97f13..4edd6c72 100644
--- a/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
+++ b/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
@@ -2,17 +2,18 @@ namespace ServiceLib.Handler;
 
 public static class SubscriptionHandler
 {
-    public static async Task UpdateProcess(Config config, string subId, bool blProxy, Action<bool, string> updateFunc)
+    public static async Task UpdateProcess(Config config, string subId, bool blProxy, Func<bool, string, Task> updateFunc)
     {
-        updateFunc?.Invoke(false, ResUI.MsgUpdateSubscriptionStart);
+        await updateFunc?.Invoke(false, ResUI.MsgUpdateSubscriptionStart);
         var subItem = await AppManager.Instance.SubItems();
 
         if (subItem is not { Count: > 0 })
         {
-            updateFunc?.Invoke(false, ResUI.MsgNoValidSubscription);
+            await updateFunc?.Invoke(false, ResUI.MsgNoValidSubscription);
             return;
         }
 
+        var successCount = 0;
         foreach (var item in subItem)
         {
             try
@@ -25,32 +26,35 @@ public static class SubscriptionHandler
                 var hashCode = $"{item.Remarks}->";
                 if (item.Enabled == false)
                 {
-                    updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSkipSubscriptionUpdate}");
+                    await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSkipSubscriptionUpdate}");
                     continue;
                 }
 
                 // Create download handler
                 var downloadHandle = CreateDownloadHandler(hashCode, updateFunc);
-                updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
+                await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
 
                 // Get all subscription content (main subscription + additional subscriptions)
                 var result = await DownloadAllSubscriptions(config, item, blProxy, downloadHandle);
 
                 // Process download result
-                await ProcessDownloadResult(config, item.Id, result, hashCode, updateFunc);
+                if (await ProcessDownloadResult(config, item.Id, result, hashCode, updateFunc))
+                {
+                    successCount++;
+                }
 
-                updateFunc?.Invoke(false, "-------------------------------------------------------");
+                await updateFunc?.Invoke(false, "-------------------------------------------------------");
             }
             catch (Exception ex)
             {
                 var hashCode = $"{item.Remarks}->";
                 Logging.SaveLog("UpdateSubscription", ex);
-                updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgFailedImportSubscription}: {ex.Message}");
-                updateFunc?.Invoke(false, "-------------------------------------------------------");
+                await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgFailedImportSubscription}: {ex.Message}");
+                await updateFunc?.Invoke(false, "-------------------------------------------------------");
             }
         }
 
-        updateFunc?.Invoke(true, $"{ResUI.MsgUpdateSubscriptionEnd}");
+        await updateFunc?.Invoke(successCount > 0, $"{ResUI.MsgUpdateSubscriptionEnd}");
     }
 
     private static bool IsValidSubscription(SubItem item, string subId)
@@ -76,7 +80,7 @@ public static class SubscriptionHandler
         return true;
     }
 
-    private static DownloadService CreateDownloadHandler(string hashCode, Action<bool, string> updateFunc)
+    private static DownloadService CreateDownloadHandler(string hashCode, Func<bool, string, Task> updateFunc)
     {
         var downloadHandle = new DownloadService();
         downloadHandle.Error += (sender2, args) =>
@@ -181,23 +185,23 @@ public static class SubscriptionHandler
         return result;
     }
 
-    private static async Task ProcessDownloadResult(Config config, string id, string result, string hashCode, Action<bool, string> updateFunc)
+    private static async Task<bool> ProcessDownloadResult(Config config, string id, string result, string hashCode, Func<bool, string, Task> updateFunc)
     {
         if (result.IsNullOrEmpty())
         {
-            updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
-            return;
+            await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
+            return false;
         }
 
-        updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
+        await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
 
         // If result is too short, display content directly
         if (result.Length < 99)
         {
-            updateFunc?.Invoke(false, $"{hashCode}{result}");
+            await updateFunc?.Invoke(false, $"{hashCode}{result}");
         }
 
-        updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartParsingSubscription}");
+        await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartParsingSubscription}");
 
         // Add servers to configuration
         var ret = await ConfigHandler.AddBatchServers(config, result, id, true);
@@ -208,9 +212,10 @@ public static class SubscriptionHandler
         }
 
         // Update completion message
-        updateFunc?.Invoke(false,
-            ret > 0
+        await updateFunc?.Invoke(false, ret > 0
                 ? $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}"
                 : $"{hashCode}{ResUI.MsgFailedImportSubscription}");
+
+        return ret > 0;
     }
 }
diff --git a/v2rayN/ServiceLib/Manager/TaskManager.cs b/v2rayN/ServiceLib/Manager/TaskManager.cs
index b968dc16..d9e5cd76 100644
--- a/v2rayN/ServiceLib/Manager/TaskManager.cs
+++ b/v2rayN/ServiceLib/Manager/TaskManager.cs
@@ -4,13 +4,18 @@ public class TaskManager
 {
     private static readonly Lazy<TaskManager> _instance = new(() => new());
     public static TaskManager Instance => _instance.Value;
+    private Config _config;
+    private Func<bool, string, Task>? _updateFunc;
 
-    public void RegUpdateTask(Config config, Action<bool, string> updateFunc)
+    public void RegUpdateTask(Config config, Func<bool, string, Task> updateFunc)
     {
-        Task.Run(() => ScheduledTasks(config, updateFunc));
+        _config = config;
+        _updateFunc = updateFunc;
+
+        Task.Run(ScheduledTasks);
     }
 
-    private async Task ScheduledTasks(Config config, Action<bool, string> updateFunc)
+    private async Task ScheduledTasks()
     {
         Logging.SaveLog("Setup Scheduled Tasks");
 
@@ -21,14 +26,14 @@ public class TaskManager
             await Task.Delay(1000 * 60);
 
             //Execute once 1 minute
-            await UpdateTaskRunSubscription(config, updateFunc);
+            await UpdateTaskRunSubscription();
 
             //Execute once 20 minute
             if (numOfExecuted % 20 == 0)
             {
                 //Logging.SaveLog("Execute save config");
 
-                await ConfigHandler.SaveConfig(config);
+                await ConfigHandler.SaveConfig(_config);
                 await ProfileExManager.Instance.SaveTo();
             }
 
@@ -42,14 +47,14 @@ public class TaskManager
                 FileManager.DeleteExpiredFiles(Utils.GetTempPath(), DateTime.Now.AddMonths(-1));
 
                 //Check once 1 hour
-                await UpdateTaskRunGeo(config, numOfExecuted / 60, updateFunc);
+                await UpdateTaskRunGeo(numOfExecuted / 60);
             }
 
             numOfExecuted++;
         }
     }
 
-    private async Task UpdateTaskRunSubscription(Config config, Action<bool, string> updateFunc)
+    private async Task UpdateTaskRunSubscription()
     {
         var updateTime = ((DateTimeOffset)DateTime.Now).ToUnixTimeSeconds();
         var lstSubs = (await AppManager.Instance.SubItems())?
@@ -66,30 +71,30 @@ public class TaskManager
 
         foreach (var item in lstSubs)
         {
-            await SubscriptionHandler.UpdateProcess(config, item.Id, true, (success, msg) =>
+            await SubscriptionHandler.UpdateProcess(_config, item.Id, true, async (success, msg) =>
             {
-                updateFunc?.Invoke(success, msg);
+                await _updateFunc?.Invoke(success, msg);
                 if (success)
                 {
                     Logging.SaveLog($"Update subscription end. {msg}");
                 }
             });
             item.UpdateTime = updateTime;
-            await ConfigHandler.AddSubItem(config, item);
+            await ConfigHandler.AddSubItem(_config, item);
             await Task.Delay(1000);
         }
     }
 
-    private async Task UpdateTaskRunGeo(Config config, int hours, Action<bool, string> updateFunc)
+    private async Task UpdateTaskRunGeo(int hours)
     {
-        if (config.GuiItem.AutoUpdateInterval > 0 && hours > 0 && hours % config.GuiItem.AutoUpdateInterval == 0)
+        if (_config.GuiItem.AutoUpdateInterval > 0 && hours > 0 && hours % _config.GuiItem.AutoUpdateInterval == 0)
         {
             Logging.SaveLog("Execute update geo files");
 
             var updateHandle = new UpdateService();
-            await updateHandle.UpdateGeoFileAll(config, (success, msg) =>
+            await updateHandle.UpdateGeoFileAll(_config, (success, msg) =>
             {
-                updateFunc?.Invoke(false, msg);
+                _updateFunc?.Invoke(false, msg);
             });
         }
     }
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index f272b9f9..281eeda8 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -254,7 +254,7 @@ public class MainWindowViewModel : MyReactiveObject
         }
     }
 
-    private void UpdateTaskHandler(bool success, string msg)
+    private async Task UpdateTaskHandler(bool success, string msg)
     {
         NoticeManager.Instance.SendMessageEx(msg);
         if (success)
@@ -263,7 +263,7 @@ public class MainWindowViewModel : MyReactiveObject
             RefreshServers();
             if (indexIdOld != _config.IndexId)
             {
-                _ = Reload();
+                await Reload();
             }
             if (_config.UiItem.EnableAutoAdjustMainLvColWidth)
             {
@@ -596,7 +596,9 @@ public class MainWindowViewModel : MyReactiveObject
             Locator.Current.GetService<ClashProxiesViewModel>()?.ProxiesReload();
         }
         else
-        { TabMainSelectedIndex = 0; }
+        {
+            TabMainSelectedIndex = 0;
+        }
     }
 
     private async Task LoadCore()
@@ -631,7 +633,7 @@ public class MainWindowViewModel : MyReactiveObject
         Locator.Current.GetService<StatusBarViewModel>()?.RefreshRoutingsMenu();
 
         await ConfigHandler.SaveConfig(_config);
-        await new UpdateService().UpdateGeoFileAll(_config, UpdateTaskHandler);
+       //TODO await new UpdateService().UpdateGeoFileAll(_config, UpdateTaskHandler);
         await Reload();
     }
 

From 8ef68127d49aaf96c62f5f5b95c0ac785534ff71 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 29 Aug 2025 10:53:57 +0800
Subject: [PATCH 085/115] Optimization and Improvement.

Changed callback from synchronous Action<bool, string> to asynchronous Func<bool, string, Task>
---
 v2rayN/ServiceLib/Manager/TaskManager.cs      |  4 +-
 v2rayN/ServiceLib/Services/UpdateService.cs   | 77 ++++++++++---------
 .../ViewModels/CheckUpdateViewModel.cs        | 37 +++++----
 .../ViewModels/MainWindowViewModel.cs         |  2 +-
 4 files changed, 65 insertions(+), 55 deletions(-)

diff --git a/v2rayN/ServiceLib/Manager/TaskManager.cs b/v2rayN/ServiceLib/Manager/TaskManager.cs
index d9e5cd76..dfbd242d 100644
--- a/v2rayN/ServiceLib/Manager/TaskManager.cs
+++ b/v2rayN/ServiceLib/Manager/TaskManager.cs
@@ -92,9 +92,9 @@ public class TaskManager
             Logging.SaveLog("Execute update geo files");
 
             var updateHandle = new UpdateService();
-            await updateHandle.UpdateGeoFileAll(_config, (success, msg) =>
+            await updateHandle.UpdateGeoFileAll(_config, async (success, msg) =>
             {
-                _updateFunc?.Invoke(false, msg);
+                await _updateFunc?.Invoke(false, msg);
             });
         }
     }
diff --git a/v2rayN/ServiceLib/Services/UpdateService.cs b/v2rayN/ServiceLib/Services/UpdateService.cs
index 95d51d4b..429c0a62 100644
--- a/v2rayN/ServiceLib/Services/UpdateService.cs
+++ b/v2rayN/ServiceLib/Services/UpdateService.cs
@@ -5,11 +5,11 @@ namespace ServiceLib.Services;
 
 public class UpdateService
 {
-    private Action<bool, string>? _updateFunc;
+    private Func<bool, string, Task>? _updateFunc;
     private readonly int _timeout = 30;
     private static readonly string _tag = "UpdateService";
 
-    public async Task CheckUpdateGuiN(Config config, Action<bool, string> updateFunc, bool preRelease)
+    public async Task CheckUpdateGuiN(Config config, Func<bool, string, Task> updateFunc, bool preRelease)
     {
         _updateFunc = updateFunc;
         var url = string.Empty;
@@ -20,25 +20,25 @@ public class UpdateService
         {
             if (args.Success)
             {
-                _updateFunc?.Invoke(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
-                _updateFunc?.Invoke(true, Utils.UrlEncode(fileName));
+                UpdateFunc(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
+                UpdateFunc(true, Utils.UrlEncode(fileName));
             }
             else
             {
-                _updateFunc?.Invoke(false, args.Msg);
+                UpdateFunc(false, args.Msg);
             }
         };
         downloadHandle.Error += (sender2, args) =>
         {
-            _updateFunc?.Invoke(false, args.GetException().Message);
+            UpdateFunc(false, args.GetException().Message);
         };
 
-        _updateFunc?.Invoke(false, string.Format(ResUI.MsgStartUpdating, ECoreType.v2rayN));
+        await UpdateFunc(false, string.Format(ResUI.MsgStartUpdating, ECoreType.v2rayN));
         var result = await CheckUpdateAsync(downloadHandle, ECoreType.v2rayN, preRelease);
         if (result.Success)
         {
-            _updateFunc?.Invoke(false, string.Format(ResUI.MsgParsingSuccessfully, ECoreType.v2rayN));
-            _updateFunc?.Invoke(false, result.Msg);
+            await UpdateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, ECoreType.v2rayN));
+            await UpdateFunc(false, result.Msg);
 
             url = result.Data?.ToString();
             fileName = Utils.GetTempPath(Utils.GetGuid());
@@ -46,11 +46,11 @@ public class UpdateService
         }
         else
         {
-            _updateFunc?.Invoke(false, result.Msg);
+            await UpdateFunc(false, result.Msg);
         }
     }
 
-    public async Task CheckUpdateCore(ECoreType type, Config config, Action<bool, string> updateFunc, bool preRelease)
+    public async Task CheckUpdateCore(ECoreType type, Config config, Func<bool, string, Task> updateFunc, bool preRelease)
     {
         _updateFunc = updateFunc;
         var url = string.Empty;
@@ -61,34 +61,34 @@ public class UpdateService
         {
             if (args.Success)
             {
-                _updateFunc?.Invoke(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
-                _updateFunc?.Invoke(false, ResUI.MsgUnpacking);
+                UpdateFunc(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
+                UpdateFunc(false, ResUI.MsgUnpacking);
 
                 try
                 {
-                    _updateFunc?.Invoke(true, fileName);
+                    UpdateFunc(true, fileName);
                 }
                 catch (Exception ex)
                 {
-                    _updateFunc?.Invoke(false, ex.Message);
+                    UpdateFunc(false, ex.Message);
                 }
             }
             else
             {
-                _updateFunc?.Invoke(false, args.Msg);
+                UpdateFunc(false, args.Msg);
             }
         };
         downloadHandle.Error += (sender2, args) =>
         {
-            _updateFunc?.Invoke(false, args.GetException().Message);
+            UpdateFunc(false, args.GetException().Message);
         };
 
-        _updateFunc?.Invoke(false, string.Format(ResUI.MsgStartUpdating, type));
+        await UpdateFunc(false, string.Format(ResUI.MsgStartUpdating, type));
         var result = await CheckUpdateAsync(downloadHandle, type, preRelease);
         if (result.Success)
         {
-            _updateFunc?.Invoke(false, string.Format(ResUI.MsgParsingSuccessfully, type));
-            _updateFunc?.Invoke(false, result.Msg);
+            await UpdateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, type));
+            await UpdateFunc(false, result.Msg);
 
             url = result.Data?.ToString();
             var ext = url.Contains(".tar.gz") ? ".tar.gz" : Path.GetExtension(url);
@@ -99,17 +99,17 @@ public class UpdateService
         {
             if (!result.Msg.IsNullOrEmpty())
             {
-                _updateFunc?.Invoke(false, result.Msg);
+                await UpdateFunc(false, result.Msg);
             }
         }
     }
 
-    public async Task UpdateGeoFileAll(Config config, Action<bool, string> updateFunc)
+    public async Task UpdateGeoFileAll(Config config, Func<bool, string, Task> updateFunc)
     {
         await UpdateGeoFiles(config, updateFunc);
         await UpdateOtherFiles(config, updateFunc);
         await UpdateSrsFileAll(config, updateFunc);
-        _updateFunc?.Invoke(true, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, "geo"));
+        await UpdateFunc(true, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, "geo"));
     }
 
     #region CheckUpdate private
@@ -128,7 +128,7 @@ public class UpdateService
         catch (Exception ex)
         {
             Logging.SaveLog(_tag, ex);
-            _updateFunc?.Invoke(false, ex.Message);
+            await UpdateFunc(false, ex.Message);
             return new RetResult(false, ex.Message);
         }
     }
@@ -212,7 +212,7 @@ public class UpdateService
         catch (Exception ex)
         {
             Logging.SaveLog(_tag, ex);
-            _updateFunc?.Invoke(false, ex.Message);
+            await UpdateFunc(false, ex.Message);
             return new SemanticVersion("");
         }
     }
@@ -272,7 +272,7 @@ public class UpdateService
         catch (Exception ex)
         {
             Logging.SaveLog(_tag, ex);
-            _updateFunc?.Invoke(false, ex.Message);
+            await UpdateFunc(false, ex.Message);
             return new RetResult(false, ex.Message);
         }
     }
@@ -333,7 +333,7 @@ public class UpdateService
 
     #region Geo private
 
-    private async Task UpdateGeoFiles(Config config, Action<bool, string> updateFunc)
+    private async Task UpdateGeoFiles(Config config, Func<bool, string, Task> updateFunc)
     {
         _updateFunc = updateFunc;
 
@@ -352,7 +352,7 @@ public class UpdateService
         }
     }
 
-    private async Task UpdateOtherFiles(Config config, Action<bool, string> updateFunc)
+    private async Task UpdateOtherFiles(Config config, Func<bool, string, Task> updateFunc)
     {
         //If it is not in China area, no update is required
         if (config.ConstItem.GeoSourceUrl.IsNotEmpty())
@@ -371,7 +371,7 @@ public class UpdateService
         }
     }
 
-    private async Task UpdateSrsFileAll(Config config, Action<bool, string> updateFunc)
+    private async Task UpdateSrsFileAll(Config config, Func<bool, string, Task> updateFunc)
     {
         _updateFunc = updateFunc;
 
@@ -426,7 +426,7 @@ public class UpdateService
         }
     }
 
-    private async Task UpdateSrsFile(string type, string srsName, Config config, Action<bool, string> updateFunc)
+    private async Task UpdateSrsFile(string type, string srsName, Config config, Func<bool, string, Task> updateFunc)
     {
         var srsUrl = string.IsNullOrEmpty(config.ConstItem.SrsSourceUrl)
                         ? Global.SingboxRulesetUrl
@@ -439,7 +439,7 @@ public class UpdateService
         await DownloadGeoFile(url, fileName, targetPath, updateFunc);
     }
 
-    private async Task DownloadGeoFile(string url, string fileName, string targetPath, Action<bool, string> updateFunc)
+    private async Task DownloadGeoFile(string url, string fileName, string targetPath, Func<bool, string, Task> updateFunc)
     {
         var tmpFileName = Utils.GetTempPath(Utils.GetGuid());
 
@@ -448,7 +448,7 @@ public class UpdateService
         {
             if (args.Success)
             {
-                _updateFunc?.Invoke(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, fileName));
+                UpdateFunc(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, fileName));
 
                 try
                 {
@@ -457,26 +457,31 @@ public class UpdateService
                         File.Copy(tmpFileName, targetPath, true);
 
                         File.Delete(tmpFileName);
-                        //_updateFunc?.Invoke(true, "");
+                        //await    UpdateFunc(true, "");
                     }
                 }
                 catch (Exception ex)
                 {
-                    _updateFunc?.Invoke(false, ex.Message);
+                    UpdateFunc(false, ex.Message);
                 }
             }
             else
             {
-                _updateFunc?.Invoke(false, args.Msg);
+                UpdateFunc(false, args.Msg);
             }
         };
         downloadHandle.Error += (sender2, args) =>
         {
-            _updateFunc?.Invoke(false, args.GetException().Message);
+            UpdateFunc(false, args.GetException().Message);
         };
 
         await downloadHandle.DownloadFileAsync(url, tmpFileName, true, _timeout);
     }
 
     #endregion Geo private
+
+    private async Task UpdateFunc(bool notify, string msg)
+    {
+        await _updateFunc?.Invoke(notify, msg);
+    }
 }
diff --git a/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs b/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
index 642149f9..59a3b163 100644
--- a/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
@@ -89,9 +89,11 @@ public class CheckUpdateViewModel : MyReactiveObject
         {
             var item = _checkUpdateModel[k];
             if (item.IsSelected != true)
+            {
                 continue;
+            }
 
-            UpdateView(item.CoreType, "...");
+            await UpdateView(item.CoreType, "...");
             if (item.CoreType == _geo)
             {
                 await CheckUpdateGeo();
@@ -129,9 +131,9 @@ public class CheckUpdateViewModel : MyReactiveObject
 
     private async Task CheckUpdateGeo()
     {
-        void _updateUI(bool success, string msg)
+        async Task _updateUI(bool success, string msg)
         {
-            UpdateView(_geo, msg);
+            await UpdateView(_geo, msg);
             if (success)
             {
                 UpdatedPlusPlus(_geo, "");
@@ -146,12 +148,12 @@ public class CheckUpdateViewModel : MyReactiveObject
 
     private async Task CheckUpdateN(bool preRelease)
     {
-        void _updateUI(bool success, string msg)
+        async Task _updateUI(bool success, string msg)
         {
-            UpdateView(_v2rayN, msg);
+            await UpdateView(_v2rayN, msg);
             if (success)
             {
-                UpdateView(_v2rayN, ResUI.OperationSuccess);
+                await UpdateView(_v2rayN, ResUI.OperationSuccess);
                 UpdatedPlusPlus(_v2rayN, msg);
             }
         }
@@ -164,12 +166,12 @@ public class CheckUpdateViewModel : MyReactiveObject
 
     private async Task CheckUpdateCore(CheckUpdateModel model, bool preRelease)
     {
-        void _updateUI(bool success, string msg)
+        async Task _updateUI(bool success, string msg)
         {
-            UpdateView(model.CoreType, msg);
+            await UpdateView(model.CoreType, msg);
             if (success)
             {
-                UpdateView(model.CoreType, ResUI.MsgUpdateV2rayCoreSuccessfullyMore);
+                await UpdateView(model.CoreType, ResUI.MsgUpdateV2rayCoreSuccessfullyMore);
 
                 UpdatedPlusPlus(model.CoreType, msg);
             }
@@ -193,7 +195,7 @@ public class CheckUpdateViewModel : MyReactiveObject
             if (_lstUpdated.Any(x => x.CoreType == _v2rayN && x.IsFinished == true))
             {
                 await Task.Delay(1000);
-                UpgradeN();
+                await UpgradeN();
             }
             await Task.Delay(1000);
             _updateView?.Invoke(EViewAction.DispatcherCheckUpdateFinished, true);
@@ -212,7 +214,7 @@ public class CheckUpdateViewModel : MyReactiveObject
         }
     }
 
-    private void UpgradeN()
+    private async Task UpgradeN()
     {
         try
         {
@@ -223,14 +225,14 @@ public class CheckUpdateViewModel : MyReactiveObject
             }
             if (!Utils.UpgradeAppExists(out _))
             {
-                UpdateView(_v2rayN, ResUI.UpgradeAppNotExistTip);
+                await UpdateView(_v2rayN, ResUI.UpgradeAppNotExistTip);
                 return;
             }
             Locator.Current.GetService<MainWindowViewModel>()?.UpgradeApp(fileName);
         }
         catch (Exception ex)
         {
-            UpdateView(_v2rayN, ex.Message);
+            await UpdateView(_v2rayN, ex.Message);
         }
     }
 
@@ -281,7 +283,7 @@ public class CheckUpdateViewModel : MyReactiveObject
                 }
             }
 
-            UpdateView(item.CoreType, ResUI.MsgUpdateV2rayCoreSuccessfully);
+            await UpdateView(item.CoreType, ResUI.MsgUpdateV2rayCoreSuccessfully);
 
             if (File.Exists(fileName))
             {
@@ -290,21 +292,24 @@ public class CheckUpdateViewModel : MyReactiveObject
         }
     }
 
-    private void UpdateView(string coreType, string msg)
+    private async Task UpdateView(string coreType, string msg)
     {
         var item = new CheckUpdateModel()
         {
             CoreType = coreType,
             Remarks = msg,
         };
-        _updateView?.Invoke(EViewAction.DispatcherCheckUpdate, item);
+        await _updateView?.Invoke(EViewAction.DispatcherCheckUpdate, item);
     }
 
     public void UpdateViewResult(CheckUpdateModel model)
     {
         var found = _checkUpdateModel.FirstOrDefault(t => t.CoreType == model.CoreType);
         if (found == null)
+        {
             return;
+        }
+
         var itemCopy = JsonUtils.DeepCopy(found);
         itemCopy.Remarks = model.Remarks;
         _checkUpdateModel.Replace(found, itemCopy);
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index 281eeda8..7f5d53a4 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -633,7 +633,7 @@ public class MainWindowViewModel : MyReactiveObject
         Locator.Current.GetService<StatusBarViewModel>()?.RefreshRoutingsMenu();
 
         await ConfigHandler.SaveConfig(_config);
-       //TODO await new UpdateService().UpdateGeoFileAll(_config, UpdateTaskHandler);
+        await new UpdateService().UpdateGeoFileAll(_config, UpdateTaskHandler);
         await Reload();
     }
 

From da28c639b30daa800cf7bd2c66740c329a8d3ea9 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 29 Aug 2025 11:40:08 +0800
Subject: [PATCH 086/115] Optimization and Improvement.

Changed callback from synchronous Action<bool, string> to asynchronous Func<bool, string, Task>
---
 v2rayN/ServiceLib/Manager/ClashApiManager.cs           |  6 +++---
 v2rayN/ServiceLib/Manager/StatisticsManager.cs         | 10 +++++-----
 .../Services/Statistics/StatisticsSingboxService.cs    |  6 +++---
 .../Services/Statistics/StatisticsXrayService.cs       |  6 +++---
 v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs  |  4 ++--
 v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs    |  4 ++--
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/v2rayN/ServiceLib/Manager/ClashApiManager.cs b/v2rayN/ServiceLib/Manager/ClashApiManager.cs
index 9147df05..e34f838d 100644
--- a/v2rayN/ServiceLib/Manager/ClashApiManager.cs
+++ b/v2rayN/ServiceLib/Manager/ClashApiManager.cs
@@ -35,7 +35,7 @@ public sealed class ClashApiManager
         return null;
     }
 
-    public void ClashProxiesDelayTest(bool blAll, List<ClashProxyModel> lstProxy, Action<ClashProxyModel?, string> updateFunc)
+    public void ClashProxiesDelayTest(bool blAll, List<ClashProxyModel> lstProxy, Func<ClashProxyModel?, string, Task> updateFunc)
     {
         Task.Run(async () =>
         {
@@ -79,12 +79,12 @@ public sealed class ClashApiManager
                 tasks.Add(Task.Run(async () =>
                 {
                     var result = await HttpClientHelper.Instance.TryGetAsync(url);
-                    updateFunc?.Invoke(it, result);
+                    await updateFunc?.Invoke(it, result);
                 }));
             }
             await Task.WhenAll(tasks);
             await Task.Delay(1000);
-            updateFunc?.Invoke(null, "");
+            await updateFunc?.Invoke(null, "");
         });
     }
 
diff --git a/v2rayN/ServiceLib/Manager/StatisticsManager.cs b/v2rayN/ServiceLib/Manager/StatisticsManager.cs
index 69a47856..1e439a7f 100644
--- a/v2rayN/ServiceLib/Manager/StatisticsManager.cs
+++ b/v2rayN/ServiceLib/Manager/StatisticsManager.cs
@@ -8,14 +8,14 @@ public class StatisticsManager
     private Config _config;
     private ServerStatItem? _serverStatItem;
     private List<ServerStatItem> _lstServerStat;
-    private Action<ServerSpeedItem>? _updateFunc;
+    private Func<ServerSpeedItem, Task>? _updateFunc;
 
     private StatisticsXrayService? _statisticsXray;
     private StatisticsSingboxService? _statisticsSingbox;
     private static readonly string _tag = "StatisticsHandler";
     public List<ServerStatItem> ServerStat => _lstServerStat;
 
-    public async Task Init(Config config, Action<ServerSpeedItem> updateFunc)
+    public async Task Init(Config config, Func<ServerSpeedItem, Task> updateFunc)
     {
         _config = config;
         _updateFunc = updateFunc;
@@ -97,9 +97,9 @@ public class StatisticsManager
         _lstServerStat = await SQLiteHelper.Instance.TableAsync<ServerStatItem>().ToListAsync();
     }
 
-    private void UpdateServerStatHandler(ServerSpeedItem server)
+    private async Task UpdateServerStatHandler(ServerSpeedItem server)
     {
-        _ = UpdateServerStat(server);
+        await UpdateServerStat(server);
     }
 
     private async Task UpdateServerStat(ServerSpeedItem server)
@@ -123,7 +123,7 @@ public class StatisticsManager
         server.TodayDown = _serverStatItem.TodayDown;
         server.TotalUp = _serverStatItem.TotalUp;
         server.TotalDown = _serverStatItem.TotalDown;
-        _updateFunc?.Invoke(server);
+        await _updateFunc?.Invoke(server);
     }
 
     private async Task GetServerStatItem(string indexId)
diff --git a/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs b/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs
index 82a5330d..d3de6a18 100644
--- a/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs
@@ -8,11 +8,11 @@ public class StatisticsSingboxService
     private readonly Config _config;
     private bool _exitFlag;
     private ClientWebSocket? webSocket;
-    private Action<ServerSpeedItem>? _updateFunc;
+    private readonly Func<ServerSpeedItem, Task>? _updateFunc;
     private string Url => $"ws://{Global.Loopback}:{AppManager.Instance.StatePort2}/traffic";
     private static readonly string _tag = "StatisticsSingboxService";
 
-    public StatisticsSingboxService(Config config, Action<ServerSpeedItem> updateFunc)
+    public StatisticsSingboxService(Config config, Func<ServerSpeedItem, Task> updateFunc)
     {
         _config = config;
         _updateFunc = updateFunc;
@@ -90,7 +90,7 @@ public class StatisticsSingboxService
                         {
                             ParseOutput(result, out var up, out var down);
 
-                            _updateFunc?.Invoke(new ServerSpeedItem()
+                            await _updateFunc?.Invoke(new ServerSpeedItem()
                             {
                                 ProxyUp = (long)(up / 1000),
                                 ProxyDown = (long)(down / 1000)
diff --git a/v2rayN/ServiceLib/Services/Statistics/StatisticsXrayService.cs b/v2rayN/ServiceLib/Services/Statistics/StatisticsXrayService.cs
index d09ae836..b64a515d 100644
--- a/v2rayN/ServiceLib/Services/Statistics/StatisticsXrayService.cs
+++ b/v2rayN/ServiceLib/Services/Statistics/StatisticsXrayService.cs
@@ -6,10 +6,10 @@ public class StatisticsXrayService
     private ServerSpeedItem _serverSpeedItem = new();
     private readonly Config _config;
     private bool _exitFlag;
-    private Action<ServerSpeedItem>? _updateFunc;
+    private readonly Func<ServerSpeedItem, Task>? _updateFunc;
     private string Url => $"{Global.HttpProtocol}{Global.Loopback}:{AppManager.Instance.StatePort}/debug/vars";
 
-    public StatisticsXrayService(Config config, Action<ServerSpeedItem> updateFunc)
+    public StatisticsXrayService(Config config, Func<ServerSpeedItem, Task> updateFunc)
     {
         _config = config;
         _updateFunc = updateFunc;
@@ -39,7 +39,7 @@ public class StatisticsXrayService
                 if (result != null)
                 {
                     var server = ParseOutput(result) ?? new ServerSpeedItem();
-                    _updateFunc?.Invoke(server);
+                    await _updateFunc?.Invoke(server);
                 }
             }
             catch
diff --git a/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs b/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
index b3a66892..0149c0fb 100644
--- a/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
@@ -373,14 +373,14 @@ public class ClashProxiesViewModel : MyReactiveObject
 
     private async Task ProxiesDelayTest(bool blAll = true)
     {
-        ClashApiManager.Instance.ClashProxiesDelayTest(blAll, _proxyDetails.ToList(), (item, result) =>
+        ClashApiManager.Instance.ClashProxiesDelayTest(blAll, _proxyDetails.ToList(), async (item, result) =>
         {
             if (item == null || result.IsNullOrEmpty())
             {
                 return;
             }
 
-            _updateView?.Invoke(EViewAction.DispatcherProxiesDelayTest, new SpeedTestResult() { IndexId = item.Name, Delay = result });
+            await _updateView?.Invoke(EViewAction.DispatcherProxiesDelayTest, new SpeedTestResult() { IndexId = item.Name, Delay = result });
         });
         await Task.CompletedTask;
     }
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index 7f5d53a4..eab61655 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -272,13 +272,13 @@ public class MainWindowViewModel : MyReactiveObject
         }
     }
 
-    private void UpdateStatisticsHandler(ServerSpeedItem update)
+    private async Task UpdateStatisticsHandler(ServerSpeedItem update)
     {
         if (!_config.UiItem.ShowInTaskbar)
         {
             return;
         }
-        _updateView?.Invoke(EViewAction.DispatcherStatistics, update);
+        await _updateView?.Invoke(EViewAction.DispatcherStatistics, update);
     }
 
     public void SetStatisticsResult(ServerSpeedItem update)

From a108eaf34bef55029422f4d617079a0ec66ea18d Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 29 Aug 2025 11:53:30 +0800
Subject: [PATCH 087/115] Optimization and Improvement.

Changed callback from synchronous Action<bool, string> to asynchronous Func<bool, string, Task>
---
 v2rayN/ServiceLib/Services/DownloadService.cs |  6 +--
 .../ServiceLib/Services/SpeedtestService.cs   | 48 ++++++++-----------
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/v2rayN/ServiceLib/Services/DownloadService.cs b/v2rayN/ServiceLib/Services/DownloadService.cs
index f37c8939..99170646 100644
--- a/v2rayN/ServiceLib/Services/DownloadService.cs
+++ b/v2rayN/ServiceLib/Services/DownloadService.cs
@@ -15,7 +15,7 @@ public class DownloadService
 
     private static readonly string _tag = "DownloadService";
 
-    public async Task<int> DownloadDataAsync(string url, WebProxy webProxy, int downloadTimeout, Action<bool, string> updateFunc)
+    public async Task<int> DownloadDataAsync(string url, WebProxy webProxy, int downloadTimeout, Func<bool, string, Task> updateFunc)
     {
         try
         {
@@ -31,10 +31,10 @@ public class DownloadService
         }
         catch (Exception ex)
         {
-            updateFunc?.Invoke(false, ex.Message);
+            await updateFunc?.Invoke(false, ex.Message);
             if (ex.InnerException != null)
             {
-                updateFunc?.Invoke(false, ex.InnerException.Message);
+                await updateFunc?.Invoke(false, ex.InnerException.Message);
             }
         }
         return 0;
diff --git a/v2rayN/ServiceLib/Services/SpeedtestService.cs b/v2rayN/ServiceLib/Services/SpeedtestService.cs
index 002a6251..5266f4d0 100644
--- a/v2rayN/ServiceLib/Services/SpeedtestService.cs
+++ b/v2rayN/ServiceLib/Services/SpeedtestService.cs
@@ -5,26 +5,20 @@ using System.Net.Sockets;
 
 namespace ServiceLib.Services;
 
-public class SpeedtestService
+public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateFunc)
 {
     private static readonly string _tag = "SpeedtestService";
-    private Config? _config;
-    private Action<SpeedTestResult>? _updateFunc;
+    private readonly Config? _config = config;
+    private readonly Func<SpeedTestResult, Task>? _updateFunc = updateFunc;
     private static readonly ConcurrentBag<string> _lstExitLoop = new();
 
-    public SpeedtestService(Config config, Action<SpeedTestResult> updateFunc)
-    {
-        _config = config;
-        _updateFunc = updateFunc;
-    }
-
     public void RunLoop(ESpeedActionType actionType, List<ProfileItem> selecteds)
     {
         Task.Run(async () =>
         {
             await RunAsync(actionType, selecteds);
             await ProfileExManager.Instance.SaveTo();
-            UpdateFunc("", ResUI.SpeedtestingCompleted);
+            await UpdateFunc("", ResUI.SpeedtestingCompleted);
         });
     }
 
@@ -43,7 +37,7 @@ public class SpeedtestService
         var exitLoopKey = Utils.GetGuid(false);
         _lstExitLoop.Add(exitLoopKey);
 
-        var lstSelected = GetClearItem(actionType, selecteds);
+        var lstSelected = await GetClearItem(actionType, selecteds);
 
         switch (actionType)
         {
@@ -65,7 +59,7 @@ public class SpeedtestService
         }
     }
 
-    private List<ServerTestItem> GetClearItem(ESpeedActionType actionType, List<ProfileItem> selecteds)
+    private async Task<List<ServerTestItem>> GetClearItem(ESpeedActionType actionType, List<ProfileItem> selecteds)
     {
         var lstSelected = new List<ServerTestItem>();
         foreach (var it in selecteds)
@@ -97,17 +91,17 @@ public class SpeedtestService
             {
                 case ESpeedActionType.Tcping:
                 case ESpeedActionType.Realping:
-                    UpdateFunc(it.IndexId, ResUI.Speedtesting, "");
+                    await UpdateFunc(it.IndexId, ResUI.Speedtesting, "");
                     ProfileExManager.Instance.SetTestDelay(it.IndexId, 0);
                     break;
 
                 case ESpeedActionType.Speedtest:
-                    UpdateFunc(it.IndexId, "", ResUI.SpeedtestingWait);
+                    await UpdateFunc(it.IndexId, "", ResUI.SpeedtestingWait);
                     ProfileExManager.Instance.SetTestSpeed(it.IndexId, 0);
                     break;
 
                 case ESpeedActionType.Mixedtest:
-                    UpdateFunc(it.IndexId, ResUI.Speedtesting, ResUI.SpeedtestingWait);
+                    await UpdateFunc(it.IndexId, ResUI.Speedtesting, ResUI.SpeedtestingWait);
                     ProfileExManager.Instance.SetTestDelay(it.IndexId, 0);
                     ProfileExManager.Instance.SetTestSpeed(it.IndexId, 0);
                     break;
@@ -133,7 +127,7 @@ public class SpeedtestService
                     var responseTime = await GetTcpingTime(it.Address, it.Port);
 
                     ProfileExManager.Instance.SetTestDelay(it.IndexId, responseTime);
-                    UpdateFunc(it.IndexId, responseTime.ToString());
+                    await UpdateFunc(it.IndexId, responseTime.ToString());
                 }
                 catch (Exception ex)
                 {
@@ -169,11 +163,11 @@ public class SpeedtestService
         {
             if (_lstExitLoop.Any(p => p == exitLoopKey) == false)
             {
-                UpdateFunc("", ResUI.SpeedtestingSkip);
+                await UpdateFunc("", ResUI.SpeedtestingSkip);
                 return;
             }
 
-            UpdateFunc("", string.Format(ResUI.SpeedtestingTestFailedPart, lstFailed.Count));
+            await UpdateFunc("", string.Format(ResUI.SpeedtestingTestFailedPart, lstFailed.Count));
 
             if (pageSizeNext > _config.SpeedTestItem.MixedConcurrencyCount)
             {
@@ -239,7 +233,7 @@ public class SpeedtestService
         {
             if (_lstExitLoop.Any(p => p == exitLoopKey) == false)
             {
-                UpdateFunc(it.IndexId, "", ResUI.SpeedtestingSkip);
+                await UpdateFunc(it.IndexId, "", ResUI.SpeedtestingSkip);
                 continue;
             }
             if (it.ConfigType == EConfigType.Custom)
@@ -256,7 +250,7 @@ public class SpeedtestService
                     pid = await CoreManager.Instance.LoadCoreConfigSpeedtest(it);
                     if (pid < 0)
                     {
-                        UpdateFunc(it.IndexId, "", ResUI.FailedToRunCore);
+                        await UpdateFunc(it.IndexId, "", ResUI.FailedToRunCore);
                     }
                     else
                     {
@@ -270,7 +264,7 @@ public class SpeedtestService
                             }
                             else
                             {
-                                UpdateFunc(it.IndexId, "", ResUI.SpeedtestingSkip);
+                                await UpdateFunc(it.IndexId, "", ResUI.SpeedtestingSkip);
                             }
                         }
                     }
@@ -298,25 +292,25 @@ public class SpeedtestService
         var responseTime = await HttpClientHelper.Instance.GetRealPingTime(_config.SpeedTestItem.SpeedPingTestUrl, webProxy, 10);
 
         ProfileExManager.Instance.SetTestDelay(it.IndexId, responseTime);
-        UpdateFunc(it.IndexId, responseTime.ToString());
+        await UpdateFunc(it.IndexId, responseTime.ToString());
         return responseTime;
     }
 
     private async Task DoSpeedTest(DownloadService downloadHandle, ServerTestItem it)
     {
-        UpdateFunc(it.IndexId, "", ResUI.Speedtesting);
+        await UpdateFunc(it.IndexId, "", ResUI.Speedtesting);
 
         var webProxy = new WebProxy($"socks5://{Global.Loopback}:{it.Port}");
         var url = _config.SpeedTestItem.SpeedTestUrl;
         var timeout = _config.SpeedTestItem.SpeedTestTimeout;
-        await downloadHandle.DownloadDataAsync(url, webProxy, timeout, (success, msg) =>
+        await downloadHandle.DownloadDataAsync(url, webProxy, timeout, async (success, msg) =>
         {
             decimal.TryParse(msg, out var dec);
             if (dec > 0)
             {
                 ProfileExManager.Instance.SetTestSpeed(it.IndexId, dec);
             }
-            UpdateFunc(it.IndexId, "", msg);
+            await UpdateFunc(it.IndexId, "", msg);
         });
     }
 
@@ -371,9 +365,9 @@ public class SpeedtestService
         return lstTest;
     }
 
-    private void UpdateFunc(string indexId, string delay, string speed = "")
+    private async Task UpdateFunc(string indexId, string delay, string speed = "")
     {
-        _updateFunc?.Invoke(new() { IndexId = indexId, Delay = delay, Speed = speed });
+        await _updateFunc?.Invoke(new() { IndexId = indexId, Delay = delay, Speed = speed });
         if (indexId.IsNotEmpty() && speed.IsNotEmpty())
         {
             ProfileExManager.Instance.SetTestMessage(indexId, speed);

From ea1d438e4072714fe0edf63b8eb23472d3f4ab87 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 29 Aug 2025 14:46:08 +0800
Subject: [PATCH 088/115] Use Rx event subscription to replace MessageBus
 refresh configuration file function

---
 v2rayN/ServiceLib/Enums/EMsgCommand.cs        |  1 -
 v2rayN/ServiceLib/Handler/AppEvents.cs        |  9 ++++
 .../ViewModels/MainWindowViewModel.cs         | 20 +++----
 .../ViewModels/ProfilesViewModel.cs           | 52 ++++++++++---------
 .../ViewModels/StatusBarViewModel.cs          | 13 +++--
 .../Views/ProfilesView.axaml.cs               | 13 +----
 .../Views/StatusBarView.axaml.cs              |  7 +--
 v2rayN/v2rayN/Views/ProfilesView.xaml.cs      | 12 +----
 v2rayN/v2rayN/Views/StatusBarView.xaml.cs     |  7 +--
 9 files changed, 59 insertions(+), 75 deletions(-)
 create mode 100644 v2rayN/ServiceLib/Handler/AppEvents.cs

diff --git a/v2rayN/ServiceLib/Enums/EMsgCommand.cs b/v2rayN/ServiceLib/Enums/EMsgCommand.cs
index 23be4ac1..fe7d01cc 100644
--- a/v2rayN/ServiceLib/Enums/EMsgCommand.cs
+++ b/v2rayN/ServiceLib/Enums/EMsgCommand.cs
@@ -5,6 +5,5 @@ public enum EMsgCommand
     ClearMsg,
     SendMsgView,
     SendSnackMsg,
-    RefreshProfiles,
     AppExit
 }
diff --git a/v2rayN/ServiceLib/Handler/AppEvents.cs b/v2rayN/ServiceLib/Handler/AppEvents.cs
new file mode 100644
index 00000000..b2992721
--- /dev/null
+++ b/v2rayN/ServiceLib/Handler/AppEvents.cs
@@ -0,0 +1,9 @@
+using System.Reactive;
+using System.Reactive.Subjects;
+
+namespace ServiceLib.Handler;
+
+public static class AppEvents
+{
+    public static readonly Subject<Unit> ProfilesRefreshRequested = new();
+}
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index eab61655..1e64d22a 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -260,7 +260,7 @@ public class MainWindowViewModel : MyReactiveObject
         if (success)
         {
             var indexIdOld = _config.IndexId;
-            RefreshServers();
+            await RefreshServers();
             if (indexIdOld != _config.IndexId)
             {
                 await Reload();
@@ -350,9 +350,11 @@ public class MainWindowViewModel : MyReactiveObject
 
     #region Servers && Groups
 
-    private void RefreshServers()
+    private async Task RefreshServers()
     {
-        MessageBus.Current.SendMessage("", EMsgCommand.RefreshProfiles.ToString());
+        AppEvents.ProfilesRefreshRequested.OnNext(Unit.Default);
+
+        await Task.Delay(200);
     }
 
     private void RefreshSubscriptions()
@@ -384,7 +386,7 @@ public class MainWindowViewModel : MyReactiveObject
         }
         if (ret == true)
         {
-            RefreshServers();
+            await RefreshServers();
             if (item.IndexId == _config.IndexId)
             {
                 await Reload();
@@ -399,11 +401,11 @@ public class MainWindowViewModel : MyReactiveObject
             await _updateView?.Invoke(EViewAction.AddServerViaClipboard, null);
             return;
         }
-        int ret = await ConfigHandler.AddBatchServers(_config, clipboardData, _config.SubIndexId, false);
+        var ret = await ConfigHandler.AddBatchServers(_config, clipboardData, _config.SubIndexId, false);
         if (ret > 0)
         {
             RefreshSubscriptions();
-            RefreshServers();
+            await RefreshServers();
             NoticeManager.Instance.Enqueue(string.Format(ResUI.SuccessfullyImportedServerViaClipboard, ret));
         }
         else
@@ -449,11 +451,11 @@ public class MainWindowViewModel : MyReactiveObject
         }
         else
         {
-            int ret = await ConfigHandler.AddBatchServers(_config, result, _config.SubIndexId, false);
+            var ret = await ConfigHandler.AddBatchServers(_config, result, _config.SubIndexId, false);
             if (ret > 0)
             {
                 RefreshSubscriptions();
-                RefreshServers();
+                await RefreshServers();
                 NoticeManager.Instance.Enqueue(ResUI.SuccessfullyImportedServerViaScan);
             }
             else
@@ -532,7 +534,7 @@ public class MainWindowViewModel : MyReactiveObject
     private async Task ClearServerStatistics()
     {
         await StatisticsManager.Instance.ClearAllServerStatistics();
-        RefreshServers();
+        await RefreshServers();
     }
 
     private async Task OpenTheFileLocation()
diff --git a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
index 8362ecea..49e47949 100644
--- a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
@@ -126,7 +126,7 @@ public class ProfilesViewModel : MyReactiveObject
         this.WhenAnyValue(
           x => x.ServerFilter,
           y => y != null && _serverFilter != y)
-              .Subscribe(c => ServerFilterChanged(c));
+              .Subscribe(async c => await ServerFilterChanged(c));
 
         //servers delete
         EditServerCmd = ReactiveCommand.CreateFromTask(async () =>
@@ -249,7 +249,10 @@ public class ProfilesViewModel : MyReactiveObject
 
         if (_updateView != null)
         {
-            MessageBus.Current.Listen<string>(EMsgCommand.RefreshProfiles.ToString()).Subscribe(OnNext);
+            AppEvents.ProfilesRefreshRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async _ => await RefreshServersBiz());//.DisposeWith(_disposables);
         }
 
         _ = Init();
@@ -263,18 +266,13 @@ public class ProfilesViewModel : MyReactiveObject
         SelectedServer = new();
 
         await RefreshSubscriptions();
-        RefreshServers();
+        await RefreshServers();
     }
 
     #endregion Init
 
     #region Actions
 
-    private async void OnNext(string x)
-    {
-        await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null);
-    }
-
     private void Reload()
     {
         Locator.Current.GetService<MainWindowViewModel>()?.Reload();
@@ -353,12 +351,12 @@ public class ProfilesViewModel : MyReactiveObject
         }
         _config.SubIndexId = SelectedSub?.Id;
 
-        RefreshServers();
+        await RefreshServers();
 
         await _updateView?.Invoke(EViewAction.ProfilesFocus, null);
     }
 
-    private void ServerFilterChanged(bool c)
+    private async Task ServerFilterChanged(bool c)
     {
         if (!c)
         {
@@ -367,16 +365,18 @@ public class ProfilesViewModel : MyReactiveObject
         _serverFilter = ServerFilter;
         if (_serverFilter.IsNullOrEmpty())
         {
-            RefreshServers();
+            await RefreshServers();
         }
     }
 
-    public void RefreshServers()
+    public async Task RefreshServers()
     {
-        MessageBus.Current.SendMessage("", EMsgCommand.RefreshProfiles.ToString());
+        AppEvents.ProfilesRefreshRequested.OnNext(Unit.Default);
+
+        await Task.Delay(200);
     }
 
-    public async Task RefreshServersBiz()
+    private async Task RefreshServersBiz()
     {
         var lstModel = await GetProfileItemsEx(_config.SubIndexId, _serverFilter);
         _lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel)) ?? [];
@@ -395,6 +395,8 @@ public class ProfilesViewModel : MyReactiveObject
                 SelectedProfile = lstModel.First();
             }
         }
+
+        await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null);
     }
 
     public async Task RefreshSubscriptions()
@@ -514,7 +516,7 @@ public class ProfilesViewModel : MyReactiveObject
         }
         if (ret == true)
         {
-            RefreshServers();
+            await RefreshServers();
             if (item.IndexId == _config.IndexId)
             {
                 Reload();
@@ -541,7 +543,7 @@ public class ProfilesViewModel : MyReactiveObject
         {
             _profileItems.Clear();
         }
-        RefreshServers();
+        await RefreshServers();
         if (exists)
         {
             Reload();
@@ -553,7 +555,7 @@ public class ProfilesViewModel : MyReactiveObject
         var tuple = await ConfigHandler.DedupServerList(_config, _config.SubIndexId);
         if (tuple.Item1 > 0 || tuple.Item2 > 0)
         {
-            RefreshServers();
+            await RefreshServers();
             Reload();
         }
         NoticeManager.Instance.Enqueue(string.Format(ResUI.RemoveDuplicateServerResult, tuple.Item1, tuple.Item2));
@@ -568,7 +570,7 @@ public class ProfilesViewModel : MyReactiveObject
         }
         if (await ConfigHandler.CopyServer(_config, lstSelected) == 0)
         {
-            RefreshServers();
+            await RefreshServers();
             NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
         }
     }
@@ -601,7 +603,7 @@ public class ProfilesViewModel : MyReactiveObject
 
         if (await ConfigHandler.SetDefaultServerIndex(_config, indexId) == 0)
         {
-            RefreshServers();
+            await RefreshServers();
             Reload();
         }
     }
@@ -652,7 +654,7 @@ public class ProfilesViewModel : MyReactiveObject
         }
         if (ret?.Data?.ToString() == _config.IndexId)
         {
-            RefreshServers();
+            await RefreshServers();
             Reload();
         }
         else
@@ -675,13 +677,13 @@ public class ProfilesViewModel : MyReactiveObject
             return;
         }
         _dicHeaderSort[colName] = !asc;
-        RefreshServers();
+        await RefreshServers();
     }
 
     public async Task RemoveInvalidServerResult()
     {
         var count = await ConfigHandler.RemoveInvalidServerResult(_config, _config.SubIndexId);
-        RefreshServers();
+        await RefreshServers();
         NoticeManager.Instance.Enqueue(string.Format(ResUI.RemoveInvalidServerResultTip, count));
     }
 
@@ -702,7 +704,7 @@ public class ProfilesViewModel : MyReactiveObject
         await ConfigHandler.MoveToGroup(_config, lstSelected, SelectedMoveToGroup.Id);
         NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
 
-        RefreshServers();
+        await RefreshServers();
         SelectedMoveToGroup = null;
         SelectedMoveToGroup = new();
     }
@@ -723,7 +725,7 @@ public class ProfilesViewModel : MyReactiveObject
         }
         if (await ConfigHandler.MoveServer(_config, _lstProfile, index, eMove) == 0)
         {
-            RefreshServers();
+            await RefreshServers();
         }
     }
 
@@ -734,7 +736,7 @@ public class ProfilesViewModel : MyReactiveObject
         {
             if (await ConfigHandler.MoveServer(_config, _lstProfile, startIndex, EMove.Position, targetIndex) == 0)
             {
-                RefreshServers();
+                await RefreshServers();
             }
         }
     }
diff --git a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
index ae097c3c..1be54da7 100644
--- a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
@@ -1,4 +1,5 @@
 using System.Reactive;
+using System.Reactive.Linq;
 using System.Text;
 using DynamicData.Binding;
 using ReactiveUI;
@@ -216,15 +217,13 @@ public class StatusBarViewModel : MyReactiveObject
         _updateView = updateView;
         if (_updateView != null)
         {
-            MessageBus.Current.Listen<string>(EMsgCommand.RefreshProfiles.ToString()).Subscribe(OnNext);
+            AppEvents.ProfilesRefreshRequested
+              .AsObservable()
+              .ObserveOn(RxApp.MainThreadScheduler)
+              .Subscribe(async _ => await RefreshServersBiz()); //.DisposeWith(_disposables);
         }
     }
 
-    private async void OnNext(string x)
-    {
-        await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null);
-    }
-
     private async Task CopyProxyCmdToClipboard()
     {
         var cmd = Utils.IsWindows() ? "set" : "export";
@@ -263,7 +262,7 @@ public class StatusBarViewModel : MyReactiveObject
             await service.UpdateSubscriptionProcess("", blProxy);
     }
 
-    public async Task RefreshServersBiz()
+    private async Task RefreshServersBiz()
     {
         await RefreshServersMenu();
 
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
index 492dc237..73115ed7 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
@@ -187,11 +187,7 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
                 break;
 
             case EViewAction.DispatcherRefreshServersBiz:
-                Dispatcher.UIThread.Post(() =>
-                {
-                    _ = RefreshServersBiz();
-                },
-                DispatcherPriority.Default);
+                Dispatcher.UIThread.Post(RefreshServersBiz, DispatcherPriority.Default);
                 break;
         }
 
@@ -209,13 +205,8 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
         await DialogHost.Show(dialog);
     }
 
-    public async Task RefreshServersBiz()
+    public void RefreshServersBiz()
     {
-        if (ViewModel != null)
-        {
-            await ViewModel.RefreshServersBiz();
-        }
-
         if (lstProfiles.SelectedIndex >= 0)
         {
             lstProfiles.ScrollIntoView(lstProfiles.SelectedItem, null);
diff --git a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
index 34ae1953..e4458721 100644
--- a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
@@ -63,12 +63,7 @@ public partial class StatusBarView : ReactiveUserControl<StatusBarViewModel>
                     ViewModel?.TestServerAvailabilityResult((string)obj),
                 DispatcherPriority.Default);
                 break;
-
-            case EViewAction.DispatcherRefreshServersBiz:
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.RefreshServersBiz(),
-                DispatcherPriority.Default);
-                break;
+                 
 
             case EViewAction.DispatcherRefreshIcon:
                 Dispatcher.UIThread.Post(() =>
diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
index 265325d3..456e6ddd 100644
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
+++ b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
@@ -168,10 +168,7 @@ public partial class ProfilesView
                 break;
 
             case EViewAction.DispatcherRefreshServersBiz:
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    _ = RefreshServersBiz();
-                }), DispatcherPriority.Normal);
+                Application.Current?.Dispatcher.Invoke(RefreshServersBiz, DispatcherPriority.Normal);
                 break;
         }
 
@@ -190,13 +187,8 @@ public partial class ProfilesView
         await DialogHost.Show(dialog, "RootDialog");
     }
 
-    public async Task RefreshServersBiz()
+    public void RefreshServersBiz()
     {
-        if (ViewModel != null)
-        {
-            await ViewModel.RefreshServersBiz();
-        }
-
         if (lstProfiles.SelectedIndex > 0)
         {
             lstProfiles.ScrollIntoView(lstProfiles.SelectedItem, null);
diff --git a/v2rayN/v2rayN/Views/StatusBarView.xaml.cs b/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
index db92793d..c29fbdc3 100644
--- a/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
+++ b/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
@@ -86,12 +86,7 @@ public partial class StatusBarView
                 }), DispatcherPriority.Normal);
                 break;
 
-            case EViewAction.DispatcherRefreshServersBiz:
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    ViewModel?.RefreshServersBiz();
-                }), DispatcherPriority.Normal);
-                break;
+        
 
             case EViewAction.DispatcherRefreshIcon:
                 Application.Current?.Dispatcher.Invoke((async () =>

From 058c6e4a85ff03aefe908b2e1b65942407b3a139 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 29 Aug 2025 15:46:09 +0800
Subject: [PATCH 089/115] Use Rx event subscription instead of MessageBus to
 send information

---
 v2rayN/ServiceLib/Enums/EMsgCommand.cs        |  9 -------
 v2rayN/ServiceLib/Handler/AppEvents.cs        |  6 +++++
 v2rayN/ServiceLib/Manager/NoticeManager.cs    |  6 ++---
 .../ViewModels/MainWindowViewModel.cs         |  2 +-
 v2rayN/ServiceLib/ViewModels/MsgViewModel.cs  | 11 ++++-----
 .../v2rayN.Desktop/Views/MainWindow.axaml.cs  | 23 ++++++++++++------
 .../Views/ProfilesView.axaml.cs               | 10 ++++++--
 v2rayN/v2rayN/Views/MainWindow.xaml.cs        | 24 ++++++++++++-------
 v2rayN/v2rayN/Views/ProfilesView.xaml.cs      | 10 ++++++--
 9 files changed, 62 insertions(+), 39 deletions(-)
 delete mode 100644 v2rayN/ServiceLib/Enums/EMsgCommand.cs

diff --git a/v2rayN/ServiceLib/Enums/EMsgCommand.cs b/v2rayN/ServiceLib/Enums/EMsgCommand.cs
deleted file mode 100644
index fe7d01cc..00000000
--- a/v2rayN/ServiceLib/Enums/EMsgCommand.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace ServiceLib.Enums;
-
-public enum EMsgCommand
-{
-    ClearMsg,
-    SendMsgView,
-    SendSnackMsg,
-    AppExit
-}
diff --git a/v2rayN/ServiceLib/Handler/AppEvents.cs b/v2rayN/ServiceLib/Handler/AppEvents.cs
index b2992721..093c5259 100644
--- a/v2rayN/ServiceLib/Handler/AppEvents.cs
+++ b/v2rayN/ServiceLib/Handler/AppEvents.cs
@@ -6,4 +6,10 @@ namespace ServiceLib.Handler;
 public static class AppEvents
 {
     public static readonly Subject<Unit> ProfilesRefreshRequested = new();
+
+    public static readonly Subject<string> SendSnackMsgRequested = new();
+
+    public static readonly Subject<string> SendMsgViewRequested = new();
+
+    public static readonly Subject<Unit> AppExitRequested = new();
 }
diff --git a/v2rayN/ServiceLib/Manager/NoticeManager.cs b/v2rayN/ServiceLib/Manager/NoticeManager.cs
index 76c01a56..f9e149ed 100644
--- a/v2rayN/ServiceLib/Manager/NoticeManager.cs
+++ b/v2rayN/ServiceLib/Manager/NoticeManager.cs
@@ -1,5 +1,3 @@
-using ReactiveUI;
-
 namespace ServiceLib.Manager;
 
 public class NoticeManager
@@ -13,7 +11,7 @@ public class NoticeManager
         {
             return;
         }
-        MessageBus.Current.SendMessage(content, EMsgCommand.SendSnackMsg.ToString());
+        AppEvents.SendSnackMsgRequested.OnNext(content);
     }
 
     public void SendMessage(string? content)
@@ -22,7 +20,7 @@ public class NoticeManager
         {
             return;
         }
-        MessageBus.Current.SendMessage(content, EMsgCommand.SendMsgView.ToString());
+        AppEvents.SendMsgViewRequested.OnNext(content);
     }
 
     public void SendMessageEx(string? content)
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index 1e64d22a..9ea9e296 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -300,7 +300,7 @@ public class MainWindowViewModel : MyReactiveObject
             Logging.SaveLog("MyAppExitAsync Begin");
 
             await SysProxyHandler.UpdateSysProxy(_config, true);
-            MessageBus.Current.SendMessage("", EMsgCommand.AppExit.ToString());
+            AppEvents.AppExitRequested.OnNext(Unit.Default);
 
             await ConfigHandler.SaveConfig(_config);
             await ProfileExManager.Instance.SaveTo();
diff --git a/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs b/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs
index 4d13d007..87a3016c 100644
--- a/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs
@@ -1,4 +1,5 @@
 using System.Collections.Concurrent;
+using System.Reactive.Linq;
 using System.Text.RegularExpressions;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
@@ -34,12 +35,10 @@ public class MsgViewModel : MyReactiveObject
           y => y == true)
               .Subscribe(c => { _config.MsgUIItem.AutoRefresh = AutoRefresh; });
 
-        MessageBus.Current.Listen<string>(EMsgCommand.SendMsgView.ToString()).Subscribe(OnNext);
-    }
-
-    private async void OnNext(string x)
-    {
-        await AppendQueueMsg(x);
+        AppEvents.SendMsgViewRequested
+         .AsObservable()
+         //.ObserveOn(RxApp.MainThreadScheduler)
+         .Subscribe(async content => await AppendQueueMsg(content));
     }
 
     private async Task AppendQueueMsg(string msg)
diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
index 0633e9af..0f1472a4 100644
--- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
@@ -1,4 +1,5 @@
 using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -39,7 +40,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
         menuBackupAndRestore.Click += MenuBackupAndRestore_Click;
         menuClose.Click += MenuClose_Click;
 
-        MessageBus.Current.Listen<string>(EMsgCommand.SendSnackMsg.ToString()).Subscribe(DelegateSnackMsg);
         ViewModel = new MainWindowViewModel(UpdateViewHandler);
         Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(MainWindowViewModel));
 
@@ -136,6 +136,18 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
                     this.Bind(ViewModel, vm => vm.TabMainSelectedIndex, v => v.tabMain2.SelectedIndex).DisposeWith(disposables);
                     break;
             }
+
+            AppEvents.SendSnackMsgRequested
+              .AsObservable()
+              .ObserveOn(RxApp.MainThreadScheduler)
+              .Subscribe(async content => await DelegateSnackMsg(content))
+              .DisposeWith(disposables);
+
+            AppEvents.AppExitRequested
+              .AsObservable()
+              .ObserveOn(RxApp.MainThreadScheduler)
+              .Subscribe(_ => StorageUI())
+              .DisposeWith(disposables);
         });
 
         if (Utils.IsWindows())
@@ -156,7 +168,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
         menuAddServerViaScan.IsVisible = false;
 
         AddHelpMenuItem();
-        MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
     }
 
     #region Event
@@ -168,11 +179,9 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
             DispatcherPriority.Default);
     }
 
-    private void DelegateSnackMsg(string content)
+    private async Task DelegateSnackMsg(string content)
     {
-        Dispatcher.UIThread.Post(() =>
-                   _manager?.Show(new Notification(null, content, NotificationType.Information)),
-        DispatcherPriority.Normal);
+        _manager?.Show(new Notification(null, content, NotificationType.Information));
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
@@ -462,7 +471,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
         }
     }
 
-    private void StorageUI(string? n = null)
+    private void StorageUI()
     {
         ConfigHandler.SaveWindowSizeItem(_config, GetType().Name, Width, Height);
 
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
index 73115ed7..4253661b 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
@@ -1,4 +1,5 @@
 using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -96,11 +97,16 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
             this.BindCommand(ViewModel, vm => vm.Export2ClientConfigClipboardCmd, v => v.menuExport2ClientConfigClipboard).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.Export2ShareUrlCmd, v => v.menuExport2ShareUrl).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.Export2ShareUrlBase64Cmd, v => v.menuExport2ShareUrlBase64).DisposeWith(disposables);
+
+            AppEvents.AppExitRequested
+              .AsObservable()
+              .ObserveOn(RxApp.MainThreadScheduler)
+              .Subscribe(_ => StorageUI())
+              .DisposeWith(disposables);
         });
 
         RestoreUI();
         ViewModel?.RefreshServers();
-        MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
     }
 
     private async void LstProfiles_Sorting(object? sender, DataGridColumnEventArgs e)
@@ -412,7 +418,7 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
         }
     }
 
-    private void StorageUI(string? n = null)
+    private void StorageUI()
     {
         List<ColumnItem> lvColumnItem = new();
         foreach (var item2 in lstProfiles.Columns)
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index 37c6bba7..4270ce55 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -36,7 +37,6 @@ public partial class MainWindow
         menuCheckUpdate.Click += MenuCheckUpdate_Click;
         menuBackupAndRestore.Click += MenuBackupAndRestore_Click;
 
-        MessageBus.Current.Listen<string>(EMsgCommand.SendSnackMsg.ToString()).Subscribe(DelegateSnackMsg);
         ViewModel = new MainWindowViewModel(UpdateViewHandler);
         Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(MainWindowViewModel));
 
@@ -133,6 +133,18 @@ public partial class MainWindow
                     this.Bind(ViewModel, vm => vm.TabMainSelectedIndex, v => v.tabMain2.SelectedIndex).DisposeWith(disposables);
                     break;
             }
+
+            AppEvents.SendSnackMsgRequested
+              .AsObservable()
+              .ObserveOn(RxApp.MainThreadScheduler)
+              .Subscribe(async content => await DelegateSnackMsg(content))
+              .DisposeWith(disposables);
+
+            AppEvents.AppExitRequested
+              .AsObservable()
+              .ObserveOn(RxApp.MainThreadScheduler)
+              .Subscribe(_ => StorageUI())
+              .DisposeWith(disposables);
         });
 
         this.Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
@@ -144,7 +156,6 @@ public partial class MainWindow
 
         AddHelpMenuItem();
         WindowsManager.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, null);
-        MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
     }
 
     #region Event
@@ -157,12 +168,9 @@ public partial class MainWindow
         }));
     }
 
-    private void DelegateSnackMsg(string content)
+    private async Task DelegateSnackMsg(string content)
     {
-        Application.Current?.Dispatcher.Invoke((() =>
-        {
-            MainSnackbar.MessageQueue?.Enqueue(content);
-        }), DispatcherPriority.Normal);
+        MainSnackbar.MessageQueue?.Enqueue(content);
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
@@ -423,7 +431,7 @@ public partial class MainWindow
         }
     }
 
-    private void StorageUI(string? n = null)
+    private void StorageUI()
     {
         ConfigHandler.SaveWindowSizeItem(_config, GetType().Name, Width, Height);
 
diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
index 456e6ddd..f2456b57 100644
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
+++ b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
@@ -1,4 +1,5 @@
 using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
@@ -90,11 +91,16 @@ public partial class ProfilesView
             this.BindCommand(ViewModel, vm => vm.Export2ClientConfigClipboardCmd, v => v.menuExport2ClientConfigClipboard).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.Export2ShareUrlCmd, v => v.menuExport2ShareUrl).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.Export2ShareUrlBase64Cmd, v => v.menuExport2ShareUrlBase64).DisposeWith(disposables);
+
+            AppEvents.AppExitRequested
+              .AsObservable()
+              .ObserveOn(RxApp.MainThreadScheduler)
+              .Subscribe(_ => StorageUI())
+              .DisposeWith(disposables);
         });
 
         RestoreUI();
         ViewModel?.RefreshServers();
-        MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
     }
 
     #region Event
@@ -369,7 +375,7 @@ public partial class ProfilesView
         }
     }
 
-    private void StorageUI(string? n = null)
+    private void StorageUI()
     {
         List<ColumnItem> lvColumnItem = new();
         foreach (var t in lstProfiles.Columns)

From 5a3286dad1b5d79f8c0ac9886b0f448d2aec98bf Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 30 Aug 2025 18:01:01 +0800
Subject: [PATCH 090/115] Using  RxApp replace ViewAction

---
 v2rayN/ServiceLib/Enums/EViewAction.cs        |  9 -----
 v2rayN/ServiceLib/Handler/AppEvents.cs        |  2 +
 .../ViewModels/CheckUpdateViewModel.cs        | 26 ++++++++++---
 .../ViewModels/ClashConnectionsViewModel.cs   |  9 ++++-
 .../ViewModels/ClashProxiesViewModel.cs       | 15 ++++++--
 .../ViewModels/MainWindowViewModel.cs         | 19 ++--------
 .../ViewModels/ProfilesViewModel.cs           | 37 +++++++++++++++----
 .../ViewModels/StatusBarViewModel.cs          | 33 +++++++++++++++--
 .../Views/CheckUpdateView.axaml.cs            | 20 ----------
 .../Views/ClashConnectionsView.axaml.cs       | 12 ------
 .../Views/ClashProxiesView.axaml.cs           | 18 ---------
 .../Views/FullConfigTemplateWindow.axaml.cs   |  1 +
 .../Views/GlobalHotkeySettingWindow.axaml.cs  |  1 +
 .../v2rayN.Desktop/Views/MainWindow.axaml.cs  | 14 -------
 .../Views/OptionSettingWindow.axaml.cs        |  1 +
 .../Views/ProfilesView.axaml.cs               |  9 -----
 .../Views/RoutingSettingWindow.axaml.cs       |  1 +
 .../Views/StatusBarView.axaml.cs              |  9 -----
 .../Views/SubSettingWindow.axaml.cs           |  1 +
 v2rayN/v2rayN/Views/CheckUpdateView.xaml.cs   | 23 ------------
 .../v2rayN/Views/ClashConnectionsView.xaml.cs | 13 -------
 v2rayN/v2rayN/Views/ClashProxiesView.xaml.cs  | 22 -----------
 v2rayN/v2rayN/Views/MainWindow.xaml.cs        | 16 --------
 v2rayN/v2rayN/Views/ProfilesView.xaml.cs      |  9 -----
 v2rayN/v2rayN/Views/StatusBarView.xaml.cs     | 11 ------
 25 files changed, 108 insertions(+), 223 deletions(-)

diff --git a/v2rayN/ServiceLib/Enums/EViewAction.cs b/v2rayN/ServiceLib/Enums/EViewAction.cs
index bf7360e2..c4689c9a 100644
--- a/v2rayN/ServiceLib/Enums/EViewAction.cs
+++ b/v2rayN/ServiceLib/Enums/EViewAction.cs
@@ -32,16 +32,7 @@ public enum EViewAction
     FullConfigTemplateWindow,
     GlobalHotkeySettingWindow,
     SubSettingWindow,
-    DispatcherSpeedTest,
-    DispatcherRefreshConnections,
-    DispatcherRefreshProxyGroups,
-    DispatcherProxiesDelayTest,
-    DispatcherStatistics,
-    DispatcherServerAvailability,
-    DispatcherReload,
     DispatcherRefreshServersBiz,
     DispatcherRefreshIcon,
-    DispatcherCheckUpdate,
-    DispatcherCheckUpdateFinished,
     DispatcherShowMsg,
 }
diff --git a/v2rayN/ServiceLib/Handler/AppEvents.cs b/v2rayN/ServiceLib/Handler/AppEvents.cs
index 093c5259..a651365d 100644
--- a/v2rayN/ServiceLib/Handler/AppEvents.cs
+++ b/v2rayN/ServiceLib/Handler/AppEvents.cs
@@ -12,4 +12,6 @@ public static class AppEvents
     public static readonly Subject<string> SendMsgViewRequested = new();
 
     public static readonly Subject<Unit> AppExitRequested = new();
+
+    public static readonly Subject<ServerSpeedItem> DispatcherStatisticsRequested = new();
 }
diff --git a/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs b/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
index 59a3b163..c87f6737 100644
--- a/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
@@ -1,4 +1,6 @@
 using System.Reactive;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using System.Runtime.InteropServices;
 using DynamicData;
 using DynamicData.Binding;
@@ -188,7 +190,7 @@ public class CheckUpdateViewModel : MyReactiveObject
     {
         if (_lstUpdated.Count > 0 && _lstUpdated.Count(x => x.IsFinished == true) == _lstUpdated.Count)
         {
-            _updateView?.Invoke(EViewAction.DispatcherCheckUpdateFinished, false);
+            await UpdateFinishedSub(false);
             await Task.Delay(2000);
             await UpgradeCore();
 
@@ -198,11 +200,20 @@ public class CheckUpdateViewModel : MyReactiveObject
                 await UpgradeN();
             }
             await Task.Delay(1000);
-            _updateView?.Invoke(EViewAction.DispatcherCheckUpdateFinished, true);
+            await UpdateFinishedSub(true);
         }
     }
 
-    public void UpdateFinishedResult(bool blReload)
+    private async Task UpdateFinishedSub(bool blReload)
+    {
+        RxApp.MainThreadScheduler.Schedule(blReload, (scheduler, blReload) =>
+        {
+            _ = UpdateFinishedResult(blReload);
+            return Disposable.Empty;
+        });
+    }
+
+    public async Task UpdateFinishedResult(bool blReload)
     {
         if (blReload)
         {
@@ -299,10 +310,15 @@ public class CheckUpdateViewModel : MyReactiveObject
             CoreType = coreType,
             Remarks = msg,
         };
-        await _updateView?.Invoke(EViewAction.DispatcherCheckUpdate, item);
+
+        RxApp.MainThreadScheduler.Schedule(item, (scheduler, model) =>
+        {
+            _ = UpdateViewResult(model);
+            return Disposable.Empty;
+        });
     }
 
-    public void UpdateViewResult(CheckUpdateModel model)
+    public async Task UpdateViewResult(CheckUpdateModel model)
     {
         var found = _checkUpdateModel.FirstOrDefault(t => t.CoreType == model.CoreType);
         if (found == null)
diff --git a/v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs b/v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs
index 222e1a8d..1fd9015c 100644
--- a/v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs
@@ -1,4 +1,5 @@
 using System.Reactive;
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using DynamicData;
 using DynamicData.Binding;
@@ -64,10 +65,14 @@ public class ClashConnectionsViewModel : MyReactiveObject
             return;
         }
 
-        _ = _updateView?.Invoke(EViewAction.DispatcherRefreshConnections, ret?.connections);
+        RxApp.MainThreadScheduler.Schedule(ret?.connections, (scheduler, model) =>
+        {
+            _ = RefreshConnections(model);
+            return Disposable.Empty;
+        });
     }
 
-    public void RefreshConnections(List<ConnectionItem>? connections)
+    public async Task RefreshConnections(List<ConnectionItem>? connections)
     {
         _connectionItems.Clear();
 
diff --git a/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs b/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
index 0149c0fb..531b4a8e 100644
--- a/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
@@ -1,4 +1,6 @@
 using System.Reactive;
+using System.Reactive.Concurrency;
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using DynamicData;
 using DynamicData.Binding;
@@ -168,11 +170,11 @@ public class ClashProxiesViewModel : MyReactiveObject
 
         if (refreshUI)
         {
-            _updateView?.Invoke(EViewAction.DispatcherRefreshProxyGroups, null);
+            RxApp.MainThreadScheduler.Schedule(() => _ = RefreshProxyGroups());
         }
     }
 
-    public void RefreshProxyGroups()
+    public async Task RefreshProxyGroups()
     {
         if (_proxies == null)
         {
@@ -380,12 +382,17 @@ public class ClashProxiesViewModel : MyReactiveObject
                 return;
             }
 
-            await _updateView?.Invoke(EViewAction.DispatcherProxiesDelayTest, new SpeedTestResult() { IndexId = item.Name, Delay = result });
+            var model = new SpeedTestResult() { IndexId = item.Name, Delay = result };
+            RxApp.MainThreadScheduler.Schedule(model, (scheduler, model) =>
+            {
+                _ = ProxiesDelayTestResult(model);
+                return Disposable.Empty;
+            });
         });
         await Task.CompletedTask;
     }
 
-    public void ProxiesDelayTestResult(SpeedTestResult result)
+    public async Task ProxiesDelayTestResult(SpeedTestResult result)
     {
         //UpdateHandler(false, $"{item.name}={result}");
         var detail = _proxyDetails.FirstOrDefault(it => it.Name == result.IndexId);
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index 9ea9e296..fa5dc82b 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -1,4 +1,5 @@
 using System.Reactive;
+using System.Reactive.Concurrency;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Splat;
@@ -278,19 +279,7 @@ public class MainWindowViewModel : MyReactiveObject
         {
             return;
         }
-        await _updateView?.Invoke(EViewAction.DispatcherStatistics, update);
-    }
-
-    public void SetStatisticsResult(ServerSpeedItem update)
-    {
-        if (_config.GuiItem.DisplayRealTimeSpeed)
-        {
-            Locator.Current.GetService<StatusBarViewModel>()?.UpdateStatistics(update);
-        }
-        if (_config.GuiItem.EnableStatistics && (update.ProxyUp + update.ProxyDown) > 0 && DateTime.Now.Second % 9 == 0)
-        {
-            Locator.Current.GetService<ProfilesViewModel>()?.UpdateStatistics(update);
-        }
+        AppEvents.DispatcherStatisticsRequested.OnNext(update);
     }
 
     public async Task MyAppExitAsync(bool blWindowsShutDown)
@@ -578,7 +567,7 @@ public class MainWindowViewModel : MyReactiveObject
         });
         Locator.Current.GetService<StatusBarViewModel>()?.TestServerAvailability();
 
-        _updateView?.Invoke(EViewAction.DispatcherReload, null);
+        RxApp.MainThreadScheduler.Schedule(() => _ = ReloadResult());
 
         BlReloadEnabled = true;
         if (_hasNextReloadJob)
@@ -588,7 +577,7 @@ public class MainWindowViewModel : MyReactiveObject
         }
     }
 
-    public void ReloadResult()
+    public async Task ReloadResult()
     {
         // BlReloadEnabled = true;
         //Locator.Current.GetService<StatusBarViewModel>()?.ChangeSystemProxyAsync(_config.systemProxyItem.sysProxyType, false);
diff --git a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
index 49e47949..10ec4b4b 100644
--- a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
@@ -1,4 +1,5 @@
 using System.Reactive;
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Text;
 using DynamicData;
@@ -247,13 +248,19 @@ public class ProfilesViewModel : MyReactiveObject
 
         #endregion WhenAnyValue && ReactiveCommand
 
-        if (_updateView != null)
-        {
-            AppEvents.ProfilesRefreshRequested
+        #region AppEvents
+
+        AppEvents.ProfilesRefreshRequested
             .AsObservable()
             .ObserveOn(RxApp.MainThreadScheduler)
-            .Subscribe(async _ => await RefreshServersBiz());//.DisposeWith(_disposables);
-        }
+            .Subscribe(async _ => await RefreshServersBiz());
+
+        AppEvents.DispatcherStatisticsRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async result => await UpdateStatistics(result));
+
+        #endregion AppEvents
 
         _ = Init();
     }
@@ -278,7 +285,7 @@ public class ProfilesViewModel : MyReactiveObject
         Locator.Current.GetService<MainWindowViewModel>()?.Reload();
     }
 
-    public void SetSpeedTestResult(SpeedTestResult result)
+    public async Task SetSpeedTestResult(SpeedTestResult result)
     {
         if (result.IndexId.IsNullOrEmpty())
         {
@@ -305,8 +312,15 @@ public class ProfilesViewModel : MyReactiveObject
         //_profileItems.Replace(item, JsonUtils.DeepCopy(item));
     }
 
-    public void UpdateStatistics(ServerSpeedItem update)
+    public async Task UpdateStatistics(ServerSpeedItem update)
     {
+        if (!_config.GuiItem.EnableStatistics
+            || (update.ProxyUp + update.ProxyDown) <= 0
+            || DateTime.Now.Second % 3 != 0)
+        {
+            return;
+        }
+
         try
         {
             var item = _profileItems.FirstOrDefault(it => it.IndexId == update.IndexId);
@@ -753,7 +767,14 @@ public class ProfilesViewModel : MyReactiveObject
             return;
         }
 
-        _speedtestService ??= new SpeedtestService(_config, (SpeedTestResult result) => _updateView?.Invoke(EViewAction.DispatcherSpeedTest, result));
+        _speedtestService ??= new SpeedtestService(_config, async (SpeedTestResult result) =>
+        {
+            RxApp.MainThreadScheduler.Schedule(result, (scheduler, result) =>
+            {
+                _ = SetSpeedTestResult(result);
+                return Disposable.Empty;
+            });
+        });
         _speedtestService?.RunLoop(actionType, lstSelected);
     }
 
diff --git a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
index 1be54da7..c89f55cb 100644
--- a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
@@ -1,4 +1,5 @@
 using System.Reactive;
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Text;
 using DynamicData.Binding;
@@ -198,10 +199,20 @@ public class StatusBarViewModel : MyReactiveObject
 
         #endregion WhenAnyValue && ReactiveCommand
 
+        #region AppEvents
+
         if (updateView != null)
         {
             InitUpdateView(updateView);
         }
+
+        AppEvents.DispatcherStatisticsRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async result => await UpdateStatistics(result));
+
+        #endregion AppEvents
+
         _ = Init();
     }
 
@@ -331,15 +342,24 @@ public class StatusBarViewModel : MyReactiveObject
             return;
         }
 
-        _updateView?.Invoke(EViewAction.DispatcherServerAvailability, ResUI.Speedtesting);
+        await TestServerAvailabilitySub(ResUI.Speedtesting);
 
         var msg = await Task.Run(ConnectionHandler.RunAvailabilityCheck);
 
         NoticeManager.Instance.SendMessageEx(msg);
-        _updateView?.Invoke(EViewAction.DispatcherServerAvailability, msg);
+        await TestServerAvailabilitySub(msg);
     }
 
-    public void TestServerAvailabilityResult(string msg)
+    private async Task TestServerAvailabilitySub(string msg)
+    {
+        RxApp.MainThreadScheduler.Schedule(msg, (scheduler, msg) =>
+        {
+            _ = TestServerAvailabilityResult(msg);
+            return Disposable.Empty;
+        });
+    }
+
+    public async Task TestServerAvailabilityResult(string msg)
     {
         RunningInfoDisplay = msg;
     }
@@ -508,8 +528,13 @@ public class StatusBarViewModel : MyReactiveObject
         await Task.CompletedTask;
     }
 
-    public void UpdateStatistics(ServerSpeedItem update)
+    public async Task UpdateStatistics(ServerSpeedItem update)
     {
+        if (!_config.GuiItem.DisplayRealTimeSpeed)
+        {
+            return;
+        }
+
         try
         {
             if (_config.IsRunningCore(ECoreType.sing_box))
diff --git a/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs
index a8b04bfc..9567c1fd 100644
--- a/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs
@@ -1,6 +1,5 @@
 using System.Reactive.Disposables;
 using Avalonia.ReactiveUI;
-using Avalonia.Threading;
 using ReactiveUI;
 
 namespace v2rayN.Desktop.Views;
@@ -24,25 +23,6 @@ public partial class CheckUpdateView : ReactiveUserControl<CheckUpdateViewModel>
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
     {
-        switch (action)
-        {
-            case EViewAction.DispatcherCheckUpdate:
-                if (obj is null)
-                    return false;
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.UpdateViewResult((CheckUpdateModel)obj),
-                DispatcherPriority.Default);
-                break;
-
-            case EViewAction.DispatcherCheckUpdateFinished:
-                if (obj is null)
-                    return false;
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.UpdateFinishedResult((bool)obj),
-                DispatcherPriority.Default);
-                break;
-        }
-
         return await Task.FromResult(true);
     }
 }
diff --git a/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs
index c39724eb..76a0fd1d 100644
--- a/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs
@@ -2,7 +2,6 @@ using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
-using Avalonia.Threading;
 using ReactiveUI;
 
 namespace v2rayN.Desktop.Views;
@@ -31,17 +30,6 @@ public partial class ClashConnectionsView : ReactiveUserControl<ClashConnections
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
     {
-        switch (action)
-        {
-            case EViewAction.DispatcherRefreshConnections:
-                if (obj is null)
-                    return false;
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.RefreshConnections((List<ConnectionItem>?)obj),
-                 DispatcherPriority.Default);
-                break;
-        }
-
         return await Task.FromResult(true);
     }
 
diff --git a/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml.cs
index 1b63f4f4..754dd2a1 100644
--- a/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml.cs
@@ -1,7 +1,6 @@
 using System.Reactive.Disposables;
 using Avalonia.Input;
 using Avalonia.ReactiveUI;
-using Avalonia.Threading;
 using DynamicData;
 using ReactiveUI;
 using Splat;
@@ -40,23 +39,6 @@ public partial class ClashProxiesView : ReactiveUserControl<ClashProxiesViewMode
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
     {
-        switch (action)
-        {
-            case EViewAction.DispatcherRefreshProxyGroups:
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.RefreshProxyGroups(),
-                    DispatcherPriority.Default);
-                break;
-
-            case EViewAction.DispatcherProxiesDelayTest:
-                if (obj is null)
-                    return false;
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.ProxiesDelayTestResult((SpeedTestResult)obj),
-                    DispatcherPriority.Default);
-                break;
-        }
-
         return await Task.FromResult(true);
     }
 
diff --git a/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
index 974b2823..38f3d34c 100644
--- a/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
@@ -50,6 +50,7 @@ public partial class FullConfigTemplateWindow : WindowBase<FullConfigTemplateVie
     {
         ProcUtils.ProcessStart("https://github.com/2dust/v2rayN/wiki/Description-of-some-ui#%E5%AE%8C%E6%95%B4%E9%85%8D%E7%BD%AE%E6%A8%A1%E6%9D%BF%E8%AE%BE%E7%BD%AE");
     }
+
     private void Window_Loaded(object? sender, RoutedEventArgs e)
     {
         btnCancel.Focus();
diff --git a/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs
index 966f4da0..18ee0f1b 100644
--- a/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs
@@ -135,6 +135,7 @@ public partial class GlobalHotkeySettingWindow : WindowBase<GlobalHotkeySettingV
 
         return res.ToString();
     }
+
     private void Window_Loaded(object? sender, RoutedEventArgs e)
     {
         btnCancel.Focus();
diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
index 0f1472a4..cc769c79 100644
--- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
@@ -222,20 +222,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
                 DispatcherPriority.Default);
                 break;
 
-            case EViewAction.DispatcherStatistics:
-                if (obj is null)
-                    return false;
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.SetStatisticsResult((ServerSpeedItem)obj),
-                DispatcherPriority.Default);
-                break;
-
-            case EViewAction.DispatcherReload:
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.ReloadResult(),
-                DispatcherPriority.Default);
-                break;
-
             case EViewAction.Shutdown:
                 if (obj != null && _blCloseByUser == false)
                 {
diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
index 673fc819..6a313a35 100644
--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
@@ -211,6 +211,7 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
             ViewModel.destOverride = clbdestOverride.SelectedItems.Cast<string>().ToList();
         }
     }
+
     private void Window_Loaded(object? sender, RoutedEventArgs e)
     {
         btnCancel.Focus();
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
index 4253661b..733a2194 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
@@ -183,15 +183,6 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
                     return false;
                 return await new SubEditWindow((SubItem)obj).ShowDialog<bool>(_window);
 
-            case EViewAction.DispatcherSpeedTest:
-                if (obj is null)
-                    return false;
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.SetSpeedTestResult((SpeedTestResult)obj),
-                DispatcherPriority.Default);
-
-                break;
-
             case EViewAction.DispatcherRefreshServersBiz:
                 Dispatcher.UIThread.Post(RefreshServersBiz, DispatcherPriority.Default);
                 break;
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs
index b0ff1e89..50a79d18 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs
@@ -135,6 +135,7 @@ public partial class RoutingSettingWindow : WindowBase<RoutingSettingViewModel>
             }
         }
     }
+
     private void Window_Loaded(object? sender, RoutedEventArgs e)
     {
         btnCancel.Focus();
diff --git a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
index e4458721..d90affe2 100644
--- a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
@@ -56,15 +56,6 @@ public partial class StatusBarView : ReactiveUserControl<StatusBarViewModel>
     {
         switch (action)
         {
-            case EViewAction.DispatcherServerAvailability:
-                if (obj is null)
-                    return false;
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.TestServerAvailabilityResult((string)obj),
-                DispatcherPriority.Default);
-                break;
-                 
-
             case EViewAction.DispatcherRefreshIcon:
                 Dispatcher.UIThread.Post(() =>
                 {
diff --git a/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs
index b708f610..d563aeb1 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs
@@ -117,6 +117,7 @@ public partial class SubSettingWindow : WindowBase<SubSettingViewModel>
             menuClose_Click(null, null);
         }
     }
+
     private void Window_Loaded(object? sender, RoutedEventArgs e)
     {
         lstSubscription.Focus();
diff --git a/v2rayN/v2rayN/Views/CheckUpdateView.xaml.cs b/v2rayN/v2rayN/Views/CheckUpdateView.xaml.cs
index 931c5e7a..cf53fc1a 100644
--- a/v2rayN/v2rayN/Views/CheckUpdateView.xaml.cs
+++ b/v2rayN/v2rayN/Views/CheckUpdateView.xaml.cs
@@ -1,6 +1,4 @@
 using System.Reactive.Disposables;
-using System.Windows;
-using System.Windows.Threading;
 using ReactiveUI;
 
 namespace v2rayN.Views;
@@ -24,27 +22,6 @@ public partial class CheckUpdateView
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
     {
-        switch (action)
-        {
-            case EViewAction.DispatcherCheckUpdate:
-                if (obj is null)
-                    return false;
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    ViewModel?.UpdateViewResult((CheckUpdateModel)obj);
-                }), DispatcherPriority.Normal);
-                break;
-
-            case EViewAction.DispatcherCheckUpdateFinished:
-                if (obj is null)
-                    return false;
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    ViewModel?.UpdateFinishedResult((bool)obj);
-                }), DispatcherPriority.Normal);
-                break;
-        }
-
         return await Task.FromResult(true);
     }
 }
diff --git a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml.cs b/v2rayN/v2rayN/Views/ClashConnectionsView.xaml.cs
index 18b97d2a..da1795bd 100644
--- a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml.cs
+++ b/v2rayN/v2rayN/Views/ClashConnectionsView.xaml.cs
@@ -1,7 +1,6 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Threading;
 using ReactiveUI;
 
 namespace v2rayN.Views;
@@ -33,18 +32,6 @@ public partial class ClashConnectionsView
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
     {
-        switch (action)
-        {
-            case EViewAction.DispatcherRefreshConnections:
-                if (obj is null)
-                    return false;
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    ViewModel?.RefreshConnections((List<ConnectionItem>?)obj);
-                }), DispatcherPriority.Normal);
-                break;
-        }
-
         return await Task.FromResult(true);
     }
 
diff --git a/v2rayN/v2rayN/Views/ClashProxiesView.xaml.cs b/v2rayN/v2rayN/Views/ClashProxiesView.xaml.cs
index c174a110..eff95de9 100644
--- a/v2rayN/v2rayN/Views/ClashProxiesView.xaml.cs
+++ b/v2rayN/v2rayN/Views/ClashProxiesView.xaml.cs
@@ -1,7 +1,5 @@
 using System.Reactive.Disposables;
-using System.Windows;
 using System.Windows.Input;
-using System.Windows.Threading;
 using ReactiveUI;
 using Splat;
 
@@ -41,26 +39,6 @@ public partial class ClashProxiesView
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
     {
-        switch (action)
-        {
-            case EViewAction.DispatcherRefreshProxyGroups:
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    ViewModel?.RefreshProxyGroups();
-                }), DispatcherPriority.Normal);
-                break;
-
-            case EViewAction.DispatcherProxiesDelayTest:
-
-                if (obj is null)
-                    return false;
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    ViewModel?.ProxiesDelayTestResult((SpeedTestResult)obj);
-                }), DispatcherPriority.Normal);
-                break;
-        }
-
         return await Task.FromResult(true);
     }
 
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index 4270ce55..4c35d2e9 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -212,22 +212,6 @@ public partial class MainWindow
                 }), DispatcherPriority.Normal);
                 break;
 
-            case EViewAction.DispatcherStatistics:
-                if (obj is null)
-                    return false;
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    ViewModel?.SetStatisticsResult((ServerSpeedItem)obj);
-                }), DispatcherPriority.Normal);
-                break;
-
-            case EViewAction.DispatcherReload:
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    ViewModel?.ReloadResult();
-                }), DispatcherPriority.Normal);
-                break;
-
             case EViewAction.Shutdown:
                 Application.Current?.Dispatcher.Invoke((() =>
                 {
diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
index f2456b57..0248a53a 100644
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
+++ b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
@@ -164,15 +164,6 @@ public partial class ProfilesView
                     return false;
                 return (new SubEditWindow((SubItem)obj)).ShowDialog() ?? false;
 
-            case EViewAction.DispatcherSpeedTest:
-                if (obj is null)
-                    return false;
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    ViewModel?.SetSpeedTestResult((SpeedTestResult)obj);
-                }), DispatcherPriority.Normal);
-                break;
-
             case EViewAction.DispatcherRefreshServersBiz:
                 Application.Current?.Dispatcher.Invoke(RefreshServersBiz, DispatcherPriority.Normal);
                 break;
diff --git a/v2rayN/v2rayN/Views/StatusBarView.xaml.cs b/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
index c29fbdc3..a4fcef55 100644
--- a/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
+++ b/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
@@ -77,17 +77,6 @@ public partial class StatusBarView
     {
         switch (action)
         {
-            case EViewAction.DispatcherServerAvailability:
-                if (obj is null)
-                    return false;
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    ViewModel?.TestServerAvailabilityResult((string)obj);
-                }), DispatcherPriority.Normal);
-                break;
-
-        
-
             case EViewAction.DispatcherRefreshIcon:
                 Application.Current?.Dispatcher.Invoke((async () =>
                 {

From ef4a1903ecbcadfef35d174dd8ca4e8d2ab30e39 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Sat, 30 Aug 2025 19:44:54 +0800
Subject: [PATCH 091/115] Update mihomo download url (#7852)

---
 v2rayN/ServiceLib/Manager/CoreInfoManager.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/v2rayN/ServiceLib/Manager/CoreInfoManager.cs b/v2rayN/ServiceLib/Manager/CoreInfoManager.cs
index 790e8839..b83bd7ac 100644
--- a/v2rayN/ServiceLib/Manager/CoreInfoManager.cs
+++ b/v2rayN/ServiceLib/Manager/CoreInfoManager.cs
@@ -125,15 +125,15 @@ public sealed class CoreInfoManager
                 new CoreInfo
                 {
                     CoreType = ECoreType.mihomo,
-                    CoreExes = ["mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-linux-amd64", "clash", "mihomo"],
+                    CoreExes = ["mihomo-windows-amd64-v1", "mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-linux-amd64", "clash", "mihomo"],
                     Arguments = "-f {0}" + PortableMode(),
                     Url = GetCoreUrl(ECoreType.mihomo),
                     ReleaseApiUrl = urlMihomo.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                    DownloadUrlWin64 = urlMihomo + "/download/{0}/mihomo-windows-amd64-compatible-{0}.zip",
+                    DownloadUrlWin64 = urlMihomo + "/download/{0}/mihomo-windows-amd64-v1-{0}.zip",
                     DownloadUrlWinArm64 = urlMihomo + "/download/{0}/mihomo-windows-arm64-{0}.zip",
-                    DownloadUrlLinux64 = urlMihomo + "/download/{0}/mihomo-linux-amd64-compatible-{0}.gz",
+                    DownloadUrlLinux64 = urlMihomo + "/download/{0}/mihomo-linux-amd64-v1-{0}.gz",
                     DownloadUrlLinuxArm64 = urlMihomo + "/download/{0}/mihomo-linux-arm64-{0}.gz",
-                    DownloadUrlOSX64 = urlMihomo + "/download/{0}/mihomo-darwin-amd64-compatible-{0}.gz",
+                    DownloadUrlOSX64 = urlMihomo + "/download/{0}/mihomo-darwin-amd64-v1-{0}.gz",
                     DownloadUrlOSXArm64 = urlMihomo + "/download/{0}/mihomo-darwin-arm64-{0}.gz",
                     Match = "Mihomo",
                     VersionArg = "-v",

From e3a63db96687401dc1d647a805e073fe04c53760 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 30 Aug 2025 20:36:16 +0800
Subject: [PATCH 092/115] Using RxApp replace ViewAction

---
 v2rayN/ServiceLib/Enums/EViewAction.cs            |  1 -
 v2rayN/ServiceLib/Handler/AppEvents.cs            |  2 ++
 .../ServiceLib/ViewModels/MainWindowViewModel.cs  |  2 +-
 v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs |  5 -----
 v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs   |  6 ------
 v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs | 13 ++++++-------
 v2rayN/v2rayN/Views/MainWindow.xaml.cs            |  7 -------
 v2rayN/v2rayN/Views/ProfilesView.xaml.cs          | 15 +++++++--------
 8 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/v2rayN/ServiceLib/Enums/EViewAction.cs b/v2rayN/ServiceLib/Enums/EViewAction.cs
index c4689c9a..7677c6e9 100644
--- a/v2rayN/ServiceLib/Enums/EViewAction.cs
+++ b/v2rayN/ServiceLib/Enums/EViewAction.cs
@@ -6,7 +6,6 @@ public enum EViewAction
     ShowYesNo,
     SaveFileDialog,
     AddBatchRoutingRulesYesNo,
-    AdjustMainLvColWidth,
     SetClipboardData,
     AddServerViaClipboard,
     ImportRulesFromClipboard,
diff --git a/v2rayN/ServiceLib/Handler/AppEvents.cs b/v2rayN/ServiceLib/Handler/AppEvents.cs
index a651365d..f61053ae 100644
--- a/v2rayN/ServiceLib/Handler/AppEvents.cs
+++ b/v2rayN/ServiceLib/Handler/AppEvents.cs
@@ -13,5 +13,7 @@ public static class AppEvents
 
     public static readonly Subject<Unit> AppExitRequested = new();
 
+    public static readonly Subject<Unit> AdjustMainLvColWidthRequested = new();
+
     public static readonly Subject<ServerSpeedItem> DispatcherStatisticsRequested = new();
 }
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index fa5dc82b..45b8ffa7 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -268,7 +268,7 @@ public class MainWindowViewModel : MyReactiveObject
             }
             if (_config.UiItem.EnableAutoAdjustMainLvColWidth)
             {
-                _updateView?.Invoke(EViewAction.AdjustMainLvColWidth, null);
+                AppEvents.AdjustMainLvColWidthRequested.OnNext(Unit.Default);
             }
         }
     }
diff --git a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
index 10ec4b4b..058855a8 100644
--- a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
@@ -348,11 +348,6 @@ public class ProfilesViewModel : MyReactiveObject
         }
     }
 
-    public async Task AutofitColumnWidthAsync()
-    {
-        await _updateView?.Invoke(EViewAction.AdjustMainLvColWidth, null);
-    }
-
     #endregion Actions
 
     #region Servers && Groups
diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
index cc769c79..417bbb9f 100644
--- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
@@ -250,12 +250,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
                     await ViewModel.AddServerViaClipboardAsync(clipboardData);
                 }
                 break;
-
-            case EViewAction.AdjustMainLvColWidth:
-                Dispatcher.UIThread.Post(() =>
-                   Locator.Current.GetService<ProfilesViewModel>()?.AutofitColumnWidthAsync(),
-                    DispatcherPriority.Default);
-                break;
         }
 
         return await Task.FromResult(true);
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
index 733a2194..994b0342 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
@@ -103,6 +103,12 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
               .ObserveOn(RxApp.MainThreadScheduler)
               .Subscribe(_ => StorageUI())
               .DisposeWith(disposables);
+
+            AppEvents.AdjustMainLvColWidthRequested
+                .AsObservable()
+                .ObserveOn(RxApp.MainThreadScheduler)
+                .Subscribe(_ => AutofitColumnWidth())
+                .DisposeWith(disposables);
         });
 
         RestoreUI();
@@ -133,13 +139,6 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
                 await AvaUtils.SetClipboardData(this, (string)obj);
                 break;
 
-            case EViewAction.AdjustMainLvColWidth:
-                Dispatcher.UIThread.Post(() =>
-                     AutofitColumnWidth(),
-               DispatcherPriority.Default);
-
-                break;
-
             case EViewAction.ProfilesFocus:
                 lstProfiles.Focus();
                 break;
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index 4c35d2e9..b9868edf 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -234,13 +234,6 @@ public partial class MainWindow
                     ViewModel?.AddServerViaClipboardAsync(clipboardData);
                 }
                 break;
-
-            case EViewAction.AdjustMainLvColWidth:
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    Locator.Current.GetService<ProfilesViewModel>()?.AutofitColumnWidthAsync();
-                }), DispatcherPriority.Normal);
-                break;
         }
 
         return await Task.FromResult(true);
diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
index 0248a53a..539886a8 100644
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
+++ b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
@@ -97,6 +97,12 @@ public partial class ProfilesView
               .ObserveOn(RxApp.MainThreadScheduler)
               .Subscribe(_ => StorageUI())
               .DisposeWith(disposables);
+
+            AppEvents.AdjustMainLvColWidthRequested
+                .AsObservable()
+                .ObserveOn(RxApp.MainThreadScheduler)
+                .Subscribe(_ => AutofitColumnWidth())
+                .DisposeWith(disposables);
         });
 
         RestoreUI();
@@ -113,14 +119,7 @@ public partial class ProfilesView
                 if (obj is null)
                     return false;
                 WindowsUtils.SetClipboardData((string)obj);
-                break;
-
-            case EViewAction.AdjustMainLvColWidth:
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    AutofitColumnWidth();
-                }), DispatcherPriority.Normal);
-                break;
+                break;          
 
             case EViewAction.ProfilesFocus:
                 lstProfiles.Focus();

From 49fa10307754f2be3f7753f9526c9349d58ec605 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 31 Aug 2025 14:08:05 +0800
Subject: [PATCH 093/115] Optimize UI

---
 v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml        | 4 ++++
 v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml     | 8 ++++----
 v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml | 4 ----
 v2rayN/v2rayN/Views/DNSSettingWindow.xaml              | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml b/v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml
index 40337f61..6a2cfacd 100644
--- a/v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml
+++ b/v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml
@@ -22,4 +22,8 @@
     <Style Selector="ScrollViewer">
         <Setter Property="AllowAutoHide" Value="False" />
     </Style>
+
+    <Style Selector="TabControl">
+        <Setter Property="Theme" Value="{StaticResource LineTabControl}" />
+    </Style>
 </Styles>
diff --git a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
index c9cf690b..18f294d3 100644
--- a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
@@ -59,7 +59,7 @@
                             x:Name="cmbDirectDNS"
                             Grid.Row="1"
                             Grid.Column="1"
-                            Width="200"
+                            Width="300"
                             Margin="{StaticResource Margin4}"
                             Text="{Binding DirectDNS, Mode=TwoWay}" />
 
@@ -73,7 +73,7 @@
                             x:Name="cmbRemoteDNS"
                             Grid.Row="2"
                             Grid.Column="1"
-                            Width="200"
+                            Width="300"
                             Margin="{StaticResource Margin4}"
                             Text="{Binding RemoteDNS, Mode=TwoWay}" />
 
@@ -87,7 +87,7 @@
                             x:Name="cmbSBResolverDNS"
                             Grid.Row="3"
                             Grid.Column="1"
-                            Width="200"
+                            Width="300"
                             Margin="{StaticResource Margin4}"
                             Text="{Binding SingboxOutboundsResolveDNS, Mode=TwoWay}" />
                         <TextBlock
@@ -108,7 +108,7 @@
                             x:Name="cmbSBFinalResolverDNS"
                             Grid.Row="4"
                             Grid.Column="1"
-                            Width="200"
+                            Width="300"
                             Margin="{StaticResource Margin4}"
                             Text="{Binding SingboxFinalResolveDNS, Mode=TwoWay}" />
                         <TextBlock
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
index bf15ab13..669c17ff 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
@@ -130,10 +130,6 @@
                             Width="*"
                             Binding="{Binding Url}"
                             Header="{x:Static resx:ResUI.LvUrl}" />
-                        <DataGridTextColumn
-                            Width="300"
-                            Binding="{Binding CustomIcon}"
-                            Header="{x:Static resx:ResUI.LvCustomIcon}" />
                     </DataGrid.Columns>
                 </DataGrid>
             </TabItem>
diff --git a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
index 38be6091..b0f2062c 100644
--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
@@ -80,7 +80,7 @@
                             x:Name="cmbDirectDNS"
                             Grid.Row="1"
                             Grid.Column="1"
-                            Width="200"
+                            Width="300"
                             Margin="{StaticResource Margin8}"
                             IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
@@ -96,7 +96,7 @@
                             x:Name="cmbRemoteDNS"
                             Grid.Row="2"
                             Grid.Column="1"
-                            Width="200"
+                            Width="300"
                             Margin="{StaticResource Margin8}"
                             IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
@@ -112,7 +112,7 @@
                             x:Name="cmbSBResolverDNS"
                             Grid.Row="3"
                             Grid.Column="1"
-                            Width="200"
+                            Width="300"
                             Margin="{StaticResource Margin8}"
                             IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
@@ -136,7 +136,7 @@
                             x:Name="cmbSBFinalResolverDNS"
                             Grid.Row="4"
                             Grid.Column="1"
-                            Width="200"
+                            Width="300"
                             Margin="{StaticResource Margin8}"
                             IsEditable="True"
                             Style="{StaticResource DefComboBox}" />

From 1d6991641077cfe5b8a64edafa4d8eb2cdce6ce6 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 31 Aug 2025 14:21:22 +0800
Subject: [PATCH 094/115] Update GlobalHotKeys

---
 v2rayN/GlobalHotKeys | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/GlobalHotKeys b/v2rayN/GlobalHotKeys
index ef73fa22..270f023f 160000
--- a/v2rayN/GlobalHotKeys
+++ b/v2rayN/GlobalHotKeys
@@ -1 +1 @@
-Subproject commit ef73fa22c46cfc7d1ec192ffe8497f6e61b4f0db
+Subproject commit 270f023fcca4ef9149480c575d502815efd83531

From b8eb7e7b29d50ad11670220b921b693d73077b1d Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 31 Aug 2025 15:41:25 +0800
Subject: [PATCH 095/115] Optimization and Improvement.

---
 .../ViewModels/CheckUpdateViewModel.cs        | 36 +++++++++---------
 .../ViewModels/ClashConnectionsViewModel.cs   |  9 ++---
 .../ViewModels/ClashProxiesViewModel.cs       | 37 +++++++++----------
 v2rayN/ServiceLib/ViewModels/MsgViewModel.cs  |  4 +-
 .../ViewModels/ProfilesViewModel.cs           | 36 ++++++++----------
 .../ViewModels/RoutingRuleSettingViewModel.cs |  8 ++--
 .../ViewModels/RoutingSettingViewModel.cs     |  7 ++--
 .../ViewModels/StatusBarViewModel.cs          | 14 +++----
 .../ViewModels/SubSettingViewModel.cs         |  7 ++--
 9 files changed, 73 insertions(+), 85 deletions(-)

diff --git a/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs b/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
index c87f6737..579a2288 100644
--- a/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
@@ -13,11 +13,11 @@ namespace ServiceLib.ViewModels;
 public class CheckUpdateViewModel : MyReactiveObject
 {
     private const string _geo = "GeoFiles";
-    private string _v2rayN = ECoreType.v2rayN.ToString();
+    private readonly string _v2rayN = ECoreType.v2rayN.ToString();
     private List<CheckUpdateModel> _lstUpdated = [];
+    private static readonly string _tag = "CheckUpdateViewModel";
 
-    private IObservableCollection<CheckUpdateModel> _checkUpdateModel = new ObservableCollectionExtended<CheckUpdateModel>();
-    public IObservableCollection<CheckUpdateModel> CheckUpdateModels => _checkUpdateModel;
+    public IObservableCollection<CheckUpdateModel> CheckUpdateModels { get; } = new ObservableCollectionExtended<CheckUpdateModel>();
     public ReactiveCommand<Unit, Unit> CheckUpdateCmd { get; }
     [Reactive] public bool EnableCheckPreReleaseUpdate { get; set; }
 
@@ -26,9 +26,11 @@ public class CheckUpdateViewModel : MyReactiveObject
         _config = AppManager.Instance.Config;
         _updateView = updateView;
 
-        CheckUpdateCmd = ReactiveCommand.CreateFromTask(async () =>
+        CheckUpdateCmd = ReactiveCommand.CreateFromTask(CheckUpdate);
+        CheckUpdateCmd.ThrownExceptions.Subscribe(ex =>
         {
-            await CheckUpdate();
+            Logging.SaveLog(_tag, ex);
+            _ = UpdateView(_v2rayN, ex.Message);
         });
 
         EnableCheckPreReleaseUpdate = _config.CheckUpdateItem.CheckPreReleaseUpdate;
@@ -43,20 +45,20 @@ public class CheckUpdateViewModel : MyReactiveObject
 
     private void RefreshCheckUpdateItems()
     {
-        _checkUpdateModel.Clear();
+        CheckUpdateModels.Clear();
 
         if (RuntimeInformation.ProcessArchitecture != Architecture.X86)
         {
-            _checkUpdateModel.Add(GetCheckUpdateModel(_v2rayN));
+            CheckUpdateModels.Add(GetCheckUpdateModel(_v2rayN));
             //Not Windows and under Win10
             if (!(Utils.IsWindows() && Environment.OSVersion.Version.Major < 10))
             {
-                _checkUpdateModel.Add(GetCheckUpdateModel(ECoreType.Xray.ToString()));
-                _checkUpdateModel.Add(GetCheckUpdateModel(ECoreType.mihomo.ToString()));
-                _checkUpdateModel.Add(GetCheckUpdateModel(ECoreType.sing_box.ToString()));
+                CheckUpdateModels.Add(GetCheckUpdateModel(ECoreType.Xray.ToString()));
+                CheckUpdateModels.Add(GetCheckUpdateModel(ECoreType.mihomo.ToString()));
+                CheckUpdateModels.Add(GetCheckUpdateModel(ECoreType.sing_box.ToString()));
             }
         }
-        _checkUpdateModel.Add(GetCheckUpdateModel(_geo));
+        CheckUpdateModels.Add(GetCheckUpdateModel(_geo));
     }
 
     private CheckUpdateModel GetCheckUpdateModel(string coreType)
@@ -71,7 +73,7 @@ public class CheckUpdateViewModel : MyReactiveObject
 
     private async Task SaveSelectedCoreTypes()
     {
-        _config.CheckUpdateItem.SelectedCoreTypes = _checkUpdateModel.Where(t => t.IsSelected == true).Select(t => t.CoreType ?? "").ToList();
+        _config.CheckUpdateItem.SelectedCoreTypes = CheckUpdateModels.Where(t => t.IsSelected == true).Select(t => t.CoreType ?? "").ToList();
         await ConfigHandler.SaveConfig(_config);
     }
 
@@ -83,13 +85,13 @@ public class CheckUpdateViewModel : MyReactiveObject
     private async Task CheckUpdateTask()
     {
         _lstUpdated.Clear();
-        _lstUpdated = _checkUpdateModel.Where(x => x.IsSelected == true)
+        _lstUpdated = CheckUpdateModels.Where(x => x.IsSelected == true)
                 .Select(x => new CheckUpdateModel() { CoreType = x.CoreType }).ToList();
         await SaveSelectedCoreTypes();
 
-        for (var k = _checkUpdateModel.Count - 1; k >= 0; k--)
+        for (var k = CheckUpdateModels.Count - 1; k >= 0; k--)
         {
-            var item = _checkUpdateModel[k];
+            var item = CheckUpdateModels[k];
             if (item.IsSelected != true)
             {
                 continue;
@@ -320,7 +322,7 @@ public class CheckUpdateViewModel : MyReactiveObject
 
     public async Task UpdateViewResult(CheckUpdateModel model)
     {
-        var found = _checkUpdateModel.FirstOrDefault(t => t.CoreType == model.CoreType);
+        var found = CheckUpdateModels.FirstOrDefault(t => t.CoreType == model.CoreType);
         if (found == null)
         {
             return;
@@ -328,6 +330,6 @@ public class CheckUpdateViewModel : MyReactiveObject
 
         var itemCopy = JsonUtils.DeepCopy(found);
         itemCopy.Remarks = model.Remarks;
-        _checkUpdateModel.Replace(found, itemCopy);
+        CheckUpdateModels.Replace(found, itemCopy);
     }
 }
diff --git a/v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs b/v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs
index 1fd9015c..d45b8e7d 100644
--- a/v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs
@@ -10,8 +10,7 @@ namespace ServiceLib.ViewModels;
 
 public class ClashConnectionsViewModel : MyReactiveObject
 {
-    private IObservableCollection<ClashConnectionModel> _connectionItems = new ObservableCollectionExtended<ClashConnectionModel>();
-    public IObservableCollection<ClashConnectionModel> ConnectionItems => _connectionItems;
+    public IObservableCollection<ClashConnectionModel> ConnectionItems { get; } = new ObservableCollectionExtended<ClashConnectionModel>();
 
     [Reactive]
     public ClashConnectionModel SelectedSource { get; set; }
@@ -74,7 +73,7 @@ public class ClashConnectionsViewModel : MyReactiveObject
 
     public async Task RefreshConnections(List<ConnectionItem>? connections)
     {
-        _connectionItems.Clear();
+        ConnectionItems.Clear();
 
         var dtNow = DateTime.Now;
         var lstModel = new List<ClashConnectionModel>();
@@ -104,7 +103,7 @@ public class ClashConnectionsViewModel : MyReactiveObject
             return;
         }
 
-        _connectionItems.AddRange(lstModel);
+        ConnectionItems.AddRange(lstModel);
     }
 
     public async Task ClashConnectionClose(bool all)
@@ -121,7 +120,7 @@ public class ClashConnectionsViewModel : MyReactiveObject
         }
         else
         {
-            _connectionItems.Clear();
+            ConnectionItems.Clear();
         }
         await ClashApiManager.Instance.ClashConnectionClose(id);
         await GetClashConnections();
diff --git a/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs b/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
index 531b4a8e..54cbdc8d 100644
--- a/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
@@ -17,11 +17,8 @@ public class ClashProxiesViewModel : MyReactiveObject
     private Dictionary<string, ProvidersItem>? _providers;
     private readonly int _delayTimeout = 99999999;
 
-    private IObservableCollection<ClashProxyModel> _proxyGroups = new ObservableCollectionExtended<ClashProxyModel>();
-    private IObservableCollection<ClashProxyModel> _proxyDetails = new ObservableCollectionExtended<ClashProxyModel>();
-
-    public IObservableCollection<ClashProxyModel> ProxyGroups => _proxyGroups;
-    public IObservableCollection<ClashProxyModel> ProxyDetails => _proxyDetails;
+    public IObservableCollection<ClashProxyModel> ProxyGroups { get; } = new ObservableCollectionExtended<ClashProxyModel>();
+    public IObservableCollection<ClashProxyModel> ProxyDetails { get; } = new ObservableCollectionExtended<ClashProxyModel>();
 
     [Reactive]
     public ClashProxyModel SelectedGroup { get; set; }
@@ -182,7 +179,7 @@ public class ClashProxiesViewModel : MyReactiveObject
         }
 
         var selectedName = SelectedGroup?.Name;
-        _proxyGroups.Clear();
+        ProxyGroups.Clear();
 
         var proxyGroups = ClashApiManager.Instance.GetClashProxyGroups();
         if (proxyGroups != null && proxyGroups.Count > 0)
@@ -198,7 +195,7 @@ public class ClashProxiesViewModel : MyReactiveObject
                 {
                     continue;
                 }
-                _proxyGroups.Add(new ClashProxyModel()
+                ProxyGroups.Add(new ClashProxyModel()
                 {
                     Now = item.now,
                     Name = item.name,
@@ -214,12 +211,12 @@ public class ClashProxiesViewModel : MyReactiveObject
             {
                 continue;
             }
-            var item = _proxyGroups.FirstOrDefault(t => t.Name == kv.Key);
+            var item = ProxyGroups.FirstOrDefault(t => t.Name == kv.Key);
             if (item != null && item.Name.IsNotEmpty())
             {
                 continue;
             }
-            _proxyGroups.Add(new ClashProxyModel()
+            ProxyGroups.Add(new ClashProxyModel()
             {
                 Now = kv.Value.now,
                 Name = kv.Key,
@@ -227,15 +224,15 @@ public class ClashProxiesViewModel : MyReactiveObject
             });
         }
 
-        if (_proxyGroups != null && _proxyGroups.Count > 0)
+        if (ProxyGroups != null && ProxyGroups.Count > 0)
         {
-            if (selectedName != null && _proxyGroups.Any(t => t.Name == selectedName))
+            if (selectedName != null && ProxyGroups.Any(t => t.Name == selectedName))
             {
-                SelectedGroup = _proxyGroups.FirstOrDefault(t => t.Name == selectedName);
+                SelectedGroup = ProxyGroups.FirstOrDefault(t => t.Name == selectedName);
             }
             else
             {
-                SelectedGroup = _proxyGroups.First();
+                SelectedGroup = ProxyGroups.First();
             }
         }
         else
@@ -246,7 +243,7 @@ public class ClashProxiesViewModel : MyReactiveObject
 
     private void RefreshProxyDetails(bool c)
     {
-        _proxyDetails.Clear();
+        ProxyDetails.Clear();
         if (!c)
         {
             return;
@@ -299,7 +296,7 @@ public class ClashProxiesViewModel : MyReactiveObject
             default:
                 break;
         }
-        _proxyDetails.AddRange(lstDetails);
+        ProxyDetails.AddRange(lstDetails);
     }
 
     private ProxiesItem? TryGetProxy(string name)
@@ -361,12 +358,12 @@ public class ClashProxiesViewModel : MyReactiveObject
         await ClashApiManager.Instance.ClashSetActiveProxy(name, nameNode);
 
         selectedProxy.now = nameNode;
-        var group = _proxyGroups.FirstOrDefault(it => it.Name == SelectedGroup.Name);
+        var group = ProxyGroups.FirstOrDefault(it => it.Name == SelectedGroup.Name);
         if (group != null)
         {
             group.Now = nameNode;
             var group2 = JsonUtils.DeepCopy(group);
-            _proxyGroups.Replace(group, group2);
+            ProxyGroups.Replace(group, group2);
 
             SelectedGroup = group2;
         }
@@ -375,7 +372,7 @@ public class ClashProxiesViewModel : MyReactiveObject
 
     private async Task ProxiesDelayTest(bool blAll = true)
     {
-        ClashApiManager.Instance.ClashProxiesDelayTest(blAll, _proxyDetails.ToList(), async (item, result) =>
+        ClashApiManager.Instance.ClashProxiesDelayTest(blAll, ProxyDetails.ToList(), async (item, result) =>
         {
             if (item == null || result.IsNullOrEmpty())
             {
@@ -395,7 +392,7 @@ public class ClashProxiesViewModel : MyReactiveObject
     public async Task ProxiesDelayTestResult(SpeedTestResult result)
     {
         //UpdateHandler(false, $"{item.name}={result}");
-        var detail = _proxyDetails.FirstOrDefault(it => it.Name == result.IndexId);
+        var detail = ProxyDetails.FirstOrDefault(it => it.Name == result.IndexId);
         if (detail == null)
         {
             return;
@@ -417,7 +414,7 @@ public class ClashProxiesViewModel : MyReactiveObject
             detail.Delay = _delayTimeout;
             detail.DelayName = string.Empty;
         }
-        _proxyDetails.Replace(detail, JsonUtils.DeepCopy(detail));
+        ProxyDetails.Replace(detail, JsonUtils.DeepCopy(detail));
     }
 
     #endregion proxy function
diff --git a/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs b/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs
index 87a3016c..8fc62dfe 100644
--- a/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs
@@ -8,8 +8,8 @@ namespace ServiceLib.ViewModels;
 
 public class MsgViewModel : MyReactiveObject
 {
-    private ConcurrentQueue<string> _queueMsg = new();
-    private int _numMaxMsg = 500;
+    private readonly ConcurrentQueue<string> _queueMsg = new();
+    private readonly int _numMaxMsg = 500;
     private bool _lastMsgFilterNotAvailable;
     private bool _blLockShow = false;
 
diff --git a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
index 058855a8..5209f4dd 100644
--- a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
@@ -23,13 +23,9 @@ public class ProfilesViewModel : MyReactiveObject
 
     #region ObservableCollection
 
-    private IObservableCollection<ProfileItemModel> _profileItems = new ObservableCollectionExtended<ProfileItemModel>();
-    public IObservableCollection<ProfileItemModel> ProfileItems => _profileItems;
+    public IObservableCollection<ProfileItemModel> ProfileItems { get; } = new ObservableCollectionExtended<ProfileItemModel>();
 
-    private IObservableCollection<SubItem> _subItems = new ObservableCollectionExtended<SubItem>();
-    public IObservableCollection<SubItem> SubItems => _subItems;
-
-    private IObservableCollection<ComboItem> _servers = new ObservableCollectionExtended<ComboItem>();
+    public IObservableCollection<SubItem> SubItems { get; } = new ObservableCollectionExtended<SubItem>();
 
     [Reactive]
     public ProfileItemModel SelectedProfile { get; set; }
@@ -293,7 +289,7 @@ public class ProfilesViewModel : MyReactiveObject
             NoticeManager.Instance.Enqueue(result.Delay);
             return;
         }
-        var item = _profileItems.FirstOrDefault(it => it.IndexId == result.IndexId);
+        var item = ProfileItems.FirstOrDefault(it => it.IndexId == result.IndexId);
         if (item == null)
         {
             return;
@@ -323,7 +319,7 @@ public class ProfilesViewModel : MyReactiveObject
 
         try
         {
-            var item = _profileItems.FirstOrDefault(it => it.IndexId == update.IndexId);
+            var item = ProfileItems.FirstOrDefault(it => it.IndexId == update.IndexId);
             if (item != null)
             {
                 item.TodayDown = Utils.HumanFy(update.TodayDown);
@@ -390,8 +386,8 @@ public class ProfilesViewModel : MyReactiveObject
         var lstModel = await GetProfileItemsEx(_config.SubIndexId, _serverFilter);
         _lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel)) ?? [];
 
-        _profileItems.Clear();
-        _profileItems.AddRange(lstModel);
+        ProfileItems.Clear();
+        ProfileItems.AddRange(lstModel);
         if (lstModel.Count > 0)
         {
             var selected = lstModel.FirstOrDefault(t => t.IndexId == _config.IndexId);
@@ -410,21 +406,21 @@ public class ProfilesViewModel : MyReactiveObject
 
     public async Task RefreshSubscriptions()
     {
-        _subItems.Clear();
+        SubItems.Clear();
 
-        _subItems.Add(new SubItem { Remarks = ResUI.AllGroupServers });
+        SubItems.Add(new SubItem { Remarks = ResUI.AllGroupServers });
 
         foreach (var item in await AppManager.Instance.SubItems())
         {
-            _subItems.Add(item);
+            SubItems.Add(item);
         }
-        if (_config.SubIndexId != null && _subItems.FirstOrDefault(t => t.Id == _config.SubIndexId) != null)
+        if (_config.SubIndexId != null && SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId) != null)
         {
-            SelectedSub = _subItems.FirstOrDefault(t => t.Id == _config.SubIndexId);
+            SelectedSub = SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId);
         }
         else
         {
-            SelectedSub = _subItems.First();
+            SelectedSub = SubItems.First();
         }
     }
 
@@ -548,9 +544,9 @@ public class ProfilesViewModel : MyReactiveObject
 
         await ConfigHandler.RemoveServers(_config, lstSelected);
         NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
-        if (lstSelected.Count == _profileItems.Count)
+        if (lstSelected.Count == ProfileItems.Count)
         {
-            _profileItems.Clear();
+            ProfileItems.Clear();
         }
         await RefreshServers();
         if (exists)
@@ -740,7 +736,7 @@ public class ProfilesViewModel : MyReactiveObject
 
     public async Task MoveServerTo(int startIndex, ProfileItemModel targetItem)
     {
-        var targetIndex = _profileItems.IndexOf(targetItem);
+        var targetIndex = ProfileItems.IndexOf(targetItem);
         if (startIndex >= 0 && targetIndex >= 0 && startIndex != targetIndex)
         {
             if (await ConfigHandler.MoveServer(_config, _lstProfile, startIndex, EMove.Position, targetIndex) == 0)
@@ -754,7 +750,7 @@ public class ProfilesViewModel : MyReactiveObject
     {
         if (actionType == ESpeedActionType.Mixedtest)
         {
-            SelectedProfiles = _profileItems;
+            SelectedProfiles = ProfileItems;
         }
         var lstSelected = await GetProfileItems(false);
         if (lstSelected == null)
diff --git a/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs b/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs
index c3acc7ba..f176e29b 100644
--- a/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs
@@ -13,9 +13,7 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
 
     [Reactive]
     public RoutingItem SelectedRouting { get; set; }
-
-    private IObservableCollection<RulesItemModel> _rulesItems = new ObservableCollectionExtended<RulesItemModel>();
-    public IObservableCollection<RulesItemModel> RulesItems => _rulesItems;
+    public IObservableCollection<RulesItemModel> RulesItems { get; } = new ObservableCollectionExtended<RulesItemModel>();
 
     [Reactive]
     public RulesItemModel SelectedSource { get; set; }
@@ -101,7 +99,7 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
 
     public void RefreshRulesItems()
     {
-        _rulesItems.Clear();
+        RulesItems.Clear();
 
         foreach (var item in _rules)
         {
@@ -118,7 +116,7 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
                 Enabled = item.Enabled,
                 Remarks = item.Remarks,
             };
-            _rulesItems.Add(it);
+            RulesItems.Add(it);
         }
     }
 
diff --git a/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs b/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs
index 8aa36f0c..5237a8d2 100644
--- a/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs
@@ -9,8 +9,7 @@ public class RoutingSettingViewModel : MyReactiveObject
 {
     #region Reactive
 
-    private IObservableCollection<RoutingItemModel> _routingItems = new ObservableCollectionExtended<RoutingItemModel>();
-    public IObservableCollection<RoutingItemModel> RoutingItems => _routingItems;
+    public IObservableCollection<RoutingItemModel> RoutingItems { get; } = new ObservableCollectionExtended<RoutingItemModel>();
 
     [Reactive]
     public RoutingItemModel SelectedSource { get; set; }
@@ -82,7 +81,7 @@ public class RoutingSettingViewModel : MyReactiveObject
 
     public async Task RefreshRoutingItems()
     {
-        _routingItems.Clear();
+        RoutingItems.Clear();
 
         var routings = await AppManager.Instance.RoutingItems();
         foreach (var item in routings)
@@ -98,7 +97,7 @@ public class RoutingSettingViewModel : MyReactiveObject
                 CustomRulesetPath4Singbox = item.CustomRulesetPath4Singbox,
                 Sort = item.Sort,
             };
-            _routingItems.Add(it);
+            RoutingItems.Add(it);
         }
     }
 
diff --git a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
index c89f55cb..e9ee033e 100644
--- a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
@@ -13,11 +13,9 @@ public class StatusBarViewModel : MyReactiveObject
 {
     #region ObservableCollection
 
-    private IObservableCollection<RoutingItem> _routingItems = new ObservableCollectionExtended<RoutingItem>();
-    public IObservableCollection<RoutingItem> RoutingItems => _routingItems;
+    public IObservableCollection<RoutingItem> RoutingItems { get; } = new ObservableCollectionExtended<RoutingItem>();
 
-    private IObservableCollection<ComboItem> _servers = new ObservableCollectionExtended<ComboItem>();
-    public IObservableCollection<ComboItem> Servers => _servers;
+    public IObservableCollection<ComboItem> Servers { get; } = new ObservableCollectionExtended<ComboItem>();
 
     [Reactive]
     public RoutingItem SelectedRouting { get; set; }
@@ -295,7 +293,7 @@ public class StatusBarViewModel : MyReactiveObject
     {
         var lstModel = await AppManager.Instance.ProfileItems(_config.SubIndexId, "");
 
-        _servers.Clear();
+        Servers.Clear();
         if (lstModel.Count > _config.GuiItem.TrayMenuServersLimit)
         {
             BlServers = false;
@@ -309,7 +307,7 @@ public class StatusBarViewModel : MyReactiveObject
             string name = it.GetSummary();
 
             var item = new ComboItem() { ID = it.IndexId, Text = name };
-            _servers.Add(item);
+            Servers.Add(item);
             if (_config.IndexId == it.IndexId)
             {
                 SelectedServer = item;
@@ -397,13 +395,13 @@ public class StatusBarViewModel : MyReactiveObject
 
     public async Task RefreshRoutingsMenu()
     {
-        _routingItems.Clear();
+        RoutingItems.Clear();
 
         BlRouting = true;
         var routings = await AppManager.Instance.RoutingItems();
         foreach (var item in routings)
         {
-            _routingItems.Add(item);
+            RoutingItems.Add(item);
             if (item.IsActive)
             {
                 SelectedRouting = item;
diff --git a/v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs b/v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs
index e9c657c4..88f33619 100644
--- a/v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs
@@ -8,8 +8,7 @@ namespace ServiceLib.ViewModels;
 
 public class SubSettingViewModel : MyReactiveObject
 {
-    private IObservableCollection<SubItem> _subItems = new ObservableCollectionExtended<SubItem>();
-    public IObservableCollection<SubItem> SubItems => _subItems;
+    public IObservableCollection<SubItem> SubItems { get; } = new ObservableCollectionExtended<SubItem>();
 
     [Reactive]
     public SubItem SelectedSource { get; set; }
@@ -60,8 +59,8 @@ public class SubSettingViewModel : MyReactiveObject
 
     public async Task RefreshSubItems()
     {
-        _subItems.Clear();
-        _subItems.AddRange(await AppManager.Instance.SubItems());
+        SubItems.Clear();
+        SubItems.AddRange(await AppManager.Instance.SubItems());
     }
 
     public async Task EditSubAsync(bool blNew)

From 3f67a23f8b4dcdff69b532e9e74d2f201d419661 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 31 Aug 2025 19:55:17 +0800
Subject: [PATCH 096/115] up 7.14.5

---
 v2rayN/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/Directory.Build.props b/v2rayN/Directory.Build.props
index 589eb889..657abfab 100644
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.14.4</Version>
+        <Version>7.14.5</Version>
     </PropertyGroup>
 
     <PropertyGroup>

From 1a6fbf782d7956df39e40b6765a9ec31aa1fe0fa Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 2 Sep 2025 17:12:38 +0800
Subject: [PATCH 097/115] Using RxApp replace ViewAction

---
 v2rayN/ServiceLib/Enums/EViewAction.cs        |  1 -
 v2rayN/ServiceLib/Handler/AppEvents.cs        |  2 +
 v2rayN/ServiceLib/Manager/AppManager.cs       | 39 ++++++++++++++-
 .../ViewModels/BackupAndRestoreViewModel.cs   |  5 +-
 .../ViewModels/CheckUpdateViewModel.cs        | 11 +++-
 .../ViewModels/MainWindowViewModel.cs         | 50 +------------------
 v2rayN/v2rayN.Desktop/App.axaml.cs            |  8 +--
 .../v2rayN.Desktop/Views/MainWindow.axaml.cs  | 40 ++++++++-------
 v2rayN/v2rayN/Views/MainWindow.xaml.cs        | 20 +++++---
 v2rayN/v2rayN/Views/StatusBarView.xaml.cs     |  4 +-
 10 files changed, 87 insertions(+), 93 deletions(-)

diff --git a/v2rayN/ServiceLib/Enums/EViewAction.cs b/v2rayN/ServiceLib/Enums/EViewAction.cs
index 7677c6e9..2c47d31d 100644
--- a/v2rayN/ServiceLib/Enums/EViewAction.cs
+++ b/v2rayN/ServiceLib/Enums/EViewAction.cs
@@ -15,7 +15,6 @@ public enum EViewAction
     ShowHideWindow,
     ScanScreenTask,
     ScanImageTask,
-    Shutdown,
     BrowseServer,
     ImportRulesFromFile,
     InitSettingFont,
diff --git a/v2rayN/ServiceLib/Handler/AppEvents.cs b/v2rayN/ServiceLib/Handler/AppEvents.cs
index f61053ae..109ee762 100644
--- a/v2rayN/ServiceLib/Handler/AppEvents.cs
+++ b/v2rayN/ServiceLib/Handler/AppEvents.cs
@@ -13,6 +13,8 @@ public static class AppEvents
 
     public static readonly Subject<Unit> AppExitRequested = new();
 
+    public static readonly Subject<bool> ShutdownRequested = new();
+
     public static readonly Subject<Unit> AdjustMainLvColWidthRequested = new();
 
     public static readonly Subject<ServerSpeedItem> DispatcherStatisticsRequested = new();
diff --git a/v2rayN/ServiceLib/Manager/AppManager.cs b/v2rayN/ServiceLib/Manager/AppManager.cs
index 6cf0e826..33125289 100644
--- a/v2rayN/ServiceLib/Manager/AppManager.cs
+++ b/v2rayN/ServiceLib/Manager/AppManager.cs
@@ -1,3 +1,5 @@
+using System.Reactive;
+
 namespace ServiceLib.Manager;
 
 public sealed class AppManager
@@ -34,7 +36,7 @@ public sealed class AppManager
 
     #endregion Property
 
-    #region Init
+    #region App
 
     public bool InitApp()
     {
@@ -87,7 +89,40 @@ public sealed class AppManager
         return true;
     }
 
-    #endregion Init
+    public async Task AppExitAsync(bool needShutdown)
+    {
+        try
+        {
+            Logging.SaveLog("AppExitAsync Begin");
+
+            await SysProxyHandler.UpdateSysProxy(_config, true);
+            AppEvents.AppExitRequested.OnNext(Unit.Default);
+            await Task.Delay(50); //Wait for AppExitRequested to be processed
+
+            await ConfigHandler.SaveConfig(_config);
+            await ProfileExManager.Instance.SaveTo();
+            await StatisticsManager.Instance.SaveTo();
+            await CoreManager.Instance.CoreStop();
+            StatisticsManager.Instance.Close();
+
+            Logging.SaveLog("AppExitAsync End");
+        }
+        catch { }
+        finally
+        {
+            if (needShutdown)
+            {
+                Shutdown(false);
+            }
+        }
+    }
+
+    public void Shutdown(bool byUser)
+    {
+        AppEvents.ShutdownRequested.OnNext(byUser);
+    }
+
+    #endregion App
 
     #region Config
 
diff --git a/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs b/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs
index e258d3b2..80336c5d 100644
--- a/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs
@@ -136,8 +136,7 @@ public class BackupAndRestoreViewModel : MyReactiveObject
         var result = await CreateZipFileFromDirectory(fileBackup);
         if (result)
         {
-            var service = Locator.Current.GetService<MainWindowViewModel>();
-            await service?.MyAppExitAsync(true);
+            await AppManager.Instance.AppExitAsync(false);
             await SQLiteHelper.Instance.DisposeDbConnectionAsync();
 
             var toPath = Utils.GetConfigPath();
@@ -154,7 +153,7 @@ public class BackupAndRestoreViewModel : MyReactiveObject
                     _ = ProcUtils.ProcessStart(upgradeFileName, Global.RebootAs, Utils.StartupPath());
                 }
             }
-            service?.Shutdown(true);
+            AppManager.Instance.Shutdown(true);
         }
         else
         {
diff --git a/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs b/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
index 579a2288..23839141 100644
--- a/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
@@ -236,12 +236,19 @@ public class CheckUpdateViewModel : MyReactiveObject
             {
                 return;
             }
-            if (!Utils.UpgradeAppExists(out _))
+            if (!Utils.UpgradeAppExists(out var upgradeFileName))
             {
                 await UpdateView(_v2rayN, ResUI.UpgradeAppNotExistTip);
+                NoticeManager.Instance.SendMessageAndEnqueue(ResUI.UpgradeAppNotExistTip);
+                Logging.SaveLog("UpgradeApp does not exist");
                 return;
             }
-            Locator.Current.GetService<MainWindowViewModel>()?.UpgradeApp(fileName);
+
+            var id = ProcUtils.ProcessStart(upgradeFileName, fileName, Utils.StartupPath());
+            if (id > 0)
+            {
+                await AppManager.Instance.AppExitAsync(true);
+            }
         }
         catch (Exception ex)
         {
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index 45b8ffa7..7df04380 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -282,59 +282,11 @@ public class MainWindowViewModel : MyReactiveObject
         AppEvents.DispatcherStatisticsRequested.OnNext(update);
     }
 
-    public async Task MyAppExitAsync(bool blWindowsShutDown)
-    {
-        try
-        {
-            Logging.SaveLog("MyAppExitAsync Begin");
-
-            await SysProxyHandler.UpdateSysProxy(_config, true);
-            AppEvents.AppExitRequested.OnNext(Unit.Default);
-
-            await ConfigHandler.SaveConfig(_config);
-            await ProfileExManager.Instance.SaveTo();
-            await StatisticsManager.Instance.SaveTo();
-            await CoreManager.Instance.CoreStop();
-            StatisticsManager.Instance.Close();
-
-            Logging.SaveLog("MyAppExitAsync End");
-        }
-        catch { }
-        finally
-        {
-            if (!blWindowsShutDown)
-            {
-                _updateView?.Invoke(EViewAction.Shutdown, false);
-            }
-        }
-    }
-
-    public async Task UpgradeApp(string arg)
-    {
-        if (!Utils.UpgradeAppExists(out var upgradeFileName))
-        {
-            NoticeManager.Instance.SendMessageAndEnqueue(ResUI.UpgradeAppNotExistTip);
-            Logging.SaveLog("UpgradeApp does not exist");
-            return;
-        }
-
-        var id = ProcUtils.ProcessStart(upgradeFileName, arg, Utils.StartupPath());
-        if (id > 0)
-        {
-            await MyAppExitAsync(false);
-        }
-    }
-
     public void ShowHideWindow(bool? blShow)
     {
         _updateView?.Invoke(EViewAction.ShowHideWindow, blShow);
     }
 
-    public void Shutdown(bool byUser)
-    {
-        _updateView?.Invoke(EViewAction.Shutdown, byUser);
-    }
-
     #endregion Actions
 
     #region Servers && Groups
@@ -517,7 +469,7 @@ public class MainWindowViewModel : MyReactiveObject
     public async Task RebootAsAdmin()
     {
         ProcUtils.RebootAsAdmin();
-        await MyAppExitAsync(false);
+        await AppManager.Instance.AppExitAsync(true);
     }
 
     private async Task ClearServerStatistics()
diff --git a/v2rayN/v2rayN.Desktop/App.axaml.cs b/v2rayN/v2rayN.Desktop/App.axaml.cs
index a1b97b77..5303eb6c 100644
--- a/v2rayN/v2rayN.Desktop/App.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/App.axaml.cs
@@ -74,11 +74,7 @@ public partial class App : Application
 
     private async void MenuExit_Click(object? sender, EventArgs e)
     {
-        var service = Locator.Current.GetService<MainWindowViewModel>();
-        if (service != null)
-        {
-            await service.MyAppExitAsync(true);
-        }
-        service?.Shutdown(true);
+        await AppManager.Instance.AppExitAsync(false);
+        AppManager.Instance.Shutdown(true);
     }
 }
diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
index 417bbb9f..582b18ac 100644
--- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
@@ -148,6 +148,12 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
               .ObserveOn(RxApp.MainThreadScheduler)
               .Subscribe(_ => StorageUI())
               .DisposeWith(disposables);
+
+            AppEvents.ShutdownRequested
+              .AsObservable()
+              .ObserveOn(RxApp.MainThreadScheduler)
+              .Subscribe(content => Shutdown(content))
+              .DisposeWith(disposables);
         });
 
         if (Utils.IsWindows())
@@ -222,19 +228,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
                 DispatcherPriority.Default);
                 break;
 
-            case EViewAction.Shutdown:
-                if (obj != null && _blCloseByUser == false)
-                {
-                    _blCloseByUser = (bool)obj;
-                }
-                StorageUI();
-                if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-                {
-                    HotkeyManager.Instance.Dispose();
-                    desktop.Shutdown();
-                }
-                break;
-
             case EViewAction.ScanScreenTask:
                 await ScanScreenTaskAsync();
                 break;
@@ -289,10 +282,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
                 break;
 
             case WindowCloseReason.ApplicationShutdown or WindowCloseReason.OSShutdown:
-                if (ViewModel != null)
-                {
-                    await ViewModel.MyAppExitAsync(true);
-                }
+                await AppManager.Instance.AppExitAsync(false);
                 break;
         }
 
@@ -387,9 +377,21 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
 
         _blCloseByUser = true;
         StorageUI();
-        if (ViewModel != null)
+
+        await AppManager.Instance.AppExitAsync(true);
+    }
+
+    private void Shutdown(bool obj)
+    {
+        if (obj is bool b && _blCloseByUser == false)
         {
-            await ViewModel.MyAppExitAsync(false);
+            _blCloseByUser = b;
+        }
+        StorageUI();
+        if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+        {
+            HotkeyManager.Instance.Dispose();
+            desktop.Shutdown();
         }
     }
 
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index b9868edf..a3a26c97 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -145,6 +145,12 @@ public partial class MainWindow
               .ObserveOn(RxApp.MainThreadScheduler)
               .Subscribe(_ => StorageUI())
               .DisposeWith(disposables);
+
+            AppEvents.ShutdownRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(content => Shutdown(content))
+            .DisposeWith(disposables);
         });
 
         this.Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
@@ -212,13 +218,6 @@ public partial class MainWindow
                 }), DispatcherPriority.Normal);
                 break;
 
-            case EViewAction.Shutdown:
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    Application.Current.Shutdown();
-                }), DispatcherPriority.Normal);
-                break;
-
             case EViewAction.ScanScreenTask:
                 await ScanScreenTaskAsync();
                 break;
@@ -266,7 +265,12 @@ public partial class MainWindow
     {
         Logging.SaveLog("Current_SessionEnding");
         StorageUI();
-        await ViewModel?.MyAppExitAsync(true);
+        await AppManager.Instance.AppExitAsync(false);
+    }
+
+    private void Shutdown(bool obj)
+    {
+        Application.Current.Shutdown();
     }
 
     private void MainWindow_PreviewKeyDown(object sender, KeyEventArgs e)
diff --git a/v2rayN/v2rayN/Views/StatusBarView.xaml.cs b/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
index a4fcef55..2bc4c7c9 100644
--- a/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
+++ b/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
@@ -97,9 +97,7 @@ public partial class StatusBarView
     private async void menuExit_Click(object sender, RoutedEventArgs e)
     {
         tbNotify.Dispose();
-        var service = Locator.Current.GetService<MainWindowViewModel>();
-        if (service != null)
-            await service.MyAppExitAsync(false);
+        await AppManager.Instance.AppExitAsync(true);
     }
 
     private void txtRunningInfoDisplay_MouseDoubleClick(object sender, MouseButtonEventArgs e)

From d094370209cf6706b82ee604c04e7137022b6641 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 3 Sep 2025 19:05:45 +0800
Subject: [PATCH 098/115] up 7.14.6

---
 v2rayN/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/Directory.Build.props b/v2rayN/Directory.Build.props
index 657abfab..6eb40796 100644
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.14.5</Version>
+        <Version>7.14.6</Version>
     </PropertyGroup>
 
     <PropertyGroup>

From a2917b3ce815bf0192aa9938844d1afc2f52e3a5 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 4 Sep 2025 20:50:25 +0800
Subject: [PATCH 099/115] Update Directory.Packages.props

---
 v2rayN/Directory.Packages.props | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/v2rayN/Directory.Packages.props b/v2rayN/Directory.Packages.props
index ab71be95..5916c8c8 100644
--- a/v2rayN/Directory.Packages.props
+++ b/v2rayN/Directory.Packages.props
@@ -5,10 +5,10 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.4" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.4" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.4" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.4" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.5" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.5" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.5" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.5" />
     <PackageVersion Include="CliWrap" Version="3.9.0" />
     <PackageVersion Include="Downloader" Version="4.0.3" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
@@ -27,4 +27,4 @@
     <PackageVersion Include="YamlDotNet" Version="16.3.0" />
     <PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

From 84bf9ecfafc2afb767da338f114c5a059499d083 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Fri, 5 Sep 2025 18:11:16 +0800
Subject: [PATCH 100/115] Fix DNS Regional Presets (#7885)

---
 v2rayN/ServiceLib/Handler/ConfigHandler.cs | 36 ++++++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
index 9df5f6b4..e488720f 100644
--- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -2321,10 +2321,22 @@ public static class ConfigHandler
                 config.ConstItem.SrsSourceUrl = Global.SingboxRulesetSources[1];
                 config.ConstItem.RouteRulesTemplateSourceUrl = Global.RoutingRulesSources[1];
 
-                await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.Xray, Global.DNSTemplateSources[1] + "v2ray.json"));
-                await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.sing_box, Global.DNSTemplateSources[1] + "sing_box.json"));
+                var xrayDnsRussia = await GetExternalDNSItem(ECoreType.Xray, Global.DNSTemplateSources[1] + "v2ray.json");
+                var singboxDnsRussia = await GetExternalDNSItem(ECoreType.sing_box, Global.DNSTemplateSources[1] + "sing_box.json");
+                var simpleDnsRussia = await GetExternalSimpleDNSItem(Global.DNSTemplateSources[1] + "simple_dns.json");
 
-                config.SimpleDNSItem = await GetExternalSimpleDNSItem(Global.DNSTemplateSources[1] + "simple_dns.json") ?? InitBuiltinSimpleDNS();
+                if (simpleDnsRussia == null)
+                {
+                    xrayDnsRussia.Enabled = true;
+                    singboxDnsRussia.Enabled = true;
+                    config.SimpleDNSItem = InitBuiltinSimpleDNS();
+                }
+                else
+                {
+                    config.SimpleDNSItem = simpleDnsRussia;
+                }
+                await SaveDNSItems(config, xrayDnsRussia);
+                await SaveDNSItems(config, singboxDnsRussia);
                 break;
 
             case EPresetType.Iran:
@@ -2332,10 +2344,22 @@ public static class ConfigHandler
                 config.ConstItem.SrsSourceUrl = Global.SingboxRulesetSources[2];
                 config.ConstItem.RouteRulesTemplateSourceUrl = Global.RoutingRulesSources[2];
 
-                await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.Xray, Global.DNSTemplateSources[2] + "v2ray.json"));
-                await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.sing_box, Global.DNSTemplateSources[2] + "sing_box.json"));
+                var xrayDnsIran = await GetExternalDNSItem(ECoreType.Xray, Global.DNSTemplateSources[2] + "v2ray.json");
+                var singboxDnsIran = await GetExternalDNSItem(ECoreType.sing_box, Global.DNSTemplateSources[2] + "sing_box.json");
+                var simpleDnsIran = await GetExternalSimpleDNSItem(Global.DNSTemplateSources[2] + "simple_dns.json");
 
-                config.SimpleDNSItem = await GetExternalSimpleDNSItem(Global.DNSTemplateSources[2] + "simple_dns.json") ?? InitBuiltinSimpleDNS();
+                if (simpleDnsIran == null)
+                {
+                    xrayDnsIran.Enabled = true;
+                    singboxDnsIran.Enabled = true;
+                    config.SimpleDNSItem = InitBuiltinSimpleDNS();
+                }
+                else
+                {
+                    config.SimpleDNSItem = simpleDnsIran;
+                }
+                await SaveDNSItems(config, xrayDnsIran);
+                await SaveDNSItems(config, singboxDnsIran);
                 break;
         }
 

From e7609619d4875ba4a4eebe7168118c958c6d62c7 Mon Sep 17 00:00:00 2001
From: JieXu <xujie0739@gmail.com>
Date: Sat, 6 Sep 2025 15:46:20 +0800
Subject: [PATCH 101/115] Update package-debian.sh (#7888)

---
 package-debian.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/package-debian.sh b/package-debian.sh
index 568bdd88..76a34206 100644
--- a/package-debian.sh
+++ b/package-debian.sh
@@ -52,7 +52,17 @@ sudo chmod 0755 "${PackagePath}/DEBIAN/postinst"
 sudo chmod 0755 "${PackagePath}/opt/v2rayN/v2rayN"
 sudo chmod 0755 "${PackagePath}/opt/v2rayN/AmazTool"
 
-# desktop && PATH
+# Patch
+# set owner to root:root
+sudo chown -R root:root "${PackagePath}"
+# set all directories to 755 (readable & traversable by all users)
+sudo find "${PackagePath}/opt/v2rayN" -type d -exec chmod 755 {} +
+# set all regular files to 644 (readable by all users)
+sudo find "${PackagePath}/opt/v2rayN" -type f -exec chmod 644 {} +
+# ensure main binaries are 755 (executable by all users)
+sudo chmod 755 "${PackagePath}/opt/v2rayN/v2rayN" 2>/dev/null || true
+sudo chmod 755 "${PackagePath}/opt/v2rayN/AmazTool" 2>/dev/null || true
 
+# build deb package
 sudo dpkg-deb -Zxz --build $PackagePath
-sudo mv "${PackagePath}.deb" "v2rayN-${Arch}.deb"
\ No newline at end of file
+sudo mv "${PackagePath}.deb" "v2rayN-${Arch}.deb"

From f2f3a7eb5fee3589c6f82a9c4e926b21c8283134 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Sep 2025 15:46:34 +0800
Subject: [PATCH 102/115] Bump actions/setup-dotnet from 4.3.1 to 5.0.0 (#7883)

Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 4.3.1 to 5.0.0.
- [Release notes](https://github.com/actions/setup-dotnet/releases)
- [Commits](https://github.com/actions/setup-dotnet/compare/v4.3.1...v5.0.0)

---
updated-dependencies:
- dependency-name: actions/setup-dotnet
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/build-linux.yml           | 2 +-
 .github/workflows/build-osx.yml             | 2 +-
 .github/workflows/build-windows-desktop.yml | 2 +-
 .github/workflows/build-windows.yml         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index 0fb8574f..40e9c953 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -32,7 +32,7 @@ jobs:
         fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v4.3.1
+      uses: actions/setup-dotnet@v5.0.0
       with:
         dotnet-version: '8.0.x'
 
diff --git a/.github/workflows/build-osx.yml b/.github/workflows/build-osx.yml
index fa1d3ef4..97c002c7 100644
--- a/.github/workflows/build-osx.yml
+++ b/.github/workflows/build-osx.yml
@@ -32,7 +32,7 @@ jobs:
         fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v4.3.1
+      uses: actions/setup-dotnet@v5.0.0
       with:
         dotnet-version: '8.0.x'
 
diff --git a/.github/workflows/build-windows-desktop.yml b/.github/workflows/build-windows-desktop.yml
index 4cd33704..3b28599d 100644
--- a/.github/workflows/build-windows-desktop.yml
+++ b/.github/workflows/build-windows-desktop.yml
@@ -32,7 +32,7 @@ jobs:
         fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v4.3.1
+      uses: actions/setup-dotnet@v5.0.0
       with:
         dotnet-version: '8.0.x'
 
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index c39ed723..fea3aa70 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -30,7 +30,7 @@ jobs:
       uses: actions/checkout@v5.0.0
 
     - name: Setup
-      uses: actions/setup-dotnet@v4.3.1
+      uses: actions/setup-dotnet@v5.0.0
       with:
         dotnet-version: '8.0.x'
 

From 291d4bd8e592f96c445ba5eea9901c305e97bf78 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 6 Sep 2025 16:52:57 +0800
Subject: [PATCH 103/115] Update Directory.Packages.props

---
 v2rayN/Directory.Packages.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2rayN/Directory.Packages.props b/v2rayN/Directory.Packages.props
index 5916c8c8..2a79ea50 100644
--- a/v2rayN/Directory.Packages.props
+++ b/v2rayN/Directory.Packages.props
@@ -20,11 +20,11 @@
     <PackageVersion Include="ReactiveUI.WPF" Version="20.4.1" />
     <PackageVersion Include="Semi.Avalonia" Version="11.2.1.9" />
     <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.9" />
-    <PackageVersion Include="Splat.NLog" Version="15.5.3" />
+    <PackageVersion Include="Splat.NLog" Version="16.1.1" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
     <PackageVersion Include="TaskScheduler" Version="2.12.2" />
     <PackageVersion Include="WebDav.Client" Version="2.9.0" />
     <PackageVersion Include="YamlDotNet" Version="16.3.0" />
     <PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

From 7f264453275a12709a00a0f120c3b08cb50af56c Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 6 Sep 2025 16:59:38 +0800
Subject: [PATCH 104/115] Update Directory.Packages.props

---
 v2rayN/Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/Directory.Packages.props b/v2rayN/Directory.Packages.props
index 2a79ea50..9193271c 100644
--- a/v2rayN/Directory.Packages.props
+++ b/v2rayN/Directory.Packages.props
@@ -20,7 +20,7 @@
     <PackageVersion Include="ReactiveUI.WPF" Version="20.4.1" />
     <PackageVersion Include="Semi.Avalonia" Version="11.2.1.9" />
     <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.9" />
-    <PackageVersion Include="Splat.NLog" Version="16.1.1" />
+    <PackageVersion Include="Splat.NLog" Version="16.2.1" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
     <PackageVersion Include="TaskScheduler" Version="2.12.2" />
     <PackageVersion Include="WebDav.Client" Version="2.9.0" />

From 6391667c15a993ddaf1b841e0280d68602e62b4b Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 6 Sep 2025 16:59:54 +0800
Subject: [PATCH 105/115] up 7.14.7

---
 v2rayN/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/Directory.Build.props b/v2rayN/Directory.Build.props
index 6eb40796..9ab2dc8e 100644
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.14.6</Version>
+        <Version>7.14.7</Version>
     </PropertyGroup>
 
     <PropertyGroup>

From d18d74ac1c144c47c3e8323156265a1f1508be4c Mon Sep 17 00:00:00 2001
From: JieXu <xujie0739@gmail.com>
Date: Sun, 7 Sep 2025 16:39:54 +0800
Subject: [PATCH 106/115] Update package-debian.sh (#7899)

---
 package-debian.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package-debian.sh b/package-debian.sh
index 76a34206..2d7d5534 100644
--- a/package-debian.sh
+++ b/package-debian.sh
@@ -28,6 +28,7 @@ Package: v2rayN
 Version: $Version
 Architecture: $Arch2
 Maintainer: https://github.com/2dust/v2rayN
+Depends: desktop-file-utils
 Description: A GUI client for Windows and Linux, support Xray core and sing-box-core and others
 EOF
 

From 04195c29573525151d85b2a9b2d9761c23df4f3d Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Sun, 7 Sep 2025 18:58:59 +0800
Subject: [PATCH 107/115] Profiles Select Window (#7891)

* Profiles Select Window

* Sort

* wpf

* avalonia

* Allow single select

* Fix

* Add Config Type Filter

* Remove unnecessary
---
 v2rayN/ServiceLib/Resx/ResUI.Designer.cs      |   9 +
 v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx       |   3 +
 v2rayN/ServiceLib/Resx/ResUI.hu.resx          |   3 +
 v2rayN/ServiceLib/Resx/ResUI.resx             |   3 +
 v2rayN/ServiceLib/Resx/ResUI.ru.resx          |   3 +
 v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx     |   3 +
 v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx     |   3 +
 .../ViewModels/ProfilesSelectViewModel.cs     | 359 ++++++++++++++++++
 .../ViewModels/ProfilesViewModel.cs           |  25 --
 .../Views/ProfilesSelectWindow.axaml          | 136 +++++++
 .../Views/ProfilesSelectWindow.axaml.cs       | 200 ++++++++++
 .../Views/RoutingRuleDetailsWindow.axaml      |  15 +-
 .../Views/RoutingRuleDetailsWindow.axaml.cs   |  16 +
 .../v2rayN.Desktop/Views/SubEditWindow.axaml  |  12 +
 .../Views/SubEditWindow.axaml.cs              |  31 ++
 v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml | 156 ++++++++
 .../v2rayN/Views/ProfilesSelectWindow.xaml.cs | 194 ++++++++++
 v2rayN/v2rayN/Views/ProfilesView.xaml.cs      |   4 +-
 .../Views/RoutingRuleDetailsWindow.xaml       |  16 +-
 .../Views/RoutingRuleDetailsWindow.xaml.cs    |  15 +
 v2rayN/v2rayN/Views/SubEditWindow.xaml        |  16 +
 v2rayN/v2rayN/Views/SubEditWindow.xaml.cs     |  28 ++
 22 files changed, 1217 insertions(+), 33 deletions(-)
 create mode 100644 v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs
 create mode 100644 v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
 create mode 100644 v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs
 create mode 100644 v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml
 create mode 100644 v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs

diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index 82d1203f..6503b41c 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -3030,6 +3030,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Select Profile 的本地化字符串。
+        /// </summary>
+        public static string TbSelectProfile {
+            get {
+                return ResourceManager.GetString("TbSelectProfile", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Set system proxy 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
index 302c91c4..0c8ca393 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1512,4 +1512,7 @@
   <data name="MsgStartParsingSubscription" xml:space="preserve">
     <value>Start parsing and processing subscription content</value>
   </data>
+  <data name="TbSelectProfile" xml:space="preserve">
+    <value>Select Profile</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
index 8f6079fd..800fa00f 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1512,4 +1512,7 @@
   <data name="MsgStartParsingSubscription" xml:space="preserve">
     <value>Start parsing and processing subscription content</value>
   </data>
+  <data name="TbSelectProfile" xml:space="preserve">
+    <value>Select Profile</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index 05bcf901..614c8092 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1512,4 +1512,7 @@
   <data name="MsgStartParsingSubscription" xml:space="preserve">
     <value>Start parsing and processing subscription content</value>
   </data>
+  <data name="TbSelectProfile" xml:space="preserve">
+    <value>Select Profile</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
index fd2f5400..294d9f34 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1512,4 +1512,7 @@
   <data name="MsgStartParsingSubscription" xml:space="preserve">
     <value>Start parsing and processing subscription content</value>
   </data>
+  <data name="TbSelectProfile" xml:space="preserve">
+    <value>Select Profile</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index 7176222a..194a59e2 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1509,4 +1509,7 @@
   <data name="MsgStartParsingSubscription" xml:space="preserve">
     <value>开始解析和处理订阅内容</value>
   </data>
+  <data name="TbSelectProfile" xml:space="preserve">
+    <value>选择配置文件</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index 58239c8c..fa84c789 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1509,4 +1509,7 @@
   <data name="MsgStartParsingSubscription" xml:space="preserve">
     <value>開始解析和處理訂閱內容</value>
   </data>
+  <data name="TbSelectProfile" xml:space="preserve">
+    <value>Select Profile</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs b/v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs
new file mode 100644
index 00000000..ff6d787f
--- /dev/null
+++ b/v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs
@@ -0,0 +1,359 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive;
+using System.Reactive.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DynamicData;
+using DynamicData.Binding;
+using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
+using Splat;
+
+namespace ServiceLib.ViewModels;
+public class ProfilesSelectViewModel : MyReactiveObject
+{
+    #region private prop
+
+    private List<ProfileItem> _lstProfile;
+    private string _serverFilter = string.Empty;
+    private Dictionary<string, bool> _dicHeaderSort = new();
+    private string _subIndexId = string.Empty;
+    // ConfigType filter state: default include-mode with all types selected
+    private List<EConfigType> _filterConfigTypes = new();
+    private bool _filterExclude = false;
+
+    #endregion private prop
+
+    #region ObservableCollection
+
+    public IObservableCollection<ProfileItemModel> ProfileItems { get; } = new ObservableCollectionExtended<ProfileItemModel>();
+
+    public IObservableCollection<SubItem> SubItems { get; } = new ObservableCollectionExtended<SubItem>();
+
+    [Reactive]
+    public ProfileItemModel SelectedProfile { get; set; }
+
+    public IList<ProfileItemModel> SelectedProfiles { get; set; }
+
+    [Reactive]
+    public SubItem SelectedSub { get; set; }
+
+    [Reactive]
+    public string ServerFilter { get; set; }
+
+    // Include/Exclude filter for ConfigType
+    public List<EConfigType> FilterConfigTypes
+    {
+        get => _filterConfigTypes;
+        set => this.RaiseAndSetIfChanged(ref _filterConfigTypes, value);
+    }
+
+    [Reactive]
+    public bool FilterExclude
+    {
+        get => _filterExclude;
+        set => this.RaiseAndSetIfChanged(ref _filterExclude, value);
+    }
+
+    #endregion ObservableCollection
+
+    #region Init
+
+    public ProfilesSelectViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
+    {
+        _config = AppManager.Instance.Config;
+        _updateView = updateView;
+        _subIndexId = _config.SubIndexId ?? string.Empty;
+        #region WhenAnyValue && ReactiveCommand
+
+        this.WhenAnyValue(
+            x => x.SelectedSub,
+            y => y != null && !y.Remarks.IsNullOrEmpty() && _subIndexId != y.Id)
+                .Subscribe(async c => await SubSelectedChangedAsync(c));
+
+        this.WhenAnyValue(
+          x => x.ServerFilter,
+          y => y != null && _serverFilter != y)
+              .Subscribe(async c => await ServerFilterChanged(c));
+
+        // React to ConfigType filter changes
+        this.WhenAnyValue(x => x.FilterExclude)
+            .Skip(1)
+            .Subscribe(async _ => await RefreshServersBiz());
+
+        this.WhenAnyValue(x => x.FilterConfigTypes)
+            .Skip(1)
+            .Subscribe(async _ => await RefreshServersBiz());
+
+        #endregion WhenAnyValue && ReactiveCommand
+
+        _ = Init();
+    }
+
+    private async Task Init()
+    {
+        SelectedProfile = new();
+        SelectedSub = new();
+
+        // Default: include mode with all ConfigTypes selected
+        try
+        {
+            FilterExclude = false;
+            FilterConfigTypes = Enum.GetValues(typeof(EConfigType)).Cast<EConfigType>().ToList();
+        }
+        catch
+        {
+            FilterConfigTypes = new();
+        }
+
+        await RefreshSubscriptions();
+        await RefreshServers();
+    }
+
+    #endregion Init
+
+    #region Actions
+
+    public bool CanOk()
+    {
+        return SelectedProfile != null && !SelectedProfile.IndexId.IsNullOrEmpty();
+    }
+
+    public bool SelectFinish()
+    {
+        if (!CanOk())
+        {
+            return false;
+        }
+        _updateView?.Invoke(EViewAction.CloseWindow, null);
+        return true;
+    }
+    #endregion Actions
+
+    #region Servers && Groups
+
+    private async Task SubSelectedChangedAsync(bool c)
+    {
+        if (!c)
+        {
+            return;
+        }
+        _subIndexId = SelectedSub?.Id;
+
+        await RefreshServers();
+
+        await _updateView?.Invoke(EViewAction.ProfilesFocus, null);
+    }
+
+    private async Task ServerFilterChanged(bool c)
+    {
+        if (!c)
+        {
+            return;
+        }
+        _serverFilter = ServerFilter;
+        if (_serverFilter.IsNullOrEmpty())
+        {
+            await RefreshServers();
+        }
+    }
+
+    public async Task RefreshServers()
+    {
+        await RefreshServersBiz();
+    }
+
+    private async Task RefreshServersBiz()
+    {
+        var lstModel = await GetProfileItemsEx(_subIndexId, _serverFilter);
+        _lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel)) ?? [];
+
+        ProfileItems.Clear();
+        ProfileItems.AddRange(lstModel);
+        if (lstModel.Count > 0)
+        {
+            var selected = lstModel.FirstOrDefault(t => t.IndexId == _config.IndexId);
+            if (selected != null)
+            {
+                SelectedProfile = selected;
+            }
+            else
+            {
+                SelectedProfile = lstModel.First();
+            }
+        }
+
+        await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null);
+    }
+
+    public async Task RefreshSubscriptions()
+    {
+        SubItems.Clear();
+
+        SubItems.Add(new SubItem { Remarks = ResUI.AllGroupServers });
+
+        foreach (var item in await AppManager.Instance.SubItems())
+        {
+            SubItems.Add(item);
+        }
+        if (_subIndexId != null && SubItems.FirstOrDefault(t => t.Id == _subIndexId) != null)
+        {
+            SelectedSub = SubItems.FirstOrDefault(t => t.Id == _subIndexId);
+        }
+        else
+        {
+            SelectedSub = SubItems.First();
+        }
+    }
+
+    private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)
+    {
+        var lstModel = await AppManager.Instance.ProfileItems(_subIndexId, filter);
+
+        //await ConfigHandler.SetDefaultServer(_config, lstModel);
+
+        lstModel = (from t in lstModel
+                    select new ProfileItemModel
+                    {
+                        IndexId = t.IndexId,
+                        ConfigType = t.ConfigType,
+                        Remarks = t.Remarks,
+                        Address = t.Address,
+                        Port = t.Port,
+                        Security = t.Security,
+                        Network = t.Network,
+                        StreamSecurity = t.StreamSecurity,
+                        Subid = t.Subid,
+                        SubRemarks = t.SubRemarks,
+                        IsActive = t.IndexId == _config.IndexId,
+                    }).OrderBy(t => t.Sort).ToList();
+
+        // Apply ConfigType filter (include or exclude)
+        if (FilterConfigTypes != null && FilterConfigTypes.Count > 0)
+        {
+            if (FilterExclude)
+            {
+                lstModel = lstModel.Where(t => !FilterConfigTypes.Contains(t.ConfigType)).ToList();
+            }
+            else
+            {
+                lstModel = lstModel.Where(t => FilterConfigTypes.Contains(t.ConfigType)).ToList();
+            }
+        }
+
+        return lstModel;
+    }
+
+    public async Task<ProfileItem?> GetProfileItem()
+    {
+        if (string.IsNullOrEmpty(SelectedProfile?.IndexId))
+        {
+            return null;
+        }
+        var indexId = SelectedProfile.IndexId;
+        var item = await AppManager.Instance.GetProfileItem(indexId);
+        if (item is null)
+        {
+            NoticeManager.Instance.Enqueue(ResUI.PleaseSelectServer);
+            return null;
+        }
+        return item;
+    }
+
+    public async Task<List<ProfileItem>?> GetProfileItems()
+    {
+        if (SelectedProfiles == null || SelectedProfiles.Count == 0)
+        {
+            return null;
+        }
+        var lst = new List<ProfileItem>();
+        foreach (var sp in SelectedProfiles)
+        {
+            if (string.IsNullOrEmpty(sp?.IndexId))
+            {
+                continue;
+            }
+            var item = await AppManager.Instance.GetProfileItem(sp.IndexId);
+            if (item != null)
+            {
+                lst.Add(item);
+            }
+        }
+        if (lst.Count == 0)
+        {
+            NoticeManager.Instance.Enqueue(ResUI.PleaseSelectServer);
+            return null;
+        }
+        return lst;
+    }
+
+    public void SortServer(string colName)
+    {
+        if (colName.IsNullOrEmpty())
+        {
+            return;
+        }
+
+        var prop = typeof(ProfileItemModel).GetProperty(colName);
+        if (prop == null)
+        {
+            return;
+        }
+
+        _dicHeaderSort.TryAdd(colName, true);
+        var asc = _dicHeaderSort[colName];
+
+        var comparer = Comparer<object?>.Create((a, b) =>
+        {
+            if (ReferenceEquals(a, b))
+            {
+                return 0;
+            }
+            if (a is null)
+            {
+                return -1;
+            }
+            if (b is null)
+            {
+                return 1;
+            }
+            if (a.GetType() == b.GetType() && a is IComparable ca)
+            {
+                return ca.CompareTo(b);
+            }
+            return string.Compare(a.ToString(), b.ToString(), StringComparison.OrdinalIgnoreCase);
+        });
+
+        object? KeySelector(ProfileItemModel x)
+        {
+            return prop.GetValue(x);
+        }
+
+        IEnumerable<ProfileItemModel> sorted = asc
+            ? ProfileItems.OrderBy(KeySelector, comparer)
+            : ProfileItems.OrderByDescending(KeySelector, comparer);
+
+        var list = sorted.ToList();
+        ProfileItems.Clear();
+        ProfileItems.AddRange(list);
+
+        _dicHeaderSort[colName] = !asc;
+
+        return;
+    }
+
+    #endregion Servers && Groups
+
+    #region Public API
+
+    // External setter for ConfigType filter
+    public void SetConfigTypeFilter(IEnumerable<EConfigType> types, bool exclude = false)
+    {
+        FilterConfigTypes = types?.Distinct().ToList() ?? new List<EConfigType>();
+        FilterExclude = exclude;
+    }
+
+    #endregion Public API
+}
diff --git a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
index 5209f4dd..f5aeac21 100644
--- a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
@@ -38,15 +38,9 @@ public class ProfilesViewModel : MyReactiveObject
     [Reactive]
     public SubItem SelectedMoveToGroup { get; set; }
 
-    [Reactive]
-    public ComboItem SelectedServer { get; set; }
-
     [Reactive]
     public string ServerFilter { get; set; }
 
-    [Reactive]
-    public bool BlServers { get; set; }
-
     #endregion ObservableCollection
 
     #region Menu
@@ -115,11 +109,6 @@ public class ProfilesViewModel : MyReactiveObject
              y => y != null && !y.Remarks.IsNullOrEmpty())
                  .Subscribe(async c => await MoveToGroup(c));
 
-        this.WhenAnyValue(
-          x => x.SelectedServer,
-          y => y != null && !y.Text.IsNullOrEmpty())
-              .Subscribe(async c => await ServerSelectedChanged(c));
-
         this.WhenAnyValue(
           x => x.ServerFilter,
           y => y != null && _serverFilter != y)
@@ -266,7 +255,6 @@ public class ProfilesViewModel : MyReactiveObject
         SelectedProfile = new();
         SelectedSub = new();
         SelectedMoveToGroup = new();
-        SelectedServer = new();
 
         await RefreshSubscriptions();
         await RefreshServers();
@@ -613,19 +601,6 @@ public class ProfilesViewModel : MyReactiveObject
         }
     }
 
-    private async Task ServerSelectedChanged(bool c)
-    {
-        if (!c)
-        {
-            return;
-        }
-        if (SelectedServer == null || SelectedServer.ID.IsNullOrEmpty())
-        {
-            return;
-        }
-        await SetDefaultServer(SelectedServer.ID);
-    }
-
     public async Task ShareServerAsync()
     {
         var item = await AppManager.Instance.GetProfileItem(SelectedProfile.IndexId);
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
new file mode 100644
index 00000000..abe98176
--- /dev/null
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
@@ -0,0 +1,136 @@
+<Window
+    x:Class="v2rayN.Desktop.Views.ProfilesSelectWindow"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
+    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
+    Title="{x:Static resx:ResUI.TbSelectProfile}"
+    Width="800"
+    Height="450"
+    x:DataType="vms:ProfilesSelectViewModel"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+
+    <DockPanel Margin="8">
+        <!--  Bottom buttons  -->
+        <StackPanel
+            Margin="4"
+            HorizontalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
+            <Button
+                x:Name="btnSave"
+                Width="100"
+                Click="BtnSave_Click"
+                Content="{x:Static resx:ResUI.TbConfirm}" />
+            <Button
+                x:Name="btnCancel"
+                Width="100"
+                Margin="8,0"
+                Content="{x:Static resx:ResUI.TbCancel}" />
+        </StackPanel>
+
+        <Grid>
+            <DockPanel>
+                <!--  Top tools  -->
+                <WrapPanel Margin="4" DockPanel.Dock="Top">
+                    <ListBox
+                        x:Name="lstGroup"
+                        Margin="4,0"
+                        DisplayMemberBinding="{Binding Remarks}"
+                        ItemsSource="{Binding SubItems}">
+                        <ListBox.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <WrapPanel />
+                            </ItemsPanelTemplate>
+                        </ListBox.ItemsPanel>
+                    </ListBox>
+
+                    <Button
+                        x:Name="btnAutofitColumnWidth"
+                        Width="32"
+                        Height="32"
+                        Margin="8,0"
+                        ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
+                        <Button.Content>
+                            <PathIcon Data="{StaticResource building_fit}" />
+                        </Button.Content>
+                    </Button>
+
+                    <TextBox
+                        x:Name="txtServerFilter"
+                        Width="200"
+                        Margin="8,0"
+                        VerticalContentAlignment="Center"
+                        Text="{Binding ServerFilter, Mode=TwoWay}"
+                        Watermark="{x:Static resx:ResUI.MsgServerTitle}" />
+                </WrapPanel>
+
+                <!--  Profiles grid  -->
+                <DataGrid
+                    x:Name="lstProfiles"
+                    AutoGenerateColumns="False"
+                    BorderThickness="1"
+                    CanUserReorderColumns="True"
+                    CanUserResizeColumns="True"
+                    GridLinesVisibility="All"
+                    HeadersVisibility="All"
+                    IsReadOnly="True"
+                    ItemsSource="{Binding ProfileItems}"
+                    SelectionMode="Single">
+                    <DataGrid.KeyBindings>
+                        <KeyBinding Command="{Binding SelectFinish}" Gesture="Enter" />
+                    </DataGrid.KeyBindings>
+                    <DataGrid.Columns>
+                        <DataGridTextColumn
+                            Width="80"
+                            Binding="{Binding ConfigType}"
+                            Header="{x:Static resx:ResUI.LvServiceType}"
+                            Tag="ConfigType" />
+
+                        <DataGridTemplateColumn SortMemberPath="Remarks" Tag="Remarks">
+                            <DataGridTemplateColumn.Header>
+                                <TextBlock Text="{x:Static resx:ResUI.LvRemarks}" />
+                            </DataGridTemplateColumn.Header>
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <StackPanel Margin="8,0" Orientation="Horizontal">
+                                        <TextBlock Text="{Binding Remarks}" />
+                                    </StackPanel>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+
+                        <DataGridTextColumn
+                            Width="120"
+                            Binding="{Binding Address}"
+                            Header="{x:Static resx:ResUI.LvAddress}"
+                            Tag="Address" />
+                        <DataGridTextColumn
+                            Width="60"
+                            Binding="{Binding Port}"
+                            Header="{x:Static resx:ResUI.LvPort}"
+                            Tag="Port" />
+                        <DataGridTextColumn
+                            Width="100"
+                            Binding="{Binding Network}"
+                            Header="{x:Static resx:ResUI.LvTransportProtocol}"
+                            Tag="Network" />
+                        <DataGridTextColumn
+                            Width="100"
+                            Binding="{Binding StreamSecurity}"
+                            Header="{x:Static resx:ResUI.LvTLS}"
+                            Tag="StreamSecurity" />
+                        <DataGridTextColumn
+                            Width="100"
+                            Binding="{Binding SubRemarks}"
+                            Header="{x:Static resx:ResUI.LvSubscription}"
+                            Tag="SubRemarks" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </DockPanel>
+        </Grid>
+    </DockPanel>
+</Window>
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs
new file mode 100644
index 00000000..5df0251a
--- /dev/null
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs
@@ -0,0 +1,200 @@
+using System.Linq;
+using System.Reactive.Disposables;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using Avalonia.VisualTree;
+using Avalonia.ReactiveUI;
+using ReactiveUI;
+using ServiceLib.Manager;
+using v2rayN.Desktop.Common;
+
+namespace v2rayN.Desktop.Views;
+
+public partial class ProfilesSelectWindow : ReactiveWindow<ProfilesSelectViewModel>
+{
+    private static Config _config;
+
+    public Task<ProfileItem?> ProfileItem => GetProfileItem();
+    public Task<List<ProfileItem>?> ProfileItems => GetProfileItems();
+    private bool _allowMultiSelect = false;
+
+    public ProfilesSelectWindow()
+    {
+        InitializeComponent();
+
+        _config = AppManager.Instance.Config;
+
+        btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
+        txtServerFilter.KeyDown += TxtServerFilter_KeyDown;
+        lstProfiles.KeyDown += LstProfiles_KeyDown;
+        lstProfiles.SelectionChanged += LstProfiles_SelectionChanged;
+        lstProfiles.LoadingRow += LstProfiles_LoadingRow;
+        lstProfiles.Sorting += LstProfiles_Sorting;
+        lstProfiles.DoubleTapped += LstProfiles_DoubleTapped;
+
+        ViewModel = new ProfilesSelectViewModel(UpdateViewHandler);
+        DataContext = ViewModel;
+
+        this.WhenActivated(disposables =>
+        {
+            this.OneWayBind(ViewModel, vm => vm.ProfileItems, v => v.lstProfiles.ItemsSource).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SelectedProfile, v => v.lstProfiles.SelectedItem).DisposeWith(disposables);
+
+            this.Bind(ViewModel, vm => vm.SelectedSub, v => v.lstGroup.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.ServerFilter, v => v.txtServerFilter.Text).DisposeWith(disposables);
+        });
+
+        btnCancel.Click += (s, e) => Close(false);
+    }
+
+    public void AllowMultiSelect(bool allow)
+    {
+        _allowMultiSelect = allow;
+        if (allow)
+        {
+            lstProfiles.SelectionMode = DataGridSelectionMode.Extended;
+            lstProfiles.SelectedItems.Clear();
+        }
+        else
+        {
+            lstProfiles.SelectionMode = DataGridSelectionMode.Single;
+            if (lstProfiles.SelectedItems.Count > 0)
+            {
+                var first = lstProfiles.SelectedItems[0];
+                lstProfiles.SelectedItems.Clear();
+                lstProfiles.SelectedItem = first;
+            }
+        }
+    }
+
+    // Expose ConfigType filter controls to callers
+    public void SetConfigTypeFilter(IEnumerable<EConfigType> types, bool exclude = false)
+        => ViewModel?.SetConfigTypeFilter(types, exclude);
+
+    private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
+    {
+        switch (action)
+        {
+            case EViewAction.CloseWindow:
+                Close(true);
+                break;
+        }
+        return await Task.FromResult(true);
+    }
+
+    private void LstProfiles_SelectionChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        if (ViewModel != null)
+        {
+            ViewModel.SelectedProfiles = lstProfiles.SelectedItems.Cast<ProfileItemModel>().ToList();
+        }
+    }
+
+    private void LstProfiles_LoadingRow(object? sender, DataGridRowEventArgs e)
+    {
+        e.Row.Header = $" {e.Row.Index + 1}";
+    }
+
+    private void LstProfiles_DoubleTapped(object? sender, TappedEventArgs e)
+    {
+        // 忽略表头区域的双击
+        if (e.Source is Control src)
+        {
+            if (src.FindAncestorOfType<DataGridColumnHeader>() != null)
+            {
+                e.Handled = true;
+                return;
+            }
+
+            // 仅当在数据行或其子元素上双击时才触发选择
+            if (src.FindAncestorOfType<DataGridRow>() != null)
+            {
+                ViewModel?.SelectFinish();
+                e.Handled = true;
+            }
+        }
+    }
+
+    private void LstProfiles_Sorting(object? sender, DataGridColumnEventArgs e)
+    {
+        // 自定义排序，防止默认行为导致误触发
+        e.Handled = true;
+        if (ViewModel != null && e.Column?.Tag?.ToString() != null)
+        {
+            ViewModel.SortServer(e.Column.Tag.ToString());
+        }
+    }
+
+    private void LstProfiles_KeyDown(object? sender, KeyEventArgs e)
+    {
+        if (e.KeyModifiers is KeyModifiers.Control or KeyModifiers.Meta)
+        {
+            if (e.Key == Key.A)
+            {
+                if (_allowMultiSelect)
+                {
+                    lstProfiles.SelectAll();
+                }
+                e.Handled = true;
+            }
+        }
+        else
+        {
+            if (e.Key is Key.Enter or Key.Return)
+            {
+                ViewModel?.SelectFinish();
+                e.Handled = true;
+            }
+        }
+    }
+
+    private void BtnAutofitColumnWidth_Click(object? sender, RoutedEventArgs e)
+    {
+        AutofitColumnWidth();
+    }
+
+    private void AutofitColumnWidth()
+    {
+        try
+        {
+            foreach (var col in lstProfiles.Columns)
+            {
+                col.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
+            }
+        }
+        catch
+        {
+        }
+    }
+
+    private void TxtServerFilter_KeyDown(object? sender, KeyEventArgs e)
+    {
+        if (e.Key is Key.Enter or Key.Return)
+        {
+            ViewModel?.RefreshServers();
+        }
+    }
+
+    public async Task<ProfileItem?> GetProfileItem()
+    {
+        var item = await ViewModel?.GetProfileItem();
+        return item;
+    }
+
+    public async Task<List<ProfileItem>?> GetProfileItems()
+    {
+        var item = await ViewModel?.GetProfileItems();
+        return item;
+    }
+
+    private void BtnSave_Click(object sender, RoutedEventArgs e)
+    {
+        // Trigger selection finalize when Confirm is clicked
+        ViewModel?.SelectFinish();
+    }
+}
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml b/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
index f310f260..872a11f8 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
@@ -54,13 +54,22 @@
                 Width="300"
                 Margin="{StaticResource Margin4}"
                 Text="{Binding SelectedSource.OutboundTag, Mode=TwoWay}" />
-            <TextBlock
+            <StackPanel
                 Grid.Row="1"
                 Grid.Column="2"
                 Margin="{StaticResource Margin4}"
+                Orientation="Horizontal"
                 HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                Text="{x:Static resx:ResUI.TbRuleOutboundTagTip}" />
+                VerticalAlignment="Center">
+                <Button
+                    x:Name="btnSelectProfile"
+                    Margin="0,0,8,0"
+                    Content="{x:Static resx:ResUI.TbSelectProfile}"
+                    Click="BtnSelectProfile_Click" />
+                <TextBlock
+                    VerticalAlignment="Center"
+                    Text="{x:Static resx:ResUI.TbRuleOutboundTagTip}" />
+            </StackPanel>
 
             <TextBlock
                 Grid.Row="2"
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs
index 05744799..04b1219c 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs
@@ -3,6 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
 using v2rayN.Desktop.Base;
+using System.Threading.Tasks;
 
 namespace v2rayN.Desktop.Views;
 
@@ -93,4 +94,19 @@ public partial class RoutingRuleDetailsWindow : WindowBase<RoutingRuleDetailsVie
     {
         ProcUtils.ProcessStart("https://xtls.github.io/config/routing.html#ruleobject");
     }
+
+    private async void BtnSelectProfile_Click(object? sender, RoutedEventArgs e)
+    {
+        var selectWindow = new ProfilesSelectWindow();
+        selectWindow.SetConfigTypeFilter(new[] { EConfigType.Custom }, exclude: true);
+        var result = await selectWindow.ShowDialog<bool?>(this);
+        if (result == true)
+        {
+            var profile = await selectWindow.ProfileItem;
+            if (profile != null)
+            {
+                cmbOutboundTag.Text = profile.Remarks;
+            }
+        }
+    }
 }
diff --git a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
index 21c52189..7ebca48f 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
@@ -204,6 +204,12 @@
                     Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" />
+                <Button
+                    Grid.Row="9"
+                    Grid.Column="2"
+                    Margin="{StaticResource Margin4}"
+                    Content="{x:Static resx:ResUI.TbSelectProfile}"
+                    Click="BtnSelectPrevProfile_Click" />
 
                 <TextBlock
                     Grid.Row="10"
@@ -218,6 +224,12 @@
                     Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" />
+                <Button
+                    Grid.Row="10"
+                    Grid.Column="2"
+                    Margin="{StaticResource Margin4}"
+                    Content="{x:Static resx:ResUI.TbSelectProfile}"
+                    Click="BtnSelectNextProfile_Click" />
 
                 <TextBlock
                     Grid.Row="11"
diff --git a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs
index 99049018..486be1dd 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs
@@ -3,6 +3,7 @@ using Avalonia;
 using Avalonia.Interactivity;
 using ReactiveUI;
 using v2rayN.Desktop.Base;
+using System.Threading.Tasks;
 
 namespace v2rayN.Desktop.Views;
 
@@ -59,4 +60,34 @@ public partial class SubEditWindow : WindowBase<SubEditViewModel>
     {
         txtRemarks.Focus();
     }
+
+    private async void BtnSelectPrevProfile_Click(object? sender, RoutedEventArgs e)
+    {
+        var selectWindow = new ProfilesSelectWindow();
+        selectWindow.SetConfigTypeFilter(new[] { EConfigType.Custom }, exclude: true);
+        var result = await selectWindow.ShowDialog<bool?>(this);
+        if (result == true)
+        {
+            var profile = await selectWindow.ProfileItem;
+            if (profile != null)
+            {
+                txtPrevProfile.Text = profile.Remarks;
+            }
+        }
+    }
+
+    private async void BtnSelectNextProfile_Click(object? sender, RoutedEventArgs e)
+    {
+        var selectWindow = new ProfilesSelectWindow();
+        selectWindow.SetConfigTypeFilter(new[] { EConfigType.Custom }, exclude: true);
+        var result = await selectWindow.ShowDialog<bool?>(this);
+        if (result == true)
+        {
+            var profile = await selectWindow.ProfileItem;
+            if (profile != null)
+            {
+                txtNextProfile.Text = profile.Remarks;
+            }
+        }
+    }
 }
diff --git a/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml b/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml
new file mode 100644
index 00000000..453d8c03
--- /dev/null
+++ b/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml
@@ -0,0 +1,156 @@
+<base:WindowBase
+    x:Class="v2rayN.Views.ProfilesSelectWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:base="clr-namespace:v2rayN.Base"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
+    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
+    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
+    Title="{x:Static resx:ResUI.TbSelectProfile}"
+    Width="800"
+    Height="450"
+    x:TypeArguments="vms:ProfilesSelectViewModel"
+    Style="{StaticResource WindowGlobal}"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+
+    <DockPanel Margin="{StaticResource Margin8}">
+        <StackPanel
+            Margin="{StaticResource Margin4}"
+            HorizontalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
+            <Button
+                x:Name="btnSave"
+                Width="100"
+                Click="BtnSave_Click"
+                Content="{x:Static resx:ResUI.TbConfirm}"
+                IsDefault="True"
+                Style="{StaticResource DefButton}" />
+            <Button
+                x:Name="btnCancel"
+                Width="100"
+                Margin="{StaticResource MarginLeftRight8}"
+                Content="{x:Static resx:ResUI.TbCancel}"
+                IsCancel="true"
+                Style="{StaticResource DefButton}" />
+        </StackPanel>
+        <Grid>
+            <DockPanel>
+                <WrapPanel Margin="{StaticResource Margin4}" DockPanel.Dock="Top">
+                    <ListBox
+                        x:Name="lstGroup"
+                        MaxHeight="200"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuSubscription}"
+                        FontSize="{DynamicResource StdFontSize}"
+                        ItemContainerStyle="{StaticResource MyChipListBoxItem}"
+                        Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding Remarks}" />
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+
+                    <Button
+                        x:Name="btnAutofitColumnWidth"
+                        Width="30"
+                        Height="30"
+                        Margin="{StaticResource MarginLeftRight8}"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}"
+                        Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                        ToolTip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
+                        <materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowSplitVertical" />
+                    </Button>
+                    <TextBox
+                        x:Name="txtServerFilter"
+                        Width="200"
+                        Margin="{StaticResource MarginLeftRight4}"
+                        VerticalContentAlignment="Center"
+                        materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}"
+                        materialDesign:TextFieldAssist.HasClearButton="True"
+                        AutomationProperties.Name="{x:Static resx:ResUI.MsgServerTitle}"
+                        Style="{StaticResource DefTextBox}" />
+                </WrapPanel>
+                <DataGrid
+                    x:Name="lstProfiles"
+                    materialDesign:DataGridAssist.CellPadding="2,2"
+                    AutoGenerateColumns="False"
+                    BorderThickness="1"
+                    CanUserAddRows="False"
+                    CanUserResizeRows="False"
+                    CanUserSortColumns="False"
+                    EnableRowVirtualization="True"
+                    Focusable="True"
+                    GridLinesVisibility="All"
+                    HeadersVisibility="All"
+                    IsReadOnly="True"
+                    RowHeaderWidth="40"
+                    SelectionMode="Single"
+                    Style="{StaticResource DefDataGrid}">
+                    <DataGrid.InputBindings>
+                        <KeyBinding Command="ApplicationCommands.NotACommand" Gesture="Enter" />
+                    </DataGrid.InputBindings>
+                    <DataGrid.Resources>
+                        <Style BasedOn="{StaticResource MaterialDesignDataGridRow}" TargetType="DataGridRow">
+                            <EventSetter Event="MouseDoubleClick" Handler="LstProfiles_MouseDoubleClick" />
+                        </Style>
+                        <Style BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}" TargetType="DataGridColumnHeader">
+                            <EventSetter Event="Click" Handler="LstProfiles_ColumnHeader_Click" />
+                        </Style>
+
+                        <Style BasedOn="{StaticResource MaterialDesignDataGridCell}" TargetType="DataGridCell">
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding IsActive}" Value="True">
+                                    <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
+                                    <Setter Property="Foreground" Value="Black" />
+                                    <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </DataGrid.Resources>
+                    <DataGrid.Columns>
+                        <base:MyDGTextColumn
+                            Width="80"
+                            Binding="{Binding ConfigType}"
+                            ExName="ConfigType"
+                            Header="{x:Static resx:ResUI.LvServiceType}" />
+                        <base:MyDGTextColumn
+                            Width="150"
+                            Binding="{Binding Remarks}"
+                            ExName="Remarks"
+                            Header="{x:Static resx:ResUI.LvRemarks}" />
+                        <base:MyDGTextColumn
+                            Width="120"
+                            Binding="{Binding Address}"
+                            ExName="Address"
+                            Header="{x:Static resx:ResUI.LvAddress}" />
+                        <base:MyDGTextColumn
+                            Width="60"
+                            Binding="{Binding Port}"
+                            ExName="Port"
+                            Header="{x:Static resx:ResUI.LvPort}" />
+                        <base:MyDGTextColumn
+                            Width="100"
+                            Binding="{Binding Network}"
+                            ExName="Network"
+                            Header="{x:Static resx:ResUI.LvTransportProtocol}" />
+                        <base:MyDGTextColumn
+                            Width="100"
+                            Binding="{Binding StreamSecurity}"
+                            ExName="StreamSecurity"
+                            Header="{x:Static resx:ResUI.LvTLS}" />
+                        <base:MyDGTextColumn
+                            Width="100"
+                            Binding="{Binding SubRemarks}"
+                            ExName="SubRemarks"
+                            Header="{x:Static resx:ResUI.LvSubscription}" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </DockPanel>
+        </Grid>
+    </DockPanel>
+</base:WindowBase>
diff --git a/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs b/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs
new file mode 100644
index 00000000..e9e33ec5
--- /dev/null
+++ b/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs
@@ -0,0 +1,194 @@
+using System.Reactive.Disposables;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+using System.Windows.Threading;
+using ReactiveUI;
+using ServiceLib.Manager;
+using Splat;
+using v2rayN.Base;
+
+namespace v2rayN.Views;
+
+public partial class ProfilesSelectWindow
+{
+    private static Config _config;
+
+    public Task<ProfileItem?> ProfileItem => GetProfileItem();
+    public Task<List<ProfileItem>?> ProfileItems => GetProfileItems();
+    private bool _allowMultiSelect = false;
+
+    public ProfilesSelectWindow()
+    {
+        InitializeComponent();
+        lstGroup.MaxHeight = Math.Floor(SystemParameters.WorkArea.Height * 0.20 / 40) * 40;
+
+        _config = AppManager.Instance.Config;
+
+        btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
+        txtServerFilter.PreviewKeyDown += TxtServerFilter_PreviewKeyDown;
+        lstProfiles.PreviewKeyDown += LstProfiles_PreviewKeyDown;
+        lstProfiles.SelectionChanged += LstProfiles_SelectionChanged;
+        lstProfiles.LoadingRow += LstProfiles_LoadingRow;
+
+        ViewModel = new ProfilesSelectViewModel(UpdateViewHandler);
+
+
+        this.WhenActivated(disposables =>
+        {
+            this.OneWayBind(ViewModel, vm => vm.ProfileItems, v => v.lstProfiles.ItemsSource).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SelectedProfile, v => v.lstProfiles.SelectedItem).DisposeWith(disposables);
+
+            this.OneWayBind(ViewModel, vm => vm.SubItems, v => v.lstGroup.ItemsSource).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SelectedSub, v => v.lstGroup.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.ServerFilter, v => v.txtServerFilter.Text).DisposeWith(disposables);
+        });
+    }
+
+    public void AllowMultiSelect(bool allow)
+    {
+        _allowMultiSelect = allow;
+        if (allow)
+        {
+            lstProfiles.SelectionMode = DataGridSelectionMode.Extended;
+            lstProfiles.SelectedItems.Clear();
+        }
+        else
+        {
+            lstProfiles.SelectionMode = DataGridSelectionMode.Single;
+            if (lstProfiles.SelectedItems.Count > 0)
+            {
+                var first = lstProfiles.SelectedItems[0];
+                lstProfiles.SelectedItems.Clear();
+                lstProfiles.SelectedItem = first;
+            }
+        }
+    }
+
+    // Expose ConfigType filter controls to callers
+    public void SetConfigTypeFilter(IEnumerable<EConfigType> types, bool exclude = false)
+        => ViewModel?.SetConfigTypeFilter(types, exclude);
+
+    #region Event
+
+    private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
+    {
+        switch (action)
+        {
+            case EViewAction.CloseWindow:
+                this.DialogResult = true;
+                break;
+        }
+        return await Task.FromResult(true);
+    }
+
+    private void LstProfiles_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
+    {
+        if (ViewModel != null)
+        {
+            ViewModel.SelectedProfiles = lstProfiles.SelectedItems.Cast<ProfileItemModel>().ToList();
+        }
+    }
+
+    private void LstProfiles_LoadingRow(object? sender, DataGridRowEventArgs e)
+    {
+        e.Row.Header = $" {e.Row.GetIndex() + 1}";
+    }
+
+    private void LstProfiles_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+    {
+        ViewModel?.SelectFinish();
+    }
+
+    private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e)
+    {
+        var colHeader = sender as DataGridColumnHeader;
+        if (colHeader == null || colHeader.TabIndex < 0 || colHeader.Column == null)
+        {
+            return;
+        }
+
+        var colName = ((MyDGTextColumn)colHeader.Column).ExName;
+        ViewModel?.SortServer(colName);
+    }
+
+    private void menuSelectAll_Click(object sender, RoutedEventArgs e)
+    {
+        if (!_allowMultiSelect)
+        {
+            return;
+        }
+        lstProfiles.SelectAll();
+    }
+
+    private void LstProfiles_PreviewKeyDown(object sender, KeyEventArgs e)
+    {
+        if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
+        {
+            switch (e.Key)
+            {
+                case Key.A:
+                    menuSelectAll_Click(null, null);
+                    e.Handled = true;
+                    break;
+            }
+        }
+        else
+        {
+            if (e.Key is Key.Enter or Key.Return)
+            {
+                ViewModel?.SelectFinish();
+                e.Handled = true;
+            }
+        }
+    }
+
+    private void BtnAutofitColumnWidth_Click(object sender, RoutedEventArgs e)
+    {
+        AutofitColumnWidth();
+    }
+
+    private void AutofitColumnWidth()
+    {
+        try
+        {
+            foreach (var it in lstProfiles.Columns)
+            {
+                it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog("ProfilesView", ex);
+        }
+    }
+
+    private void TxtServerFilter_PreviewKeyDown(object sender, KeyEventArgs e)
+    {
+        if (e.Key is Key.Enter or Key.Return)
+        {
+            ViewModel?.RefreshServers();
+            e.Handled = true;
+        }
+    }
+
+    public async Task<ProfileItem?> GetProfileItem()
+    {
+        var item = await ViewModel?.GetProfileItem();
+        return item;
+    }
+
+    public async Task<List<ProfileItem>?> GetProfileItems()
+    {
+        var item = await ViewModel?.GetProfileItems();
+        return item;
+    }
+
+    private void BtnSave_Click(object sender, RoutedEventArgs e)
+    {
+        // Trigger selection finalize when Confirm is clicked
+        ViewModel?.SelectFinish();
+    }
+    #endregion Event
+}
diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
index 539886a8..c03fb0bd 100644
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
+++ b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
@@ -29,7 +29,7 @@ public partial class ProfilesView
         btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
         txtServerFilter.PreviewKeyDown += TxtServerFilter_PreviewKeyDown;
         lstProfiles.PreviewKeyDown += LstProfiles_PreviewKeyDown;
-        lstProfiles.SelectionChanged += lstProfiles_SelectionChanged;
+        lstProfiles.SelectionChanged += LstProfiles_SelectionChanged;
         lstProfiles.LoadingRow += LstProfiles_LoadingRow;
         menuSelectAll.Click += menuSelectAll_Click;
 
@@ -191,7 +191,7 @@ public partial class ProfilesView
         }
     }
 
-    private void lstProfiles_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
+    private void LstProfiles_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
     {
         if (ViewModel != null)
         {
diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
index baa4d543..f24a38d7 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
@@ -72,14 +72,24 @@
                 IsEditable="True"
                 MaxDropDownHeight="1000"
                 Style="{StaticResource DefComboBox}" />
-            <TextBlock
+            <StackPanel
                 Grid.Row="1"
                 Grid.Column="2"
                 Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
-                Style="{StaticResource ToolbarTextBlock}"
-                Text="{x:Static resx:ResUI.TbRuleOutboundTagTip}" />
+                Orientation="Horizontal">
+                <Button
+                    Margin="{StaticResource Margin4}"
+                    Click="BtnSelectProfile_Click"
+                    Content="{x:Static resx:ResUI.TbSelectProfile}"
+                    Style="{StaticResource DefButton}" />
+                <TextBlock
+                    Margin="{StaticResource Margin4}"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource ToolbarTextBlock}"
+                    Text="{x:Static resx:ResUI.TbRuleOutboundTagTip}" />
+            </StackPanel>
 
             <TextBlock
                 Grid.Row="2"
diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
index 86490e8b..806dde65 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
@@ -1,5 +1,6 @@
 using System.Reactive.Disposables;
 using System.Windows;
+using System.Windows.Threading;
 using ReactiveUI;
 using ServiceLib.Manager;
 
@@ -88,4 +89,18 @@ public partial class RoutingRuleDetailsWindow
     {
         ProcUtils.ProcessStart("https://xtls.github.io/config/routing.html#ruleobject");
     }
+
+    private async void BtnSelectProfile_Click(object sender, RoutedEventArgs e)
+    {
+        var selectWindow = new ProfilesSelectWindow();
+        selectWindow.SetConfigTypeFilter(new[] { EConfigType.Custom }, exclude: true);
+        if (selectWindow.ShowDialog() == true)
+        {
+            var profile = await selectWindow.ProfileItem;
+            if (profile != null)
+            {
+                cmbOutboundTag.Text = profile.Remarks;
+            }
+        }
+    }
 }
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml b/v2rayN/v2rayN/Views/SubEditWindow.xaml
index 2d863a96..cd665cf8 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml
@@ -259,6 +259,14 @@
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvPrevProfileTip}"
                     AcceptsReturn="True"
                     Style="{StaticResource MyOutlinedTextBox}" />
+                <Button
+                    Grid.Row="9"
+                    Grid.Column="2"
+                    Margin="{StaticResource Margin4}"
+                    VerticalAlignment="Center"
+                    Click="BtnSelectPrevProfile_Click"
+                    Content="{x:Static resx:ResUI.TbSelectProfile}"
+                    Style="{StaticResource DefButton}" />
 
                 <TextBlock
                     Grid.Row="10"
@@ -276,6 +284,14 @@
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvPrevProfileTip}"
                     AcceptsReturn="True"
                     Style="{StaticResource MyOutlinedTextBox}" />
+                <Button
+                    Grid.Row="10"
+                    Grid.Column="2"
+                    Margin="{StaticResource Margin4}"
+                    VerticalAlignment="Center"
+                    Click="BtnSelectNextProfile_Click"
+                    Content="{x:Static resx:ResUI.TbSelectProfile}"
+                    Style="{StaticResource DefButton}" />
 
                 <TextBlock
                     Grid.Row="11"
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs b/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
index 7c3cb847..e37076e7 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
@@ -54,4 +54,32 @@ public partial class SubEditWindow
     {
         txtRemarks.Focus();
     }
+
+    private async void BtnSelectPrevProfile_Click(object sender, RoutedEventArgs e)
+    {
+        var selectWindow = new ProfilesSelectWindow();
+        selectWindow.SetConfigTypeFilter(new[] { EConfigType.Custom }, exclude: true);
+        if (selectWindow.ShowDialog() == true)
+        {
+            var profile = await selectWindow.ProfileItem;
+            if (profile != null)
+            {
+                txtPrevProfile.Text = profile.Remarks;
+            }
+        }
+    }
+
+    private async void BtnSelectNextProfile_Click(object sender, RoutedEventArgs e)
+    {
+        var selectWindow = new ProfilesSelectWindow();
+        selectWindow.SetConfigTypeFilter(new[] { EConfigType.Custom }, exclude: true);
+        if (selectWindow.ShowDialog() == true)
+        {
+            var profile = await selectWindow.ProfileItem;
+            if (profile != null)
+            {
+                txtNextProfile.Text = profile.Remarks;
+            }
+        }
+    }
 }

From 0770e3003436f46999411eb2626ae5dba8df7c26 Mon Sep 17 00:00:00 2001
From: th1nker <69061641+th1nk-er@users.noreply.github.com>
Date: Mon, 8 Sep 2025 18:02:44 +0800
Subject: [PATCH 108/115] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=B3=BB=E7=BB=9Fhosts=20(#7903)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复当host的记录存在行尾注释时，无法将其添加到dns.host中

示例hosts
```
127.0.0.1 test1.com
127.0.0.1 test2.com # test
```
在之前仅仅会添加`127.0.0.1 test1.com`这条记录，而忽略另一条
---
 v2rayN/ServiceLib/Common/Utils.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2rayN/ServiceLib/Common/Utils.cs b/v2rayN/ServiceLib/Common/Utils.cs
index 38869ebb..49a359c0 100644
--- a/v2rayN/ServiceLib/Common/Utils.cs
+++ b/v2rayN/ServiceLib/Common/Utils.cs
@@ -582,9 +582,9 @@ public class Utils
                     if (host.StartsWith("#"))
                         continue;
                     var hostItem = host.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                    if (hostItem.Length != 2)
+                    if (hostItem.Length < 2)
                         continue;
-                    systemHosts.Add(hostItem.Last(), hostItem.First());
+                    systemHosts.Add(hostItem[1], hostItem[0]);
                 }
             }
         }

From 56c3e9c46d9044bb52d46d5e5ea2b9b8c80510ea Mon Sep 17 00:00:00 2001
From: JieXu <xujie0739@gmail.com>
Date: Mon, 8 Sep 2025 18:02:54 +0800
Subject: [PATCH 109/115] Fix package-appimage.sh bugs. (#7904)

* Update package-appimage.sh

* Delete pkg2appimage.yml
---
 package-appimage.sh | 75 ++++++++++++++++++++++++++++++++++++++-------
 pkg2appimage.yml    | 37 ----------------------
 2 files changed, 64 insertions(+), 48 deletions(-)
 delete mode 100644 pkg2appimage.yml

diff --git a/package-appimage.sh b/package-appimage.sh
index 77df287b..6a8bfcca 100644
--- a/package-appimage.sh
+++ b/package-appimage.sh
@@ -1,14 +1,67 @@
 #!/bin/bash
+set -euo pipefail
 
+# Install deps
 sudo apt update -y
-sudo apt install -y libfuse2
-wget -O pkg2appimage https://github.com/AppImageCommunity/pkg2appimage/releases/download/continuous/pkg2appimage-1eceb30-x86_64.AppImage
-chmod a+x pkg2appimage
-export AppImageOutputArch=$OutputArch
-export OutputPath=$OutputPath64
-./pkg2appimage ./pkg2appimage.yml
-mv out/*.AppImage v2rayN-${AppImageOutputArch}.AppImage
-export AppImageOutputArch=$OutputArchArm
-export OutputPath=$OutputPathArm64
-./pkg2appimage ./pkg2appimage.yml
-mv out/*.AppImage v2rayN-${AppImageOutputArch}.AppImage
+sudo apt install -y libfuse2 wget file
+
+# Get tools
+wget -qO appimagetool https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+chmod +x appimagetool
+
+# x86_64 AppDir
+APPDIR_X64="AppDir-x86_64"
+rm -rf "$APPDIR_X64"
+mkdir -p "$APPDIR_X64/usr/lib/v2rayN" "$APPDIR_X64/usr/bin" "$APPDIR_X64/usr/share/applications" "$APPDIR_X64/usr/share/pixmaps"
+cp -rf "$OutputPath64"/* "$APPDIR_X64/usr/lib/v2rayN" || true
+[ -f "$APPDIR_X64/usr/lib/v2rayN/v2rayN.png" ] && cp "$APPDIR_X64/usr/lib/v2rayN/v2rayN.png" "$APPDIR_X64/usr/share/pixmaps/v2rayN.png" || true
+[ -f "$APPDIR_X64/usr/lib/v2rayN/v2rayN.png" ] && cp "$APPDIR_X64/usr/lib/v2rayN/v2rayN.png" "$APPDIR_X64/v2rayN.png" || true
+
+printf '%s\n' '#!/bin/sh' 'HERE="$(dirname "$(readlink -f "$0")")"' 'cd "$HERE/usr/lib/v2rayN"' 'exec "$HERE/usr/lib/v2rayN/v2rayN" "$@"' > "$APPDIR_X64/AppRun"
+chmod +x "$APPDIR_X64/AppRun"
+ln -sf usr/lib/v2rayN/v2rayN "$APPDIR_X64/usr/bin/v2rayN"
+cat > "$APPDIR_X64/v2rayN.desktop" <<EOF
+[Desktop Entry]
+Name=v2rayN
+Comment=A GUI client for Windows and Linux, support Xray core and sing-box-core and others
+Exec=v2rayN
+Icon=v2rayN
+Terminal=false
+Type=Application
+Categories=Network;
+EOF
+install -Dm644 "$APPDIR_X64/v2rayN.desktop" "$APPDIR_X64/usr/share/applications/v2rayN.desktop"
+
+ARCH=x86_64 ./appimagetool "$APPDIR_X64" "v2rayN-${OutputArch}.AppImage"
+file "v2rayN-${OutputArch}.AppImage" | grep -q 'x86-64'
+
+# aarch64 AppDir
+APPDIR_ARM64="AppDir-aarch64"
+rm -rf "$APPDIR_ARM64"
+mkdir -p "$APPDIR_ARM64/usr/lib/v2rayN" "$APPDIR_ARM64/usr/bin" "$APPDIR_ARM64/usr/share/applications" "$APPDIR_ARM64/usr/share/pixmaps"
+cp -rf "$OutputPathArm64"/* "$APPDIR_ARM64/usr/lib/v2rayN" || true
+[ -f "$APPDIR_ARM64/usr/lib/v2rayN/v2rayN.png" ] && cp "$APPDIR_ARM64/usr/lib/v2rayN/v2rayN.png" "$APPDIR_ARM64/usr/share/pixmaps/v2rayN.png" || true
+[ -f "$APPDIR_ARM64/usr/lib/v2rayN/v2rayN.png" ] && cp "$APPDIR_ARM64/usr/lib/v2rayN/v2rayN.png" "$APPDIR_ARM64/v2rayN.png" || true
+
+printf '%s\n' '#!/bin/sh' 'HERE="$(dirname "$(readlink -f "$0")")"' 'cd "$HERE/usr/lib/v2rayN"' 'exec "$HERE/usr/lib/v2rayN/v2rayN" "$@"' > "$APPDIR_ARM64/AppRun"
+chmod +x "$APPDIR_ARM64/AppRun"
+ln -sf usr/lib/v2rayN/v2rayN "$APPDIR_ARM64/usr/bin/v2rayN"
+cat > "$APPDIR_ARM64/v2rayN.desktop" <<EOF
+[Desktop Entry]
+Name=v2rayN
+Comment=A GUI client for Windows and Linux, support Xray core and sing-box-core and others
+Exec=v2rayN
+Icon=v2rayN
+Terminal=false
+Type=Application
+Categories=Network;
+EOF
+install -Dm644 "$APPDIR_ARM64/v2rayN.desktop" "$APPDIR_ARM64/usr/share/applications/v2rayN.desktop"
+
+# aarch64 runtime
+wget -qO runtime-aarch64 https://github.com/AppImage/AppImageKit/releases/download/continuous/runtime-aarch64
+chmod +x runtime-aarch64
+
+# build aarch64 AppImage
+ARCH=aarch64 ./appimagetool --runtime-file ./runtime-aarch64 "$APPDIR_ARM64" "v2rayN-${OutputArchArm}.AppImage"
+file "v2rayN-${OutputArchArm}.AppImage" | grep -q 'ARM aarch64'
diff --git a/pkg2appimage.yml b/pkg2appimage.yml
deleted file mode 100644
index 0b4565c7..00000000
--- a/pkg2appimage.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-app: v2rayN
-binpatch: true
-
-ingredients:
-  script:
-    - export FileName="v2rayN-${AppImageOutputArch}.zip"
-    - wget -nv -O $FileName "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/${FileName}"
-    - 7z x $FileName -aoa
-    - cp -rf v2rayN-${AppImageOutputArch}/* $OutputPath
-
-script:
-  - mkdir -p usr/bin usr/lib
-  - cp -rf $OutputPath usr/lib/v2rayN
-  - echo "When this file exists, app will not store configs under this folder" > usr/lib/v2rayN/NotStoreConfigHere.txt
-  - ln -sf usr/lib/v2rayN/v2rayN usr/bin/v2rayN
-  - chmod a+x usr/lib/v2rayN/v2rayN
-  - find usr -type f -exec sh -c 'file "{}" | grep -qi "executable" && chmod +x "{}"' \;
-  - install -Dm644 usr/lib/v2rayN/v2rayN.png v2rayN.png
-  - install -Dm644 usr/lib/v2rayN/v2rayN.png usr/share/pixmaps/v2rayN.png
-  - cat > v2rayN.desktop <<EOF
-  - [Desktop Entry]
-  - Name=v2rayN
-  - Comment=A GUI client for Windows and Linux, support Xray core and sing-box-core and others
-  - Exec=v2rayN
-  - Icon=v2rayN
-  - Terminal=false
-  - Type=Application
-  - Categories=Network;
-  - EOF
-  - install -Dm644 v2rayN.desktop usr/share/applications/v2rayN.desktop
-  - cat > AppRun <<\EOF
-  - #!/bin/sh
-  - HERE="$(dirname "$(readlink -f "${0}")")"
-  - cd ${HERE}/usr/lib/v2rayN
-  - exec ${HERE}/usr/lib/v2rayN/v2rayN $@
-  - EOF
-  - chmod a+x AppRun

From 2826444ffcfbab03a5e39b45989a49f220276653 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 8 Sep 2025 18:21:39 +0800
Subject: [PATCH 110/115] Code clean

---
 .../ViewModels/BackupAndRestoreViewModel.cs     |  1 -
 .../ViewModels/ProfilesSelectViewModel.cs       | 17 +++++------------
 .../ViewModels/RoutingRuleSettingViewModel.cs   |  1 +
 .../Views/ProfilesSelectWindow.axaml.cs         |  7 +------
 .../Views/RoutingRuleDetailsWindow.axaml.cs     |  1 -
 .../v2rayN.Desktop/Views/SubEditWindow.axaml.cs |  1 -
 .../v2rayN/Views/ProfilesSelectWindow.xaml.cs   |  6 +++---
 v2rayN/v2rayN/Views/ProfilesView.xaml.cs        |  2 +-
 .../Views/RoutingRuleDetailsWindow.xaml.cs      |  1 -
 9 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs b/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs
index 80336c5d..5a96a04d 100644
--- a/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs
@@ -1,7 +1,6 @@
 using System.Reactive;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
-using Splat;
 
 namespace ServiceLib.ViewModels;
 
diff --git a/v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs b/v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs
index ff6d787f..8742755e 100644
--- a/v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs
@@ -1,27 +1,22 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive;
 using System.Reactive.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using DynamicData;
 using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
-using Splat;
 
 namespace ServiceLib.ViewModels;
+
 public class ProfilesSelectViewModel : MyReactiveObject
 {
     #region private prop
 
-    private List<ProfileItem> _lstProfile;
     private string _serverFilter = string.Empty;
     private Dictionary<string, bool> _dicHeaderSort = new();
     private string _subIndexId = string.Empty;
+
     // ConfigType filter state: default include-mode with all types selected
     private List<EConfigType> _filterConfigTypes = new();
+
     private bool _filterExclude = false;
 
     #endregion private prop
@@ -66,6 +61,7 @@ public class ProfilesSelectViewModel : MyReactiveObject
         _config = AppManager.Instance.Config;
         _updateView = updateView;
         _subIndexId = _config.SubIndexId ?? string.Empty;
+
         #region WhenAnyValue && ReactiveCommand
 
         this.WhenAnyValue(
@@ -130,6 +126,7 @@ public class ProfilesSelectViewModel : MyReactiveObject
         _updateView?.Invoke(EViewAction.CloseWindow, null);
         return true;
     }
+
     #endregion Actions
 
     #region Servers && Groups
@@ -168,7 +165,6 @@ public class ProfilesSelectViewModel : MyReactiveObject
     private async Task RefreshServersBiz()
     {
         var lstModel = await GetProfileItemsEx(_subIndexId, _serverFilter);
-        _lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel)) ?? [];
 
         ProfileItems.Clear();
         ProfileItems.AddRange(lstModel);
@@ -211,9 +207,6 @@ public class ProfilesSelectViewModel : MyReactiveObject
     private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)
     {
         var lstModel = await AppManager.Instance.ProfileItems(_subIndexId, filter);
-
-        //await ConfigHandler.SetDefaultServer(_config, lstModel);
-
         lstModel = (from t in lstModel
                     select new ProfileItemModel
                     {
diff --git a/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs b/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs
index f176e29b..4b192f04 100644
--- a/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs
@@ -13,6 +13,7 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
 
     [Reactive]
     public RoutingItem SelectedRouting { get; set; }
+
     public IObservableCollection<RulesItemModel> RulesItems { get; } = new ObservableCollectionExtended<RulesItemModel>();
 
     [Reactive]
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs
index 5df0251a..b3319154 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs
@@ -1,17 +1,12 @@
-using System.Linq;
 using System.Reactive.Disposables;
-using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-using Avalonia.VisualTree;
 using Avalonia.ReactiveUI;
+using Avalonia.VisualTree;
 using ReactiveUI;
 using ServiceLib.Manager;
-using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views;
 
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs
index 04b1219c..b19fc923 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs
@@ -3,7 +3,6 @@ using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
 using v2rayN.Desktop.Base;
-using System.Threading.Tasks;
 
 namespace v2rayN.Desktop.Views;
 
diff --git a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs
index 486be1dd..d030ba02 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs
@@ -3,7 +3,6 @@ using Avalonia;
 using Avalonia.Interactivity;
 using ReactiveUI;
 using v2rayN.Desktop.Base;
-using System.Threading.Tasks;
 
 namespace v2rayN.Desktop.Views;
 
diff --git a/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs b/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs
index e9e33ec5..c6c82928 100644
--- a/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs
@@ -3,10 +3,8 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
-using System.Windows.Threading;
 using ReactiveUI;
 using ServiceLib.Manager;
-using Splat;
 using v2rayN.Base;
 
 namespace v2rayN.Views;
@@ -34,7 +32,6 @@ public partial class ProfilesSelectWindow
 
         ViewModel = new ProfilesSelectViewModel(UpdateViewHandler);
 
-
         this.WhenActivated(disposables =>
         {
             this.OneWayBind(ViewModel, vm => vm.ProfileItems, v => v.lstProfiles.ItemsSource).DisposeWith(disposables);
@@ -44,6 +41,8 @@ public partial class ProfilesSelectWindow
             this.Bind(ViewModel, vm => vm.SelectedSub, v => v.lstGroup.SelectedItem).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.ServerFilter, v => v.txtServerFilter.Text).DisposeWith(disposables);
         });
+
+        WindowsUtils.SetDarkBorder(this, AppManager.Instance.Config.UiItem.CurrentTheme);
     }
 
     public void AllowMultiSelect(bool allow)
@@ -190,5 +189,6 @@ public partial class ProfilesSelectWindow
         // Trigger selection finalize when Confirm is clicked
         ViewModel?.SelectFinish();
     }
+
     #endregion Event
 }
diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
index c03fb0bd..54e92181 100644
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
+++ b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
@@ -119,7 +119,7 @@ public partial class ProfilesView
                 if (obj is null)
                     return false;
                 WindowsUtils.SetClipboardData((string)obj);
-                break;          
+                break;
 
             case EViewAction.ProfilesFocus:
                 lstProfiles.Focus();
diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
index 806dde65..0c1d2a91 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
@@ -1,6 +1,5 @@
 using System.Reactive.Disposables;
 using System.Windows;
-using System.Windows.Threading;
 using ReactiveUI;
 using ServiceLib.Manager;
 

From 6ffb3bd30c2912c3be47ec4e349a7f4b60925ad5 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 8 Sep 2025 18:48:56 +0800
Subject: [PATCH 111/115] up 7.14.8

---
 v2rayN/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/Directory.Build.props b/v2rayN/Directory.Build.props
index 9ab2dc8e..6d911c66 100644
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.14.7</Version>
+        <Version>7.14.8</Version>
     </PropertyGroup>
 
     <PropertyGroup>

From 8e0c5cb9aa696d0972d330d3dfc66ba61d3d453a Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 9 Sep 2025 17:55:15 +0800
Subject: [PATCH 112/115] Bug fix

https://github.com/2dust/v2rayN/issues/7914
---
 v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs | 1 +
 v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs   | 2 +-
 v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs   | 1 -
 v2rayN/v2rayN/Views/ProfilesView.xaml.cs            | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index 7df04380..1f7b427e 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -235,6 +235,7 @@ public class MainWindowViewModel : MyReactiveObject
         {
             await StatisticsManager.Instance.Init(_config, UpdateStatisticsHandler);
         }
+        await RefreshServers();
 
         BlReloadEnabled = true;
         await Reload();
diff --git a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
index f5aeac21..14216fee 100644
--- a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
@@ -257,7 +257,7 @@ public class ProfilesViewModel : MyReactiveObject
         SelectedMoveToGroup = new();
 
         await RefreshSubscriptions();
-        await RefreshServers();
+        //await RefreshServers();
     }
 
     #endregion Init
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
index 994b0342..c52cad9d 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
@@ -112,7 +112,6 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
         });
 
         RestoreUI();
-        ViewModel?.RefreshServers();
     }
 
     private async void LstProfiles_Sorting(object? sender, DataGridColumnEventArgs e)
diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
index 54e92181..5f8f7033 100644
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
+++ b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
@@ -106,7 +106,6 @@ public partial class ProfilesView
         });
 
         RestoreUI();
-        ViewModel?.RefreshServers();
     }
 
     #region Event

From b95830b3d574c8073a5e7fa20c56a3e02633aa19 Mon Sep 17 00:00:00 2001
From: JieXu <xujie0739@gmail.com>
Date: Tue, 9 Sep 2025 19:51:10 +0800
Subject: [PATCH 113/115] Update package-rhel.sh package-debian.sh
 MainWindowViewModel.cs (#7910)

* Update package-rhel.sh

* Update package-rhel.sh

* Update package-rhel.sh

* Update package-rhel.sh

* Update MainWindowViewModel.cs

* Update package-rhel.sh

* Update package-debian.sh
---
 package-debian.sh                             |  2 +-
 package-rhel.sh                               | 53 ++++++++-----------
 .../ViewModels/MainWindowViewModel.cs         |  2 +-
 3 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/package-debian.sh b/package-debian.sh
index 2d7d5534..7c690d5f 100644
--- a/package-debian.sh
+++ b/package-debian.sh
@@ -28,7 +28,7 @@ Package: v2rayN
 Version: $Version
 Architecture: $Arch2
 Maintainer: https://github.com/2dust/v2rayN
-Depends: desktop-file-utils
+Depends: desktop-file-utils, xdg-utils
 Description: A GUI client for Windows and Linux, support Xray core and sing-box-core and others
 EOF
 
diff --git a/package-rhel.sh b/package-rhel.sh
index 0eeee8c7..ea537c62 100644
--- a/package-rhel.sh
+++ b/package-rhel.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# ===== Require Red Hat Enterprise Linux/RockyLinux/AlmaLinux/CentOS OR Ubuntu/Debian ====
+# == Require Red Hat Enterprise Linux/FedoraLinux/RockyLinux/AlmaLinux/CentOS OR Ubuntu/Debian ==
 if [[ -r /etc/os-release ]]; then
   . /etc/os-release
   case "$ID" in
-    rhel|rocky|almalinux|centos|ubuntu|debian)
+    rhel|rocky|almalinux|fedora|centos|ubuntu|debian)
       echo "[OK] Detected supported system: $NAME $VERSION_ID"
       ;;
     *)
@@ -390,25 +390,30 @@ download_mihomo() {
   chmod +x "$outroot/bin/mihomo/mihomo" || true
 }
 
-# Move geo files to a unified path: outroot/bin/xray/
+# Move geo files to a unified path: outroot/bin
 unify_geo_layout() {
   local outroot="$1"
-  mkdir -p "$outroot/bin/xray"
-  local srcs=( \
-    "$outroot/bin/geosite.dat" \
-    "$outroot/bin/geoip.dat" \
-    "$outroot/bin/geoip-only-cn-private.dat" \
-    "$outroot/bin/Country.mmdb" \
-    "$outroot/bin/geoip.metadb" \
+  mkdir -p "$outroot/bin"
+  local names=( \
+    "geosite.dat" \
+    "geoip.dat" \
+    "geoip-only-cn-private.dat" \
+    "Country.mmdb" \
+    "geoip.metadb" \
   )
-  for s in "${srcs[@]}"; do
-    if [[ -f "$s" ]]; then
-      mv -f "$s" "$outroot/bin/xray/$(basename "$s")"
+  for n in "${names[@]}"; do
+    # If file exists under bin/xray/, move it up to bin/
+    if [[ -f "$outroot/bin/xray/$n" ]]; then
+      mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
+    fi
+    # If file already in bin/, leave it as-is
+    if [[ -f "$outroot/bin/$n" ]]; then
+      :
     fi
   done
 }
 
-# Download geo/rule assets; then unify to bin/xray/
+# Download geo/rule assets; then unify to bin/
 download_geo_assets() {
   local outroot="$1"
   local bin_dir="$outroot/bin"
@@ -442,7 +447,7 @@ download_geo_assets() {
       "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geosite/$f" || true
   done
 
-  # Unify to bin/xray/
+  # Unify to bin/
   unify_geo_layout "$outroot"
 }
 
@@ -480,7 +485,7 @@ download_v2rayn_bundle() {
     rm -rf "$nested_dir"
   fi
 
-  # Unify to bin/xray/
+  # Unify to bin/
   unify_geo_layout "$outroot"
 
   echo "[+] Bundle extracted to $outroot"
@@ -610,7 +615,7 @@ Source0:        __PKGROOT__.tar.gz
 
 # Runtime dependencies (Avalonia / X11 / Fonts / GL)
 Requires:       libX11, libXrandr, libXcursor, libXi, libXext, libxcb, libXrender, libXfixes, libXinerama, libxkbcommon
-Requires:       fontconfig, freetype, cairo, pango, mesa-libEGL, mesa-libGL
+Requires:       fontconfig, freetype, cairo, pango, mesa-libEGL, mesa-libGL, xdg-utils
 
 %description
 v2rayN Linux for Red Hat Enterprise Linux
@@ -629,25 +634,13 @@ https://github.com/2dust/v2rayN
 install -dm0755 %{buildroot}/opt/v2rayN
 cp -a * %{buildroot}/opt/v2rayN/
 
-# Launcher (prefer native ELF first, then DLL fallback; also create Geo symlinks for the user)
+# Launcher (prefer native ELF first, then DLL fallback)
 install -dm0755 %{buildroot}%{_bindir}
 cat > %{buildroot}%{_bindir}/v2rayn << 'EOF'
 #!/usr/bin/bash
 set -euo pipefail
 DIR="/opt/v2rayN"
 
-# --- Symlink GEO files into user's XDG dir (first-run convenience) ---
-XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
-USR_GEO_DIR="$XDG_DATA_HOME/v2rayN/bin"
-SYS_XRAY_DIR="$DIR/bin/xray"
-mkdir -p "$USR_GEO_DIR"
-for f in geosite.dat geoip.dat geoip-only-cn-private.dat Country.mmdb; do
-  if [[ -f "$SYS_XRAY_DIR/$f" && ! -e "$USR_GEO_DIR/$f" ]]; then
-    ln -s "$SYS_XRAY_DIR/$f" "$USR_GEO_DIR/$f" || true
-  fi
-done
-# --- end GEO ---
-
 # Prefer native apphost
 if [[ -x "$DIR/v2rayN" ]]; then exec "$DIR/v2rayN" "$@"; fi
 
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index 1f7b427e..4e9fc9fc 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -488,7 +488,7 @@ public class MainWindowViewModel : MyReactiveObject
         }
         else if (Utils.IsLinux())
         {
-            ProcUtils.ProcessStart("nautilus", path);
+            ProcUtils.ProcessStart("xdg-open", path);
         }
         else if (Utils.IsOSX())
         {

From b49486cc2309f1ef12305e86f61d523674601ca1 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 9 Sep 2025 20:00:00 +0800
Subject: [PATCH 114/115] Update ProfilesSelectWindow.axaml

---
 .../Views/ProfilesSelectWindow.axaml          | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
index abe98176..eda3b105 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
@@ -38,9 +38,10 @@
                 <WrapPanel Margin="4" DockPanel.Dock="Top">
                     <ListBox
                         x:Name="lstGroup"
-                        Margin="4,0"
+                        Margin="{StaticResource MarginLr4}"
                         DisplayMemberBinding="{Binding Remarks}"
-                        ItemsSource="{Binding SubItems}">
+                        ItemsSource="{Binding SubItems}"
+                        Theme="{DynamicResource ButtonRadioGroupListBox}">
                         <ListBox.ItemsPanel>
                             <ItemsPanelTemplate>
                                 <WrapPanel />
@@ -89,20 +90,11 @@
                             Binding="{Binding ConfigType}"
                             Header="{x:Static resx:ResUI.LvServiceType}"
                             Tag="ConfigType" />
-
-                        <DataGridTemplateColumn SortMemberPath="Remarks" Tag="Remarks">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="{x:Static resx:ResUI.LvRemarks}" />
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <StackPanel Margin="8,0" Orientation="Horizontal">
-                                        <TextBlock Text="{Binding Remarks}" />
-                                    </StackPanel>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-
+                        <DataGridTextColumn
+                            Width="120"
+                            Binding="{Binding Remarks}"
+                            Header="{x:Static resx:ResUI.LvRemarks}"
+                            Tag="Remarks" />
                         <DataGridTextColumn
                             Width="120"
                             Binding="{Binding Address}"

From b54c67d6f17ed588c7adc8104e7d67de25b78fbc Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 9 Sep 2025 20:18:55 +0800
Subject: [PATCH 115/115] up 7.14.9

---
 v2rayN/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/Directory.Build.props b/v2rayN/Directory.Build.props
index 6d911c66..785e23d1 100644
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.14.8</Version>
+        <Version>7.14.9</Version>
     </PropertyGroup>
 
     <PropertyGroup>