Remove unnecessary checks

Adds cycle detection to prevent infinite loops when evaluating profile groups.

This ensures that profile group configurations don't result in stack overflow errors when groups reference each other, directly or indirectly.

v2rayN/Directory.Packages.props

@@ -6,10 +6,10 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.7" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.7" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.7" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.7" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.6" />
     <PackageVersion Include="CliWrap" Version="3.9.0" />
     <PackageVersion Include="Downloader" Version="4.0.3" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
@@ -19,9 +19,9 @@
     <PackageVersion Include="ReactiveUI" Version="20.4.1" />
     <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
     <PackageVersion Include="ReactiveUI.WPF" Version="20.4.1" />
-    <PackageVersion Include="Semi.Avalonia" Version="11.3.7" />
+    <PackageVersion Include="Semi.Avalonia" Version="11.2.1.10" />
     <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.1" />
-    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.3.7" />
+    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.10" />
     <PackageVersion Include="NLog" Version="6.0.4" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
     <PackageVersion Include="TaskScheduler" Version="2.12.2" />

v2rayN/ServiceLib/Common/Job.cs

@@ -7,11 +7,11 @@ namespace ServiceLib.Common;
      * http://stackoverflow.com/questions/6266820/working-example-of-createjobobject-setinformationjobobject-pinvoke-in-net
      */
 
-    public sealed class WindowsJob : IDisposable
+    public sealed class Job : IDisposable
     {
         private IntPtr handle = IntPtr.Zero;
 
-        public WindowsJob()
+        public Job()
         {
             handle = CreateJobObject(IntPtr.Zero, null);
             var extendedInfoPtr = IntPtr.Zero;
@@ -94,7 +94,7 @@ namespace ServiceLib.Common;
             }
         }
 
-        ~WindowsJob()
+        ~Job()
         {
             Dispose(false);
         }

v2rayN/ServiceLib/Common/ProcUtils.cs

@@ -67,4 +67,116 @@ public static class ProcUtils
             Logging.SaveLog(_tag, ex);
         }
     }
