up 7.15.5

Also fix the handling of IPv6 domains

.github/ISSUE_TEMPLATE/01_bug_report.yml

@@ -3,6 +3,18 @@ description: 在提出问题前请先自行排除服务器端问题和升级到
 title: "[Bug]: "
 labels: ["bug"]
 body:
+  - type: markdown
+    attributes:
+      value: |
+        ### 报告 Bug 前请务必确认以下事项：
+        > ** **
+        > **✓ 已自行排除服务器端问题。**
+        > **✓ 已升级到最新客户端版本。**
+        > **✓ 已通过搜索确认没有人提出过相同问题。**
+        > **✓ 已确认自己的电脑系统环境是受支持的。**
+
+        ---
+
   - type: input
     id: "os-version"
     attributes:
@@ -10,6 +22,7 @@ body:
       description: "操作系统和版本"
     validations:
       required: true
+
   - type: input
     id: "expectation"
     attributes:
@@ -17,6 +30,7 @@ body:
       description: "描述你认为应该发生什么"
     validations:
       required: true
+
   - type: textarea
     id: "describe-the-bug"
     attributes:
@@ -24,22 +38,34 @@ body:
       description: "描述实际发生了什么"
     validations:
       required: true
+
   - type: textarea
     id: "reproduction-method"
     attributes:
       label: "复现方法"
       description: "在BUG出现前执行了哪些操作"
-      placeholder: 标序号
+      placeholder: "标序号"
     validations:
       required: true
+
   - type: textarea
-    id: "log"
+    id: "gui-log"
     attributes:
-      label: "日志信息"
+      label: "软件日志"
       description: "位置在软件当前目录下的guiLogs"
