up 7.14.1

https://github.com/2dust/v2rayN/issues/7734

.github/workflows/build-linux.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v5.0.0
       with:
         submodules: 'recursive'
         fetch-depth: '0'

.github/workflows/build-osx.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v5.0.0
       with:
         submodules: 'recursive'
         fetch-depth: '0'

.github/workflows/build-windows-desktop.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v5.0.0
       with:
         submodules: 'recursive'
         fetch-depth: '0'

.github/workflows/build-windows.yml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v5.0.0
 
     - name: Setup
       uses: actions/setup-dotnet@v4.3.1

.github/workflows/winget-publish.yml

@@ -22,10 +22,18 @@ jobs:
           $github = Invoke-RestMethod -uri "https://api.github.com/repos/2dust/v2rayN/releases" 
 
           $targetRelease = $github | Where-Object -Property prerelease -match 'False' | Select -First 1
-          $installerUrl  = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'v2rayN-windows-64\.zip*' | Select -ExpandProperty browser_download_url
+          
+          $x64InstallerUrl = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'v2rayN-windows-64\.zip' | Select -ExpandProperty browser_download_url
+          $arm64InstallerUrl = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'v2rayN-windows-arm64\.zip' | Select -ExpandProperty browser_download_url
           
           $ver = $targetRelease.tag_name
 
           # getting latest wingetcreate file
           iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
-          .\wingetcreate.exe update $wingetPackage -s -v $ver -u "$installerUrl|x64" -t $gitToken
+          
+          Write-Host "Updating with both x64 and arm64 installers"
+          Write-Host "Version: $ver"
+          Write-Host "x64 URL: $x64InstallerUrl"
+          Write-Host "arm64 URL: $arm64InstallerUrl"
+          
+          .\wingetcreate.exe update $wingetPackage -s -v $ver -u "$x64InstallerUrl|x64" "$arm64InstallerUrl|arm64" -t $gitToken

LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    Copyright (C) 2019-Present  2dust
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
+    v2rayN  Copyright (C) 2019-Present  2dust
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

README.md

@@ -1,16 +1,18 @@
 # v2rayN
-A GUI client for Windows, Linux and macOS, support [Xray](https://github.com/XTLS/Xray-core) and [sing-box](https://github.com/SagerNet/sing-box/releases) and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
 
+A GUI client for Windows, Linux and macOS, support [Xray](https://github.com/XTLS/Xray-core)
+and [sing-box](https://github.com/SagerNet/sing-box)
+and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
 
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/2dust/v2rayN)](https://github.com/2dust/v2rayN/commits/master)
 [![CodeFactor](https://www.codefactor.io/repository/github/2dust/v2rayn/badge)](https://www.codefactor.io/repository/github/2dust/v2rayn)
 [![GitHub Releases](https://img.shields.io/github/downloads/2dust/v2rayN/latest/total?logo=github)](https://github.com/2dust/v2rayN/releases)
 [![Chat on Telegram](https://img.shields.io/badge/Chat%20on-Telegram-brightgreen.svg)](https://t.me/v2rayn)
 
-
 ## How to use
 
 Read the [Wiki](https://github.com/2dust/v2rayN/wiki) for details.
 
 ## Telegram Channel
+
 [github_2dust](https://t.me/github_2dust)

v2rayN/AmazTool/Program.cs

@@ -5,21 +5,83 @@ internal static class Program
     [STAThread]
     private static void Main(string[] args)
     {
+        try
+        {
+            // If no arguments are provided, display usage guidelines and exit
             if (args.Length == 0)
             {
-            Console.WriteLine(Resx.Resource.Guidelines);
-            Thread.Sleep(5000);
+                ShowHelp();
                 return;
             }
 
-        var argData = Uri.UnescapeDataString(string.Join(" ", args));
-        if (argData.Equals("rebootas"))
+            // Log all arguments for debugging purposes
+            foreach (var arg in args)
             {
+                Console.WriteLine(arg);
+            }
+
+            // Parse command based on first argument
+            switch (args[0].ToLowerInvariant())
+            {
+                case "rebootas":
+                    // Handle application restart
+                    HandleRebootAsync();
+                    break;
+
+                case "help":
+                case "--help":
+                case "-h":
+                case "/?":
+                    // Display help information
+                    ShowHelp();
+                    break;
+
+                default:
+                    // Default behavior: handle as upgrade data
+                    // Maintain backward compatibility with existing usage pattern
+                    var argData = Uri.UnescapeDataString(string.Join(" ", args));
+                    HandleUpgrade(argData);
+                    break;
+            }
+        }
+        catch (Exception ex)
+        {
+            // Global exception handling
+            Console.WriteLine($"An error occurred: {ex.Message}");
+            Console.WriteLine("Press any key to exit...");
+            Console.ReadKey();
+        }
+    }
+
+    /// <summary>
+    /// Display help information and usage guidelines
+    /// </summary>
+    private static void ShowHelp()
+    {
+        Console.WriteLine(Resx.Resource.Guidelines);
+        Console.WriteLine("Available commands:");
+        Console.WriteLine("  rebootas             - Restart the application");
+        Console.WriteLine("  help                 - Display this help information");
+        Thread.Sleep(5000);
+    }
+
+    /// <summary>
+    /// Handle application restart
+    /// </summary>
+    private static void HandleRebootAsync()
+    {
+        Console.WriteLine("Restarting application...");
         Thread.Sleep(1000);
         Utils.StartV2RayN();
-            return;
     }
 
-        UpgradeApp.Upgrade(argData);
+    /// <summary>
+    /// Handle application upgrade with the provided data
+    /// </summary>
+    /// <param name="upgradeData">Data for the upgrade process</param>
+    private static void HandleUpgrade(string upgradeData)
+    {
+        Console.WriteLine("Upgrading application...");
+        UpgradeApp.Upgrade(upgradeData);
     }
 }

v2rayN/AmazTool/UpgradeApp.cs

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

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.11.0</Version>
+        <Version>7.14.1</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/Directory.Packages.props

@@ -5,24 +5,24 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.6" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.2.6" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.6" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.6" />
-    <PackageVersion Include="CliWrap" Version="3.8.2" />
-    <PackageVersion Include="Downloader" Version="3.3.4" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.3" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.3" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.3" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.3" />
+    <PackageVersion Include="CliWrap" Version="3.9.0" />
+    <PackageVersion Include="Downloader" Version="4.0.3" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
     <PackageVersion Include="MaterialDesignThemes" Version="5.2.1" />
     <PackageVersion Include="MessageBox.Avalonia" Version="3.2.0" />
     <PackageVersion Include="QRCoder" Version="1.6.0" />
-    <PackageVersion Include="ReactiveUI" Version="20.2.45" />
+    <PackageVersion Include="ReactiveUI" Version="20.4.1" />
     <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
-    <PackageVersion Include="ReactiveUI.WPF" Version="20.2.45" />
-    <PackageVersion Include="Semi.Avalonia" Version="11.2.1.6" />
-    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.6" />
-    <PackageVersion Include="Splat.NLog" Version="15.3.1" />
+    <PackageVersion Include="ReactiveUI.WPF" Version="20.4.1" />
+    <PackageVersion Include="Semi.Avalonia" Version="11.2.1.9" />
+    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.9" />
+    <PackageVersion Include="Splat.NLog" Version="15.4.1" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
-    <PackageVersion Include="TaskScheduler" Version="2.12.1" />
+    <PackageVersion Include="TaskScheduler" Version="2.12.2" />
     <PackageVersion Include="WebDav.Client" Version="2.9.0" />
     <PackageVersion Include="YamlDotNet" Version="16.3.0" />
     <PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />

v2rayN/ServiceLib/Common/AesUtils.cs

@@ -1,100 +0,0 @@
-using System.Security.Cryptography;
-using System.Text;
-
-namespace ServiceLib.Common;
-
-public class AesUtils
-{
-    private const int KeySize = 256; // AES-256
-    private const int IvSize = 16;   // AES block size
-    private const int Iterations = 10000;
-    private static readonly byte[] Salt = Encoding.ASCII.GetBytes("saltysalt".PadRight(16, ' ')); // google浏览器默认盐值
-    private static readonly string DefaultPassword = Utils.GetMd5(Utils.GetHomePath() + "AesUtils");
-
-    /// <summary>
-    /// Encrypt
-    /// </summary>
-    /// <param name="text">Plain text</param>
-    /// <param name="password">Password for key derivation or direct key in ASCII bytes</param>
-    /// <returns>Base64 encoded cipher text with IV</returns>
-    public static string Encrypt(string text, string? password = null)
-    {
-        if (string.IsNullOrEmpty(text))
-            return string.Empty;
-
-        var plaintext = Encoding.UTF8.GetBytes(text);
-        var key = GetKey(password);
-        var iv = GenerateIv();
-
-        using var aes = Aes.Create();
-        aes.Key = key;
-        aes.IV = iv;
-
-        using var ms = new MemoryStream();
-        ms.Write(iv, 0, iv.Length);
-
-        using (var cs = new CryptoStream(ms, aes.CreateEncryptor(), CryptoStreamMode.Write))
-        {
-            cs.Write(plaintext, 0, plaintext.Length);
-            cs.FlushFinalBlock();
-        }
-
-        var cipherTextWithIv = ms.ToArray();
-        return Convert.ToBase64String(cipherTextWithIv);
-    }
-
-    /// <summary>
-    /// Decrypt
-    /// </summary>
-    /// <param name="cipherTextWithIv">Base64 encoded cipher text with IV</param>
-    /// <param name="password">Password for key derivation or direct key in ASCII bytes</param>
-    /// <returns>Plain text</returns>
-    public static string Decrypt(string cipherTextWithIv, string? password = null)
-    {
-        if (string.IsNullOrEmpty(cipherTextWithIv))
-            return string.Empty;
-
-        var cipherTextWithIvBytes = Convert.FromBase64String(cipherTextWithIv);
-        var key = GetKey(password);
-
-        var iv = new byte[IvSize];
-        Buffer.BlockCopy(cipherTextWithIvBytes, 0, iv, 0, IvSize);
-
-        var cipherText = new byte[cipherTextWithIvBytes.Length - IvSize];
-        Buffer.BlockCopy(cipherTextWithIvBytes, IvSize, cipherText, 0, cipherText.Length);
-
-        using var aes = Aes.Create();
-        aes.Key = key;
-        aes.IV = iv;
-
-        using var ms = new MemoryStream();
-        using (var cs = new CryptoStream(ms, aes.CreateDecryptor(), CryptoStreamMode.Write))
-        {
-            cs.Write(cipherText, 0, cipherText.Length);
-            cs.FlushFinalBlock();
-        }
-
-        var plainText = ms.ToArray();
-        return Encoding.UTF8.GetString(plainText);
-    }
-
-    private static byte[] GetKey(string? password)
-    {
-        if (password.IsNullOrEmpty())
-        {
-            password = DefaultPassword;
-        }
-
-        using var pbkdf2 = new Rfc2898DeriveBytes(password, Salt, Iterations, HashAlgorithmName.SHA256);
-        return pbkdf2.GetBytes(KeySize / 8);
-    }
-
-    private static byte[] GenerateIv()
-    {
-        var randomNumber = new byte[IvSize];
-
-        using var rng = RandomNumberGenerator.Create();
-        rng.GetBytes(randomNumber);
-        return randomNumber;
-    }
-}

v2rayN/ServiceLib/Common/DesUtils.cs

@@ -1,74 +0,0 @@
-using System.Security.Cryptography;
-using System.Text;
-
-namespace ServiceLib.Common;
-
-public class DesUtils
-{
-    /// <summary>
-    /// Encrypt
-    /// </summary>
-    /// <param name="text"></param>
-    /// /// <param name="key"></param>
-    /// <returns></returns>
-    public static string Encrypt(string? text, string? key = null)
-    {
-        if (text.IsNullOrEmpty())
-        {
-            return string.Empty;
-        }
-        GetKeyIv(key ?? GetDefaultKey(), out var rgbKey, out var rgbIv);
-        var dsp = DES.Create();
-        using var memStream = new MemoryStream();
-        using var cryStream = new CryptoStream(memStream, dsp.CreateEncryptor(rgbKey, rgbIv), CryptoStreamMode.Write);
-        using var sWriter = new StreamWriter(cryStream);
-        sWriter.Write(text);
-        sWriter.Flush();
-        cryStream.FlushFinalBlock();
-        memStream.Flush();
-        return Convert.ToBase64String(memStream.GetBuffer(), 0, (int)memStream.Length);
-    }
-
-    /// <summary>
-    /// Decrypt
-    /// </summary>
-    /// <param name="encryptText"></param>
-    /// <param name="key"></param>
-    /// <returns></returns>
-    public static string Decrypt(string? encryptText, string? key = null)
-    {
-        if (encryptText.IsNullOrEmpty())
-        {
-            return string.Empty;
-        }
-        GetKeyIv(key ?? GetDefaultKey(), out var rgbKey, out var rgbIv);
-        var dsp = DES.Create();
-        var buffer = Convert.FromBase64String(encryptText);
-
-        using var memStream = new MemoryStream();
-        using var cryStream = new CryptoStream(memStream, dsp.CreateDecryptor(rgbKey, rgbIv), CryptoStreamMode.Write);
-        cryStream.Write(buffer, 0, buffer.Length);
-        cryStream.FlushFinalBlock();
-        return Encoding.UTF8.GetString(memStream.ToArray());
-    }
-
-    private static void GetKeyIv(string key, out byte[] rgbKey, out byte[] rgbIv)
-    {
-        if (key.IsNullOrEmpty())
-        {
-            throw new ArgumentNullException("The key cannot be null");
-        }
-        if (key.Length <= 8)
-        {
-            throw new ArgumentNullException("The key length cannot be less than 8 characters.");
-        }
-
-        rgbKey = Encoding.ASCII.GetBytes(key.Substring(0, 8));
-        rgbIv = Encoding.ASCII.GetBytes(key.Insert(0, "w").Substring(0, 8));
-    }
-
-    private static string GetDefaultKey()
-    {
-        return Utils.GetMd5(Utils.GetHomePath() + "DesUtils");
-    }
-}

v2rayN/ServiceLib/Common/DownloaderHelper.cs

@@ -26,7 +26,7 @@ public class DownloaderHelper
         var downloadOpt = new DownloadConfiguration()
         {
             Timeout = timeout * 1000,
-            MaxTryAgainOnFailover = 2,
+            MaxTryAgainOnFailure = 2,
             RequestConfiguration =
                 {
                     Headers = headers,
@@ -64,7 +64,7 @@ public class DownloaderHelper
         var downloadOpt = new DownloadConfiguration()
         {
             Timeout = timeout * 1000,
-            MaxTryAgainOnFailover = 2,
+            MaxTryAgainOnFailure = 2,
             RequestConfiguration =
                 {
                     Timeout= timeout * 1000,
@@ -135,7 +135,7 @@ public class DownloaderHelper
         var downloadOpt = new DownloadConfiguration()
         {
             Timeout = timeout * 1000,
-            MaxTryAgainOnFailover = 2,
+            MaxTryAgainOnFailure = 2,
             RequestConfiguration =
                 {
                     Timeout= timeout * 1000,

v2rayN/ServiceLib/Common/Extension.cs

@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 
 namespace ServiceLib.Common;
 
-public static class StringEx
+public static class Extension
 {
     public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value)
     {
@@ -79,4 +79,9 @@ public static class StringEx
     {
         return int.TryParse(value, out var result) ? result : defaultValue;
     }
+
+    public static List<string> AppendEmpty(this IEnumerable<string> source)
+    {
+        return source.Concat(new[] { string.Empty }).ToList();
+    }
 }

v2rayN/ServiceLib/Common/FileManager.cs

@@ -223,4 +223,28 @@ public static class FileManager
             // ignored
         }
     }
+
+    /// <summary>
+    /// Creates a Linux shell file with the specified contents.
+    /// </summary>
+    /// <param name="fileName"></param>
+    /// <param name="contents"></param>
+    /// <param name="overwrite"></param>
+    /// <returns></returns>
+    public static async Task<string> CreateLinuxShellFile(string fileName, string contents, bool overwrite)
+    {
+        var shFilePath = Utils.GetBinConfigPath(fileName);
+
+        // Check if the file already exists and if we should overwrite it
+        if (!overwrite && File.Exists(shFilePath))
+        {
+            return shFilePath;
+        }
+
+        File.Delete(shFilePath);
+        await File.WriteAllTextAsync(shFilePath, contents);
+        await Utils.SetLinuxChmod(shFilePath);
+
+        return shFilePath;
+    }
 }

v2rayN/ServiceLib/Common/JsonUtils.cs

@@ -1,3 +1,4 @@
+using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
@@ -86,7 +87,8 @@ public class JsonUtils
             var options = new JsonSerializerOptions
             {
                 WriteIndented = indented,
-                DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull
+                DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull,
+                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
             };
             result = JsonSerializer.Serialize(obj, options);
         }
@@ -126,5 +128,8 @@ public class JsonUtils
     /// </summary>
     /// <param name="obj"></param>
     /// <returns></returns>
-    public static JsonNode? SerializeToNode(object? obj) => JsonSerializer.SerializeToNode(obj);
+    public static JsonNode? SerializeToNode(object? obj, JsonSerializerOptions? options = null)
+    {
+        return JsonSerializer.SerializeToNode(obj, options);
+    }
 }

v2rayN/ServiceLib/Common/Utils.cs

@@ -323,6 +323,14 @@ public class Utils
         return text.Replace("，", ",").Replace(Environment.NewLine, ",");
     }
 
+    public static List<string> GetEnumNames<TEnum>() where TEnum : Enum
+    {
+        return Enum.GetValues(typeof(TEnum))
+            .Cast<TEnum>()
+            .Select(e => e.ToString())
+            .ToList();
+    }
+
     #endregion 转换函数
 
     #region 数据检查
@@ -382,7 +390,14 @@ public class Utils
     {
         if (IPAddress.TryParse(ip, out var address))
         {
+            // Loopback address check (127.0.0.1 for IPv4, ::1 for IPv6)
+            if (IPAddress.IsLoopback(address))
+                return true;
+
             var ipBytes = address.GetAddressBytes();
+            if (address.AddressFamily == AddressFamily.InterNetwork)
+            {
+                // IPv4 private address check
                 if (ipBytes[0] == 10)
                     return true;
                 if (ipBytes[0] == 172 && ipBytes[1] >= 16 && ipBytes[1] <= 31)
@@ -390,6 +405,30 @@ public class Utils
                 if (ipBytes[0] == 192 && ipBytes[1] == 168)
                     return true;
             }
+            else if (address.AddressFamily == AddressFamily.InterNetworkV6)
+            {
+                // IPv6 private address check
+                // Link-local address fe80::/10
+                if (ipBytes[0] == 0xfe && (ipBytes[1] & 0xc0) == 0x80)
+                    return true;
+
+                // Unique local address fc00::/7 (typically fd00::/8)
+                if ((ipBytes[0] & 0xfe) == 0xfc)
+                    return true;
+
+                // Private portion in IPv4-mapped addresses ::ffff:0:0/96
+                if (address.IsIPv4MappedToIPv6)
+                {
+                    var ipv4Bytes = ipBytes.Skip(12).ToArray();
+                    if (ipv4Bytes[0] == 10)
+                        return true;
+                    if (ipv4Bytes[0] == 172 && ipv4Bytes[1] >= 16 && ipv4Bytes[1] <= 31)
+                        return true;
+                    if (ipv4Bytes[0] == 192 && ipv4Bytes[1] == 168)
+                        return true;
+                }
+            }
+        }
 
         return false;
     }
@@ -427,11 +466,11 @@ public class Utils
         return false;
     }
 
-    public static int GetFreePort(int defaultPort = 9090)
+    public static int GetFreePort(int defaultPort = 0)
     {
         try
         {
-            if (!Utils.PortInUse(defaultPort))
+            if (!(defaultPort == 0 || Utils.PortInUse(defaultPort)))
             {
                 return defaultPort;
             }
@@ -582,7 +621,7 @@ public class Utils
             var result = await cmd.ExecuteBufferedAsync();
             if (result.IsSuccess)
             {
-                return result.StandardOutput.ToString();
+                return result.StandardOutput ?? "";
             }
 
             Logging.SaveLog(result.ToString() ?? "");
@@ -816,18 +855,6 @@ public class Utils
             return new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator);
         }
         return false;
-        //else
-        //{
-        //    var id = GetLinuxUserId().Result ?? "1000";
-        //    if (int.TryParse(id, out var userId))
-        //    {
-        //        return userId == 0;
-        //    }
-        //    else
-        //    {
-        //        return false;
-        //    }
-        //}
     }
 
     private static async Task<string?> GetLinuxUserId()
@@ -839,14 +866,46 @@ public class Utils
     public static async Task<string?> SetLinuxChmod(string? fileName)
     {
         if (fileName.IsNullOrEmpty())
+        {
             return null;
+        }
+        if (SetUnixFileMode(fileName))
+        {
+            Logging.SaveLog($"Successfully set the file execution permission, {fileName}");
+            return "";
+        }
+
         if (fileName.Contains(' '))
+        {
             fileName = fileName.AppendQuotes();
-        //File.SetUnixFileMode(fileName, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute);
+        }
         var arg = new List<string>() { "-c", $"chmod +x {fileName}" };
         return await GetCliWrapOutput(Global.LinuxBash, arg);
     }
 
+    public static bool SetUnixFileMode(string? fileName)
+    {
+        try
+        {
+            if (fileName.IsNullOrEmpty())
+            {
+                return false;
+            }
+
+            if (File.Exists(fileName))
+            {
+                var currentMode = File.GetUnixFileMode(fileName);
+                File.SetUnixFileMode(fileName, currentMode | UnixFileMode.UserExecute | UnixFileMode.GroupExecute | UnixFileMode.OtherExecute);
+                return true;
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog("SetUnixFileMode", ex);
+        }
+        return false;
+    }
+
     public static async Task<string?> GetLinuxFontFamily(string lang)
     {
         // var arg = new List<string>() { "-c", $"fc-list :lang={lang} family" };

v2rayN/ServiceLib/Common/YamlUtils.cs

@@ -11,7 +11,7 @@ public class YamlUtils
     #region YAML
 
     /// <summary>
-    /// 反序列化成对象
+    /// Deserialize
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="str"></param>
@@ -34,7 +34,7 @@ public class YamlUtils
     }
 
     /// <summary>
-    /// 序列化
+    /// Serialize
     /// </summary>
     /// <param name="obj"></param>
     /// <returns></returns>

v2rayN/ServiceLib/Enums/EConfigType.cs

@@ -11,5 +11,6 @@ public enum EConfigType
     Hysteria2 = 7,
     TUIC = 8,
     WireGuard = 9,
-    HTTP = 10
+    HTTP = 10,
+    Anytls = 11
 }

v2rayN/ServiceLib/Enums/ECoreType.cs

@@ -14,5 +14,6 @@ public enum ECoreType
     hysteria2 = 26,
     brook = 27,
     overtls = 28,
+    shadowquic = 29,
     v2rayN = 99
 }

v2rayN/ServiceLib/Enums/EViewAction.cs

@@ -20,6 +20,7 @@ public enum EViewAction
     BrowseServer,
     ImportRulesFromFile,
     InitSettingFont,
+    PasswordInput,
     SubEditWindow,
     RoutingRuleSettingWindow,
     RoutingRuleDetailsWindow,
@@ -28,6 +29,7 @@ public enum EViewAction
     DNSSettingWindow,
     RoutingSettingWindow,
     OptionSettingWindow,
+    FullConfigTemplateWindow,
     GlobalHotkeySettingWindow,
     SubSettingWindow,
     DispatcherSpeedTest,

v2rayN/ServiceLib/Global.cs

@@ -8,9 +8,7 @@ public class Global
     public const string GithubUrl = "https://github.com";
     public const string GithubApiUrl = "https://api.github.com/repos";
     public const string GeoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/{0}.dat";
-    public const string SpeedPingTestUrl = @"https://www.google.com/generate_204";
     public const string SingboxRulesetUrl = @"https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-{0}/{1}.srs";
-    public const string IPAPIUrl = "https://api.ip.sb/geoip";
 
     public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
     public const string ConfigFileName = "guiNConfig.json";
@@ -40,6 +38,8 @@ public class Global
     public const string PacFileName = NamespaceSample + "pac";
     public const string ProxySetOSXShellFileName = NamespaceSample + "proxy_set_osx_sh";
     public const string ProxySetLinuxShellFileName = NamespaceSample + "proxy_set_linux_sh";
+    public const string KillAsSudoOSXShellFileName = NamespaceSample + "kill_as_sudo_osx_sh";
+    public const string KillAsSudoLinuxShellFileName = NamespaceSample + "kill_as_sudo_linux_sh";
 
     public const string DefaultSecurity = "auto";
     public const string DefaultNetwork = "tcp";
@@ -48,6 +48,7 @@ public class Global
     public const string ProxyTag = "proxy";
     public const string DirectTag = "direct";
     public const string BlockTag = "block";
+    public const string DnsTag = "dns-module";
     public const string StreamSecurity = "tls";
     public const string StreamSecurityReality = "reality";
     public const string Loopback = "127.0.0.1";
@@ -56,6 +57,9 @@ public class Global
     public const string HttpsProtocol = "https://";
     public const string SocksProtocol = "socks://";
     public const string Socks5Protocol = "socks5://";
+    public const string AsIs = "AsIs";
+    public const string IPIfNonMatch = "IPIfNonMatch";
+    public const string IPOnDemand = "IPOnDemand";
 
     public const string UserEMail = "t@t.tt";
     public const string AutoRunRegPath = @"Software\Microsoft\Windows\CurrentVersion\Run";
@@ -76,6 +80,13 @@ public class Global
     public const int SpeedTestPageSize = 1000;
     public const string LinuxBash = "/bin/bash";
 
+    public const string SingboxDirectDNSTag = "direct_dns";
+    public const string SingboxRemoteDNSTag = "remote_dns";
+    public const string SingboxOutboundResolverTag = "outbound_resolver";
+    public const string SingboxFinalResolverTag = "final_resolver";
+    public const string SingboxHostsDNSTag = "hosts_dns";
+    public const string SingboxFakeDNSTag = "fake_dns";
+
     public static readonly List<string> IEProxyProtocols =
     [
         "{ip}:{http_port}",
@@ -125,28 +136,28 @@ public class Global
     [
         "",
             @"https://github.com/runetfreedom/russia-v2ray-rules-dat/releases/latest/download/{0}.dat",
-            @"https://cdn.jsdelivr.net/gh/chocolate4u/Iran-v2ray-rules@release/{0}.dat"
+            @"https://github.com/Chocolate4U/Iran-v2ray-rules/releases/latest/download/{0}.dat"
     ];
 
     public static readonly List<string> SingboxRulesetSources =
-    [
+[
     "",
-            @"https://cdn.jsdelivr.net/gh/runetfreedom/russia-v2ray-rules-dat@release/sing-box/rule-set-{0}/{1}.srs",
-            @"https://cdn.jsdelivr.net/gh/chocolate4u/Iran-sing-box-rules@rule-set/{1}.srs"
-    ];
+    @"https://raw.githubusercontent.com/runetfreedom/russia-v2ray-rules-dat/release/sing-box/rule-set-{0}/{1}.srs",
+    @"https://raw.githubusercontent.com/chocolate4u/Iran-sing-box-rules/rule-set/{1}.srs"
+];
 
     public static readonly List<string> RoutingRulesSources =
     [
         "",
-            @"https://cdn.jsdelivr.net/gh/runetfreedom/russia-v2ray-custom-routing-list@main/v2rayN/template.json",
-            @"https://cdn.jsdelivr.net/gh/Chocolate4U/Iran-v2ray-rules@main/v2rayN/template.json"
+    @"https://raw.githubusercontent.com/runetfreedom/russia-v2ray-custom-routing-list/main/v2rayN/template.json",
+    @"https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/main/v2rayN/template.json"
     ];
 
     public static readonly List<string> DNSTemplateSources =
     [
         "",
-            @"https://cdn.jsdelivr.net/gh/runetfreedom/russia-v2ray-custom-routing-list@main/v2rayN/",
-            @"https://cdn.jsdelivr.net/gh/Chocolate4U/Iran-v2ray-rules@main/v2rayN/"
+    @"https://raw.githubusercontent.com/runetfreedom/russia-v2ray-custom-routing-list/main/v2rayN/",
+    @"https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/main/v2rayN/"
     ];
 
     public static readonly Dictionary<string, string> UserAgentTexts = new()
@@ -169,7 +180,8 @@ public class Global
             { EConfigType.Trojan, "trojan://" },
             { EConfigType.Hysteria2, "hysteria2://" },
             { EConfigType.TUIC, "tuic://" },
-            { EConfigType.WireGuard, "wireguard://" }
+            { EConfigType.WireGuard, "wireguard://" },
+            { EConfigType.Anytls, "anytls://" }
         };
 
     public static readonly Dictionary<EConfigType, string> ProtocolTypes = new()
@@ -182,7 +194,8 @@ public class Global
             { EConfigType.Trojan, "trojan" },
             { EConfigType.Hysteria2, "hysteria2" },
             { EConfigType.TUIC, "tuic" },
-            { EConfigType.WireGuard, "wireguard" }
+            { EConfigType.WireGuard, "wireguard" },
+            { EConfigType.Anytls, "anytls" }
         };
 
     public static readonly List<string> VmessSecurities =
@@ -278,9 +291,9 @@ public class Global
 
     public static readonly List<string> DomainStrategies =
     [
-        "AsIs",
-            "IPIfNonMatch",
-            "IPOnDemand"
+        AsIs,
+        IPIfNonMatch,
+        IPOnDemand
     ];
 
     public static readonly List<string> DomainStrategies4Singbox =
@@ -292,13 +305,6 @@ public class Global
             ""
     ];
 
-    public static readonly List<string> DomainMatchers =
-    [
-        "linear",
-            "mph",
-            ""
-    ];
-
     public static readonly List<string> Fingerprints =
     [
         "chrome",
@@ -349,25 +355,42 @@ public class Global
 
     public static readonly List<string> SingboxDomainStrategy4Out =
     [
+        "",
             "ipv4_only",
             "prefer_ipv4",
             "prefer_ipv6",
-            "ipv6_only",
-            ""
+            "ipv6_only"
     ];
 
-    public static readonly List<string> DomainDNSAddress =
+    public static readonly List<string> DomainDirectDNSAddress =
     [
+        "https://dns.alidns.com/dns-query",
+            "https://doh.pub/dns-query",
             "223.5.5.5",
-            "223.6.6.6",
+            "119.29.29.29",
             "localhost"
     ];
 
-    public static readonly List<string> SingboxDomainDNSAddress =
+    public static readonly List<string> DomainRemoteDNSAddress =
+    [
+        "https://cloudflare-dns.com/dns-query",
+            "https://dns.cloudflare.com/dns-query",
+            "https://dns.google/dns-query",
+            "https://doh.dns.sb/dns-query",
+            "https://doh.opendns.com/dns-query",
+            "https://common.dot.dns.yandex.net",
+            "8.8.8.8",
+            "1.1.1.1",
+            "185.222.222.222",
+            "208.67.222.222",
+            "77.88.8.8"
+    ];
+
+    public static readonly List<string> DomainPureIPDNSAddress =
     [
         "223.5.5.5",
-            "223.6.6.6",
-            "dhcp://auto"
+            "119.29.29.29",
+            "localhost"
     ];
 
     public static readonly List<string> Languages =
@@ -436,7 +459,9 @@ public class Global
         1280,
         1408,
         1500,
-            9000
+        4064,
+        9000,
+        65535
     ];
 
     public static readonly List<string> TunStacks =
@@ -509,6 +534,7 @@ public class Global
             { ECoreType.juicity, "juicity/juicity" },
             { ECoreType.brook, "txthinking/brook" },
             { ECoreType.overtls, "ShadowsocksR-Live/overtls" },
+            { ECoreType.shadowquic, "spongebob888/shadowquic" },
             { ECoreType.v2rayN, "2dust/v2rayN" },
         };
 
@@ -519,5 +545,47 @@ public class Global
             @"https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.metadb"
     ];
 
+    public static readonly List<string> IPAPIUrls =
+    [
+        @"https://speed.cloudflare.com/meta",
+        @"https://api.ip.sb/geoip",
+        @"https://api-ipv4.ip.sb/geoip",
+        @"https://api-ipv6.ip.sb/geoip",
+        @"https://api.ipapi.is",
+        @""
+    ];
+
+    public static readonly List<string> OutboundTags =
+    [
+        ProxyTag,
+        DirectTag,
+        BlockTag
+    ];
+
+    public static readonly Dictionary<string, List<string>> PredefinedHosts = new()
+        {
+            { "dns.google", new List<string> { "8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844" } },
+            { "dns.alidns.com", new List<string> { "223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1" } },
+            { "one.one.one.one", new List<string> { "1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001" } },
+            { "1dot1dot1dot1.cloudflare-dns.com", new List<string> { "1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001" } },
+            { "cloudflare-dns.com", new List<string> { "104.16.249.249", "104.16.248.249", "2606:4700::6810:f8f9", "2606:4700::6810:f9f9" } },
+            { "dns.cloudflare.com", new List<string> { "104.16.132.229", "104.16.133.229", "2606:4700::6810:84e5", "2606:4700::6810:85e5" } },
+            { "dot.pub", new List<string> { "1.12.12.12", "120.53.53.53" } },
+            { "dns.quad9.net", new List<string> { "9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9" } },
+            { "dns.yandex.net", new List<string> { "77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff" } },
+            { "dns.sb", new List<string> { "185.222.222.222", "2a09::" } },
+            { "dns.umbrella.com", new List<string> { "208.67.220.220", "208.67.222.222", "2620:119:35::35", "2620:119:53::53" } },
+            { "dns.sse.cisco.com", new List<string> { "208.67.220.220", "208.67.222.222", "2620:119:35::35", "2620:119:53::53" } },
+            { "engage.cloudflareclient.com", new List<string> { "162.159.192.1", "2606:4700:d0::a29f:c001" } }
+        };
+
+    public static readonly List<string> ExpectedIPs =
+    [
+        "geoip:cn",
+            "geoip:ir",
+            "geoip:ru",
+            ""
+    ];
+
     #endregion const
 }

v2rayN/ServiceLib/Handler/AppHandler.cs

@@ -9,7 +9,6 @@ public sealed class AppHandler
     private int? _statePort;
     private int? _statePort2;
     private Job? _processJob;
-    private bool? _isAdministrator;
     public static AppHandler Instance => _instance.Value;
     public Config Config => _config;
 
@@ -31,14 +30,7 @@ public sealed class AppHandler
         }
     }
 
-    public bool IsAdministrator
-    {
-        get
-        {
-            _isAdministrator ??= Utils.IsAdministrator();
-            return _isAdministrator.Value;
-        }
-    }
+    public string LinuxSudoPwd { get; set; }
 
     #endregion Property
 
@@ -72,6 +64,7 @@ public sealed class AppHandler
         SQLiteHelper.Instance.CreateTable<RoutingItem>();
         SQLiteHelper.Instance.CreateTable<ProfileExItem>();
         SQLiteHelper.Instance.CreateTable<DNSItem>();
+        SQLiteHelper.Instance.CreateTable<FullConfigTemplateItem>();
         return true;
     }
 
@@ -211,6 +204,16 @@ public sealed class AppHandler
         return await SQLiteHelper.Instance.TableAsync<DNSItem>().FirstOrDefaultAsync(it => it.CoreType == eCoreType);
     }
 
+    public async Task<List<FullConfigTemplateItem>?> FullConfigTemplateItem()
+    {
+        return await SQLiteHelper.Instance.TableAsync<FullConfigTemplateItem>().ToListAsync();
+    }
+
+    public async Task<FullConfigTemplateItem?> GetFullConfigTemplateItem(ECoreType eCoreType)
+    {
+        return await SQLiteHelper.Instance.TableAsync<FullConfigTemplateItem>().FirstOrDefaultAsync(it => it.CoreType == eCoreType);
+    }
+
     #endregion SqliteHelper
 
     #region Core Type

v2rayN/ServiceLib/Handler/ConnectionHandler.cs

@@ -0,0 +1,42 @@
+namespace ServiceLib.Handler;
+
+public class ConnectionHandler
+{
+    private static readonly Lazy<ConnectionHandler> _instance = new(() => new());
+    public static ConnectionHandler Instance => _instance.Value;
+
+    public async Task<string> RunAvailabilityCheck()
+    {
+        var downloadHandle = new DownloadService();
+        var time = await downloadHandle.RunAvailabilityCheck(null);
+        var ip = time > 0 ? await GetIPInfo(downloadHandle) ?? Global.None : Global.None;
+
+        return string.Format(ResUI.TestMeOutput, time, ip);
+    }
+
+    private async Task<string?> GetIPInfo(DownloadService downloadHandle)
+    {
+        var url = AppHandler.Instance.Config.SpeedTestItem.IPAPIUrl;
+        if (url.IsNullOrEmpty())
+        {
+            return null;
+        }
+
+        var result = await downloadHandle.TryDownloadString(url, true, "");
+        if (result == null)
+        {
+            return null;
+        }
+
+        var ipInfo = JsonUtils.Deserialize<IPAPIInfo>(result);
+        if (ipInfo == null)
+        {
+            return null;
+        }
+
+        var ip = ipInfo.ip ?? ipInfo.clientIp ?? ipInfo.ip_addr ?? ipInfo.query;
+        var country = ipInfo.country_code ?? ipInfo.country ?? ipInfo.countryCode ?? ipInfo.location?.country_code;
+
+        return $"({country ?? "unknown"}) {ip}";
+    }
+}

v2rayN/ServiceLib/Handler/CoreAdminHandler.cs