+
+    public static async Task ProcessKill(int pid)
+    {
+        try
+        {
+            await ProcessKill(Process.GetProcessById(pid), false);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    public static async Task ProcessKill(Process? proc, bool review)
+    {
+        if (proc is null)
+        {
+            return;
+        }
+
+        GetProcessKeyInfo(proc, review, out var procId, out var fileName, out var processName);
+
+        try
+        {
+            if (Utils.IsNonWindows())
+            {
+                proc?.Kill(true);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+
+        try
+        {
+            proc?.Kill();
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+
+        try
+        {
+            proc?.Close();
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+
+        try
+        {
+            proc?.Dispose();
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+
+        await Task.Delay(300);
+        await ProcessKillByKeyInfo(review, procId, fileName, processName);
+    }
+
+    private static void GetProcessKeyInfo(Process? proc, bool review, out int? procId, out string? fileName, out string? processName)
+    {
+        procId = null;
+        fileName = null;
+        processName = null;
+        if (!review)
+        {
+            return;
+        }
+        try
+        {
+            procId = proc?.Id;
+            fileName = proc?.MainModule?.FileName;
+            processName = proc?.ProcessName;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    private static async Task ProcessKillByKeyInfo(bool review, int? procId, string? fileName, string? processName)
+    {
+        if (review && procId != null && fileName != null)
+        {
+            try
+            {
+                var lstProc = Process.GetProcessesByName(processName);
+                foreach (var proc2 in lstProc)
+                {
+                    if (proc2.Id == procId)
+                    {
+                        Logging.SaveLog($"{_tag}, KillProcess not completing the job, procId");
+                        await ProcessKill(proc2, false);
+                    }
+                    if (proc2.MainModule != null && proc2.MainModule?.FileName == fileName)
+                    {
+                        Logging.SaveLog($"{_tag}, KillProcess not completing the job, fileName");
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(_tag, ex);
+            }
+        }
+    }
 }

v2rayN/ServiceLib/Common/Utils.cs

@@ -85,19 +85,13 @@ public class Utils
     /// Base64 Encode
     /// </summary>
     /// <param name="plainText"></param>
-    /// <param name="removePadding"></param>
     /// <returns></returns>
-    public static string Base64Encode(string plainText, bool removePadding = false)
+    public static string Base64Encode(string plainText)
     {
         try
         {
             var plainTextBytes = Encoding.UTF8.GetBytes(plainText);
-            var base64 = Convert.ToBase64String(plainTextBytes);
-            if (removePadding)
-            {
-                base64 = base64.TrimEnd('=');
-            }
-            return base64;
+            return Convert.ToBase64String(plainTextBytes);
         }
         catch (Exception ex)
         {
@@ -118,7 +112,7 @@ public class Utils
         {
             if (plainText.IsNullOrEmpty())
             {
-                return string.Empty;
+                return "";
             }
 
             plainText = plainText.Trim()
@@ -953,7 +947,7 @@ public class Utils
         if (SetUnixFileMode(fileName))
         {
             Logging.SaveLog($"Successfully set the file execution permission, {fileName}");
-            return string.Empty;
+            return "";
         }
 
         if (fileName.Contains(' '))

v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs

@@ -155,60 +155,61 @@ public class BaseFmt
 
     protected static int ResolveStdTransport(NameValueCollection query, ref ProfileItem item)
     {
-        item.Flow = GetQueryValue(query, "flow");
-        item.StreamSecurity = GetQueryValue(query, "security");
-        item.Sni = GetQueryValue(query, "sni");
-        item.Alpn = GetQueryDecoded(query, "alpn");
-        item.Fingerprint = GetQueryDecoded(query, "fp");
-        item.PublicKey = GetQueryDecoded(query, "pbk");
-        item.ShortId = GetQueryDecoded(query, "sid");
-        item.SpiderX = GetQueryDecoded(query, "spx");
-        item.Mldsa65Verify = GetQueryDecoded(query, "pqv");
-        item.AllowInsecure = new[] { "allowInsecure", "allow_insecure", "insecure" }.Any(k => (query[k] ?? "") == "1") ? "true" : "";
+        item.Flow = query["flow"] ?? "";
+        item.StreamSecurity = query["security"] ?? "";
+        item.Sni = query["sni"] ?? "";
+        item.Alpn = Utils.UrlDecode(query["alpn"] ?? "");
+        item.Fingerprint = Utils.UrlDecode(query["fp"] ?? "");
+        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 = GetQueryValue(query, "type", nameof(ETransport.tcp));
+        item.Network = query["type"] ?? nameof(ETransport.tcp);
         switch (item.Network)
         {
             case nameof(ETransport.tcp):
-                item.HeaderType = GetQueryValue(query, "headerType", Global.None);
-                item.RequestHost = GetQueryDecoded(query, "host");
+                item.HeaderType = query["headerType"] ?? Global.None;
+                item.RequestHost = Utils.UrlDecode(query["host"] ?? "");
+
                 break;
 
             case nameof(ETransport.kcp):
-                item.HeaderType = GetQueryValue(query, "headerType", Global.None);
-                item.Path = GetQueryDecoded(query, "seed");
+                item.HeaderType = query["headerType"] ?? Global.None;
+                item.Path = Utils.UrlDecode(query["seed"] ?? "");
                 break;
 
             case nameof(ETransport.ws):
             case nameof(ETransport.httpupgrade):
-                item.RequestHost = GetQueryDecoded(query, "host");
-                item.Path = GetQueryDecoded(query, "path", "/");
+                item.RequestHost = Utils.UrlDecode(query["host"] ?? "");
+                item.Path = Utils.UrlDecode(query["path"] ?? "/");
                 break;
 
             case nameof(ETransport.xhttp):
-                item.RequestHost = GetQueryDecoded(query, "host");
-                item.Path = GetQueryDecoded(query, "path", "/");
-                item.HeaderType = GetQueryDecoded(query, "mode");
-                item.Extra = GetQueryDecoded(query, "extra");
+                item.RequestHost = Utils.UrlDecode(query["host"] ?? "");
+                item.Path = Utils.UrlDecode(query["path"] ?? "/");
+                item.HeaderType = Utils.UrlDecode(query["mode"] ?? "");
+                item.Extra = Utils.UrlDecode(query["extra"] ?? "");
                 break;
 
             case nameof(ETransport.http):
             case nameof(ETransport.h2):
                 item.Network = nameof(ETransport.h2);
-                item.RequestHost = GetQueryDecoded(query, "host");
-                item.Path = GetQueryDecoded(query, "path", "/");
+                item.RequestHost = Utils.UrlDecode(query["host"] ?? "");
+                item.Path = Utils.UrlDecode(query["path"] ?? "/");
                 break;
 
             case nameof(ETransport.quic):
-                item.HeaderType = GetQueryValue(query, "headerType", Global.None);
-                item.RequestHost = GetQueryValue(query, "quicSecurity", Global.None);
-                item.Path = GetQueryDecoded(query, "key");
+                item.HeaderType = query["headerType"] ?? Global.None;
+                item.RequestHost = query["quicSecurity"] ?? Global.None;
+                item.Path = Utils.UrlDecode(query["key"] ?? "");
                 break;
 
             case nameof(ETransport.grpc):
-                item.RequestHost = GetQueryDecoded(query, "authority");
-                item.Path = GetQueryDecoded(query, "serviceName");
-                item.HeaderType = GetQueryDecoded(query, "mode", Global.GrpcGunMode);
+                item.RequestHost = Utils.UrlDecode(query["authority"] ?? "");
+                item.Path = Utils.UrlDecode(query["serviceName"] ?? "");
+                item.HeaderType = Utils.UrlDecode(query["mode"] ?? Global.GrpcGunMode);
                 break;
 
             default:
@@ -238,14 +239,4 @@ public class BaseFmt
         var url = $"{Utils.UrlEncode(userInfo)}@{GetIpv6(address)}:{port}";
         return $"{Global.ProtocolShares[eConfigType]}{url}{query}{remark}";
     }
-
-    protected static string GetQueryValue(NameValueCollection query, string key, string defaultValue = "")
-    {
-        return query[key] ?? defaultValue;
-    }
-
-    protected static string GetQueryDecoded(NameValueCollection query, string key, string defaultValue = "")
-    {
-        return Utils.UrlDecode(GetQueryValue(query, key, defaultValue));
-    }
 }

v2rayN/ServiceLib/Handler/Fmt/FmtHandler.cs

@@ -27,7 +27,7 @@ public class FmtHandler
         catch (Exception ex)
         {
             Logging.SaveLog(_tag, ex);
-            return string.Empty;
+            return "";
         }
     }
 

v2rayN/ServiceLib/Handler/Fmt/Hysteria2Fmt.cs

@@ -21,10 +21,10 @@ public class Hysteria2Fmt : BaseFmt
 
         var query = Utils.ParseQueryString(url.Query);
         ResolveStdTransport(query, ref item);
-        item.Path = GetQueryDecoded(query, "obfs-password");
-        item.AllowInsecure = GetQueryValue(query, "insecure") == "1" ? "true" : "false";
+        item.Path = Utils.UrlDecode(query["obfs-password"] ?? "");
+        item.AllowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
 
-        item.Ports = GetQueryDecoded(query, "mport");
+        item.Ports = Utils.UrlDecode(query["mport"] ?? "");
 
         return item;
     }

v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs

@@ -42,7 +42,7 @@ public class ShadowsocksFmt : BaseFmt
         //    item.port);
         //url = Utile.Base64Encode(url);
         //new Sip002
-        var pw = Utils.Base64Encode($"{item.Security}:{item.Id}", true);
+        var pw = Utils.Base64Encode($"{item.Security}:{item.Id}");
         return ToUri(EConfigType.Shadowsocks, item.Address, item.Port, pw, null, remark);
     }
 

v2rayN/ServiceLib/Handler/Fmt/SocksFmt.cs

@@ -33,7 +33,7 @@ public class SocksFmt : BaseFmt
             remark = "#" + Utils.UrlEncode(item.Remarks);
         }
         //new
-        var pw = Utils.Base64Encode($"{item.Security}:{item.Id}", true);
+        var pw = Utils.Base64Encode($"{item.Security}:{item.Id}");
         return ToUri(EConfigType.SOCKS, item.Address, item.Port, pw, null, remark);
     }
 

v2rayN/ServiceLib/Handler/Fmt/TuicFmt.cs

@@ -30,7 +30,7 @@ public class TuicFmt : BaseFmt
 
         var query = Utils.ParseQueryString(url.Query);
         ResolveStdTransport(query, ref item);
-        item.HeaderType = GetQueryValue(query, "congestion_control");
+        item.HeaderType = query["congestion_control"] ?? "";
 
         return item;
     }

v2rayN/ServiceLib/Handler/Fmt/VLESSFmt.cs

@@ -24,8 +24,8 @@ public class VLESSFmt : BaseFmt
         item.Id = Utils.UrlDecode(url.UserInfo);
 
         var query = Utils.ParseQueryString(url.Query);
-        item.Security = GetQueryValue(query, "encryption", Global.None);
-        item.StreamSecurity = GetQueryValue(query, "security");
+        item.Security = query["encryption"] ?? Global.None;
+        item.StreamSecurity = query["security"] ?? "";
         _ = ResolveStdTransport(query, ref item);
 
         return item;

v2rayN/ServiceLib/Handler/Fmt/WireguardFmt.cs

@@ -24,10 +24,10 @@ public class WireguardFmt : BaseFmt
 
         var query = Utils.ParseQueryString(url.Query);
 
-        item.PublicKey = GetQueryDecoded(query, "publickey");
-        item.Path = GetQueryDecoded(query, "reserved");
-        item.RequestHost = GetQueryDecoded(query, "address");
-        item.ShortId = GetQueryDecoded(query, "mtu");
+        item.PublicKey = Utils.UrlDecode(query["publickey"] ?? "");
+        item.Path = Utils.UrlDecode(query["reserved"] ?? "");
+        item.RequestHost = Utils.UrlDecode(query["address"] ?? "");
+        item.ShortId = Utils.UrlDecode(query["mtu"] ?? "");
 
         return item;
     }

v2rayN/ServiceLib/Manager/AppManager.cs

@@ -8,6 +8,7 @@ public sealed class AppManager
     private Config _config;
     private int? _statePort;
     private int? _statePort2;
+    private Job? _processJob;
     public static AppManager Instance => _instance.Value;
     public Config Config => _config;
 
@@ -136,6 +137,21 @@ public sealed class AppManager
         return localPort + (int)protocol;
     }
 
+    public void AddProcess(nint processHandle)
+    {
+        if (Utils.IsWindows())
+        {
+            _processJob ??= new();
+            try
+            {
+                _processJob?.AddProcess(processHandle);
+            }
+            catch
+            {
+            }
+        }
+    }
+
     #endregion Config
 
     #region SqliteHelper

v2rayN/ServiceLib/Manager/CoreAdminManager.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using System.Text;
 using CliWrap;
 using CliWrap.Buffered;
@@ -30,7 +31,7 @@ public class CoreAdminManager
         await _updateFunc?.Invoke(notify, msg);
     }
 
-    public async Task<ProcessService?> RunProcessAsLinuxSudo(string fileName, CoreInfo coreInfo, string configPath)
+    public async Task<Process?> RunProcessAsLinuxSudo(string fileName, CoreInfo coreInfo, string configPath)
     {
         StringBuilder sb = new();
         sb.AppendLine("#!/bin/bash");
@@ -38,25 +39,50 @@ public class CoreAdminManager
         sb.AppendLine($"sudo -S {cmdLine}");
         var shFilePath = await FileManager.CreateLinuxShellFile("run_as_sudo.sh", sb.ToString(), true);
 
-        var procService = new ProcessService(
-            fileName: shFilePath,
-            arguments: "",
-            workingDirectory: Utils.GetBinConfigPath(),
-            displayLog: true,
-            redirectInput: true,
-            environmentVars: null,
-            updateFunc: _updateFunc
-        );
+        Process proc = new()
+        {
+            StartInfo = new()
+            {
+                FileName = shFilePath,
+                Arguments = "",
+                WorkingDirectory = Utils.GetBinConfigPath(),
+                UseShellExecute = false,
+                RedirectStandardInput = true,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true,
+                CreateNoWindow = true,
+                StandardOutputEncoding = Encoding.UTF8,
+                StandardErrorEncoding = Encoding.UTF8,
+            }
+        };
 
-        await procService.StartAsync(AppManager.Instance.LinuxSudoPwd);
+        void dataHandler(object sender, DataReceivedEventArgs e)
+        {
+            if (e.Data.IsNotEmpty())
+            {
+                _ = UpdateFunc(false, e.Data + Environment.NewLine);
+            }
+        }
 
-        if (procService is null or { HasExited: true })
+        proc.OutputDataReceived += dataHandler;
+        proc.ErrorDataReceived += dataHandler;
+
+        proc.Start();
+        proc.BeginOutputReadLine();
+        proc.BeginErrorReadLine();
+
+        await Task.Delay(10);
+        await proc.StandardInput.WriteLineAsync(AppManager.Instance.LinuxSudoPwd);
+
+        await Task.Delay(100);
+        if (proc is null or { HasExited: true })
         {
             throw new Exception(ResUI.FailedToRunCore);
         }
-        _linuxSudoPid = procService.Id;
 
-        return procService;
+        _linuxSudoPid = proc.Id;
+
+        return proc;
     }
 
     public async Task KillProcessAsLinuxSudo()

v2rayN/ServiceLib/Manager/CoreManager.cs

@@ -1,3 +1,6 @@
+using System.Diagnostics;
+using System.Text;
+
 namespace ServiceLib.Manager;
 
 /// <summary>
@@ -8,9 +11,8 @@ public class CoreManager
     private static readonly Lazy<CoreManager> _instance = new(() => new());
     public static CoreManager Instance => _instance.Value;
     private Config _config;
-    private WindowsJob? _processJob;
-    private ProcessService? _processService;
-    private ProcessService? _processPreService;
+    private Process? _process;
+    private Process? _processPre;
     private bool _linuxSudo = false;
     private Func<bool, string, Task>? _updateFunc;
     private const string _tag = "CoreHandler";
@@ -87,13 +89,13 @@ public class CoreManager
 
         await CoreStart(node);
         await CoreStartPreService(node);
-        if (_processService != null)
+        if (_process != null)
         {
             await UpdateFunc(true, $"{node.GetSummary()}");
         }
     }
 
-    public async Task<ProcessService?> LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
+    public async Task<int> LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
     {
         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));
@@ -102,22 +104,28 @@ public class CoreManager
         await UpdateFunc(false, result.Msg);
         if (result.Success != true)
         {
-            return null;
+            return -1;
         }
 
         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);
-        return await RunProcess(coreInfo, fileName, true, false);
+        var proc = await RunProcess(coreInfo, fileName, true, false);
+        if (proc is null)
+        {
+            return -1;
+        }
+
+        return proc.Id;
     }
 