-      placeholder: 在日志开始和结束位置粘贴冒号后的内容：```
+      placeholder: "在日志开始和结束位置粘贴冒号后的内容到这："
     validations:
       required: true
+
+  - type: textarea
+    id: "core-log"
+    attributes:
+      label: "内核日志"
+      description: "位置在软件主界面的信息框内"
+      placeholder: "在信息框内鼠标右键复制全部信息粘贴在这："
+    validations:
+      required: true
+
   - type: textarea
     id: "more"
     attributes:
@@ -47,6 +73,7 @@ body:
       description: "可选"
     validations:
       required: false
+
   - type: checkboxes
     id: "latest-version"
     attributes:
@@ -55,6 +82,7 @@ body:
       options:
         - label: 是
           required: true
+
   - type: checkboxes
     id: "issues"
     attributes:
@@ -63,3 +91,12 @@ body:
       options:
         - label: 是
           required: true
+
+  - type: checkboxes
+    id: "system-version"
+    attributes:
+      label: "我确认系统版本是受支持的"
+      description: "否则请切换后尝试"
+      options:
+        - label: 是
+          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,9 @@
+blank_issues_enabled: false
+
+contact_links:
+  - name: Discussions / 讨论区
+    url: https://github.com/2dust/v2rayN/discussions
+    about: 使用问题或需要帮助请前往 Discussions。
+  - name: Wiki / 使用说明
+    url: https://github.com/2dust/v2rayN/wiki
+    about: 查看常见问题和使用文档。

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.15.4</Version>
+        <Version>7.15.5</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/ServiceLib/Base/MyReactiveObject.cs

@@ -1,5 +1,3 @@
-using ReactiveUI;
-
 namespace ServiceLib.Base;
 
 public class MyReactiveObject : ReactiveObject

v2rayN/ServiceLib/Common/EmbedUtils.cs

@@ -1,6 +1,3 @@
-using System.Collections.Concurrent;
-using System.Reflection;
-
 namespace ServiceLib.Common;
 
 public static class EmbedUtils

v2rayN/ServiceLib/Common/FileManager.cs

@@ -1,6 +1,5 @@
 using System.Formats.Tar;
 using System.IO.Compression;
-using System.Text;
 
 namespace ServiceLib.Common;
 

v2rayN/ServiceLib/Common/JsonUtils.cs

@@ -1,8 +1,3 @@
-using System.Text.Encodings.Web;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
-
 namespace ServiceLib.Common;
 
 public class JsonUtils

v2rayN/ServiceLib/Common/ProcUtils.cs

@@ -1,5 +1,3 @@
-using System.Diagnostics;
-
 namespace ServiceLib.Common;
 
 public static class ProcUtils

v2rayN/ServiceLib/Common/Utils.cs

@@ -1,13 +1,5 @@
 using System.Collections.Specialized;
-using System.Diagnostics;
-using System.Net;
-using System.Net.NetworkInformation;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Security.Cryptography;
 using System.Security.Principal;
-using System.Text;
 using CliWrap;
 using CliWrap.Buffered;
 
@@ -363,6 +355,110 @@ public class Utils
         return userHostsMap;
     }
 
+    /// <summary>
+    /// Parse a possibly non-standard URL into scheme, domain, port, and path.
+    /// If parsing fails, the entire input is returned as domain, and others are empty or zero.
+    /// </summary>
+    /// <param name="url">Input URL or string</param>
+    /// <returns>(domain, scheme, port, path)</returns>
+    public static (string domain, string scheme, int port, string path) ParseUrl(string url)
+    {
+        if (string.IsNullOrWhiteSpace(url))
+        {
+            return ("", "", 0, "");
+        }
+
+        // 1. First, try to parse using the standard Uri class.
+        if (Uri.TryCreate(url, UriKind.Absolute, out var uri) && !string.IsNullOrEmpty(uri.Host))
+        {
+            var scheme = uri.Scheme;
+            var domain = uri.Host;
+            var port = uri.IsDefaultPort ? 0 : uri.Port;
+            var path = uri.PathAndQuery;
+            return (domain, scheme, port, path);
+        }
+
+        // 2. Try to handle more general cases with a regular expression, including non-standard schemes.
+        // This regex captures the scheme (optional), authority (host+port), and path (optional).
+        var match = Regex.Match(url, @"^(?:([a-zA-Z][a-zA-Z0-9+.-]*):/{2,})?([^/?#]+)([^?#]*)?.*$");
+
+        if (match.Success)
+        {
+            var scheme = match.Groups[1].Value;
+            var authority = match.Groups[2].Value;
+            var path = match.Groups[3].Value;
+
+            // Remove userinfo from the authority part.
+            var atIndex = authority.LastIndexOf('@');
+            if (atIndex > 0)
+            {
+                authority = authority.Substring(atIndex + 1);
+            }
+
+            var (domain, port) = ParseAuthority(authority);
+
+            // If the parsed domain is empty, it means the authority part is malformed, so trigger the fallback.
+            if (!string.IsNullOrEmpty(domain))
+            {
+                return (domain, scheme, port, path);
+            }
+        }
+
+        // 3. If all of the above fails, execute the final fallback strategy.
+        return (url, "", 0, "");
+    }
+
+    /// <summary>
+    /// Helper function to parse domain and port from the authority part, with correct handling for IPv6.
+    /// </summary>
+    private static (string domain, int port) ParseAuthority(string authority)
+    {
+        if (string.IsNullOrEmpty(authority))
+        {
+            return ("", 0);
+        }
+
+        var port = 0;
+        var domain = authority;
+
+        // Handle IPv6 addresses, e.g., "[2001:db8::1]:443"
+        if (authority.StartsWith("[") && authority.Contains("]"))
+        {
+            int closingBracketIndex = authority.LastIndexOf(']');
+            if (closingBracketIndex < authority.Length - 1 && authority[closingBracketIndex + 1] == ':')
+            {
+                // Port exists
+                var portStr = authority.Substring(closingBracketIndex + 2);
+                if (int.TryParse(portStr, out var portNum))
+                {
+                    port = portNum;
+                }
+                domain = authority.Substring(0, closingBracketIndex + 1);
+            }
+            else
+            {
+                // No port
+                domain = authority;
+            }
+        }
+        else // Handle IPv4 or domain names
+        {
+            var lastColonIndex = authority.LastIndexOf(':');
+            // Ensure there are digits after the colon and that this colon is not part of an IPv6 address.
+            if (lastColonIndex > 0 && lastColonIndex < authority.Length - 1 && authority.Substring(lastColonIndex + 1).All(char.IsDigit))
+            {
+                var portStr = authority.Substring(lastColonIndex + 1);
+                if (int.TryParse(portStr, out var portNum))
+                {
+                    port = portNum;
+                    domain = authority.Substring(0, lastColonIndex);
+                }
+            }
+        }
+
+        return (domain, port);
+    }
+
     #endregion 转换函数
 
     #region 数据检查

v2rayN/ServiceLib/Common/WindowsUtils.cs

@@ -1,5 +1,3 @@
-using System.Security.Cryptography;
-using System.Text;
 using Microsoft.Win32;
 
 namespace ServiceLib.Common;

v2rayN/ServiceLib/Events/AppEvents.cs

@@ -1,5 +1,3 @@
-using System.Reactive;
-
 namespace ServiceLib.Events;
 
 public static class AppEvents

v2rayN/ServiceLib/Events/EventChannel.cs

@@ -1,5 +1,3 @@
-using System.Reactive;
-using System.Reactive.Linq;
 using System.Reactive.Subjects;
 
 namespace ServiceLib.Events;

v2rayN/ServiceLib/Global.cs

@@ -316,7 +316,7 @@ public class Global
     ];
 
     public static readonly HashSet<EConfigType> SingboxOnlyConfigType = SingboxSupportConfigType.Except(XraySupportConfigType).ToHashSet();
-    
+
     public static readonly List<string> DomainStrategies =
     [
         AsIs,

v2rayN/ServiceLib/GlobalUsings.cs

@@ -1,14 +1,36 @@
+global using System.Collections.Concurrent;
+global using System.Diagnostics;
+global using System.Net;
+global using System.Net.NetworkInformation;
+global using System.Net.Sockets;
+global using System.Reactive;
+global using System.Reactive.Disposables;
+global using System.Reactive.Linq;
+global using System.Reflection;
+global using System.Runtime.InteropServices;
+global using System.Security.Cryptography;
+global using System.Text;
+global using System.Text.Encodings.Web;
+global using System.Text.Json;
+global using System.Text.Json.Nodes;
+global using System.Text.Json.Serialization;
+global using System.Text.RegularExpressions;
+global using DynamicData;
+global using DynamicData.Binding;
+global using ReactiveUI;
+global using ReactiveUI.Fody.Helpers;
 global using ServiceLib.Base;
 global using ServiceLib.Common;
 global using ServiceLib.Enums;
 global using ServiceLib.Events;
 global using ServiceLib.Handler;
+global using ServiceLib.Handler.Fmt;
+global using ServiceLib.Handler.SysProxy;
 global using ServiceLib.Helper;
 global using ServiceLib.Manager;
-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;
+global using ServiceLib.Services;
+global using ServiceLib.Services.CoreConfig;
+global using ServiceLib.Services.Statistics;
+global using SQLite;

v2rayN/ServiceLib/Handler/AutoStartupHandler.cs

@@ -1,5 +1,4 @@
 using System.Security.Principal;
-using System.Text.RegularExpressions;
 
 namespace ServiceLib.Handler;
 

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -1,5 +1,4 @@
 using System.Data;
-using System.Text.RegularExpressions;
 
 namespace ServiceLib.Handler;
 
@@ -113,10 +112,8 @@ public static class ConfigHandler
         config.ConstItem ??= new ConstItem();
 
         config.SimpleDNSItem ??= InitBuiltinSimpleDNS();
-        if (config.SimpleDNSItem.GlobalFakeIp is null)
-        {
-            config.SimpleDNSItem.GlobalFakeIp = true;
-        }
+        config.SimpleDNSItem.GlobalFakeIp ??= true;
+        config.SimpleDNSItem.BootstrapDNS ??= Global.DomainPureIPDNSAddress.FirstOrDefault();
 
         config.SpeedTestItem ??= new();
         if (config.SpeedTestItem.SpeedTestTimeout < 10)
@@ -1484,7 +1481,7 @@ public static class ConfigHandler
         if (profileItem is null)
         {
             profileItem = Hysteria2Fmt.ResolveFull2(strData, subRemarks);
-        }  
+        }
         if (profileItem is null || profileItem.Address.IsNullOrEmpty())
         {
             return -1;
@@ -2274,6 +2271,7 @@ public static class ConfigHandler
             BlockBindingQuery = true,
             DirectDNS = Global.DomainDirectDNSAddress.FirstOrDefault(),
             RemoteDNS = Global.DomainRemoteDNSAddress.FirstOrDefault(),
+            BootstrapDNS = Global.DomainPureIPDNSAddress.FirstOrDefault(),
         };
     }
 

v2rayN/ServiceLib/Handler/ConnectionHandler.cs

@@ -1,5 +1,3 @@
-using System.Net;
-
 namespace ServiceLib.Handler;
 
 public static class ConnectionHandler

v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs

@@ -1,5 +1,3 @@
-using System.Text.RegularExpressions;
-
 namespace ServiceLib.Handler.Fmt;
 
 public class ShadowsocksFmt : BaseFmt

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingWindows.cs

@@ -1,4 +1,3 @@
-using System.Runtime.InteropServices;
 using static ServiceLib.Handler.SysProxy.ProxySettingWindows.InternetConnectionOption;
 
 namespace ServiceLib.Handler.SysProxy;

v2rayN/ServiceLib/Helper/DownloaderHelper.cs

@@ -1,4 +1,3 @@
-using System.Net;
 using Downloader;
 
 namespace ServiceLib.Helper;

v2rayN/ServiceLib/Helper/HttpClientHelper.cs

@@ -1,8 +1,5 @@
-using System.Diagnostics;
-using System.Net;
 using System.Net.Http.Headers;
 using System.Net.Mime;
-using System.Text;
 
 namespace ServiceLib.Helper;
 

v2rayN/ServiceLib/Helper/SqliteHelper.cs

@@ -1,5 +1,4 @@
 using System.Collections;
-using SQLite;
 
 namespace ServiceLib.Helper;
 

v2rayN/ServiceLib/Manager/CoreAdminManager.cs

@@ -1,4 +1,3 @@
-using System.Text;
 using CliWrap;
 using CliWrap.Buffered;
 

v2rayN/ServiceLib/Manager/PacManager.cs

@@ -1,6 +1,3 @@
-using System.Net.Sockets;
-using System.Text;
-
 namespace ServiceLib.Manager;
 
 public class PacManager

v2rayN/ServiceLib/Manager/ProfileExManager.cs

@@ -1,5 +1,3 @@
-using System.Collections.Concurrent;
-
 //using System.Reactive.Linq;
 
 namespace ServiceLib.Manager;

v2rayN/ServiceLib/Manager/ProfileGroupItemManager.cs

@@ -1,5 +1,3 @@
-using System.Collections.Concurrent;
-
 namespace ServiceLib.Manager;
 
 public class ProfileGroupItemManager

v2rayN/ServiceLib/Manager/TaskManager.cs

@@ -26,15 +26,29 @@ public class TaskManager
             await Task.Delay(1000 * 60);
 
             //Execute once 1 minute
-            await UpdateTaskRunSubscription();
+            try
+            {
+                await UpdateTaskRunSubscription();
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog("ScheduledTasks - UpdateTaskRunSubscription", ex);
+            }
 
             //Execute once 20 minute
             if (numOfExecuted % 20 == 0)
             {
                 //Logging.SaveLog("Execute save config");
 
-                await ConfigHandler.SaveConfig(_config);
-                await ProfileExManager.Instance.SaveTo();
+                try
+                {
+                    await ConfigHandler.SaveConfig(_config);
+                    await ProfileExManager.Instance.SaveTo();
+                }
+                catch (Exception ex)
+                {
+                    Logging.SaveLog("ScheduledTasks - SaveConfig", ex);
+                }
             }
 
             //Execute once 1 hour
@@ -46,8 +60,14 @@ public class TaskManager
                 FileManager.DeleteExpiredFiles(Utils.GetLogPath(), DateTime.Now.AddMonths(-1));
                 FileManager.DeleteExpiredFiles(Utils.GetTempPath(), DateTime.Now.AddMonths(-1));
 
-                //Check once 1 hour
-                await UpdateTaskRunGeo(numOfExecuted / 60);
+                try
+                {
+                    await UpdateTaskRunGeo(numOfExecuted / 60);
+                }
+                catch (Exception ex)
+                {
+                    Logging.SaveLog("ScheduledTasks - UpdateTaskRunGeo", ex);
+                }
             }
 
             numOfExecuted++;

v2rayN/ServiceLib/Manager/WebDavManager.cs

@@ -1,4 +1,3 @@
-using System.Net;
 using WebDav;
 
 namespace ServiceLib.Manager;

v2rayN/ServiceLib/Models/CheckUpdateModel.cs

@@ -1,6 +1,3 @@
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.Models;
 
 public class CheckUpdateModel : ReactiveObject

v2rayN/ServiceLib/Models/ClashProxyModel.cs

@@ -1,6 +1,3 @@
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -71,7 +71,6 @@ public class GUIItem
     public bool DisplayRealTimeSpeed { get; set; }
     public bool KeepOlderDedupl { get; set; }
     public int AutoUpdateInterval { get; set; }
-    public bool EnableSecurityProtocolTls13 { get; set; }
     public int TrayMenuServersLimit { get; set; } = 20;
     public bool EnableHWA { get; set; } = false;
     public bool EnableLog { get; set; } = true;
@@ -264,6 +263,7 @@ public class SimpleDNSItem
     public bool? BlockBindingQuery { get; set; }
     public string? DirectDNS { get; set; }
     public string? RemoteDNS { get; set; }
+    public string? BootstrapDNS { get; set; }
     public string? RayStrategy4Freedom { get; set; }
     public string? SingboxStrategy4Direct { get; set; }
     public string? SingboxStrategy4Proxy { get; set; }

v2rayN/ServiceLib/Models/DNSItem.cs

@@ -1,5 +1,3 @@
-using SQLite;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/FullConfigTemplateItem.cs

@@ -1,5 +1,3 @@
-using SQLite;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/GitHubRelease.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-
 namespace ServiceLib.Models;
 
 public class GitHubReleaseAsset

v2rayN/ServiceLib/Models/ProfileExItem.cs

@@ -1,5 +1,3 @@
-using SQLite;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/ProfileGroupItem.cs

@@ -1,5 +1,3 @@
-using SQLite;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/ProfileItem.cs

@@ -1,6 +1,3 @@
-using ReactiveUI;
-using SQLite;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/ProfileItemModel.cs

@@ -1,5 +1,3 @@
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/RoutingItem.cs

@@ -1,5 +1,3 @@
-using SQLite;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/ServerStatItem.cs

@@ -1,5 +1,3 @@
-using SQLite;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/SingboxConfig.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-
 namespace ServiceLib.Models;
 
 public class SingboxConfig

v2rayN/ServiceLib/Models/SubItem.cs

@@ -1,5 +1,3 @@
-using SQLite;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-
 namespace ServiceLib.Models;
 
 public class V2rayConfig

v2rayN/ServiceLib/Models/VmessQRCode.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-
 namespace ServiceLib.Models;
 
 /// <summary>

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -2517,6 +2517,24 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Bootstrap DNS 的本地化字符串。
+        /// </summary>
+        public static string TbBootstrapDNS {
+            get {
+                return ResourceManager.GetString("TbBootstrapDNS", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Resolve DNS server domains, requires IP 的本地化字符串。
+        /// </summary>
+        public static string TbBootstrapDNSTips {
+            get {
+                return ResourceManager.GetString("TbBootstrapDNSTips", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Browse 的本地化字符串。
         /// </summary>
@@ -3966,15 +3984,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Enable Security Protocol TLS v1.3 (subscription/update) 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsTLS13 {
-            get {
-                return ResourceManager.GetString("TbSettingsTLS13", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Tray right-click menu Configurations display limit 的本地化字符串。
         /// </summary>

v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx

@@ -747,9 +747,6 @@
   <data name="TbSettingsSystemproxy" xml:space="preserve">
     <value>تنظیمات پراکسی سیستم</value>
   </data>
-  <data name="TbSettingsTLS13" xml:space="preserve">
-    <value>فعال کردن پروتکل امنیتی TLS نسخه 1.3 (اشتراک/به‌روزرسانی)</value>
-  </data>
   <data name="TbSettingsTrayMenuServersLimit" xml:space="preserve">
     <value>محدودیت نمایش سرورهای منوی سینی کلیک راست</value>
   </data>
@@ -1593,4 +1590,10 @@
   <data name="TbRuleTypeTips" xml:space="preserve">
     <value>You can set separate rules for Routing and DNS, or select "ALL" to apply to both</value>
   </data>
+  <data name="TbBootstrapDNS" xml:space="preserve">
+    <value>Bootstrap DNS</value>
+  </data>
+  <data name="TbBootstrapDNSTips" xml:space="preserve">
+    <value>Resolve DNS server domains, requires IP</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -747,9 +747,6 @@
   <data name="TbSettingsSystemproxy" xml:space="preserve">
     <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>Tálca jobb egérgombos menü konfigurációk megjelenítési limitje</value>
   </data>
@@ -1593,4 +1590,10 @@
   <data name="TbRuleType" xml:space="preserve">
     <value>Rule Type</value>
   </data>
+  <data name="TbBootstrapDNS" xml:space="preserve">
+    <value>Bootstrap DNS</value>
+  </data>
+  <data name="TbBootstrapDNSTips" xml:space="preserve">
+    <value>Resolve DNS server domains, requires IP</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -747,9 +747,6 @@
   <data name="TbSettingsSystemproxy" xml:space="preserve">
     <value>System proxy settings</value>
   </data>
-  <data name="TbSettingsTLS13" xml:space="preserve">
-    <value>Enable Security Protocol TLS v1.3 (subscription/update)</value>
-  </data>
   <data name="TbSettingsTrayMenuServersLimit" xml:space="preserve">
     <value>Tray right-click menu Configurations display limit</value>
   </data>
@@ -1593,4 +1590,10 @@
   <data name="TbRuleType" xml:space="preserve">
     <value>Rule Type</value>
   </data>
+  <data name="TbBootstrapDNS" xml:space="preserve">
+    <value>Bootstrap DNS</value>
+  </data>
+  <data name="TbBootstrapDNSTips" xml:space="preserve">
+    <value>Resolve DNS server domains, requires IP</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -747,9 +747,6 @@
   <data name="TbSettingsSystemproxy" xml:space="preserve">
     <value>Настройки системного прокси</value>
   </data>
-  <data name="TbSettingsTLS13" xml:space="preserve">
-    <value>Включить протокол безопасности TLS v1.3 (обновление подписки)</value>
-  </data>
   <data name="TbSettingsTrayMenuServersLimit" xml:space="preserve">
     <value>Лимит серверов в меню трея</value>
   </data>
@@ -1593,4 +1590,10 @@
   <data name="TbRuleType" xml:space="preserve">
     <value>Rule Type</value>
   </data>
+  <data name="TbBootstrapDNS" xml:space="preserve">
+    <value>Bootstrap DNS</value>
+  </data>
+  <data name="TbBootstrapDNSTips" xml:space="preserve">
+    <value>Resolve DNS server domains, requires IP</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -121,7 +121,7 @@
     <value>导出分享链接至剪贴板成功</value>
   </data>
   <data name="CheckServerSettings" xml:space="preserve">
-    <value>请先检查配置文件设置</value>
+    <value>请先检查设置</value>
   </data>
   <data name="ConfigurationFormatIncorrect" xml:space="preserve">
     <value>配置格式不正确</value>
@@ -133,7 +133,7 @@
     <value>下载开始...</value>
   </data>
   <data name="FailedConversionConfiguration" xml:space="preserve">
-    <value>转换配置文件失败</value>
+    <value>转换配置失败</value>
   </data>
   <data name="FailedGenDefaultConfiguration" xml:space="preserve">
     <value>生成默认配置文件失败</value>
@@ -142,10 +142,10 @@
     <value>获取默认配置失败</value>
   </data>
   <data name="FailedImportedCustomServer" xml:space="preserve">
-    <value>导入自定义配置文件失败</value>
+    <value>导入自定义配置失败</value>
   </data>
   <data name="FailedReadConfiguration" xml:space="preserve">
-    <value>读取配置文件失败</value>
+    <value>读取配置失败</value>
   </data>
   <data name="FillCorrectServerPort" xml:space="preserve">
     <value>请填写正确格式的端口</value>
@@ -265,13 +265,13 @@
     <value>请选择协议</value>
   </data>
   <data name="PleaseSelectServer" xml:space="preserve">
-    <value>请先选择配置文件</value>
+    <value>请先选择配置</value>
   </data>
   <data name="RemoveDuplicateServerResult" xml:space="preserve">
-    <value>配置文件去重完成。原数量: {0}，现数量: {1}。</value>
+    <value>配置去重完成。原数量: {0}，现数量: {1}。</value>
   </data>
   <data name="RemoveServer" xml:space="preserve">
-    <value>是否确定移除配置文件？</value>
+    <value>是否确定移除？</value>
   </data>
   <data name="SaveClientConfigurationIn" xml:space="preserve">
     <value>客户端配置文件保存在：{0}</value>
@@ -283,10 +283,10 @@
     <value>配置成功。 {0}</value>
   </data>
   <data name="SuccessfullyImportedCustomServer" xml:space="preserve">
-    <value>成功导入自定义配置文件</value>
+    <value>成功导入自定义配置</value>
   </data>
   <data name="SuccessfullyImportedServerViaClipboard" xml:space="preserve">
-    <value>成功从剪贴板导入 {0} 个配置文件</value>
+    <value>成功从剪贴板导入 {0} 个配置</value>
   </data>
   <data name="SuccessfullyImportedServerViaScan" xml:space="preserve">
     <value>扫描导入分享链接成功</value>
@@ -385,7 +385,7 @@
     <value>所有</value>
   </data>
   <data name="FillServerAddressCustom" xml:space="preserve">
-    <value>请浏览导入配置文件配置</value>
+    <value>请浏览导入配置</value>
   </data>
   <data name="Speedtesting" xml:space="preserve">
     <value>测试中...</value>
@@ -397,7 +397,7 @@
     <value>本地</value>
   </data>
   <data name="MsgServerTitle" xml:space="preserve">
-    <value>配置文件过滤器，按回车执行</value>
+    <value>过滤器，按回车执行</value>
   </data>
   <data name="menuCheckUpdate" xml:space="preserve">
     <value>检查更新</value>
@@ -478,55 +478,55 @@
     <value>扫描屏幕上的二维码 (Ctrl+S)</value>
   </data>
   <data name="menuCopyServer" xml:space="preserve">
-    <value>克隆所选配置文件</value>
+    <value>克隆所选</value>
   </data>
   <data name="menuRemoveDuplicateServer" xml:space="preserve">
-    <value>移除重复的配置文件</value>
+    <value>移除重复</value>
   </data>
   <data name="menuRemoveServer" xml:space="preserve">
-    <value>移除所选配置文件 (多选) (Delete)</value>
+    <value>移除所选 (多选) (Delete)</value>
   </data>
   <data name="menuSetDefaultServer" xml:space="preserve">
-    <value>设为活动配置文件 (Enter)</value>
+    <value>设为活动 (Enter)</value>
   </data>
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>清除所有服务统计数据</value>
   </data>
   <data name="menuRealPingServer" xml:space="preserve">
-    <value>测试配置文件真连接延迟 (多选) (Ctrl+R)</value>
+    <value>测试真连接延迟 (多选) (Ctrl+R)</value>
   </data>
   <data name="menuSortServerResult" xml:space="preserve">
     <value>按测试结果排序</value>
   </data>
   <data name="menuSpeedServer" xml:space="preserve">
-    <value>测试配置文件速度 (多选) (Ctrl+T)</value>
+    <value>测试速度 (多选) (Ctrl+T)</value>
   </data>
   <data name="menuTcpingServer" xml:space="preserve">
-    <value>测试配置文件延迟 Tcping (多选) (Ctrl+O)</value>
+    <value>测试延迟 Tcping (多选) (Ctrl+O)</value>
   </data>
   <data name="menuExport2ClientConfig" xml:space="preserve">
-    <value>导出所选配置文件完整配置</value>
+    <value>导出所选完整配置</value>
   </data>
   <data name="menuExport2ShareUrl" xml:space="preserve">
     <value>导出分享链接至剪贴板 (多选) (Ctrl+C)</value>
   </data>
   <data name="menuAddCustomServer" xml:space="preserve">
-    <value>添加自定义配置文件</value>
+    <value>添加自定义配置</value>
   </data>
   <data name="menuAddShadowsocksServer" xml:space="preserve">
-    <value>添加 [Shadowsocks] 配置文件</value>
+    <value>添加 [Shadowsocks]</value>
   </data>
   <data name="menuAddSocksServer" xml:space="preserve">
-    <value>添加 [SOCKS] 配置文件</value>
+    <value>添加 [SOCKS] </value>
   </data>
   <data name="menuAddTrojanServer" xml:space="preserve">
-    <value>添加 [Trojan] 配置文件</value>
+    <value>添加 [Trojan] </value>
   </data>
   <data name="menuAddVlessServer" xml:space="preserve">
-    <value>添加 [VLESS] 配置文件</value>
+    <value>添加 [VLESS] </value>
   </data>
   <data name="menuAddVmessServer" xml:space="preserve">
-    <value>添加 [VMess] 配置文件</value>
+    <value>添加 [VMess] </value>
   </data>
   <data name="menuSelectAll" xml:space="preserve">
     <value>全选 (Ctrl+A)</value>
@@ -691,7 +691,7 @@
     <value>Outbound Freedom domainStrategy</value>
   </data>
   <data name="TbSettingsEnableAutoAdjustMainLvColWidth" xml:space="preserve">
-    <value>自动调整配置文件列宽在更新订阅后</value>
+    <value>自动调整配置列宽在更新订阅后</value>
   </data>
   <data name="TbSettingsEnableCheckPreReleaseUpdate" xml:space="preserve">
     <value>检查 Pre-Release 更新 (请谨慎启用)</value>
@@ -700,7 +700,7 @@
     <value>例外</value>
   </data>
   <data name="TbSettingsExceptionTip" xml:space="preserve">
-    <value>例外：对于下列字符开头的地址，不使用代理配置文件。使用分号 (;) 分隔。</value>
+    <value>例外：对于下列字符开头的地址，不使用代理配置。使用分号 (;) 分隔。</value>
   </data>
   <data name="TbSettingsDisplayRealTimeSpeed" xml:space="preserve">
     <value>显示实时速度 (需重启)</value>
@@ -747,11 +747,8 @@
   <data name="TbSettingsSystemproxy" xml:space="preserve">
     <value>系统代理设置</value>
   </data>
-  <data name="TbSettingsTLS13" xml:space="preserve">
-    <value>启用安全协议 TLS v1.3 (订阅/检查更新)</value>
-  </data>
   <data name="TbSettingsTrayMenuServersLimit" xml:space="preserve">
-    <value>托盘右键菜单配置文件展示数量限制</value>
+    <value>托盘右键菜单配置展示数量限制</value>
   </data>
   <data name="TbSettingsUdpEnabled" xml:space="preserve">
     <value>开启 UDP</value>
@@ -784,7 +781,7 @@
     <value>Pac 模式</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
-    <value>分享配置文件 (Ctrl+F)</value>
+    <value>分享 (Ctrl+F)</value>
   </data>
   <data name="menuRouting" xml:space="preserve">
     <value>路由</value>
@@ -916,7 +913,7 @@
     <value>移至订阅分组</value>
   </data>
   <data name="TbSettingsEnableDragDropSort" xml:space="preserve">
-    <value>启用配置文件拖放排序 (需重启)</value>
+    <value>启用配置拖放排序 (需重启)</value>
   </data>
   <data name="TbAutoRefresh" xml:space="preserve">
     <value>自动刷新</value>
@@ -925,10 +922,10 @@
     <value>跳过测试</value>
   </data>
   <data name="menuEditServer" xml:space="preserve">
-    <value>编辑配置文件 (Ctrl+D)</value>
+    <value>编辑 (Ctrl+D)</value>
   </data>
   <data name="TbSettingsDoubleClick2Activate" xml:space="preserve">
-    <value>主界面双击设为活动配置文件</value>
+    <value>主界面双击设为活动</value>
   </data>
   <data name="SpeedtestingCompleted" xml:space="preserve">
     <value>测试完成</value>
@@ -1033,7 +1030,7 @@
     <value>Domain</value>
   </data>
   <data name="menuAddHysteria2Server" xml:space="preserve">
-    <value>添加 [Hysteria2] 配置文件</value>
+    <value>添加 [Hysteria2] </value>
   </data>
   <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
     <value>Hysteria 最大带宽 (Up/Dw)</value>
@@ -1042,19 +1039,19 @@
     <value>使用系统 hosts</value>
   </data>
   <data name="menuAddTuicServer" xml:space="preserve">
-    <value>添加 [TUIC] 配置文件</value>
+    <value>添加 [TUIC] </value>
   </data>
   <data name="TbHeaderType8" xml:space="preserve">
     <value>拥塞控制算法</value>
   </data>
   <data name="LvPrevProfile" xml:space="preserve">
-    <value>前置代理配置文件别名</value>
+    <value>前置代理配置别名</value>
   </data>
   <data name="LvNextProfile" xml:space="preserve">
-    <value>落地代理配置文件別名</value>
+    <value>落地代理配置別名</value>
   </data>
   <data name="LvPrevProfileTip" xml:space="preserve">
-    <value>请确保配置文件别名存在并唯一</value>
+    <value>请确保配置别名存在并唯一</value>
   </data>
   <data name="TbSettingsTunAutoRoute" xml:space="preserve">
     <value>自动路由</value>
@@ -1075,7 +1072,7 @@
     <value>启用 IPv6</value>
   </data>
   <data name="menuAddWireguardServer" xml:space="preserve">
-    <value>添加 [WireGuard] 配置文件</value>
+    <value>添加 [WireGuard] </value>
   </data>
   <data name="TbPrivateKey" xml:space="preserve">
     <value>PrivateKey</value>
@@ -1108,7 +1105,7 @@
     <value>*grpc Authority</value>
   </data>
   <data name="menuAddHttpServer" xml:space="preserve">
-    <value>添加 [HTTP] 配置文件</value>
+    <value>添加 [HTTP] </value>
   </data>
   <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
     <value>和分组前置代理冲突</value>
@@ -1198,13 +1195,13 @@
     <value>延迟测试</value>
   </data>
   <data name="menuProxiesDelaytestPart" xml:space="preserve">
-    <value>当前部分节点延迟测试</value>
+    <value>当前部分延迟测试</value>
   </data>
   <data name="menuProxiesReload" xml:space="preserve">
     <value>刷新</value>
   </data>
   <data name="menuProxiesSelectActivity" xml:space="preserve">
-    <value>设为活动节点 (Enter)</value>
+    <value>设为活动 (Enter)</value>
   </data>
   <data name="TbSettingsDomainStrategy4Out" xml:space="preserve">
     <value>Outbound 默认解析策略</value>
@@ -1222,7 +1219,7 @@
     <value>导出分享链接至剪贴板 (多选) Base64 编码</value>
   </data>
   <data name="menuExport2ClientConfigClipboard" xml:space="preserve">
-    <value>导出所选配置文件完整配置至剪贴板</value>
+    <value>导出所选完整配置至剪贴板</value>
   </data>
   <data name="menuShowOrHideMainWindow" xml:space="preserve">
     <value>显示或隐藏主界面</value>
@@ -1339,7 +1336,7 @@
     <value>多线程测试时的并发数量</value>
   </data>
   <data name="TbSettingsExceptionTip2" xml:space="preserve">
-    <value>例外：对于下列地址不使用代理配置文件。使用逗号 (,) 分隔。</value>
+    <value>例外：对于下列地址不使用代理配置。使用逗号 (,) 分隔。</value>
   </data>
   <data name="TbSettingsDestOverride" xml:space="preserve">
     <value>流量探测类型</value>
@@ -1375,31 +1372,31 @@
     <value>会覆盖端口，多组时用逗号 (,) 隔开</value>
   </data>
   <data name="menuGenGroupMultipleServer" xml:space="preserve">
-    <value>多配置文件生成策略组</value>
+    <value>多选生成策略组</value>
   </data>
   <data name="menuGenGroupMultipleServerXrayRandom" xml:space="preserve">
-    <value>多配置文件随机 Xray</value>
+    <value>多选随机 Xray</value>
   </data>
   <data name="menuGenGroupMultipleServerXrayRoundRobin" xml:space="preserve">
-    <value>多配置文件负载均衡 Xray</value>
+    <value>多选负载均衡 Xray</value>
   </data>
   <data name="menuGenGroupMultipleServerXrayLeastPing" xml:space="preserve">
-    <value>多配置文件最低延迟 Xray</value>
+    <value>多选最低延迟 Xray</value>
   </data>
   <data name="menuGenGroupMultipleServerXrayLeastLoad" xml:space="preserve">
-    <value>多配置文件最稳定 Xray</value>
+    <value>多选最稳定 Xray</value>
   </data>
   <data name="menuGenGroupMultipleServerSingBoxLeastPing" xml:space="preserve">
-    <value>多配置文件最低延迟 sing-box</value>
+    <value>多选最低延迟 sing-box</value>
   </data>
   <data name="menuExportConfig" xml:space="preserve">
-    <value>导出配置文件</value>
+    <value>导出</value>
   </data>
   <data name="TbSettingsIPAPIUrl" xml:space="preserve">
     <value>当前连接信息测试地址</value>
   </data>
   <data name="TbRuleOutboundTagTip" xml:space="preserve">
-    <value>可以填写配置文件别名，请确保存在并唯一</value>
+    <value>可以填写配置别名，请确保存在并唯一</value>
   </data>
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>密码错误，请重试。</value>
@@ -1408,7 +1405,7 @@
     <value>Mldsa65Verify</value>
   </data>
   <data name="menuAddAnytlsServer" xml:space="preserve">
-    <value>添加 [Anytls] 配置文件</value>
+    <value>添加 [Anytls] </value>
   </data>
   <data name="TbRemoteDNS" xml:space="preserve">
     <value>远程 DNS</value>
@@ -1495,13 +1492,13 @@
     <value>开始解析和处理订阅内容</value>
   </data>
   <data name="TbSelectProfile" xml:space="preserve">
-    <value>选择配置文件</value>
+    <value>选择配置</value>
   </data>
   <data name="TbFakeIPTips" xml:space="preserve">
     <value>默认全局生效，内置 FakeIP 过滤，仅在 sing-box 中生效</value>
   </data>
   <data name="PleaseAddAtLeastOneServer" xml:space="preserve">
-    <value>请至少添加一个配置文件</value>
+    <value>请至少添加一个配置</value>
   </data>
   <data name="TbConfigTypePolicyGroup" xml:space="preserve">
     <value>策略组</value>
@@ -1525,28 +1522,28 @@
     <value>策略组类型</value>
   </data>
   <data name="menuAddPolicyGroupServer" xml:space="preserve">
-    <value>添加策略组配置文件</value>
+    <value>添加策略组</value>
   </data>
   <data name="menuAddProxyChainServer" xml:space="preserve">
-    <value>添加链式代理配置文件</value>
+    <value>添加链式代理</value>
   </data>
   <data name="menuAddChildServer" xml:space="preserve">
-    <value>添加子配置文件</value>
+    <value>添加子项</value>
   </data>
   <data name="menuRemoveChildServer" xml:space="preserve">
-    <value>删除子配置文件</value>
+    <value>删除子项</value>
   </data>
   <data name="menuServerList" xml:space="preserve">
-    <value>服务器列表</value>
+    <value>子项列表</value>
   </data>
   <data name="TbFallback" xml:space="preserve">
     <value>故障转移</value>
   </data>
   <data name="menuGenGroupMultipleServerSingBoxFallback" xml:space="preserve">
-    <value>多配置文件故障转移 sing-box</value>
+    <value>多选故障转移 sing-box</value>
   </data>
   <data name="menuGenGroupMultipleServerXrayFallback" xml:space="preserve">
-    <value>多配置文件故障转移 Xray</value>
+    <value>多选故障转移 Xray</value>
   </data>
   <data name="CoreNotSupportNetwork" xml:space="preserve">
     <value>核心 '{0}' 不支持网络类型 '{1}'。</value>
@@ -1567,10 +1564,10 @@
     <value>策略组： </value>
   </data>
   <data name="NodeTagNotExist" xml:space="preserve">
-    <value>节点别名 '{0}' 不存在。</value>
+    <value>别名 '{0}' 不存在。</value>
   </data>
   <data name="GroupEmpty" xml:space="preserve">
-    <value>组“{0}”为空。请至少添加一个节点。</value>
+    <value>组“{0}”为空。请至少添加一个配置。</value>
   </data>
   <data name="InvalidProperty" xml:space="preserve">
     <value>{0}属性无效，请检查</value>
@@ -1590,4 +1587,10 @@
   <data name="TbRuleTypeTips" xml:space="preserve">
     <value>可对 Routing 和 DNS 单独设定规则，ALL 则都生效</value>
   </data>
+  <data name="TbBootstrapDNS" xml:space="preserve">
+    <value>Bootstrap DNS</value>
+  </data>
+  <data name="TbBootstrapDNSTips" xml:space="preserve">
+    <value>解析 DNS 服务器域名，需指定为 IP</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -747,9 +747,6 @@
   <data name="TbSettingsSystemproxy" xml:space="preserve">
     <value>系統代理設定</value>
   </data>
-  <data name="TbSettingsTLS13" xml:space="preserve">
-    <value>啟用安全協定 TLS v1.3 (訂閱/檢查更新)</value>
-  </data>
   <data name="TbSettingsTrayMenuServersLimit" xml:space="preserve">
     <value>工具列右鍵選單設定檔展示數量限制</value>
   </data>
@@ -1590,4 +1587,10 @@
   <data name="TbRuleTypeTips" xml:space="preserve">
     <value>可对 Routing 和 DNS 单独设定规则，ALL 则都生效</value>
   </data>
+  <data name="TbBootstrapDNS" xml:space="preserve">
+    <value>Bootstrap DNS</value>
+  </data>
+  <data name="TbBootstrapDNSTips" xml:space="preserve">
+    <value>Resolve DNS server domains, requires IP</value>
+  </data>
 </root>

v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs

@@ -1,7 +1,3 @@
-using System.Net;
-using System.Net.NetworkInformation;
-using ServiceLib.Common;
-
 namespace ServiceLib.Services.CoreConfig;
 
 public partial class CoreConfigSingboxService(Config config)

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxConfigTemplateService.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Nodes;
-
 namespace ServiceLib.Services.CoreConfig;
 
 public partial class CoreConfigSingboxService

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs

@@ -138,12 +138,7 @@ public partial class CoreConfigSingboxService
 
     private async Task<Server4Sbox> GenDnsDomains(SingboxConfig singboxConfig, SimpleDNSItem? simpleDNSItem)
     {
-        var finalDnsAddress = "local";
-        if (_config.TunModeItem.EnableTun)
-        {
-            finalDnsAddress = "dhcp://auto";
-        }
-        var finalDns = ParseDnsAddress(finalDnsAddress);
+        var finalDns = ParseDnsAddress(simpleDNSItem.BootstrapDNS);
         finalDns.tag = Global.SingboxLocalDNSTag;
         singboxConfig.dns ??= new Dns4Sbox();
         singboxConfig.dns.servers ??= new List<Server4Sbox>();
@@ -459,15 +454,19 @@ public partial class CoreConfigSingboxService
             return server;
         }
 
-        if (addressFirst.StartsWith("dhcp://", StringComparison.OrdinalIgnoreCase))
+        var (domain, scheme, port, path) = Utils.ParseUrl(addressFirst);
+
+        if (scheme.Equals("dhcp", StringComparison.OrdinalIgnoreCase))
         {
-            var interface_name = addressFirst.Substring(7);
             server.type = "dhcp";
-            server.Interface = interface_name == "auto" ? null : interface_name;
+            if ((!domain.IsNullOrEmpty()) && domain != "auto")
+            {
+                server.server = domain;
+            }
             return server;
         }
 
-        if (!addressFirst.Contains("://"))
+        if (scheme.IsNullOrEmpty())
         {
             // udp dns
             server.type = "udp";
@@ -475,63 +474,19 @@ public partial class CoreConfigSingboxService
             return server;
         }
 
-        try
+        //server.type = scheme.ToLower();
+        // remove "+local" suffix
+        // TODO: "+local" suffix decide server.detour = "direct" ?
+        server.type = scheme.Replace("+local", "", StringComparison.OrdinalIgnoreCase).ToLower();
+        server.server = domain;
+        if (port != 0)
         {
-            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;
-            }
+            server.server_port = port;
         }
-        catch (UriFormatException)
+        if ((server.type == "https" || server.type == "h3") && !string.IsNullOrEmpty(path) && path != "/")
         {
-            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);
-                }
-            }
+            server.path = path;
         }
-
         return server;
     }
 }

v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs

@@ -1,6 +1,3 @@
-using System.Net;
-using System.Net.NetworkInformation;
-
 namespace ServiceLib.Services.CoreConfig;
 
 public partial class CoreConfigV2rayService(Config config)

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayConfigTemplateService.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Nodes;
-
 namespace ServiceLib.Services.CoreConfig;
 
 public partial class CoreConfigV2rayService

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs

@@ -1,7 +1,3 @@
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
-
 namespace ServiceLib.Services.CoreConfig;
 
 public partial class CoreConfigV2rayService
@@ -107,6 +103,35 @@ public partial class CoreConfigV2rayService
         var expectedIPs = new List<string>();
         var regionNames = new HashSet<string>();
 
+        var bootstrapDNSAddress = ParseDnsAddresses(simpleDNSItem?.BootstrapDNS, Global.DomainPureIPDNSAddress.FirstOrDefault());
+        var dnsServerDomains = new List<string>();
+
+        foreach (var dns in directDNSAddress)
+        {
+            var (domain, _, _, _) = Utils.ParseUrl(dns);
+            if (domain == "localhost")
+            {
+                continue;
+            }
+            if (Utils.IsDomain(domain))
+            {
+                dnsServerDomains.Add($"full:{domain}");
+            }
+        }
+        foreach (var dns in remoteDNSAddress)
+        {
+            var (domain, _, _, _) = Utils.ParseUrl(dns);
+            if (domain == "localhost")
+            {
+                continue;
+            }
+            if (Utils.IsDomain(domain))
+            {
+                dnsServerDomains.Add($"full:{domain}");
+            }
+        }
+        dnsServerDomains = dnsServerDomains.Distinct().ToList();
+
         if (!string.IsNullOrEmpty(simpleDNSItem?.DirectExpectedIPs))
         {
             expectedIPs = simpleDNSItem.DirectExpectedIPs
@@ -221,6 +246,10 @@ public partial class CoreConfigV2rayService
         AddDnsServers(remoteDNSAddress, proxyGeositeList);
         AddDnsServers(directDNSAddress, directGeositeList);
         AddDnsServers(directDNSAddress, expectedDomainList, expectedIPs);
+        if (dnsServerDomains.Count > 0)
+        {
+            AddDnsServers(bootstrapDNSAddress, dnsServerDomains);
+        }
 
         var useDirectDns = rules?.LastOrDefault() is { } lastRule
             && lastRule.OutboundTag == Global.DirectTag

v2rayN/ServiceLib/Services/DownloadService.cs

@@ -1,6 +1,4 @@
-using System.Net;
 using System.Net.Http.Headers;
-using System.Net.Sockets;
 
 namespace ServiceLib.Services;
 
@@ -19,8 +17,6 @@ public class DownloadService
     {
         try
         {
-            SetSecurityProtocol(AppManager.Instance.Config.GuiItem.EnableSecurityProtocolTls13);
-
             var progress = new Progress<string>();
             progress.ProgressChanged += (sender, value) => updateFunc?.Invoke(false, $"{value}");
 
@@ -44,7 +40,6 @@ public class DownloadService
     {
         try
         {
-            SetSecurityProtocol(AppManager.Instance.Config.GuiItem.EnableSecurityProtocolTls13);
             UpdateCompleted?.Invoke(this, new RetResult(false, $"{ResUI.Downloading}   {url}"));
 
             var progress = new Progress<double>();
@@ -71,7 +66,6 @@ public class DownloadService
 
     public async Task<string?> UrlRedirectAsync(string url, bool blProxy)
     {
-        SetSecurityProtocol(AppManager.Instance.Config.GuiItem.EnableSecurityProtocolTls13);
         var webRequestHandler = new SocketsHttpHandler
         {
             AllowAutoRedirect = false,
@@ -141,7 +135,6 @@ public class DownloadService
     {
         try
         {
-            SetSecurityProtocol(AppManager.Instance.Config.GuiItem.EnableSecurityProtocolTls13);
             var webProxy = await GetWebProxy(blProxy);
             var client = new HttpClient(new SocketsHttpHandler()
             {
@@ -186,8 +179,6 @@ public class DownloadService
     {
         try
         {
-            SetSecurityProtocol(AppManager.Instance.Config.GuiItem.EnableSecurityProtocolTls13);
-
             var webProxy = await GetWebProxy(blProxy);
 
             if (userAgent.IsNullOrEmpty())
@@ -238,17 +229,4 @@ public class DownloadService
             return false;
         }
     }
-
-    private static void SetSecurityProtocol(bool enableSecurityProtocolTls13)
-    {
-        if (enableSecurityProtocolTls13)
-        {
-            ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12 | SecurityProtocolType.Tls13;
-        }
-        else
-        {
-            ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12;
-        }
-        ServicePointManager.DefaultConnectionLimit = 256;
-    }
 }

v2rayN/ServiceLib/Services/ProcessService.cs

@@ -1,6 +1,3 @@
-using System.Diagnostics;
-using System.Text;
-
 namespace ServiceLib.Services;
 
 public class ProcessService : IDisposable

v2rayN/ServiceLib/Services/SpeedtestService.cs

@@ -1,8 +1,3 @@
-using System.Collections.Concurrent;
-using System.Diagnostics;
-using System.Net;
-using System.Net.Sockets;
-
 namespace ServiceLib.Services;
 
 public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateFunc)

v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs

@@ -1,5 +1,4 @@
 using System.Net.WebSockets;
-using System.Text;
 
 namespace ServiceLib.Services.Statistics;
 

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -1,6 +1,3 @@
-using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;
-
 namespace ServiceLib.Services;
 
 public class UpdateService

v2rayN/ServiceLib/ViewModels/AddGroupServerViewModel.cs

@@ -1,8 +1,3 @@
-using System.Reactive;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class AddGroupServerViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/AddServer2ViewModel.cs

@@ -1,7 +1,3 @@
-using System.Reactive;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class AddServer2ViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs

@@ -1,7 +1,3 @@
-using System.Reactive;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class AddServerViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs

@@ -1,7 +1,3 @@
-using System.Reactive;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class BackupAndRestoreViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -1,11 +1,3 @@
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Runtime.InteropServices;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class CheckUpdateViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs

@@ -1,11 +1,3 @@
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using DynamicData;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class ClashConnectionsViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs

@@ -1,11 +1,4 @@
-using System.Reactive;
 using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using DynamicData;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
 using static ServiceLib.Models.ClashProviders;
 using static ServiceLib.Models.ClashProxies;
 

v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs

@@ -1,8 +1,3 @@
-using System.Reactive;
-using System.Reactive.Linq;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class DNSSettingViewModel : MyReactiveObject
@@ -13,6 +8,7 @@ public class DNSSettingViewModel : MyReactiveObject
     [Reactive] public bool? BlockBindingQuery { get; set; }
     [Reactive] public string? DirectDNS { get; set; }
     [Reactive] public string? RemoteDNS { get; set; }
+    [Reactive] public string? BootstrapDNS { get; set; }
     [Reactive] public string? RayStrategy4Freedom { get; set; }
     [Reactive] public string? SingboxStrategy4Direct { get; set; }
     [Reactive] public string? SingboxStrategy4Proxy { get; set; }
@@ -73,6 +69,7 @@ public class DNSSettingViewModel : MyReactiveObject
         BlockBindingQuery = item.BlockBindingQuery;
         DirectDNS = item.DirectDNS;
         RemoteDNS = item.RemoteDNS;
+        BootstrapDNS = item.BootstrapDNS;
         RayStrategy4Freedom = item.RayStrategy4Freedom;
         SingboxStrategy4Direct = item.SingboxStrategy4Direct;
         SingboxStrategy4Proxy = item.SingboxStrategy4Proxy;
@@ -102,6 +99,7 @@ public class DNSSettingViewModel : MyReactiveObject
         _config.SimpleDNSItem.BlockBindingQuery = BlockBindingQuery;
         _config.SimpleDNSItem.DirectDNS = DirectDNS;
         _config.SimpleDNSItem.RemoteDNS = RemoteDNS;
+        _config.SimpleDNSItem.BootstrapDNS = BootstrapDNS;
         _config.SimpleDNSItem.RayStrategy4Freedom = RayStrategy4Freedom;
         _config.SimpleDNSItem.SingboxStrategy4Direct = SingboxStrategy4Direct;
         _config.SimpleDNSItem.SingboxStrategy4Proxy = SingboxStrategy4Proxy;

v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs

@@ -1,7 +1,3 @@
-using System.Reactive;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class FullConfigTemplateViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/GlobalHotkeySettingViewModel.cs

@@ -1,6 +1,3 @@
-using System.Reactive;
-using ReactiveUI;
-
 namespace ServiceLib.ViewModels;
 
 public class GlobalHotkeySettingViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -1,8 +1,4 @@
-using System.Reactive;
 using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
 
 namespace ServiceLib.ViewModels;
 

v2rayN/ServiceLib/ViewModels/MsgViewModel.cs

@@ -1,10 +1,3 @@
-using System.Collections.Concurrent;
-using System.Reactive.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class MsgViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs

@@ -1,7 +1,3 @@
-using System.Reactive;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class OptionSettingViewModel : MyReactiveObject
@@ -52,7 +48,6 @@ public class OptionSettingViewModel : MyReactiveObject
     [Reactive] public bool DisplayRealTimeSpeed { get; set; }
     [Reactive] public bool EnableAutoAdjustMainLvColWidth { get; set; }
     [Reactive] public bool EnableUpdateSubOnlyRemarksExist { get; set; }
-    [Reactive] public bool EnableSecurityProtocolTls13 { get; set; }
     [Reactive] public bool AutoHideStartup { get; set; }
     [Reactive] public bool Hide2TrayWhenClose { get; set; }
     [Reactive] public bool EnableDragDropSort { get; set; }
@@ -170,7 +165,6 @@ public class OptionSettingViewModel : MyReactiveObject
         KeepOlderDedupl = _config.GuiItem.KeepOlderDedupl;
         EnableAutoAdjustMainLvColWidth = _config.UiItem.EnableAutoAdjustMainLvColWidth;
         EnableUpdateSubOnlyRemarksExist = _config.UiItem.EnableUpdateSubOnlyRemarksExist;
-        EnableSecurityProtocolTls13 = _config.GuiItem.EnableSecurityProtocolTls13;
         AutoHideStartup = _config.UiItem.AutoHideStartup;
         Hide2TrayWhenClose = _config.UiItem.Hide2TrayWhenClose;
         EnableDragDropSort = _config.UiItem.EnableDragDropSort;
@@ -330,7 +324,6 @@ public class OptionSettingViewModel : MyReactiveObject
         _config.GuiItem.KeepOlderDedupl = KeepOlderDedupl;
         _config.UiItem.EnableAutoAdjustMainLvColWidth = EnableAutoAdjustMainLvColWidth;
         _config.UiItem.EnableUpdateSubOnlyRemarksExist = EnableUpdateSubOnlyRemarksExist;
-        _config.GuiItem.EnableSecurityProtocolTls13 = EnableSecurityProtocolTls13;
         _config.UiItem.AutoHideStartup = AutoHideStartup;
         _config.UiItem.Hide2TrayWhenClose = Hide2TrayWhenClose;
         _config.GuiItem.AutoUpdateInterval = AutoUpdateInterval;

v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs

@@ -1,9 +1,3 @@
-using System.Reactive.Linq;
-using DynamicData;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class ProfilesSelectViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -1,12 +1,3 @@
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Text;
-using DynamicData;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class ProfilesViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs

@@ -1,7 +1,3 @@
-using System.Reactive;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class RoutingRuleDetailsViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs

@@ -1,10 +1,3 @@
-using System.Reactive;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class RoutingRuleSettingViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs

@@ -1,8 +1,3 @@
-using System.Reactive;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class RoutingSettingViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -1,11 +1,3 @@
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Text;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class StatusBarViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/SubEditViewModel.cs

@@ -1,7 +1,3 @@
-using System.Reactive;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class SubEditViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs

@@ -1,9 +1,3 @@
-using System.Reactive;
-using DynamicData;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class SubSettingViewModel : MyReactiveObject

v2rayN/v2rayN.Desktop/App.axaml

@@ -8,14 +8,7 @@
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Name="v2rayN"
     x:DataType="vms:StatusBarViewModel"
-    RequestedThemeVariant="Default">
-    <Application.Styles>
-        <semi:SemiTheme />
-        <semi:AvaloniaEditSemiTheme />
-        <StyleInclude Source="Assets/GlobalStyles.axaml" />
-        <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
-        <dialogHost:DialogHostStyles />
-    </Application.Styles>
+    RequestedThemeVariant="Default">    
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -23,6 +16,13 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
+    <Application.Styles>
+        <semi:SemiTheme />
+        <semi:AvaloniaEditSemiTheme />
+        <StyleInclude Source="Assets/GlobalStyles.axaml" />
+        <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
+        <dialogHost:DialogHostStyles />
+    </Application.Styles>
 
     <TrayIcon.Icons>
         <TrayIcons>

v2rayN/v2rayN.Desktop/App.axaml.cs

@@ -1,6 +1,3 @@
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
 using v2rayN.Desktop.Views;
 
 namespace v2rayN.Desktop;

v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml

@@ -13,6 +13,7 @@
     <Style Selector="PathIcon">
         <Setter Property="Width" Value="16" />
         <Setter Property="Height" Value="16" />
+        <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
     </Style>
 
     <Style Selector="TextBox">
@@ -26,4 +27,12 @@
     <Style Selector="TabControl">
         <Setter Property="Theme" Value="{StaticResource LineTabControl}" />
     </Style>
+
+    <Style Selector="Button.IconButton">
+        <Setter Property="Width" Value="{StaticResource IconButtonWidth}" />
+        <Setter Property="Height" Value="{StaticResource IconButtonHeight}" />
+        <Setter Property="MinWidth" Value="{StaticResource IconButtonWidth}" />
+        <Setter Property="Theme" Value="{DynamicResource BorderlessButton}" />
+    </Style>
+
 </Styles>

v2rayN/v2rayN.Desktop/Base/WindowBase.cs

@@ -1,7 +1,3 @@
-using Avalonia;
-using Avalonia.Interactivity;
-using Avalonia.ReactiveUI;
-
 namespace v2rayN.Desktop.Base;
 
 public class WindowBase<TViewModel> : ReactiveWindow<TViewModel> where TViewModel : class

v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs

@@ -1,6 +1,3 @@
-using Avalonia;
-using Avalonia.Media;
-
 namespace v2rayN.Desktop.Common;
 
 public static class AppBuilderExtension

v2rayN/v2rayN.Desktop/Common/AvaUtils.cs

@@ -1,9 +1,4 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Input;
 using Avalonia.Input.Platform;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform;
 
 namespace v2rayN.Desktop.Common;
 

v2rayN/v2rayN.Desktop/Common/TextEditorKeywordHighlighter.cs

@@ -1,4 +1,3 @@
-using Avalonia.Media;
 using AvaloniaEdit;
 using AvaloniaEdit.Document;
 using AvaloniaEdit.Rendering;

v2rayN/v2rayN.Desktop/Common/UI.cs

@@ -1,7 +1,5 @@
-using Avalonia.Controls;
 using Avalonia.Platform.Storage;
 using MsBox.Avalonia;
-using MsBox.Avalonia.Enums;
 
 namespace v2rayN.Desktop.Common;
 

v2rayN/v2rayN.Desktop/Converters/DelayColorConverter.cs

@@ -1,6 +1,4 @@
-using System.Globalization;
 using Avalonia.Data.Converters;
-using Avalonia.Media;
 
 namespace v2rayN.Desktop.Converters;
 

v2rayN/v2rayN.Desktop/GlobalUsings.cs

@@ -1,3 +1,29 @@
+global using System;
+global using System.Collections.Generic;
+global using System.Globalization;
+global using System.IO;
+global using System.Linq;
+global using System.Reactive.Disposables;
+global using System.Reactive.Linq;
+global using System.Text;
+global using System.Threading;
+global using System.Threading.Tasks;
+global using Avalonia;
+global using Avalonia.Controls;
+global using Avalonia.Controls.ApplicationLifetimes;
+global using Avalonia.Input;
+global using Avalonia.Interactivity;
+global using Avalonia.Markup.Xaml;
+global using Avalonia.Media;
+global using Avalonia.Media.Imaging;
+global using Avalonia.Platform;
+global using Avalonia.ReactiveUI;
+global using Avalonia.Styling;
+global using Avalonia.Threading;
+global using ReactiveUI;
+global using ReactiveUI.Fody.Helpers;
+global using DynamicData;
+global using MsBox.Avalonia.Enums;
 global using ServiceLib;
 global using ServiceLib.Base;
 global using ServiceLib.Common;

v2rayN/v2rayN.Desktop/Manager/HotkeyManager.cs

@@ -1,6 +1,3 @@
-using System.Reactive.Linq;
-using Avalonia.Input;
-using Avalonia.ReactiveUI;
 using Avalonia.Win32.Input;
 using GlobalHotKeys;
 
@@ -11,7 +8,7 @@ public sealed class HotkeyManager
     private static readonly Lazy<HotkeyManager> _instance = new(() => new());
     public static HotkeyManager Instance = _instance.Value;
     private readonly Dictionary<int, EGlobalHotkey> _hotkeyTriggerDic = new();
-    private HotKeyManager? _hotKeyManager;
+    private GlobalHotKeys.HotKeyManager? _hotKeyManager;
 
     private Config? _config;
 

v2rayN/v2rayN.Desktop/Program.cs

@@ -1,5 +1,3 @@
-using Avalonia;
-using Avalonia.ReactiveUI;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop;

v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs

@@ -1,13 +1,6 @@
-using System.Reactive.Linq;
-using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
 using Avalonia.Controls.Primitives;
-using Avalonia.Media;
-using Avalonia.Styling;
 using AvaloniaEdit;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
 using Semi.Avalonia;
 
 namespace v2rayN.Desktop.ViewModels;

v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml.cs

@@ -1,9 +1,3 @@
-using System.Reactive.Disposables;
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using DynamicData;
-using ReactiveUI;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml.cs

@@ -1,6 +1,3 @@
-using System.Reactive.Disposables;
-using Avalonia.Interactivity;
-using ReactiveUI;
 using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Common;
 

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml

@@ -607,12 +607,14 @@
 
                         <Button
                             x:Name="btnExtra"
-                            Width="{StaticResource IconButtonWidth}"
-                            Height="{StaticResource IconButtonHeight}"
-                            Margin="{StaticResource MarginLr8}"
-                            Theme="{DynamicResource BorderlessButton}">
+                            Classes="IconButton"
+                            Margin="{StaticResource MarginLr8}">
                             <Button.Content>
-                                <PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                                <PathIcon Data="{StaticResource SemiIconMore}" >
+                                    <PathIcon.RenderTransform>
+                                        <RotateTransform Angle="90" />
+                                    </PathIcon.RenderTransform>
+                                </PathIcon>
                             </Button.Content>
                             <Button.Flyout>
                                 <Flyout>

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs

@@ -1,7 +1,3 @@
-using System.Reactive.Disposables;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using ReactiveUI;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;