@@ -0,0 +1,118 @@
+using System.Diagnostics;
+using System.Text;
+using CliWrap;
+using CliWrap.Buffered;
+
+namespace ServiceLib.Handler;
+
+public class CoreAdminHandler
+{
+    private static readonly Lazy<CoreAdminHandler> _instance = new(() => new());
+    public static CoreAdminHandler Instance => _instance.Value;
+    private Config _config;
+    private Action<bool, string>? _updateFunc;
+    private int _linuxSudoPid = -1;
+    private const string _tag = "CoreAdminHandler";
+
+    public async Task Init(Config config, Action<bool, string> updateFunc)
+    {
+        if (_config != null)
+        {
+            return;
+        }
+        _config = config;
+        _updateFunc = updateFunc;
+
+        await Task.CompletedTask;
+    }
+
+    private void UpdateFunc(bool notify, string msg)
+    {
+        _updateFunc?.Invoke(notify, msg);
+    }
+
+    public async Task<Process?> RunProcessAsLinuxSudo(string fileName, CoreInfo coreInfo, string configPath)
+    {
+        StringBuilder sb = new();
+        sb.AppendLine("#!/bin/bash");
+        var cmdLine = $"{fileName.AppendQuotes()} {string.Format(coreInfo.Arguments, Utils.GetBinConfigPath(configPath).AppendQuotes())}";
+        sb.AppendLine($"sudo -S {cmdLine}");
+        var shFilePath = await FileManager.CreateLinuxShellFile("run_as_sudo.sh", sb.ToString(), true);
+
+        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,
+            }
+        };
+
+        void dataHandler(object sender, DataReceivedEventArgs e)
+        {
+            if (e.Data.IsNotEmpty())
+            {
+                UpdateFunc(false, e.Data + Environment.NewLine);
+            }
+        }
+
+        proc.OutputDataReceived += dataHandler;
+        proc.ErrorDataReceived += dataHandler;
+
+        proc.Start();
+        proc.BeginOutputReadLine();
+        proc.BeginErrorReadLine();
+
+        await Task.Delay(10);
+        await proc.StandardInput.WriteLineAsync(AppHandler.Instance.LinuxSudoPwd);
+
+        await Task.Delay(100);
+        if (proc is null or { HasExited: true })
+        {
+            throw new Exception(ResUI.FailedToRunCore);
+        }
+
+        _linuxSudoPid = proc.Id;
+
+        return proc;
+    }
+
+    public async Task KillProcessAsLinuxSudo()
+    {
+        if (_linuxSudoPid < 0)
+        {
+            return;
+        }
+
+        try
+        {
+            var shellFileName = Utils.IsOSX() ? Global.KillAsSudoOSXShellFileName : Global.KillAsSudoLinuxShellFileName;
+            var shFilePath = await FileManager.CreateLinuxShellFile("kill_as_sudo.sh", EmbedUtils.GetEmbedText(shellFileName), true);
+            if (shFilePath.Contains(' '))
+            {
+                shFilePath = shFilePath.AppendQuotes();
+            }
+            var arg = new List<string>() { "-c", $"sudo -S {shFilePath} {_linuxSudoPid}" };
+            var result = await Cli.Wrap(Global.LinuxBash)
+                .WithArguments(arg)
+                .WithStandardInputPipe(PipeSource.FromString(AppHandler.Instance.LinuxSudoPwd))
+                .ExecuteBufferedAsync();
+
+            UpdateFunc(false, result.StandardOutput.ToString());
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+
+        _linuxSudoPid = -1;
+    }
+}

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -13,7 +13,7 @@ public class CoreHandler
     private Config _config;
     private Process? _process;
     private Process? _processPre;
-    private int _linuxSudoPid = -1;
+    private bool _linuxSudo = false;
     private Action<bool, string>? _updateFunc;
     private const string _tag = "CoreHandler";
 
@@ -101,7 +101,7 @@ public class CoreHandler
 
     public async Task<int> LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
     {
-        var coreType = selecteds.Exists(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard) ? ECoreType.sing_box : ECoreType.Xray;
+        var coreType = selecteds.Exists(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls) ? ECoreType.sing_box : ECoreType.Xray;
         var fileName = string.Format(Global.CoreSpeedtestConfigFileName, Utils.GetGuid(false));
         var configPath = Utils.GetBinConfigPath(fileName);
         var result = await CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType);
@@ -155,23 +155,23 @@ public class CoreHandler
     {
         try
         {
+            if (_linuxSudo)
+            {
+                await CoreAdminHandler.Instance.KillProcessAsLinuxSudo();
+                _linuxSudo = false;
+            }
+
             if (_process != null)
             {
-                await ProcUtils.ProcessKill(_process, true);
+                await ProcUtils.ProcessKill(_process, Utils.IsWindows());
                 _process = null;
             }
 
             if (_processPre != null)
             {
-                await ProcUtils.ProcessKill(_processPre, true);
+                await ProcUtils.ProcessKill(_processPre, Utils.IsWindows());
                 _processPre = null;
             }
-
-            if (_linuxSudoPid > 0)
-            {
-                await KillProcessAsLinuxSudo();
-            }
-            _linuxSudoPid = -1;
         }
         catch (Exception ex)
         {
@@ -225,15 +225,6 @@ public class CoreHandler
         _updateFunc?.Invoke(notify, msg);
     }
 
-    private bool IsNeedSudo(ECoreType eCoreType)
-    {
-        return _config.TunModeItem.EnableTun
-               && eCoreType == ECoreType.sing_box
-               && (Utils.IsNonWindows())
-            //&& _config.TunModeItem.LinuxSudoPwd.IsNotEmpty()
-            ;
-    }
-
     #endregion Private
 
     #region Process
@@ -248,6 +239,28 @@ public class CoreHandler
         }
 
         try
+        {
+            if (mayNeedSudo
+                && _config.TunModeItem.EnableTun
+                && coreInfo.CoreType == ECoreType.sing_box
+                && Utils.IsNonWindows())
+            {
+                _linuxSudo = true;
+                await CoreAdminHandler.Instance.Init(_config, _updateFunc);
+                return await CoreAdminHandler.Instance.RunProcessAsLinuxSudo(fileName, coreInfo, configPath);
+            }
+
+            return await RunProcessNormal(fileName, coreInfo, configPath, displayLog);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            UpdateFunc(mayNeedSudo, ex.Message);
+            return null;
+        }
+    }
+
+    private async Task<Process?> RunProcessNormal(string fileName, CoreInfo? coreInfo, string configPath, bool displayLog)
     {
         Process proc = new()
         {
@@ -265,47 +278,27 @@ public class CoreHandler
             }
         };
 
-            var isNeedSudo = mayNeedSudo && IsNeedSudo(coreInfo.CoreType);
-            if (isNeedSudo)
-            {
-                await RunProcessAsLinuxSudo(proc, fileName, coreInfo, configPath);
-            }
-
         if (displayLog)
         {
-                proc.OutputDataReceived += (sender, e) =>
+            void dataHandler(object sender, DataReceivedEventArgs e)
             {
-                    if (e.Data.IsNullOrEmpty())
-                        return;
-                    UpdateFunc(false, e.Data + Environment.NewLine);
-                };
-                proc.ErrorDataReceived += (sender, e) =>
+                if (e.Data.IsNotEmpty())
                 {
-                    if (e.Data.IsNullOrEmpty())
-                        return;
                     UpdateFunc(false, e.Data + Environment.NewLine);
-                };
+                }
+            }
+            proc.OutputDataReceived += dataHandler;
+            proc.ErrorDataReceived += dataHandler;
         }
         proc.Start();
 
-            if (isNeedSudo && _config.TunModeItem.LinuxSudoPwd.IsNotEmpty())
-            {
-                var pwd = DesUtils.Decrypt(_config.TunModeItem.LinuxSudoPwd);
-                await Task.Delay(10);
-                await proc.StandardInput.WriteLineAsync(pwd);
-                await Task.Delay(10);
-                await proc.StandardInput.WriteLineAsync(pwd);
-            }
-            if (isNeedSudo)
-                _linuxSudoPid = proc.Id;
-
         if (displayLog)
         {
             proc.BeginOutputReadLine();
             proc.BeginErrorReadLine();
         }
 
-            await Task.Delay(500);
+        await Task.Delay(100);
         AppHandler.Instance.AddProcess(proc.Handle);
         if (proc is null or { HasExited: true })
         {
@@ -313,97 +306,6 @@ public class CoreHandler
         }
         return proc;
     }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-            UpdateFunc(mayNeedSudo, ex.Message);
-            return null;
-        }
-    }
 
     #endregion Process
-
-    #region Linux
-
-    private async Task RunProcessAsLinuxSudo(Process proc, string fileName, CoreInfo coreInfo, string configPath)
-    {
-        var cmdLine = $"{fileName.AppendQuotes()} {string.Format(coreInfo.Arguments, Utils.GetBinConfigPath(configPath).AppendQuotes())}";
-
-        var shFilePath = await CreateLinuxShellFile(cmdLine, "run_as_sudo.sh");
-        proc.StartInfo.FileName = shFilePath;
-        proc.StartInfo.Arguments = "";
-        proc.StartInfo.WorkingDirectory = "";
-        if (_config.TunModeItem.LinuxSudoPwd.IsNotEmpty())
-        {
-            proc.StartInfo.StandardInputEncoding = Encoding.UTF8;
-            proc.StartInfo.RedirectStandardInput = true;
-        }
-    }
-
-    private async Task KillProcessAsLinuxSudo()
-    {
-        var cmdLine = $"kill {_linuxSudoPid}";
-        var shFilePath = await CreateLinuxShellFile(cmdLine, "kill_as_sudo.sh");
-        Process proc = new()
-        {
-            StartInfo = new()
-            {
-                FileName = shFilePath,
-                UseShellExecute = false,
-                CreateNoWindow = true,
-                StandardInputEncoding = Encoding.UTF8,
-                RedirectStandardInput = true
-            }
-        };
-        proc.Start();
-
-        if (_config.TunModeItem.LinuxSudoPwd.IsNotEmpty())
-        {
-            try
-            {
-                var pwd = DesUtils.Decrypt(_config.TunModeItem.LinuxSudoPwd);
-                await Task.Delay(10);
-                await proc.StandardInput.WriteLineAsync(pwd);
-                await Task.Delay(10);
-                await proc.StandardInput.WriteLineAsync(pwd);
-            }
-            catch (Exception)
-            {
-                // ignored
-            }
-        }
-
-        var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-        await proc.WaitForExitAsync(timeout.Token);
-        await Task.Delay(3000);
-    }
-
-    private async Task<string> CreateLinuxShellFile(string cmdLine, string fileName)
-    {
-        //Shell scripts
-        var shFilePath = Utils.GetBinConfigPath(AppHandler.Instance.IsAdministrator ? "root_" + fileName : fileName);
-        File.Delete(shFilePath);
-        var sb = new StringBuilder();
-        sb.AppendLine("#!/bin/sh");
-        if (AppHandler.Instance.IsAdministrator)
-        {
-            sb.AppendLine($"{cmdLine}");
-        }
-        else if (_config.TunModeItem.LinuxSudoPwd.IsNullOrEmpty())
-        {
-            sb.AppendLine($"pkexec {cmdLine}");
-        }
-        else
-        {
-            sb.AppendLine($"sudo -S {cmdLine}");
-        }
-
-        await File.WriteAllTextAsync(shFilePath, sb.ToString());
-        await Utils.SetLinuxChmod(shFilePath);
-        Logging.SaveLog(shFilePath);
-
-        return shFilePath;
-    }
-
-    #endregion Linux
 }

v2rayN/ServiceLib/Handler/CoreInfoHandler.cs

@@ -200,6 +200,15 @@ public sealed class CoreInfoHandler
                     Arguments = "-r client -c {0}",
                     Url =  GetCoreUrl(ECoreType.overtls),
                     AbsolutePath = false,
+                },
+
+                new CoreInfo
+                {
+                    CoreType = ECoreType.shadowquic,
+                    CoreExes = [ "shadowquic", "shadowquic"],
+                    Arguments = "-c {0}",
+                    Url =  GetCoreUrl(ECoreType.shadowquic),
+                    AbsolutePath = false,
                 }
 
         ];

v2rayN/ServiceLib/Handler/Fmt/AnytlsFmt.cs