-    public async Task<ProcessService?> LoadCoreConfigSpeedtest(ServerTestItem testItem)
+    public async Task<int> LoadCoreConfigSpeedtest(ServerTestItem testItem)
     {
         var node = await AppManager.Instance.GetProfileItem(testItem.IndexId);
         if (node is null)
         {
-            return null;
+            return -1;
         }
 
         var fileName = string.Format(Global.CoreSpeedtestConfigFileName, Utils.GetGuid(false));
@@ -125,12 +133,18 @@ public class CoreManager
         var result = await CoreConfigHandler.GenerateClientSpeedtestConfig(_config, node, testItem, configPath);
         if (result.Success != true)
         {
-            return null;
+            return -1;
         }
 
         var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
         var coreInfo = CoreInfoManager.Instance.GetCoreInfo(coreType);
-        return await RunProcess(coreInfo, fileName, true, false);
+        var proc = await RunProcess(coreInfo, fileName, true, false);
+        if (proc is null)
+        {
+            return -1;
+        }
+
+        return proc.Id;
     }
 
     public async Task CoreStop()
@@ -143,18 +157,16 @@ public class CoreManager
                 _linuxSudo = false;
             }
 
-            if (_processService != null)
+            if (_process != null)
             {
-                await _processService.StopAsync();
-                _processService.Dispose();
-                _processService = null;
+                await ProcUtils.ProcessKill(_process, Utils.IsWindows());
+                _process = null;
             }
 
-            if (_processPreService != null)
+            if (_processPre != null)
             {
-                await _processPreService.StopAsync();
-                _processPreService.Dispose();
-                _processPreService = null;
+                await ProcUtils.ProcessKill(_processPre, Utils.IsWindows());
+                _processPre = null;
             }
         }
         catch (Exception ex)
@@ -176,12 +188,12 @@ public class CoreManager
         {
             return;
         }
-        _processService = proc;
+        _process = proc;
     }
 
     private async Task CoreStartPreService(ProfileItem node)
     {
-        if (_processService != null && !_processService.HasExited)
+        if (_process != null && !_process.HasExited)
         {
             var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
             var itemSocks = await ConfigHandler.GetPreSocksItem(_config, node, coreType);
@@ -198,7 +210,7 @@ public class CoreManager
                     {
                         return;
                     }
-                    _processPreService = proc;
+                    _processPre = proc;
                 }
             }
         }
@@ -213,7 +225,7 @@ public class CoreManager
 
     #region Process
 
-    private async Task<ProcessService?> RunProcess(CoreInfo? coreInfo, string configPath, bool displayLog, bool mayNeedSudo)
+    private async Task<Process?> RunProcess(CoreInfo? coreInfo, string configPath, bool displayLog, bool mayNeedSudo)
     {
         var fileName = CoreInfoManager.Instance.GetCoreExecFile(coreInfo, out var msg);
         if (fileName.IsNullOrEmpty())
@@ -244,48 +256,55 @@ public class CoreManager
         }
     }
 
-    private async Task<ProcessService?> RunProcessNormal(string fileName, CoreInfo? coreInfo, string configPath, bool displayLog)
+    private async Task<Process?> RunProcessNormal(string fileName, CoreInfo? coreInfo, string configPath, bool displayLog)
     {
-        var environmentVars = new Dictionary<string, string>();
+        Process proc = new()
+        {
+            StartInfo = new()
+            {
+                FileName = fileName,
+                Arguments = string.Format(coreInfo.Arguments, coreInfo.AbsolutePath ? Utils.GetBinConfigPath(configPath).AppendQuotes() : configPath),
+                WorkingDirectory = Utils.GetBinConfigPath(),
+                UseShellExecute = false,
+                RedirectStandardOutput = displayLog,
+                RedirectStandardError = displayLog,
+                CreateNoWindow = true,
+                StandardOutputEncoding = displayLog ? Encoding.UTF8 : null,
+                StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
+            }
+        };
         foreach (var kv in coreInfo.Environment)
         {
-            environmentVars[kv.Key] = string.Format(kv.Value, coreInfo.AbsolutePath ? Utils.GetBinConfigPath(configPath).AppendQuotes() : configPath);
+            proc.StartInfo.Environment[kv.Key] = string.Format(kv.Value, coreInfo.AbsolutePath ? Utils.GetBinConfigPath(configPath).AppendQuotes() : configPath);
         }
 
-        var procService = new ProcessService(
-            fileName: fileName,
-            arguments: string.Format(coreInfo.Arguments, coreInfo.AbsolutePath ? Utils.GetBinConfigPath(configPath).AppendQuotes() : configPath),
-            workingDirectory: Utils.GetBinConfigPath(),
-            displayLog: displayLog,
-            redirectInput: false,
-            environmentVars: environmentVars,
-            updateFunc: _updateFunc
-        );
+        if (displayLog)
+        {
+            void dataHandler(object sender, DataReceivedEventArgs e)
+            {
+                if (e.Data.IsNotEmpty())
+                {
+                    _ = UpdateFunc(false, e.Data + Environment.NewLine);
+                }
+            }
+            proc.OutputDataReceived += dataHandler;
+            proc.ErrorDataReceived += dataHandler;
+        }
+        proc.Start();
 
-        await procService.StartAsync();
+        if (displayLog)
+        {
+            proc.BeginOutputReadLine();
+            proc.BeginErrorReadLine();
+        }
 
         await Task.Delay(100);
-
-        if (procService is null or { HasExited: true })
+        AppManager.Instance.AddProcess(proc.Handle);
+        if (proc is null or { HasExited: true })
         {
             throw new Exception(ResUI.FailedToRunCore);
         }
-        AddProcessJob(procService.Handle);
-
-        return procService;
-    }
-
-    private void AddProcessJob(nint processHandle)
-    {
-        if (Utils.IsWindows())
-        {
-            _processJob ??= new();
-            try
-            {
-                _processJob?.AddProcess(processHandle);
-            }
-            catch { }
-        }
+        return proc;
     }
 
     #endregion Process

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -3057,15 +3057,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Bootstrap DNS (sing-box) 的本地化字符串。
-        /// </summary>
-        public static string TbSBBootstrapDNS {
-            get {
-                return ResourceManager.GetString("TbSBBootstrapDNS", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 sing-box Direct Resolution Strategy 的本地化字符串。
         /// </summary>
@@ -3076,7 +3067,25 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Resolve DNS server domains, requires IP 的本地化字符串。
+        ///   查找类似 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 {

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

@@ -1425,11 +1425,11 @@
   <data name="TbSBOutboundDomainResolve" xml:space="preserve">
     <value>Resolve Outbound Domains</value>
   </data>
-  <data name="TbSBBootstrapDNS" xml:space="preserve">
-    <value>Bootstrap DNS (sing-box)</value>
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
+    <value>sing-box DoH Resolver Server</value>
   </data>
   <data name="TbSBFallbackDNSResolve" xml:space="preserve">
-    <value>Resolve DNS server domains, requires IP</value>
+    <value>Fallback DNS Resolution, Suggest IP</value>
   </data>
   <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
     <value>xray Freedom Resolution Strategy</value>
@@ -1443,6 +1443,9 @@
   <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>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -1425,11 +1425,11 @@
   <data name="TbSBOutboundDomainResolve" xml:space="preserve">
     <value>Resolve Outbound Domains</value>
   </data>
-  <data name="TbSBBootstrapDNS" xml:space="preserve">
-    <value>Bootstrap DNS (sing-box)</value>
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
+    <value>sing-box DoH Resolver Server</value>
   </data>
   <data name="TbSBFallbackDNSResolve" xml:space="preserve">
-    <value>Resolve DNS server domains, requires IP</value>
+    <value>Fallback DNS Resolution, Suggest IP</value>
   </data>
   <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
     <value>xray Freedom Resolution Strategy</value>
@@ -1443,6 +1443,9 @@
   <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>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -1425,11 +1425,11 @@
   <data name="TbSBOutboundDomainResolve" xml:space="preserve">
     <value>Resolve Outbound Domains</value>
   </data>
-  <data name="TbSBBootstrapDNS" xml:space="preserve">
-    <value>Bootstrap DNS (sing-box)</value>
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
+    <value>sing-box DoH Resolver Server</value>
   </data>
   <data name="TbSBFallbackDNSResolve" xml:space="preserve">
-    <value>Resolve DNS server domains, requires IP</value>
+    <value>Fallback DNS Resolution, Suggest IP</value>
   </data>
   <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
     <value>xray Freedom Resolution Strategy</value>
@@ -1443,6 +1443,9 @@
   <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>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1425,11 +1425,11 @@
   <data name="TbSBOutboundDomainResolve" xml:space="preserve">
     <value>Разрешать домены для исходящих соединений</value>
   </data>
-  <data name="TbSBBootstrapDNS" xml:space="preserve">
-    <value>Bootstrap DNS (sing-box)</value>
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
+    <value>Сервер DoH-резолвера (sing-box)</value>
   </data>
   <data name="TbSBFallbackDNSResolve" xml:space="preserve">
-    <value>Resolve DNS server domains, requires IP</value>
+    <value>Резервное DNS-разрешение (рекомендуется указывать IP)</value>
   </data>
   <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
     <value>Стратегия резолвинга Freedom (Xray)</value>
@@ -1443,6 +1443,9 @@
   <data name="TbAddCommonDNSHosts" xml:space="preserve">
     <value>Добавить стандартные записи hosts (DNS)</value>
   </data>
+  <data name="TbSBDoHOverride" xml:space="preserve">
+    <value>Сервер DoH-резолвера sing-box можно переопределить</value>
+  </data>
   <data name="TbFakeIP" xml:space="preserve">
     <value>FakeIP</value>
   </data>

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

@@ -1422,11 +1422,11 @@
   <data name="TbSBOutboundDomainResolve" xml:space="preserve">
     <value>解析出站域名</value>
   </data>
-  <data name="TbSBBootstrapDNS" xml:space="preserve">
-    <value>Bootstrap DNS (sing-box)</value>
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
+    <value>sing-box DoH 解析服务器</value>
   </data>
   <data name="TbSBFallbackDNSResolve" xml:space="preserve">
-    <value>解析 DNS 服务器域名，需指定为 IP</value>
+    <value>兜底解析其他 DNS 域名，建议设为 ip</value>
   </data>
   <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
     <value>xray freedom 解析策略</value>
@@ -1440,6 +1440,9 @@
   <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>

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

@@ -1422,11 +1422,11 @@
   <data name="TbSBOutboundDomainResolve" xml:space="preserve">
     <value>Resolve Outbound Domains</value>
   </data>
-  <data name="TbSBBootstrapDNS" xml:space="preserve">
-    <value>Bootstrap DNS (sing-box)</value>
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
+    <value>sing-box DoH Resolver Server</value>
   </data>
   <data name="TbSBFallbackDNSResolve" xml:space="preserve">
-    <value>Resolve DNS server domains, requires IP</value>
+    <value>Fallback DNS Resolution, Suggest IP</value>
   </data>
   <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
     <value>xray Freedom Resolution Strategy</value>
@@ -1440,6 +1440,9 @@
   <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>

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

@@ -177,7 +177,7 @@ public partial class CoreConfigV2rayService(Config config)
 
             ret.Success = true;
 
-            ret.Data = await ApplyFullConfigTemplate(v2rayConfig);
+            ret.Data = await ApplyFullConfigTemplate(v2rayConfig, true);
             return ret;
         }
         catch (Exception ex)
@@ -234,7 +234,7 @@ public partial class CoreConfigV2rayService(Config config)
 
             ret.Success = true;
 
-            ret.Data = await ApplyFullConfigTemplate(v2rayConfig);
+            ret.Data = await ApplyFullConfigTemplate(v2rayConfig, true);
             return ret;
         }
         catch (Exception ex)

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

@@ -4,7 +4,7 @@ namespace ServiceLib.Services.CoreConfig;
 
 public partial class CoreConfigV2rayService
 {
-    private async Task<string> ApplyFullConfigTemplate(V2rayConfig v2rayConfig)
+    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())
@@ -19,7 +19,7 @@ public partial class CoreConfigV2rayService
         }
 
         // Handle balancer and rules modifications (for multiple load scenarios)