@@ -0,0 +1,48 @@
+namespace ServiceLib.Handler.Fmt;
+
+public class AnytlsFmt : BaseFmt
+{
+    public static ProfileItem? Resolve(string str, out string msg)
+    {
+        msg = ResUI.ConfigurationFormatIncorrect;
+
+        var parsedUrl = Utils.TryUri(str);
+        if (parsedUrl == null)
+        {
+            return null;
+        }
+
+        ProfileItem item = new()
+        {
+            ConfigType = EConfigType.Anytls,
+            Remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
+            Address = parsedUrl.IdnHost,
+            Port = parsedUrl.Port,
+        };
+        var rawUserInfo = Utils.UrlDecode(parsedUrl.UserInfo);
+        item.Id = rawUserInfo;
+
+        var query = Utils.ParseQueryString(parsedUrl.Query);
+        _ = ResolveStdTransport(query, ref item);
+
+        return item;
+    }
+
+    public static string? ToUri(ProfileItem? item)
+    {
+        if (item == null)
+        {
+            return null;
+        }
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
+        {
+            remark = "#" + Utils.UrlEncode(item.Remarks);
+        }
+        var pw = item.Id;
+        var dicQuery = new Dictionary<string, string>();
+        _ = GetStdTransport(item, Global.None, ref dicQuery);
+
+        return ToUri(EConfigType.Anytls, item.Address, item.Port, pw, dicQuery, remark);
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs

@@ -8,10 +8,13 @@ public class BaseFmt
     {
         if (Utils.IsIpv6(address))
         {
-            // 检查地址是否已经被方括号包围，如果没有，则添加方括号
+            // Check if the address is already surrounded by square brackets, if not, add square brackets
             return address.StartsWith('[') && address.EndsWith(']') ? address : $"[{address}]";
         }
-        return address;  // 如果不是IPv6地址，直接返回原地址
+        else
+        {
+            return address;
+        }
     }
 
     protected static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
@@ -56,6 +59,10 @@ public class BaseFmt
         {
             dicQuery.Add("spx", Utils.UrlEncode(item.SpiderX));
         }
+        if (item.Mldsa65Verify.IsNotEmpty())
+        {
+            dicQuery.Add("pqv", Utils.UrlEncode(item.Mldsa65Verify));
+        }
         if (item.AllowInsecure.Equals("true"))
         {
             dicQuery.Add("allowInsecure", "1");
@@ -156,6 +163,7 @@ public class BaseFmt
         item.PublicKey = Utils.UrlDecode(query["pbk"] ?? "");
         item.ShortId = Utils.UrlDecode(query["sid"] ?? "");
         item.SpiderX = Utils.UrlDecode(query["spx"] ?? "");
+        item.Mldsa65Verify = Utils.UrlDecode(query["pqv"] ?? "");
         item.AllowInsecure = (query["allowInsecure"] ?? "") == "1" ? "true" : "";
 
         item.Network = query["type"] ?? nameof(ETransport.tcp);
@@ -212,14 +220,7 @@ public class BaseFmt
 
     protected static bool Contains(string str, params string[] s)
     {
-        foreach (var item in s)
-        {
-            if (str.Contains(item, StringComparison.OrdinalIgnoreCase))
-            {
-                return true;
-            }
-        }
-        return false;
+        return s.All(item => str.Contains(item, StringComparison.OrdinalIgnoreCase));
     }
 
     protected static string WriteAllText(string strData, string ext = "json")

v2rayN/ServiceLib/Handler/Fmt/FmtHandler.cs

@@ -18,6 +18,7 @@ public class FmtHandler
                 EConfigType.Hysteria2 => Hysteria2Fmt.ToUri(item),
                 EConfigType.TUIC => TuicFmt.ToUri(item),
                 EConfigType.WireGuard => WireguardFmt.ToUri(item),
+                EConfigType.Anytls => AnytlsFmt.ToUri(item),
                 _ => null,
             };
 
@@ -75,6 +76,10 @@ public class FmtHandler
             {
                 return WireguardFmt.Resolve(str, out msg);
             }
+            else if (str.StartsWith(Global.ProtocolShares[EConfigType.Anytls]))
+            {
+                return AnytlsFmt.Resolve(str, out msg);
+            }
             else
             {
                 msg = ResUI.NonvmessOrssProtocol;

v2rayN/ServiceLib/Handler/Fmt/HtmlPageFmt.cs

@@ -0,0 +1,11 @@
+using SkiaSharp;
+
+namespace ServiceLib.Handler.Fmt;
+
+public class HtmlPageFmt : BaseFmt
+{
+    public static bool IsHtmlPage(string strData)
+    {
+        return Contains(strData, "<html", "<!doctype html", "<head");
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/Hysteria2Fmt.cs

@@ -24,7 +24,7 @@ public class Hysteria2Fmt : BaseFmt
         item.Path = Utils.UrlDecode(query["obfs-password"] ?? "");
         item.AllowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
 
-        item.Ports = Utils.UrlDecode(query["mport"] ?? "").Replace('-', ':');
+        item.Ports = Utils.UrlDecode(query["mport"] ?? "");
 
         return item;
     }

v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs

@@ -6,9 +6,9 @@ public class VmessFmt : BaseFmt
     {
         msg = ResUI.ConfigurationFormatIncorrect;
         ProfileItem? item;
-        if (str.IndexOf('?') > 0 && str.IndexOf('&') > 0)
+        if (str.IndexOf('@') > 0)
         {
-            item = ResolveStdVmess(str);
+            item = ResolveStdVmess(str) ?? ResolveVmess(str, out msg);
         }
         else
         {

v2rayN/ServiceLib/Handler/PacHandler.cs

@@ -5,15 +5,18 @@ namespace ServiceLib.Handler;
 
 public class PacHandler
 {
-    private static string _configPath;
-    private static int _httpPort;
-    private static int _pacPort;
-    private static TcpListener? _tcpListener;
-    private static byte[] _writeContent;
-    private static bool _isRunning;
-    private static bool _needRestart = true;
+    private static readonly Lazy<PacHandler> _instance = new(() => new PacHandler());
+    public static PacHandler Instance => _instance.Value;
 
-    public static async Task Start(string configPath, int httpPort, int pacPort)
+    private string _configPath;
+    private int _httpPort;
+    private int _pacPort;
+    private TcpListener? _tcpListener;
+    private byte[] _writeContent;
+    private bool _isRunning;
+    private bool _needRestart = true;
+
+    public async Task StartAsync(string configPath, int httpPort, int pacPort)
     {
         _needRestart = configPath != _configPath || httpPort != _httpPort || pacPort != _pacPort || !_isRunning;
 
@@ -30,7 +33,7 @@ public class PacHandler
         }
     }
 
-    private static async Task InitText()
+    private async Task InitText()
     {
         var path = Path.Combine(_configPath, "pac.txt");
 
@@ -59,7 +62,7 @@ public class PacHandler
         _writeContent = Encoding.UTF8.GetBytes(sb.ToString());
     }
 
-    private static void RunListener()
+    private void RunListener()
     {
         _tcpListener = TcpListener.Create(_pacPort);
         _isRunning = true;
@@ -87,14 +90,14 @@ public class PacHandler
         }, TaskCreationOptions.LongRunning);
     }
 
-    private static void WriteContent(TcpClient client)
+    private void WriteContent(TcpClient client)
     {
         var stream = client.GetStream();
         stream.Write(_writeContent, 0, _writeContent.Length);
         stream.Flush();
     }
 
-    public static void Stop()
+    public void Stop()
     {
         if (_tcpListener == null)
         {

v2rayN/ServiceLib/Handler/SubscriptionHandler.cs

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

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs

@@ -18,14 +18,7 @@ public class ProxySettingLinux
 
     private static async Task ExecCmd(List<string> args)
     {
-        var fileName = Utils.GetBinConfigPath(_proxySetFileName);
-        if (!File.Exists(fileName))
-        {
-            var contents = EmbedUtils.GetEmbedText(Global.ProxySetLinuxShellFileName);
-            await File.AppendAllTextAsync(fileName, contents);
-
-            await Utils.SetLinuxChmod(fileName);
-        }
+        var fileName = await FileManager.CreateLinuxShellFile(_proxySetFileName, EmbedUtils.GetEmbedText(Global.ProxySetLinuxShellFileName), false);
 
         await Utils.GetCliWrapOutput(fileName, args);
     }

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs

@@ -23,14 +23,7 @@ public class ProxySettingOSX
 
     private static async Task ExecCmd(List<string> args)
     {
-        var fileName = Utils.GetBinConfigPath(_proxySetFileName);
-        if (!File.Exists(fileName))
-        {
-            var contents = EmbedUtils.GetEmbedText(Global.ProxySetOSXShellFileName);
-            await File.AppendAllTextAsync(fileName, contents);
-
-            await Utils.SetLinuxChmod(fileName);
-        }
+        var fileName = await FileManager.CreateLinuxShellFile(_proxySetFileName, EmbedUtils.GetEmbedText(Global.ProxySetOSXShellFileName), false);
 
         await Utils.GetCliWrapOutput(fileName, args);
     }

v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs

@@ -56,7 +56,7 @@ public static class SysProxyHandler
 
             if (type != ESysProxyType.Pac && Utils.IsWindows())
             {
-                PacHandler.Stop();
+                PacHandler.Instance.Stop();
             }
         }
         catch (Exception ex)
@@ -91,7 +91,7 @@ public static class SysProxyHandler
     private static async Task SetWindowsProxyPac(int port)
     {
         var portPac = AppHandler.Instance.GetLocalPort(EInboundProtocol.pac);
-        await PacHandler.Start(Utils.GetConfigPath(), port, portPac);
+        await PacHandler.Instance.StartAsync(Utils.GetConfigPath(), port, portPac);
         var strProxy = $"{Global.HttpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
         ProxySettingWindows.SetProxy(strProxy, "", 4);
     }

v2rayN/ServiceLib/Handler/TaskHandler.cs

@@ -63,11 +63,10 @@ public class TaskHandler
         }
 
         Logging.SaveLog("Execute update subscription");
-        var updateHandle = new UpdateService();
 
         foreach (var item in lstSubs)
         {
-            await updateHandle.UpdateSubscriptionProcess(config, item.Id, true, (bool success, string msg) =>
+            await SubscriptionHandler.UpdateProcess(config, item.Id, true, (bool success, string msg) =>
             {
                 updateFunc?.Invoke(success, msg);
                 if (success)

v2rayN/ServiceLib/Models/Config.cs

@@ -1,8 +1,5 @@
 namespace ServiceLib.Models;
 
-/// <summary>
-/// 本软件配置文件实体类
-/// </summary>
 [Serializable]
 public class Config
 {
@@ -51,6 +48,7 @@ public class Config
     public List<InItem> Inbound { get; set; }
     public List<KeyEventItem> GlobalHotkeys { get; set; }
     public List<CoreTypeItem> CoreTypeItem { get; set; }
+    public SimpleDNSItem SimpleDNSItem { get; set; }
 
     #endregion other entities
 }

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -89,10 +89,8 @@ public class UIItem
 {
     public bool EnableAutoAdjustMainLvColWidth { get; set; }
     public bool EnableUpdateSubOnlyRemarksExist { get; set; }
-    public double MainWidth { get; set; }
-    public double MainHeight { get; set; }
-    public double MainGirdHeight1 { get; set; }
-    public double MainGirdHeight2 { get; set; }
+    public int MainGirdHeight1 { get; set; }
+    public int MainGirdHeight2 { get; set; }
     public EGirdOrientation MainGirdOrientation { get; set; } = EGirdOrientation.Vertical;
     public string? ColorPrimaryName { get; set; }
     public string? CurrentTheme { get; set; }
@@ -103,8 +101,10 @@ public class UIItem
     public bool DoubleClick2Activate { get; set; }
     public bool AutoHideStartup { get; set; }
     public bool Hide2TrayWhenClose { get; set; }
-    public List<ColumnItem> MainColumnItem { get; set; }
     public bool ShowInTaskbar { get; set; }
+    public bool MacOSShowInDock { get; set; }
+    public List<ColumnItem> MainColumnItem { get; set; }
+    public List<WindowSizeItem> WindowSizeItem { get; set; }
 }
 
 [Serializable]
@@ -142,12 +142,12 @@ public class CoreTypeItem
 public class TunModeItem
 {
     public bool EnableTun { get; set; }
+    public bool AutoRoute { get; set; } = true;
     public bool StrictRoute { get; set; } = true;
     public string Stack { get; set; }
     public int Mtu { get; set; }
     public bool EnableExInbound { get; set; }
     public bool EnableIPv6Address { get; set; }
-    public string? LinuxSudoPwd { get; set; }
 }
 
 [Serializable]
@@ -157,6 +157,7 @@ public class SpeedTestItem
     public string SpeedTestUrl { get; set; }
     public string SpeedPingTestUrl { get; set; }
     public int MixedConcurrencyCount { get; set; }
+    public string IPAPIUrl { get; set; }
 }
 
 [Serializable]
@@ -164,7 +165,6 @@ public class RoutingBasicItem
 {
     public string DomainStrategy { get; set; }
     public string DomainStrategy4Singbox { get; set; }
-    public string DomainMatcher { get; set; }
     public string RoutingIndexId { get; set; }
 }
 
@@ -245,3 +245,29 @@ public class Fragment4RayItem
     public string? Length { get; set; }
     public string? Interval { get; set; }
 }
+
+[Serializable]
+public class WindowSizeItem
+{
+    public string TypeName { get; set; }
+    public int Width { get; set; }
+    public int Height { get; set; }
+}
+
+[Serializable]
+public class SimpleDNSItem
+{
+    public bool? UseSystemHosts { get; set; }
+    public bool? AddCommonHosts { get; set; }
+    public bool? FakeIP { get; set; }
+    public bool? BlockBindingQuery { get; set; }
+    public string? DirectDNS { get; set; }
+    public string? RemoteDNS { get; set; }
+    public string? SingboxOutboundsResolveDNS { get; set; }
+    public string? SingboxFinalResolveDNS { get; set; }
+    public string? RayStrategy4Freedom { get; set; }
+    public string? SingboxStrategy4Direct { get; set; }
+    public string? SingboxStrategy4Proxy { get; set; }
+    public string? Hosts { get; set; }
+    public string? DirectExpectedIPs { get; set; }
+}

v2rayN/ServiceLib/Models/DNSItem.cs

@@ -9,7 +9,7 @@ public class DNSItem
     public string Id { get; set; }
 
     public string Remarks { get; set; }
-    public bool Enabled { get; set; } = true;
+    public bool Enabled { get; set; } = false;
     public ECoreType CoreType { get; set; }
     public bool UseSystemHosts { get; set; }
     public string? NormalDNS { get; set; }

v2rayN/ServiceLib/Models/FullConfigTemplateItem.cs

@@ -0,0 +1,18 @@
+using SQLite;
+
+namespace ServiceLib.Models;
+
+[Serializable]
+public class FullConfigTemplateItem
+{
+    [PrimaryKey]
+    public string Id { get; set; }
+
+    public string Remarks { get; set; }
+    public bool Enabled { get; set; } = false;
+    public ECoreType CoreType { get; set; }
+    public string? Config { get; set; }
+    public string? TunConfig { get; set; }
+    public bool? AddProxyOnly { get; set; } = false;
+    public string? ProxyDetour { get; set; }
+}

v2rayN/ServiceLib/Models/IPAPIInfo.cs

@@ -3,10 +3,17 @@ namespace ServiceLib.Models;
 internal class IPAPIInfo
 {
     public string? ip { get; set; }
-    public string? city { get; set; }
-    public string? region { get; set; }
-    public string? region_code { get; set; }
+    public string? clientIp { get; set; }
+    public string? ip_addr { get; set; }
+    public string? query { get; set; }
     public string? country { get; set; }
     public string? country_name { get; set; }
     public string? country_code { get; set; }
+    public string? countryCode { get; set; }
+    public LocationInfo? location { get; set; }
+}
+
+public class LocationInfo
+{
+    public string? country_code { get; set; }
 }

v2rayN/ServiceLib/Models/ProfileItem.cs

@@ -1,9 +1,10 @@
+using ReactiveUI;
 using SQLite;
 
 namespace ServiceLib.Models;
 
 [Serializable]
-public class ProfileItem
+public class ProfileItem : ReactiveObject
 {
     public ProfileItem()
     {
@@ -31,7 +32,7 @@ public class ProfileItem
     public string GetSummary()
     {
         var summary = $"[{(ConfigType).ToString()}] ";
-        var arrAddr = Address.Split('.');
+        var arrAddr = Address.Contains(':') ? Address.Split(':') : Address.Split('.');
         var addr = arrAddr.Length switch
         {
             > 2 => $"{arrAddr.First()}***{arrAddr.Last()}",
@@ -92,5 +93,7 @@ public class ProfileItem
     public string PublicKey { get; set; }
     public string ShortId { get; set; }
     public string SpiderX { get; set; }
+    public string Mldsa65Verify { get; set; }
     public string Extra { get; set; }
+    public bool? MuxEnabled { get; set; }
 }

v2rayN/ServiceLib/Models/ProfileItemModel.cs

@@ -1,3 +1,5 @@
+using ReactiveUI.Fody.Helpers;
+
 namespace ServiceLib.Models;
 
 [Serializable]
@@ -5,13 +7,28 @@ public class ProfileItemModel : ProfileItem
 {
     public bool IsActive { get; set; }
     public string SubRemarks { get; set; }
+
+    [Reactive]
     public int Delay { get; set; }
+
     public decimal Speed { get; set; }
     public int Sort { get; set; }
+
+    [Reactive]
     public string DelayVal { get; set; }
+
+    [Reactive]
     public string SpeedVal { get; set; }
+
+    [Reactive]
     public string TodayUp { get; set; }
+
+    [Reactive]
     public string TodayDown { get; set; }
+
+    [Reactive]
     public string TotalUp { get; set; }
+
+    [Reactive]
     public string TotalDown { get; set; }
 }

v2rayN/ServiceLib/Models/RoutingItem.cs

@@ -19,4 +19,5 @@ public class RoutingItem
     public string DomainStrategy { get; set; }
     public string DomainStrategy4Singbox { get; set; }
     public int Sort { get; set; }
+    public bool IsActive { get; set; }
 }

v2rayN/ServiceLib/Models/RoutingItemModel.cs

@@ -3,5 +3,4 @@ namespace ServiceLib.Models;
 [Serializable]
 public class RoutingItemModel : RoutingItem
 {
-    public bool IsActive { get; set; }
 }

v2rayN/ServiceLib/Models/SingboxConfig.cs

@@ -1,3 +1,5 @@
+using System.Text.Json.Serialization;
+
 namespace ServiceLib.Models;
 
 public class SingboxConfig
@@ -6,6 +8,7 @@ public class SingboxConfig
     public Dns4Sbox? dns { get; set; }
     public List<Inbound4Sbox> inbounds { get; set; }
     public List<Outbound4Sbox> outbounds { get; set; }
+    public List<Endpoints4Sbox>? endpoints { get; set; }
     public Route4Sbox route { get; set; }
     public Experimental4Sbox? experimental { get; set; }
 }
@@ -29,14 +32,15 @@ public class Dns4Sbox
     public bool? independent_cache { get; set; }
     public bool? reverse_mapping { get; set; }
     public string? client_subnet { get; set; }
-    public Fakeip4Sbox? fakeip { get; set; }
 }
 
 public class Route4Sbox
 {
+    public Rule4Sbox? default_domain_resolver { get; set; } // or string
     public bool? auto_detect_interface { get; set; }
     public List<Rule4Sbox> rules { get; set; }
     public List<Ruleset4Sbox>? rule_set { get; set; }
+    public string? final { get; set; }
 }
 
 [Serializable]
@@ -49,6 +53,7 @@ public class Rule4Sbox
     public string? mode { get; set; }
     public bool? ip_is_private { get; set; }
     public string? client_subnet { get; set; }
+    public int? rewrite_ttl { get; set; }
     public bool? invert { get; set; }
     public string? clash_mode { get; set; }
     public List<string>? inbound { get; set; }
@@ -67,6 +72,27 @@ public class Rule4Sbox
     public List<string>? process_name { get; set; }
     public List<string>? rule_set { get; set; }
     public List<Rule4Sbox>? rules { get; set; }
+    public string? action { get; set; }
+    public string? strategy { get; set; }
+    public List<string>? sniffer { get; set; }
+    public string? rcode { get; set; }
+    public List<int>? query_type { get; set; }
+    public List<string>? answer { get; set; }
+    public List<string>? ns { get; set; }
+    public List<string>? extra { get; set; }
+    public string? method { get; set; }
+    public bool? no_drop { get; set; }
+    public bool? source_ip_is_private { get; set; }
+    public bool? ip_accept_any { get; set; }
+    public int? source_port { get; set; }
+    public List<string>? source_port_range { get; set; }
+    public List<string>? network_type { get; set; }
+    public bool? network_is_expensive { get; set; }
+    public bool? network_is_constrained { get; set; }
+    public List<string>? wifi_ssid { get; set; }
+    public List<string>? wifi_bssid { get; set; }
+    public bool? rule_set_ip_cidr_match_source { get; set; }
+    public bool? rule_set_ip_cidr_accept_empty { get; set; }
 }
 
 [Serializable]
@@ -76,7 +102,6 @@ public class Inbound4Sbox
     public string tag { get; set; }
     public string listen { get; set; }
     public int? listen_port { get; set; }
-    public string? domain_strategy { get; set; }
     public string interface_name { get; set; }
     public List<string>? address { get; set; }
     public int? mtu { get; set; }
@@ -84,8 +109,6 @@ public class Inbound4Sbox
     public bool? strict_route { get; set; }
     public bool? endpoint_independent_nat { get; set; }
     public string? stack { get; set; }
-    public bool? sniff { get; set; }
-    public bool? sniff_override_destination { get; set; }
     public List<User4Sbox> users { get; set; }
 }
 
@@ -95,10 +118,8 @@ public class User4Sbox
     public string password { get; set; }
 }
 
-public class Outbound4Sbox
+public class Outbound4Sbox : BaseServer4Sbox
 {
-    public string type { get; set; }
-    public string tag { get; set; }
     public string? server { get; set; }
     public int? server_port { get; set; }
     public List<string>? server_ports { get; set; }
@@ -113,7 +134,6 @@ public class Outbound4Sbox
     public int? recv_window_conn { get; set; }
     public int? recv_window { get; set; }
     public bool? disable_mtu_discovery { get; set; }
-    public string? detour { get; set; }
     public string? method { get; set; }
     public string? username { get; set; }
     public string? password { get; set; }
@@ -121,21 +141,36 @@ public class Outbound4Sbox
     public string? version { get; set; }
     public string? network { get; set; }
     public string? packet_encoding { get; set; }
-    public List<string>? local_address { get; set; }
-    public string? private_key { get; set; }
-    public string? peer_public_key { get; set; }
-    public List<int>? reserved { get; set; }
-    public int? mtu { get; set; }
     public string? plugin { get; set; }
     public string? plugin_opts { get; set; }
-    public Tls4Sbox? tls { get; set; }
-    public Multiplex4Sbox? multiplex { get; set; }
-    public Transport4Sbox? transport { get; set; }
-    public HyObfs4Sbox? obfs { get; set; }
     public List<string>? outbounds { get; set; }
     public bool? interrupt_exist_connections { get; set; }
 }
 
+public class Endpoints4Sbox : BaseServer4Sbox
+{
+    public bool? system { get; set; }
+    public string? name { get; set; }
+    public int? mtu { get; set; }
+    public List<string> address { get; set; }
+    public string private_key { get; set; }
+    public int? listen_port { get; set; }
+    public string? udp_timeout { get; set; }
+    public int? workers { get; set; }
+    public List<Peer4Sbox> peers { get; set; }
+}
+
+public class Peer4Sbox
+{
+    public string address { get; set; }
+    public int port { get; set; }
+    public string public_key { get; set; }
+    public string? pre_shared_key { get; set; }
+    public List<string> allowed_ips { get; set; }
+    public int? persistent_keepalive_interval { get; set; }
+    public List<int> reserved { get; set; }
+}
+
 public class Tls4Sbox
 {
     public bool enabled { get; set; }
@@ -144,6 +179,9 @@ public class Tls4Sbox
     public List<string>? alpn { get; set; }
     public Utls4Sbox? utls { get; set; }
     public Reality4Sbox? reality { get; set; }
+    public bool? fragment { get; set; }
+    public string? fragment_fallback_delay { get; set; }
+    public bool? record_fragment { get; set; }
 }
 
 public class Multiplex4Sbox
@@ -191,15 +229,28 @@ public class HyObfs4Sbox
     public string? password { get; set; }
 }
 
-public class Server4Sbox
+public class Server4Sbox : BaseServer4Sbox
 {
-    public string? tag { get; set; }
+    public string? inet4_range { get; set; }
+    public string? inet6_range { get; set; }
+    public string? client_subnet { get; set; }
+    public string? server { get; set; }
+    public new string? domain_resolver { get; set; }
+    [JsonPropertyName("interface")] public string? Interface { get; set; }
+    public int? server_port { get; set; }
+    public string? path { get; set; }
+    public Headers4Sbox? headers { get; set; }
+
+    // public List<string>? path { get; set; } // hosts
+    public Dictionary<string, List<string>>? predefined { get; set; }
+
+    // Deprecated
     public string? address { get; set; }
+
     public string? address_resolver { get; set; }
     public string? address_strategy { get; set; }
     public string? strategy { get; set; }
-    public string? detour { get; set; }
-    public string? client_subnet { get; set; }
+    // Deprecated End
 }
 
 public class Experimental4Sbox
@@ -229,13 +280,6 @@ public class Stats4Sbox
     public List<string>? users { get; set; }
 }
 
-public class Fakeip4Sbox
-{
-    public bool enabled { get; set; }
-    public string inet4_range { get; set; }
-    public string inet6_range { get; set; }
-}
-
 public class CacheFile4Sbox
 {
     public bool enabled { get; set; }
@@ -254,3 +298,33 @@ public class Ruleset4Sbox
     public string? download_detour { get; set; }
     public string? update_interval { get; set; }
 }
+
+public abstract class DialFields4Sbox
+{
+    public string? detour { get; set; }
+    public string? bind_interface { get; set; }
+    public string? inet4_bind_address { get; set; }
+    public string? inet6_bind_address { get; set; }
+    public int? routing_mark { get; set; }
+    public bool? reuse_addr { get; set; }
+    public string? netns { get; set; }
+    public string? connect_timeout { get; set; }
+    public bool? tcp_fast_open { get; set; }
+    public bool? tcp_multi_path { get; set; }
+    public bool? udp_fragment { get; set; }
+    public Rule4Sbox? domain_resolver { get; set; } // or string
+    public string? network_strategy { get; set; }
+    public List<string>? network_type { get; set; }
+    public List<string>? fallback_network_type { get; set; }
+    public string? fallback_delay { get; set; }
+    public Tls4Sbox? tls { get; set; }
+    public Multiplex4Sbox? multiplex { get; set; }
+    public Transport4Sbox? transport { get; set; }
+    public HyObfs4Sbox? obfs { get; set; }
+}
+
+public abstract class BaseServer4Sbox : DialFields4Sbox
+{
+    public string type { get; set; }
+    public string tag { get; set; }
+}

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -5,7 +5,7 @@ namespace ServiceLib.Models;
 public class V2rayConfig
 {
     public Log4Ray log { get; set; }
-    public object dns { get; set; }
+    public Dns4Ray dns { get; set; }
     public List<Inbounds4Ray> inbounds { get; set; }
     public List<Outbounds4Ray> outbounds { get; set; }
     public Routing4Ray routing { get; set; }
@@ -127,6 +127,26 @@ public class Outboundsettings4Ray
     public int? userLevel { get; set; }
 
     public FragmentItem4Ray? fragment { get; set; }
+
+    public string? secretKey { get; set; }
+
+    public List<string>? address { get; set; }
+
+    public List<WireguardPeer4Ray>? peers { get; set; }
+
+    public bool? noKernelTun { get; set; }
+
+    public int? mtu { get; set; }
+
+    public List<int>? reserved { get; set; }
+
+    public int? workers { get; set; }
+}
+
+public class WireguardPeer4Ray
+{
+    public string endpoint { get; set; }
+    public string publicKey { get; set; }
 }
 
 public class VnextItem4Ray
@@ -183,21 +203,36 @@ public class Response4Ray
 
 public class Dns4Ray
 {
-    public List<string> servers { get; set; }
+    public Dictionary<string, object>? hosts { get; set; }
+    public List<object> servers { get; set; }
+    public string? clientIp { get; set; }
+    public string? queryStrategy { get; set; }
+    public bool? disableCache { get; set; }
+    public bool? disableFallback { get; set; }
+    public bool? disableFallbackIfMatch { get; set; }
+    public bool? useSystemHosts { get; set; }
+    public string? tag { get; set; }
 }
 
 public class DnsServer4Ray
 {
     public string? address { get; set; }
     public List<string>? domains { get; set; }
+    public bool? skipFallback { get; set; }
+    public List<string>? expectedIPs { get; set; }
+    public List<string>? unexpectedIPs { get; set; }
+    public string? clientIp { get; set; }
+    public string? queryStrategy { get; set; }
+    public int? timeoutMs { get; set; }
+    public bool? disableCache { get; set; }
+    public bool? finalQuery { get; set; }
+    public string? tag { get; set; }
 }
 
 public class Routing4Ray
 {
     public string domainStrategy { get; set; }
 
-    public string? domainMatcher { get; set; }
-
     public List<RulesItem4Ray> rules { get; set; }
 
     public List<BalancersItem4Ray>? balancers { get; set; }
@@ -319,6 +354,7 @@ public class TlsSettings4Ray
     public string? publicKey { get; set; }
     public string? shortId { get; set; }
     public string? spiderX { get; set; }
+    public string? mldsa65Verify { get; set; }
 }
 
 public class TcpSettings4Ray

v2rayN/ServiceLib/Models/V2rayTcpRequest.cs

@@ -1,8 +1,5 @@
 namespace ServiceLib.Models;
 
-/// <summary>
-/// Tcp伪装http的Request，只要Host
-/// </summary>
 public class V2rayTcpRequest
 {
     /// <summary>

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -88,7 +88,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please check the server settings first. 的本地化字符串。
+        ///   查找类似 Please check the Configuration settings first. 的本地化字符串。
         /// </summary>
         public static string CheckServerSettings {
             get {
@@ -132,24 +132,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Download speed 的本地化字符串。
-        /// </summary>
-        public static string downloadSpeed {
-            get {
-                return ResourceManager.GetString("downloadSpeed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Do you want to download {0}? 的本地化字符串。
-        /// </summary>
-        public static string DownloadYesNo {
-            get {
-                return ResourceManager.GetString("DownloadYesNo", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Failed to convert configuration file 的本地化字符串。
         /// </summary>
@@ -178,7 +160,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Failed to import custom configuration server 的本地化字符串。
+        ///   查找类似 Failed to import custom configuration Configuration 的本地化字符串。
         /// </summary>
         public static string FailedImportedCustomServer {
             get {
@@ -204,6 +186,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Please fill in the correct config template 的本地化字符串。
+        /// </summary>
+        public static string FillCorrectConfigTemplateText {
+            get {
+                return ResourceManager.GetString("FillCorrectConfigTemplateText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Please fill in the correct custom DNS 的本地化字符串。
         /// </summary>
@@ -214,7 +205,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please enter the correct server port format. 的本地化字符串。
+        ///   查找类似 Please enter the correct port format. 的本地化字符串。
         /// </summary>
         public static string FillCorrectServerPort {
             get {
@@ -241,7 +232,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please enter the server address. 的本地化字符串。
+        ///   查找类似 Please enter the address. 的本地化字符串。
         /// </summary>
         public static string FillServerAddress {
             get {
@@ -250,7 +241,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please browse to import server configuration 的本地化字符串。
+        ///   查找类似 Please browse to import Configuration configuration 的本地化字符串。
         /// </summary>
         public static string FillServerAddressCustom {
             get {
@@ -466,7 +457,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Next proxy remarks 的本地化字符串。
+        ///   查找类似 Next proxy Configuration remarks 的本地化字符串。
         /// </summary>
         public static string LvNextProfile {
             get {
@@ -484,7 +475,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Previous proxy remarks 的本地化字符串。
+        ///   查找类似 Previous proxy Configuration remarks 的本地化字符串。
         /// </summary>
         public static string LvPrevProfile {
             get {
@@ -493,7 +484,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please make sure the remarks exist and are unique 的本地化字符串。
+        ///   查找类似 Please make sure the Configuration remarks exist and are unique 的本地化字符串。
         /// </summary>
         public static string LvPrevProfileTip {
             get {
@@ -673,7 +664,16 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add a custom configuration server 的本地化字符串。
+        ///   查找类似 Add [Anytls] Configuration 的本地化字符串。
+        /// </summary>
+        public static string menuAddAnytlsServer {
+            get {
+                return ResourceManager.GetString("menuAddAnytlsServer", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Add a custom configuration Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddCustomServer {
             get {
@@ -682,7 +682,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [HTTP] server 的本地化字符串。
+        ///   查找类似 Add [HTTP] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddHttpServer {
             get {
@@ -691,7 +691,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [Hysteria2] server 的本地化字符串。
+        ///   查找类似 Add [Hysteria2] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddHysteria2Server {
             get {
@@ -727,7 +727,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [Shadowsocks] server 的本地化字符串。
+        ///   查找类似 Add [Shadowsocks] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddShadowsocksServer {
             get {
@@ -736,7 +736,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [SOCKS] server 的本地化字符串。
+        ///   查找类似 Add [SOCKS] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddSocksServer {
             get {
@@ -745,7 +745,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [Trojan] server 的本地化字符串。
+        ///   查找类似 Add [Trojan] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddTrojanServer {
             get {
@@ -754,7 +754,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [TUIC] server 的本地化字符串。
+        ///   查找类似 Add [TUIC] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddTuicServer {
             get {
@@ -763,7 +763,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [VLESS] server 的本地化字符串。
+        ///   查找类似 Add [VLESS] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddVlessServer {
             get {
@@ -772,7 +772,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [VMess] server 的本地化字符串。
+        ///   查找类似 Add [VMess] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddVmessServer {
             get {
@@ -781,7 +781,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [WireGuard] server 的本地化字符串。
+        ///   查找类似 Add [WireGuard] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddWireguardServer {
             get {
@@ -853,7 +853,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Clone selected server 的本地化字符串。
+        ///   查找类似 Clone selected Configuration 的本地化字符串。
         /// </summary>
         public static string menuCopyServer {
             get {
@@ -871,7 +871,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Edit Server (Ctrl+D) 的本地化字符串。
+        ///   查找类似 Edit Configuration (Ctrl+D) 的本地化字符串。
         /// </summary>
         public static string menuEditServer {
             get {
@@ -898,7 +898,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Export selected server for complete configuration 的本地化字符串。
+        ///   查找类似 Export selected Configuration for complete configuration 的本地化字符串。
         /// </summary>
         public static string menuExport2ClientConfig {
             get {
@@ -907,7 +907,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Export selected server for complete configuration to clipboard 的本地化字符串。
+        ///   查找类似 Export selected Configuration for complete configuration to clipboard 的本地化字符串。
         /// </summary>
         public static string menuExport2ClientConfigClipboard {
             get {
@@ -934,7 +934,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Export server 的本地化字符串。
+        ///   查找类似 Export Configuration 的本地化字符串。
         /// </summary>
         public static string menuExportConfig {
             get {
@@ -942,6 +942,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Full Config Template Setting 的本地化字符串。
+        /// </summary>
+        public static string menuFullConfigTemplate {
+            get {
+                return ResourceManager.GetString("menuFullConfigTemplate", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Global Hotkey Setting 的本地化字符串。
         /// </summary>
@@ -1222,7 +1231,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Test servers real delay (Ctrl+R) 的本地化字符串。
+        ///   查找类似 Test Configurations real delay (Ctrl+R) 的本地化字符串。
         /// </summary>
         public static string menuRealPingServer {
             get {
@@ -1312,7 +1321,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Remove duplicate servers 的本地化字符串。
+        ///   查找类似 Remove duplicate Configurations 的本地化字符串。
         /// </summary>
         public static string menuRemoveDuplicateServer {
             get {
@@ -1330,7 +1339,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Remove selected servers (Delete) 的本地化字符串。
+        ///   查找类似 Remove selected Configurations (Delete) 的本地化字符串。
         /// </summary>
         public static string menuRemoveServer {
             get {
@@ -1347,15 +1356,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Advanced Function 的本地化字符串。
-        /// </summary>
-        public static string menuRoutingAdvanced {
-            get {
-                return ResourceManager.GetString("menuRoutingAdvanced", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Add 的本地化字符串。
         /// </summary>
@@ -1474,7 +1474,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Servers 的本地化字符串。
+        ///   查找类似 Configurations 的本地化字符串。
         /// </summary>
         public static string menuServers {
             get {
@@ -1483,7 +1483,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Multi-server to custom configuration 的本地化字符串。
+        ///   查找类似 Multi-Configuration to custom configuration 的本地化字符串。
         /// </summary>
         public static string menuSetDefaultMultipleServer {
             get {
@@ -1492,7 +1492,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Multi-server LeastPing by sing-box 的本地化字符串。
+        ///   查找类似 Multi-Configuration LeastPing by sing-box 的本地化字符串。
         /// </summary>
         public static string menuSetDefaultMultipleServerSingBoxLeastPing {
             get {
@@ -1501,7 +1501,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Multi-server LeastLoad by Xray 的本地化字符串。
+        ///   查找类似 Multi-Configuration LeastLoad by Xray 的本地化字符串。
         /// </summary>
         public static string menuSetDefaultMultipleServerXrayLeastLoad {
             get {
@@ -1510,7 +1510,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Multi-server LeastPing by Xray 的本地化字符串。
+        ///   查找类似 Multi-Configuration LeastPing by Xray 的本地化字符串。
         /// </summary>
         public static string menuSetDefaultMultipleServerXrayLeastPing {
             get {
@@ -1519,7 +1519,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Multi-server Random by Xray 的本地化字符串。
+        ///   查找类似 Multi-Configuration Random by Xray 的本地化字符串。
         /// </summary>
         public static string menuSetDefaultMultipleServerXrayRandom {
             get {
@@ -1528,7 +1528,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Multi-server RoundRobin by Xray 的本地化字符串。
+        ///   查找类似 Multi-Configuration RoundRobin by Xray 的本地化字符串。
         /// </summary>
         public static string menuSetDefaultMultipleServerXrayRoundRobin {
             get {
@@ -1537,7 +1537,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Set as active server (Enter) 的本地化字符串。
+        ///   查找类似 Set as active Configuration (Enter) 的本地化字符串。
         /// </summary>
         public static string menuSetDefaultServer {
             get {
@@ -1555,7 +1555,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Share Server (Ctrl+F) 的本地化字符串。
+        ///   查找类似 Share Configuration (Ctrl+F) 的本地化字符串。
         /// </summary>
         public static string menuShareServer {
             get {
@@ -1582,7 +1582,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Test servers download speed (Ctrl+T) 的本地化字符串。
+        ///   查找类似 Test Configurations download speed (Ctrl+T) 的本地化字符串。
         /// </summary>
         public static string menuSpeedServer {
             get {
@@ -1726,7 +1726,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Test servers with tcping (Ctrl+O) 的本地化字符串。
+        ///   查找类似 Test Configurations with tcping (Ctrl+O) 的本地化字符串。
         /// </summary>
         public static string menuTcpingServer {
             get {
@@ -1834,7 +1834,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Server filter, press Enter to execute 的本地化字符串。
+        ///   查找类似 Configuration filter, press Enter to execute 的本地化字符串。
         /// </summary>
         public static string MsgServerTitle {
             get {
@@ -2023,7 +2023,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please select the server first 的本地化字符串。
+        ///   查找类似 Please select the Configuration first 的本地化字符串。
         /// </summary>
         public static string PleaseSelectServer {
             get {
@@ -2050,7 +2050,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Servers deduplication completed. Old: {0}, New: {1}. 的本地化字符串。
+        ///   查找类似 Configurations deduplication completed. Old: {0}, New: {1}. 的本地化字符串。
         /// </summary>
         public static string RemoveDuplicateServerResult {
             get {
@@ -2077,7 +2077,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Are you sure you want to remove the server? 的本地化字符串。
+        ///   查找类似 Are you sure you want to remove the Configuration? 的本地化字符串。
         /// </summary>
         public static string RemoveServer {
             get {
@@ -2203,7 +2203,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Custom configuration server imported successfully 的本地化字符串。
+        ///   查找类似 Custom configuration Configuration imported successfully 的本地化字符串。
         /// </summary>
         public static string SuccessfullyImportedCustomServer {
             get {
@@ -2212,7 +2212,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 {0} servers have been imported from clipboard 的本地化字符串。
+        ///   查找类似 {0} Configurations have been imported from clipboard 的本地化字符串。
         /// </summary>
         public static string SuccessfullyImportedServerViaClipboard {
             get {
@@ -2229,6 +2229,33 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Incorrect password, please try again. 的本地化字符串。
+        /// </summary>
+        public static string SudoIncorrectPasswordTip {
+            get {
+                return ResourceManager.GetString("SudoIncorrectPasswordTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Add Common DNS Hosts 的本地化字符串。
+        /// </summary>
+        public static string TbAddCommonDNSHosts {
+            get {
+                return ResourceManager.GetString("TbAddCommonDNSHosts", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Do Not Add Non-Proxy Protocol Outbound 的本地化字符串。
+        /// </summary>
+        public static string TbAddProxyProtocolOutboundOnly {
+            get {
+                return ResourceManager.GetString("TbAddProxyProtocolOutboundOnly", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Address 的本地化字符串。
         /// </summary>
@@ -2265,6 +2292,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Apply to Proxy Domains Only 的本地化字符串。
+        /// </summary>
+        public static string TbApplyProxyDomainsOnly {
+            get {
+                return ResourceManager.GetString("TbApplyProxyDomainsOnly", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Auto refresh 的本地化字符串。
         /// </summary>
@@ -2292,6 +2328,24 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Block SVCB and HTTPS Queries 的本地化字符串。
+        /// </summary>
+        public static string TbBlockSVCBHTTPSQueries {
+            get {
+                return ResourceManager.GetString("TbBlockSVCBHTTPSQueries", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Prevent domain-based routing rules from failing 的本地化字符串。
+        /// </summary>
+        public static string TbBlockSVCBHTTPSQueriesTips {
+            get {
+                return ResourceManager.GetString("TbBlockSVCBHTTPSQueriesTips", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Browse 的本地化字符串。
         /// </summary>
@@ -2346,6 +2400,24 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Enable Custom DNS 的本地化字符串。
+        /// </summary>
+        public static string TbCustomDNSEnable {
+            get {
+                return ResourceManager.GetString("TbCustomDNSEnable", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Custom DNS Enabled, This Page&apos;s Settings Invalid 的本地化字符串。
+        /// </summary>
+        public static string TbCustomDNSEnabledPageInvalid {
+            get {
+                return ResourceManager.GetString("TbCustomDNSEnabledPageInvalid", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Display GUI 的本地化字符串。
         /// </summary>
@@ -2364,6 +2436,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 DNS Hosts: (&quot;domain1 ip1 ip2&quot; per line) 的本地化字符串。
+        /// </summary>
+        public static string TbDNSHostsConfig {
+            get {
+                return ResourceManager.GetString("TbDNSHostsConfig", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Supports DNS Object; Click to view documentation 的本地化字符串。
         /// </summary>
@@ -2382,15 +2463,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Domain Matcher 的本地化字符串。
-        /// </summary>
-        public static string TbdomainMatcher {
-            get {
-                return ResourceManager.GetString("TbdomainMatcher", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Domain strategy 的本地化字符串。
         /// </summary>
@@ -2409,6 +2481,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Domestic DNS 的本地化字符串。
+        /// </summary>
+        public static string TbDomesticDNS {
+            get {
+                return ResourceManager.GetString("TbDomesticDNS", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Edit 的本地化字符串。
         /// </summary>
@@ -2427,6 +2508,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 FakeIP 的本地化字符串。
+        /// </summary>
+        public static string TbFakeIP {
+            get {
+                return ResourceManager.GetString("TbFakeIP", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Fingerprint 的本地化字符串。
         /// </summary>
@@ -2445,6 +2535,24 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core&apos;s basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you. 的本地化字符串。
+        /// </summary>
+        public static string TbFullConfigTemplateDesc {
+            get {
+                return ResourceManager.GetString("TbFullConfigTemplateDesc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Enable Full Config Template 的本地化字符串。
+        /// </summary>
+        public static string TbFullConfigTemplateEnable {
+            get {
+                return ResourceManager.GetString("TbFullConfigTemplateEnable", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Global Hotkey Settings 的本地化字符串。
         /// </summary>
@@ -2535,6 +2643,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Mldsa65Verify 的本地化字符串。
+        /// </summary>
+        public static string TbMldsa65Verify {
+            get {
+                return ResourceManager.GetString("TbMldsa65Verify", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Transport protocol(network) 的本地化字符串。
         /// </summary>
@@ -2581,7 +2698,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Server port range 的本地化字符串。
+        ///   查找类似 Configuration port range 的本地化字符串。
         /// </summary>
         public static string TbPorts7 {
             get {
@@ -2643,6 +2760,24 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 v2ray Full Config Template 的本地化字符串。
+        /// </summary>
+        public static string TbRayFullConfigTemplate {
+            get {
+                return ResourceManager.GetString("TbRayFullConfigTemplate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Add Outbound Config Only, routing.balancers and routing.rules.outboundTag, Click to view the document 的本地化字符串。
+        /// </summary>
+        public static string TbRayFullConfigTemplateDesc {
+            get {
+                return ResourceManager.GetString("TbRayFullConfigTemplateDesc", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Alias (remarks) 的本地化字符串。
         /// </summary>
@@ -2652,6 +2787,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Remote DNS 的本地化字符串。
+        /// </summary>
+        public static string TbRemoteDNS {
+            get {
+                return ResourceManager.GetString("TbRemoteDNS", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Camouflage domain(host) 的本地化字符串。
         /// </summary>
@@ -2715,33 +2859,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 3. Block Domain or IP 的本地化字符串。
-        /// </summary>
-        public static string TbRoutingTabBlock {
-            get {
-                return ResourceManager.GetString("TbRoutingTabBlock", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 2. Direct Domain or IP 的本地化字符串。
-        /// </summary>
-        public static string TbRoutingTabDirect {
-            get {
-                return ResourceManager.GetString("TbRoutingTabDirect", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 1. Proxy Domain or IP 的本地化字符串。
-        /// </summary>
-        public static string TbRoutingTabProxy {
-            get {
-                return ResourceManager.GetString("TbRoutingTabProxy", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Pre-defined Rule Set List 的本地化字符串。
         /// </summary>
@@ -2778,6 +2895,96 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Can fill in the configuration remarks, please make sure it exist and are unique 的本地化字符串。
+        /// </summary>
+        public static string TbRuleOutboundTagTip {
+            get {
+                return ResourceManager.GetString("TbRuleOutboundTagTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 sing-box Direct Resolution Strategy 的本地化字符串。
+        /// </summary>
+        public static string TbSBDirectResolveStrategy {
+            get {
+                return ResourceManager.GetString("TbSBDirectResolveStrategy", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 The sing-box DoH resolution server can be overwritten 的本地化字符串。
+        /// </summary>
+        public static string TbSBDoHOverride {
+            get {
+                return ResourceManager.GetString("TbSBDoHOverride", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 sing-box DoH Resolver Server 的本地化字符串。
+        /// </summary>
+        public static string TbSBDoHResolverServer {
+            get {
+                return ResourceManager.GetString("TbSBDoHResolverServer", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Fallback DNS Resolution, Suggest IP 的本地化字符串。
+        /// </summary>
+        public static string TbSBFallbackDNSResolve {
+            get {
+                return ResourceManager.GetString("TbSBFallbackDNSResolve", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 sing-box Full Config Template 的本地化字符串。
+        /// </summary>
+        public static string TbSBFullConfigTemplate {
+            get {
+                return ResourceManager.GetString("TbSBFullConfigTemplate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Add Outbound and Endpoint Config Only, Click to view the document 的本地化字符串。
+        /// </summary>
+        public static string TbSBFullConfigTemplateDesc {
+            get {
+                return ResourceManager.GetString("TbSBFullConfigTemplateDesc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Resolve Outbound Domains 的本地化字符串。
+        /// </summary>
+        public static string TbSBOutboundDomainResolve {
+            get {
+                return ResourceManager.GetString("TbSBOutboundDomainResolve", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Outbound DNS Resolution (sing-box) 的本地化字符串。
+        /// </summary>
+        public static string TbSBOutboundsResolverDNS {
+            get {
+                return ResourceManager.GetString("TbSBOutboundsResolverDNS", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 sing-box Remote Resolution Strategy 的本地化字符串。
+        /// </summary>
+        public static string TbSBRemoteResolveStrategy {
+            get {
+                return ResourceManager.GetString("TbSBRemoteResolveStrategy", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Encryption method (security) 的本地化字符串。
         /// </summary>
@@ -3040,7 +3247,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Double-clicking server makes it active 的本地化字符串。
+        ///   查找类似 Double-clicking Configuration makes it active 的本地化字符串。
         /// </summary>
         public static string TbSettingsDoubleClick2Activate {
             get {
@@ -3076,7 +3283,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Enable sorting servers by drag-n-drop (requires restart) 的本地化字符串。
+        ///   查找类似 Enable sorting Configurations by drag-n-drop (requires restart) 的本地化字符串。
         /// </summary>
         public static string TbSettingsEnableDragDropSort {
             get {
@@ -3103,7 +3310,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Use Xray and enable non-Tun mode, which conflicts with the group previous proxy 的本地化字符串。
+        ///   查找类似 which conflicts with the group previous proxy 的本地化字符串。
         /// </summary>
         public static string TbSettingsEnableFragmentTips {
             get {
@@ -3201,6 +3408,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Current connection info test URL 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsIPAPIUrl {
+            get {
+                return ResourceManager.GetString("TbSettingsIPAPIUrl", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Keep older entries when de-duplicating 的本地化字符串。
         /// </summary>
@@ -3229,25 +3445,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please set the sudo password in Tun mode settings first 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsLinuxSudoPasswordIsEmpty {
-            get {
-                return ResourceManager.GetString("TbSettingsLinuxSudoPasswordIsEmpty", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Please do not run this app with sudo 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsLinuxSudoPasswordNotSudoRunApp {
-            get {
-                return ResourceManager.GetString("TbSettingsLinuxSudoPasswordNotSudoRunApp", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 The password is encrypted and stored only in local files 的本地化字符串。
+        ///   查找类似 The password will be validated via the command line. If a validation error causes the application to malfunction, please restart the application. The password will not be stored and must be entered again after each restart. 的本地化字符串。
         /// </summary>
         public static string TbSettingsLinuxSudoPasswordTip {
             get {
@@ -3526,7 +3724,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Tray right-click menu servers display limit 的本地化字符串。
+        ///   查找类似 Tray right-click menu Configurations display limit 的本地化字符串。
         /// </summary>
         public static string TbSettingsTrayMenuServersLimit {
             get {
@@ -3570,6 +3768,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Set Upstream Proxy Tag 的本地化字符串。
+        /// </summary>
+        public static string TbSetUpstreamProxyDetour {
+            get {
+                return ResourceManager.GetString("TbSetUpstreamProxyDetour", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Short Id 的本地化字符串。
         /// </summary>
@@ -3732,6 +3939,33 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Validate Regional Domain IPs 的本地化字符串。
+        /// </summary>
+        public static string TbValidateDirectExpectedIPs {
+            get {
+                return ResourceManager.GetString("TbValidateDirectExpectedIPs", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs 的本地化字符串。
+        /// </summary>
+        public static string TbValidateDirectExpectedIPsDesc {
+            get {
+                return ResourceManager.GetString("TbValidateDirectExpectedIPsDesc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 xray Freedom Resolution Strategy 的本地化字符串。
+        /// </summary>
+        public static string TbXrayFreedomResolveStrategy {
+            get {
+                return ResourceManager.GetString("TbXrayFreedomResolveStrategy", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 The delay: {0} ms, {1} 的本地化字符串。
         /// </summary>
@@ -3741,6 +3975,24 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Advanced DNS Settings 的本地化字符串。
+        /// </summary>
+        public static string ThAdvancedDNSSettings {
+            get {
+                return ResourceManager.GetString("ThAdvancedDNSSettings", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Basic DNS Settings 的本地化字符串。
+        /// </summary>
+        public static string ThBasicDNSSettings {
+            get {
+                return ResourceManager.GetString("ThBasicDNSSettings", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Active 的本地化字符串。
         /// </summary>
@@ -3939,15 +4191,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Ungrouped 的本地化字符串。
-        /// </summary>
-        public static string UngroupedServers {
-            get {
-                return ResourceManager.GetString("UngroupedServers", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Upgrade App does not exist 的本地化字符串。
         /// </summary>

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

@@ -132,12 +132,6 @@
   <data name="Downloading" xml:space="preserve">
     <value>درحال دانلود...</value>
   </data>
-  <data name="downloadSpeed" xml:space="preserve">
-    <value>دانلود</value>
-  </data>
-  <data name="DownloadYesNo" xml:space="preserve">
-    <value>آیا می خواهید {0} را دانلود کنید؟</value>
-  </data>
   <data name="FailedConversionConfiguration" xml:space="preserve">
     <value>تبدیل فایل پیکربندی انجام نشد</value>
   </data>
@@ -387,9 +381,6 @@
   <data name="RegisterGlobalHotkeySuccessfully" xml:space="preserve">
     <value>کلید میانبر جهانی {0} با موفقیت ثبت شد</value>
   </data>
-  <data name="UngroupedServers" xml:space="preserve">
-    <value>گروه بندی نشده</value>
-  </data>
   <data name="AllGroupServers" xml:space="preserve">
     <value>همه سرورها</value>
   </data>
@@ -822,9 +813,6 @@
   <data name="menuWebsiteItem" xml:space="preserve">
     <value>{0} وب سایت</value>
   </data>
-  <data name="menuRoutingAdvanced" xml:space="preserve">
-    <value>عملکرد پیشرفته</value>
-  </data>
   <data name="menuRoutingAdvancedAdd" xml:space="preserve">
     <value>اضافه کردن</value>
   </data>
@@ -837,21 +825,9 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>تنظیم کردن به عنوان قانون فعال</value>
   </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>تطبیق دامنه</value>
-  </data>
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>استراتژی دامنه</value>
   </data>
-  <data name="TbRoutingTabBlock" xml:space="preserve">
-    <value>3. مسدود کردن دامنه یا آیپی</value>
-  </data>
-  <data name="TbRoutingTabDirect" xml:space="preserve">
-    <value>2. دایرکت کردن دامنه یا IP</value>
-  </data>
-  <data name="TbRoutingTabProxy" xml:space="preserve">
-    <value>1. پروکسی کردن دامنه یا IP</value>
-  </data>
   <data name="TbRoutingTabRuleList" xml:space="preserve">
     <value>لیست مجموعه قوانین از پیش تعریف شده</value>
   </data>
@@ -1126,7 +1102,7 @@
     <value>افزودن سرور [HTTP]</value>
   </data>
   <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
-    <value>از Xray استفاده کنید و حالت non-Tun را فعال کنید، که با پراکسی قبلی گروه در تضاد است</value>
+    <value>which conflicts with the group previous proxy</value>
   </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>فعال کردن فرگمنت</value>
@@ -1339,13 +1315,7 @@
     <value>رمز عبور sudo سیستم</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
-    <value>رمز عبور رمزگذاری شده و فقط در فایل های محلی ذخیره می شود.</value>
-  </data>
-  <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
-    <value>لطفاً ابتدا رمز عبور sudo را در تنظیمات حالت Tun تنظیم کنید</value>
-  </data>
-  <data name="TbSettingsLinuxSudoPasswordNotSudoRunApp" xml:space="preserve">
-    <value>لطفا این برنامه را با sudo اجرا نکنید</value>
+    <value>The password will be validated via the command line. If a validation error causes the application to malfunction, please restart the application. The password will not be stored and must be entered again after each restart.</value>
   </data>
   <data name="TransportHeaderTypeTip5" xml:space="preserve">
     <value>*حالت xhttp</value>
@@ -1416,4 +1386,115 @@
   <data name="menuExportConfig" xml:space="preserve">
     <value>صادر کردن سرور</value>
   </data>
+  <data name="TbSettingsIPAPIUrl" xml:space="preserve">
+    <value>URL آزمایش اطلاعات اتصال فعلی</value>
+  </data>
+  <data name="TbRuleOutboundTagTip" xml:space="preserve">
+    <value>Can fill in the configuration remarks, please make sure it exist and are unique</value>
+  </data>
+  <data name="SudoIncorrectPasswordTip" xml:space="preserve">
+    <value>Incorrect password, please try again.</value>
+  </data>
+  <data name="TbMldsa65Verify" xml:space="preserve">
+    <value>Mldsa65Verify</value>
+  </data>
+  <data name="menuAddAnytlsServer" xml:space="preserve">
+    <value>Add [Anytls] Configuration</value>
+  </data>
+  <data name="TbRemoteDNS" xml:space="preserve">
+    <value>Remote DNS</value>
+  </data>
+  <data name="TbDomesticDNS" xml:space="preserve">
+    <value>Domestic DNS</value>
+  </data>
+  <data name="TbSBOutboundsResolverDNS" xml:space="preserve">
+    <value>Outbound DNS Resolution (sing-box)</value>
+  </data>
+  <data name="TbSBOutboundDomainResolve" xml:space="preserve">
+    <value>Resolve Outbound Domains</value>
+  </data>
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
+    <value>sing-box DoH Resolver Server</value>
+  </data>
+  <data name="TbSBFallbackDNSResolve" xml:space="preserve">
+    <value>Fallback DNS Resolution, Suggest IP</value>
+  </data>
+  <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
+    <value>xray Freedom Resolution Strategy</value>
+  </data>
+  <data name="TbSBDirectResolveStrategy" xml:space="preserve">
+    <value>sing-box Direct Resolution Strategy</value>
+  </data>
+  <data name="TbSBRemoteResolveStrategy" xml:space="preserve">
+    <value>sing-box Remote Resolution Strategy</value>
+  </data>
+  <data name="TbAddCommonDNSHosts" xml:space="preserve">
+    <value>Add Common DNS Hosts</value>
+  </data>
+  <data name="TbSBDoHOverride" xml:space="preserve">
+    <value>The sing-box DoH resolution server can be overwritten</value>
+  </data>
+  <data name="TbFakeIP" xml:space="preserve">
+    <value>FakeIP</value>
+  </data>
+  <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
+    <value>Block SVCB and HTTPS Queries</value>
+  </data>
+  <data name="TbDNSHostsConfig" xml:space="preserve">
+    <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
+  </data>
+  <data name="TbApplyProxyDomainsOnly" xml:space="preserve">
+    <value>Apply to Proxy Domains Only</value>
+  </data>
+  <data name="ThBasicDNSSettings" xml:space="preserve">
+    <value>Basic DNS Settings</value>
+  </data>
+  <data name="ThAdvancedDNSSettings" xml:space="preserve">
+    <value>Advanced DNS Settings</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPs" xml:space="preserve">
+    <value>Validate Regional Domain IPs</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
+    <value>When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs</value>
+  </data>
+  <data name="TbCustomDNSEnable" xml:space="preserve">
+    <value>Enable Custom DNS</value>
+  </data>
+  <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
+    <value>Custom DNS Enabled, This Page's Settings Invalid</value>
+  </data>
+  <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
+    <value>Prevent domain-based routing rules from failing</value>
+  </data>
+  <data name="FillCorrectConfigTemplateText" xml:space="preserve">
+    <value>Please fill in the correct config template</value>
+  </data>
+  <data name="menuFullConfigTemplate" xml:space="preserve">
+    <value>Full Config Template Setting</value>
+  </data>
+  <data name="TbFullConfigTemplateEnable" xml:space="preserve">
+    <value>Enable Full Config Template</value>
+  </data>
+  <data name="TbRayFullConfigTemplate" xml:space="preserve">
+    <value>v2ray Full Config Template</value>
+  </data>
+  <data name="TbRayFullConfigTemplateDesc" xml:space="preserve">
+    <value>Add Outbound Config Only, routing.balancers and routing.rules.outboundTag, Click to view the document</value>
+  </data>
+  <data name="TbAddProxyProtocolOutboundOnly" xml:space="preserve">
+    <value>Do Not Add Non-Proxy Protocol Outbound</value>
+  </data>
+  <data name="TbSetUpstreamProxyDetour" xml:space="preserve">
+    <value>Set Upstream Proxy Tag</value>
+  </data>
+  <data name="TbSBFullConfigTemplate" xml:space="preserve">
+    <value>sing-box Full Config Template</value>
+  </data>
+  <data name="TbSBFullConfigTemplateDesc" xml:space="preserve">
+    <value>Add Outbound and Endpoint Config Only, Click to view the document</value>
+  </data>
+  <data name="TbFullConfigTemplateDesc" xml:space="preserve">
+    <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -121,7 +121,7 @@
     <value>Export share link to clipboard successfully</value>
   </data>
   <data name="CheckServerSettings" xml:space="preserve">
-    <value>Please check the server settings first.</value>
+    <value>Please check the Configuration settings first.</value>
   </data>
   <data name="ConfigurationFormatIncorrect" xml:space="preserve">
     <value>Invalid configuration format.</value>
@@ -132,12 +132,6 @@
   <data name="Downloading" xml:space="preserve">
     <value>Downloading...</value>
   </data>
-  <data name="downloadSpeed" xml:space="preserve">
-    <value>Download speed</value>
-  </data>
-  <data name="DownloadYesNo" xml:space="preserve">
-    <value>Do you want to download {0}?</value>
-  </data>
   <data name="FailedConversionConfiguration" xml:space="preserve">
     <value>Failed to convert configuration file</value>
   </data>
@@ -148,13 +142,13 @@
     <value>Failed to get the default configuration</value>
   </data>
   <data name="FailedImportedCustomServer" xml:space="preserve">
-    <value>Failed to import custom configuration server</value>
+    <value>Failed to import custom configuration Configuration</value>
   </data>
   <data name="FailedReadConfiguration" xml:space="preserve">
     <value>Failed to read configuration file</value>
   </data>
   <data name="FillCorrectServerPort" xml:space="preserve">
-    <value>Please enter the correct server port format.</value>
+    <value>Please enter the correct port format.</value>
   </data>
   <data name="FillLocalListeningPort" xml:space="preserve">
     <value>Please enter the local listening port.</value>
@@ -163,7 +157,7 @@
     <value>Please enter the password.</value>
   </data>
   <data name="FillServerAddress" xml:space="preserve">
-    <value>Please enter the server address.</value>
+    <value>Please enter the address.</value>
   </data>
   <data name="FillUUID" xml:space="preserve">
     <value>Please enter the user ID.</value>
@@ -271,13 +265,13 @@
     <value>Please select a protocol</value>
   </data>
   <data name="PleaseSelectServer" xml:space="preserve">
-    <value>Please select the server first</value>
+    <value>Please select the Configuration first</value>
   </data>
   <data name="RemoveDuplicateServerResult" xml:space="preserve">
-    <value>Servers deduplication completed. Old: {0}, New: {1}.</value>
+    <value>Configurations deduplication completed. Old: {0}, New: {1}.</value>
   </data>
   <data name="RemoveServer" xml:space="preserve">
-    <value>Are you sure you want to remove the server?</value>
+    <value>Are you sure you want to remove the Configuration?</value>
   </data>
   <data name="SaveClientConfigurationIn" xml:space="preserve">
     <value>The client configuration file is saved at: {0}</value>
@@ -289,10 +283,10 @@
     <value>Configuration successful. {0}</value>
   </data>
   <data name="SuccessfullyImportedCustomServer" xml:space="preserve">
-    <value>Custom configuration server imported successfully</value>
+    <value>Custom configuration Configuration imported successfully</value>
   </data>
   <data name="SuccessfullyImportedServerViaClipboard" xml:space="preserve">
-    <value>{0} servers have been imported from clipboard</value>
+    <value>{0} Configurations have been imported from clipboard</value>
   </data>
   <data name="SuccessfullyImportedServerViaScan" xml:space="preserve">
     <value>Successfully scanned and imported the shared link</value>
@@ -387,14 +381,11 @@
   <data name="RegisterGlobalHotkeySuccessfully" xml:space="preserve">
     <value>Global hotkey {0} registered successfully</value>
   </data>
-  <data name="UngroupedServers" xml:space="preserve">
-    <value>Ungrouped</value>
-  </data>
   <data name="AllGroupServers" xml:space="preserve">
     <value>All</value>
   </data>
   <data name="FillServerAddressCustom" xml:space="preserve">
-    <value>Please browse to import server configuration</value>
+    <value>Please browse to import Configuration configuration</value>
   </data>
   <data name="Speedtesting" xml:space="preserve">
     <value>Testing...</value>
@@ -406,7 +397,7 @@
     <value>Local</value>
   </data>
   <data name="MsgServerTitle" xml:space="preserve">
-    <value>Server filter, press Enter to execute</value>
+    <value>Configuration filter, press Enter to execute</value>
   </data>
   <data name="menuCheckUpdate" xml:space="preserve">
     <value>Check Update</value>
@@ -436,7 +427,7 @@
     <value>Routing Setting</value>
   </data>
   <data name="menuServers" xml:space="preserve">
-    <value>Servers</value>
+    <value>Configurations</value>
   </data>
   <data name="menuSetting" xml:space="preserve">
     <value>Settings</value>
@@ -487,55 +478,55 @@
     <value>Scan QR code on the screen (Ctrl+S)</value>
   </data>
   <data name="menuCopyServer" xml:space="preserve">
-    <value>Clone selected server</value>
+    <value>Clone selected Configuration</value>
   </data>
   <data name="menuRemoveDuplicateServer" xml:space="preserve">
-    <value>Remove duplicate servers</value>
+    <value>Remove duplicate Configurations</value>
   </data>
   <data name="menuRemoveServer" xml:space="preserve">
-    <value>Remove selected servers (Delete)</value>
+    <value>Remove selected Configurations (Delete)</value>
   </data>
   <data name="menuSetDefaultServer" xml:space="preserve">
-    <value>Set as active server (Enter)</value>
+    <value>Set as active Configuration (Enter)</value>
   </data>
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>Clear all service statistics</value>
   </data>
   <data name="menuRealPingServer" xml:space="preserve">
-    <value>Test servers real delay (Ctrl+R)</value>
+    <value>Test Configurations real delay (Ctrl+R)</value>
   </data>
   <data name="menuSortServerResult" xml:space="preserve">
     <value>Sort by test result</value>
   </data>
   <data name="menuSpeedServer" xml:space="preserve">
-    <value>Test servers download speed (Ctrl+T)</value>
+    <value>Test Configurations download speed (Ctrl+T)</value>
   </data>
   <data name="menuTcpingServer" xml:space="preserve">
-    <value>Test servers with tcping (Ctrl+O)</value>
+    <value>Test Configurations with tcping (Ctrl+O)</value>
   </data>
   <data name="menuExport2ClientConfig" xml:space="preserve">
-    <value>Export selected server for complete configuration</value>
+    <value>Export selected Configuration for complete configuration</value>
   </data>
   <data name="menuExport2ShareUrl" xml:space="preserve">
     <value>Export Share Link to Clipboard (Ctrl+C)</value>
   </data>
   <data name="menuAddCustomServer" xml:space="preserve">
-    <value>Add a custom configuration server</value>
+    <value>Add a custom configuration Configuration</value>
   </data>
   <data name="menuAddShadowsocksServer" xml:space="preserve">
-    <value>Add [Shadowsocks] server</value>
+    <value>Add [Shadowsocks] Configuration</value>
   </data>
   <data name="menuAddSocksServer" xml:space="preserve">
-    <value>Add [SOCKS] server</value>
+    <value>Add [SOCKS] Configuration</value>
   </data>
   <data name="menuAddTrojanServer" xml:space="preserve">
-    <value>Add [Trojan] server</value>
+    <value>Add [Trojan] Configuration</value>
   </data>
   <data name="menuAddVlessServer" xml:space="preserve">
-    <value>Add [VLESS] server</value>
+    <value>Add [VLESS] Configuration</value>
   </data>
   <data name="menuAddVmessServer" xml:space="preserve">
-    <value>Add [VMess] server</value>
+    <value>Add [VMess] Configuration</value>
   </data>
   <data name="menuSelectAll" xml:space="preserve">
     <value>Select all (Ctrl+A)</value>
@@ -760,7 +751,7 @@
     <value>Enable Security Protocol TLS v1.3 (subscription/update)</value>
   </data>
   <data name="TbSettingsTrayMenuServersLimit" xml:space="preserve">
-    <value>Tray right-click menu servers display limit</value>
+    <value>Tray right-click menu Configurations display limit</value>
   </data>
   <data name="TbSettingsUdpEnabled" xml:space="preserve">
     <value>Enable UDP</value>
@@ -793,7 +784,7 @@
     <value>PAC mode</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
-    <value>Share Server (Ctrl+F)</value>
+    <value>Share Configuration (Ctrl+F)</value>
   </data>
   <data name="menuRouting" xml:space="preserve">
     <value>Routing</value>
@@ -822,9 +813,6 @@
   <data name="menuWebsiteItem" xml:space="preserve">
     <value>{0} Website</value>
   </data>
-  <data name="menuRoutingAdvanced" xml:space="preserve">
-    <value>Advanced Function</value>
-  </data>
   <data name="menuRoutingAdvancedAdd" xml:space="preserve">
     <value>Add</value>
   </data>
@@ -837,21 +825,9 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>Set as active rule (Enter)</value>
   </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>Domain Matcher</value>
-  </data>
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>Domain strategy</value>
   </data>
-  <data name="TbRoutingTabBlock" xml:space="preserve">
-    <value>3. Block Domain or IP</value>
-  </data>
-  <data name="TbRoutingTabDirect" xml:space="preserve">
-    <value>2. Direct Domain or IP</value>
-  </data>
-  <data name="TbRoutingTabProxy" xml:space="preserve">
-    <value>1. Proxy Domain or IP</value>
-  </data>
   <data name="TbRoutingTabRuleList" xml:space="preserve">
     <value>Pre-defined Rule Set List</value>
   </data>
@@ -940,7 +916,7 @@
     <value>Move to group</value>
   </data>
   <data name="TbSettingsEnableDragDropSort" xml:space="preserve">
-    <value>Enable sorting servers by drag-n-drop (requires restart)</value>
+    <value>Enable sorting Configurations by drag-n-drop (requires restart)</value>
   </data>
   <data name="TbAutoRefresh" xml:space="preserve">
     <value>Auto refresh</value>
@@ -949,10 +925,10 @@
     <value>Skip test</value>
   </data>
   <data name="menuEditServer" xml:space="preserve">
-    <value>Edit Server (Ctrl+D)</value>
+    <value>Edit Configuration (Ctrl+D)</value>
   </data>
   <data name="TbSettingsDoubleClick2Activate" xml:space="preserve">
-    <value>Double-clicking server makes it active</value>
+    <value>Double-clicking Configuration makes it active</value>
   </data>
   <data name="SpeedtestingCompleted" xml:space="preserve">
     <value>Test completed</value>
@@ -1060,7 +1036,7 @@
     <value>Domain</value>
   </data>
   <data name="menuAddHysteria2Server" xml:space="preserve">
-    <value>Add [Hysteria2] server</value>
+    <value>Add [Hysteria2] Configuration</value>
   </data>
   <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
     <value>Hysteria Max bandwidth (Up/Down)</value>
@@ -1069,19 +1045,19 @@
     <value>Use System Hosts</value>
   </data>
   <data name="menuAddTuicServer" xml:space="preserve">
-    <value>Add [TUIC] server</value>
+    <value>Add [TUIC] Configuration</value>
   </data>
   <data name="TbHeaderType8" xml:space="preserve">
     <value>Congestion control</value>
   </data>
   <data name="LvPrevProfile" xml:space="preserve">
-    <value>Previous proxy remarks</value>
+    <value>Previous proxy Configuration remarks</value>
   </data>
   <data name="LvNextProfile" xml:space="preserve">
-    <value>Next proxy remarks</value>
+    <value>Next proxy Configuration remarks</value>
   </data>
   <data name="LvPrevProfileTip" xml:space="preserve">
-    <value>Please make sure the remarks exist and are unique</value>
+    <value>Please make sure the Configuration remarks exist and are unique</value>
   </data>
   <data name="TbSettingsEnableExInbound" xml:space="preserve">
     <value>Enable additional Inbound</value>
@@ -1090,7 +1066,7 @@
     <value>Enable IPv6 Address</value>
   </data>
   <data name="menuAddWireguardServer" xml:space="preserve">
-    <value>Add [WireGuard] server</value>
+    <value>Add [WireGuard] Configuration</value>
   </data>
   <data name="TbPrivateKey" xml:space="preserve">
     <value>Private Key</value>
@@ -1123,10 +1099,10 @@
     <value>*grpc Authority</value>
   </data>
   <data name="menuAddHttpServer" xml:space="preserve">
-    <value>Add [HTTP] server</value>
+    <value>Add [HTTP] Configuration</value>
   </data>
   <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
-    <value>Use Xray and enable non-Tun mode, which conflicts with the group previous proxy</value>
+    <value>which conflicts with the group previous proxy</value>
   </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>Enable fragment</value>
@@ -1237,7 +1213,7 @@
     <value>Export Base64-encoded Share Links to Clipboard</value>
   </data>
   <data name="menuExport2ClientConfigClipboard" xml:space="preserve">
-    <value>Export selected server for complete configuration to clipboard</value>
+    <value>Export selected Configuration for complete configuration to clipboard</value>
   </data>
   <data name="menuShowOrHideMainWindow" xml:space="preserve">
     <value>Show or hide the main window</value>
@@ -1339,13 +1315,7 @@
     <value>System sudo password</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
-    <value>The password is encrypted and stored only in local files</value>
-  </data>
-  <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
-    <value>Please set the sudo password in Tun mode settings first</value>
-  </data>
-  <data name="TbSettingsLinuxSudoPasswordNotSudoRunApp" xml:space="preserve">
-    <value>Please do not run this app with sudo</value>
+    <value>The password will be validated via the command line. If a validation error causes the application to malfunction, please restart the application. The password will not be stored and must be entered again after each restart.</value>
   </data>
   <data name="TransportHeaderTypeTip5" xml:space="preserve">
     <value>*xhttp mode</value>
@@ -1390,30 +1360,141 @@
     <value>Removed {0} invalid test results.</value>
   </data>
   <data name="TbPorts7" xml:space="preserve">
-    <value>Server port range</value>
+    <value>Configuration port range</value>
   </data>
   <data name="TbPorts7Tips" xml:space="preserve">
     <value>Will cover the port, separate with commas (,)</value>
   </data>
   <data name="menuSetDefaultMultipleServer" xml:space="preserve">
-    <value>Multi-server to custom configuration</value>
+    <value>Multi-Configuration to custom configuration</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayRandom" xml:space="preserve">
-    <value>Multi-server Random by Xray</value>
+    <value>Multi-Configuration Random by Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayRoundRobin" xml:space="preserve">
-    <value>Multi-server RoundRobin by Xray</value>
+    <value>Multi-Configuration RoundRobin by Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayLeastPing" xml:space="preserve">
-    <value>Multi-server LeastPing by Xray</value>
+    <value>Multi-Configuration LeastPing by Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayLeastLoad" xml:space="preserve">
-    <value>Multi-server LeastLoad by Xray</value>
+    <value>Multi-Configuration LeastLoad by Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerSingBoxLeastPing" xml:space="preserve">
-    <value>Multi-server LeastPing by sing-box</value>
+    <value>Multi-Configuration LeastPing by sing-box</value>
   </data>
   <data name="menuExportConfig" xml:space="preserve">
-    <value>Export server</value>
+    <value>Export Configuration</value>
+  </data>
+  <data name="TbSettingsIPAPIUrl" xml:space="preserve">
+    <value>Current connection info test URL</value>
+  </data>
+  <data name="TbRuleOutboundTagTip" xml:space="preserve">
+    <value>Can fill in the configuration remarks, please make sure it exist and are unique</value>
+  </data>
+  <data name="SudoIncorrectPasswordTip" xml:space="preserve">
+    <value>Incorrect password, please try again.</value>
+  </data>
+  <data name="TbMldsa65Verify" xml:space="preserve">
+    <value>Mldsa65Verify</value>
+  </data>
+  <data name="menuAddAnytlsServer" xml:space="preserve">
+    <value>Add [Anytls] Configuration</value>
+  </data>
+  <data name="TbRemoteDNS" xml:space="preserve">
+    <value>Remote DNS</value>
+  </data>
+  <data name="TbDomesticDNS" xml:space="preserve">
+    <value>Domestic DNS</value>
+  </data>
+  <data name="TbSBOutboundsResolverDNS" xml:space="preserve">
+    <value>Outbound DNS Resolution (sing-box)</value>
+  </data>
+  <data name="TbSBOutboundDomainResolve" xml:space="preserve">
+    <value>Resolve Outbound Domains</value>
+  </data>
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
+    <value>sing-box DoH Resolver Server</value>
+  </data>
+  <data name="TbSBFallbackDNSResolve" xml:space="preserve">
+    <value>Fallback DNS Resolution, Suggest IP</value>
+  </data>
+  <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
+    <value>xray Freedom Resolution Strategy</value>
+  </data>
+  <data name="TbSBDirectResolveStrategy" xml:space="preserve">
+    <value>sing-box Direct Resolution Strategy</value>
+  </data>
+  <data name="TbSBRemoteResolveStrategy" xml:space="preserve">
+    <value>sing-box Remote Resolution Strategy</value>
+  </data>
+  <data name="TbAddCommonDNSHosts" xml:space="preserve">
+    <value>Add Common DNS Hosts</value>
+  </data>
+  <data name="TbSBDoHOverride" xml:space="preserve">
+    <value>The sing-box DoH resolution server can be overwritten</value>
+  </data>
+  <data name="TbFakeIP" xml:space="preserve">
+    <value>FakeIP</value>
+  </data>
+  <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
+    <value>Block SVCB and HTTPS Queries</value>
+  </data>
+  <data name="TbDNSHostsConfig" xml:space="preserve">
+    <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
+  </data>
+  <data name="TbApplyProxyDomainsOnly" xml:space="preserve">
+    <value>Apply to Proxy Domains Only</value>
+  </data>
+  <data name="ThBasicDNSSettings" xml:space="preserve">
+    <value>Basic DNS Settings</value>
+  </data>
+  <data name="ThAdvancedDNSSettings" xml:space="preserve">
+    <value>Advanced DNS Settings</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPs" xml:space="preserve">
+    <value>Validate Regional Domain IPs</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
+    <value>When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs</value>
+  </data>
+  <data name="TbCustomDNSEnable" xml:space="preserve">
+    <value>Enable Custom DNS</value>
+  </data>
+  <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
+    <value>Custom DNS Enabled, This Page's Settings Invalid</value>
+  </data>
+  <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
+    <value>Prevent domain-based routing rules from failing</value>
+  </data>
+  <data name="FillCorrectConfigTemplateText" xml:space="preserve">
+    <value>Please fill in the correct config template</value>
+  </data>
+  <data name="menuFullConfigTemplate" xml:space="preserve">
+    <value>Full Config Template Setting</value>
+  </data>
+  <data name="TbFullConfigTemplateEnable" xml:space="preserve">
+    <value>Enable Full Config Template</value>
+  </data>
+  <data name="TbRayFullConfigTemplate" xml:space="preserve">
+    <value>v2ray Full Config Template</value>
+  </data>
+  <data name="TbRayFullConfigTemplateDesc" xml:space="preserve">
+    <value>Add Outbound Config Only, routing.balancers and routing.rules.outboundTag, Click to view the document</value>
+  </data>
+  <data name="TbAddProxyProtocolOutboundOnly" xml:space="preserve">
+    <value>Do Not Add Non-Proxy Protocol Outbound</value>
+  </data>
+  <data name="TbSetUpstreamProxyDetour" xml:space="preserve">
+    <value>Set Upstream Proxy Tag</value>
+  </data>
+  <data name="TbSBFullConfigTemplate" xml:space="preserve">
+    <value>sing-box Full Config Template</value>
+  </data>
+  <data name="TbSBFullConfigTemplateDesc" xml:space="preserve">
+    <value>Add Outbound and Endpoint Config Only, Click to view the document</value>
+  </data>
+  <data name="TbFullConfigTemplateDesc" xml:space="preserve">
+    <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
   </data>
 </root>

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>
@@ -132,12 +132,6 @@
   <data name="Downloading" xml:space="preserve">
     <value>下载开始...</value>
   </data>
-  <data name="downloadSpeed" xml:space="preserve">
-    <value>下载</value>
-  </data>
-  <data name="DownloadYesNo" xml:space="preserve">
-    <value>是否下载？{0}</value>
-  </data>
   <data name="FailedConversionConfiguration" xml:space="preserve">
     <value>转换配置文件失败</value>
   </data>
@@ -148,13 +142,13 @@
     <value>获取默认配置失败</value>
   </data>
   <data name="FailedImportedCustomServer" xml:space="preserve">
-    <value>导入自定义配置服务器失败</value>
+    <value>导入自定义配置文件失败</value>
   </data>
   <data name="FailedReadConfiguration" xml:space="preserve">
     <value>读取配置文件失败</value>
   </data>
   <data name="FillCorrectServerPort" xml:space="preserve">
-    <value>请填写正确格式的服务器端口</value>
+    <value>请填写正确格式的端口</value>
   </data>
   <data name="FillLocalListeningPort" xml:space="preserve">
     <value>请填写本地监听端口</value>
@@ -163,7 +157,7 @@
     <value>请填写密码</value>
   </data>
   <data name="FillServerAddress" xml:space="preserve">
-    <value>请填写服务器地址</value>
+    <value>请填写地址</value>
   </data>
   <data name="FillUUID" xml:space="preserve">
     <value>请填写用户 ID</value>
@@ -271,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>
@@ -289,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>
@@ -387,14 +381,11 @@
   <data name="RegisterGlobalHotkeySuccessfully" xml:space="preserve">
     <value>注册全局热键 {0} 成功</value>
   </data>
-  <data name="UngroupedServers" xml:space="preserve">
-    <value>未分组服务器</value>
-  </data>
   <data name="AllGroupServers" xml:space="preserve">
     <value>所有</value>
   </data>
   <data name="FillServerAddressCustom" xml:space="preserve">
-    <value>请浏览导入服务器配置</value>
+    <value>请浏览导入配置文件配置</value>
   </data>
   <data name="Speedtesting" xml:space="preserve">
     <value>测试中...</value>
@@ -406,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>
@@ -436,7 +427,7 @@
     <value>路由设置</value>
   </data>
   <data name="menuServers" xml:space="preserve">
-    <value>服务器</value>
+    <value>配置文件</value>
   </data>
   <data name="menuSetting" xml:space="preserve">
     <value>设置</value>
@@ -487,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>
@@ -700,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>
@@ -712,7 +703,7 @@
     <value>例外：对于下列字符开头的地址，不使用代理配置文件。使用分号 (;) 分隔。</value>
   </data>
   <data name="TbSettingsDisplayRealTimeSpeed" xml:space="preserve">
-    <value>显示实时速度（需重启）</value>
+    <value>显示实时速度 (需重启)</value>
   </data>
   <data name="TbSettingsKeepOlderDedupl" xml:space="preserve">
     <value>去重时保留序号较小的项</value>
@@ -748,7 +739,7 @@
     <value>开机启动 (可能会不成功)</value>
   </data>
   <data name="TbSettingsStatistics" xml:space="preserve">
-    <value>启用流量统计（需重启）</value>
+    <value>启用流量统计 (需重启)</value>
   </data>
   <data name="TbSettingsSubConvert" xml:space="preserve">
     <value>订阅转换网址 (可选)</value>
@@ -760,7 +751,7 @@
     <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>
@@ -793,7 +784,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>
@@ -822,9 +813,6 @@
   <data name="menuWebsiteItem" xml:space="preserve">
     <value>{0} 官网</value>
   </data>
-  <data name="menuRoutingAdvanced" xml:space="preserve">
-    <value>高级功能</value>
-  </data>
   <data name="menuRoutingAdvancedAdd" xml:space="preserve">
     <value>添加规则集</value>
   </data>
@@ -837,21 +825,9 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>设为活动规则 (Enter)</value>
   </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>域名匹配算法</value>
-  </data>
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>域名解析策略</value>
   </data>
-  <data name="TbRoutingTabBlock" xml:space="preserve">
-    <value>3.阻止的 Domain 或 IP</value>
-  </data>
-  <data name="TbRoutingTabDirect" xml:space="preserve">
-    <value>2.直连的 Domain 或 IP</value>
-  </data>
-  <data name="TbRoutingTabProxy" xml:space="preserve">
-    <value>1.代理的 Domain 或 IP</value>
-  </data>
   <data name="TbRoutingTabRuleList" xml:space="preserve">
     <value>预定义规则集列表</value>
   </data>
@@ -907,7 +883,7 @@
     <value>仅限路由 (routeOnly)</value>
   </data>
   <data name="TbSettingsNotProxyLocalAddress" xml:space="preserve">
-    <value>请勿将代理服务器用于本地（Intranet）地址</value>
+    <value>请勿将代理服务器用于本地 (Intranet) 地址</value>
   </data>
   <data name="menuMixedTestServer" xml:space="preserve">
     <value>一键多线程测试延迟和速度 (Ctrl+E)</value>
@@ -940,7 +916,7 @@
     <value>移至订阅分组</value>
   </data>
   <data name="TbSettingsEnableDragDropSort" xml:space="preserve">
-    <value>启用服务器拖放排序（需重启）</value>
+    <value>启用配置文件拖放排序 (需重启)</value>
   </data>
   <data name="TbAutoRefresh" xml:space="preserve">
     <value>自动刷新</value>
@@ -949,10 +925,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>
@@ -967,10 +943,10 @@
     <value>仅对 tcp/http、ws 协议生效</value>
   </data>
   <data name="TbSettingsCurrentFontFamily" xml:space="preserve">
-    <value>当前字体（需重启）</value>
+    <value>当前字体 (需重启)</value>
   </data>
   <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
-    <value>拷贝字体 TTF/TTC 文件到目录 guiFonts，重启设置</value>
+    <value>拷贝字体 TTF/TTC 文件到目录 guiFonts，重启生效</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
     <value>Pac 端口 = +3；Xray API 端口 = +4；mihomo API 端口 = +5；</value>
@@ -1000,10 +976,10 @@
     <value>SpiderX</value>
   </data>
   <data name="TbSettingsEnableHWA" xml:space="preserve">
-    <value>启用硬件加速（需重启）</value>
+    <value>启用硬件加速 (需重启)</value>
   </data>
   <data name="SpeedtestingWait" xml:space="preserve">
-    <value>等待测试中（按 ESC 终止）...</value>
+    <value>等待测试中 (按 ESC 终止)...</value>
   </data>
   <data name="TipDisplayLog" xml:space="preserve">
     <value>当有异常断流时请关闭</value>
@@ -1057,7 +1033,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>
@@ -1066,19 +1042,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="TbSettingsEnableExInbound" xml:space="preserve">
     <value>启用额外监听端口</value>
@@ -1087,7 +1063,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>
@@ -1096,7 +1072,7 @@
     <value>Reserved (2,3,4)</value>
   </data>
   <data name="TbLocalAddress" xml:space="preserve">
-    <value>Address (Ipv4,Ipv6)</value>
+    <value>Address (IPv4,IPv6)</value>
   </data>
   <data name="TbPath7" xml:space="preserve">
     <value>混淆密码 (obfs password)</value>
@@ -1120,16 +1096,16 @@
     <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>使用 Xray 且非 Tun 模式启用，和分组前置代理冲突</value>
+    <value>和分组前置代理冲突</value>
   </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
-    <value>启用分片（Fragment）</value>
+    <value>启用分片 (Fragment)</value>
   </data>
   <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
-    <value>启用 sing-box（规则集文件）的缓存文件</value>
+    <value>启用 sing-box (规则集文件) 的缓存文件</value>
   </data>
   <data name="LvCustomRulesetPath4Singbox" xml:space="preserve">
     <value>自定义 sing-box rule-set</value>
@@ -1222,7 +1198,7 @@
     <value>Outbound 默认解析策略</value>
   </data>
   <data name="TbSettingsMainGirdOrientation" xml:space="preserve">
-    <value>主界面布局方向（需重启）</value>
+    <value>主界面布局方向 (需重启)</value>
   </data>
   <data name="TbSettingsDomainDNSAddress" xml:space="preserve">
     <value>Outbound 域名解析地址</value>
@@ -1234,7 +1210,7 @@
     <value>导出分享链接至剪贴板 (多选) Base64 编码</value>
   </data>
   <data name="menuExport2ClientConfigClipboard" xml:space="preserve">
-    <value>导出所选服务器完整配置至剪贴板</value>
+    <value>导出所选配置文件完整配置至剪贴板</value>
   </data>
   <data name="menuShowOrHideMainWindow" xml:space="preserve">
     <value>显示或隐藏主界面</value>
@@ -1324,7 +1300,7 @@
     <value>请不要使用不安全的 HTTP 协议订阅地址</value>
   </data>
   <data name="TbSettingsCurrentFontFamilyLinuxTip" xml:space="preserve">
-    <value>安装字体到系统中，选择或填入字体名称，重启设置</value>
+    <value>安装字体到系统中，选择或填入字体名称，重启生效</value>
   </data>
   <data name="menuExitTips" xml:space="preserve">
     <value>是否确定退出？</value>
@@ -1336,16 +1312,10 @@
     <value>系统的 sudo 密码</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
-    <value>密码已加密且只存储在本地文件中，无密码则每次都要输入</value>
-  </data>
-  <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
-    <value>请先在 Tun 模式设置中设置 sudo 密码</value>
-  </data>
-  <data name="TbSettingsLinuxSudoPasswordNotSudoRunApp" xml:space="preserve">
-    <value>请不要用 sudo 运行本程序</value>
+    <value>密码将调用命令行校验，如果因为校验错误导致无法正常运行时，请重启本应用。 密码不会存储，每次重启后都需要再次输入。</value>
   </data>
   <data name="TransportHeaderTypeTip5" xml:space="preserve">
-    <value>*xhttp 模式</value>
+    <value>*XHTTP 模式</value>
   </data>
   <data name="TransportExtraTip" xml:space="preserve">
     <value>XHTTP Extra 原始 JSON，格式： { XHTTPObject }</value>
@@ -1366,7 +1336,7 @@
     <value>开启第二个本地监听端口</value>
   </data>
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
-    <value>socks：本地端口，socks2：第二个本地端口，socks3：局域网端口</value>
+    <value>Socks：本地端口，Socks2：第二个本地端口，Socks3：局域网端口</value>
   </data>
   <data name="TbSettingsTheme" xml:space="preserve">
     <value>主题</value>
@@ -1393,24 +1363,135 @@
     <value>会覆盖端口，多组时用逗号 (,) 隔开</value>
   </data>
   <data name="menuSetDefaultMultipleServer" xml:space="preserve">
-    <value>多服务器产生自定义配置 (多选)</value>
+    <value>多配置文件产生自定义配置 (多选)</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayRandom" xml:space="preserve">
-    <value>多服务器随机 Xray</value>
+    <value>多配置文件随机 Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayRoundRobin" xml:space="preserve">
-    <value>多服务器负载均衡  Xray</value>
+    <value>多配置文件负载均衡 Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayLeastPing" xml:space="preserve">
-    <value>多服务器最低延迟  Xray</value>
+    <value>多配置文件最低延迟 Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayLeastLoad" xml:space="preserve">
-    <value>多服务器最稳定  Xray</value>
+    <value>多配置文件最稳定 Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerSingBoxLeastPing" 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>
+  </data>
+  <data name="SudoIncorrectPasswordTip" xml:space="preserve">
+    <value>密码错误，请重试。</value>
+  </data>
+  <data name="TbMldsa65Verify" xml:space="preserve">
+    <value>Mldsa65Verify</value>
+  </data>
+  <data name="menuAddAnytlsServer" xml:space="preserve">
+    <value>添加 [Anytls] 配置文件</value>
+  </data>
+  <data name="TbRemoteDNS" xml:space="preserve">
+    <value>远程 DNS</value>
+  </data>
+  <data name="TbDomesticDNS" xml:space="preserve">
+    <value>直连 DNS</value>
+  </data>
+  <data name="TbSBOutboundsResolverDNS" xml:space="preserve">
+    <value>出站 DNS 解析（sing-box）</value>
+  </data>
+  <data name="TbSBOutboundDomainResolve" xml:space="preserve">
+    <value>解析出站域名</value>
+  </data>
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
+    <value>sing-box DoH 解析服务器</value>
+  </data>
+  <data name="TbSBFallbackDNSResolve" xml:space="preserve">
+    <value>兜底解析其他 DNS 域名，建议设为 ip</value>
+  </data>
+  <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
+    <value>xray freedom 解析策略</value>
+  </data>
+  <data name="TbSBDirectResolveStrategy" xml:space="preserve">
+    <value>sing-box 直连解析策略</value>
+  </data>
+  <data name="TbSBRemoteResolveStrategy" xml:space="preserve">
+    <value>sing-box 远程解析策略</value>
+  </data>
+  <data name="TbAddCommonDNSHosts" xml:space="preserve">
+    <value>添加常用 DNS Hosts</value>
+  </data>
+  <data name="TbSBDoHOverride" xml:space="preserve">
+    <value>开启后可覆盖 sing-box DoH 解析服务器</value>
+  </data>
+  <data name="TbFakeIP" xml:space="preserve">
+    <value>FakeIP</value>
+  </data>
+  <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
+    <value>阻止 SVCB 和 HTTPS 查询</value>
+  </data>
+  <data name="TbDNSHostsConfig" xml:space="preserve">
+    <value>DNS Hosts：（“域名1 ip1 ip2” 一行一个）</value>
+  </data>
+  <data name="TbApplyProxyDomainsOnly" xml:space="preserve">
+    <value>仅对代理域名生效</value>
+  </data>
+  <data name="ThBasicDNSSettings" xml:space="preserve">
+    <value>DNS 基础设置</value>
+  </data>
+  <data name="ThAdvancedDNSSettings" xml:space="preserve">
+    <value>DNS 进阶设置</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPs" xml:space="preserve">
+    <value>校验相应地区域名 IP</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
+    <value>配置后，会对相应地区域名（如 geosite:cn）的返回 IP 进行校验，仅返回期望 IP</value>
+  </data>
+  <data name="TbCustomDNSEnable" xml:space="preserve">
+    <value>启用自定义 DNS</value>
+  </data>
+  <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
+    <value>自定义 DNS 已启用，此页面配置将无效</value>
+  </data>
+  <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
+    <value>避免域名分流规则失效</value>
+  </data>
+  <data name="FillCorrectConfigTemplateText" xml:space="preserve">
+    <value>请填写正确的配置模板</value>
+  </data>
+  <data name="menuFullConfigTemplate" xml:space="preserve">
+    <value>完整配置模板设置</value>
+  </data>
+  <data name="TbFullConfigTemplateEnable" xml:space="preserve">
+    <value>启用完整配置模板</value>
+  </data>
+  <data name="TbRayFullConfigTemplate" xml:space="preserve">
+    <value>v2ray 完整配置模板</value>
+  </data>
+  <data name="TbRayFullConfigTemplateDesc" xml:space="preserve">
+    <value>仅添加出站配置，routing.balancers 和 routing.rules.outboundTag，点击查看文档</value>
+  </data>
+  <data name="TbAddProxyProtocolOutboundOnly" xml:space="preserve">
+    <value>不添加非代理协议出站</value>
+  </data>
+  <data name="TbSetUpstreamProxyDetour" xml:space="preserve">
+    <value>设置上游代理 tag</value>
+  </data>
+  <data name="TbSBFullConfigTemplate" xml:space="preserve">
+    <value>sing-box 完整配置模板</value>
+  </data>
+  <data name="TbSBFullConfigTemplateDesc" xml:space="preserve">
+    <value>仅添加出站和端点配置，点击查看文档</value>
+  </data>
+  <data name="TbFullConfigTemplateDesc" xml:space="preserve">
+    <value>此功能供高级用户和有特殊需求的用户使用。 启用此功能后，将忽略 Core 的基础设置，DNS 设置 ，路由设置。你需要保证系统代理的端口和流量统计等功能的配置正确，一切都由你来设置。</value>
   </data>
 </root>

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

@@ -118,10 +118,10 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="BatchExportURLSuccessfully" xml:space="preserve">
-    <value>匯出分享链接至剪貼簿成功</value>
+    <value>匯出分享連結至剪貼簿成功</value>
   </data>
   <data name="CheckServerSettings" xml:space="preserve">
-    <value>請先檢查伺服器設定</value>
+    <value>請先檢查設定檔設定</value>
   </data>
   <data name="ConfigurationFormatIncorrect" xml:space="preserve">
     <value>設定格式不正確</value>
@@ -132,12 +132,6 @@
   <data name="Downloading" xml:space="preserve">
     <value>下載開始...</value>
   </data>
-  <data name="downloadSpeed" xml:space="preserve">
-    <value>下載</value>
-  </data>
-  <data name="DownloadYesNo" xml:space="preserve">
-    <value>是否下載？{0}</value>
-  </data>
   <data name="FailedConversionConfiguration" xml:space="preserve">
     <value>轉換設定檔失敗</value>
   </data>
@@ -148,13 +142,13 @@
     <value>獲取預設設定失敗</value>
   </data>
   <data name="FailedImportedCustomServer" xml:space="preserve">
-    <value>匯入自訂設定伺服器失敗</value>
+    <value>匯入自訂設定設定檔失敗</value>
   </data>
   <data name="FailedReadConfiguration" xml:space="preserve">
     <value>讀取設定檔失敗</value>
   </data>
   <data name="FillCorrectServerPort" xml:space="preserve">
-    <value>請填寫正確格式的伺服器埠</value>
+    <value>請填寫正確格式的埠</value>
   </data>
   <data name="FillLocalListeningPort" xml:space="preserve">
     <value>請填寫本機偵聽埠</value>
@@ -163,7 +157,7 @@
     <value>請填寫密碼</value>
   </data>
   <data name="FillServerAddress" xml:space="preserve">
-    <value>請填寫伺服器位址</value>
+    <value>請填寫位址</value>
   </data>
   <data name="FillUUID" xml:space="preserve">
     <value>請填寫使用者 ID</value>
@@ -271,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>
@@ -289,13 +283,13 @@
     <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>
+    <value>掃描匯入分享連結成功</value>
   </data>
   <data name="TestMeOutput" xml:space="preserve">
     <value>目前延遲: {0} ms，{1}</value>
@@ -387,14 +381,11 @@
   <data name="RegisterGlobalHotkeySuccessfully" xml:space="preserve">
     <value>註冊全域快速鍵 {0} 成功</value>
   </data>
-  <data name="UngroupedServers" xml:space="preserve">
-    <value>未分組伺服器</value>
-  </data>
   <data name="AllGroupServers" xml:space="preserve">
     <value>所有</value>
   </data>
   <data name="FillServerAddressCustom" xml:space="preserve">
-    <value>請瀏覽匯入伺服器設定</value>
+    <value>請瀏覽匯入設定檔設定</value>
   </data>
   <data name="Speedtesting" xml:space="preserve">
     <value>測試中...</value>
@@ -406,7 +397,7 @@
     <value>本機</value>
   </data>
   <data name="MsgServerTitle" xml:space="preserve">
-    <value>伺服器過濾，按 Enter 執行</value>
+    <value>設定檔過濾，按 Enter 執行</value>
   </data>
   <data name="menuCheckUpdate" xml:space="preserve">
     <value>檢查更新</value>
@@ -436,7 +427,7 @@
     <value>路由設定</value>
   </data>
   <data name="menuServers" xml:space="preserve">
-    <value>伺服器</value>
+    <value>設定檔</value>
   </data>
   <data name="menuSetting" xml:space="preserve">
     <value>設定</value>
@@ -481,61 +472,61 @@
     <value>語言 (需重啟)</value>
   </data>
   <data name="menuAddServerViaClipboard" xml:space="preserve">
-    <value>從剪貼簿導入分享鏈接 (Ctrl+V)</value>
+    <value>從剪貼簿導入分享連結 (Ctrl+V)</value>
   </data>
   <data name="menuAddServerViaScan" xml:space="preserve">
     <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>
+    <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>
@@ -700,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>
@@ -760,7 +751,7 @@
     <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>
@@ -793,7 +784,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>
@@ -822,9 +813,6 @@
   <data name="menuWebsiteItem" xml:space="preserve">
     <value>{0} 官網</value>
   </data>
-  <data name="menuRoutingAdvanced" xml:space="preserve">
-    <value>進階功能</value>
-  </data>
   <data name="menuRoutingAdvancedAdd" xml:space="preserve">
     <value>新增規則集</value>
   </data>
@@ -837,21 +825,9 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>設為活動規則 (Enter)</value>
   </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>域名匹配演算法</value>
-  </data>
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>域名解析策略</value>
   </data>
-  <data name="TbRoutingTabBlock" xml:space="preserve">
-    <value>3.阻止的 Domain 或 IP</value>
-  </data>
-  <data name="TbRoutingTabDirect" xml:space="preserve">
-    <value>2.直連的 Domain 或 IP</value>
-  </data>
-  <data name="TbRoutingTabProxy" xml:space="preserve">
-    <value>1.代理的 Domain 或 IP</value>
-  </data>
   <data name="TbRoutingTabRuleList" xml:space="preserve">
     <value>預定義規則集列表</value>
   </data>
@@ -892,7 +868,7 @@
     <value>規則詳細說明檔案</value>
   </data>
   <data name="TbDnsObjectDoc" xml:space="preserve">
-    <value>支援填寫 DnsObject，JSON 格式，點擊查看説明</value>
+    <value>支援填寫 DnsObject，JSON 格式，點擊查看說明</value>
   </data>
   <data name="SubUrlTips" xml:space="preserve">
     <value>普通分組此處請留空</value>
@@ -940,7 +916,7 @@
     <value>移至訂閱分組</value>
   </data>
   <data name="TbSettingsEnableDragDropSort" xml:space="preserve">
-    <value>啟動伺服器拖放排序 (需重啟)</value>
+    <value>啟動設定檔拖放排序 (需重啟)</value>
   </data>
   <data name="TbAutoRefresh" xml:space="preserve">
     <value>自動重新整理</value>
@@ -949,10 +925,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>
@@ -1003,7 +979,7 @@
     <value>啟用硬體加速 (需重啟)</value>
   </data>
   <data name="SpeedtestingWait" xml:space="preserve">
-    <value>等待测试中（按 ESC 终止）...</value>
+    <value>等待測試中（按 ESC 終止）...</value>
   </data>
   <data name="TipDisplayLog" xml:space="preserve">
     <value>當有異常斷流時請關閉</value>
@@ -1057,7 +1033,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>
@@ -1066,19 +1042,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="TbSettingsEnableExInbound" xml:space="preserve">
     <value>啟用額外偵聽連接埠</value>
@@ -1087,7 +1063,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>
@@ -1102,10 +1078,10 @@
     <value>混淆密碼 (obfs password)</value>
   </data>
   <data name="TbRuleMatchingTips" xml:space="preserve">
-    <value>(Domain 或 IP 或 行程名) 与 Port 与 Protocol 与 InboundTag =&gt; OutboundTag</value>
+    <value>(Domain 或 IP 或 行程名) 與 Port 與 Protocol 與 InboundTag =&gt; OutboundTag</value>
   </data>
   <data name="TbAutoScrollToEnd" xml:space="preserve">
-    <value>自动滚动到末尾</value>
+    <value>自動滾動到末尾</value>
   </data>
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>真連線測試位址</value>
@@ -1120,10 +1096,10 @@
     <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>使用 Xray 且非 Tun 模式啟用，和分組前置代理衝突</value>
+    <value>和分組前置代理衝突</value>
   </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>啟用分片（Fragment）</value>
@@ -1201,7 +1177,7 @@
     <value>全局</value>
   </data>
   <data name="menuModeNothing" xml:space="preserve">
-    <value>随原配置</value>
+    <value>隨原配置</value>
   </data>
   <data name="menuModeRule" xml:space="preserve">
     <value>規則</value>
@@ -1231,10 +1207,10 @@
     <value>自動調整列寬</value>
   </data>
   <data name="menuExport2ShareUrlBase64" xml:space="preserve">
-    <value>匯出分享链接至剪貼簿 (多選) Base64 编码</value>
+    <value>匯出分享連結至剪貼簿 (多選) Base64 編碼</value>
   </data>
   <data name="menuExport2ClientConfigClipboard" xml:space="preserve">
-    <value>匯出所選伺服器完整設定至剪貼簿</value>
+    <value>匯出所選設定檔完整設定至剪貼簿</value>
   </data>
   <data name="menuShowOrHideMainWindow" xml:space="preserve">
     <value>顯示或隱藏主介面</value>
@@ -1267,7 +1243,7 @@
     <value>WebDav 伺服器位址</value>
   </data>
   <data name="LvWebDavUserName" xml:space="preserve">
-    <value>WebDav 賬戶</value>
+    <value>WebDav 帳戶</value>
   </data>
   <data name="LvWebDavPassword" xml:space="preserve">
     <value>WebDav 密碼</value>
@@ -1336,13 +1312,7 @@
     <value>系統的 sudo 密碼</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
-    <value>密碼已加密且只儲存在本機檔案中，無密碼則每次都要輸入</value>
-  </data>
-  <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
-    <value>請先在 Tun 模式設定中設定 sudo 密碼</value>
-  </data>
-  <data name="TbSettingsLinuxSudoPasswordNotSudoRunApp" xml:space="preserve">
-    <value>請不要用 sudo 來運行此 App</value>
+    <value>密碼將調用命令行校驗，如果因為校驗錯誤導致無法正常運行時，請重啟本應用。密碼不會存儲，每次重啟後都需要再次輸入。</value>
   </data>
   <data name="TransportHeaderTypeTip5" xml:space="preserve">
     <value>*xhttp 模式</value>
@@ -1366,7 +1336,7 @@
     <value>開啟第二個本機監聽埠</value>
   </data>
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
-    <value>socks：本地端口，socks2：第二個本地端口，socks3：區域網路端口</value>
+    <value>socks：本地埠，socks2：第二個本地埠，socks3：區域網路埠</value>
   </data>
   <data name="TbSettingsTheme" xml:space="preserve">
     <value>主題</value>
@@ -1387,30 +1357,141 @@
     <value>移除無效測試結果 {0} 個。</value>
   </data>
   <data name="TbPorts7" xml:space="preserve">
-    <value>跳躍端口範圍</value>
+    <value>跳躍埠範圍</value>
   </data>
   <data name="TbPorts7Tips" xml:space="preserve">
-    <value>會覆蓋端口，多組時用逗號 (,) 隔開</value>
+    <value>會覆蓋埠，多組時用逗號 (,) 隔開</value>
   </data>
   <data name="menuSetDefaultMultipleServer" xml:space="preserve">
-    <value>多伺服器產生自訂配置 (多選)</value>
+    <value>多設定檔產生自訂配置 (多選)</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayRandom" xml:space="preserve">
-    <value>多伺服器隨機 Xray</value>
+    <value>多設定檔隨機 Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayRoundRobin" xml:space="preserve">
-    <value>多伺服器負載平衡 Xray</value>
+    <value>多設定檔負載平衡 Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayLeastPing" xml:space="preserve">
-    <value>多伺服器最低延遲 Xray</value>
+    <value>多設定檔最低延遲 Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayLeastLoad" xml:space="preserve">
-    <value>多伺服器最穩定 Xray</value>
+    <value>多設定檔最穩定 Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerSingBoxLeastPing" 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>
+  </data>
+  <data name="SudoIncorrectPasswordTip" xml:space="preserve">
+    <value>密碼錯誤，請重試。</value>
+  </data>
+  <data name="TbMldsa65Verify" xml:space="preserve">
+    <value>Mldsa65Verify</value>
+  </data>
+  <data name="menuAddAnytlsServer" xml:space="preserve">
+    <value>新增 [Anytls] 設定檔</value>
+  </data>
+  <data name="TbRemoteDNS" xml:space="preserve">
+    <value>Remote DNS</value>
+  </data>
+  <data name="TbDomesticDNS" xml:space="preserve">
+    <value>Domestic DNS</value>
+  </data>
+  <data name="TbSBOutboundsResolverDNS" xml:space="preserve">
+    <value>Outbound DNS Resolution (sing-box)</value>
+  </data>
+  <data name="TbSBOutboundDomainResolve" xml:space="preserve">
+    <value>Resolve Outbound Domains</value>
+  </data>
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
+    <value>sing-box DoH Resolver Server</value>
+  </data>
+  <data name="TbSBFallbackDNSResolve" xml:space="preserve">
+    <value>Fallback DNS Resolution, Suggest IP</value>
+  </data>
+  <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
+    <value>xray Freedom Resolution Strategy</value>
+  </data>
+  <data name="TbSBDirectResolveStrategy" xml:space="preserve">
+    <value>sing-box Direct Resolution Strategy</value>
+  </data>
+  <data name="TbSBRemoteResolveStrategy" xml:space="preserve">
+    <value>sing-box Remote Resolution Strategy</value>
+  </data>
+  <data name="TbAddCommonDNSHosts" xml:space="preserve">
+    <value>Add Common DNS Hosts</value>
+  </data>
+  <data name="TbSBDoHOverride" xml:space="preserve">
+    <value>The sing-box DoH resolution server can be overwritten</value>
+  </data>
+  <data name="TbFakeIP" xml:space="preserve">
+    <value>FakeIP</value>
+  </data>
+  <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
+    <value>Block SVCB and HTTPS Queries</value>
+  </data>
+  <data name="TbDNSHostsConfig" xml:space="preserve">
+    <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
+  </data>
+  <data name="TbApplyProxyDomainsOnly" xml:space="preserve">
+    <value>Apply to Proxy Domains Only</value>
+  </data>
+  <data name="ThBasicDNSSettings" xml:space="preserve">
+    <value>Basic DNS Settings</value>
+  </data>
+  <data name="ThAdvancedDNSSettings" xml:space="preserve">
+    <value>Advanced DNS Settings</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPs" xml:space="preserve">
+    <value>Validate Regional Domain IPs</value>
+  </data>
+  <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
+    <value>When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs</value>
+  </data>
+  <data name="TbCustomDNSEnable" xml:space="preserve">
+    <value>Enable Custom DNS</value>
+  </data>
+  <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
+    <value>Custom DNS Enabled, This Page's Settings Invalid</value>
+  </data>
+  <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
+    <value>Prevent domain-based routing rules from failing</value>
+  </data>
+  <data name="FillCorrectConfigTemplateText" xml:space="preserve">
+    <value>Please fill in the correct config template</value>
+  </data>
+  <data name="menuFullConfigTemplate" xml:space="preserve">
+    <value>Full Config Template Setting</value>
+  </data>
+  <data name="TbFullConfigTemplateEnable" xml:space="preserve">
+    <value>Enable Full Config Template</value>
+  </data>
+  <data name="TbRayFullConfigTemplate" xml:space="preserve">
+    <value>v2ray Full Config Template</value>
+  </data>
+  <data name="TbRayFullConfigTemplateDesc" xml:space="preserve">
+    <value>Add Outbound Config Only, routing.balancers and routing.rules.outboundTag, Click to view the document</value>
+  </data>
+  <data name="TbAddProxyProtocolOutboundOnly" xml:space="preserve">
+    <value>Do Not Add Non-Proxy Protocol Outbound</value>
+  </data>
+  <data name="TbSetUpstreamProxyDetour" xml:space="preserve">
+    <value>Set Upstream Proxy Tag</value>
+  </data>
+  <data name="TbSBFullConfigTemplate" xml:space="preserve">
+    <value>sing-box Full Config Template</value>
+  </data>
+  <data name="TbSBFullConfigTemplateDesc" xml:space="preserve">
+    <value>Add Outbound and Endpoint Config Only, Click to view the document</value>
+  </data>
+  <data name="TbFullConfigTemplateDesc" xml:space="preserve">
+    <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
   </data>
 </root>

v2rayN/ServiceLib/Sample/SingboxSampleClientConfig

@@ -1,4 +1,4 @@
-{
+{
 	"log": {
 		"level": "debug",
 		"timestamp": true
@@ -14,22 +14,10 @@
 		{
 			"type": "direct",
 			"tag": "direct"
-		},
-		{
-			"type": "block",
-			"tag": "block"
-		},
-		{
-			"tag": "dns_out",
-			"type": "dns"
 		}
 	],
 	"route": {
 		"rules": [
-			{
-				"protocol": [ "dns" ],
-				"outbound": "dns_out"
-			}
 		]
 	}
 }

v2rayN/ServiceLib/Sample/dns_singbox_normal

@@ -2,28 +2,33 @@
   "servers": [
     {
       "tag": "remote",
-      "address": "tcp://8.8.8.8",
-      "strategy": "prefer_ipv4",
+      "type": "tcp",
+      "server": "8.8.8.8",
       "detour": "proxy"
     },
     {
       "tag": "local",
-      "address": "223.5.5.5",
-      "strategy": "prefer_ipv4",
-      "detour": "direct"
-    },
-    {
-      "tag": "block",
-      "address": "rcode://success"
+      "type": "udp",
+      "server": "223.5.5.5"
     }
   ],
   "rules": [
+    {
+      "domain_suffix": [
+        "googleapis.cn",
+        "gstatic.com"
+      ],
+      "server": "remote",
+      "strategy": "prefer_ipv4"
+    },
     {
       "rule_set": [
         "geosite-cn"
       ],
-      "server": "local"
+      "server": "local",
+      "strategy": "prefer_ipv4"
     }
   ],
-  "final": "remote"
+  "final": "remote",
+  "strategy": "prefer_ipv4"
 }

v2rayN/ServiceLib/Sample/dns_v2ray_normal

@@ -6,15 +6,15 @@
   "servers": [
     {
       "address": "1.1.1.1",
+      "skipFallback": true,
       "domains": [
-        "geosite:geolocation-!cn"
-      ],
-      "expectIPs": [
-        "geoip:!cn"
+        "domain:googleapis.cn",
+        "domain:gstatic.com"
       ]
     },
     {
       "address": "223.5.5.5",
+      "skipFallback": true,
       "domains": [
         "geosite:cn"
       ],
@@ -22,6 +22,7 @@
         "geoip:cn"
       ]
     },
+    "1.1.1.1",
     "8.8.8.8",
     "https://dns.google/dns-query"
   ]

v2rayN/ServiceLib/Sample/kill_as_sudo_linux_sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+#
+# Process Terminator Script for Linux
+# This script forcibly terminates a process and all its child processes
+#
+
+# Check if PID argument is provided
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 <PID>"
+    exit 1
+fi
+
+PID=$1
+
+# Validate that input is a valid PID (numeric)
+if ! [[ "$PID" =~ ^[0-9]+$ ]]; then
+    echo "Error: The PID must be a numeric value"
+    exit 1
+fi
+
+# Check if the process exists
+if ! ps -p $PID > /dev/null; then
+    echo "Warning: No process found with PID $PID"
+    exit 0
+fi
+
+# Recursive function to find and kill all child processes
+kill_children() {
+    local parent=$1
+    local children=$(ps -o pid --no-headers --ppid "$parent")
+    
+    # Output information about processes being terminated
+    echo "Processing children of PID: $parent..."
+    
+    # Process each child
+    for child in $children; do
+        # Recursively find and kill child's children first
+        kill_children "$child"
+        
+        # Force kill the child process
+        echo "Terminating child process: $child"
+        kill -9 "$child" 2>/dev/null || true
+    done
+}
+
+echo "============================================"
+echo "Starting termination of process $PID and all its children"
+echo "============================================"
+
+# Find and kill all child processes
+kill_children "$PID"
+
+# Finally kill the main process
+echo "Terminating main process: $PID"
+kill -9 "$PID" 2>/dev/null || true
+
+echo "============================================"
+echo "Process $PID and all its children have been terminated"
+echo "============================================"
+
+exit 0

v2rayN/ServiceLib/Sample/kill_as_sudo_osx_sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+#
+# Process Terminator Script for macOS
+# This script forcibly terminates a process and all its descendant processes
+#
+
+# Check if PID argument is provided
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 <PID>"
+    exit 1
+fi
+
+PID=$1
+
+# Validate that input is a valid PID (numeric)
+if ! [[ "$PID" =~ ^[0-9]+$ ]]; then
+    echo "Error: The PID must be a numeric value"
+    exit 1
+fi
+
+# Check if the process exists - using kill -0 which is more reliable on macOS
+if ! kill -0 $PID 2>/dev/null; then
+    echo "Warning: No process found with PID $PID"
+    exit 0
+fi
+
+# Recursive function to find and kill all descendant processes
+kill_descendants() {
+    local parent=$1
+    # Use ps -axo for macOS to ensure all processes are included
+    local children=$(ps -axo pid=,ppid= | awk -v ppid=$parent '$2==ppid {print $1}')
+
+    echo "Processing children of PID: $parent..."
+    for child in $children; do
+        kill_descendants "$child"
+        echo "Terminating child process: $child"
+        kill -9 "$child" 2>/dev/null || true
+    done
+}
+
+echo "============================================"
+echo "Starting termination of process $PID and all its descendants"
+echo "============================================"
+
+# Find and kill all descendant processes
+kill_descendants "$PID"
+
+# Finally kill the main process
+echo "Terminating main process: $PID"
+kill -9 "$PID" 2>/dev/null || true
+
+echo "============================================"
+echo "Process $PID and all its descendants have been terminated"
+echo "============================================"
+
+exit 0

v2rayN/ServiceLib/Sample/proxy_set_linux_sh

@@ -29,9 +29,6 @@ set_gnome_proxy() {
         echo "Ignored Hosts: $IGNORE_HOSTS"
     elif [ "$MODE" == "none" ]; then
         echo "GNOME: Proxy disabled."
-    else
-        echo "GNOME: Invalid mode. Use 'none' or 'manual'."
-        exit 1
     fi
 }
 
@@ -69,9 +66,6 @@ set_kde_proxy() {
         # Disable proxy
         $KWRITECONFIG --file kioslaverc --group "Proxy Settings" --key ProxyType 0
         echo "KDE: Proxy disabled."
-    else
-        echo "KDE: Invalid mode. Use 'none' or 'manual'."
-        exit 1
     fi
 
     # Apply changes by restarting KDE's network settings
@@ -95,6 +89,21 @@ detect_desktop_environment() {
         return
     fi
 
+    if [[ "$XDG_CURRENT_DESKTOP" == *"UKUI"* ]] || [[ "$XDG_SESSION_DESKTOP" == *"ukui"* ]]; then
+        echo "gnome"
+        return
+    fi
+
+    if [[ "$XDG_CURRENT_DESKTOP" == *"DDE"* ]] || [[ "$XDG_SESSION_DESKTOP" == *"dde"* ]]; then
+        echo "gnome"
+        return
+    fi
+
+    if [[ "$XDG_CURRENT_DESKTOP" == *"MATE"* ]] || [[ "$XDG_SESSION_DESKTOP" == *"mate"* ]]; then
+        echo "gnome"
+        return
+    fi
+
     local KDE_ENVIRONMENTS=("KDE" "plasma")
     for ENV in "${KDE_ENVIRONMENTS[@]}"; do
         if [ "$XDG_CURRENT_DESKTOP" == "$ENV" ] || [ "$XDG_SESSION_DESKTOP" == "$ENV" ]; then
@@ -102,6 +111,15 @@ detect_desktop_environment() {
             return
         fi
     done
+
+    # Fallback to GNOME method if CLI utility is available. This solves the
+    # proxy configuration issues on minimal installation systems, like setups
+    # with only window managers, that borrow some parts from big DEs.
+    if command -v gsettings >/dev/null 2>&1; then
+        echo "gnome"
+        return
+    fi
+
     echo "unsupported"
 }
 
@@ -119,6 +137,11 @@ PROXY_IP=$2
 PROXY_PORT=$3
 IGNORE_HOSTS=$4
 
+if ! [[ "$MODE" =~ ^(manual|none)$ ]]; then
+    echo "Invalid mode. Use 'none' or 'manual'." >&2
+    exit 1
+fi
+
 # Detect desktop environment
 DE=$(detect_desktop_environment)
 
@@ -129,6 +152,6 @@ elif [ "$DE" == "kde" ]; then
     set_gnome_proxy "$MODE" "$PROXY_IP" "$PROXY_PORT" "$IGNORE_HOSTS"
     set_kde_proxy "$MODE" "$PROXY_IP" "$PROXY_PORT" "$IGNORE_HOSTS"
 else
-    echo "Unsupported desktop environment: $DE"
+    echo "Unsupported desktop environment: $DE" >&2
     exit 1
 fi

v2rayN/ServiceLib/Sample/tun_singbox_dns

@@ -2,29 +2,33 @@
   "servers": [
     {
       "tag": "remote",
-      "address": "tcp://8.8.8.8",
-      "strategy": "prefer_ipv4",
+      "type": "tcp",
+      "server": "8.8.8.8",
       "detour": "proxy"
     },
     {
       "tag": "local",
-      "address": "223.5.5.5",
-      "strategy": "prefer_ipv4",
-      "detour": "direct"
-    },
-    {
-      "tag": "block",
-      "address": "rcode://success"
+      "type": "udp",
+      "server": "223.5.5.5"
     }
   ],
   "rules": [
     {
-      "rule_set": [
-        "geosite-cn",
-        "geosite-geolocation-cn"
+      "domain_suffix": [
+        "googleapis.cn",
+        "gstatic.com"
       ],
-      "server": "local"
+      "server": "remote",
+      "strategy": "prefer_ipv4"
+    },
+    {
+      "rule_set": [
+        "geosite-cn"
+      ],
+      "server": "local",
+      "strategy": "prefer_ipv4"
     }
   ],
-  "final": "remote"
+  "final": "remote",
+  "strategy": "prefer_ipv4"
 }

v2rayN/ServiceLib/Sample/tun_singbox_rules

@@ -8,13 +8,13 @@
       139,
       5353
     ],
-    "outbound": "block"
+    "action": "reject"
   },
   {
     "ip_cidr": [
       "224.0.0.0/3",
       "ff00::/8"
     ],
-    "outbound": "block"
+    "action": "reject"
   }
 ]

v2rayN/ServiceLib/ServiceLib.csproj

@@ -28,6 +28,8 @@
 		<EmbeddedResource Include="Sample\custom_routing_white" />
 		<EmbeddedResource Include="Sample\dns_singbox_normal" />
 		<EmbeddedResource Include="Sample\dns_v2ray_normal" />
+		<EmbeddedResource Include="Sample\kill_as_sudo_linux_sh" />
+		<EmbeddedResource Include="Sample\kill_as_sudo_osx_sh" />
 		<EmbeddedResource Include="Sample\pac" />
 		<EmbeddedResource Include="Sample\proxy_set_linux_sh" /> 
 		<EmbeddedResource Include="Sample\proxy_set_osx_sh" />

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs

@@ -13,13 +13,6 @@ public class CoreConfigClashService
         _config = config;
     }
 
-    /// <summary>
-    /// 生成配置文件
-    /// </summary>
-    /// <param name="node"></param>
-    /// <param name="fileName"></param>
-    /// <param name="msg"></param>
-    /// <returns></returns>
     public async Task<RetResult> GenerateClientCustomConfig(ProfileItem node, string? fileName)
     {
         var ret = new RetResult();

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs

@@ -1,6 +1,8 @@
 using System.Net;
 using System.Net.NetworkInformation;
+using System.Text.Json;
 using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
 
 namespace ServiceLib.Services.CoreConfig;
 
@@ -54,19 +56,19 @@ public class CoreConfigV2rayService
 
             await GenInbounds(v2rayConfig);
 
-            await GenRouting(v2rayConfig);
-
             await GenOutbound(node, v2rayConfig.outbounds.First());
 
             await GenMoreOutbounds(node, v2rayConfig);
 
+            await GenRouting(v2rayConfig);
+
             await GenDns(node, v2rayConfig);
 
             await GenStatistic(v2rayConfig);
 
             ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
             ret.Success = true;
-            ret.Data = JsonUtils.Serialize(v2rayConfig);
+            ret.Data = await ApplyFullConfigTemplate(v2rayConfig);
             return ret;
         }
         catch (Exception ex)
@@ -113,14 +115,14 @@ public class CoreConfigV2rayService
             await GenStatistic(v2rayConfig);
             v2rayConfig.outbounds.RemoveAt(0);
 
-            var tagProxy = new List<string>();
+            var proxyProfiles = new List<ProfileItem>();
             foreach (var it in selecteds)
             {
                 if (it.ConfigType == EConfigType.Custom)
                 {
                     continue;
                 }
-                if (it.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard)
+                if (it.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls)
                 {
                     continue;
                 }
@@ -151,17 +153,14 @@ public class CoreConfigV2rayService
                 }
 
                 //outbound
-                var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
-                await GenOutbound(item, outbound);
-                outbound.tag = $"{Global.ProxyTag}-{tagProxy.Count + 1}";
-                v2rayConfig.outbounds.Insert(0, outbound);
-                tagProxy.Add(outbound.tag);
+                proxyProfiles.Add(item);
             }
-            if (tagProxy.Count <= 0)
+            if (proxyProfiles.Count <= 0)
             {
                 ret.Msg = ResUI.FailedGenDefaultConfiguration;
                 return ret;
             }
+            await GenOutboundsList(proxyProfiles, v2rayConfig);
 
             //add balancers
             await GenBalancer(v2rayConfig, multipleLoad);
@@ -178,7 +177,7 @@ public class CoreConfigV2rayService
                     rule.balancerTag = balancer.tag;
                 }
             }
-            if (v2rayConfig.routing.domainStrategy == "IPIfNonMatch")
+            if (v2rayConfig.routing.domainStrategy == Global.IPIfNonMatch)
             {
                 v2rayConfig.routing.rules.Add(new()
                 {
@@ -198,7 +197,8 @@ public class CoreConfigV2rayService
             }
 
             ret.Success = true;
-            ret.Data = JsonUtils.Serialize(v2rayConfig);
+
+            ret.Data = await ApplyFullConfigTemplate(v2rayConfig, true);
             return ret;
         }
         catch (Exception ex)
@@ -328,7 +328,7 @@ public class CoreConfigV2rayService
                 {
                     listen = Global.Loopback,
                     port = port,
-                    protocol = EInboundProtocol.socks.ToString(),
+                    protocol = EInboundProtocol.mixed.ToString(),
                 };
                 inbound.tag = inbound.protocol + inbound.port.ToString();
                 v2rayConfig.inbounds.Add(inbound);
@@ -403,7 +403,7 @@ public class CoreConfigV2rayService
                 tag = $"{EInboundProtocol.socks}{port}",
                 listen = Global.Loopback,
                 port = port,
-                protocol = EInboundProtocol.socks.ToString(),
+                protocol = EInboundProtocol.mixed.ToString(),
             });
 
             ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
@@ -507,7 +507,7 @@ public class CoreConfigV2rayService
         }
         inbound.tag = protocol.ToString();
         inbound.port = inItem.LocalPort + (int)protocol;
-        inbound.protocol = EInboundProtocol.socks.ToString();
+        inbound.protocol = EInboundProtocol.mixed.ToString();
         inbound.settings.udp = inItem.UdpEnabled;
         inbound.sniffing.enabled = inItem.SniffingEnabled;
         inbound.sniffing.destOverride = inItem.DestOverride;
@@ -523,7 +523,6 @@ public class CoreConfigV2rayService
             if (v2rayConfig.routing?.rules != null)
             {
                 v2rayConfig.routing.domainStrategy = _config.RoutingBasicItem.DomainStrategy;
-                v2rayConfig.routing.domainMatcher = _config.RoutingBasicItem.DomainMatcher.IsNullOrEmpty() ? null : _config.RoutingBasicItem.DomainMatcher;
 
                 var routing = await ConfigHandler.GetDefaultRouting(_config);
                 if (routing != null)
@@ -559,6 +558,8 @@ public class CoreConfigV2rayService
             {
                 return 0;
             }
+            rule.outboundTag = await GenRoutingUserRuleOutbound(rule.outboundTag, v2rayConfig);
+
             if (rule.port.IsNullOrEmpty())
             {
                 rule.port = null;
@@ -614,6 +615,7 @@ public class CoreConfigV2rayService
                 if (rule.port.IsNotEmpty()
                     || rule.protocol?.Count > 0
                     || rule.inboundTag?.Count > 0
+                    || rule.network != null
                     )
                 {
                     var it = JsonUtils.DeepCopy(rule);
@@ -629,11 +631,37 @@ public class CoreConfigV2rayService
         return await Task.FromResult(0);
     }
 
+    private async Task<string?> GenRoutingUserRuleOutbound(string outboundTag, V2rayConfig v2rayConfig)
+    {
+        if (Global.OutboundTags.Contains(outboundTag))
+        {
+            return outboundTag;
+        }
+
+        var node = await AppHandler.Instance.GetProfileItemViaRemarks(outboundTag);
+        if (node == null
+            || node.ConfigType == EConfigType.Custom
+            || node.ConfigType == EConfigType.Hysteria2
+            || node.ConfigType == EConfigType.TUIC
+            || node.ConfigType == EConfigType.Anytls)
+        {
+            return Global.ProxyTag;
+        }
+
+        var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
+        var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
+        await GenOutbound(node, outbound);
+        outbound.tag = Global.ProxyTag + node.IndexId.ToString();
+        v2rayConfig.outbounds.Add(outbound);
+
+        return outbound.tag;
+    }
+
     private async Task<int> GenOutbound(ProfileItem node, Outbounds4Ray outbound)
     {
         try
         {
-            var muxEnabled = _config.CoreBasicItem.MuxEnabled;
+            var muxEnabled = node.MuxEnabled ?? _config.CoreBasicItem.MuxEnabled;
             switch (node.ConfigType)
             {
                 case EConfigType.VMess:
@@ -661,7 +689,7 @@ public class CoreConfigV2rayService
                         {
                             usersItem = vnextItem.users.First();
                         }
-                        //远程服务器用户ID
+
                         usersItem.id = node.Id;
                         usersItem.alterId = node.AlterId;
                         usersItem.email = Global.UserEMail;
@@ -805,6 +833,26 @@ public class CoreConfigV2rayService
                         outbound.settings.vnext = null;
                         break;
                     }
+                case EConfigType.WireGuard:
+                    {
+                        var peer = new WireguardPeer4Ray
+                        {
+                            publicKey = node.PublicKey,
+                            endpoint = node.Address + ":" + node.Port.ToString()
+                        };
+                        var setting = new Outboundsettings4Ray
+                        {
+                            address = Utils.String2List(node.RequestHost),
+                            secretKey = node.Id,
+                            reserved = Utils.String2List(node.Path)?.Select(int.Parse).ToList(),
+                            mtu = node.ShortId.IsNullOrEmpty() ? Global.TunMtus.First() : node.ShortId.ToInt(),
+                            peers = new List<WireguardPeer4Ray> { peer }
+                        };
+                        outbound.settings = setting;
+                        outbound.settings.vnext = null;
+                        outbound.settings.servers = null;
+                        break;
+                    }
             }
 
             outbound.protocol = Global.ProtocolTypes[node.ConfigType];
@@ -899,6 +947,7 @@ public class CoreConfigV2rayService
                     publicKey = node.PublicKey,
                     shortId = node.ShortId,
                     spiderX = node.SpiderX,
+                    mldsa65Verify = node.Mldsa65Verify,
                     show = false,
                 };
 
@@ -1087,6 +1136,293 @@ public class CoreConfigV2rayService
     }
 
     private async Task<int> GenDns(ProfileItem? node, V2rayConfig v2rayConfig)
+    {
+        try
+        {
+            var item = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
+            if (item != null && item.Enabled == true)
+            {
+                var result = await GenDnsCompatible(node, v2rayConfig);
+
+                if (v2rayConfig.routing.domainStrategy == Global.IPIfNonMatch)
+                {
+                    // DNS routing
+                    v2rayConfig.dns.tag = Global.DnsTag;
+                    v2rayConfig.routing.rules.Add(new RulesItem4Ray
+                    {
+                        type = "field",
+                        inboundTag = new List<string> { Global.DnsTag },
+                        outboundTag = Global.ProxyTag,
+                    });
+                }
+
+                return result;
+            }
+            var simpleDNSItem = _config.SimpleDNSItem;
+            var domainStrategy4Freedom = simpleDNSItem?.RayStrategy4Freedom;
+
+            //Outbound Freedom domainStrategy
+            if (domainStrategy4Freedom.IsNotEmpty())
+            {
+                var outbound = v2rayConfig.outbounds.FirstOrDefault(t => t is { protocol: "freedom", tag: Global.DirectTag });
+                if (outbound != null)
+                {
+                    outbound.settings = new()
+                    {
+                        domainStrategy = domainStrategy4Freedom,
+                        userLevel = 0
+                    };
+                }
+            }
+
+            await GenDnsServers(node, v2rayConfig, simpleDNSItem);
+            await GenDnsHosts(v2rayConfig, simpleDNSItem);
+
+            if (v2rayConfig.routing.domainStrategy == Global.IPIfNonMatch)
+            {
+                // DNS routing
+                v2rayConfig.dns.tag = Global.DnsTag;
+                v2rayConfig.routing.rules.Add(new RulesItem4Ray
+                {
+                    type = "field",
+                    inboundTag = new List<string> { Global.DnsTag },
+                    outboundTag = Global.ProxyTag,
+                });
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return 0;
+    }
+
+    private async Task<int> GenDnsServers(ProfileItem? node, V2rayConfig v2rayConfig, SimpleDNSItem simpleDNSItem)
+    {
+        static List<string> ParseDnsAddresses(string? dnsInput, string defaultAddress)
+        {
+            var addresses = dnsInput?.Split(dnsInput.Contains(',') ? ',' : ';')
+                .Select(addr => addr.Trim())
+                .Where(addr => !string.IsNullOrEmpty(addr))
+                .Select(addr => addr.StartsWith("dhcp", StringComparison.OrdinalIgnoreCase) ? "localhost" : addr)
+                .Distinct()
+                .ToList() ?? new List<string> { defaultAddress };
+            return addresses.Count > 0 ? addresses : new List<string> { defaultAddress };
+        }
+
+        static object CreateDnsServer(string dnsAddress, List<string> domains, List<string>? expectedIPs = null)
+        {
+            var dnsServer = new DnsServer4Ray
+            {
+                address = dnsAddress,
+                skipFallback = true,
+                domains = domains.Count > 0 ? domains : null,
+                expectedIPs = expectedIPs?.Count > 0 ? expectedIPs : null
+            };
+            return JsonUtils.SerializeToNode(dnsServer, new JsonSerializerOptions
+            {
+                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+            });
+        }
+
+        var directDNSAddress = ParseDnsAddresses(simpleDNSItem?.DirectDNS, Global.DomainDirectDNSAddress.FirstOrDefault());
+        var remoteDNSAddress = ParseDnsAddresses(simpleDNSItem?.RemoteDNS, Global.DomainRemoteDNSAddress.FirstOrDefault());
+
+        var directDomainList = new List<string>();
+        var directGeositeList = new List<string>();
+        var proxyDomainList = new List<string>();
+        var proxyGeositeList = new List<string>();
+        var expectedDomainList = new List<string>();
+        var expectedIPs = new List<string>();
+        var regionNames = new HashSet<string>();
+
+        if (!string.IsNullOrEmpty(simpleDNSItem?.DirectExpectedIPs))
+        {
+            expectedIPs = simpleDNSItem.DirectExpectedIPs
+                .Split(new[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(s => s.Trim())
+                .Where(s => !string.IsNullOrEmpty(s))
+                .ToList();
+
+            foreach (var ip in expectedIPs)
+            {
+                if (ip.StartsWith("geoip:", StringComparison.OrdinalIgnoreCase))
+                {
+                    var region = ip["geoip:".Length..];
+                    if (!string.IsNullOrEmpty(region))
+                    {
+                        regionNames.Add($"geosite:{region}");
+                        regionNames.Add($"geosite:geolocation-{region}");
+                        regionNames.Add($"geosite:tld-{region}");
+                    }
+                }
+            }
+        }
+
+        var routing = await ConfigHandler.GetDefaultRouting(_config);
+        List<RulesItem>? rules = null;
+        if (routing != null)
+        {
+            rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet) ?? [];
+            foreach (var item in rules)
+            {
+                if (!item.Enabled || item.Domain is null || item.Domain.Count == 0)
+                {
+                    continue;
+                }
+
+                foreach (var domain in item.Domain)
+                {
+                    if (domain.StartsWith('#'))
+                        continue;
+                    var normalizedDomain = domain.Replace(Global.RoutingRuleComma, ",");
+
+                    if (item.OutboundTag == Global.DirectTag)
+                    {
+                        if (normalizedDomain.StartsWith("geosite:"))
+                        {
+                            (regionNames.Contains(normalizedDomain) ? expectedDomainList : directGeositeList).Add(normalizedDomain);
+                        }
+                        else
+                        {
+                            directDomainList.Add(normalizedDomain);
+                        }
+                    }
+                    else if (item.OutboundTag != Global.BlockTag)
+                    {
+                        if (normalizedDomain.StartsWith("geosite:"))
+                        {
+                            proxyGeositeList.Add(normalizedDomain);
+                        }
+                        else
+                        {
+                            proxyDomainList.Add(normalizedDomain);
+                        }
+                    }
+                }
+            }
+        }
+
+        if (Utils.IsDomain(node?.Address))
+        {
+            directDomainList.Add(node.Address);
+        }
+
+        if (node?.Subid is not null)
+        {
+            var subItem = await AppHandler.Instance.GetSubItem(node.Subid);
+            if (subItem is not null)
+            {
+                foreach (var profile in new[] { subItem.PrevProfile, subItem.NextProfile })
+                {
+                    var profileNode = await AppHandler.Instance.GetProfileItemViaRemarks(profile);
+                    if (profileNode is not null &&
+                        profileNode.ConfigType is not (EConfigType.Custom or EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls) &&
+                        Utils.IsDomain(profileNode.Address))
+                    {
+                        directDomainList.Add(profileNode.Address);
+                    }
+                }
+            }
+        }
+
+        v2rayConfig.dns ??= new Dns4Ray();
+        v2rayConfig.dns.servers ??= new List<object>();
+
+        void AddDnsServers(List<string> dnsAddresses, List<string> domains, List<string>? expectedIPs = null)
+        {
+            if (domains.Count > 0)
+            {
+                foreach (var dnsAddress in dnsAddresses)
+                {
+                    v2rayConfig.dns.servers.Add(CreateDnsServer(dnsAddress, domains, expectedIPs));
+                }
+            }
+        }
+
+        AddDnsServers(remoteDNSAddress, proxyDomainList);
+        AddDnsServers(directDNSAddress, directDomainList);
+        AddDnsServers(remoteDNSAddress, proxyGeositeList);
+        AddDnsServers(directDNSAddress, directGeositeList);
+        AddDnsServers(directDNSAddress, expectedDomainList, expectedIPs);
+
+        var useDirectDns = rules?.LastOrDefault() is { } lastRule &&
+                          lastRule.OutboundTag == Global.DirectTag &&
+                          (lastRule.Port == "0-65535" ||
+                           lastRule.Network == "tcp,udp" ||
+                           lastRule.Ip?.Contains("0.0.0.0/0") == true);
+
+        var defaultDnsServers = useDirectDns ? directDNSAddress : remoteDNSAddress;
+        v2rayConfig.dns.servers.AddRange(defaultDnsServers);
+
+        return 0;
+    }
+
+    private async Task<int> GenDnsHosts(V2rayConfig v2rayConfig, SimpleDNSItem simpleDNSItem)
+    {
+        if (simpleDNSItem.AddCommonHosts == false && simpleDNSItem.UseSystemHosts == false && simpleDNSItem.Hosts.IsNullOrEmpty())
+        {
+            return await Task.FromResult(0);
+        }
+        v2rayConfig.dns ??= new Dns4Ray();
+        v2rayConfig.dns.hosts ??= new Dictionary<string, object>();
+        if (simpleDNSItem.AddCommonHosts == true)
+        {
+            v2rayConfig.dns.hosts = Global.PredefinedHosts.ToDictionary(
+                kvp => kvp.Key,
+                kvp => (object)kvp.Value
+            );
+        }
+
+        if (simpleDNSItem.UseSystemHosts == true)
+        {
+            var systemHosts = Utils.GetSystemHosts();
+            if (systemHosts.Count > 0)
+            {
+                var normalHost = v2rayConfig.dns.hosts;
+                if (normalHost != null)
+                {
+                    foreach (var host in systemHosts)
+                    {
+                        if (normalHost[host.Key] != null)
+                        {
+                            continue;
+                        }
+                        normalHost[host.Key] = new List<string> { host.Value };
+                    }
+                }
+            }
+        }
+
+        var userHostsMap = simpleDNSItem.Hosts?
+            .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
+            .Where(line => !string.IsNullOrWhiteSpace(line))
+            .Where(line => line.Contains(' '))
+            .ToDictionary(
+                line =>
+                {
+                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                    return parts[0];
+                },
+                line =>
+                {
+                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                    var values = parts.Skip(1).ToList();
+                    return values;
+                }
+            );
+
+        if (userHostsMap != null)
+        {
+            foreach (var kvp in userHostsMap)
+            {
+                v2rayConfig.dns.hosts[kvp.Key] = kvp.Value;
+            }
+        }
+        return await Task.FromResult(0);
+    }
+
+    private async Task<int> GenDnsCompatible(ProfileItem? node, V2rayConfig v2rayConfig)
     {
         try
         {
@@ -1123,28 +1459,39 @@ public class CoreConfigV2rayService
                 obj["servers"] = JsonUtils.SerializeToNode(servers);
             }
 
-            // 追加至 dns 设置
+            // Append to dns settings
             if (item.UseSystemHosts)
             {
                 var systemHosts = Utils.GetSystemHosts();
                 if (systemHosts.Count > 0)
                 {
-                    var normalHost = obj["hosts"];
-                    if (normalHost != null)
+                    var normalHost1 = obj["hosts"];
+                    if (normalHost1 != null)
                     {
                         foreach (var host in systemHosts)
                         {
-                            if (normalHost[host.Key] != null)
+                            if (normalHost1[host.Key] != null)
                                 continue;
-                            normalHost[host.Key] = host.Value;
+                            normalHost1[host.Key] = host.Value;
                         }
                     }
                 }
             }
+            var normalHost = obj["hosts"];
+            if (normalHost != null)
+            {
+                foreach (var hostProp in normalHost.AsObject().ToList())
+                {
+                    if (hostProp.Value is JsonValue value && value.TryGetValue<string>(out var ip))
+                    {
+                        normalHost[hostProp.Key] = new JsonArray(ip);
+                    }
+                }
+            }
 
-            await GenDnsDomains(node, obj, item);
+            await GenDnsDomainsCompatible(node, obj, item);
 
-            v2rayConfig.dns = obj;
+            v2rayConfig.dns = JsonUtils.Deserialize<Dns4Ray>(JsonUtils.Serialize(obj));
         }
         catch (Exception ex)
         {
@@ -1153,19 +1500,52 @@ public class CoreConfigV2rayService
         return 0;
     }
 
-    private async Task<int> GenDnsDomains(ProfileItem? node, JsonNode dns, DNSItem? dNSItem)
+    private async Task<int> GenDnsDomainsCompatible(ProfileItem? node, JsonNode dns, DNSItem? dNSItem)
     {
         if (node == null)
-        { return 0; }
+        {
+            return 0;
+        }
         var servers = dns["servers"];
         if (servers != null)
         {
+            var domainList = new List<string>();
             if (Utils.IsDomain(node.Address))
+            {
+                domainList.Add(node.Address);
+            }
+            var subItem = await AppHandler.Instance.GetSubItem(node.Subid);
+            if (subItem is not null)
+            {
+                // Previous proxy
+                var prevNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+                if (prevNode is not null
+                    && prevNode.ConfigType != EConfigType.Custom
+                    && prevNode.ConfigType != EConfigType.Hysteria2
+                    && prevNode.ConfigType != EConfigType.TUIC
+                    && Utils.IsDomain(prevNode.Address))
+                {
+                    domainList.Add(prevNode.Address);
+                }
+
+                // Next proxy
+                var nextNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
+                if (nextNode is not null
+                    && nextNode.ConfigType != EConfigType.Custom
+                    && nextNode.ConfigType != EConfigType.Hysteria2
+                    && nextNode.ConfigType != EConfigType.TUIC
+                    && Utils.IsDomain(nextNode.Address))
+                {
+                    domainList.Add(nextNode.Address);
+                }
+            }
+            if (domainList.Count > 0)
             {
                 var dnsServer = new DnsServer4Ray()
                 {
-                    address = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress,
-                    domains = [node.Address]
+                    address = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainPureIPDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress,
+                    skipFallback = true,
+                    domains = domainList
                 };
                 servers.AsArray().Add(JsonUtils.SerializeToNode(dnsServer));
             }
@@ -1267,41 +1647,24 @@ public class CoreConfigV2rayService
 
             //Previous proxy
             var prevNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+            string? prevOutboundTag = null;
             if (prevNode is not null
                 && prevNode.ConfigType != EConfigType.Custom
                 && prevNode.ConfigType != EConfigType.Hysteria2
                 && prevNode.ConfigType != EConfigType.TUIC
-                && prevNode.ConfigType != EConfigType.WireGuard)
+                && prevNode.ConfigType != EConfigType.Anytls)
             {
                 var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                 await GenOutbound(prevNode, prevOutbound);
-                prevOutbound.tag = $"{Global.ProxyTag}2";
+                prevOutboundTag = $"prev-{Global.ProxyTag}";
+                prevOutbound.tag = prevOutboundTag;
                 v2rayConfig.outbounds.Add(prevOutbound);
-
-                outbound.streamSettings.sockopt = new()
-                {
-                    dialerProxy = prevOutbound.tag
-                };
             }
+            var nextOutbound = await GenChainOutbounds(subItem, outbound, prevOutboundTag);
 
-            //Next proxy
-            var nextNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
-            if (nextNode is not null
-                && nextNode.ConfigType != EConfigType.Custom
-                && nextNode.ConfigType != EConfigType.Hysteria2
-                && nextNode.ConfigType != EConfigType.TUIC
-                && nextNode.ConfigType != EConfigType.WireGuard)
+            if (nextOutbound is not null)
             {
-                var nextOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
-                await GenOutbound(nextNode, nextOutbound);
-                nextOutbound.tag = Global.ProxyTag;
                 v2rayConfig.outbounds.Insert(0, nextOutbound);
-
-                outbound.tag = $"{Global.ProxyTag}1";
-                nextOutbound.streamSettings.sockopt = new()
-                {
-                    dialerProxy = outbound.tag
-                };
             }
         }
         catch (Exception ex)
@@ -1312,18 +1675,181 @@ public class CoreConfigV2rayService
         return 0;
     }
 
+    private async Task<int> GenOutboundsList(List<ProfileItem> nodes, V2rayConfig v2rayConfig)
+    {
+        try
+        {
+            // Get template and initialize list
+            var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
+            if (txtOutbound.IsNullOrEmpty())
+            {
+                return 0;
+            }
+
+            var resultOutbounds = new List<Outbounds4Ray>();
+            var prevOutbounds = new List<Outbounds4Ray>(); // Separate list for prev outbounds and fragment
+
+            // Cache for chain proxies to avoid duplicate generation
+            var nextProxyCache = new Dictionary<string, Outbounds4Ray?>();
+            var prevProxyTags = new Dictionary<string, string?>(); // Map from profile name to tag
+            int prevIndex = 0; // Index for prev outbounds
+
+            // Process nodes
+            int index = 0;
+            foreach (var node in nodes)
+            {
+                index++;
+
+                // Handle proxy chain
+                string? prevTag = null;
+                var currentOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
+                var nextOutbound = nextProxyCache.GetValueOrDefault(node.Subid, null);
+                if (nextOutbound != null)
+                {
+                    nextOutbound = JsonUtils.DeepCopy(nextOutbound);
+                }
+
+                var subItem = await AppHandler.Instance.GetSubItem(node.Subid);
+
+                // current proxy
+                await GenOutbound(node, currentOutbound);
+                currentOutbound.tag = $"{Global.ProxyTag}-{index}";
+
+                if (!node.Subid.IsNullOrEmpty())
+                {
+                    if (prevProxyTags.TryGetValue(node.Subid, out var value))
+                    {
+                        prevTag = value; // maybe null
+                    }
+                    else
+                    {
+                        var prevNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+                        if (prevNode is not null
+                            && prevNode.ConfigType != EConfigType.Custom
+                            && prevNode.ConfigType != EConfigType.Hysteria2
+                            && prevNode.ConfigType != EConfigType.TUIC
+                            && prevNode.ConfigType != EConfigType.Anytls)
+                        {
+                            var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
+                            await GenOutbound(prevNode, prevOutbound);
+                            prevTag = $"prev-{Global.ProxyTag}-{++prevIndex}";
+                            prevOutbound.tag = prevTag;
+                            prevOutbounds.Add(prevOutbound);
+                        }
+                        prevProxyTags[node.Subid] = prevTag;
+                    }
+
+                    nextOutbound = await GenChainOutbounds(subItem, currentOutbound, prevTag, nextOutbound);
+                    if (!nextProxyCache.ContainsKey(node.Subid))
+                    {
+                        nextProxyCache[node.Subid] = nextOutbound;
+                    }
+                }
+
+                if (nextOutbound is not null)
+                {
+                    resultOutbounds.Add(nextOutbound);
+                }
+                resultOutbounds.Add(currentOutbound);
+            }
+
+            // Merge results: first the main chain outbounds, then other outbounds, and finally utility outbounds
+            resultOutbounds.AddRange(prevOutbounds);
+            resultOutbounds.AddRange(v2rayConfig.outbounds);
+            v2rayConfig.outbounds = resultOutbounds;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+
+        return 0;
+    }
+
+    /// <summary>
+    /// Generates a chained outbound configuration for the given subItem and outbound.
+    /// The outbound's tag must be set before calling this method.
+    /// Returns the next proxy's outbound configuration, which may be null if no next proxy exists.
+    /// </summary>
+    /// <param name="subItem">The subscription item containing proxy chain information.</param>
+    /// <param name="outbound">The current outbound configuration. Its tag must be set before calling this method.</param>
+    /// <param name="prevOutboundTag">The tag of the previous outbound in the chain, if any.</param>
+    /// <param name="nextOutbound">The outbound for the next proxy in the chain, if already created. If null, will be created inside.</param>
+    /// <returns>
+    /// The outbound configuration for the next proxy in the chain, or null if no next proxy exists.
+    /// </returns>
+    private async Task<Outbounds4Ray?> GenChainOutbounds(SubItem subItem, Outbounds4Ray outbound, string? prevOutboundTag, Outbounds4Ray? nextOutbound = null)
+    {
+        try
+        {
+            var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
+
+            if (!prevOutboundTag.IsNullOrEmpty())
+            {
+                outbound.streamSettings.sockopt = new()
+                {
+                    dialerProxy = prevOutboundTag
+                };
+            }
+
+            // Next proxy
+            var nextNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
+            if (nextNode is not null
+                && nextNode.ConfigType != EConfigType.Custom
+                && nextNode.ConfigType != EConfigType.Hysteria2
+                && nextNode.ConfigType != EConfigType.TUIC
+                && nextNode.ConfigType != EConfigType.Anytls)
+            {
+                if (nextOutbound == null)
+                {
+                    nextOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
+                    await GenOutbound(nextNode, nextOutbound);
+                }
+                nextOutbound.tag = outbound.tag;
+
+                outbound.tag = $"mid-{outbound.tag}";
+                nextOutbound.streamSettings.sockopt = new()
+                {
+                    dialerProxy = outbound.tag
+                };
+            }
+            return nextOutbound;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return null;
+    }
+
     private async Task<int> GenBalancer(V2rayConfig v2rayConfig, EMultipleLoad multipleLoad)
     {
-        if (multipleLoad is EMultipleLoad.LeastLoad or EMultipleLoad.LeastPing)
+        if (multipleLoad == EMultipleLoad.LeastPing)
         {
             var observatory = new Observatory4Ray
             {
                 subjectSelector = [Global.ProxyTag],
                 probeUrl = AppHandler.Instance.Config.SpeedTestItem.SpeedPingTestUrl,
-                probeInterval = "3m"
+                probeInterval = "3m",
+                enableConcurrency = true,
             };
             v2rayConfig.observatory = observatory;
         }
+        else if (multipleLoad == EMultipleLoad.LeastLoad)
+        {
+            var burstObservatory = new BurstObservatory4Ray
+            {
+                subjectSelector = [Global.ProxyTag],
+                pingConfig = new()
+                {
+                    destination = AppHandler.Instance.Config.SpeedTestItem.SpeedPingTestUrl,
+                    interval = "5m",
+                    timeout = "30s",
+                    sampling = 2,
+                }
+            };
+            v2rayConfig.burstObservatory = burstObservatory;
+        }
         var strategyType = multipleLoad switch
         {
             EMultipleLoad.Random => "random",
@@ -1342,5 +1868,85 @@ public class CoreConfigV2rayService
         return await Task.FromResult(0);
     }
 
+    private async Task<string> ApplyFullConfigTemplate(V2rayConfig v2rayConfig, bool handleBalancerAndRules = false)
+    {
+        var fullConfigTemplate = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
+        if (fullConfigTemplate == null || !fullConfigTemplate.Enabled || fullConfigTemplate.Config.IsNullOrEmpty())
+        {
+            return JsonUtils.Serialize(v2rayConfig);
+        }
+
+        var fullConfigTemplateNode = JsonNode.Parse(fullConfigTemplate.Config);
+        if (fullConfigTemplateNode == null)
+        {
+            return JsonUtils.Serialize(v2rayConfig);
+        }
+
+        // Handle balancer and rules modifications (for multiple load scenarios)
+        if (handleBalancerAndRules && v2rayConfig.routing?.balancers?.Count > 0)
+        {
+            var balancer = v2rayConfig.routing.balancers.First();
+
+            // Modify existing rules in custom config
+            var rulesNode = fullConfigTemplateNode["routing"]?["rules"];
+            if (rulesNode != null)
+            {
+                foreach (var rule in rulesNode.AsArray())
+                {
+                    if (rule["outboundTag"]?.GetValue<string>() == Global.ProxyTag)
+                    {
+                        rule.AsObject().Remove("outboundTag");
+                        rule["balancerTag"] = balancer.tag;
+                    }
+                }
+            }
+
+            // Ensure routing node exists
+            if (fullConfigTemplateNode["routing"] == null)
+            {
+                fullConfigTemplateNode["routing"] = new JsonObject();
+            }
+
+            // Handle balancers - append instead of override
+            if (fullConfigTemplateNode["routing"]["balancers"] is JsonArray customBalancersNode)
+            {
+                if (JsonNode.Parse(JsonUtils.Serialize(v2rayConfig.routing.balancers)) is JsonArray newBalancers)
+                {
+                    foreach (var balancerNode in newBalancers)
+                    {
+                        customBalancersNode.Add(balancerNode?.DeepClone());
+                    }
+                }
+            }
+            else
+            {
+                fullConfigTemplateNode["routing"]["balancers"] = JsonNode.Parse(JsonUtils.Serialize(v2rayConfig.routing.balancers));
+            }
+        }
+
+        // Handle outbounds - append instead of override
+        var customOutboundsNode = fullConfigTemplateNode["outbounds"] is JsonArray outbounds ? outbounds : new JsonArray();
+        foreach (var outbound in v2rayConfig.outbounds)
+        {
+            if (outbound.protocol.ToLower() is "blackhole" or "dns" or "freedom")
+            {
+                if (fullConfigTemplate.AddProxyOnly == true)
+                {
+                    continue;
+                }
+            }
+            else if ((outbound.streamSettings?.sockopt?.dialerProxy.IsNullOrEmpty() == true) && (!fullConfigTemplate.ProxyDetour.IsNullOrEmpty()) && !(Utils.IsPrivateNetwork(outbound.settings?.servers?.FirstOrDefault()?.address ?? string.Empty) || Utils.IsPrivateNetwork(outbound.settings?.vnext?.FirstOrDefault()?.address ?? string.Empty)))
+            {
+                outbound.streamSettings ??= new StreamSettings4Ray();
+                outbound.streamSettings.sockopt ??= new Sockopt4Ray();
+                outbound.streamSettings.sockopt.dialerProxy = fullConfigTemplate.ProxyDetour;
+            }
+            customOutboundsNode.Add(JsonUtils.DeepCopy(outbound));
+        }
+        fullConfigTemplateNode["outbounds"] = customOutboundsNode;
+
+        return await Task.FromResult(JsonUtils.Serialize(fullConfigTemplateNode));
+    }
+
     #endregion private gen function
 }

v2rayN/ServiceLib/Services/SpeedtestService.cs

@@ -196,6 +196,7 @@ public class SpeedtestService
             {
                 return false;
             }
+            await Task.Delay(1000);
 
             var downloadHandle = new DownloadService();
 
@@ -255,9 +256,13 @@ public class SpeedtestService
                 try
                 {
                     pid = await CoreHandler.Instance.LoadCoreConfigSpeedtest(it);
-                    if (pid > 0)
+                    if (pid < 0)
                     {
-                        await Task.Delay(500);
+                        UpdateFunc(it.IndexId, "", ResUI.FailedToRunCore);
+                    }
+                    else
+                    {
+                        await Task.Delay(1000);
                         var delay = await DoRealPing(downloadHandle, it);
                         if (blSpeedTest)
                         {
@@ -271,10 +276,6 @@ public class SpeedtestService
                             }
                         }
                     }
-                    else
-                    {
-                        UpdateFunc(it.IndexId, "", ResUI.FailedToRunCore);
-                    }
                 }
                 catch (Exception ex)
                 {
@@ -357,8 +358,8 @@ public class SpeedtestService
     private List<List<ServerTestItem>> GetTestBatchItem(List<ServerTestItem> lstSelected, int pageSize)
     {
         List<List<ServerTestItem>> lstTest = new();
-        var lst1 = lstSelected.Where(t => t.ConfigType is not (EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard)).ToList();
-        var lst2 = lstSelected.Where(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard).ToList();
+        var lst1 = lstSelected.Where(t => t.ConfigType is not (EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls)).ToList();
+        var lst2 = lstSelected.Where(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.Anytls).ToList();
 
         for (var num = 0; num < (int)Math.Ceiling(lst1.Count * 1.0 / pageSize); num++)
         {

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -6,7 +6,7 @@ namespace ServiceLib.Services;
 public class UpdateService
 {
     private Action<bool, string>? _updateFunc;
-    private int _timeout = 30;
+    private readonly int _timeout = 30;
     private static readonly string _tag = "UpdateService";
 
     public async Task CheckUpdateGuiN(Config config, Action<bool, string> updateFunc, bool preRelease)
@@ -104,137 +104,6 @@ public class UpdateService
         }
     }
 
-    public async Task UpdateSubscriptionProcess(Config config, string subId, bool blProxy, Action<bool, string> updateFunc)
-    {
-        _updateFunc = updateFunc;
-
-        _updateFunc?.Invoke(false, ResUI.MsgUpdateSubscriptionStart);
-        var subItem = await AppHandler.Instance.SubItems();
-
-        if (subItem is not { Count: > 0 })
-        {
-            _updateFunc?.Invoke(false, ResUI.MsgNoValidSubscription);
-            return;
-        }
-
-        foreach (var item in subItem)
-        {
-            var id = item.Id.TrimEx();
-            var url = item.Url.TrimEx();
-            var userAgent = item.UserAgent.TrimEx();
-            var hashCode = $"{item.Remarks}->";
-            if (id.IsNullOrEmpty() || url.IsNullOrEmpty() || (subId.IsNotEmpty() && item.Id != subId))
-            {
-                //_updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgNoValidSubscription}");
-                continue;
-            }
-            if (!url.StartsWith(Global.HttpsProtocol) && !url.StartsWith(Global.HttpProtocol))
-            {
-                continue;
-            }
-            if (item.Enabled == false)
-            {
-                _updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSkipSubscriptionUpdate}");
-                continue;
-            }
-
-            var downloadHandle = new DownloadService();
-            downloadHandle.Error += (sender2, args) =>
-            {
-                _updateFunc?.Invoke(false, $"{hashCode}{args.GetException().Message}");
-            };
-
-            _updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
-
-            //one url
-            url = Utils.GetPunycode(url);
-            //convert
-            if (item.ConvertTarget.IsNotEmpty())
-            {
-                var subConvertUrl = config.ConstItem.SubConvertUrl.IsNullOrEmpty() ? Global.SubConvertUrls.FirstOrDefault() : config.ConstItem.SubConvertUrl;
-                url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
-                if (!url.Contains("target="))
-                {
-                    url += string.Format("&target={0}", item.ConvertTarget);
-                }
-                if (!url.Contains("config="))
-                {
-                    url += string.Format("&config={0}", Global.SubConvertConfig.FirstOrDefault());
-                }
-            }
-            var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
-            if (blProxy && result.IsNullOrEmpty())
-            {
-                result = await downloadHandle.TryDownloadString(url, false, userAgent);
-            }
-
-            //more url
-            if (item.ConvertTarget.IsNullOrEmpty() && item.MoreUrl.TrimEx().IsNotEmpty())
-            {
-                if (result.IsNotEmpty() && Utils.IsBase64String(result))
-                {
-                    result = Utils.Base64Decode(result);
-                }
-
-                var lstUrl = item.MoreUrl.TrimEx().Split(",") ?? [];
-                foreach (var it in lstUrl)
-                {
-                    var url2 = Utils.GetPunycode(it);
-                    if (url2.IsNullOrEmpty())
-                    {
-                        continue;
-                    }
-
-                    var result2 = await downloadHandle.TryDownloadString(url2, blProxy, userAgent);
-                    if (blProxy && result2.IsNullOrEmpty())
-                    {
-                        result2 = await downloadHandle.TryDownloadString(url2, false, userAgent);
-                    }
-                    if (result2.IsNotEmpty())
-                    {
-                        if (Utils.IsBase64String(result2))
-                        {
-                            result += Utils.Base64Decode(result2);
-                        }
-                        else
-                        {
-                            result += result2;
-                        }
-                    }
-                }
-            }
-
-            if (result.IsNullOrEmpty())
-            {
-                _updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
-            }
-            else
-            {
-                _updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
-                if (result?.Length < 99)
-                {
-                    _updateFunc?.Invoke(false, $"{hashCode}{result}");
-                }
-
-                var ret = await ConfigHandler.AddBatchServers(config, result, id, true);
-                if (ret <= 0)
-                {
-                    Logging.SaveLog("FailedImportSubscription");
-                    Logging.SaveLog(result);
-                }
-                _updateFunc?.Invoke(false,
-                    ret > 0
-                        ? $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}"
-                        : $"{hashCode}{ResUI.MsgFailedImportSubscription}");
-            }
-            _updateFunc?.Invoke(false, "-------------------------------------------------------");
-
-            //await ConfigHandler.DedupServerList(config, id);
-        }
-
-        _updateFunc?.Invoke(true, $"{ResUI.MsgUpdateSubscriptionEnd}");
-    }
-
     public async Task UpdateGeoFileAll(Config config, Action<bool, string> updateFunc)
     {
         await UpdateGeoFiles(config, updateFunc);
@@ -243,21 +112,6 @@ public class UpdateService
         _updateFunc?.Invoke(true, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, "geo"));
     }
 
-    public async Task<string> RunAvailabilityCheck()
-    {
-        var downloadHandle = new DownloadService();
-        var time = await downloadHandle.RunAvailabilityCheck(null);
-        var ip = Global.None;
-        if (time > 0)
-        {
-            var result = await downloadHandle.TryDownloadString(Global.IPAPIUrl, true, Global.IPAPIUrl);
-            var ipInfo = JsonUtils.Deserialize<IPAPIInfo>(result);
-            ip = $"({ipInfo?.country_code}) {ipInfo?.ip}";
-        }
-
-        return string.Format(ResUI.TestMeOutput, time, ip);
-    }
-
     #region CheckUpdate private
 
     private async Task<RetResult> CheckUpdateAsync(DownloadService downloadHandle, ECoreType type, bool preRelease)
@@ -500,6 +354,12 @@ public class UpdateService
 
     private async Task UpdateOtherFiles(Config config, Action<bool, string> updateFunc)
     {
+        //If it is not in China area, no update is required
+        if (config.ConstItem.GeoSourceUrl.IsNotEmpty())
+        {
+            return;
+        }
+
         _updateFunc = updateFunc;
 
         foreach (var url in Global.OtherGeoUrls)
@@ -545,6 +405,11 @@ public class UpdateService
             }
         }
 
+        //append dns items TODO
+        geoSiteFiles.Add("cn");
+        geoSiteFiles.Add("geolocation-cn");
+        geoSiteFiles.Add("category-ads-all");
+
         var path = Utils.GetBinPath("srss");
         if (!Directory.Exists(path))
         {

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -75,10 +75,7 @@ public class CheckUpdateViewModel : MyReactiveObject
 
     private async Task CheckUpdate()
     {
-        await Task.Run(async () =>
-        {
-            await CheckUpdateTask();
-        });
+        await Task.Run(CheckUpdateTask);
     }
 
     private async Task CheckUpdateTask()

v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs

@@ -174,6 +174,11 @@ public class ClashProxiesViewModel : MyReactiveObject
 
     public void RefreshProxyGroups()
     {
+        if (_proxies == null)
+        {
+            return;
+        }
+
         var selectedName = SelectedGroup?.Name;
         _proxyGroups.Clear();
 
@@ -297,8 +302,10 @@ public class ClashProxiesViewModel : MyReactiveObject
 
     private ProxiesItem? TryGetProxy(string name)
     {
-        if (_proxies is null)
+        if (_proxies == null)
+        {
             return null;
+        }
         _proxies.TryGetValue(name, out var proxy2);
         if (proxy2 != null)
         {

v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs

@@ -6,39 +6,52 @@ namespace ServiceLib.ViewModels;
 
 public class DNSSettingViewModel : MyReactiveObject
 {
-    [Reactive] public bool UseSystemHosts { get; set; }
-    [Reactive] public string DomainStrategy4Freedom { get; set; }
-    [Reactive] public string DomainDNSAddress { get; set; }
-    [Reactive] public string NormalDNS { get; set; }
+    [Reactive] public bool? UseSystemHosts { get; set; }
+    [Reactive] public bool? AddCommonHosts { get; set; }
+    [Reactive] public bool? FakeIP { get; set; }
+    [Reactive] public bool? BlockBindingQuery { get; set; }
+    [Reactive] public string? DirectDNS { get; set; }
+    [Reactive] public string? RemoteDNS { get; set; }
+    [Reactive] public string? SingboxOutboundsResolveDNS { get; set; }
+    [Reactive] public string? SingboxFinalResolveDNS { get; set; }
+    [Reactive] public string? RayStrategy4Freedom { get; set; }
+    [Reactive] public string? SingboxStrategy4Direct { get; set; }
+    [Reactive] public string? SingboxStrategy4Proxy { get; set; }
+    [Reactive] public string? Hosts { get; set; }
+    [Reactive] public string? DirectExpectedIPs { get; set; }
 
-    [Reactive] public string DomainStrategy4Freedom2 { get; set; }
-    [Reactive] public string DomainDNSAddress2 { get; set; }
-    [Reactive] public string NormalDNS2 { get; set; }
-    [Reactive] public string TunDNS2 { get; set; }
+    [Reactive] public bool UseSystemHostsCompatible { get; set; }
+    [Reactive] public string DomainStrategy4FreedomCompatible { get; set; }
+    [Reactive] public string DomainDNSAddressCompatible { get; set; }
+    [Reactive] public string NormalDNSCompatible { get; set; }
+
+    [Reactive] public string DomainStrategy4Freedom2Compatible { get; set; }
+    [Reactive] public string DomainDNSAddress2Compatible { get; set; }
+    [Reactive] public string NormalDNS2Compatible { get; set; }
+    [Reactive] public string TunDNS2Compatible { get; set; }
+    [Reactive] public bool RayCustomDNSEnableCompatible { get; set; }
+    [Reactive] public bool SBCustomDNSEnableCompatible { get; set; }
 
     public ReactiveCommand<Unit, Unit> SaveCmd { get; }
-    public ReactiveCommand<Unit, Unit> ImportDefConfig4V2rayCmd { get; }
-    public ReactiveCommand<Unit, Unit> ImportDefConfig4SingboxCmd { get; }
+    public ReactiveCommand<Unit, Unit> ImportDefConfig4V2rayCompatibleCmd { get; }
+    public ReactiveCommand<Unit, Unit> ImportDefConfig4SingboxCompatibleCmd { get; }
 
     public DNSSettingViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
     {
         _config = AppHandler.Instance.Config;
         _updateView = updateView;
-        SaveCmd = ReactiveCommand.CreateFromTask(async () =>
-        {
-            await SaveSettingAsync();
-        });
+        SaveCmd = ReactiveCommand.CreateFromTask(SaveSettingAsync);
 
-        ImportDefConfig4V2rayCmd = ReactiveCommand.CreateFromTask(async () =>
+        ImportDefConfig4V2rayCompatibleCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            NormalDNS = EmbedUtils.GetEmbedText(Global.DNSV2rayNormalFileName);
+            NormalDNSCompatible = EmbedUtils.GetEmbedText(Global.DNSV2rayNormalFileName);
             await Task.CompletedTask;
         });
 
-        ImportDefConfig4SingboxCmd = ReactiveCommand.CreateFromTask(async () =>
+        ImportDefConfig4SingboxCompatibleCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            NormalDNS2 = EmbedUtils.GetEmbedText(Global.DNSSingboxNormalFileName);
-            TunDNS2 = EmbedUtils.GetEmbedText(Global.TunSingboxDNSFileName);
+            NormalDNS2Compatible = EmbedUtils.GetEmbedText(Global.DNSSingboxNormalFileName);
+            TunDNS2Compatible = EmbedUtils.GetEmbedText(Global.TunSingboxDNSFileName);
             await Task.CompletedTask;
         });
 
@@ -47,48 +60,80 @@ public class DNSSettingViewModel : MyReactiveObject
 
     private async Task Init()
     {
-        var item = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
+        _config = AppHandler.Instance.Config;
+        var item = _config.SimpleDNSItem;
         UseSystemHosts = item.UseSystemHosts;
-        DomainStrategy4Freedom = item?.DomainStrategy4Freedom ?? string.Empty;
-        DomainDNSAddress = item?.DomainDNSAddress ?? string.Empty;
-        NormalDNS = item?.NormalDNS ?? string.Empty;
+        AddCommonHosts = item.AddCommonHosts;
+        FakeIP = item.FakeIP;
+        BlockBindingQuery = item.BlockBindingQuery;
+        DirectDNS = item.DirectDNS;
+        RemoteDNS = item.RemoteDNS;
+        RayStrategy4Freedom = item.RayStrategy4Freedom;
+        SingboxOutboundsResolveDNS = item.SingboxOutboundsResolveDNS;
+        SingboxFinalResolveDNS = item.SingboxFinalResolveDNS;
+        SingboxStrategy4Direct = item.SingboxStrategy4Direct;
+        SingboxStrategy4Proxy = item.SingboxStrategy4Proxy;
+        Hosts = item.Hosts;
+        DirectExpectedIPs = item.DirectExpectedIPs;
+
+        var item1 = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
+        RayCustomDNSEnableCompatible = item1.Enabled;
+        UseSystemHostsCompatible = item1.UseSystemHosts;
+        DomainStrategy4FreedomCompatible = item1?.DomainStrategy4Freedom ?? string.Empty;
+        DomainDNSAddressCompatible = item1?.DomainDNSAddress ?? string.Empty;
+        NormalDNSCompatible = item1?.NormalDNS ?? string.Empty;
 
         var item2 = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
-        DomainStrategy4Freedom2 = item2?.DomainStrategy4Freedom ?? string.Empty;
-        DomainDNSAddress2 = item2?.DomainDNSAddress ?? string.Empty;
-        NormalDNS2 = item2?.NormalDNS ?? string.Empty;
-        TunDNS2 = item2?.TunDNS ?? string.Empty;
+        SBCustomDNSEnableCompatible = item2.Enabled;
+        DomainStrategy4Freedom2Compatible = item2?.DomainStrategy4Freedom ?? string.Empty;
+        DomainDNSAddress2Compatible = item2?.DomainDNSAddress ?? string.Empty;
+        NormalDNS2Compatible = item2?.NormalDNS ?? string.Empty;
+        TunDNS2Compatible = item2?.TunDNS ?? string.Empty;
     }
 
     private async Task SaveSettingAsync()
     {
-        if (NormalDNS.IsNotEmpty())
+        _config.SimpleDNSItem.UseSystemHosts = UseSystemHosts;
+        _config.SimpleDNSItem.AddCommonHosts = AddCommonHosts;
+        _config.SimpleDNSItem.FakeIP = FakeIP;
+        _config.SimpleDNSItem.BlockBindingQuery = BlockBindingQuery;
+        _config.SimpleDNSItem.DirectDNS = DirectDNS;
+        _config.SimpleDNSItem.RemoteDNS = RemoteDNS;
+        _config.SimpleDNSItem.RayStrategy4Freedom = RayStrategy4Freedom;
+        _config.SimpleDNSItem.SingboxOutboundsResolveDNS = SingboxOutboundsResolveDNS;
+        _config.SimpleDNSItem.SingboxFinalResolveDNS = SingboxFinalResolveDNS;
+        _config.SimpleDNSItem.SingboxStrategy4Direct = SingboxStrategy4Direct;
+        _config.SimpleDNSItem.SingboxStrategy4Proxy = SingboxStrategy4Proxy;
+        _config.SimpleDNSItem.Hosts = Hosts;
+        _config.SimpleDNSItem.DirectExpectedIPs = DirectExpectedIPs;
+
+        if (NormalDNSCompatible.IsNotEmpty())
         {
-            var obj = JsonUtils.ParseJson(NormalDNS);
+            var obj = JsonUtils.ParseJson(NormalDNSCompatible);
             if (obj != null && obj["servers"] != null)
             {
             }
             else
             {
-                if (NormalDNS.Contains('{') || NormalDNS.Contains('}'))
+                if (NormalDNSCompatible.Contains('{') || NormalDNSCompatible.Contains('}'))
                 {
                     NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
                     return;
                 }
             }
         }
-        if (NormalDNS2.IsNotEmpty())
+        if (NormalDNS2Compatible.IsNotEmpty())
         {
-            var obj2 = JsonUtils.Deserialize<Dns4Sbox>(NormalDNS2);
+            var obj2 = JsonUtils.Deserialize<Dns4Sbox>(NormalDNS2Compatible);
             if (obj2 == null)
             {
                 NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
                 return;
             }
         }
-        if (TunDNS2.IsNotEmpty())
+        if (TunDNS2Compatible.IsNotEmpty())
         {
-            var obj2 = JsonUtils.Deserialize<Dns4Sbox>(TunDNS2);
+            var obj2 = JsonUtils.Deserialize<Dns4Sbox>(TunDNS2Compatible);
             if (obj2 == null)
             {
                 NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
@@ -96,21 +141,26 @@ public class DNSSettingViewModel : MyReactiveObject
             }
         }
 
-        var item = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
-        item.DomainStrategy4Freedom = DomainStrategy4Freedom;
-        item.DomainDNSAddress = DomainDNSAddress;
-        item.UseSystemHosts = UseSystemHosts;
-        item.NormalDNS = NormalDNS;
-        await ConfigHandler.SaveDNSItems(_config, item);
+        var item1 = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
+        item1.Enabled = RayCustomDNSEnableCompatible;
+        item1.DomainStrategy4Freedom = DomainStrategy4FreedomCompatible;
+        item1.DomainDNSAddress = DomainDNSAddressCompatible;
+        item1.UseSystemHosts = UseSystemHostsCompatible;
+        item1.NormalDNS = NormalDNSCompatible;
+        await ConfigHandler.SaveDNSItems(_config, item1);
 
         var item2 = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
-        item2.DomainStrategy4Freedom = DomainStrategy4Freedom2;
-        item2.DomainDNSAddress = DomainDNSAddress2;
-        item2.NormalDNS = JsonUtils.Serialize(JsonUtils.ParseJson(NormalDNS2));
-        item2.TunDNS = JsonUtils.Serialize(JsonUtils.ParseJson(TunDNS2));
+        item2.Enabled = SBCustomDNSEnableCompatible;
+        item2.DomainStrategy4Freedom = DomainStrategy4Freedom2Compatible;
+        item2.DomainDNSAddress = DomainDNSAddress2Compatible;
+        item2.NormalDNS = JsonUtils.Serialize(JsonUtils.ParseJson(NormalDNS2Compatible));
+        item2.TunDNS = JsonUtils.Serialize(JsonUtils.ParseJson(TunDNS2Compatible));
         await ConfigHandler.SaveDNSItems(_config, item2);
 
-        NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
-        _ = _updateView?.Invoke(EViewAction.CloseWindow, null);
+        await ConfigHandler.SaveConfig(_config);
+        if (_updateView != null)
+        {
+            await _updateView(EViewAction.CloseWindow, null);
+        }
     }
 }

v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs

@@ -0,0 +1,113 @@
+using System.Reactive;
+using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
+
+namespace ServiceLib.ViewModels;
+
+public class FullConfigTemplateViewModel : MyReactiveObject
+{
+    #region Reactive
+
+    [Reactive]
+    public bool EnableFullConfigTemplate4Ray { get; set; }
+
+    [Reactive]
+    public bool EnableFullConfigTemplate4Singbox { get; set; }
+
+    [Reactive]
+    public string FullConfigTemplate4Ray { get; set; }
+
+    [Reactive]
+    public string FullConfigTemplate4Singbox { get; set; }
+
+    [Reactive]
+    public string FullTunConfigTemplate4Singbox { get; set; }
+
+    [Reactive]
+    public bool AddProxyOnly4Ray { get; set; }
+
+    [Reactive]
+    public bool AddProxyOnly4Singbox { get; set; }
+
+    [Reactive]
+    public string ProxyDetour4Ray { get; set; }
+
+    [Reactive]
+    public string ProxyDetour4Singbox { get; set; }
+
+    public ReactiveCommand<Unit, Unit> SaveCmd { get; }
+
+    #endregion Reactive
+
+    public FullConfigTemplateViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
+    {
+        _config = AppHandler.Instance.Config;
+        _updateView = updateView;
+        SaveCmd = ReactiveCommand.CreateFromTask(async () =>
+        {
+            await SaveSettingAsync();
+        });
+
+        _ = Init();
+    }
+
+    private async Task Init()
+    {
+        var item = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
+        EnableFullConfigTemplate4Ray = item?.Enabled ?? false;
+        FullConfigTemplate4Ray = item?.Config ?? string.Empty;
+        AddProxyOnly4Ray = item?.AddProxyOnly ?? false;
+        ProxyDetour4Ray = item?.ProxyDetour ?? string.Empty;
+
+        var item2 = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.sing_box);
+        EnableFullConfigTemplate4Singbox = item2?.Enabled ?? false;
+        FullConfigTemplate4Singbox = item2?.Config ?? string.Empty;
+        FullTunConfigTemplate4Singbox = item2?.TunConfig ?? string.Empty;
+        AddProxyOnly4Singbox = item2?.AddProxyOnly ?? false;
+        ProxyDetour4Singbox = item2?.ProxyDetour ?? string.Empty;
+    }
+
+    private async Task SaveSettingAsync()
+    {
+        if (!await SaveXrayConfigAsync())
+            return;
+
+        if (!await SaveSingboxConfigAsync())
+            return;
+
+        NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
+        _ = _updateView?.Invoke(EViewAction.CloseWindow, null);
+    }
+
+    private async Task<bool> SaveXrayConfigAsync()
+    {
+        var item = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.Xray);
+        item.Enabled = EnableFullConfigTemplate4Ray;
+        item.Config = null;
+
+        item.Config = FullConfigTemplate4Ray;
+
+        item.AddProxyOnly = AddProxyOnly4Ray;
+        item.ProxyDetour = ProxyDetour4Ray;
+
+        await ConfigHandler.SaveFullConfigTemplate(_config, item);
+        return true;
+    }
+
+    private async Task<bool> SaveSingboxConfigAsync()
+    {
+        var item = await AppHandler.Instance.GetFullConfigTemplateItem(ECoreType.sing_box);
+        item.Enabled = EnableFullConfigTemplate4Singbox;
+        item.Config = null;
+        item.TunConfig = null;
+
+        item.Config = FullConfigTemplate4Singbox;
+        item.TunConfig = FullTunConfigTemplate4Singbox;
+
+        item.AddProxyOnly = AddProxyOnly4Singbox;
+        item.ProxyDetour = ProxyDetour4Singbox;
+
+        await ConfigHandler.SaveFullConfigTemplate(_config, item);
+        return true;
+    }
+}

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -20,6 +20,7 @@ public class MainWindowViewModel : MyReactiveObject
     public ReactiveCommand<Unit, Unit> AddHysteria2ServerCmd { get; }
     public ReactiveCommand<Unit, Unit> AddTuicServerCmd { get; }
     public ReactiveCommand<Unit, Unit> AddWireguardServerCmd { get; }
+    public ReactiveCommand<Unit, Unit> AddAnytlsServerCmd { get; }
     public ReactiveCommand<Unit, Unit> AddCustomServerCmd { get; }
     public ReactiveCommand<Unit, Unit> AddServerViaClipboardCmd { get; }
     public ReactiveCommand<Unit, Unit> AddServerViaScanCmd { get; }
@@ -38,6 +39,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     public ReactiveCommand<Unit, Unit> RoutingSettingCmd { get; }
     public ReactiveCommand<Unit, Unit> DNSSettingCmd { get; }
+    public ReactiveCommand<Unit, Unit> FullConfigTemplateCmd { get; }
     public ReactiveCommand<Unit, Unit> GlobalHotkeySettingCmd { get; }
     public ReactiveCommand<Unit, Unit> RebootAsAdminCmd { get; }
     public ReactiveCommand<Unit, Unit> ClearServerStatisticsCmd { get; }
@@ -111,6 +113,10 @@ public class MainWindowViewModel : MyReactiveObject
         {
             await AddServerAsync(true, EConfigType.WireGuard);
         });
+        AddAnytlsServerCmd = ReactiveCommand.CreateFromTask(async () =>
+        {
+            await AddServerAsync(true, EConfigType.Anytls);
+        });
         AddCustomServerCmd = ReactiveCommand.CreateFromTask(async () =>
         {
             await AddServerAsync(true, EConfigType.Custom);
@@ -164,6 +170,10 @@ public class MainWindowViewModel : MyReactiveObject
         {
             await DNSSettingAsync();
         });
+        FullConfigTemplateCmd = ReactiveCommand.CreateFromTask(async () =>
+        {
+            await FullConfigTemplateAsync();
+        });
         GlobalHotkeySettingCmd = ReactiveCommand.CreateFromTask(async () =>
         {
             if (await _updateView?.Invoke(EViewAction.GlobalHotkeySettingWindow, null) == true)
@@ -215,6 +225,7 @@ public class MainWindowViewModel : MyReactiveObject
 
         await ConfigHandler.InitBuiltinRouting(_config);
         await ConfigHandler.InitBuiltinDNS(_config);
+        await ConfigHandler.InitBuiltinFullConfigTemplate(_config);
         await ProfileExHandler.Instance.Init();
         await CoreHandler.Instance.Init(_config, UpdateHandler);
         TaskHandler.Instance.RegUpdateTask(_config, UpdateTaskHandler);
@@ -466,7 +477,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     public async Task UpdateSubscriptionProcess(string subId, bool blProxy)
     {
-        await (new UpdateService()).UpdateSubscriptionProcess(_config, subId, blProxy, UpdateTaskHandler);
+        await SubscriptionHandler.UpdateProcess(_config, subId, blProxy, UpdateTaskHandler);
     }
 
     #endregion Subscription
@@ -503,6 +514,15 @@ public class MainWindowViewModel : MyReactiveObject
         }
     }
 
+    private async Task FullConfigTemplateAsync()
+    {
+        var ret = await _updateView?.Invoke(EViewAction.FullConfigTemplateWindow, null);
+        if (ret == true)
+        {
+            await Reload();
+        }
+    }
+
     public async Task RebootAsAdmin()
     {
         ProcUtils.RebootAsAdmin();
@@ -548,8 +568,12 @@ public class MainWindowViewModel : MyReactiveObject
 
         BlReloadEnabled = false;
 
+        await Task.Run(async () =>
+        {
             await LoadCore();
             await SysProxyHandler.UpdateSysProxy(_config, false);
+            await Task.Delay(1000);
+        });
         Locator.Current.GetService<StatusBarViewModel>()?.TestServerAvailability();
 
         _updateView?.Invoke(EViewAction.DispatcherReload, null);

v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs

@@ -70,6 +70,7 @@ public class OptionSettingViewModel : MyReactiveObject
     [Reactive] public string GeoFileSourceUrl { get; set; }
     [Reactive] public string SrsFileSourceUrl { get; set; }
     [Reactive] public string RoutingRulesSourceUrl { get; set; }
+    [Reactive] public string IPAPIUrl { get; set; }
 
     #endregion UI
 
@@ -83,12 +84,12 @@ public class OptionSettingViewModel : MyReactiveObject
 
     #region Tun mode
 
+    [Reactive] public bool TunAutoRoute { get; set; }
     [Reactive] public bool TunStrictRoute { get; set; }
     [Reactive] public string TunStack { get; set; }
     [Reactive] public int TunMtu { get; set; }
     [Reactive] public bool TunEnableExInbound { get; set; }
     [Reactive] public bool TunEnableIPv6Address { get; set; }
-    [Reactive] public string TunLinuxSudoPassword { get; set; }
 
     #endregion Tun mode
 
@@ -100,6 +101,7 @@ public class OptionSettingViewModel : MyReactiveObject
     [Reactive] public string CoreType4 { get; set; }
     [Reactive] public string CoreType5 { get; set; }
     [Reactive] public string CoreType6 { get; set; }
+    [Reactive] public string CoreType9 { get; set; }
 
     #endregion CoreType
 
@@ -186,6 +188,7 @@ public class OptionSettingViewModel : MyReactiveObject
         GeoFileSourceUrl = _config.ConstItem.GeoSourceUrl;
         SrsFileSourceUrl = _config.ConstItem.SrsSourceUrl;
         RoutingRulesSourceUrl = _config.ConstItem.RouteRulesTemplateSourceUrl;
+        IPAPIUrl = _config.SpeedTestItem.IPAPIUrl;
 
         #endregion UI
 
@@ -199,12 +202,12 @@ public class OptionSettingViewModel : MyReactiveObject
 
         #region Tun mode
 
+        TunAutoRoute = _config.TunModeItem.AutoRoute;
         TunStrictRoute = _config.TunModeItem.StrictRoute;
         TunStack = _config.TunModeItem.Stack;
         TunMtu = _config.TunModeItem.Mtu;
         TunEnableExInbound = _config.TunModeItem.EnableExInbound;
         TunEnableIPv6Address = _config.TunModeItem.EnableIPv6Address;
-        TunLinuxSudoPassword = _config.TunModeItem.LinuxSudoPwd;
 
         #endregion Tun mode
 
@@ -259,6 +262,10 @@ public class OptionSettingViewModel : MyReactiveObject
                 case 6:
                     CoreType6 = type;
                     break;
+
+                case 9:
+                    CoreType9 = type;
+                    break;
             }
         });
         await Task.CompletedTask;
@@ -341,6 +348,7 @@ public class OptionSettingViewModel : MyReactiveObject
         _config.ConstItem.GeoSourceUrl = GeoFileSourceUrl;
         _config.ConstItem.SrsSourceUrl = SrsFileSourceUrl;
         _config.ConstItem.RouteRulesTemplateSourceUrl = RoutingRulesSourceUrl;
+        _config.SpeedTestItem.IPAPIUrl = IPAPIUrl;
 
         //systemProxy
         _config.SystemProxyItem.SystemProxyExceptions = systemProxyExceptions;
@@ -348,15 +356,12 @@ public class OptionSettingViewModel : MyReactiveObject
         _config.SystemProxyItem.SystemProxyAdvancedProtocol = systemProxyAdvancedProtocol;
 
         //tun mode
+        _config.TunModeItem.AutoRoute = TunAutoRoute;
         _config.TunModeItem.StrictRoute = TunStrictRoute;
         _config.TunModeItem.Stack = TunStack;
         _config.TunModeItem.Mtu = TunMtu;
         _config.TunModeItem.EnableExInbound = TunEnableExInbound;
         _config.TunModeItem.EnableIPv6Address = TunEnableIPv6Address;
-        if (TunLinuxSudoPassword != _config.TunModeItem.LinuxSudoPwd)
-        {
-            _config.TunModeItem.LinuxSudoPwd = DesUtils.Encrypt(TunLinuxSudoPassword);
-        }
 
         //coreType
         await SaveCoreType();
@@ -407,6 +412,10 @@ public class OptionSettingViewModel : MyReactiveObject
                     type = CoreType6;
                     break;
 
+                case 9:
+                    type = CoreType9;
+                    break;
+
                 default:
                     continue;
             }

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -304,7 +304,7 @@ public class ProfilesViewModel : MyReactiveObject
         {
             item.SpeedVal = result.Speed ?? string.Empty;
         }
-        _profileItems.Replace(item, JsonUtils.DeepCopy(item));
+        //_profileItems.Replace(item, JsonUtils.DeepCopy(item));
     }
 
     public void UpdateStatistics(ServerSpeedItem update)
@@ -319,16 +319,16 @@ public class ProfilesViewModel : MyReactiveObject
                 item.TotalDown = Utils.HumanFy(update.TotalDown);
                 item.TotalUp = Utils.HumanFy(update.TotalUp);
 
-                if (SelectedProfile?.IndexId == item.IndexId)
-                {
-                    var temp = JsonUtils.DeepCopy(item);
-                    _profileItems.Replace(item, temp);
-                    SelectedProfile = temp;
-                }
-                else
-                {
-                    _profileItems.Replace(item, JsonUtils.DeepCopy(item));
-                }
+                //if (SelectedProfile?.IndexId == item.IndexId)
+                //{
+                //    var temp = JsonUtils.DeepCopy(item);
+                //    _profileItems.Replace(item, temp);
+                //    SelectedProfile = temp;
+                //}
+                //else
+                //{
+                //    _profileItems.Replace(item, JsonUtils.DeepCopy(item));
+                //}
             }
         }
         catch

v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs

@@ -20,9 +20,6 @@ public class RoutingSettingViewModel : MyReactiveObject
     [Reactive]
     public string DomainStrategy { get; set; }
 
-    [Reactive]
-    public string DomainMatcher { get; set; }
-
     [Reactive]
     public string DomainStrategy4Singbox { get; set; }
 
@@ -75,7 +72,6 @@ public class RoutingSettingViewModel : MyReactiveObject
         SelectedSource = new();
 
         DomainStrategy = _config.RoutingBasicItem.DomainStrategy;
-        DomainMatcher = _config.RoutingBasicItem.DomainMatcher;
         DomainStrategy4Singbox = _config.RoutingBasicItem.DomainStrategy4Singbox;
 
         await ConfigHandler.InitBuiltinRouting(_config);
@@ -91,11 +87,9 @@ public class RoutingSettingViewModel : MyReactiveObject
         var routings = await AppHandler.Instance.RoutingItems();
         foreach (var item in routings)
         {
-            var def = item.Id == _config.RoutingBasicItem.RoutingIndexId;
-
             var it = new RoutingItemModel()
             {
-                IsActive = def,
+                IsActive = item.IsActive,
                 RuleNum = item.RuleNum,
                 Id = item.Id,
                 Remarks = item.Remarks,
@@ -111,7 +105,6 @@ public class RoutingSettingViewModel : MyReactiveObject
     private async Task SaveRoutingAsync()
     {
         _config.RoutingBasicItem.DomainStrategy = DomainStrategy;
-        _config.RoutingBasicItem.DomainMatcher = DomainMatcher;
         _config.RoutingBasicItem.DomainStrategy4Singbox = DomainStrategy4Singbox;
 
         if (await ConfigHandler.SaveConfig(_config) == 0)

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -34,6 +34,8 @@ public class StatusBarViewModel : MyReactiveObject
     public ReactiveCommand<Unit, Unit> SubUpdateViaProxyCmd { get; }
     public ReactiveCommand<Unit, Unit> CopyProxyCmdToClipboardCmd { get; }
     public ReactiveCommand<Unit, Unit> NotifyLeftClickCmd { get; }
+    public ReactiveCommand<Unit, Unit> ShowWindowCmd { get; }
+    public ReactiveCommand<Unit, Unit> HideWindowCmd { get; }
 
     #region System Proxy
 
@@ -91,6 +93,9 @@ public class StatusBarViewModel : MyReactiveObject
     [Reactive]
     public bool EnableTun { get; set; }
 
+    [Reactive]
+    public bool BlIsNonWindows { get; set; }
+
     #endregion UI
 
     public StatusBarViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
@@ -100,6 +105,7 @@ public class StatusBarViewModel : MyReactiveObject
         SelectedServer = new();
         RunningServerToolTipText = "-";
         BlSystemProxyPacVisible = Utils.IsWindows();
+        BlIsNonWindows = Utils.IsNonWindows();
 
         if (_config.TunModeItem.EnableTun && AllowEnableTun())
         {
@@ -143,6 +149,16 @@ public class StatusBarViewModel : MyReactiveObject
             Locator.Current.GetService<MainWindowViewModel>()?.ShowHideWindow(null);
             await Task.CompletedTask;
         });
+        ShowWindowCmd = ReactiveCommand.CreateFromTask(async () =>
+        {
+            Locator.Current.GetService<MainWindowViewModel>()?.ShowHideWindow(true);
+            await Task.CompletedTask;
+        });
+        HideWindowCmd = ReactiveCommand.CreateFromTask(async () =>
+        {
+            Locator.Current.GetService<MainWindowViewModel>()?.ShowHideWindow(false);
+            await Task.CompletedTask;
+        });
 
         AddServerViaClipboardCmd = ReactiveCommand.CreateFromTask(async () =>
             {
@@ -318,7 +334,7 @@ public class StatusBarViewModel : MyReactiveObject
 
         _updateView?.Invoke(EViewAction.DispatcherServerAvailability, ResUI.Speedtesting);
 
-        var msg = await (new UpdateService()).RunAvailabilityCheck();
+        var msg = await Task.Run(ConnectionHandler.Instance.RunAvailabilityCheck);
 
         NoticeHandler.Instance.SendMessageEx(msg);
         _updateView?.Invoke(EViewAction.DispatcherServerAvailability, msg);
@@ -369,7 +385,7 @@ public class StatusBarViewModel : MyReactiveObject
         foreach (var item in routings)
         {
             _routingItems.Add(item);
-            if (item.Id == _config.RoutingBasicItem.RoutingIndexId)
+            if (item.IsActive)
             {
                 SelectedRouting = item;
             }
@@ -393,10 +409,6 @@ public class StatusBarViewModel : MyReactiveObject
         {
             return;
         }
-        if (_config.RoutingBasicItem.RoutingIndexId == item.Id)
-        {
-            return;
-        }
 
         if (await ConfigHandler.SetDefaultRouting(_config, item) == 0)
         {
@@ -421,43 +433,49 @@ public class StatusBarViewModel : MyReactiveObject
 
     private async Task DoEnableTun(bool c)
     {
-        if (_config.TunModeItem.EnableTun != EnableTun)
+        if (_config.TunModeItem.EnableTun == EnableTun)
         {
+            return;
+        }
+
         _config.TunModeItem.EnableTun = EnableTun;
-            // When running as a non-administrator, reboot to administrator mode
+
         if (EnableTun && AllowEnableTun() == false)
         {
+            // When running as a non-administrator, reboot to administrator mode
             if (Utils.IsWindows())
             {
                 _config.TunModeItem.EnableTun = false;
                 Locator.Current.GetService<MainWindowViewModel>()?.RebootAsAdmin();
                 return;
             }
-                else if (Utils.IsOSX())
+            else
+            {
+                bool? passwordResult = await _updateView?.Invoke(EViewAction.PasswordInput, null);
+                if (passwordResult == false)
                 {
                     _config.TunModeItem.EnableTun = false;
-                    NoticeHandler.Instance.SendMessageAndEnqueue(ResUI.TbSettingsLinuxSudoPasswordIsEmpty);
                     return;
                 }
             }
+        }
         await ConfigHandler.SaveConfig(_config);
         Locator.Current.GetService<MainWindowViewModel>()?.Reload();
     }
-    }
 
     private bool AllowEnableTun()
     {
         if (Utils.IsWindows())
         {
-            return AppHandler.Instance.IsAdministrator;
+            return Utils.IsAdministrator();
         }
         else if (Utils.IsLinux())
         {
-            return _config.TunModeItem.LinuxSudoPwd.IsNotEmpty();
+            return AppHandler.Instance.LinuxSudoPwd.IsNotEmpty();
         }
         else if (Utils.IsOSX())
         {
-            return _config.TunModeItem.LinuxSudoPwd.IsNotEmpty();
+            return AppHandler.Instance.LinuxSudoPwd.IsNotEmpty();
         }
         return false;
     }
@@ -494,10 +512,18 @@ public class StatusBarViewModel : MyReactiveObject
     public void UpdateStatistics(ServerSpeedItem update)
     {
         try
+        {
+            if (_config.IsRunningCore(ECoreType.sing_box))
+            {
+                SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, EInboundProtocol.mixed, Utils.HumanFy(update.ProxyUp), Utils.HumanFy(update.ProxyDown));
+                SpeedDirectDisplay = string.Empty;
+            }
+            else
             {
                 SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, Global.ProxyTag, Utils.HumanFy(update.ProxyUp), Utils.HumanFy(update.ProxyDown));
                 SpeedDirectDisplay = string.Format(ResUI.SpeedDisplayText, Global.DirectTag, Utils.HumanFy(update.DirectUp), Utils.HumanFy(update.DirectDown));
             }
+        }
         catch
         {
         }

v2rayN/v2rayN.Desktop/App.axaml

@@ -6,8 +6,8 @@
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:semi="https://irihi.tech/semi"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
-    x:DataType="vms:StatusBarViewModel"
     Name="v2rayN"
+    x:DataType="vms:StatusBarViewModel"
     RequestedThemeVariant="Default">
     <Application.Styles>
         <semi:SemiTheme />
@@ -32,6 +32,16 @@
                 ToolTipText="{Binding RunningServerToolTipText}">
                 <TrayIcon.Menu>
                     <NativeMenu>
+                        <NativeMenuItem
+                            Command="{Binding ShowWindowCmd}"
+                            Header="{x:Static resx:ResUI.TbDisplayGUI}"
+                            IsVisible="{Binding BlIsNonWindows}" />
+                        <NativeMenuItem
+                            Command="{Binding NotifyLeftClickCmd}"
+                            Header="{x:Static resx:ResUI.menuShowOrHideMainWindow}"
+                            IsVisible="{Binding BlIsNonWindows}" />
+                        <NativeMenuItem Command="{Binding CopyProxyCmdToClipboardCmd}" Header="{x:Static resx:ResUI.menuCopyProxyCmdToClipboard}" />
+                        <NativeMenuItemSeparator />
                         <NativeMenuItem
                             Command="{Binding SystemProxyClearCmd}"
                             Header="{x:Static resx:ResUI.menuSystemProxyClear}"
@@ -55,13 +65,9 @@
                             ToggleType="Radio" />
                         <NativeMenuItemSeparator />
                         <NativeMenuItem Click="MenuAddServerViaClipboardClick" Header="{x:Static resx:ResUI.menuAddServerViaClipboard}" />
-                        <NativeMenuItem Header="{x:Static resx:ResUI.menuAddServerViaScan}" IsVisible="False" />
                         <NativeMenuItem Command="{Binding SubUpdateCmd}" Header="{x:Static resx:ResUI.menuSubUpdate}" />
                         <NativeMenuItem Command="{Binding SubUpdateViaProxyCmd}" Header="{x:Static resx:ResUI.menuSubUpdateViaProxy}" />
                         <NativeMenuItemSeparator />
-                        <NativeMenuItem Command="{Binding CopyProxyCmdToClipboardCmd}" Header="{x:Static resx:ResUI.menuCopyProxyCmdToClipboard}" />
-                        <NativeMenuItemSeparator />
-                        <NativeMenuItem Command="{Binding NotifyLeftClickCmd}" Header="{x:Static resx:ResUI.menuShowOrHideMainWindow}" />
                         <NativeMenuItem Click="MenuExit_Click" Header="{x:Static resx:ResUI.menuExit}" />
                     </NativeMenu>
                 </TrayIcon.Menu>

v2rayN/v2rayN.Desktop/App.axaml.cs

@@ -11,11 +11,6 @@ public partial class App : Application
 {
     public override void Initialize()
     {
-        if (!AppHandler.Instance.InitApp())
-        {
-            Environment.Exit(0);
-            return;
-        }
         AvaloniaXamlLoader.Load(this);
 
         AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
@@ -43,7 +38,7 @@ public partial class App : Application
     {
         if (e.ExceptionObject != null)
         {
-            Logging.SaveLog("CurrentDomain_UnhandledException", (Exception)e.ExceptionObject!);
+            Logging.SaveLog("CurrentDomain_UnhandledException", (Exception)e.ExceptionObject);
         }
     }
 

v2rayN/v2rayN.Desktop/Base/WindowBase.cs

@@ -0,0 +1,52 @@
+using Avalonia;
+using Avalonia.Interactivity;
+using Avalonia.ReactiveUI;
+
+namespace v2rayN.Desktop.Base;
+
+public class WindowBase<TViewModel> : ReactiveWindow<TViewModel> where TViewModel : class
+{
+    public WindowBase()
+    {
+        Loaded += OnLoaded;
+    }
+
+    private void ReactiveWindowBase_Closed(object? sender, EventArgs e)
+    {
+        throw new NotImplementedException();
+    }
+
+    protected virtual void OnLoaded(object? sender, RoutedEventArgs e)
+    {
+        try
+        {
+            var sizeItem = ConfigHandler.GetWindowSizeItem(AppHandler.Instance.Config, GetType().Name);
+            if (sizeItem == null)
+            {
+                return;
+            }
+
+            Width = sizeItem.Width;
+            Height = sizeItem.Height;
+
+            var workingArea = (Screens.ScreenFromWindow(this) ?? Screens.Primary).WorkingArea;
+            var scaling = (Utils.IsOSX() ? null : VisualRoot?.RenderScaling) ?? 1.0;
+
+            var x = workingArea.X + ((workingArea.Width - (Width * scaling)) / 2);
+            var y = workingArea.Y + ((workingArea.Height - (Height * scaling)) / 2);
+
+            Position = new PixelPoint((int)x, (int)y);
+        }
+        catch { }
+    }
+
+    protected override void OnClosed(EventArgs e)
+    {
+        base.OnClosed(e);
+        try
+        {
+            ConfigHandler.SaveWindowSizeItem(AppHandler.Instance.Config, GetType().Name, Width, Height);
+        }
+        catch { }
+    }
+}

v2rayN/v2rayN.Desktop/Program.cs

@@ -14,13 +14,17 @@ internal class Program
     [STAThread]
     public static void Main(string[] args)
     {
-        OnStartup(args);
+        if (OnStartup(args) == false)
+        {
+            Environment.Exit(0);
+            return;
+        }
 
         BuildAvaloniaApp()
             .StartWithClassicDesktopLifetime(args);
     }
 
-    private static void OnStartup(string[]? Args)
+    private static bool OnStartup(string[]? Args)
     {
         if (Utils.IsWindows())
         {
@@ -30,8 +34,7 @@ internal class Program
             if (!rebootas && !bCreatedNew)
             {
                 ProgramStarted.Set();
-                Environment.Exit(0);
-                return;
+                return false;
             }
         }
         else
@@ -39,19 +42,26 @@ internal class Program
             _ = new Mutex(true, "v2rayN", out var bOnlyOneInstance);
             if (!bOnlyOneInstance)
             {
-                Environment.Exit(0);
-                return;
+                return false;
             }
         }
+
+        if (!AppHandler.Instance.InitApp())
+        {
+            return false;
+        }
+        return true;
     }
 
     // Avalonia configuration, don't remove; also used by visual designer.
     public static AppBuilder BuildAvaloniaApp()
-    => AppBuilder.Configure<App>()
+    {
+        return AppBuilder.Configure<App>()
             .UsePlatformDetect()
             //.WithInterFont()
             .WithFontByDefault()
             .LogToTrace()
             .UseReactiveUI()
-        .With(new MacOSPlatformOptions { ShowInDock = false });
+            .With(new MacOSPlatformOptions { ShowInDock = AppHandler.Instance.Config.UiItem.MacOSShowInDock });
+    }
 }

v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs

@@ -107,6 +107,7 @@ public class ThemeSettingViewModel : MyReactiveObject
             x.OfType<Button>(),
             x.OfType<TextBox>(),
             x.OfType<TextBlock>(),
+            x.OfType<SelectableTextBlock>(),
             x.OfType<Menu>(),
             x.OfType<ContextMenu>(),
             x.OfType<DataGridRow>(),
@@ -146,6 +147,7 @@ public class ThemeSettingViewModel : MyReactiveObject
                 x.OfType<Button>(),
                 x.OfType<TextBox>(),
                 x.OfType<TextBlock>(),
+                x.OfType<SelectableTextBlock>(),
                 x.OfType<Menu>(),
                 x.OfType<ContextMenu>(),
                 x.OfType<DataGridRow>(),

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

@@ -1,12 +1,12 @@
 using System.Reactive.Disposables;
 using Avalonia.Interactivity;
-using Avalonia.ReactiveUI;
 using ReactiveUI;
+using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views;
 
-public partial class AddServer2Window : ReactiveWindow<AddServer2ViewModel>
+public partial class AddServer2Window : WindowBase<AddServer2ViewModel>
 {
     public AddServer2Window()
     {
@@ -21,13 +21,7 @@ public partial class AddServer2Window : ReactiveWindow<AddServer2ViewModel>
         btnCancel.Click += (s, e) => this.Close();
         ViewModel = new AddServer2ViewModel(profileItem, UpdateViewHandler);
 
-        foreach (ECoreType it in Enum.GetValues(typeof(ECoreType)))
-        {
-            if (it == ECoreType.v2rayN)
-                continue;
-            cmbCoreType.Items.Add(it.ToString());
-        }
-        cmbCoreType.Items.Add(string.Empty);
+        cmbCoreType.ItemsSource = Utils.GetEnumNames<ECoreType>().Where(t => t != ECoreType.v2rayN.ToString()).ToList().AppendEmpty();
 
         this.WhenActivated(disposables =>
         {

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml

@@ -105,7 +105,7 @@
                     Grid.Row="2"
                     ColumnDefinitions="180,Auto,Auto"
                     IsVisible="False"
-                    RowDefinitions="Auto,Auto,Auto,Auto">
+                    RowDefinitions="Auto,Auto,Auto,Auto,Auto">
 
                     <TextBlock
                         Grid.Row="1"
@@ -152,13 +152,26 @@
                         Grid.Column="1"
                         Width="200"
                         Margin="{StaticResource Margin4}" />
+
+                    <TextBlock
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbSettingsMuxEnabled}" />
+                    <ToggleSwitch
+                        x:Name="togmuxEnabled"
+                        Grid.Row="4"
+                        Grid.Column="1"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
                 </Grid>
                 <Grid
                     x:Name="gridSs"
                     Grid.Row="2"
                     ColumnDefinitions="180,Auto"
                     IsVisible="False"
-                    RowDefinitions="Auto,Auto,Auto,Auto">
+                    RowDefinitions="Auto,Auto,Auto,Auto,Auto">
 
                     <TextBlock
                         Grid.Row="1"
@@ -185,6 +198,19 @@
                         Grid.Column="1"
                         Width="300"
                         Margin="{StaticResource Margin4}" />
+
+                    <TextBlock
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbSettingsMuxEnabled}" />
+                    <ToggleSwitch
+                        x:Name="togmuxEnabled3"
+                        Grid.Row="4"
+                        Grid.Column="1"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
                 </Grid>
                 <Grid
                     x:Name="gridSocks"
@@ -224,7 +250,7 @@
                     Grid.Row="2"
                     ColumnDefinitions="180,Auto,Auto"
                     IsVisible="False"
-                    RowDefinitions="Auto,Auto,Auto,Auto">
+                    RowDefinitions="Auto,Auto,Auto,Auto,Auto">
 
                     <TextBlock
                         Grid.Row="1"
@@ -271,13 +297,26 @@
                         Width="200"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
+
+                    <TextBlock
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbSettingsMuxEnabled}" />
+                    <ToggleSwitch
+                        x:Name="togmuxEnabled5"
+                        Grid.Row="4"
+                        Grid.Column="1"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
                 </Grid>
                 <Grid
                     x:Name="gridTrojan"
                     Grid.Row="2"
                     ColumnDefinitions="180,Auto"
                     IsVisible="False"
-                    RowDefinitions="Auto,Auto,Auto,Auto">
+                    RowDefinitions="Auto,Auto,Auto,Auto,Auto">
 
                     <TextBlock
                         Grid.Row="1"
@@ -304,6 +343,19 @@
                         Grid.Column="1"
                         Width="200"
                         Margin="{StaticResource Margin4}" />
+
+                    <TextBlock
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbSettingsMuxEnabled}" />
+                    <ToggleSwitch
+                        x:Name="togmuxEnabled6"
+                        Grid.Row="4"
+                        Grid.Column="1"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
                 </Grid>
                 <Grid
                     x:Name="gridHysteria2"
@@ -481,6 +533,26 @@
                         HorizontalAlignment="Left"
                         Watermark="1500" />
                 </Grid>
+                <Grid
+                    x:Name="gridAnytls"
+                    Grid.Row="2"
+                    ColumnDefinitions="180,Auto"
+                    IsVisible="False"
+                    RowDefinitions="Auto,Auto,Auto">
+
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbId3}" />
+                    <TextBox
+                        x:Name="txtId10"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource Margin4}" />
+                </Grid>
 
                 <Separator
                     x:Name="sepa2"
@@ -701,7 +773,7 @@
                     Grid.Row="7"
                     ColumnDefinitions="180,Auto"
                     IsVisible="False"
-                    RowDefinitions="Auto,Auto,Auto,Auto,Auto">
+                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
 
                     <TextBlock
                         Grid.Row="0"
@@ -771,6 +843,20 @@
                         Width="400"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
+
+                    <TextBlock
+                        Grid.Row="5"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbMldsa65Verify}" />
+                    <TextBox
+                        x:Name="txtMldsa65Verify"
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
                 </Grid>
                 <Separator Grid.Row="8" Margin="{StaticResource MarginTb8}" />
             </Grid>

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

@@ -1,12 +1,12 @@
 using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.ReactiveUI;
 using ReactiveUI;
+using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;
 
-public partial class AddServerWindow : ReactiveWindow<AddServerViewModel>
+public partial class AddServerWindow : WindowBase<AddServerViewModel>
 {
     public AddServerWindow()
     {
@@ -26,41 +26,22 @@ public partial class AddServerWindow : ReactiveWindow<AddServerViewModel>
 
         ViewModel = new AddServerViewModel(profileItem, UpdateViewHandler);
 
-        Global.CoreTypes.ForEach(it =>
-        {
-            cmbCoreType.Items.Add(it);
-        });
-        cmbCoreType.Items.Add(string.Empty);
+        cmbCoreType.ItemsSource = Global.CoreTypes.AppendEmpty();
+        cmbNetwork.ItemsSource = Global.Networks;
+        cmbFingerprint.ItemsSource = Global.Fingerprints;
+        cmbFingerprint2.ItemsSource = Global.Fingerprints;
+        cmbAllowInsecure.ItemsSource = Global.AllowInsecure;
+        cmbAlpn.ItemsSource = Global.Alpns;
 
-        cmbStreamSecurity.Items.Add(string.Empty);
-        cmbStreamSecurity.Items.Add(Global.StreamSecurity);
-
-        Global.Networks.ForEach(it =>
-        {
-            cmbNetwork.Items.Add(it);
-        });
-        Global.Fingerprints.ForEach(it =>
-        {
-            cmbFingerprint.Items.Add(it);
-            cmbFingerprint2.Items.Add(it);
-        });
-        Global.AllowInsecure.ForEach(it =>
-        {
-            cmbAllowInsecure.Items.Add(it);
-        });
-        Global.Alpns.ForEach(it =>
-        {
-            cmbAlpn.Items.Add(it);
-        });
+        var lstStreamSecurity = new List<string>();
+        lstStreamSecurity.Add(string.Empty);
+        lstStreamSecurity.Add(Global.StreamSecurity);
 
         switch (profileItem.ConfigType)
         {
             case EConfigType.VMess:
                 gridVMess.IsVisible = true;
-                Global.VmessSecurities.ForEach(it =>
-                {
-                    cmbSecurity.Items.Add(it);
-                });
+                cmbSecurity.ItemsSource = Global.VmessSecurities;
                 if (profileItem.Security.IsNullOrEmpty())
                 {
                     profileItem.Security = Global.DefaultSecurity;
@@ -69,10 +50,7 @@ public partial class AddServerWindow : ReactiveWindow<AddServerViewModel>
 
             case EConfigType.Shadowsocks:
                 gridSs.IsVisible = true;
-                AppHandler.Instance.GetShadowsocksSecurities(profileItem).ForEach(it =>
-                {
-                    cmbSecurity3.Items.Add(it);
-                });
+                cmbSecurity3.ItemsSource = AppHandler.Instance.GetShadowsocksSecurities(profileItem);
                 break;
 
             case EConfigType.SOCKS:
@@ -82,11 +60,8 @@ public partial class AddServerWindow : ReactiveWindow<AddServerViewModel>
 
             case EConfigType.VLESS:
                 gridVLESS.IsVisible = true;
-                cmbStreamSecurity.Items.Add(Global.StreamSecurityReality);
-                Global.Flows.ForEach(it =>
-                {
-                    cmbFlow5.Items.Add(it);
-                });
+                lstStreamSecurity.Add(Global.StreamSecurityReality);
+                cmbFlow5.ItemsSource = Global.Flows;
                 if (profileItem.Security.IsNullOrEmpty())
                 {
                     profileItem.Security = Global.None;
@@ -95,11 +70,8 @@ public partial class AddServerWindow : ReactiveWindow<AddServerViewModel>
 
             case EConfigType.Trojan:
                 gridTrojan.IsVisible = true;
-                cmbStreamSecurity.Items.Add(Global.StreamSecurityReality);
-                Global.Flows.ForEach(it =>
-                {
-                    cmbFlow6.Items.Add(it);
-                });
+                lstStreamSecurity.Add(Global.StreamSecurityReality);
+                cmbFlow6.ItemsSource = Global.Flows;
                 break;
 
             case EConfigType.Hysteria2:
@@ -119,10 +91,7 @@ public partial class AddServerWindow : ReactiveWindow<AddServerViewModel>
                 cmbFingerprint.IsEnabled = false;
                 cmbFingerprint.SelectedValue = string.Empty;
 
-                Global.TuicCongestionControls.ForEach(it =>
-                {
-                    cmbHeaderType8.Items.Add(it);
-                });
+                cmbHeaderType8.ItemsSource = Global.TuicCongestionControls;
                 break;
 
             case EConfigType.WireGuard:
@@ -131,10 +100,16 @@ public partial class AddServerWindow : ReactiveWindow<AddServerViewModel>
                 sepa2.IsVisible = false;
                 gridTransport.IsVisible = false;
                 gridTls.IsVisible = false;
-                cmbCoreType.IsEnabled = false;
 
                 break;
+
+            case EConfigType.Anytls:
+                gridAnytls.IsVisible = true;
+                lstStreamSecurity.Add(Global.StreamSecurityReality);
+                cmbCoreType.IsEnabled = false;
+                break;
         }
+        cmbStreamSecurity.ItemsSource = lstStreamSecurity;
 
         gridTlsMore.IsVisible = false;
 
@@ -151,11 +126,13 @@ public partial class AddServerWindow : ReactiveWindow<AddServerViewModel>
                     this.Bind(ViewModel, vm => vm.SelectedSource.Id, v => v.txtId.Text).DisposeWith(disposables);
                     this.Bind(ViewModel, vm => vm.SelectedSource.AlterId, v => v.txtAlterId.Text).DisposeWith(disposables);
                     this.Bind(ViewModel, vm => vm.SelectedSource.Security, v => v.cmbSecurity.SelectedValue).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.SelectedSource.MuxEnabled, v => v.togmuxEnabled.IsChecked).DisposeWith(disposables);
                     break;
 
                 case EConfigType.Shadowsocks:
                     this.Bind(ViewModel, vm => vm.SelectedSource.Id, v => v.txtId3.Text).DisposeWith(disposables);
                     this.Bind(ViewModel, vm => vm.SelectedSource.Security, v => v.cmbSecurity3.SelectedValue).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.SelectedSource.MuxEnabled, v => v.togmuxEnabled3.IsChecked).DisposeWith(disposables);
                     break;
 
                 case EConfigType.SOCKS:
@@ -168,11 +145,13 @@ public partial class AddServerWindow : ReactiveWindow<AddServerViewModel>
                     this.Bind(ViewModel, vm => vm.SelectedSource.Id, v => v.txtId5.Text).DisposeWith(disposables);
                     this.Bind(ViewModel, vm => vm.SelectedSource.Flow, v => v.cmbFlow5.SelectedValue).DisposeWith(disposables);
                     this.Bind(ViewModel, vm => vm.SelectedSource.Security, v => v.txtSecurity5.Text).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.SelectedSource.MuxEnabled, v => v.togmuxEnabled5.IsChecked).DisposeWith(disposables);
                     break;
 
                 case EConfigType.Trojan:
                     this.Bind(ViewModel, vm => vm.SelectedSource.Id, v => v.txtId6.Text).DisposeWith(disposables);
                     this.Bind(ViewModel, vm => vm.SelectedSource.Flow, v => v.cmbFlow6.SelectedValue).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.SelectedSource.MuxEnabled, v => v.togmuxEnabled6.IsChecked).DisposeWith(disposables);
                     break;
 
                 case EConfigType.Hysteria2:
@@ -194,6 +173,10 @@ public partial class AddServerWindow : ReactiveWindow<AddServerViewModel>
                     this.Bind(ViewModel, vm => vm.SelectedSource.RequestHost, v => v.txtRequestHost9.Text).DisposeWith(disposables);
                     this.Bind(ViewModel, vm => vm.SelectedSource.ShortId, v => v.txtShortId9.Text).DisposeWith(disposables);
                     break;
+
+                case EConfigType.Anytls:
+                    this.Bind(ViewModel, vm => vm.SelectedSource.Id, v => v.txtId10.Text).DisposeWith(disposables);
+                    break;
             }
             this.Bind(ViewModel, vm => vm.SelectedSource.Network, v => v.cmbNetwork.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.HeaderType, v => v.cmbHeaderType.SelectedValue).DisposeWith(disposables);
@@ -212,6 +195,7 @@ public partial class AddServerWindow : ReactiveWindow<AddServerViewModel>
             this.Bind(ViewModel, vm => vm.SelectedSource.PublicKey, v => v.txtPublicKey.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.ShortId, v => v.txtShortId.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.SpiderX, v => v.txtSpiderX.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SelectedSource.Mldsa65Verify, v => v.txtMldsa65Verify.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });
@@ -269,44 +253,41 @@ public partial class AddServerWindow : ReactiveWindow<AddServerViewModel>
 
     private void SetHeaderType()
     {
-        cmbHeaderType.Items.Clear();
+        var lstHeaderType = new List<string>();
 
         var network = cmbNetwork.SelectedItem.ToString();
         if (network.IsNullOrEmpty())
         {
-            cmbHeaderType.Items.Add(Global.None);
+            lstHeaderType.Add(Global.None);
+            cmbHeaderType.ItemsSource = lstHeaderType;
+            cmbHeaderType.SelectedIndex = 0;
             return;
         }
 
         if (network == nameof(ETransport.tcp))
         {
-            cmbHeaderType.Items.Add(Global.None);
-            cmbHeaderType.Items.Add(Global.TcpHeaderHttp);
+            lstHeaderType.Add(Global.None);
+            lstHeaderType.Add(Global.TcpHeaderHttp);
         }
         else if (network is nameof(ETransport.kcp) or nameof(ETransport.quic))
         {
-            cmbHeaderType.Items.Add(Global.None);
-            Global.KcpHeaderTypes.ForEach(it =>
-            {
-                cmbHeaderType.Items.Add(it);
-            });
+            lstHeaderType.Add(Global.None);
+            lstHeaderType.AddRange(Global.KcpHeaderTypes);
         }
         else if (network is nameof(ETransport.xhttp))
         {
-            Global.XhttpMode.ForEach(it =>
-            {
-                cmbHeaderType.Items.Add(it);
-            });
+            lstHeaderType.AddRange(Global.XhttpMode);
         }
         else if (network == nameof(ETransport.grpc))
         {
-            cmbHeaderType.Items.Add(Global.GrpcGunMode);
-            cmbHeaderType.Items.Add(Global.GrpcMultiMode);
+            lstHeaderType.Add(Global.GrpcGunMode);
+            lstHeaderType.Add(Global.GrpcMultiMode);
         }
         else
         {
-            cmbHeaderType.Items.Add(Global.None);
+            lstHeaderType.Add(Global.None);
         }
+        cmbHeaderType.ItemsSource = lstHeaderType;
         cmbHeaderType.SelectedIndex = 0;
     }
 

v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs

@@ -51,12 +51,19 @@ public partial class ClashConnectionsView : ReactiveUserControl<ClashConnections
     }
 
     private void AutofitColumnWidth()
+    {
+        try
         {
             foreach (var it in lstConnections.Columns)
             {
                 it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
             }
         }
+        catch (Exception ex)
+        {
+            Logging.SaveLog("ClashConnectionsView", ex);
+        }
+    }
 
     private void btnClose_Click(object? sender, RoutedEventArgs e)
     {

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"
@@ -34,10 +35,289 @@
                 IsCancel="True" />
         </StackPanel>
 
-        <TabControl HorizontalContentAlignment="Left">
+        <TabControl HorizontalContentAlignment="Stretch">
+            <TabItem Header="{x:Static resx:ResUI.ThBasicDNSSettings}">
+                <ScrollViewer VerticalScrollBarVisibility="Visible">
+                    <Grid
+                        Margin="{StaticResource Margin8}"
+                        ColumnDefinitions="Auto,Auto,*"
+                        RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+
+                        <TextBlock
+                            x:Name="txtBasicDNSSettingsInvalid"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbCustomDNSEnabledPageInvalid}" />
+
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbDomesticDNS}" />
+                        <ctrls:AutoCompleteBox
+                            x:Name="cmbDirectDNS"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            Text="{Binding DirectDNS, Mode=TwoWay}" />
+
+                        <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbRemoteDNS}" />
+                        <ctrls:AutoCompleteBox
+                            x:Name="cmbRemoteDNS"
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            Text="{Binding RemoteDNS, Mode=TwoWay}" />
+
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSBOutboundsResolverDNS}" />
+                        <ctrls:AutoCompleteBox
+                            x:Name="cmbSBResolverDNS"
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            Text="{Binding SingboxOutboundsResolveDNS, Mode=TwoWay}" />
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSBOutboundDomainResolve}"
+                            TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSBDoHResolverServer}" />
+                        <ctrls:AutoCompleteBox
+                            x:Name="cmbSBFinalResolverDNS"
+                            Grid.Row="4"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            Text="{Binding SingboxFinalResolveDNS, Mode=TwoWay}" />
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSBFallbackDNSResolve}"
+                            TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="5"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbXrayFreedomResolveStrategy}" />
+                        <ComboBox
+                            x:Name="cmbRayFreedomDNSStrategy"
+                            Grid.Row="5"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            PlaceholderText="Default" />
+
+                        <TextBlock
+                            Grid.Row="6"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSBDirectResolveStrategy}" />
+                        <ComboBox
+                            x:Name="cmbSBDirectDNSStrategy"
+                            Grid.Row="6"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            PlaceholderText="Default" />
+
+                        <TextBlock
+                            Grid.Row="7"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSBRemoteResolveStrategy}" />
+                        <ComboBox
+                            x:Name="cmbSBRemoteDNSStrategy"
+                            Grid.Row="7"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            PlaceholderText="Default" />
+
+                        <TextBlock
+                            Grid.Row="8"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbAddCommonDNSHosts}" />
+                        <ToggleSwitch
+                            x:Name="togAddCommonHosts"
+                            Grid.Row="8"
+                            Grid.Column="1"
+                            Margin="{StaticResource Margin4}"
+                            HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="8"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSBDoHOverride}"
+                            TextWrapping="Wrap" />
+                    </Grid>
+                </ScrollViewer>
+            </TabItem>
+
+            <TabItem Header="{x:Static resx:ResUI.ThAdvancedDNSSettings}">
+                <ScrollViewer VerticalScrollBarVisibility="Visible">
+                    <Grid
+                        Margin="{StaticResource Margin8}"
+                        ColumnDefinitions="Auto,Auto,*"
+                        RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,*">
+
+                        <TextBlock
+                            x:Name="txtAdvancedDNSSettingsInvalid"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbCustomDNSEnabledPageInvalid}" />
+
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSettingsUseSystemHosts}" />
+                        <ToggleSwitch
+                            x:Name="togUseSystemHosts"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Margin="{StaticResource Margin4}"
+                            HorizontalAlignment="Left" />
+
+                        <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbFakeIP}" />
+                        <ToggleSwitch
+                            x:Name="togFakeIP"
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Margin="{StaticResource Margin4}"
+                            HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbApplyProxyDomainsOnly}"
+                            TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbBlockSVCBHTTPSQueries}" />
+                        <ToggleSwitch
+                            x:Name="togBlockBindingQuery"
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            Margin="{StaticResource Margin4}"
+                            HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbBlockSVCBHTTPSQueriesTips}"
+                            TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPs}" />
+                        <ctrls:AutoCompleteBox
+                            x:Name="cmbDirectExpectedIPs"
+                            Grid.Row="4"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            Text="{Binding DirectExpectedIPs, Mode=TwoWay}" />
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPsDesc}"
+                            TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="5"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="3"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbDNSHostsConfig}" />
+
+                        <TextBox
+                            x:Name="txtHosts"
+                            Grid.Row="6"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="3"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Stretch"
+                            BorderThickness="1"
+                            Classes="TextArea"
+                            TextWrapping="Wrap"
+                            Watermark="{x:Static resx:ResUI.TbDNSHostsConfig}" />
+                    </Grid>
+                </ScrollViewer>
+            </TabItem>
+
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDns}">
                 <DockPanel Margin="{StaticResource Margin8}">
-                    <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
+                    <Grid DockPanel.Dock="Top">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <StackPanel Grid.Row="0" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbCustomDNSEnable}" />
+                            <ToggleSwitch
+                                x:Name="togRayCustomDNSEnableCompatible"
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+
+                        <StackPanel Grid.Row="1" Orientation="Horizontal">
                             <TextBlock
                                 Margin="{StaticResource Margin4}"
                                 VerticalAlignment="Center"
@@ -49,11 +329,12 @@
                                 </HyperlinkButton>
                             </TextBlock>
                             <Button
-                            x:Name="btnImportDefConfig4V2ray"
+                                x:Name="btnImportDefConfig4V2rayCompatible"
                                 Margin="{StaticResource Margin4}"
                                 Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
                                 Cursor="Hand" />
                         </StackPanel>
+                    </Grid>
 
                     <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
                         <StackPanel Orientation="Horizontal">
@@ -62,7 +343,7 @@
                                 VerticalAlignment="Center"
                                 Text="{x:Static resx:ResUI.TbSettingsUseSystemHosts}" />
                             <ToggleSwitch
-                                x:Name="togUseSystemHosts"
+                                x:Name="togUseSystemHostsCompatible"
                                 Margin="{StaticResource Margin4}"
                                 HorizontalAlignment="Left" />
                         </StackPanel>
@@ -73,7 +354,7 @@
                                 VerticalAlignment="Center"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Freedom}" />
                             <ComboBox
-                                x:Name="cmbdomainStrategy4Freedom"
+                                x:Name="cmbdomainStrategy4FreedomCompatible"
                                 Width="150"
                                 Margin="{StaticResource Margin4}" />
                         </StackPanel>
@@ -83,40 +364,61 @@
                                 Margin="{StaticResource Margin4}"
                                 VerticalAlignment="Center"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
-                            <ComboBox
-                                x:Name="cmbdomainDNSAddress"
+                            <ctrls:AutoCompleteBox
+                                x:Name="cmbdomainDNSAddressCompatible"
                                 Width="150"
-                                Margin="{StaticResource Margin4}" />
+                                Margin="{StaticResource Margin4}"
+                                Text="{Binding DomainDNSAddressCompatible, Mode=TwoWay}" />
                         </StackPanel>
                     </WrapPanel>
 
-                    <Grid Margin="{StaticResource Margin4}">
-                        <TextBox
-                            x:Name="txtnormalDNS"
+                    <HeaderedContentControl
                         Margin="{StaticResource Margin4}"
-                            VerticalAlignment="Stretch"
+                        BorderBrush="Gray"
                         BorderThickness="1"
+                        Header="HTTP/SOCKS">
+                        <TextBox
+                            Name="txtnormalDNSCompatible"
+                            VerticalAlignment="Stretch"
                             Classes="TextArea"
-                            TextWrapping="Wrap"
-                            Watermark="HTTP/SOCKS" />
-                    </Grid>
+                            MinLines="10"
+                            TextWrapping="Wrap" />
+                    </HeaderedContentControl>
                 </DockPanel>
             </TabItem>
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDnsSingbox}">
                 <DockPanel Margin="{StaticResource Margin8}">
-                    <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
+                    <Grid DockPanel.Dock="Top">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <StackPanel Grid.Row="0" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbCustomDNSEnable}" />
+                            <ToggleSwitch
+                                x:Name="togSBCustomDNSEnableCompatible"
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+
+                        <StackPanel Grid.Row="1" Orientation="Horizontal">
                             <TextBlock Margin="{StaticResource Margin4}" VerticalAlignment="Center">
                                 <HyperlinkButton Classes="WithIcon" Click="linkDnsSingboxObjectDoc_Click">
                                     <TextBlock Text="{x:Static resx:ResUI.TbDnsSingboxObjectDoc}" />
                                 </HyperlinkButton>
                             </TextBlock>
                             <Button
-                            x:Name="btnImportDefConfig4Singbox"
+                                x:Name="btnImportDefConfig4SingboxCompatible"
                                 Margin="{StaticResource Margin4}"
                                 Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
                                 Cursor="Hand" />
                         </StackPanel>
+                    </Grid>
 
                     <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
                         <StackPanel Orientation="Horizontal">
@@ -125,7 +427,7 @@
                                 VerticalAlignment="Center"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Out}" />
                             <ComboBox
-                                x:Name="cmbdomainStrategy4Out"
+                                x:Name="cmbdomainStrategy4OutCompatible"
                                 Width="150"
                                 Margin="{StaticResource Margin4}" />
                         </StackPanel>
@@ -135,40 +437,44 @@
                                 Margin="{StaticResource Margin4}"
                                 VerticalAlignment="Center"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
-                            <ComboBox
-                                x:Name="cmbdomainDNSAddress2"
+                            <ctrls:AutoCompleteBox
+                                x:Name="cmbdomainDNSAddress2Compatible"
                                 Width="150"
-                                Margin="{StaticResource Margin4}" />
+                                Margin="{StaticResource Margin4}"
+                                Text="{Binding DomainDNSAddress2Compatible, Mode=TwoWay}" />
                         </StackPanel>
                     </WrapPanel>
 
                     <Grid Margin="{StaticResource Margin4}" ColumnDefinitions="*,10,*">
 
-                        <TextBox
-                            x:Name="txtnormalDNS2"
+                        <HeaderedContentControl
                             Grid.Column="0"
-                            Width="400"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
+                            BorderBrush="Gray"
                             BorderThickness="1"
+                            Header="HTTP/SOCKS">
+                            <TextBox
+                                Name="txtnormalDNS2Compatible"
+                                VerticalAlignment="Stretch"
                                 Classes="TextArea"
-                            Margin="{StaticResource Margin4}"
-                            TextWrapping="Wrap"
-                            Watermark="HTTP/SOCKS" />
+                                MinLines="10"
+                                TextWrapping="Wrap" />
+                        </HeaderedContentControl>
 
                         <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
 
-                        <TextBox
-                            x:Name="txttunDNS2"
+                        <HeaderedContentControl
                             Grid.Column="2"
-                            Width="400"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
+                            BorderBrush="Gray"
                             BorderThickness="1"
+                            Header="{x:Static resx:ResUI.TbSettingsTunMode}">
+                            <TextBox
+                                Name="txttunDNS2Compatible"
+                                VerticalAlignment="Stretch"
                                 Classes="TextArea"
-                            Margin="{StaticResource Margin4}"
-                            TextWrapping="Wrap"
-                            Watermark="{x:Static resx:ResUI.TbSettingsTunMode}" />
+                                MinLines="10"
+                                TextWrapping="Wrap" />
+                        </HeaderedContentControl>
+
                     </Grid>
                 </DockPanel>
             </TabItem>

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

@@ -1,11 +1,12 @@
 using System.Reactive.Disposables;
+using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.ReactiveUI;
 using ReactiveUI;
+using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;
 
-public partial class DNSSettingWindow : ReactiveWindow<DNSSettingViewModel>
+public partial class DNSSettingWindow : WindowBase<DNSSettingViewModel>
 {
     private static Config _config;
 
@@ -17,38 +18,64 @@ public partial class DNSSettingWindow : ReactiveWindow<DNSSettingViewModel>
         btnCancel.Click += (s, e) => this.Close();
         ViewModel = new DNSSettingViewModel(UpdateViewHandler);
 
-        Global.DomainStrategy4Freedoms.ForEach(it =>
-        {
-            cmbdomainStrategy4Freedom.Items.Add(it);
-        });
-        Global.SingboxDomainStrategy4Out.ForEach(it =>
-        {
-            cmbdomainStrategy4Out.Items.Add(it);
-        });
-        Global.DomainDNSAddress.ForEach(it =>
-        {
-            cmbdomainDNSAddress.Items.Add(it);
-        });
-        Global.SingboxDomainDNSAddress.ForEach(it =>
-        {
-            cmbdomainDNSAddress2.Items.Add(it);
-        });
+        cmbRayFreedomDNSStrategy.ItemsSource = Global.DomainStrategy4Freedoms;
+        cmbSBDirectDNSStrategy.ItemsSource = Global.SingboxDomainStrategy4Out;
+        cmbSBRemoteDNSStrategy.ItemsSource = Global.SingboxDomainStrategy4Out;
+        cmbDirectDNS.ItemsSource = Global.DomainDirectDNSAddress;
+        cmbSBResolverDNS.ItemsSource = Global.DomainDirectDNSAddress.Concat(new[] { "dhcp://auto,localhost" });
+        cmbRemoteDNS.ItemsSource = Global.DomainRemoteDNSAddress;
+        cmbSBFinalResolverDNS.ItemsSource = Global.DomainPureIPDNSAddress.Concat(new[] { "dhcp://auto,localhost" });
+        cmbDirectExpectedIPs.ItemsSource = Global.ExpectedIPs;
+
+        cmbdomainStrategy4FreedomCompatible.ItemsSource = Global.DomainStrategy4Freedoms;
+        cmbdomainStrategy4OutCompatible.ItemsSource = Global.SingboxDomainStrategy4Out;
+        cmbdomainDNSAddressCompatible.ItemsSource = Global.DomainPureIPDNSAddress;
+        cmbdomainDNSAddress2Compatible.ItemsSource = Global.DomainPureIPDNSAddress;
 
         this.WhenActivated(disposables =>
         {
             this.Bind(ViewModel, vm => vm.UseSystemHosts, v => v.togUseSystemHosts.IsChecked).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.DomainStrategy4Freedom, v => v.cmbdomainStrategy4Freedom.SelectedValue).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.DomainDNSAddress, v => v.cmbdomainDNSAddress.SelectedValue).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.NormalDNS, v => v.txtnormalDNS.Text).DisposeWith(disposables);
-
-            this.Bind(ViewModel, vm => vm.DomainStrategy4Freedom2, v => v.cmbdomainStrategy4Out.SelectedValue).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.DomainDNSAddress2, v => v.cmbdomainDNSAddress2.SelectedValue).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.NormalDNS2, v => v.txtnormalDNS2.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.TunDNS2, v => v.txttunDNS2.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.AddCommonHosts, v => v.togAddCommonHosts.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.FakeIP, v => v.togFakeIP.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.BlockBindingQuery, v => v.togBlockBindingQuery.IsChecked).DisposeWith(disposables);
+            //this.Bind(ViewModel, vm => vm.DirectDNS, v => v.cmbDirectDNS.Text).DisposeWith(disposables);
+            //this.Bind(ViewModel, vm => vm.RemoteDNS, v => v.cmbRemoteDNS.Text).DisposeWith(disposables);
+            //this.Bind(ViewModel, vm => vm.SingboxOutboundsResolveDNS, v => v.cmbSBResolverDNS.Text).DisposeWith(disposables);
+            //this.Bind(ViewModel, vm => vm.SingboxFinalResolveDNS, v => v.cmbSBFinalResolverDNS.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.RayStrategy4Freedom, v => v.cmbRayFreedomDNSStrategy.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SingboxStrategy4Direct, v => v.cmbSBDirectDNSStrategy.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SingboxStrategy4Proxy, v => v.cmbSBRemoteDNSStrategy.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.Hosts, v => v.txtHosts.Text).DisposeWith(disposables);
+            //this.Bind(ViewModel, vm => vm.DirectExpectedIPs, v => v.cmbDirectExpectedIPs.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
-            this.BindCommand(ViewModel, vm => vm.ImportDefConfig4V2rayCmd, v => v.btnImportDefConfig4V2ray).DisposeWith(disposables);
-            this.BindCommand(ViewModel, vm => vm.ImportDefConfig4SingboxCmd, v => v.btnImportDefConfig4Singbox).DisposeWith(disposables);
+
+            this.Bind(ViewModel, vm => vm.RayCustomDNSEnableCompatible, v => v.togRayCustomDNSEnableCompatible.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SBCustomDNSEnableCompatible, v => v.togSBCustomDNSEnableCompatible.IsChecked).DisposeWith(disposables);
+
+            this.Bind(ViewModel, vm => vm.UseSystemHostsCompatible, v => v.togUseSystemHostsCompatible.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.DomainStrategy4FreedomCompatible, v => v.cmbdomainStrategy4FreedomCompatible.SelectedItem).DisposeWith(disposables);
+            //this.Bind(ViewModel, vm => vm.DomainDNSAddressCompatible, v => v.cmbdomainDNSAddressCompatible.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.NormalDNSCompatible, v => v.txtnormalDNSCompatible.Text).DisposeWith(disposables);
+
+            this.Bind(ViewModel, vm => vm.DomainStrategy4Freedom2Compatible, v => v.cmbdomainStrategy4OutCompatible.SelectedItem).DisposeWith(disposables);
+            //this.Bind(ViewModel, vm => vm.DomainDNSAddress2Compatible, v => v.cmbdomainDNSAddress2Compatible.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.NormalDNS2Compatible, v => v.txtnormalDNS2Compatible.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.TunDNS2Compatible, v => v.txttunDNS2Compatible.Text).DisposeWith(disposables);
+
+            this.BindCommand(ViewModel, vm => vm.ImportDefConfig4V2rayCompatibleCmd, v => v.btnImportDefConfig4V2rayCompatible).DisposeWith(disposables);
+            this.BindCommand(ViewModel, vm => vm.ImportDefConfig4SingboxCompatibleCmd, v => v.btnImportDefConfig4SingboxCompatible).DisposeWith(disposables);
+
+            this.WhenAnyValue(
+                    x => x.ViewModel.RayCustomDNSEnableCompatible,
+                    x => x.ViewModel.SBCustomDNSEnableCompatible,
+                    (ray, sb) => ray && sb
+                ).BindTo(this.FindControl<TextBlock>("txtBasicDNSSettingsInvalid"), t => t.IsVisible);
+            this.WhenAnyValue(
+                    x => x.ViewModel.RayCustomDNSEnableCompatible,
+                    x => x.ViewModel.SBCustomDNSEnableCompatible,
+                    (ray, sb) => ray && sb
+                ).BindTo(this.FindControl<TextBlock>("txtAdvancedDNSSettingsInvalid"), t => t.IsVisible);
         });
     }
 

v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml

@@ -0,0 +1,198 @@
+<Window
+    x:Class="v2rayN.Desktop.Views.FullConfigTemplateWindow"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
+    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
+    Title="{x:Static resx:ResUI.menuFullConfigTemplate}"
+    Width="900"
+    Height="600"
+    x:DataType="vms:FullConfigTemplateViewModel"
+    ShowInTaskbar="False"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <DockPanel Margin="{StaticResource Margin8}">
+        <StackPanel
+            Margin="{StaticResource Margin4}"
+            HorizontalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
+            <Button
+                x:Name="btnSave"
+                Width="100"
+                Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
+                IsDefault="True" />
+            <Button
+                x:Name="btnCancel"
+                Width="100"
+                Margin="{StaticResource MarginLr8}"
+                Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
+                IsCancel="True" />
+        </StackPanel>
+
+        <TabControl HorizontalContentAlignment="Stretch">
+            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbRayFullConfigTemplate}">
+                <DockPanel Margin="{StaticResource Margin4}">
+                    <Grid DockPanel.Dock="Top" RowDefinitions="Auto,Auto,Auto">
+
+                        <TextBlock
+                            Grid.Row="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbFullConfigTemplateDesc}"
+                            TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="1"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center">
+                            <HyperlinkButton Classes="WithIcon" Click="linkFullConfigTemplateDoc_Click">
+                                <TextBlock Text="{x:Static resx:ResUI.TbRayFullConfigTemplateDesc}" />
+                            </HyperlinkButton>
+                        </TextBlock>
+
+                        <StackPanel Grid.Row="2" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbFullConfigTemplateEnable}" />
+                            <ToggleSwitch
+                                x:Name="rayFullConfigTemplateEnable"
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+                    </Grid>
+
+                    <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbAddProxyProtocolOutboundOnly}" />
+                            <ToggleSwitch
+                                x:Name="togAddProxyProtocolOutboundOnly4Ray"
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbSetUpstreamProxyDetour}" />
+                            <TextBox
+                                x:Name="txtProxyDetour4Ray"
+                                Width="200"
+                                Margin="{StaticResource Margin4}" />
+                        </StackPanel>
+                    </WrapPanel>
+
+                    <HeaderedContentControl
+                        Margin="{StaticResource Margin4}"
+                        BorderBrush="Gray"
+                        BorderThickness="1"
+                        Header="xray config template json">
+                        <TextBox
+                            x:Name="rayFullConfigTemplate"
+                            VerticalAlignment="Stretch"
+                            Classes="TextArea"
+                            MinLines="10"
+                            TextWrapping="Wrap" />
+                    </HeaderedContentControl>
+                </DockPanel>
+            </TabItem>
+            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbSBFullConfigTemplate}">
+                <DockPanel Margin="{StaticResource Margin4}">
+                    <Grid DockPanel.Dock="Top" RowDefinitions="Auto,Auto,Auto">
+
+                        <TextBlock
+                            Grid.Row="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbFullConfigTemplateDesc}"
+                            TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="1"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center">
+                            <HyperlinkButton Classes="WithIcon" Click="linkFullConfigTemplateDoc_Click">
+                                <TextBlock Text="{x:Static resx:ResUI.TbSBFullConfigTemplateDesc}" />
+                            </HyperlinkButton>
+                        </TextBlock>
+
+                        <StackPanel Grid.Row="2" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbFullConfigTemplateEnable}" />
+                            <ToggleSwitch
+                                x:Name="sbFullConfigTemplateEnable"
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+                    </Grid>
+
+                    <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbAddProxyProtocolOutboundOnly}" />
+                            <ToggleSwitch
+                                x:Name="togAddProxyProtocolOutboundOnly4Singbox"
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbSetUpstreamProxyDetour}" />
+                            <TextBox
+                                x:Name="txtProxyDetour4Singbox"
+                                Width="200"
+                                Margin="{StaticResource Margin4}" />
+                        </StackPanel>
+                    </WrapPanel>
+
+                    <Grid Margin="{StaticResource Margin4}" ColumnDefinitions="*,10,*">
+
+                        <HeaderedContentControl
+                            Grid.Column="0"
+                            BorderBrush="Gray"
+                            BorderThickness="1"
+                            Header="sing-box config template json">
+                            <TextBox
+                                x:Name="sbFullConfigTemplate"
+                                VerticalAlignment="Stretch"
+                                Classes="TextArea"
+                                MinLines="10"
+                                TextWrapping="Wrap" />
+                        </HeaderedContentControl>
+
+                        <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
+
+                        <HeaderedContentControl
+                            Grid.Column="2"
+                            BorderBrush="Gray"
+                            BorderThickness="1"
+                            Header="sing-box tun config template json">
+                            <TextBox
+                                x:Name="sbFullTunConfigTemplate"
+                                VerticalAlignment="Stretch"
+                                Classes="TextArea"
+                                MinLines="10"
+                                TextWrapping="Wrap" />
+                        </HeaderedContentControl>
+                    </Grid>
+                </DockPanel>
+            </TabItem>
+        </TabControl>
+    </DockPanel>
+</Window>

v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs

@@ -0,0 +1,51 @@
+using System.Reactive.Disposables;
+using Avalonia.Interactivity;
+using ReactiveUI;
+using v2rayN.Desktop.Base;
+
+namespace v2rayN.Desktop.Views;
+
+public partial class FullConfigTemplateWindow : WindowBase<FullConfigTemplateViewModel>
+{
+    private static Config _config;
+
+    public FullConfigTemplateWindow()
+    {
+        InitializeComponent();
+
+        _config = AppHandler.Instance.Config;
+        btnCancel.Click += (s, e) => this.Close();
+        ViewModel = new FullConfigTemplateViewModel(UpdateViewHandler);
+
+        this.WhenActivated(disposables =>
+        {
+            this.Bind(ViewModel, vm => vm.EnableFullConfigTemplate4Ray, v => v.rayFullConfigTemplateEnable.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.FullConfigTemplate4Ray, v => v.rayFullConfigTemplate.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.AddProxyOnly4Ray, v => v.togAddProxyProtocolOutboundOnly4Ray.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.ProxyDetour4Ray, v => v.txtProxyDetour4Ray.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.EnableFullConfigTemplate4Singbox, v => v.sbFullConfigTemplateEnable.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.FullConfigTemplate4Singbox, v => v.sbFullConfigTemplate.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.FullTunConfigTemplate4Singbox, v => v.sbFullTunConfigTemplate.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.AddProxyOnly4Singbox, v => v.togAddProxyProtocolOutboundOnly4Singbox.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.ProxyDetour4Singbox, v => v.txtProxyDetour4Singbox.Text).DisposeWith(disposables);
+
+            this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
+        });
+    }
+
+    private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
+    {
+        switch (action)
+        {
+            case EViewAction.CloseWindow:
+                this.Close(true);
+                break;
+        }
+        return await Task.FromResult(true);
+    }
+
+    private void linkFullConfigTemplateDoc_Click(object sender, RoutedEventArgs e)
+    {
+        ProcUtils.ProcessStart("https://github.com/2dust/v2rayN/wiki/Description-of-some-ui#%E5%AE%8C%E6%95%B4%E9%85%8D%E7%BD%AE%E6%A8%A1%E6%9D%BF%E8%AE%BE%E7%BD%AE");
+    }
+}

v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs

@@ -3,13 +3,13 @@ using System.Text;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.ReactiveUI;
 using ReactiveUI;
+using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Handler;
 
 namespace v2rayN.Desktop.Views;
 
-public partial class GlobalHotkeySettingWindow : ReactiveWindow<GlobalHotkeySettingViewModel>
+public partial class GlobalHotkeySettingWindow : WindowBase<GlobalHotkeySettingViewModel>
 {
     private readonly List<object> _textBoxKeyEventItem = new();
 

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml

@@ -39,13 +39,14 @@
                         <MenuItem x:Name="menuAddVmessServer" Header="{x:Static resx:ResUI.menuAddVmessServer}" />
                         <MenuItem x:Name="menuAddVlessServer" Header="{x:Static resx:ResUI.menuAddVlessServer}" />
                         <MenuItem x:Name="menuAddShadowsocksServer" Header="{x:Static resx:ResUI.menuAddShadowsocksServer}" />
+                        <MenuItem x:Name="menuAddTrojanServer" Header="{x:Static resx:ResUI.menuAddTrojanServer}" />
+                        <MenuItem x:Name="menuAddWireguardServer" Header="{x:Static resx:ResUI.menuAddWireguardServer}" />
                         <MenuItem x:Name="menuAddSocksServer" Header="{x:Static resx:ResUI.menuAddSocksServer}" />
                         <MenuItem x:Name="menuAddHttpServer" Header="{x:Static resx:ResUI.menuAddHttpServer}" />
-                        <MenuItem x:Name="menuAddTrojanServer" Header="{x:Static resx:ResUI.menuAddTrojanServer}" />
                         <Separator />
                         <MenuItem x:Name="menuAddHysteria2Server" Header="{x:Static resx:ResUI.menuAddHysteria2Server}" />
                         <MenuItem x:Name="menuAddTuicServer" Header="{x:Static resx:ResUI.menuAddTuicServer}" />
-                        <MenuItem x:Name="menuAddWireguardServer" Header="{x:Static resx:ResUI.menuAddWireguardServer}" />
+                        <MenuItem x:Name="menuAddAnytlsServer" Header="{x:Static resx:ResUI.menuAddAnytlsServer}" />
                     </MenuItem>
 
                     <MenuItem Padding="8,0">
@@ -71,6 +72,7 @@
                         <MenuItem x:Name="menuOptionSetting" Header="{x:Static resx:ResUI.menuOptionSetting}" />
                         <MenuItem x:Name="menuRoutingSetting" Header="{x:Static resx:ResUI.menuRoutingSetting}" />
                         <MenuItem x:Name="menuDNSSetting" Header="{x:Static resx:ResUI.menuDNSSetting}" />
+                        <MenuItem x:Name="menuFullConfigTemplate" Header="{x:Static resx:ResUI.menuFullConfigTemplate}" />
                         <MenuItem x:Name="menuGlobalHotkeySetting" Header="{x:Static resx:ResUI.menuGlobalHotkeySetting}" />
                         <Separator />
                         <MenuItem x:Name="menuRebootAsAdmin" Header="{x:Static resx:ResUI.menuRebootAsAdmin}" />

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -5,18 +5,18 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Notifications;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using DialogHostAvalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
 using Splat;
+using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Common;
 using v2rayN.Desktop.Handler;
 
 namespace v2rayN.Desktop.Views;
 
-public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
+public partial class MainWindow : WindowBase<MainWindowViewModel>
 {
     private static Config _config;
     private WindowNotificationManager? _manager;
@@ -29,7 +29,7 @@ public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
         InitializeComponent();
 
         _config = AppHandler.Instance.Config;
-        _manager = new WindowNotificationManager(TopLevel.GetTopLevel(this)) { MaxItems = 3, Position = NotificationPosition.BottomRight };
+        _manager = new WindowNotificationManager(TopLevel.GetTopLevel(this)) { MaxItems = 3, Position = NotificationPosition.TopRight };
 
         this.KeyDown += MainWindow_KeyDown;
         menuSettingsSetUWP.Click += menuSettingsSetUWP_Click;
@@ -83,6 +83,7 @@ public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
             this.BindCommand(ViewModel, vm => vm.AddHysteria2ServerCmd, v => v.menuAddHysteria2Server).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddTuicServerCmd, v => v.menuAddTuicServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddWireguardServerCmd, v => v.menuAddWireguardServer).DisposeWith(disposables);
+            this.BindCommand(ViewModel, vm => vm.AddAnytlsServerCmd, v => v.menuAddAnytlsServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddCustomServerCmd, v => v.menuAddCustomServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddServerViaClipboardCmd, v => v.menuAddServerViaClipboard).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddServerViaScanCmd, v => v.menuAddServerViaScan).DisposeWith(disposables);
@@ -99,6 +100,7 @@ public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
             this.BindCommand(ViewModel, vm => vm.OptionSettingCmd, v => v.menuOptionSetting).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.RoutingSettingCmd, v => v.menuRoutingSetting).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.DNSSettingCmd, v => v.menuDNSSetting).DisposeWith(disposables);
+            this.BindCommand(ViewModel, vm => vm.FullConfigTemplateCmd, v => v.menuFullConfigTemplate).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.GlobalHotkeySettingCmd, v => v.menuGlobalHotkeySetting).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.RebootAsAdminCmd, v => v.menuRebootAsAdmin).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.ClearServerStatisticsCmd, v => v.menuClearServerStatistics).DisposeWith(disposables);
@@ -135,26 +137,23 @@ public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
             }
         });
 
-        this.Title = $"{Utils.GetVersion()}";
         if (Utils.IsWindows())
         {
+            this.Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
+
             ThreadPool.RegisterWaitForSingleObject(Program.ProgramStarted, OnProgramStarted, null, -1, false);
             HotkeyHandler.Instance.Init(_config, OnHotkeyHandler);
         }
         else
         {
-            if (AppHandler.Instance.IsAdministrator)
-            {
-                this.Title = $"{Utils.GetVersion()} - {ResUI.TbSettingsLinuxSudoPasswordNotSudoRunApp}";
-                NoticeHandler.Instance.SendMessageAndEnqueue(ResUI.TbSettingsLinuxSudoPasswordNotSudoRunApp);
-            }
+            this.Title = $"{Utils.GetVersion()}";
+
             menuRebootAsAdmin.IsVisible = false;
             menuSettingsSetUWP.IsVisible = false;
             menuGlobalHotkeySetting.IsVisible = false;
         }
         menuAddServerViaScan.IsVisible = false;
 
-        RestoreUI();
         AddHelpMenuItem();
         MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
     }
@@ -192,6 +191,9 @@ public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
             case EViewAction.DNSSettingWindow:
                 return await new DNSSettingWindow().ShowDialog<bool>(this);
 
+            case EViewAction.FullConfigTemplateWindow:
+                return await new FullConfigTemplateWindow().ShowDialog<bool>(this);
+
             case EViewAction.RoutingSettingWindow:
                 return await new RoutingSettingWindow().ShowDialog<bool>(this);
 
@@ -388,7 +390,7 @@ public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
 
     private async void MenuClose_Click(object? sender, RoutedEventArgs e)
     {
-        if (await UI.ShowYesNo(this, ResUI.menuExitTips) == ButtonResult.No)
+        if (await UI.ShowYesNo(this, ResUI.menuExitTips) != ButtonResult.Yes)
         {
             return;
         }
@@ -436,14 +438,14 @@ public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
         _config.UiItem.ShowInTaskbar = bl;
     }
 
-    private void RestoreUI()
+    protected override void OnLoaded(object? sender, RoutedEventArgs e)
     {
-        if (_config.UiItem.MainWidth > 0 && _config.UiItem.MainHeight > 0)
-        {
-            Width = _config.UiItem.MainWidth;
-            Height = _config.UiItem.MainHeight;
+        base.OnLoaded(sender, e);
+        RestoreUI();
     }
 
+    private void RestoreUI()
+    {
         if (_config.UiItem.MainGirdHeight1 > 0 && _config.UiItem.MainGirdHeight2 > 0)
         {
             if (_config.UiItem.MainGirdOrientation == EGirdOrientation.Horizontal)
@@ -461,18 +463,15 @@ public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
 
     private void StorageUI(string? n = null)
     {
-        _config.UiItem.MainWidth = this.Width;
-        _config.UiItem.MainHeight = this.Height;
+        ConfigHandler.SaveWindowSizeItem(_config, GetType().Name, Width, Height);
 
         if (_config.UiItem.MainGirdOrientation == EGirdOrientation.Horizontal)
         {
-            _config.UiItem.MainGirdHeight1 = Math.Ceiling(gridMain.ColumnDefinitions[0].ActualWidth + 0.1);
-            _config.UiItem.MainGirdHeight2 = Math.Ceiling(gridMain.ColumnDefinitions[2].ActualWidth + 0.1);
+            ConfigHandler.SaveMainGirdHeight(_config, gridMain.ColumnDefinitions[0].ActualWidth, gridMain.ColumnDefinitions[2].ActualWidth);
         }
         else if (_config.UiItem.MainGirdOrientation == EGirdOrientation.Vertical)
         {
-            _config.UiItem.MainGirdHeight1 = Math.Ceiling(gridMain1.RowDefinitions[0].ActualHeight + 0.1);
-            _config.UiItem.MainGirdHeight2 = Math.Ceiling(gridMain1.RowDefinitions[2].ActualHeight + 0.1);
+            ConfigHandler.SaveMainGirdHeight(_config, gridMain1.RowDefinitions[0].ActualHeight, gridMain1.RowDefinitions[2].ActualHeight);
         }
     }
 

v2rayN/v2rayN.Desktop/Views/MsgView.axaml

@@ -69,15 +69,16 @@
                 IsChecked="True"
                 Theme="{DynamicResource SimpleToggleSwitch}" />
         </WrapPanel>
-        <TextBox
+
+        <ScrollViewer x:Name="msgScrollViewer" VerticalScrollBarVisibility="Auto">
+            <SelectableTextBlock
                 Name="txtMsg"
+                Margin="{StaticResource Margin8}"
                 VerticalAlignment="Stretch"
-            BorderThickness="0"
                 Classes="TextArea"
-            IsReadOnly="True"
                 TextAlignment="Left"
                 TextWrapping="Wrap">
-            <TextBox.ContextMenu>
+                <SelectableTextBlock.ContextMenu>
                     <ContextMenu>
                         <MenuItem
                             x:Name="menuMsgViewSelectAll"
@@ -96,7 +97,8 @@
                             Click="menuMsgViewClear_Click"
                             Header="{x:Static resx:ResUI.menuMsgViewClear}" />
                     </ContextMenu>
-            </TextBox.ContextMenu>
-        </TextBox>
+                </SelectableTextBlock.ContextMenu>
+            </SelectableTextBlock>
+        </ScrollViewer>
     </DockPanel>
 </UserControl>