-        if (v2rayConfig.routing?.balancers?.Count > 0)
+        if (handleBalancerAndRules && v2rayConfig.routing?.balancers?.Count > 0)
         {
             var balancer = v2rayConfig.routing.balancers.First();
 
@@ -60,34 +60,6 @@ public partial class CoreConfigV2rayService
             }
         }
 
-        if (v2rayConfig.observatory != null)
-        {
-            if (fullConfigTemplateNode["observatory"] == null)
-            {
-                fullConfigTemplateNode["observatory"] = JsonNode.Parse(JsonUtils.Serialize(v2rayConfig.observatory));
-            }
-            else
-            {
-                var subjectSelector = v2rayConfig.observatory.subjectSelector;
-                subjectSelector.AddRange(fullConfigTemplateNode["observatory"]?["subjectSelector"]?.AsArray()?.Select(x => x?.GetValue<string>()) ?? []);
-                fullConfigTemplateNode["observatory"]["subjectSelector"] = JsonNode.Parse(JsonUtils.Serialize(subjectSelector.Distinct().ToList()));
-            }
-        }
-
-        if (v2rayConfig.burstObservatory != null)
-        {
-            if (fullConfigTemplateNode["burstObservatory"] == null)
-            {
-                fullConfigTemplateNode["burstObservatory"] = JsonNode.Parse(JsonUtils.Serialize(v2rayConfig.burstObservatory));
-            }
-            else
-            {
-                var subjectSelector = v2rayConfig.burstObservatory.subjectSelector;
-                subjectSelector.AddRange(fullConfigTemplateNode["burstObservatory"]?["subjectSelector"]?.AsArray()?.Select(x => x?.GetValue<string>()) ?? []);
-                fullConfigTemplateNode["burstObservatory"]["subjectSelector"] = JsonNode.Parse(JsonUtils.Serialize(subjectSelector.Distinct().ToList()));
-            }
-        }
-
         // Handle outbounds - append instead of override
         var customOutboundsNode = fullConfigTemplateNode["outbounds"] is JsonArray outbounds ? outbounds : new JsonArray();
         foreach (var outbound in v2rayConfig.outbounds)

v2rayN/ServiceLib/Services/ProcessService.cs

@@ -1,183 +0,0 @@
-using System.Diagnostics;
-using System.Text;
-
-namespace ServiceLib.Services;
-
-public class ProcessService : IDisposable
-{
-    private readonly Process _process;
-    private readonly Func<bool, string, Task>? _updateFunc;
-    private bool _isDisposed;
-
-    public int Id => _process.Id;
-    public IntPtr Handle => _process.Handle;
-    public bool HasExited => _process.HasExited;
-
-    public ProcessService(
-        string fileName,
-        string arguments,
-        string workingDirectory,
-        bool displayLog,
-        bool redirectInput,
-        Dictionary<string, string>? environmentVars,
-        Func<bool, string, Task>? updateFunc)
-    {
-        _updateFunc = updateFunc;
-
-        _process = new Process
-        {
-            StartInfo = new ProcessStartInfo
-            {
-                FileName = fileName,
-                Arguments = arguments,
-                WorkingDirectory = workingDirectory,
-                UseShellExecute = false,
-                RedirectStandardInput = redirectInput,
-                RedirectStandardOutput = displayLog,
-                RedirectStandardError = displayLog,
-                CreateNoWindow = true,
-                StandardOutputEncoding = displayLog ? Encoding.UTF8 : null,
-                StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
-            },
-            EnableRaisingEvents = true
-        };
-
-        if (environmentVars != null)
-        {
-            foreach (var kv in environmentVars)
-            {
-                _process.StartInfo.Environment[kv.Key] = kv.Value;
-            }
-        }
-
-        if (displayLog)
-        {
-            RegisterEventHandlers();
-        }
-    }
-
-    public async Task StartAsync(string pwd = null)
-    {
-        _process.Start();
-
-        if (_process.StartInfo.RedirectStandardOutput)
-        {
-            _process.BeginOutputReadLine();
-            _process.BeginErrorReadLine();
-        }
-
-        if (_process.StartInfo.RedirectStandardInput)
-        {
-            await Task.Delay(10);
-            await _process.StandardInput.WriteLineAsync(pwd);
-        }
-    }
-
-    public async Task StopAsync()
-    {
-        if (_process.HasExited)
-        {
-            return;
-        }
-
-        try
-        {
-            if (_process.StartInfo.RedirectStandardOutput)
-            {
-                try
-                {
-                    _process.CancelOutputRead();
-                }
-                catch { }
-                try
-                {
-                    _process.CancelErrorRead();
-                }
-                catch { }
-            }
-
-            try
-            {
-                if (Utils.IsNonWindows())
-                {
-                    _process.Kill(true);
-                }
-            }
-            catch { }
-
-            try
-            {
-                _process.Kill();
-            }
-            catch { }
-
-            await Task.Delay(100);
-        }
-        catch (Exception ex)
-        {
-            await _updateFunc?.Invoke(true, ex.Message);
-        }
-    }
-
-    private void RegisterEventHandlers()
-    {
-        void dataHandler(object sender, DataReceivedEventArgs e)
-        {
-            if (e.Data.IsNotEmpty())
-            {
-                _ = _updateFunc?.Invoke(false, e.Data + Environment.NewLine);
-            }
-        }
-
-        _process.OutputDataReceived += dataHandler;
-        _process.ErrorDataReceived += dataHandler;
-
-        _process.Exited += (s, e) =>
-        {
-            try
-            {
-                _process.OutputDataReceived -= dataHandler;
-                _process.ErrorDataReceived -= dataHandler;
-            }
-            catch
-            {
-            }
-        };
-    }
-
-    public void Dispose()
-    {
-        if (_isDisposed)
-        {
-            return;
-        }
-
-        try
-        {
-            if (!_process.HasExited)
-            {
-                try
-                {
-                    _process.CancelOutputRead();
-                }
-                catch { }
-                try
-                {
-                    _process.CancelErrorRead();
-                }
-                catch { }
-
-                _process.Kill();
-            }
-
-            _process.Dispose();
-        }
-        catch (Exception ex)
-        {
-            _updateFunc?.Invoke(true, ex.Message);
-        }
-
-        _isDisposed = true;
-        GC.SuppressFinalize(this);
-    }
-}

v2rayN/ServiceLib/Services/SpeedtestService.cs

@@ -182,11 +182,11 @@ public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateF
 
     private async Task<bool> RunRealPingAsync(List<ServerTestItem> selecteds, string exitLoopKey)
     {
-        ProcessService processService = null;
+        var pid = -1;
         try
         {
-            processService = await CoreManager.Instance.LoadCoreConfigSpeedtest(selecteds);
-            if (processService is null)
+            pid = await CoreManager.Instance.LoadCoreConfigSpeedtest(selecteds);
+            if (pid < 0)
             {
                 return false;
             }
@@ -216,7 +216,10 @@ public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateF
         }
         finally
         {
-            await processService?.StopAsync();
+            if (pid > 0)
+            {
+                await ProcUtils.ProcessKill(pid);
+            }
         }
         return true;
     }
@@ -241,11 +244,11 @@ public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateF
 
             tasks.Add(Task.Run(async () =>
             {
-                ProcessService processService = null;
+                var pid = -1;
                 try
                 {
-                    processService = await CoreManager.Instance.LoadCoreConfigSpeedtest(it);
-                    if (processService is null)
+                    pid = await CoreManager.Instance.LoadCoreConfigSpeedtest(it);
+                    if (pid < 0)
                     {
                         await UpdateFunc(it.IndexId, "", ResUI.FailedToRunCore);
                     }
@@ -272,7 +275,10 @@ public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateF
                 }
                 finally
                 {
-                    await processService?.StopAsync();
+                    if (pid > 0)
+                    {
+                        await ProcUtils.ProcessKill(pid);
+                    }
                     concurrencySemaphore.Release();
                 }
             }));

v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs

@@ -1,5 +1,4 @@
 using System.Reactive;
-using System.Reactive.Linq;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 
@@ -33,8 +32,6 @@ public class DNSSettingViewModel : MyReactiveObject
     [Reactive] public bool RayCustomDNSEnableCompatible { get; set; }
     [Reactive] public bool SBCustomDNSEnableCompatible { get; set; }
 
-    [ObservableAsProperty] public bool IsSimpleDNSEnabled { get; }
-
     public ReactiveCommand<Unit, Unit> SaveCmd { get; }
     public ReactiveCommand<Unit, Unit> ImportDefConfig4V2rayCompatibleCmd { get; }
     public ReactiveCommand<Unit, Unit> ImportDefConfig4SingboxCompatibleCmd { get; }
@@ -58,10 +55,6 @@ public class DNSSettingViewModel : MyReactiveObject
             await Task.CompletedTask;
         });
 
-        this.WhenAnyValue(x => x.RayCustomDNSEnableCompatible, x => x.SBCustomDNSEnableCompatible)
-            .Select(x => !(x.Item1 && x.Item2))
-            .ToPropertyEx(this, x => x.IsSimpleDNSEnabled);
-
         _ = Init();
     }
 

v2rayN/v2rayN.Desktop/App.axaml

@@ -20,6 +20,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="Assets/GlobalResources.axaml" />
+                <ResourceInclude Source="Controls/AutoCompleteBox.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

v2rayN/v2rayN.Desktop/Common/AvaUtils.cs

@@ -1,7 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
-using Avalonia.Input.Platform;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
 
@@ -19,7 +18,7 @@ internal class AvaUtils
                 return null;
             }
 
-            return await clipboard.TryGetTextAsync();
+            return await clipboard.GetTextAsync();
         }
         catch
         {
@@ -34,7 +33,9 @@ internal class AvaUtils
             var clipboard = TopLevel.GetTopLevel(visual)?.Clipboard;
             if (clipboard == null)
                 return;
-            await clipboard.SetTextAsync(strData);
+            var dataObject = new DataObject();
+            dataObject.Set(DataFormats.Text, strData);
+            await clipboard.SetDataObjectAsync(dataObject);
         }
         catch
         {

v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.axaml

@@ -0,0 +1,48 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:v2rayN.Desktop.Controls">
+    <!--  Add Resources Here  -->
+    <ControlTheme x:Key="{x:Type controls:AutoCompleteBox}" TargetType="controls:AutoCompleteBox">
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxDefaultHeight}" />
+        <Setter Property="MaxDropDownHeight" Value="{DynamicResource AutoCompleteMaxDropdownHeight}" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="AutoCompleteBox">
+                <Panel>
+                    <TextBox
+                        Name="PART_TextBox"
+                        MinHeight="{TemplateBinding MinHeight}"
+                        VerticalAlignment="Stretch"
+                        DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
+                        InnerLeftContent="{TemplateBinding InnerLeftContent}"
+                        InnerRightContent="{TemplateBinding InnerRightContent}"
+                        Watermark="{TemplateBinding Watermark}" />
+                    <Popup
+                        Name="PART_Popup"
+                        MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                        IsLightDismissEnabled="True"
+                        PlacementTarget="{TemplateBinding}">
+                        <Border
+                            MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                            Margin="{DynamicResource AutoCompleteBoxPopupMargin}"
+                            Padding="{DynamicResource AutoCompleteBoxPopupPadding}"
+                            HorizontalAlignment="Stretch"
+                            Background="{DynamicResource AutoCompleteBoxPopupBackground}"
+                            BorderBrush="{DynamicResource AutoCompleteBoxPopupBorderBrush}"
+                            BorderThickness="{DynamicResource AutoCompleteBoxPopupBorderThickness}"
+                            BoxShadow="{DynamicResource AutoCompleteBoxPopupBoxShadow}"
+                            CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}">
+                            <ListBox
+                                Name="PART_SelectingItemsControl"
+                                Foreground="{TemplateBinding Foreground}"
+                                ItemTemplate="{TemplateBinding ItemTemplate}"
+                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                ScrollViewer.VerticalScrollBarVisibility="Auto" />
+                        </Border>
+                    </Popup>
+                </Panel>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>

v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.cs

@@ -0,0 +1,40 @@
+using Avalonia.Input;
+using Avalonia.Interactivity;
+
+namespace v2rayN.Desktop.Controls;
+
+public class AutoCompleteBox : Avalonia.Controls.AutoCompleteBox
+{
+    static AutoCompleteBox()
+    {
+        MinimumPrefixLengthProperty.OverrideDefaultValue<AutoCompleteBox>(0);
+    }
+
+    public AutoCompleteBox()
+    {
+        AddHandler(PointerPressedEvent, OnBoxPointerPressed, RoutingStrategies.Tunnel);
+    }
+
+    private void OnBoxPointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        if (Equals(sender, this) && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+        {
+            SetCurrentValue(IsDropDownOpenProperty, true);
+        }
+    }
+
+    protected override void OnGotFocus(GotFocusEventArgs e)
+    {
+        base.OnGotFocus(e);
+        if (IsDropDownOpen)
+        {
+            return;
+        }
+        SetCurrentValue(IsDropDownOpenProperty, true);
+    }
+
+    public void Clear()
+    {
+        SetCurrentValue(SelectedItemProperty, null);
+    }
+}

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"
@@ -36,7 +37,6 @@
             <TabItem Header="{x:Static resx:ResUI.ThBasicDNSSettings}">
                 <ScrollViewer VerticalScrollBarVisibility="Visible">
                     <Grid
-                        x:Name="gridBasicDNSSettings"
                         Margin="{StaticResource Margin8}"
                         ColumnDefinitions="Auto,Auto,*"
                         RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
@@ -55,13 +55,13 @@
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbDomesticDNS}" />
-                        <ComboBox
+                        <ctrls:AutoCompleteBox
                             x:Name="cmbDirectDNS"
                             Grid.Row="1"
                             Grid.Column="1"
                             Width="300"
                             Margin="{StaticResource Margin4}"
-                            IsEditable="True" />
+                            Text="{Binding DirectDNS, Mode=TwoWay}" />
 
                         <TextBlock
                             Grid.Row="2"
@@ -69,13 +69,13 @@
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbRemoteDNS}" />
-                        <ComboBox
+                        <ctrls:AutoCompleteBox
                             x:Name="cmbRemoteDNS"
                             Grid.Row="2"
                             Grid.Column="1"
                             Width="300"
                             Margin="{StaticResource Margin4}"
-                            IsEditable="True" />
+                            Text="{Binding RemoteDNS, Mode=TwoWay}" />
 
                         <TextBlock
                             Grid.Row="3"
@@ -83,13 +83,13 @@
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbSBOutboundsResolverDNS}" />
-                        <ComboBox
+                        <ctrls:AutoCompleteBox
                             x:Name="cmbSBResolverDNS"
                             Grid.Row="3"
                             Grid.Column="1"
                             Width="300"
                             Margin="{StaticResource Margin4}"
-                            IsEditable="True" />
+                            Text="{Binding SingboxOutboundsResolveDNS, Mode=TwoWay}" />
                         <TextBlock
                             Grid.Row="3"
                             Grid.Column="2"
@@ -103,14 +103,14 @@
                             Grid.Column="0"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
-                            Text="{x:Static resx:ResUI.TbSBBootstrapDNS}" />
-                        <ComboBox
+                            Text="{x:Static resx:ResUI.TbSBDoHResolverServer}" />
+                        <ctrls:AutoCompleteBox
                             x:Name="cmbSBFinalResolverDNS"
                             Grid.Row="4"
                             Grid.Column="1"
                             Width="300"
                             Margin="{StaticResource Margin4}"
-                            IsEditable="True" />
+                            Text="{Binding SingboxFinalResolveDNS, Mode=TwoWay}" />
                         <TextBlock
                             Grid.Row="4"
                             Grid.Column="2"
@@ -173,6 +173,13 @@
                             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}"
+                            TextWrapping="Wrap" />
                     </Grid>
                 </ScrollViewer>
             </TabItem>
@@ -180,7 +187,6 @@
             <TabItem Header="{x:Static resx:ResUI.ThAdvancedDNSSettings}">
                 <ScrollViewer VerticalScrollBarVisibility="Visible">
                     <Grid
-                        x:Name="gridAdvancedDNSSettings"
                         Margin="{StaticResource Margin8}"
                         ColumnDefinitions="Auto,Auto,*"
                         RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,*">
@@ -252,13 +258,13 @@
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPs}" />
-                        <ComboBox
+                        <ctrls:AutoCompleteBox
                             x:Name="cmbDirectExpectedIPs"
                             Grid.Row="4"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource Margin4}"
-                            IsEditable="True" />
+                            Text="{Binding DirectExpectedIPs, Mode=TwoWay}" />
                         <TextBlock
                             Grid.Row="4"
                             Grid.Column="2"
@@ -355,11 +361,11 @@
                                 Margin="{StaticResource Margin4}"
                                 VerticalAlignment="Center"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
-                            <ComboBox
+                            <ctrls:AutoCompleteBox
                                 x:Name="cmbdomainDNSAddressCompatible"
                                 Width="150"
                                 Margin="{StaticResource Margin4}"
-                                IsEditable="True" />
+                                Text="{Binding DomainDNSAddressCompatible, Mode=TwoWay}" />
                         </StackPanel>
                     </WrapPanel>
 
@@ -427,11 +433,11 @@
                                 Margin="{StaticResource Margin4}"
                                 VerticalAlignment="Center"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
-                            <ComboBox
+                            <ctrls:AutoCompleteBox
                                 x:Name="cmbdomainDNSAddress2Compatible"
                                 Width="150"
                                 Margin="{StaticResource Margin4}"
-                                IsEditable="True" />
+                                Text="{Binding DomainDNSAddress2Compatible, Mode=TwoWay}" />
                         </StackPanel>
                     </WrapPanel>
 

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs

@@ -1,5 +1,4 @@
 using System.Reactive.Disposables;
-using System.Reactive.Linq;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
@@ -40,15 +39,15 @@ public partial class DNSSettingWindow : WindowBase<DNSSettingViewModel>
             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.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.Bind(ViewModel, vm => vm.DirectExpectedIPs, v => v.cmbDirectExpectedIPs.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
 
@@ -57,25 +56,27 @@ public partial class DNSSettingWindow : WindowBase<DNSSettingViewModel>
 
             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.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.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.IsSimpleDNSEnabled)
-                .Select(b => !b)
-                .BindTo(this.FindControl<TextBlock>("txtBasicDNSSettingsInvalid"), t => t.IsVisible);
-            this.WhenAnyValue(x => x.ViewModel.IsSimpleDNSEnabled)
-                .Select(b => !b)
-                .BindTo(this.FindControl<TextBlock>("txtAdvancedDNSSettingsInvalid"), t => t.IsVisible);
-            this.Bind(ViewModel, vm => vm.IsSimpleDNSEnabled, v => v.gridBasicDNSSettings.IsEnabled).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.IsSimpleDNSEnabled, v => v.gridAdvancedDNSSettings.IsEnabled).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);
         });
     }
 

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -2,6 +2,7 @@
     x:Class="v2rayN.Desktop.Views.OptionSettingWindow"
     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"
@@ -501,13 +502,12 @@
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamily}" />
-                        <ComboBox
+                        <ctrls:AutoCompleteBox
                             x:Name="cmbcurrentFontFamily"
                             Grid.Row="15"
                             Grid.Column="1"
                             Width="300"
-                            Margin="{StaticResource Margin4}"
-                            IsEditable="True" />
+                            Margin="{StaticResource Margin4}" />
                         <TextBlock
                             Grid.Row="15"
                             Grid.Column="2"
@@ -548,13 +548,12 @@
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbSettingsSpeedTestUrl}" />
-                        <ComboBox
+                        <ctrls:AutoCompleteBox
                             Name="cmbSpeedTestUrl"
                             Grid.Row="18"
                             Grid.Column="1"
                             Width="300"
-                            Margin="{StaticResource Margin4}"
-                            IsEditable="True" />
+                            Margin="{StaticResource Margin4}" />
 
                         <TextBlock
                             Grid.Row="19"
@@ -562,13 +561,12 @@
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbSettingsSpeedPingTestUrl}" />
-                        <ComboBox
+                        <ctrls:AutoCompleteBox
                             x:Name="cmbSpeedPingTestUrl"
                             Grid.Row="19"
                             Grid.Column="1"
                             Width="300"
-                            Margin="{StaticResource Margin4}"
-                            IsEditable="True" />
+                            Margin="{StaticResource Margin4}" />
 
                         <TextBlock
                             Grid.Row="20"
@@ -589,13 +587,12 @@
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbSettingsSubConvert}" />
-                        <ComboBox
+                        <ctrls:AutoCompleteBox
                             x:Name="cmbSubConvertUrl"
                             Grid.Row="21"
                             Grid.Column="1"
                             Width="300"
-                            Margin="{StaticResource Margin4}"
-                            IsEditable="True" />
+                            Margin="{StaticResource Margin4}" />
 
                         <TextBlock
                             Grid.Row="22"
@@ -621,8 +618,7 @@
                             Grid.Row="23"
                             Grid.Column="1"
                             Width="300"
-                            Margin="{StaticResource Margin4}"
-                            IsEditable="True" />
+                            Margin="{StaticResource Margin4}" />
                         <TextBlock
                             Grid.Row="23"
                             Grid.Column="2"
@@ -642,8 +638,7 @@
                             Grid.Row="24"
                             Grid.Column="1"
                             Width="300"
-                            Margin="{StaticResource Margin4}"
-                            IsEditable="True" />
+                            Margin="{StaticResource Margin4}" />
                         <TextBlock
                             Grid.Row="24"
                             Grid.Column="2"
@@ -663,8 +658,7 @@
                             Grid.Row="25"
                             Grid.Column="1"
                             Width="300"
-                            Margin="{StaticResource Margin4}"
-                            IsEditable="True" />
+                            Margin="{StaticResource Margin4}" />
                         <TextBlock
                             Grid.Row="25"
                             Grid.Column="2"

v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml

@@ -2,6 +2,7 @@
     x:Class="v2rayN.Desktop.Views.RoutingRuleDetailsWindow"
     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"
@@ -46,26 +47,28 @@
                 Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Text="outboundTag" />
-            <ComboBox
+            <ctrls:AutoCompleteBox
                 Name="cmbOutboundTag"
                 Grid.Row="1"
                 Grid.Column="1"
                 Width="300"
                 Margin="{StaticResource Margin4}"
-                IsEditable="True" />
+                Text="{Binding SelectedSource.OutboundTag, Mode=TwoWay}" />
             <StackPanel
                 Grid.Row="1"
                 Grid.Column="2"
                 Margin="{StaticResource Margin4}"
+                Orientation="Horizontal"
                 HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                Orientation="Horizontal">
+                VerticalAlignment="Center">
                 <Button
                     x:Name="btnSelectProfile"
                     Margin="0,0,8,0"
-                    Click="BtnSelectProfile_Click"
-                    Content="{x:Static resx:ResUI.TbSelectProfile}" />
-                <TextBlock VerticalAlignment="Center" Text="{x:Static resx:ResUI.TbRuleOutboundTagTip}" />
+                    Content="{x:Static resx:ResUI.TbSelectProfile}"
+                    Click="BtnSelectProfile_Click" />
+                <TextBlock
+                    VerticalAlignment="Center"
+                    Text="{x:Static resx:ResUI.TbRuleOutboundTagTip}" />
             </StackPanel>
 
             <TextBlock

v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs

@@ -43,7 +43,6 @@ public partial class RoutingRuleDetailsWindow : WindowBase<RoutingRuleDetailsVie
 
         this.WhenActivated(disposables =>
         {
-            this.Bind(ViewModel, vm => vm.SelectedSource.OutboundTag, v => v.cmbOutboundTag.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.Remarks, v => v.txtRemarks.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.OutboundTag, v => v.cmbOutboundTag.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.Port, v => v.txtPort.Text).DisposeWith(disposables);

v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml

@@ -75,7 +75,6 @@
                     Width="{StaticResource IconButtonWidth}"
                     Height="{StaticResource IconButtonHeight}"
                     Margin="{StaticResource MarginLr8}"
-                    HorizontalAlignment="Left"
                     Theme="{DynamicResource BorderlessButton}">
                     <Button.Content>
                         <PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
@@ -209,8 +208,8 @@
                     Grid.Row="9"
                     Grid.Column="2"
                     Margin="{StaticResource Margin4}"
-                    Click="BtnSelectPrevProfile_Click"
-                    Content="{x:Static resx:ResUI.TbSelectProfile}" />
+                    Content="{x:Static resx:ResUI.TbSelectProfile}"
+                    Click="BtnSelectPrevProfile_Click" />
 
                 <TextBlock
                     Grid.Row="10"
@@ -229,8 +228,8 @@
                     Grid.Row="10"
                     Grid.Column="2"
                     Margin="{StaticResource Margin4}"
-                    Click="BtnSelectNextProfile_Click"
-                    Content="{x:Static resx:ResUI.TbSelectProfile}" />
+                    Content="{x:Static resx:ResUI.TbSelectProfile}"
+                    Click="BtnSelectNextProfile_Click" />
 
                 <TextBlock
                     Grid.Row="11"

v2rayN/v2rayN/Views/DNSSettingWindow.xaml

@@ -41,7 +41,7 @@
         <TabControl HorizontalContentAlignment="Left">
             <TabItem Header="{x:Static resx:ResUI.ThBasicDNSSettings}">
                 <ScrollViewer VerticalScrollBarVisibility="Visible">
-                    <Grid x:Name="gridBasicDNSSettings" Margin="{StaticResource Margin8}">
+                    <Grid Margin="{StaticResource Margin8}">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
@@ -131,7 +131,7 @@
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbSBBootstrapDNS}" />
+                            Text="{x:Static resx:ResUI.TbSBDoHResolverServer}" />
                         <ComboBox
                             x:Name="cmbSBFinalResolverDNS"
                             Grid.Row="4"
@@ -210,12 +210,19 @@
                             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 x:Name="gridAdvancedDNSSettings" Margin="{StaticResource Margin8}">
+                    <Grid Margin="{StaticResource Margin8}">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />

v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs

@@ -1,5 +1,4 @@
 using System.Reactive.Disposables;
-using System.Reactive.Linq;
 using System.Windows;
 using ReactiveUI;
 
@@ -66,16 +65,18 @@ public partial class DNSSettingWindow
             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.IsSimpleDNSEnabled)
-                .Select(b => b ? Visibility.Collapsed : Visibility.Visible)
+            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.IsSimpleDNSEnabled)
-                .Select(b => b ? Visibility.Collapsed : Visibility.Visible)
+            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);
-            this.Bind(ViewModel, vm => vm.IsSimpleDNSEnabled, v => v.gridBasicDNSSettings.IsEnabled).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.IsSimpleDNSEnabled, v => v.gridAdvancedDNSSettings.IsEnabled).DisposeWith(disposables);
         });
         WindowsUtils.SetDarkBorder(this, AppManager.Instance.Config.UiItem.CurrentTheme);
     }

v2rayN/v2rayN/Views/SubEditWindow.xaml

@@ -117,7 +117,7 @@
                 <materialDesign:PopupBox
                     Grid.Row="2"
                     Grid.Column="2"
-                    HorizontalAlignment="Left"
+                    HorizontalAlignment="Right"
                     StaysOpen="True"
                     Style="{StaticResource MaterialDesignToolForegroundPopupBox}">
                     <StackPanel>