up 7.25.0

Update scheduled file cleanup in `TaskManager` to delete log and temp files older than 7 days instead of 1 month, reducing stale local data and tightening routine maintenance behavior.

.github/dependabot.yml

@@ -6,6 +6,6 @@ updates:
       interval: "daily"
 
   - package-ecosystem: "nuget"
-    directory: "/"
+    directory: "/v2rayN"
     schedule:
       interval: "daily"

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

@@ -52,7 +52,7 @@ jobs:
           dotnet --list-sdks 2>$null; $LASTEXITCODE=0
 
       - name: Setup .NET 10.0.1xx
-        uses: actions/setup-dotnet@v6.0.0
+        uses: actions/setup-dotnet@v6
         with:
           dotnet-version: 10.0.1xx
 

.github/workflows/build.yml

@@ -69,10 +69,10 @@ jobs:
         dotnet --list-sdks 2>$null; $LASTEXITCODE=0
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v6.0.0
+      uses: actions/setup-dotnet@v6
       with:
-        dotnet-version: '10.0.1xx'
-
+        dotnet-version: 10.0.1xx
+        
     - name: Build v2rayN
       shell: bash
       working-directory: ./v2rayN
@@ -89,7 +89,7 @@ jobs:
         find ${{ matrix.arch }} -type f -name '*.pdb' -delete
 
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v7.0.1
+      uses: actions/upload-artifact@v7
       with:
         name: ${{ matrix.arch }}
         path: ${{ matrix.arch }}

.github/workflows/test.yml

@@ -1,29 +1,52 @@
 name: Code Test
 
 on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'v2rayN/ServiceLib/**'
+      - 'v2rayN/ServiceLib.UdpTest/**'
+      - 'v2rayN/ServiceLib.Tests/**'
+      - 'v2rayN/Directory.Build.*'
+      - 'v2rayN/Directory.Packages.props'
+      - 'global.json'
+      - '.github/workflows/test.yml'
   pull_request:
     branches:
       - master
     paths:
-      - 'v2rayN/ServiceLib/Services/CoreConfig/**'
-      - 'v2rayN/ServiceLib/Handler/Fmt/**'
+      - 'v2rayN/ServiceLib/**'
+      - 'v2rayN/ServiceLib.UdpTest/**'
+      - 'v2rayN/ServiceLib.Tests/**'
+      - 'v2rayN/Directory.Build.*'
+      - 'v2rayN/Directory.Packages.props'
+      - 'global.json'
       - '.github/workflows/test.yml'
 
+permissions:
+  checks: write
+  pull-requests: write
+
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
       uses: actions/checkout@v7
-      with:
-        submodules: 'recursive'
-        fetch-depth: '0'
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v6.0.0
+      uses: actions/setup-dotnet@v6
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '10.x'
+        dotnet-quality: 'ga'
 
     - name: Test Code
-      working-directory: ./v2rayN
-      run: dotnet test ./ServiceLib.Tests
+      run: dotnet test --project ./v2rayN/ServiceLib.Tests -c Release --results-directory ./TestResults -- --report-trx
+
+    - name: Comment PR with results
+      if: always()
+      uses: EnricoMi/publish-unit-test-result-action@v2
+      with:
+        files: ./TestResults/*.trx
+        comment_mode: failures

global.json

@@ -0,0 +1,5 @@
+{
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
+  }
+}

package-debian-loong.sh

@@ -13,8 +13,8 @@ PKGROOT="v2rayN-publish"
 PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj"
 OUTPUT_DIR="${HOME}/debbuild"
 DOTNET_TFM="net10.0"
-DOTNET_LOONGARCH_VERSION="10.0.110"
-DOTNET_LOONGARCH_TAG="v10.0.110-loongarch64"
+DOTNET_LOONGARCH_VERSION="10.0.111"
+DOTNET_LOONGARCH_TAG="v10.0.111-loongarch64"
 DOTNET_LOONGARCH_BASE="https://github.com/loongson/dotnet/releases/download"
 DOTNET_LOONGARCH_FILE="dotnet-sdk-${DOTNET_LOONGARCH_VERSION}-linux-loongarch64.tar.gz"
 DOTNET_SDK_URL="${DOTNET_LOONGARCH_BASE}/${DOTNET_LOONGARCH_TAG}/${DOTNET_LOONGARCH_FILE}"

package-debian-riscv.sh

@@ -12,7 +12,7 @@ MIN_KERNEL="5.10"
 PKGROOT="v2rayN-publish"
 PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj"
 OUTPUT_DIR="${HOME}/debbuild"
-DOTNET_RISCV_VERSION="10.0.110"
+DOTNET_RISCV_VERSION="10.0.111"
 DOTNET_RISCV_BASE="https://github.com/xujiegb/dotnet-riscv/releases/download"
 DOTNET_RISCV_FILE="dotnet-sdk-${DOTNET_RISCV_VERSION}-linux-riscv64.tar.gz"
 DOTNET_SDK_URL="${DOTNET_RISCV_BASE}/${DOTNET_RISCV_VERSION}/${DOTNET_RISCV_FILE}"

package-rhel-loong.sh

@@ -12,8 +12,8 @@ MIN_KERNEL="6.12"
 PKGROOT="v2rayN-publish"
 PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj"
 RPM_TOPDIR="${HOME}/rpmbuild"
-DOTNET_LOONGARCH_VERSION="10.0.110"
-DOTNET_LOONGARCH_TAG="v10.0.110-loongarch64"
+DOTNET_LOONGARCH_VERSION="10.0.111"
+DOTNET_LOONGARCH_TAG="v10.0.111-loongarch64"
 DOTNET_LOONGARCH_BASE="https://github.com/loongson/dotnet/releases/download"
 DOTNET_LOONGARCH_FILE="dotnet-sdk-${DOTNET_LOONGARCH_VERSION}-linux-loongarch64.tar.gz"
 DOTNET_SDK_URL="${DOTNET_LOONGARCH_BASE}/${DOTNET_LOONGARCH_TAG}/${DOTNET_LOONGARCH_FILE}"

package-rhel-riscv.sh

@@ -12,7 +12,7 @@ MIN_KERNEL="5.10"
 PKGROOT="v2rayN-publish"
 PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj"
 RPM_TOPDIR="${HOME}/rpmbuild"
-DOTNET_RISCV_VERSION="10.0.110"
+DOTNET_RISCV_VERSION="10.0.111"
 DOTNET_RISCV_BASE="https://github.com/xujiegb/dotnet-riscv/releases/download"
 DOTNET_RISCV_FILE="dotnet-sdk-${DOTNET_RISCV_VERSION}-linux-riscv64.tar.gz"
 DOTNET_SDK_URL="${DOTNET_RISCV_BASE}/${DOTNET_RISCV_VERSION}/${DOTNET_RISCV_FILE}"

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.24.7</Version>
+        <Version>7.25.0</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/Directory.Packages.props

@@ -7,33 +7,31 @@
   <ItemGroup>
     <PackageVersion Include="Avalonia.AvaloniaEdit" Version="12.0.0" />
     <PackageVersion Include="Avalonia.Controls.DataGrid" Version="12.1.2" />
-    <PackageVersion Include="Avalonia.Desktop" Version="12.1.1" />
+    <PackageVersion Include="Avalonia.Desktop" Version="12.1.2" />
     <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.3" />
-    <PackageVersion Include="AwesomeAssertions" Version="9.5.0" />
     <PackageVersion Include="DialogHost.Avalonia" Version="0.12.3" />
     <PackageVersion Include="IPNetwork2" Version="4.3.0" />
     <PackageVersion Include="ReactiveUI.Avalonia" Version="12.1.1" />
-    <PackageVersion Include="CliWrap" Version="3.10.4" />
-    <PackageVersion Include="Downloader" Version="5.9.5" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
+    <PackageVersion Include="CliWrap" Version="3.10.5" />
+    <PackageVersion Include="Downloader" Version="5.9.6" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.4.1" />
     <PackageVersion Include="MaterialDesignThemes" Version="5.3.2" />
     <PackageVersion Include="QRCoder" Version="1.8.0" />
-    <PackageVersion Include="ReactiveUI" Version="24.1.0" />
+    <PackageVersion Include="ReactiveUI" Version="24.2.0" />
     <PackageVersion Include="ReactiveUI.SourceGenerators" Version="3.2.0" />
-    <PackageVersion Include="ReactiveUI.WPF" Version="24.1.0" />
+    <PackageVersion Include="ReactiveUI.WPF" Version="24.2.0" />
     <PackageVersion Include="Semi.Avalonia" Version="12.1.0.1" />
     <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="12.0.0" />
     <PackageVersion Include="Semi.Avalonia.DataGrid" Version="12.1.0.1" />
-    <PackageVersion Include="NLog" Version="6.1.4" />
+    <PackageVersion Include="NLog" Version="6.2.0" />
     <PackageVersion Include="sqlite-net-e" Version="1.11.285" />
     <PackageVersion Include="Repobot.SQLite.Unofficial" Version="3.53.4.1" />
     <PackageVersion Include="TaskScheduler" Version="2.12.2" />
+    <PackageVersion Include="TUnit" Version="1.65.68" />
+    <PackageVersion Include="TUnit.Assertions.Should" Version="1.65.38-beta" />
     <PackageVersion Include="WebDav.Client" Version="2.9.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
-    <PackageVersion Include="xunit.v3" Version="3.2.2" />
     <PackageVersion Include="YamlDotNet" Version="18.1.0" />
     <PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.22" />
     <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.119.4" />
   </ItemGroup>
-</Project>
+</Project>

v2rayN/ServiceLib.Tests/CoreConfig/Context/CoreConfigContextBuilderTests.cs

@@ -1,15 +1,8 @@
-using AwesomeAssertions;
-using ServiceLib.Enums;
-using ServiceLib.Handler.Builder;
-using ServiceLib.Helper;
-using ServiceLib.Models;
-using Xunit;
-
 namespace ServiceLib.Tests.CoreConfig.Context;
 
 public class CoreConfigContextBuilderTests
 {
-    [Fact]
+    [Test]
     public async Task ResolveNodeAsync_DirectCycleDependency_ShouldFailWithCycleError()
     {
         var config = CoreConfigTestFactory.CreateConfig();
@@ -27,13 +20,13 @@ public class CoreConfigContextBuilderTests
 
         var (_, validatorResult) = await CoreConfigContextBuilder.ResolveNodeAsync(context, groupA, false);
 
-        validatorResult.Success.Should().BeFalse();
-        validatorResult.Errors.Should().Contain(msg => ContainsCycleDependencyMessage(msg));
-        context.AllProxiesMap.Should().NotContainKey(groupA.IndexId);
-        context.AllProxiesMap.Should().NotContainKey(groupB.IndexId);
+        await validatorResult.Success.Should().BeFalse();
+        await validatorResult.Errors.Should().Contain(ContainsCycleDependencyMessage);
+        await context.AllProxiesMap.Should().NotContainKey(groupA.IndexId);
+        await context.AllProxiesMap.Should().NotContainKey(groupB.IndexId);
     }
 
-    [Fact]
+    [Test]
     public async Task ResolveNodeAsync_IndirectCycleDependency_ShouldFailWithCycleError()
     {
         var config = CoreConfigTestFactory.CreateConfig();
@@ -53,14 +46,14 @@ public class CoreConfigContextBuilderTests
 
         var (_, validatorResult) = await CoreConfigContextBuilder.ResolveNodeAsync(context, groupA, false);
 
-        validatorResult.Success.Should().BeFalse();
-        validatorResult.Errors.Should().Contain(msg => ContainsCycleDependencyMessage(msg));
-        context.AllProxiesMap.Should().NotContainKey(groupA.IndexId);
-        context.AllProxiesMap.Should().NotContainKey(groupB.IndexId);
-        context.AllProxiesMap.Should().NotContainKey(groupC.IndexId);
+        await validatorResult.Success.Should().BeFalse();
+        await validatorResult.Errors.Should().Contain(ContainsCycleDependencyMessage);
+        await context.AllProxiesMap.Should().NotContainKey(groupA.IndexId);
+        await context.AllProxiesMap.Should().NotContainKey(groupB.IndexId);
+        await context.AllProxiesMap.Should().NotContainKey(groupC.IndexId);
     }
 
-    [Fact]
+    [Test]
     public async Task ResolveNodeAsync_CycleWithValidBranch_ShouldSkipCycleAndKeepValidChild()
     {
         var config = CoreConfigTestFactory.CreateConfig();
@@ -80,14 +73,14 @@ public class CoreConfigContextBuilderTests
 
         var (_, validatorResult) = await CoreConfigContextBuilder.ResolveNodeAsync(context, groupA, false);
 
-        validatorResult.Success.Should().BeTrue();
-        validatorResult.Errors.Should().BeEmpty();
-        validatorResult.Warnings.Should().Contain(msg => ContainsCycleDependencyMessage(msg));
+        await validatorResult.Success.Should().BeTrue();
+        await validatorResult.Errors.Should().BeEmpty();
+        await validatorResult.Warnings.Should().Contain(ContainsCycleDependencyMessage);
 
-        context.AllProxiesMap.Should().ContainKey(leaf.IndexId);
-        context.AllProxiesMap.Should().ContainKey(groupA.IndexId);
-        context.AllProxiesMap.Should().NotContainKey(groupB.IndexId);
-        groupA.GetProtocolExtra().ChildItems.Should().Be(leaf.IndexId);
+        await context.AllProxiesMap.Should().ContainKey(leaf.IndexId);
+        await context.AllProxiesMap.Should().ContainKey(groupA.IndexId);
+        await context.AllProxiesMap.Should().NotContainKey(groupB.IndexId);
+        await groupA.GetProtocolExtra().ChildItems.Should().BeEqualTo(leaf.IndexId);
     }
 
     private static string NewId(string prefix)

v2rayN/ServiceLib.Tests/CoreConfig/CoreConfigTestFactory.cs

@@ -205,7 +205,8 @@ internal static class CoreConfigTestFactory
         return node;
     }
 
-    public static CoreConfigContext CreateContext(Config config, ProfileItem node, ECoreType runCoreType)
+    public static CoreConfigContext CreateContext(Config config, ProfileItem node, ECoreType runCoreType,
+        bool hasGlobalIPv6Address = true)
     {
         return new CoreConfigContext
         {
@@ -226,6 +227,7 @@ internal static class CoreConfigTestFactory
             FullConfigTemplate = null,
             IsTunEnabled = config.TunModeItem.EnableTun,
             ProtectDomainList = [],
+            HasGlobalIPv6Address = hasGlobalIPv6Address,
         };
     }
 

v2rayN/ServiceLib.Tests/CoreConfig/Singbox/CoreConfigSingboxServiceTests.cs

@@ -1,19 +1,9 @@
-using AwesomeAssertions;
-using ServiceLib.Common;
-using ServiceLib.Enums;
-using ServiceLib.Handler.Fmt;
-using ServiceLib.Manager;
-using ServiceLib.Models;
-using ServiceLib.Models.Dto;
-using ServiceLib.Services.CoreConfig;
-using Xunit;
-
 namespace ServiceLib.Tests.CoreConfig.Singbox;
 
 public class CoreConfigSingboxServiceTests
 {
-    [Fact]
-    public void GenerateClientConfigContent_ShouldGenerateBasicProxyConfig()
+    [Test]
+    public async Task GenerateClientConfigContent_ShouldGenerateBasicProxyConfig()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -22,17 +12,17 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
-        result.Data.Should().NotBeNull();
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
+        await result.Data.Should().NotBeNull();
 
         var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString());
-        singboxConfig.Should().NotBeNull();
-        singboxConfig!.outbounds.Should().Contain(o => o.tag == Global.ProxyTag && o.type == "socks");
-        singboxConfig.inbounds.Should().Contain(i => i.type == nameof(EInboundProtocol.mixed));
+        await singboxConfig.Should().NotBeNull();
+        await singboxConfig!.outbounds.Should().Contain(o => o.tag == Global.ProxyTag && o.type == "socks");
+        await singboxConfig.inbounds.Should().Contain(i => i.type == nameof(EInboundProtocol.mixed));
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_TunWithLoopbackPreSocks_ShouldKeepMixedInbound()
+    [Test]
+    public async Task GenerateClientConfigContent_TunWithLoopbackPreSocks_ShouldKeepMixedInbound()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -46,18 +36,18 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
 
-        cfg.inbounds.Should().Contain(i =>
+        await cfg.inbounds.Should().Contain(i =>
             i.type == nameof(EInboundProtocol.mixed)
             && i.listen == Global.Loopback
             && i.listen_port == AppManager.Instance.GetLocalPort(EInboundProtocol.socks));
-        cfg.inbounds.Should().Contain(i => i.type == "tun");
+        await cfg.inbounds.Should().Contain(i => i.type == "tun");
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_TunEnabled_ShouldKeepEmbeddedTunRules()
+    [Test]
+    public async Task GenerateClientConfigContent_TunEnabled_ShouldKeepEmbeddedTunRules()
     {
         // The embedded tun rules reject local-network noise (NetBIOS/mDNS, multicast).
         // They are deserialized into List<Rule4Sbox>, so a schema mismatch in the
@@ -75,22 +65,22 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
 
-        cfg.route.rules.Should().Contain(
+        await cfg.route.rules.Should().Contain(
             r => r.action == "reject"
                 && r.network != null && r.network.Contains("udp")
                 && r.port != null && r.port.Contains(5353),
             "the embedded tun rules must reject mDNS/NetBIOS noise");
-        cfg.route.rules.Should().Contain(
+        await cfg.route.rules.Should().Contain(
             r => r.action == "reject"
                 && r.ip_cidr != null && r.ip_cidr.Contains("224.0.0.0/3"),
             "the embedded tun rules must reject multicast traffic");
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_TunEnabled_ShouldRejectTrafficToTunOwnAddresses()
+    [Test]
+    public async Task GenerateClientConfigContent_TunEnabled_ShouldRejectTrafficToTunOwnAddresses()
     {
         // Regression test: traffic addressed to the TUN interface's own addresses must
         // never reach an outbound. auto_route hijacks the default route, so `direct`
@@ -111,17 +101,19 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
         var tun = cfg.inbounds.First(i => i.type == "tun");
-        tun.address.Should().NotBeNullOrEmpty();
+        //tun.address.Should().NotBeNullOrEmpty();
+        await tun.address.Should().NotBeNull();
+        await tun.address.Should().NotBeEmpty();
 
         foreach (var address in tun.address!)
         {
             var self = IPAddress.Parse(address.Split('/').First());
             var hostBits = self.AddressFamily == AddressFamily.InterNetworkV6 ? 128 : 32;
             var expected = $"{self}/{hostBits}";
-            cfg.route.rules.Should().Contain(
+            await cfg.route.rules.Should().Contain(
                 r => r.action == "reject" && r.ip_cidr != null && r.ip_cidr.Contains(expected),
                 $"traffic to the TUN's own address '{address}' must be rejected, not routed");
         }
@@ -131,12 +123,13 @@ public class CoreConfigSingboxServiceTests
         // here leaves room for it, so a prefix match would drop system name lookups too.
         var dropRule = cfg.route.rules.First(r =>
             r.action == "reject" && r.method == "drop" && r.ip_cidr?.Count > 0);
-        dropRule.ip_cidr!.Should().OnlyContain(c =>
-            c.EndsWith("/32", StringComparison.Ordinal) || c.EndsWith("/128", StringComparison.Ordinal));
+        //dropRule.ip_cidr!.Should().OnlyContain(c =>
+        //    c.EndsWith("/32", StringComparison.Ordinal) || c.EndsWith("/128", StringComparison.Ordinal));
+        await dropRule.ip_cidr.Should().All(c => c.EndsWith("/32", StringComparison.Ordinal) || c.EndsWith("/128", StringComparison.Ordinal));
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_BindInterface_ShouldUseDialBindInterface()
+    [Test]
+    public async Task GenerateClientConfigContent_BindInterface_ShouldUseDialBindInterface()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
         config.CoreBasicItem.BindInterface = "eth0";
@@ -150,16 +143,16 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
         var proxy = cfg.outbounds.First(o => o.tag == Global.ProxyTag);
 
-        proxy.bind_interface.Should().Be("eth0");
-        proxy.detour.Should().BeNullOrEmpty();
+        await proxy.bind_interface.Should().BeEqualTo("eth0");
+        await proxy.detour.Should().BeNull().Or.BeEmpty();
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_PolicyGroup_ShouldExpandChildrenAndBuildSelector()
+    [Test]
+    public async Task GenerateClientConfigContent_PolicyGroup_ShouldExpandChildrenAndBuildSelector()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -176,17 +169,17 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
 
-        cfg.outbounds.Should().Contain(o => o.tag == Global.ProxyTag && o.type == "selector");
-        cfg.outbounds.Should().Contain(o => o.tag == $"{Global.ProxyTag}-auto" && o.type == "urltest");
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith("proxy-1-", StringComparison.Ordinal));
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith("proxy-2-", StringComparison.Ordinal));
+        await cfg.outbounds.Should().Contain(o => o.tag == Global.ProxyTag && o.type == "selector");
+        await cfg.outbounds.Should().Contain(o => o.tag == $"{Global.ProxyTag}-auto" && o.type == "urltest");
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith("proxy-1-", StringComparison.Ordinal));
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith("proxy-2-", StringComparison.Ordinal));
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_ProxyChain_ShouldBuildDetourChain()
+    [Test]
+    public async Task GenerateClientConfigContent_ProxyChain_ShouldBuildDetourChain()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -203,18 +196,18 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
 
-        cfg.outbounds.Should().Contain(o => o.tag == Global.ProxyTag && o.type == "socks");
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith("chain-proxy-1-", StringComparison.Ordinal));
-        cfg.outbounds.Should().Contain(o =>
+        await cfg.outbounds.Should().Contain(o => o.tag == Global.ProxyTag && o.type == "socks");
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith("chain-proxy-1-", StringComparison.Ordinal));
+        await cfg.outbounds.Should().Contain(o =>
             o.tag == Global.ProxyTag &&
             (o.detour ?? string.Empty).StartsWith("chain-proxy-1-", StringComparison.Ordinal));
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_PolicyGroupWithProxyChain_ShouldBuildCombinedOutbounds()
+    [Test]
+    public async Task GenerateClientConfigContent_PolicyGroupWithProxyChain_ShouldBuildCombinedOutbounds()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -236,18 +229,18 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
 
-        cfg.outbounds.Should().Contain(o => o.tag == Global.ProxyTag && o.type == "selector");
-        cfg.outbounds.Should().Contain(o => o.tag == $"{Global.ProxyTag}-auto" && o.type == "urltest");
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith("proxy-1-", StringComparison.Ordinal));
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith("chain-proxy-1-", StringComparison.Ordinal));
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith("proxy-2-", StringComparison.Ordinal));
+        await cfg.outbounds.Should().Contain(o => o.tag == Global.ProxyTag && o.type == "selector");
+        await cfg.outbounds.Should().Contain(o => o.tag == $"{Global.ProxyTag}-auto" && o.type == "urltest");
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith("proxy-1-", StringComparison.Ordinal));
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith("chain-proxy-1-", StringComparison.Ordinal));
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith("proxy-2-", StringComparison.Ordinal));
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_ProxyChainWithPolicyGroup_ShouldBuildClonedChainBranches()
+    [Test]
+    public async Task GenerateClientConfigContent_ProxyChainWithPolicyGroup_ShouldBuildClonedChainBranches()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -269,25 +262,25 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
 
-        cfg.outbounds.Should().Contain(o => o.tag == Global.ProxyTag && o.type == "selector");
-        cfg.outbounds.Should().Contain(o => o.tag == $"{Global.ProxyTag}-auto" && o.type == "urltest");
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith("chain-proxy-1-group-1-", StringComparison.Ordinal));
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith("chain-proxy-1-group-2-", StringComparison.Ordinal));
+        await cfg.outbounds.Should().Contain(o => o.tag == Global.ProxyTag && o.type == "selector");
+        await cfg.outbounds.Should().Contain(o => o.tag == $"{Global.ProxyTag}-auto" && o.type == "urltest");
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith("chain-proxy-1-group-1-", StringComparison.Ordinal));
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith("chain-proxy-1-group-2-", StringComparison.Ordinal));
 
         var proxyCloneCount = cfg.outbounds.Count(o => o.tag.StartsWith("proxy-clone-", StringComparison.Ordinal));
-        proxyCloneCount.Should().Be(2);
+        await proxyCloneCount.Should().BeEqualTo(2);
 
         var allCloneDetoursPointToGroupBranches = cfg.outbounds
             .Where(o => o.tag.StartsWith("proxy-clone-", StringComparison.Ordinal))
             .All(o => (o.detour ?? string.Empty).StartsWith("chain-proxy-1-group-", StringComparison.Ordinal));
-        allCloneDetoursPointToGroupBranches.Should().BeTrue();
+        await allCloneDetoursPointToGroupBranches.Should().BeTrue();
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_RoutingSplit_DirectAndBlock_ShouldApplyRules()
+    [Test]
+    public async Task GenerateClientConfigContent_RoutingSplit_DirectAndBlock_ShouldApplyRules()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -323,24 +316,24 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
 
         var hasDirectRule = cfg.route.rules.Any(r =>
             r.domain != null
             && r.domain.Contains("direct.example.com")
             && r.outbound == Global.DirectTag);
-        hasDirectRule.Should().BeTrue();
+        await hasDirectRule.Should().BeTrue();
 
         var hasBlockRule = cfg.route.rules.Any(r =>
             r.domain != null
             && r.domain.Contains("block.example.com")
             && r.action == "reject");
-        hasBlockRule.Should().BeTrue();
+        await hasBlockRule.Should().BeTrue();
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_RoutingSplit_ByRemark_ShouldGenerateTargetOutbound()
+    [Test]
+    public async Task GenerateClientConfigContent_RoutingSplit_ByRemark_ShouldGenerateTargetOutbound()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -372,65 +365,21 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
         var expectedPrefix = $"{routeNode.IndexId}-{Global.ProxyTag}-{routeNode.Remarks}";
 
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith(expectedPrefix, StringComparison.Ordinal));
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith(expectedPrefix, StringComparison.Ordinal));
 
         var hasRouteRule = cfg.route.rules.Any(r =>
             r.domain != null
             && r.domain.Contains("route.example.com")
             && (r.outbound ?? string.Empty).StartsWith(expectedPrefix, StringComparison.Ordinal));
-        hasRouteRule.Should().BeTrue();
+        await hasRouteRule.Should().BeTrue();
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_DirectExpectedIPs_ShouldApplyGeoipAndCidrToDirectDnsRule()
-    {
-        var config = CoreConfigTestFactory.CreateConfigWithDirectExpectedIPs(
-            ECoreType.sing_box,
-            "192.168.0.0/16,geoip:cn");
-        CoreConfigTestFactory.BindAppManagerConfig(config);
-
-        var node = CoreConfigTestFactory.CreateSocksNode(ECoreType.sing_box, "n-main", "main");
-        var context = CoreConfigTestFactory.CreateContext(config, node, ECoreType.sing_box) with
-        {
-            RoutingItem = new RoutingItem
-            {
-                Id = "r-dns-direct-expected",
-                Remarks = "dns-direct-expected",
-                RuleSet = JsonUtils.Serialize(new List<RulesItem>
-                {
-                    new()
-                    {
-                        Enabled = true,
-                        RuleType = ERuleType.DNS,
-                        OutboundTag = Global.DirectTag,
-                        Domain = ["geosite:cn"],
-                    }
-                }),
-                DomainStrategy = Global.AsIs,
-                DomainStrategy4Singbox = string.Empty,
-            }
-        };
-
-        var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
-
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
-        var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
-
-        var hasExpectedRule = cfg.dns.rules?.Any(r =>
-            r.server == Global.SingboxDirectDNSTag
-            && r.ip_cidr?.Contains("192.168.0.0/16") == true
-            && r.rule_set?.Contains("geosite-cn") == true
-            && r.rule_set?.Contains("geoip-cn") == true) ?? false;
-
-        hasExpectedRule.Should().BeTrue();
-    }
-
-    [Fact]
-    public void GenerateClientConfigContent_BootstrapDNS_ShouldConfigurePureIPResolver()
+    [Test]
+    public async Task GenerateClientConfigContent_BootstrapDNS_ShouldConfigurePureIPResolver()
     {
         var bootstrapDns = "8.8.8.8";
         var config = CoreConfigTestFactory.CreateConfigWithBootstrapDNS(ECoreType.sing_box, bootstrapDns);
@@ -441,17 +390,17 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
-        config.SimpleDNSItem.BootstrapDNS.Should().Be(bootstrapDns);
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
+        await config.SimpleDNSItem.BootstrapDNS.Should().BeEqualTo(bootstrapDns);
 
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
-        var bootstrapServer = cfg.dns.servers?.FirstOrDefault(s => s.tag == Global.SingboxLocalDNSTag);
-        bootstrapServer.Should().NotBeNull();
-        (bootstrapServer?.server ?? string.Empty).Should().Contain(bootstrapDns);
+        var bootstrapServer = cfg.dns?.servers.FirstOrDefault(s => s.tag == Global.SingboxLocalDNSTag);
+        await bootstrapServer.Should().NotBeNull();
+        await bootstrapServer!.server.Should().Contain(bootstrapDns);
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_DnsFallback_LastRuleDirect_ShouldUseDirectFinalDns()
+    [Test]
+    public async Task GenerateClientConfigContent_DnsFallback_LastRuleDirect_ShouldUseDirectFinalDns()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
         config.SimpleDNSItem.DirectDNS = "1.1.1.1";
@@ -484,14 +433,14 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
 
-        cfg.dns.final.Should().Be(Global.SingboxDirectDNSTag);
+        await cfg.dns.final.Should().BeEqualTo(Global.SingboxDirectDNSTag);
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_DirectExpectedIPs_NonMatchingRegion_ShouldNotApplyExpectedRule()
+    [Test]
+    public async Task GenerateClientConfigContent_DirectExpectedIPs_NonMatchingRegion_ShouldNotApplyExpectedRule()
     {
         var config =
             CoreConfigTestFactory.CreateConfigWithDirectExpectedIPs(ECoreType.sing_box, "192.168.0.0/16,geoip:cn");
@@ -521,21 +470,21 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
 
         var hasExpectedRule = cfg.dns.rules?.Any(r =>
             r.server == Global.SingboxDirectDNSTag
             && r.ip_cidr?.Contains("192.168.0.0/16") == true
             && r.rule_set?.Contains("geoip-cn") == true) ?? false;
-        hasExpectedRule.Should().BeFalse();
+        await hasExpectedRule.Should().BeFalse();
     }
 
-    [Theory]
-    [InlineData("geosite:cn", "geosite-cn")]
-    [InlineData("geosite:geolocation-cn", "geosite-geolocation-cn")]
-    [InlineData("geosite:tld-cn", "geosite-tld-cn")]
-    public void GenerateClientConfigContent_DirectExpectedIPs_RegionVariant_ShouldApplyExpectedRule(string domainTag,
+    [Test]
+    [Arguments("geosite:cn", "geosite-cn")]
+    [Arguments("geosite:geolocation-cn", "geosite-geolocation-cn")]
+    [Arguments("geosite:tld-cn", "geosite-tld-cn")]
+    public async Task GenerateClientConfigContent_DirectExpectedIPs_RegionVariant_ShouldApplyExpectedRule(string domainTag,
         string expectedRuleSetTag)
     {
         var config =
@@ -551,31 +500,38 @@ public class CoreConfigSingboxServiceTests
                 Remarks = "dns-direct-variant",
                 RuleSet = JsonUtils.Serialize(new List<RulesItem>
                 {
+                    new()
+                    {
+                        Enabled = true, RuleType = ERuleType.DNS, OutboundTag = Global.ProxyTag, Domain = ["geosite:google"],
+                    },
                     new()
                     {
                         Enabled = true, RuleType = ERuleType.DNS, OutboundTag = Global.DirectTag, Domain = [domainTag],
-                    }
+                    },
                 }),
                 DomainStrategy = Global.AsIs,
                 DomainStrategy4Singbox = string.Empty,
-            }
+            },
         };
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
 
-        var hasExpectedRule = cfg.dns.rules?.Any(r =>
-            r.server == Global.SingboxDirectDNSTag
-            && r.ip_cidr?.Contains("192.168.0.0/16") == true
-            && r.rule_set?.Contains(expectedRuleSetTag) == true
-            && r.rule_set?.Contains("geoip-cn") == true) ?? false;
-        hasExpectedRule.Should().BeTrue();
+        var hasExpectedRule = (cfg.dns.rules?.Any(r =>
+                                  r.ip_cidr?.Contains("192.168.0.0/16") == true
+                                  && r.action == "respond"
+                                  && r.rule_set?.Contains("geoip-cn") == true) ?? false)
+                              && (cfg.dns.rules?.Any(r =>
+                                  r.server == Global.SingboxDirectDNSTag
+                                  && r.rule_set?.Contains(expectedRuleSetTag) == true
+                                  && r.action == "evaluate") ?? false);
+        await hasExpectedRule.Should().BeTrue();
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_Hosts_ShouldPopulateHostsServerAndDomainResolver()
+    [Test]
+    public async Task GenerateClientConfigContent_Hosts_ShouldPopulateHostsServerAndDomainResolver()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
         config.SimpleDNSItem.Hosts = "resolver.example 1.1.1.1";
@@ -587,21 +543,21 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
 
         var hostsServer = cfg.dns.servers.FirstOrDefault(s => s.tag == Global.SingboxHostsDNSTag);
-        hostsServer.Should().NotBeNull();
-        hostsServer!.predefined.Should().ContainKey("resolver.example");
-        hostsServer.predefined!["resolver.example"].Should().Contain("1.1.1.1");
+        await hostsServer.Should().NotBeNull();
+        await hostsServer!.predefined.Should().ContainKey("resolver.example");
+        await hostsServer.predefined!["resolver.example"].Should().Contain("1.1.1.1");
 
         var directServer = cfg.dns.servers.FirstOrDefault(s => s.tag == Global.SingboxDirectDNSTag);
-        directServer.Should().NotBeNull();
-        directServer!.domain_resolver.Should().Be(Global.SingboxHostsDNSTag);
+        await directServer.Should().NotBeNull();
+        await directServer!.domain_resolver.Should().BeEqualTo(Global.SingboxHostsDNSTag);
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_RawDnsEnabled_ShouldUseCustomDnsAndInjectLocalResolver()
+    [Test]
+    public async Task GenerateClientConfigContent_RawDnsEnabled_ShouldUseCustomDnsAndInjectLocalResolver()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -630,22 +586,76 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
 
-        cfg.dns.servers.Should().Contain(s => s.tag == "remote" && s.type == "udp" && s.server == "8.8.8.8");
-        cfg.dns.servers.Should().Contain(s => s.tag == Global.SingboxLocalDNSTag);
-        cfg.dns.rules.Should().Contain(r => r.clash_mode == nameof(ERuleMode.Global));
-        cfg.dns.rules.Should().Contain(r => r.clash_mode == nameof(ERuleMode.Direct));
+        await cfg.dns.servers.Should().Contain(s => s.tag == "remote" && s.type == "udp" && s.server == "8.8.8.8");
+        await cfg.dns.servers.Should().Contain(s => s.tag == Global.SingboxLocalDNSTag);
+        await cfg.dns.rules.Should().Contain(r => r.clash_mode == nameof(ERuleMode.Global));
+        await cfg.dns.rules.Should().Contain(r => r.clash_mode == nameof(ERuleMode.Direct));
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_Hysteria2Realm_ShouldEmitHttpsServerUrl()
+    [Test]
+    [Arguments(true)]
+    [Arguments(false)]
+    public async Task GenerateClientConfigContent_MultiDnsServers_ShouldIncludeAllServers(bool parallelQuery)
+    {
+        var config =
+            CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
+        config.SimpleDNSItem.ParallelQuery = parallelQuery;
+        config.SimpleDNSItem.DirectDNS = "1.1.1.1,2.2.2.2";
+        config.SimpleDNSItem.RemoteDNS = "3.3.3.3,4.4.4.4";
+        CoreConfigTestFactory.BindAppManagerConfig(config);
+
+        var node = CoreConfigTestFactory.CreateSocksNode(ECoreType.sing_box, "n-main", "main");
+        var context = CoreConfigTestFactory.CreateContext(config, node, ECoreType.sing_box) with
+        {
+            RoutingItem = new RoutingItem
+            {
+                Id = "r-dns-direct-variant",
+                Remarks = "dns-direct-variant",
+                RuleSet = JsonUtils.Serialize(new List<RulesItem>
+                {
+                    new()
+                    {
+                        Enabled = true,
+                        RuleType = ERuleType.DNS,
+                        OutboundTag = Global.ProxyTag,
+                        Domain = ["geosite:google"],
+                    },
+                    new()
+                    {
+                        Enabled = true,
+                        RuleType = ERuleType.DNS,
+                        OutboundTag = Global.DirectTag,
+                        Domain = ["geosite:cn"],
+                    },
+                }),
+                DomainStrategy = Global.AsIs,
+                DomainStrategy4Singbox = string.Empty,
+            },
+        };
+
+        var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
+
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
+        var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
+
+        await cfg.dns.servers.Where(s => s.tag.StartsWith(Global.SingboxDirectDNSTagPrefix)).Should().HaveCount(2);
+        await cfg.dns.servers.Where(s => s.tag.StartsWith(Global.SingboxRemoteDNSTagPrefix)).Should().HaveCount(2);
+        if (parallelQuery)
+        {
+            await cfg.dns.rules.Should().Contain(r => r.race == true);
+        }
+    }
+
+    [Test]
+    public async Task GenerateClientConfigContent_Hysteria2Realm_ShouldEmitHttpsServerUrl()
     {
         var shareLink =
             "hysteria2+realm://public@realm.hy2.io/my-realm-id?auth=uuid&stun=turn.cloudflare.com%3A3478&sni=cloudflare.com&pinSHA256=xxx#Realm-Test";
         var node = Hysteria2Fmt.ResolveRealm(shareLink, out _);
-        node.Should().NotBeNull();
+        await node.Should().NotBeNull();
         node!.CoreType = ECoreType.sing_box;
 
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
@@ -658,22 +668,22 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
         var proxy = cfg.outbounds.First(o => o.tag == Global.ProxyTag);
 
-        proxy.type.Should().Be("hysteria2");
-        proxy.realm.Should().NotBeNull();
-        proxy.realm!.server_url.Should().StartWith("https://");
-        proxy.realm.server_url.Should().Contain("realm.hy2.io");
-        proxy.realm.token.Should().Be("public");
-        proxy.realm.realm_id.Should().Be("my-realm-id");
-        proxy.realm.stun_servers.Should().Contain("turn.cloudflare.com:3478");
-        proxy.server.Should().BeNull();
+        await proxy.type.Should().BeEqualTo("hysteria2");
+        await proxy.realm.Should().NotBeNull();
+        await proxy.realm!.server_url.Should().StartWith("https://");
+        await proxy.realm.server_url.Should().Contain("realm.hy2.io");
+        await proxy.realm.token.Should().BeEqualTo("public");
+        await proxy.realm.realm_id.Should().BeEqualTo("my-realm-id");
+        await proxy.realm.stun_servers.Should().Contain("turn.cloudflare.com:3478");
+        await proxy.server.Should().BeNull();
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_TunSystemStackWithIpv6_ShouldUsePrefixWithPeerAddress()
+    [Test]
+    public async Task GenerateClientConfigContent_TunSystemStackWithIpv6_ShouldUsePrefixWithPeerAddress()
     {
         // Regression test for #9820: sing-box fails with "need one more IPv6 address in
         // first prefix for system stack" when the TUN inbound uses a /128 IPv6 prefix.
@@ -691,23 +701,24 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
         var tun = cfg.inbounds.First(i => i.type == "tun");
 
-        tun.address.Should().NotBeNullOrEmpty();
+        await tun.address.Should().NotBeNull();
+        await tun.address.Should().NotBeEmpty();
         foreach (var address in tun.address!)
         {
             var prefixLength = int.Parse(address[(address.LastIndexOf('/') + 1)..]);
             var isIpv6 = address.Contains(':');
-            prefixLength.Should().BeLessThanOrEqualTo(isIpv6 ? 126 : 30,
+            await prefixLength.Should().BeLessThanOrEqualTo(isIpv6 ? 126 : 30,
                 $"'{address}' must leave room for the peer address the system stack derives");
         }
     }
 
 
-    [Fact]
-    public void GenerateClientConfigContent_CustomOutbound_ShouldReplaceWithUserCustomOutboundJson()
+    [Test]
+    public async Task GenerateClientConfigContent_CustomOutbound_ShouldReplaceWithUserCustomOutboundJson()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -728,17 +739,17 @@ public class CoreConfigSingboxServiceTests
 
         var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
-        result.Data.Should().NotBeNull();
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
+        await result.Data.Should().NotBeNull();
 
         var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString());
-        cfg.Should().NotBeNull();
+        await cfg.Should().NotBeNull();
         var proxyOutbound = cfg!.outbounds.FirstOrDefault(o => o.tag == Global.ProxyTag);
-        proxyOutbound.Should().NotBeNull();
-        proxyOutbound!.type.Should().Be("shadowsocks");
-        proxyOutbound.server.Should().Be("1.2.3.4");
-        proxyOutbound.server_port.Should().Be(8388);
-        proxyOutbound.method.Should().Be("aes-128-gcm");
-        proxyOutbound.password.Should().Be("custom_password");
+        await proxyOutbound.Should().NotBeNull();
+        await proxyOutbound!.type.Should().BeEqualTo("shadowsocks");
+        await proxyOutbound.server.Should().BeEqualTo("1.2.3.4");
+        await proxyOutbound.server_port.Should().BeEqualTo(8388);
+        await proxyOutbound.method.Should().BeEqualTo("aes-128-gcm");
+        await proxyOutbound.password.Should().BeEqualTo("custom_password");
     }
 }

v2rayN/ServiceLib.Tests/CoreConfig/V2ray/CoreConfigV2rayServiceTests.cs

@@ -1,16 +1,9 @@
-using AwesomeAssertions;
-using ServiceLib.Common;
-using ServiceLib.Enums;
-using ServiceLib.Models;
-using ServiceLib.Services.CoreConfig;
-using Xunit;
-
 namespace ServiceLib.Tests.CoreConfig.V2ray;
 
 public class CoreConfigV2rayServiceTests
 {
-    [Fact]
-    public void GenerateClientConfigContent_ShouldGenerateBasicProxyConfig()
+    [Test]
+    public async Task GenerateClientConfigContent_ShouldGenerateBasicProxyConfig()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.Xray);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -19,17 +12,17 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
-        result.Data.Should().NotBeNull();
+        await result.Success.Should().BeTrue();
+        await result.Data.Should().NotBeNull();
 
         var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString());
-        v2rayConfig.Should().NotBeNull();
-        v2rayConfig!.outbounds.Should().Contain(o => o.tag == Global.ProxyTag && o.protocol == "vmess");
-        v2rayConfig.inbounds.Should().Contain(i => i.protocol == nameof(EInboundProtocol.mixed));
+        await v2rayConfig.Should().NotBeNull();
+        await v2rayConfig!.outbounds.Should().Contain(o => o.tag == Global.ProxyTag && o.protocol == "vmess");
+        await v2rayConfig.inbounds.Should().Contain(i => i.protocol == nameof(EInboundProtocol.mixed));
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_HttpOutbound_ShouldEmitHeadersInSettings()
+    [Test]
+    public async Task GenerateClientConfigContent_HttpOutbound_ShouldEmitHeadersInSettings()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.Xray);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -42,27 +35,27 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
+        await result.Success.Should().BeTrue();
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
         var outbound = cfg.outbounds.First(o => o.tag == Global.ProxyTag && o.protocol == "http");
 
-        outbound.settings.address?.ToString().Should().Be("proxy.example.com");
-        outbound.settings.port.Should().Be(8080);
-        outbound.settings.user.Should().Be("user");
-        outbound.settings.pass.Should().Be("pass");
-        outbound.settings.level.Should().Be(1);
-        outbound.settings.headers.Should().NotBeNull();
-        var headers = JsonUtils.ParseJson(outbound.settings.headers.ToString());
-        headers["User-Agent"]!.GetValue<string>().Should().Be("v2rayN");
-        headers["Set-Cookie"]!.AsArray()
+        await outbound.settings.address!.ToString().Should().BeEqualTo("proxy.example.com");
+        await outbound.settings.port.Should().BeEqualTo(8080);
+        await outbound.settings.user.Should().BeEqualTo("user");
+        await outbound.settings.pass.Should().BeEqualTo("pass");
+        await outbound.settings.level.Should().BeEqualTo(1);
+        await outbound.settings.headers.Should().NotBeNull();
+        var headers = JsonUtils.ParseJson(outbound.settings.headers!.ToString());
+        await headers["User-Agent"]!.GetValue<string>().Should().BeEqualTo("v2rayN");
+        await headers["Set-Cookie"]!.AsArray()
             .Select(item => item!.GetValue<string>())
-            .Should().Equal("a=1", "b=2");
-        outbound.settings.servers.Should().BeNull();
-        outbound.settings.vnext.Should().BeNull();
+            .Should().BeEquivalentTo(["a=1", "b=2"]);
+        await outbound.settings.servers.Should().BeNull();
+        await outbound.settings.vnext.Should().BeNull();
     }
  
-    [Fact]
-    public void GenerateClientConfigContent_PolicyGroup_ShouldExpandChildrenAndBuildBalancer()
+    [Test]
+    public async Task GenerateClientConfigContent_PolicyGroup_ShouldExpandChildrenAndBuildBalancer()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.Xray);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -79,17 +72,17 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
+        await result.Success.Should().BeTrue();
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
 
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith("proxy-1-", StringComparison.Ordinal));
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith("proxy-2-", StringComparison.Ordinal));
-        cfg.routing.balancers.Should().NotBeNull();
-        cfg.routing.balancers!.Should().Contain(b => b.tag == Global.ProxyTag + Global.BalancerTagSuffix);
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith("proxy-1-", StringComparison.Ordinal));
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith("proxy-2-", StringComparison.Ordinal));
+        await cfg.routing.balancers.Should().NotBeNull();
+        await cfg.routing.balancers!.Should().Contain(b => b.tag == Global.ProxyTag + Global.BalancerTagSuffix);
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_ProxyChain_ShouldBuildDialerProxyChain()
+    [Test]
+    public async Task GenerateClientConfigContent_ProxyChain_ShouldBuildDialerProxyChain()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.Xray);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -105,21 +98,21 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
+        await result.Success.Should().BeTrue();
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
 
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith("chain-proxy-1-", StringComparison.Ordinal));
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith("chain-proxy-1-", StringComparison.Ordinal));
         var hasDialerChain = cfg.outbounds.Any(o =>
             o.tag == Global.ProxyTag
             && o.streamSettings is not null
             && o.streamSettings.sockopt is not null
             && (o.streamSettings.sockopt.dialerProxy ?? string.Empty).StartsWith("chain-proxy-1-",
                 StringComparison.Ordinal));
-        hasDialerChain.Should().BeTrue();
+        await hasDialerChain.Should().BeTrue();
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_PolicyGroupWithProxyChain_ShouldBuildCombinedOutbounds()
+    [Test]
+    public async Task GenerateClientConfigContent_PolicyGroupWithProxyChain_ShouldBuildCombinedOutbounds()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.Xray);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -140,18 +133,18 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
+        await result.Success.Should().BeTrue();
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
 
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith("proxy-1-", StringComparison.Ordinal));
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith("chain-proxy-1-", StringComparison.Ordinal));
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith("proxy-2-", StringComparison.Ordinal));
-        cfg.routing.balancers.Should().NotBeNull();
-        cfg.routing.balancers!.Should().Contain(b => b.tag == Global.ProxyTag + Global.BalancerTagSuffix);
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith("proxy-1-", StringComparison.Ordinal));
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith("chain-proxy-1-", StringComparison.Ordinal));
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith("proxy-2-", StringComparison.Ordinal));
+        await cfg.routing.balancers.Should().NotBeNull();
+        await cfg.routing.balancers!.Should().Contain(b => b.tag == Global.ProxyTag + Global.BalancerTagSuffix);
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_ProxyChainWithPolicyGroup_ShouldBuildClonedChainBranches()
+    [Test]
+    public async Task GenerateClientConfigContent_ProxyChainWithPolicyGroup_ShouldBuildClonedChainBranches()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.Xray);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -173,27 +166,27 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
+        await result.Success.Should().BeTrue();
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
 
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith("chain-proxy-1-group-1-", StringComparison.Ordinal));
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith("chain-proxy-1-group-2-", StringComparison.Ordinal));
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith("chain-proxy-1-group-1-", StringComparison.Ordinal));
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith("chain-proxy-1-group-2-", StringComparison.Ordinal));
 
         var proxyCloneCount = cfg.outbounds.Count(o => o.tag.StartsWith("proxy-clone-", StringComparison.Ordinal));
-        proxyCloneCount.Should().Be(2);
+        await proxyCloneCount.Should().BeEqualTo(2);
 
         var allCloneDialersPointToGroupBranches = cfg.outbounds
             .Where(o => o.tag.StartsWith("proxy-clone-", StringComparison.Ordinal))
             .All(o => (o.streamSettings?.sockopt?.dialerProxy ?? string.Empty).StartsWith("chain-proxy-1-group-",
                 StringComparison.Ordinal));
-        allCloneDialersPointToGroupBranches.Should().BeTrue();
+        await allCloneDialersPointToGroupBranches.Should().BeTrue();
 
-        cfg.routing.balancers.Should().NotBeNull();
-        cfg.routing.balancers!.Should().Contain(b => b.tag == Global.ProxyTag + Global.BalancerTagSuffix);
+        await cfg.routing.balancers.Should().NotBeNull();
+        await cfg.routing.balancers!.Should().Contain(b => b.tag == Global.ProxyTag + Global.BalancerTagSuffix);
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_RoutingSplit_DirectAndBlock_ShouldApplyRules()
+    [Test]
+    public async Task GenerateClientConfigContent_RoutingSplit_DirectAndBlock_ShouldApplyRules()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.Xray);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -229,24 +222,24 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
+        await result.Success.Should().BeTrue();
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
 
         var hasDirectRule = cfg.routing.rules.Any(r =>
             r.domain != null
             && r.domain.Contains("full:direct.example.com")
             && r.outboundTag == Global.DirectTag);
-        hasDirectRule.Should().BeTrue();
+        await hasDirectRule.Should().BeTrue();
 
         var hasBlockRule = cfg.routing.rules.Any(r =>
             r.domain != null
             && r.domain.Contains("full:block.example.com")
             && r.outboundTag == Global.BlockTag);
-        hasBlockRule.Should().BeTrue();
+        await hasBlockRule.Should().BeTrue();
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_RoutingSplit_ByRemark_ShouldGenerateTargetOutbound()
+    [Test]
+    public async Task GenerateClientConfigContent_RoutingSplit_ByRemark_ShouldGenerateTargetOutbound()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.Xray);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -278,20 +271,20 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
+        await result.Success.Should().BeTrue();
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
         var expectedPrefix = $"{routeNode.IndexId}-{Global.ProxyTag}-{routeNode.Remarks}";
 
-        cfg.outbounds.Should().Contain(o => o.tag.StartsWith(expectedPrefix, StringComparison.Ordinal));
+        await cfg.outbounds.Should().Contain(o => o.tag.StartsWith(expectedPrefix, StringComparison.Ordinal));
         var hasRouteRule = cfg.routing.rules.Any(r =>
             r.domain != null
             && r.domain.Contains("full:route.example.com")
             && (r.outboundTag ?? string.Empty).StartsWith(expectedPrefix, StringComparison.Ordinal));
-        hasRouteRule.Should().BeTrue();
+        await hasRouteRule.Should().BeTrue();
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_DirectExpectedIPs_ShouldApplyExpectedIPsToDirectDnsServer()
+    [Test]
+    public async Task GenerateClientConfigContent_DirectExpectedIPs_ShouldApplyExpectedIPsToDirectDnsServer()
     {
         var config = CoreConfigTestFactory.CreateConfigWithDirectExpectedIPs(ECoreType.Xray, "192.168.0.0/16,geoip:cn");
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -320,7 +313,7 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
+        await result.Success.Should().BeTrue();
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
         var dns = JsonUtils.Deserialize<Dns4Ray>(JsonUtils.Serialize(cfg.dns))!;
 
@@ -335,11 +328,11 @@ public class CoreConfigV2rayServiceTests
             && s.domains?.Contains("geosite:cn") == true
             && s.expectedIPs?.Contains("192.168.0.0/16") == true
             && s.expectedIPs?.Contains("geoip:cn") == true);
-        hasExpectedServer.Should().BeTrue();
+        await hasExpectedServer.Should().BeTrue();
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_BootstrapDNS_ShouldApplyToDnsServerDomains()
+    [Test]
+    public async Task GenerateClientConfigContent_BootstrapDNS_ShouldApplyToDnsServerDomains()
     {
         var bootstrapDns = "8.8.8.8";
         var config = CoreConfigTestFactory.CreateConfigWithBootstrapDNS(ECoreType.Xray, bootstrapDns);
@@ -352,7 +345,7 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
+        await result.Success.Should().BeTrue();
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
         var dns = JsonUtils.Deserialize<Dns4Ray>(JsonUtils.Serialize(cfg.dns))!;
 
@@ -366,11 +359,11 @@ public class CoreConfigV2rayServiceTests
             s.address == bootstrapDns
             && s.domains?.Contains("full:dns-direct.example") == true
             && s.domains?.Contains("full:dns-remote.example") == true);
-        hasBootstrapServer.Should().BeTrue();
+        await hasBootstrapServer.Should().BeTrue();
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_DnsFallback_LastRuleDirect_ShouldUseDirectDnsServers()
+    [Test]
+    public async Task GenerateClientConfigContent_DnsFallback_LastRuleDirect_ShouldUseDirectDnsServers()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.Xray);
         config.SimpleDNSItem.DirectDNS = "1.1.1.1";
@@ -403,7 +396,7 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
+        await result.Success.Should().BeTrue();
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
         var dns = JsonUtils.Deserialize<Dns4Ray>(JsonUtils.Serialize(cfg.dns))!;
         var dnsServers = dns.servers
@@ -415,14 +408,14 @@ public class CoreConfigV2rayServiceTests
         var hasDirectFallback = dnsServers.Any(s =>
             (s.tag ?? string.Empty).StartsWith(Global.DirectDnsTag, StringComparison.Ordinal)
             && s.address == "1.1.1.1");
-        hasDirectFallback.Should().BeTrue();
+        await hasDirectFallback.Should().BeTrue();
 
         var hasRemoteFallback = dnsServers.Any(s => s.address == "9.9.9.9");
-        hasRemoteFallback.Should().BeFalse();
+        await hasRemoteFallback.Should().BeFalse();
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_DirectExpectedIPs_NonMatchingRegion_ShouldNotApplyExpectedIPs()
+    [Test]
+    public async Task GenerateClientConfigContent_DirectExpectedIPs_NonMatchingRegion_ShouldNotApplyExpectedIPs()
     {
         var config = CoreConfigTestFactory.CreateConfigWithDirectExpectedIPs(ECoreType.Xray, "192.168.0.0/16,geoip:cn");
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -451,7 +444,7 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
+        await result.Success.Should().BeTrue();
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
         var dns = JsonUtils.Deserialize<Dns4Ray>(JsonUtils.Serialize(cfg.dns))!;
         var dnsServers = dns.servers
@@ -463,14 +456,14 @@ public class CoreConfigV2rayServiceTests
         var hasExpectedIPs = dnsServers.Any(s =>
             s.expectedIPs?.Contains("192.168.0.0/16") == true
             || s.expectedIPs?.Contains("geoip:cn") == true);
-        hasExpectedIPs.Should().BeFalse();
+        await hasExpectedIPs.Should().BeFalse();
     }
 
-    [Theory]
-    [InlineData("geosite:cn")]
-    [InlineData("geosite:geolocation-cn")]
-    [InlineData("geosite:tld-cn")]
-    public void GenerateClientConfigContent_DirectExpectedIPs_RegionVariant_ShouldApplyExpectedIPs(string domainTag)
+    [Test]
+    [Arguments("geosite:cn")]
+    [Arguments("geosite:geolocation-cn")]
+    [Arguments("geosite:tld-cn")]
+    public async Task GenerateClientConfigContent_DirectExpectedIPs_RegionVariant_ShouldApplyExpectedIPs(string domainTag)
     {
         var config = CoreConfigTestFactory.CreateConfigWithDirectExpectedIPs(ECoreType.Xray, "192.168.0.0/16,geoip:cn");
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -496,7 +489,7 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
+        await result.Success.Should().BeTrue();
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
         var dns = JsonUtils.Deserialize<Dns4Ray>(JsonUtils.Serialize(cfg.dns))!;
         var dnsServers = dns.servers
@@ -510,11 +503,11 @@ public class CoreConfigV2rayServiceTests
             && s.domains?.Contains(domainTag) == true
             && s.expectedIPs?.Contains("192.168.0.0/16") == true
             && s.expectedIPs?.Contains("geoip:cn") == true);
-        hasExpectedServer.Should().BeTrue();
+        await hasExpectedServer.Should().BeTrue();
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_Hosts_ShouldPopulateDnsHosts()
+    [Test]
+    public async Task GenerateClientConfigContent_Hosts_ShouldPopulateDnsHosts()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.Xray);
         config.SimpleDNSItem.Hosts = "resolver.example 1.1.1.1";
@@ -525,17 +518,17 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
+        await result.Success.Should().BeTrue();
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
         var dns = JsonUtils.Deserialize<Dns4Ray>(JsonUtils.Serialize(cfg.dns))!;
 
-        dns.hosts.Should().NotBeNull();
-        dns.hosts!.Should().ContainKey("resolver.example");
-        JsonUtils.Serialize(dns.hosts!["resolver.example"]).Should().Contain("1.1.1.1");
+        await dns.hosts.Should().NotBeNull();
+        await dns.hosts!.Should().ContainKey("resolver.example");
+        await JsonUtils.Serialize(dns.hosts!["resolver.example"]).Should().Contain("1.1.1.1");
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_RawDnsEnabled_ShouldUseCustomDnsConfig()
+    [Test]
+    public async Task GenerateClientConfigContent_RawDnsEnabled_ShouldUseCustomDnsConfig()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.Xray);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -556,24 +549,24 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
+        await result.Success.Should().BeTrue();
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
         var dns = JsonUtils.Deserialize<Dns4Ray>(JsonUtils.Serialize(cfg.dns))!;
 
-        JsonUtils.Serialize(dns.servers).Should().Contain("8.8.8.8");
-        dns.hosts.Should().NotBeNull();
-        dns.hosts!.Should().ContainKey("raw.example");
-        JsonUtils.Serialize(dns.hosts!["raw.example"]).Should().Contain("1.1.1.1");
+        await JsonUtils.Serialize(dns.servers).Should().Contain("8.8.8.8");
+        await dns.hosts.Should().NotBeNull();
+        await dns.hosts!.Should().ContainKey("raw.example");
+        await JsonUtils.Serialize(dns.hosts!["raw.example"]).Should().Contain("1.1.1.1");
 
         var directOutbound = cfg.outbounds.FirstOrDefault(o => o.tag == Global.DirectTag && o.protocol == "freedom");
-        directOutbound.Should().NotBeNull();
-        directOutbound!.streamSettings.sockopt!.domainStrategy.Should().Be("UseIPv4");
+        await directOutbound.Should().NotBeNull();
+        await directOutbound!.streamSettings.sockopt!.domainStrategy.Should().BeEqualTo("UseIPv4");
     }
 
-    [Theory]
-    [InlineData(false)]
-    [InlineData(true)]
-    public void GenerateClientConfigContent_Tun_ShouldRouteIPv6IntoTunnel(bool enableIPv6Address)
+    [Test]
+    [Arguments(false)]
+    [Arguments(true)]
+    public async Task GenerateClientConfigContent_Tun_ShouldRouteIPv6IntoTunnel(bool enableIPv6Address)
     {
         var config = CoreConfigTestFactory.CreateConfigWithTun(ECoreType.Xray, enableIPv6Address);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -583,20 +576,67 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
+        await result.Success.Should().BeTrue();
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
         var tunInbound = cfg.inbounds.FirstOrDefault(i => i.protocol == "tun");
 
-        tunInbound.Should().NotBeNull();
-        tunInbound!.settings.autoSystemRoutingTable.Should().Contain("0.0.0.0/0");
-        tunInbound.settings.autoSystemRoutingTable.Should().Contain("::/0");
+        await tunInbound.Should().NotBeNull();
+        await tunInbound!.settings.autoSystemRoutingTable.Should().Contain("0.0.0.0/0");
+        await tunInbound.settings.autoSystemRoutingTable.Should().Contain("::/0");
 
         // EnableIPv6Address governs the interface address only, never the routing table.
-        tunInbound.settings.gateway.Should().HaveCount(enableIPv6Address ? 2 : 1);
+        await tunInbound.settings.gateway.Should().HaveCount(enableIPv6Address ? 2 : 1);
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_TunRouteExcludeAddress_ShouldIncludeIPv6Ranges()
+    [Test]
+    [Arguments(true)]
+    [Arguments(false)]
+    public async Task GenerateClientConfigContent_Tun_ShouldSkipIPv6RouteWithoutGlobalIPv6(bool enableIPv6Address)
+    {
+        // A host without a global IPv6 address has no IPv6 traffic that could bypass the tunnel,
+        // while ::/0 would pull IPv6 attempts into a tunnel they cannot leave.
+        var config = CoreConfigTestFactory.CreateConfigWithTun(ECoreType.Xray, enableIPv6Address);
+        CoreConfigTestFactory.BindAppManagerConfig(config);
+
+        var node = CoreConfigTestFactory.CreateVmessNode(ECoreType.Xray, "n-main", "main");
+        var context = CoreConfigTestFactory.CreateContext(config, node, ECoreType.Xray, hasGlobalIPv6Address: false);
+
+        var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
+
+        await result.Success.Should().BeTrue();
+        var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
+        var tunInbound = cfg.inbounds.FirstOrDefault(i => i.protocol == "tun");
+
+        await tunInbound.Should().NotBeNull();
+        await tunInbound!.settings.autoSystemRoutingTable.Should().Contain("0.0.0.0/0");
+        var ipv6Routes = tunInbound.settings.autoSystemRoutingTable!.Where(x => x.Contains(':')).ToList();
+        await ipv6Routes.Should().BeEmpty();
+    }
+
+    [Test]
+    public async Task GenerateClientConfigContent_TunRouteExcludeAddress_ShouldSkipIPv6RangesWithoutGlobalIPv6()
+    {
+        var config = CoreConfigTestFactory.CreateConfigWithTunRouteExcludeAddress(ECoreType.Xray);
+        config.TunModeItem.EnableIPv6Address = false;
+        CoreConfigTestFactory.BindAppManagerConfig(config);
+
+        var node = CoreConfigTestFactory.CreateVmessNode(ECoreType.Xray, "n-main", "main");
+        var context = CoreConfigTestFactory.CreateContext(config, node, ECoreType.Xray, hasGlobalIPv6Address: false);
+
+        var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
+
+        await result.Success.Should().BeTrue();
+        var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
+        var tunInbound = cfg.inbounds.FirstOrDefault(i => i.protocol == "tun");
+
+        await tunInbound.Should().NotBeNull();
+        await tunInbound!.settings.autoSystemRoutingTable.Should().NotBeEmpty();
+        var ipv6Routes = tunInbound.settings.autoSystemRoutingTable!.Where(x => x.Contains(':')).ToList();
+        await ipv6Routes.Should().BeEmpty();
+    }
+
+    [Test]
+    public async Task GenerateClientConfigContent_TunRouteExcludeAddress_ShouldIncludeIPv6Ranges()
     {
         var config = CoreConfigTestFactory.CreateConfigWithTunRouteExcludeAddress(ECoreType.Xray);
         config.TunModeItem.EnableIPv6Address = false;
@@ -607,16 +647,16 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
+        await result.Success.Should().BeTrue();
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
         var tunInbound = cfg.inbounds.FirstOrDefault(i => i.protocol == "tun");
 
-        tunInbound.Should().NotBeNull();
-        tunInbound!.settings.autoSystemRoutingTable.Should().Contain(x => x.Contains(':'));
+        await tunInbound.Should().NotBeNull();
+        await tunInbound!.settings.autoSystemRoutingTable.Should().Contain(x => x.Contains(':'));
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_TunRouteExcludeAddress()
+    [Test]
+    public async Task GenerateClientConfigContent_TunRouteExcludeAddress()
     {
         var config = CoreConfigTestFactory.CreateConfigWithTunRouteExcludeAddress(ECoreType.Xray);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -626,20 +666,20 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue();
+        await result.Success.Should().BeTrue();
 
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
         var tunInbound = cfg.inbounds.FirstOrDefault(i => i.protocol == "tun");
 
-        tunInbound.Should().NotBeNull();
+        await tunInbound.Should().NotBeNull();
 
-        tunInbound!.settings.autoSystemRoutingTable.Should().NotContain("0.0.0.0/0");
-        tunInbound!.settings.autoSystemRoutingTable.Should().Contain("10.0.0.0/32");
-        tunInbound!.settings.autoSystemRoutingTable.Should().Contain("10.0.0.2/31");
+        await tunInbound!.settings.autoSystemRoutingTable.Should().NotContain("0.0.0.0/0");
+        await tunInbound!.settings.autoSystemRoutingTable.Should().Contain("10.0.0.0/32");
+        await tunInbound!.settings.autoSystemRoutingTable.Should().Contain("10.0.0.2/31");
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_CustomOutbound_ShouldReplaceWithUserCustomOutboundJson()
+    [Test]
+    public async Task GenerateClientConfigContent_CustomOutbound_ShouldReplaceWithUserCustomOutboundJson()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.Xray);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -666,14 +706,14 @@ public class CoreConfigV2rayServiceTests
 
         var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
 
-        result.Success.Should().BeTrue($"ret msg: {result.Msg}");
-        result.Data.Should().NotBeNull();
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
+        await result.Data.Should().NotBeNull();
 
         var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString());
-        cfg.Should().NotBeNull();
+        await cfg.Should().NotBeNull();
         var proxyOutbound = cfg!.outbounds.FirstOrDefault(o => o.tag == Global.ProxyTag);
-        proxyOutbound.Should().NotBeNull();
-        proxyOutbound!.protocol.Should().Be("shadowsocks");
-        proxyOutbound.settings.servers.Should().NotBeNull();
+        await proxyOutbound.Should().NotBeNull();
+        await proxyOutbound!.protocol.Should().BeEqualTo("shadowsocks");
+        await proxyOutbound.settings.servers.Should().NotBeNull();
     }
 }

v2rayN/ServiceLib.Tests/Fmt/FmtHandlerTests.cs

@@ -1,103 +1,354 @@
-using AwesomeAssertions;
-using ServiceLib.Enums;
-using ServiceLib.Handler.Fmt;
-using ServiceLib.Models;
-using Xunit;
-
 namespace ServiceLib.Tests.Fmt;
 
 public class FmtHandlerTests
 {
-    [Fact]
-    public void GetShareUriAndResolveConfig_Vmess_ShouldRoundTripBasicFields()
+    /// <summary>
+    /// One profile factory per protocol that <see cref="FmtHandler.GetShareUri" /> can export.
+    /// The suite below asserts that this map and <see cref="Global.ProtocolShares" /> agree, so a
+    /// newly exportable protocol cannot be added without a round-trip case.
+    /// </summary>
+    private static readonly Dictionary<EConfigType, Func<ProfileItem>> ShareProfileFactories = new()
+    {
+        [EConfigType.VMess] = CreateVmessProfile,
+        [EConfigType.Shadowsocks] = CreateShadowsocksProfile,
+        [EConfigType.SOCKS] = CreateSocksProfile,
+        [EConfigType.VLESS] = CreateVlessProfile,
+        [EConfigType.Trojan] = CreateTrojanProfile,
+        [EConfigType.Hysteria2] = CreateHysteria2Profile,
+        [EConfigType.TUIC] = CreateTuicProfile,
+        [EConfigType.WireGuard] = CreateWireguardProfile,
+        [EConfigType.Anytls] = CreateAnytlsProfile,
+        [EConfigType.Naive] = () => CreateNaiveProfile(false),
+    };
+
+    [Test]
+    public async Task ShareUriSuite_ShouldCoverAndRoundTripEveryExportableProtocol()
+    {
+        var uncovered = string.Join(", ", Global.ProtocolShares.Keys.Except(ShareProfileFactories.Keys));
+        var unexpected = string.Join(", ", ShareProfileFactories.Keys.Except(Global.ProtocolShares.Keys));
+
+        await uncovered.Should().BeEqualTo(string.Empty);
+        await unexpected.Should().BeEqualTo(string.Empty);
+
+        foreach (var (configType, factory) in ShareProfileFactories)
+        {
+            var source = factory();
+
+            var resolved = await ExportThenImport(source);
+
+            await resolved.ConfigType.Should().BeEqualTo(configType);
+            await resolved.Address.Should().BeEqualTo(source.Address);
+            await resolved.Port.Should().BeEqualTo(source.Port);
+        }
+    }
+
+    [Test]
+    public async Task GetShareUriAndResolveConfig_Vmess_ShouldRoundTripBasicFields()
     {
         var source = CreateVmessProfile();
 
-        var resolved = ExportThenImport(source);
+        var resolved = await ExportThenImport(source);
 
-        resolved.ConfigType.Should().Be(EConfigType.VMess);
-        resolved.Remarks.Should().Be(source.Remarks);
-        resolved.Address.Should().Be(source.Address);
-        resolved.Port.Should().Be(source.Port);
-        resolved.Password.Should().Be(source.Password);
-        resolved.GetProtocolExtra().AlterId.Should().Be(source.GetProtocolExtra().AlterId);
+        await resolved.ConfigType.Should().BeEqualTo(EConfigType.VMess);
+        await resolved.Remarks.Should().BeEqualTo(source.Remarks);
+        await resolved.Address.Should().BeEqualTo(source.Address);
+        await resolved.Port.Should().BeEqualTo(source.Port);
+        await resolved.Password.Should().BeEqualTo(source.Password);
+        await resolved.GetProtocolExtra().AlterId.Should().BeEqualTo(source.GetProtocolExtra().AlterId);
     }
 
-    [Fact]
-    public void GetShareUriAndResolveConfig_Vless_ShouldRoundTripBasicFields()
+    [Test]
+    public async Task GetShareUriAndResolveConfig_Vless_ShouldRoundTripBasicFields()
     {
         var source = CreateVlessProfile();
 
-        var resolved = ExportThenImport(source);
+        var resolved = await ExportThenImport(source);
 
-        resolved.ConfigType.Should().Be(EConfigType.VLESS);
-        resolved.Remarks.Should().Be(source.Remarks);
-        resolved.Address.Should().Be(source.Address);
-        resolved.Port.Should().Be(source.Port);
-        resolved.Password.Should().Be(source.Password);
-        resolved.GetProtocolExtra().VlessEncryption.Should().Be(Global.None);
+        await resolved.ConfigType.Should().BeEqualTo(EConfigType.VLESS);
+        await resolved.Remarks.Should().BeEqualTo(source.Remarks);
+        await resolved.Address.Should().BeEqualTo(source.Address);
+        await resolved.Port.Should().BeEqualTo(source.Port);
+        await resolved.Password.Should().BeEqualTo(source.Password);
+        await resolved.GetProtocolExtra().VlessEncryption.Should().BeEqualTo(Global.None);
     }
 
-    [Fact]
-    public void GetShareUriAndResolveConfig_Shadowsocks_ShouldRoundTripBasicFields()
+    [Test]
+    public async Task GetShareUriAndResolveConfig_Shadowsocks_ShouldRoundTripBasicFields()
     {
         var source = CreateShadowsocksProfile();
 
-        var resolved = ExportThenImport(source);
+        var resolved = await ExportThenImport(source);
 
-        resolved.ConfigType.Should().Be(EConfigType.Shadowsocks);
-        resolved.Remarks.Should().Be(source.Remarks);
-        resolved.Address.Should().Be(source.Address);
-        resolved.Port.Should().Be(source.Port);
-        resolved.Password.Should().Be(source.Password);
-        resolved.GetProtocolExtra().SsMethod.Should().Be(source.GetProtocolExtra().SsMethod);
+        await resolved.ConfigType.Should().BeEqualTo(EConfigType.Shadowsocks);
+        await resolved.Remarks.Should().BeEqualTo(source.Remarks);
+        await resolved.Address.Should().BeEqualTo(source.Address);
+        await resolved.Port.Should().BeEqualTo(source.Port);
+        await resolved.Password.Should().BeEqualTo(source.Password);
+        await resolved.GetProtocolExtra().SsMethod.Should().BeEqualTo(source.GetProtocolExtra().SsMethod);
     }
 
-    [Fact]
-    public void GetShareUriAndResolveConfig_Socks_ShouldRoundTripBasicFields()
+    [Test]
+    public async Task GetShareUriAndResolveConfig_Socks_ShouldRoundTripBasicFields()
     {
         var source = CreateSocksProfile();
 
-        var resolved = ExportThenImport(source);
+        var resolved = await ExportThenImport(source);
 
-        resolved.ConfigType.Should().Be(EConfigType.SOCKS);
-        resolved.Remarks.Should().Be(source.Remarks);
-        resolved.Address.Should().Be(source.Address);
-        resolved.Port.Should().Be(source.Port);
-        resolved.Username.Should().Be(source.Username);
-        resolved.Password.Should().Be(source.Password);
+        await resolved.ConfigType.Should().BeEqualTo(EConfigType.SOCKS);
+        await resolved.Remarks.Should().BeEqualTo(source.Remarks);
+        await resolved.Address.Should().BeEqualTo(source.Address);
+        await resolved.Port.Should().BeEqualTo(source.Port);
+        await resolved.Username.Should().BeEqualTo(source.Username);
+        await resolved.Password.Should().BeEqualTo(source.Password);
     }
 
-    [Fact]
-    public void ResolveConfig_UnsupportedProtocol_ShouldReturnNull()
+    [Test]
+    public async Task GetShareUriAndResolveConfig_Trojan_ShouldRoundTripBasicFields()
+    {
+        var source = CreateTrojanProfile();
+
+        var resolved = await ExportThenImport(source);
+
+        await AssertCommonShareFields(source, resolved);
+        await AssertRawTransportFields(source, resolved);
+        await resolved.Password.Should().BeEqualTo(source.Password);
+        await resolved.Sni.Should().BeEqualTo(source.Sni);
+        await resolved.GetProtocolExtra().Flow.Should().BeEqualTo(source.GetProtocolExtra().Flow);
+        await resolved.GetAllowInsecure().Should().BeTrue();
+
+        // Trojan is the one exporter that writes both spellings of the flag.
+        await AssertExportContains(source, "allowInsecure=1", "insecure=1");
+    }
+
+    [Test]
+    public async Task GetShareUriAndResolveConfig_Tuic_ShouldRoundTripUserInfoAndCongestionControl()
+    {
+        var source = CreateTuicProfile();
+
+        var resolved = await ExportThenImport(source);
+
+        await AssertCommonShareFields(source, resolved);
+        await resolved.Username.Should().BeEqualTo(source.Username);
+        await resolved.Password.Should().BeEqualTo(source.Password);
+        await resolved.Sni.Should().BeEqualTo(source.Sni);
+        await resolved.Alpn.Should().BeEqualTo(source.Alpn);
+        await resolved.GetProtocolExtra().CongestionControl.Should()
+            .BeEqualTo(source.GetProtocolExtra().CongestionControl);
+        await resolved.GetAllowInsecure().Should().BeTrue();
+
+        await AssertExportContains(source, "allow_insecure=1");
+    }
+
+    [Test]
+    public async Task GetShareUriAndResolveConfig_Anytls_ShouldRoundTripBasicFields()
+    {
+        var source = CreateAnytlsProfile();
+
+        var resolved = await ExportThenImport(source);
+
+        await AssertCommonShareFields(source, resolved);
+        await AssertRawTransportFields(source, resolved);
+        await resolved.Password.Should().BeEqualTo(source.Password);
+        await resolved.Sni.Should().BeEqualTo(source.Sni);
+        await resolved.Alpn.Should().BeEqualTo(source.Alpn);
+        await resolved.GetAllowInsecure().Should().BeTrue();
+
+        await AssertExportContains(source, "insecure=1");
+    }
+
+    [Test]
+    public async Task GetShareUriAndResolveConfig_Hysteria2_ShouldRoundTripObfsAndNormalizePortRange()
+    {
+        var source = CreateHysteria2Profile();
+
+        var resolved = await ExportThenImport(source);
+        var sourceExtra = source.GetProtocolExtra();
+        var resolvedExtra = resolved.GetProtocolExtra();
+
+        await AssertCommonShareFields(source, resolved);
+        await resolved.Password.Should().BeEqualTo(source.Password);
+        await resolved.Sni.Should().BeEqualTo(source.Sni);
+        await resolved.Alpn.Should().BeEqualTo(source.Alpn);
+        await resolved.EchConfigList.Should().BeEqualTo(source.EchConfigList);
+        await resolved.GetAllowInsecure().Should().BeTrue();
+        await resolvedExtra.SalamanderPass.Should().BeEqualTo(sourceExtra.SalamanderPass);
+
+        // Hysteria2Fmt stores a port range internally as "5000:6000" and emits the URI form.
+        await resolvedExtra.Ports.Should().BeEqualTo("5000-6000");
+
+        await AssertExportContains(source, "insecure=1", "obfs=salamander", "mport=5000-6000");
+    }
+
+    [Test]
+    public async Task GetShareUriAndResolveConfig_Wireguard_ShouldRoundTripKeysAndInterface()
+    {
+        var source = CreateWireguardProfile();
+
+        var resolved = await ExportThenImport(source);
+        var extra = resolved.GetProtocolExtra();
+        var sourceExtra = source.GetProtocolExtra();
+
+        await AssertCommonShareFields(source, resolved);
+        await resolved.Password.Should().BeEqualTo(source.Password);
+        await extra.WgPublicKey.Should().BeEqualTo(sourceExtra.WgPublicKey);
+        await extra.WgPresharedKey.Should().BeEqualTo(sourceExtra.WgPresharedKey);
+        await extra.WgReserved.Should().BeEqualTo(sourceExtra.WgReserved);
+        await extra.WgInterfaceAddress.Should().BeEqualTo(sourceExtra.WgInterfaceAddress);
+        await extra.WgMtu.Should().BeEqualTo(sourceExtra.WgMtu);
+    }
+
+    [Test]
+    public async Task GetShareUri_Wireguard_ShouldEncodeKeysAndBracketIpv6()
+    {
+        var source = CreateWireguardProfile();
+
+        // Base64 keys carry '/', '+' and '=', and the address is an IPv6 literal: both have to
+        // survive the wire form, which a round trip through the same encoder would not prove.
+        await AssertExportContains(
+            source,
+            Uri.EscapeDataString(source.Password),
+            Uri.EscapeDataString(source.GetProtocolExtra().WgPublicKey ?? string.Empty),
+            "@[2001:db8::40]:51820");
+    }
+
+    [Test]
+    public async Task GetShareUriAndResolveConfig_Naive_ShouldRoundTripCredentialsOverHttps()
+    {
+        var source = CreateNaiveProfile(false);
+
+        var resolved = await ExportThenImport(source, Global.NaiveHttpsProtocolShare);
+
+        await AssertCommonShareFields(source, resolved);
+        await AssertRawTransportFields(source, resolved);
+        await resolved.Username.Should().BeEqualTo(source.Username);
+        await resolved.Password.Should().BeEqualTo(source.Password);
+        await resolved.GetProtocolExtra().InsecureConcurrency.Should()
+            .BeEqualTo(source.GetProtocolExtra().InsecureConcurrency);
+
+        // NaiveFmt only ever sets this flag on the quic branch, so the https branch leaves it
+        // unset rather than false - assert "is not quic" instead of an explicit false.
+        await (resolved.GetProtocolExtra().NaiveQuic == true).Should().BeFalse();
+    }
+
+    [Test]
+    public async Task GetShareUriAndResolveConfig_NaiveQuic_ShouldRoundTripQuicScheme()
+    {
+        var source = CreateNaiveProfile(true);
+
+        var resolved = await ExportThenImport(source, Global.NaiveQuicProtocolShare);
+
+        await AssertCommonShareFields(source, resolved);
+        await AssertRawTransportFields(source, resolved);
+        await resolved.Username.Should().BeEqualTo(source.Username);
+        await resolved.Password.Should().BeEqualTo(source.Password);
+        await resolved.GetProtocolExtra().InsecureConcurrency.Should()
+            .BeEqualTo(source.GetProtocolExtra().InsecureConcurrency);
+        await resolved.GetProtocolExtra().NaiveQuic.Should().BeTrue();
+    }
+
+    [Test]
+    [Arguments("p:a@ss#% +/=")]
+    [Arguments("пароль 東京")]
+    public async Task GetShareUriAndResolveConfig_Trojan_ShouldRoundTripEncodedCredentials(string password)
+    {
+        var source = CreateTrojanProfile();
+        source.Password = password;
+        source.Remarks = "Trojan — тест 東京 #1";
+
+        var resolved = await ExportThenImport(source);
+
+        await resolved.Password.Should().BeEqualTo(password);
+        await resolved.Remarks.Should().BeEqualTo(source.Remarks);
+    }
+
+    [Test]
+    public async Task ResolveConfig_UnsupportedProtocol_ShouldReturnNull()
     {
         var resolved = FmtHandler.ResolveConfig("not-a-share-uri", out var msg);
 
-        resolved.Should().BeNull();
-        msg.Should().NotBeNullOrWhiteSpace();
+        await resolved.Should().BeNull();
+        await msg.Should().NotBeNull();
+        await msg.Should().NotBeEmpty();
     }
 
-    [Fact]
-    public void GetShareUri_UnsupportedConfigType_ShouldReturnNull()
+    [Test]
+    public async Task GetShareUri_UnsupportedConfigType_ShouldReturnNull()
     {
         var item = new ProfileItem { ConfigType = EConfigType.PolicyGroup, Remarks = "group", };
 
         var uri = FmtHandler.GetShareUri(item);
 
-        uri.Should().BeNull();
+        await uri.Should().BeNull();
     }
 
-    private static ProfileItem ExportThenImport(ProfileItem source)
+    private static async Task AssertCommonShareFields(ProfileItem source, ProfileItem resolved)
+    {
+        await resolved.ConfigType.Should().BeEqualTo(source.ConfigType);
+        await resolved.Remarks.Should().BeEqualTo(source.Remarks);
+        await resolved.Address.Should().BeEqualTo(source.Address);
+        await resolved.Port.Should().BeEqualTo(source.Port);
+    }
+
+    /// <summary>
+    /// Only for protocols whose exporter goes through the shared transport query
+    /// (<c>security</c>, <c>type</c>, <c>headerType</c>). TUIC, Hysteria2 and WireGuard do not.
+    /// </summary>
+    private static async Task AssertRawTransportFields(ProfileItem source, ProfileItem resolved)
+    {
+        await resolved.Network.Should().BeEqualTo(source.Network);
+        await resolved.StreamSecurity.Should().BeEqualTo(source.StreamSecurity);
+        await resolved.GetTransportExtra().RawHeaderType.Should()
+            .BeEqualTo(source.GetTransportExtra().RawHeaderType);
+    }
+
+    /// <summary>
+    /// Asserts on the wire form itself. A round trip cannot catch an exporter and an importer that
+    /// agree on the wrong spelling of a parameter, and the insecure flag is spelled differently by
+    /// every protocol.
+    /// </summary>
+    private static async Task AssertExportContains(ProfileItem source, params string[] expectedFragments)
     {
         var uri = FmtHandler.GetShareUri(source);
 
-        uri.Should().NotBeNullOrWhiteSpace();
-        uri!.StartsWith(Global.ProtocolShares[source.ConfigType], StringComparison.OrdinalIgnoreCase).Should()
-            .BeTrue();
+        await uri.Should().NotBeNull();
+
+        foreach (var fragment in expectedFragments)
+        {
+            await uri!.Contains(fragment, StringComparison.Ordinal).Should()
+                .BeTrue().Because($"uri: {uri}, expected fragment: {fragment}");
+        }
+    }
+
+    private static string ExpectedShareScheme(ProfileItem item)
+    {
+        if (item.ConfigType != EConfigType.Naive)
+        {
+            return Global.ProtocolShares[item.ConfigType];
+        }
+
+        // NaiveFmt never emits the "naive://" prefix that Global.ProtocolShares records for the
+        // type; that entry is only read when importing.
+        return item.GetProtocolExtra().NaiveQuic == true
+            ? Global.NaiveQuicProtocolShare
+            : Global.NaiveHttpsProtocolShare;
+    }
+
+    private static async Task<ProfileItem> ExportThenImport(ProfileItem source)
+    {
+        return await ExportThenImport(source, ExpectedShareScheme(source));
+    }
+
+    private static async Task<ProfileItem> ExportThenImport(ProfileItem source, string expectedPrefix)
+    {
+        var uri = FmtHandler.GetShareUri(source);
+
+        await uri.Should().NotBeNull();
+        await uri.Should().NotBeEmpty();
+        await uri!.StartsWith(expectedPrefix, StringComparison.OrdinalIgnoreCase).Should().BeTrue();
 
         var resolved = FmtHandler.ResolveConfig(uri, out var msg);
 
-        resolved.Should().NotBeNull($"uri: {uri}, msg: {msg}");
+        await resolved.Should().NotBeNull().Because($"uri: {uri}, msg: {msg}");
         return resolved!;
     }
 
@@ -170,4 +421,142 @@ public class FmtHandlerTests
             Password = "pass",
         };
     }
+
+    private static ProfileItem CreateTrojanProfile()
+    {
+        var item = new ProfileItem
+        {
+            ConfigType = EConfigType.Trojan,
+            Remarks = "trojan demo",
+            Address = "trojan.example",
+            Port = 443,
+            Password = "trojan-pass",
+            Network = nameof(ETransport.raw),
+            StreamSecurity = Global.StreamSecurity,
+            Sni = "sni.trojan.example",
+            AllowInsecure = Global.StringTrue,
+        };
+
+        item.SetProtocolExtra(new ProtocolExtraItem { Flow = Global.Flows[1], });
+        item.SetTransportExtra(new TransportExtraItem { RawHeaderType = Global.None, });
+
+        return item;
+    }
+
+    private static ProfileItem CreateTuicProfile()
+    {
+        var item = new ProfileItem
+        {
+            ConfigType = EConfigType.TUIC,
+            Remarks = "tuic demo",
+            Address = "tuic.example",
+            Port = 8443,
+            // A colon separates the two halves of the TUIC user info, so it cannot appear in the
+            // uuid; a fixed value also keeps a failure reproducible.
+            Username = "01234567-89ab-cdef-0123-456789abcdef",
+            Password = "tuic-pass",
+            Sni = "sni.tuic.example",
+            Alpn = "h3",
+            AllowInsecure = Global.StringTrue,
+        };
+
+        item.SetProtocolExtra(new ProtocolExtraItem { CongestionControl = "bbr", });
+
+        return item;
+    }
+
+    private static ProfileItem CreateAnytlsProfile()
+    {
+        var item = new ProfileItem
+        {
+            ConfigType = EConfigType.Anytls,
+            Remarks = "anytls demo",
+            Address = "anytls.example",
+            Port = 8443,
+            Password = "anytls-pass",
+            Network = nameof(ETransport.raw),
+            StreamSecurity = Global.StreamSecurity,
+            Sni = "sni.anytls.example",
+            Alpn = "h2,http/1.1",
+            AllowInsecure = Global.StringTrue,
+        };
+
+        item.SetTransportExtra(new TransportExtraItem { RawHeaderType = Global.None, });
+
+        return item;
+    }
+
+    private static ProfileItem CreateHysteria2Profile()
+    {
+        // CertSha is deliberately left unset: the importer turns AllowInsecure on by itself when a
+        // pinSHA256 is present, which would mask an exporter that stopped emitting insecure=1.
+        var item = new ProfileItem
+        {
+            ConfigType = EConfigType.Hysteria2,
+            Remarks = "hysteria2 demo",
+            Address = "hy2.example",
+            Port = 8443,
+            Password = "demo-user:demo-pass",
+            Sni = "sni.hy2.example",
+            Alpn = "h3",
+            EchConfigList = "AAj+DQAEAAAAAA==",
+            AllowInsecure = Global.StringTrue,
+        };
+
+        item.SetProtocolExtra(new ProtocolExtraItem
+        {
+            SalamanderPass = "salamander-pass",
+            Ports = "5000:6000",
+        });
+
+        return item;
+    }
+
+    private static string CreateWireguardKey(byte value)
+    {
+        return Convert.ToBase64String(Enumerable.Repeat(value, 32).ToArray());
+    }
+
+    private static ProfileItem CreateWireguardProfile()
+    {
+        var item = new ProfileItem
+        {
+            ConfigType = EConfigType.WireGuard,
+            Remarks = "WireGuard — тест 東京 #1",
+            Address = "2001:db8::40",
+            Port = 51820,
+            Password = CreateWireguardKey(0xFE),
+        };
+
+        item.SetProtocolExtra(new ProtocolExtraItem
+        {
+            WgPublicKey = CreateWireguardKey(0xFD),
+            WgPresharedKey = CreateWireguardKey(0xFC),
+            WgReserved = "1,2,255",
+            WgInterfaceAddress = "10.0.0.2/32,fd00::2/128",
+            WgMtu = 1420,
+        });
+
+        return item;
+    }
+
+    private static ProfileItem CreateNaiveProfile(bool quic)
+    {
+        var item = new ProfileItem
+        {
+            ConfigType = EConfigType.Naive,
+            Remarks = quic ? "naive quic demo" : "naive https demo",
+            Address = "naive.example",
+            Port = 443,
+            Username = "naive-user",
+            Password = "päss:word@/?#&=+ 東京",
+            Network = nameof(ETransport.raw),
+            StreamSecurity = Global.None,
+        };
+
+        item.SetProtocolExtra(new ProtocolExtraItem { NaiveQuic = quic, InsecureConcurrency = 4, });
+        item.SetTransportExtra(new TransportExtraItem { RawHeaderType = Global.None, });
+
+        return item;
+    }
 }

v2rayN/ServiceLib.Tests/Fmt/HyRealmTests.cs

@@ -1,32 +1,27 @@
-using AwesomeAssertions;
-using ServiceLib.Handler.Fmt;
-using ServiceLib.Models.Dto;
-using Xunit;
-
 namespace ServiceLib.Tests.Fmt;
 
 public class HyRealmTests
 {
-    [Fact]
-    public void TryParse_ShouldParseValidRealm()
+    [Test]
+    public async Task TryParse_ShouldParseValidRealm()
     {
         var str = "realm://public@realm.hy2.io/57f9be7c-2810-4f5b-8cb9-260bc84d6c90?stun=example.stun:3478&stun=example2.stun:3478";
         var result = HyRealm.TryParse(str, out var realm);
-        result.Should().BeTrue();
-        realm.Should().NotBeNull();
+        await result.Should().BeTrue();
+        await realm.Should().NotBeNull();
 
-        realm.IsHttp.Should().BeFalse();
-        realm.Token.Should().Be("public");
-        realm.RendezvousHost.Should().Be("realm.hy2.io");
-        realm.RendezvousPort.Should().Be(443);
-        realm.RealmName.Should().Be("57f9be7c-2810-4f5b-8cb9-260bc84d6c90");
-        realm.StunList.Should().HaveCount(2);
-        realm.StunList.Should().Contain("example.stun:3478");
-        realm.StunList.Should().Contain("example2.stun:3478");
+        await realm.IsHttp.Should().BeFalse();
+        await realm.Token.Should().BeEqualTo("public");
+        await realm.RendezvousHost.Should().BeEqualTo("realm.hy2.io");
+        await realm.RendezvousPort.Should().BeEqualTo(443);
+        await realm.RealmName.Should().BeEqualTo("57f9be7c-2810-4f5b-8cb9-260bc84d6c90");
+        await realm.StunList.Should().HaveCount(2);
+        await realm.StunList.Should().Contain("example.stun:3478");
+        await realm.StunList.Should().Contain("example2.stun:3478");
     }
 
-    [Fact]
-    public void ToUri_ShouldGenerateValidUri()
+    [Test]
+    public async Task ToUri_ShouldGenerateValidUri()
     {
         var realm = new HyRealm(
             IsHttp: false,
@@ -37,32 +32,32 @@ public class HyRealmTests
             StunList: ["example.stun:3478", "example2.stun:3478"]
         );
         var uri = realm.ToUri();
-        uri.Should().Contain("realm://public@realm.hy2.io");
-        uri.Should().Contain("/57f9be7c-2810-4f5b-8cb9-260bc84d6c90");
-        uri.Should().Contain("stun=example.stun:3478");
-        uri.Should().Contain("stun=example2.stun:3478");
+        await uri.Should().Contain("realm://public@realm.hy2.io");
+        await uri.Should().Contain("/57f9be7c-2810-4f5b-8cb9-260bc84d6c90");
+        await uri.Should().Contain("stun=example.stun:3478");
+        await uri.Should().Contain("stun=example2.stun:3478");
     }
 
-    [Fact]
-    public void GetShareUriAndResolveConfig_Hy2Realm_ShouldRoundTripBasicFields()
+    [Test]
+    public async Task GetShareUriAndResolveConfig_Hy2Realm_ShouldRoundTripBasicFields()
     {
         var str = "hysteria2+realm://mytoken@rendezvous.example.com/my-cabin-1f3a8c2e9b?auth=your_password&insecure=1&pinSHA256=deadbeef#remark";
         var resolved = Hysteria2Fmt.ResolveRealm(str, out var msg);
-        resolved.Should().NotBeNull();
-        resolved.Password.Should().Be("your_password");
+        await resolved.Should().NotBeNull();
+        await resolved.Password.Should().BeEqualTo("your_password");
         var result = HyRealm.TryParse(resolved.GetProtocolExtra().Hy2RealmUrl, out var realm);
-        result.Should().BeTrue();
-        realm.Should().NotBeNull();
-        realm.Token.Should().Be("mytoken");
+        await result.Should().BeTrue();
+        await realm.Should().NotBeNull();
+        await realm.Token.Should().BeEqualTo("mytoken");
 
         // To uri
         var uri = Hysteria2Fmt.ToUri(resolved);
-        uri.Should().Contain("hysteria2+realm://mytoken@rendezvous.example.com");
-        uri.Should().EndWith("#remark");
+        await uri.Should().Contain("hysteria2+realm://mytoken@rendezvous.example.com");
+        await uri.Should().EndWith("#remark");
     }
 
-    [Fact]
-    public void ToServerUrl_ShouldIncludeSchemeForSingbox()
+    [Test]
+    public async Task ToServerUrl_ShouldIncludeSchemeForSingbox()
     {
         var realm = new HyRealm(
             IsHttp: false,
@@ -73,19 +68,19 @@ public class HyRealmTests
             StunList: ["turn.cloudflare.com:3478"]
         );
 
-        realm.ToServerUrl().Should().Be("https://realm.hy2.io:443");
+        await realm.ToServerUrl().Should().BeEqualTo("https://realm.hy2.io:443");
     }
 
-    [Fact]
-    public void ResolveRealm_Issue9635_ShouldProduceHttpsServerUrl()
+    [Test]
+    public async Task ResolveRealm_Issue9635_ShouldProduceHttpsServerUrl()
     {
         var str = "hysteria2+realm://public@realm.hy2.io/my-realm-id?auth=uuid&stun=turn.cloudflare.com%3A3478&sni=cloudflare.com&pinSHA256=xxx#Realm-Test";
         var resolved = Hysteria2Fmt.ResolveRealm(str, out _);
-        resolved.Should().NotBeNull();
+        await resolved.Should().NotBeNull();
 
-        HyRealm.TryParse(resolved!.GetProtocolExtra().Hy2RealmUrl, out var realm).Should().BeTrue();
-        realm!.ToServerUrl().Should().StartWith("https://");
-        realm.ToServerUrl().Should().Contain("realm.hy2.io");
-        realm.StunList.Should().Contain("turn.cloudflare.com:3478");
+        await HyRealm.TryParse(resolved!.GetProtocolExtra().Hy2RealmUrl, out var realm).Should().BeTrue();
+        await realm!.ToServerUrl().Should().StartWith("https://");
+        await realm.ToServerUrl().Should().Contain("realm.hy2.io");
+        await realm.StunList.Should().Contain("turn.cloudflare.com:3478");
     }
 }

v2rayN/ServiceLib.Tests/Fmt/Hysteria2FmtTests.cs

@@ -0,0 +1,54 @@
+namespace ServiceLib.Tests.Fmt;
+
+public class Hysteria2FmtTests
+{
+    // "The hostname and optional port of the server. If the port is omitted, it defaults to 443."
+    // -- https://v2.hysteria.network/docs/developers/URI-Scheme/
+    // A ':' with no digits after it is an omitted port too, per RFC 3986 'port = *DIGIT'.
+    [Test]
+    [Arguments("hysteria2://password@hy2.example/")]
+    [Arguments("hysteria2://password@hy2.example")]
+    [Arguments("hysteria2://password@hy2.example:/")]
+    [Arguments("hy2://password@hy2.example/?sni=real.example")]
+    public async Task ResolveConfig_WithoutPort_ShouldDefaultTo443(string shareUri)
+    {
+        var resolved = FmtHandler.ResolveConfig(shareUri, out var msg);
+
+        await resolved.Should().NotBeNull().Because($"uri: {shareUri}, msg: {msg}");
+        await resolved!.ConfigType.Should().BeEqualTo(EConfigType.Hysteria2);
+        await resolved.Address.Should().BeEqualTo("hy2.example");
+        await resolved.Port.Should().BeEqualTo(443);
+    }
+
+    [Test]
+    public async Task ResolveConfig_WithoutPort_ShouldProduceAValidProfile()
+    {
+        // Uri.Port is -1 for an unregistered scheme with no port, and ProfileItem.IsValid rejects
+        // any port outside 1..65535 - so the default is what keeps such a link usable at all.
+        var resolved = FmtHandler.ResolveConfig("hysteria2://password@hy2.example/", out _);
+
+        await resolved.Should().NotBeNull();
+        await resolved!.IsValid().Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResolveConfig_WithExplicitPort_ShouldKeepIt()
+    {
+        var resolved = FmtHandler.ResolveConfig("hysteria2://password@hy2.example:8443/", out _);
+
+        await resolved.Should().NotBeNull();
+        await resolved!.Port.Should().BeEqualTo(8443);
+    }
+
+    [Test]
+    public async Task ResolveConfig_WithExplicitZeroPort_ShouldNotApplyTheDefault()
+    {
+        // Uri.Port is 0 here, not -1: the port is present, it is just not a usable one. Treating
+        // it as "omitted" would silently move the endpoint to :443, so it stays invalid instead.
+        var resolved = FmtHandler.ResolveConfig("hysteria2://password@hy2.example:0/", out _);
+
+        await resolved.Should().NotBeNull();
+        await resolved!.Port.Should().BeEqualTo(0);
+        await resolved.IsValid().Should().BeFalse();
+    }
+}

v2rayN/ServiceLib.Tests/Fmt/InnerFmtTests.cs

@@ -1,15 +1,11 @@
-using AwesomeAssertions;
-using ServiceLib.Enums;
-using ServiceLib.Handler.Fmt;
 using ServiceLib.Tests.CoreConfig;
-using Xunit;
 
 namespace ServiceLib.Tests.Fmt;
 
 public class InnerFmtTests
 {
-    [Fact]
-    public void ToUriAndResolve_ShouldRoundTripPolicyGroupReferences()
+    [Test]
+    public async Task ToUriAndResolve_ShouldRoundTripPolicyGroupReferences()
     {
         var childA = CoreConfigTestFactory.CreateSocksNode(ECoreType.Xray, "child-a", "child-a");
         var childB = CoreConfigTestFactory.CreateVmessNode(ECoreType.Xray, "child-b", "child-b");
@@ -19,19 +15,20 @@ public class InnerFmtTests
 
         var uri = InnerFmt.ToUri([group, childA, childB]);
 
-        uri.Should().NotBeNullOrWhiteSpace();
+        await uri.Should().NotBeNull();
+        await uri.Should().NotBeEmpty();
 
         var resolved = InnerFmt.Resolve(uri!, "sub-123");
 
-        resolved.Should().NotBeNull();
-        resolved.Should().HaveCount(3);
+        await resolved.Should().NotBeNull();
+        await resolved.Should().HaveCount(3);
 
         var resolvedGroup = resolved!.Single(x => x.Remarks == group.Remarks);
         var resolvedChildA = resolved.Single(x => x.Remarks == childA.Remarks);
         var resolvedChildB = resolved.Single(x => x.Remarks == childB.Remarks);
 
-        resolvedGroup.ConfigType.Should().Be(EConfigType.PolicyGroup);
-        resolvedGroup.GetProtocolExtra().SubChildItems.Should().Be("sub-123");
-        resolvedGroup.GetProtocolExtra().ChildItems.Should().Be($"{resolvedChildA.IndexId},{resolvedChildB.IndexId}");
+        await resolvedGroup.ConfigType.Should().BeEqualTo(EConfigType.PolicyGroup);
+        await resolvedGroup.GetProtocolExtra().SubChildItems.Should().BeEqualTo("sub-123");
+        await resolvedGroup.GetProtocolExtra().ChildItems.Should().BeEqualTo($"{resolvedChildA.IndexId},{resolvedChildB.IndexId}");
     }
 }

v2rayN/ServiceLib.Tests/Fmt/ShareUriQueryTests.cs

@@ -0,0 +1,73 @@
+namespace ServiceLib.Tests.Fmt;
+
+public class ShareUriQueryTests
+{
+    [Test]
+    [Arguments("ob%41fs")]
+    [Arguments("66%ff")]
+    [Arguments("100%")]
+    public async Task GetShareUriAndResolveConfig_QueryValueWithPercent_ShouldSurviveTheRoundTrip(string obfsPassword)
+    {
+        var source = new ProfileItem
+        {
+            ConfigType = EConfigType.Hysteria2,
+            Remarks = "percent demo",
+            Address = "hy2.example",
+            Port = 8443,
+            Password = "pw",
+        };
+        source.SetProtocolExtra(new ProtocolExtraItem { SalamanderPass = obfsPassword, });
+
+        var uri = FmtHandler.GetShareUri(source);
+
+        await uri.Should().NotBeNull();
+
+        var resolved = FmtHandler.ResolveConfig(uri!, out var msg);
+
+        await resolved.Should().NotBeNull().Because($"uri: {uri}, msg: {msg}");
+        await resolved!.GetProtocolExtra().SalamanderPass.Should().BeEqualTo(obfsPassword);
+    }
+
+    // RFC 3986 lists '=' among the sub-delimiters a query value may carry, so only the first one
+    // separates the key from the value. Splitting on every '=' discarded the pair outright.
+    [Test]
+    public async Task ResolveConfig_QueryValueWithUnescapedEquals_ShouldNotBeDropped()
+    {
+        const string shareUri = "hysteria2://pw@hy2.example:8443/?ech=AAj+DQAEAAAAAA==&sni=real.example";
+
+        var resolved = FmtHandler.ResolveConfig(shareUri, out var msg);
+
+        await resolved.Should().NotBeNull().Because($"uri: {shareUri}, msg: {msg}");
+        await resolved!.EchConfigList.Should().BeEqualTo("AAj+DQAEAAAAAA==");
+        await resolved.Sni.Should().BeEqualTo("real.example");
+    }
+
+    // Canonical SIP002 percent-encodes the plugin argument, and that is what this client's own
+    // exporter emits. This covers the non-canonical spelling instead: the options are a ';'
+    // separated list of 'key=value' pairs, so left unescaped the value always carries '='.
+    [Test]
+    public async Task ResolveConfig_NonCanonicalSip002PluginWithLiteralEquals_ShouldConfigureObfs()
+    {
+        const string shareUri =
+            "ss://YWVzLTEyOC1nY206cGFzczEyMw==@1.2.3.4:8388/?plugin=obfs-local;obfs=http;obfs-host=example.com#ss";
+
+        var resolved = FmtHandler.ResolveConfig(shareUri, out var msg);
+
+        await resolved.Should().NotBeNull().Because($"uri: {shareUri}, msg: {msg}");
+        await resolved!.ConfigType.Should().BeEqualTo(EConfigType.Shadowsocks);
+        await resolved.GetTransportExtra().Host.Should().BeEqualTo("example.com");
+        await resolved.GetTransportExtra().RawHeaderType.Should().BeEqualTo(Global.RawHeaderHttp);
+    }
+
+    [Test]
+    public async Task ResolveConfig_EscapedQueryValue_ShouldStillDecodeExactlyOnce()
+    {
+        const string shareUri = "hysteria2://pw@hy2.example:8443/?ech=AAj%2BDQAEAAAAAA%3D%3D&obfs=salamander&obfs-password=a%20b";
+
+        var resolved = FmtHandler.ResolveConfig(shareUri, out var msg);
+
+        await resolved.Should().NotBeNull().Because($"uri: {shareUri}, msg: {msg}");
+        await resolved!.EchConfigList.Should().BeEqualTo("AAj+DQAEAAAAAA==");
+        await resolved.GetProtocolExtra().SalamanderPass.Should().BeEqualTo("a b");
+    }
+}

v2rayN/ServiceLib.Tests/Fmt/WireguardFmtTests.cs

@@ -1,13 +1,9 @@
-using AwesomeAssertions;
-using ServiceLib.Handler.Fmt;
-using Xunit;
-
 namespace ServiceLib.Tests.Fmt;
 
 public class WireguardFmtTests
 {
-    [Fact]
-    public void ResolveConfig_ShouldParsePeersAndIgnoreInlineComments()
+    [Test]
+    public async Task ResolveConfig_ShouldParsePeersAndIgnoreInlineComments()
     {
         const string config =
             """
@@ -15,6 +11,7 @@ public class WireguardFmtTests
             PrivateKey = interface-private-key
             Address = 10.0.0.2/32, fd00::2/128 ; inline comment
             MTU = 1420
+            DNS = 2001::db8::53, 1.2.3.4, 2001:db8::54
 
             [Peer]
             PublicKey = peer-public-key
@@ -29,19 +26,20 @@ public class WireguardFmtTests
 
         var resolved = WireguardFmt.ResolveConfig(config);
 
-        resolved.Should().NotBeNull();
-        resolved.Should().HaveCount(2);
+        await resolved.Should().NotBeNull();
+        await resolved.Should().HaveCount(2);
 
         var first = resolved![0];
-        first.Address.Should().Be("2001:db8::1");
-        first.Port.Should().Be(51820);
-        first.Password.Should().Be("interface-private-key");
-        first.GetProtocolExtra().WgReserved.Should().Be("1, 2, 3");
-        first.GetProtocolExtra().WgInterfaceAddress.Should().Be("10.0.0.2/32, fd00::2/128");
-        first.GetProtocolExtra().WgMtu.Should().Be(1420);
+        await first.Address.Should().BeEqualTo("2001:db8::1");
+        await first.Port.Should().BeEqualTo(51820);
+        await first.Password.Should().BeEqualTo("interface-private-key");
+        await first.GetProtocolExtra().WgReserved.Should().BeEqualTo("1, 2, 3");
+        await first.GetProtocolExtra().WgInterfaceAddress.Should().BeEqualTo("10.0.0.2/32, fd00::2/128");
+        await first.GetProtocolExtra().WgMtu.Should().BeEqualTo(1420);
+        await first.GetProtocolExtra().WgDns.Should().BeEqualTo("2001::db8::53, 1.2.3.4, 2001:db8::54");
 
         var second = resolved[1];
-        second.Address.Should().Be("example.com");
-        second.Port.Should().Be(12345);
+        await second.Address.Should().BeEqualTo("example.com");
+        await second.Port.Should().BeEqualTo(12345);
     }
 }

v2rayN/ServiceLib.Tests/Manager/CoreManagerTests.cs

@@ -1,44 +1,39 @@
-using AwesomeAssertions;
-using ServiceLib.Enums;
-using ServiceLib.Manager;
-using Xunit;
-
 namespace ServiceLib.Tests.Manager;
 
 public class CoreManagerTests
 {
-    [Theory]
-    [InlineData(ECoreType.sing_box)]
-    [InlineData(ECoreType.mihomo)]
-    [InlineData(ECoreType.Xray)]
-    public void ShouldRunAsSudo_TunLaunchOnNonWindows_RequiresElevation(ECoreType coreType)
+    [Test]
+    [Arguments(ECoreType.sing_box)]
+    [Arguments(ECoreType.mihomo)]
+    [Arguments(ECoreType.Xray)]
+    public async Task ShouldRunAsSudo_TunLaunchOnNonWindows_RequiresElevation(ECoreType coreType)
     {
-        CoreManager.ShouldRunAsSudo(isTunLaunch: true, coreType, isNonWindows: true).Should().BeTrue();
+        await CoreManager.ShouldRunAsSudo(isTunLaunch: true, coreType, isNonWindows: true).Should().BeTrue();
     }
 
-    [Fact]
-    public void ShouldRunAsSudo_NonTunLaunch_ShouldNotElevate()
+    [Test]
+    public async Task ShouldRunAsSudo_NonTunLaunch_ShouldNotElevate()
     {
         // Regression guard for the macOS TUN failure: the elevation decision must follow
         // the context snapshot that generated the config. A launch whose snapshot has TUN
         // disabled must never elevate, and a launch whose snapshot has TUN enabled must
         // elevate regardless of later changes to the live config.
-        CoreManager.ShouldRunAsSudo(isTunLaunch: false, ECoreType.sing_box, isNonWindows: true).Should().BeFalse();
-        CoreManager.ShouldRunAsSudo(isTunLaunch: false, ECoreType.Xray, isNonWindows: true).Should().BeFalse();
+        await CoreManager.ShouldRunAsSudo(isTunLaunch: false, ECoreType.sing_box, isNonWindows: true).Should().BeFalse();
+        await CoreManager.ShouldRunAsSudo(isTunLaunch: false, ECoreType.Xray, isNonWindows: true).Should().BeFalse();
     }
 
-    [Fact]
-    public void ShouldRunAsSudo_OnWindows_ShouldNotElevate()
+    [Test]
+    public async Task ShouldRunAsSudo_OnWindows_ShouldNotElevate()
     {
-        CoreManager.ShouldRunAsSudo(isTunLaunch: true, ECoreType.sing_box, isNonWindows: false).Should().BeFalse();
+        await CoreManager.ShouldRunAsSudo(isTunLaunch: true, ECoreType.sing_box, isNonWindows: false).Should().BeFalse();
     }
 
-    [Theory]
-    [InlineData(ECoreType.v2fly)]
-    [InlineData(ECoreType.hysteria)]
-    [InlineData(null)]
-    public void ShouldRunAsSudo_UnsupportedCoreType_ShouldNotElevate(ECoreType? coreType)
+    [Test]
+    [Arguments(ECoreType.v2fly)]
+    [Arguments(ECoreType.hysteria)]
+    [Arguments(null)]
+    public async Task ShouldRunAsSudo_UnsupportedCoreType_ShouldNotElevate(ECoreType? coreType)
     {
-        CoreManager.ShouldRunAsSudo(isTunLaunch: true, coreType, isNonWindows: true).Should().BeFalse();
+        await CoreManager.ShouldRunAsSudo(isTunLaunch: true, coreType, isNonWindows: true).Should().BeFalse();
     }
 }

v2rayN/ServiceLib.Tests/ServiceLib.Tests.csproj

@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <IsPackable>false</IsPackable>
+        <ImplicitUsings>enable</ImplicitUsings>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="AwesomeAssertions" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit.runner.visualstudio">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="xunit.v3" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="TUnit" />
+        <PackageReference Include="TUnit.Assertions.Should" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\ServiceLib\ServiceLib.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\ServiceLib\ServiceLib.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Using Include="TUnit.Assertions.Should" />
+        <Using Include="TUnit.Assertions.Should.Extensions" />
+    </ItemGroup>
 
 </Project>

v2rayN/ServiceLib/Base/BulkObservableCollection.cs

@@ -2,7 +2,14 @@ namespace ServiceLib.Base;
 
 public class BulkObservableCollection<T> : ObservableCollection<T>
 {
-    private bool _suppressNotification = false;
+    private bool _suppressNotification;
+
+    public BulkObservableCollection()
+    {
+    }
+
+    public BulkObservableCollection(IEnumerable<T> collection) : base(collection) { }
+    public BulkObservableCollection(List<T> list) : base(list) { }
 
     protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
     {
@@ -63,4 +70,27 @@ public class BulkObservableCollection<T> : ObservableCollection<T>
 
         return true;
     }
+
+    public void ReplaceRange(IEnumerable<T>? collection)
+    {
+        _suppressNotification = true;
+        try
+        {
+            Items.Clear();
+            if (collection != null)
+            {
+                foreach (var item in collection)
+                {
+                    Items.Add(item);
+                }
+            }
+        }
+        finally
+        {
+            _suppressNotification = false;
+            OnPropertyChanged(new PropertyChangedEventArgs(nameof(Count)));
+            OnPropertyChanged(new PropertyChangedEventArgs("Item[]"));
+            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+        }
+    }
 }

v2rayN/ServiceLib/Common/Extension.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
 
 namespace ServiceLib.Common;
 
@@ -138,7 +139,10 @@ public static class Extension
     public static async Task<TOutput> HandleSafe<TInput, TOutput>(
         this Interaction<TInput, TOutput> interaction,
         TInput input,
-        TOutput defaultValue = default!)
+        TOutput defaultValue = default!,
+        [CallerMemberName] string memberName = "",
+        [CallerFilePath] string filePath = "",
+        [CallerLineNumber] int lineNumber = 0)
     {
         try
         {
@@ -146,12 +150,14 @@ public static class Extension
         }
         catch (UnhandledInteractionException<TInput, TOutput> ex)
         {
-            Logging.SaveLog($"Unhandled interaction exception for input: {input}", ex);
+            var title = $"Unhandled interaction exception in {memberName} at {filePath}:{lineNumber}";
+            Logging.SaveLog(title, ex);
             return defaultValue;
         }
         catch (Exception ex)
         {
-            Logging.SaveLog($"Exception occurred while handling interaction for input: {input}", ex);
+            var title = $"Exception occurred while handling interaction in {memberName} at {filePath}:{lineNumber}, input: {input}";
+            Logging.SaveLog(title, ex);
             return defaultValue;
         }
     }

v2rayN/ServiceLib/Common/Utils.cs

@@ -1,4 +1,3 @@
-using System.Collections.Specialized;
 using System.Security.Principal;
 using CliWrap;
 using CliWrap.Buffered;
@@ -201,7 +200,9 @@ public class Utils
         var parts = query[1..].Split('&', StringSplitOptions.RemoveEmptyEntries);
         foreach (var part in parts)
         {
-            var keyValue = part.Split('=');
+            // Split on the FIRST '=' only: RFC 3986 lists '=' among the sub-delimiters a query
+            // value may carry, so everything after the first one belongs to the value.
+            var keyValue = part.Split('=', 2);
             if (keyValue.Length != 2)
             {
                 continue;
@@ -814,6 +815,40 @@ public class Utils
             .Any(ni => ni.Name.Equals(inInterfaceName, StringComparison.OrdinalIgnoreCase));
     }
 
+    /// <summary>
+    /// Whether the host holds a globally routable IPv6 address, that is one inside 2000::/3.
+    /// Link-local and unique local addresses are excluded: they never reach the IPv6 internet,
+    /// so a host holding only those has no IPv6 traffic that could bypass the tunnel, and no
+    /// IPv6 path that traffic sent into the tunnel could come back out of.
+    /// </summary>
+    public static bool HasGlobalIPv6Address()
+    {
+        try
+        {
+            return NetworkInterface.GetAllNetworkInterfaces()
+                .Where(ni => ni.OperationalStatus == OperationalStatus.Up
+                             && ni.NetworkInterfaceType != NetworkInterfaceType.Loopback)
+                .SelectMany(ni => ni.GetIPProperties().UnicastAddresses)
+                .Any(ua => IsGlobalUnicastIPv6(ua.Address));
+        }
+        catch
+        {
+            return true;
+        }
+    }
+
+    private static bool IsGlobalUnicastIPv6(IPAddress address)
+    {
+        if (address.AddressFamily != AddressFamily.InterNetworkV6)
+        {
+            return false;
+        }
+
+        // 2000::/3 is the only range currently assigned for global unicast, which leaves out
+        // ::1, fe80::/10, fc00::/7 and ff00::/8 in a single test.
+        return (address.GetAddressBytes()[0] & 0xE0) == 0x20;
+    }
+
     #endregion Speed Test
 
     #region Miscellaneous

v2rayN/ServiceLib/Enums/ERuleMode.cs

@@ -5,5 +5,4 @@ public enum ERuleMode
     Rule = 0,
     Global = 1,
     Direct = 2,
-    Unchanged = 3
 }

v2rayN/ServiceLib/Events/EventChannel.cs

@@ -5,6 +5,7 @@ public sealed class EventChannel<T>
     private readonly Signal<T> _signal = new();
     private readonly Lock _gate = new();
     private readonly IObservable<T> _observable;
+
     public EventChannel()
     {
         _observable = _signal.Synchronize(_gate);

v2rayN/ServiceLib/Global.cs

@@ -97,11 +97,16 @@ public class Global
     public const string StringFalse = "false";
     public const int SqliteMaxBatchSize = 10000;
 
-    public const string SingboxDirectDNSTag = "direct_dns";
-    public const string SingboxRemoteDNSTag = "remote_dns";
-    public const string SingboxLocalDNSTag = "local_local";
-    public const string SingboxHostsDNSTag = "hosts_dns";
-    public const string SingboxFakeDNSTag = "fake_dns";
+    public const string SingboxDirectDNSTagPrefix = "direct-dns-";
+    public const string SingboxRemoteDNSTagPrefix = "remote-dns-";
+    public const string SingboxDirectDNSTag = "direct-dns-1";
+    public const string SingboxRemoteDNSTag = "remote-dns-1";
+    public const string SingboxDirectDNSTagTemplate = "direct-dns-{0}";
+    public const string SingboxRemoteDNSTagTemplate = "remote-dns-{0}";
+    public const string SingboxLocalDNSTag = "local-local";
+    public const string SingboxHostsDNSTag = "hosts-dns";
+    public const string SingboxFakeDNSTag = "fake-dns";
+    public const string SingboxSrsDownloadHttpClientTag = "srs-download-http-client";
 
     public const int Hysteria2DefaultHopInt = 30;
     public const string PolicyGroupExcludeKeywords = @"剩余|过期|到期|重置|[Rr]emaining|[Ee]xpir|[Rr]eset";

v2rayN/ServiceLib/GlobalUsings.cs

@@ -8,6 +8,7 @@ global using System.Net.NetworkInformation;
 global using System.Net.Sockets;
 global using ReactiveUI.Primitives;
 global using ReactiveUI.Primitives.Concurrency;
+global using ReactiveUI.Primitives.Extensions;
 global using ReactiveUI.Primitives.Disposables;
 global using ReactiveUI.Primitives.Signals;
 global using System.Reflection;
@@ -41,5 +42,3 @@ global using ServiceLib.Services;
 global using ServiceLib.Services.CoreConfig;
 global using ServiceLib.Services.Statistics;
 global using SQLite;
-
-

v2rayN/ServiceLib/Handler/Builder/CoreConfigContextBuilder.cs

@@ -1,5 +1,3 @@
-using System.ComponentModel.DataAnnotations;
-
 namespace ServiceLib.Handler.Builder;
 
 public record CoreConfigContextBuilderResult(CoreConfigContext Context, NodeValidatorResult ValidatorResult)
@@ -51,6 +49,7 @@ public class CoreConfigContextBuilder
             RoutingItem = await ConfigHandler.GetDefaultRouting(config),
             IsWindows = Utils.IsWindows(),
             IsMacOS = Utils.IsMacOS(),
+            HasGlobalIPv6Address = Utils.HasGlobalIPv6Address(),
             ProtectCoreTypeList = config.TunModeItem.EnableTun ? [ECoreType.Xray, ECoreType.sing_box] : []
         };
         var validatorResult = NodeValidatorResult.Empty();
@@ -205,7 +204,7 @@ public class CoreConfigContextBuilder
                 Context = preSocksResult.Context with
                 {
                     ProtectDomainList =
-                    [.. nodeContext.ProtectDomainList ?? [], .. preSocksResult.Context.ProtectDomainList ?? []],
+                    [.. nodeContext.ProtectDomainList, .. preSocksResult.Context.ProtectDomainList],
                     ProtectCoreTypeList = protectCoreTypeList,
                 },
             };
@@ -386,7 +385,7 @@ public class CoreConfigContextBuilder
         {
             var echQuerySni = node.Sni;
             if (node.StreamSecurity == Global.StreamSecurity
-                && node.EchConfigList?.Contains("://") == true)
+                && node.EchConfigList.Contains("://"))
             {
                 var idx = node.EchConfigList.IndexOf('+');
                 echQuerySni = idx > 0 ? node.EchConfigList[..idx] : node.Sni;

v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs

@@ -115,10 +115,10 @@ public class NodeValidator
 
         if (item.GetNetwork() is nameof(ETransport.ws)
             && item.EchConfigList.IsNullOrEmpty()
-            && item.GetAlpn()?.FirstOrDefault() == "h3")
+            && item.GetAlpn()?.FirstOrDefault() is "h3" or "h2")
         {
             v.Warning(
-                "WebSocket but ALPN is set to h3, the core may ignore the ALPN setting or cause unexpected issues.");
+                $"WebSocket but ALPN is set to {item.Alpn}, the core may ignore the ALPN setting or cause unexpected issues.");
         }
 
         // TLS & Security
@@ -131,14 +131,6 @@ public class NodeValidator
                 isCertProvided = false;
             }
 
-            // Check for deprecated allowInsecure property when TLS is enabled
-            if (item.GetAllowInsecure()
-                && item.Cert.IsNullOrEmpty()
-                && item.CertSha.IsNullOrEmpty())
-            {
-                v.Warning(ResUI.MsgAllowInsecureDeprecated);
-            }
-
             if ((coreType == ECoreType.Xray
                 && item.GetAllowInsecure()
                 && !isCertProvided
@@ -147,6 +139,10 @@ public class NodeValidator
                     && item.GetAllowInsecure()
                     && !isCertProvided))
             {
+                if (coreType == ECoreType.Xray)
+                {
+                    v.Warning(ResUI.MsgAllowInsecureDeprecated);
+                }
                 v.Warning(ResUI.MsgInsecureConfiguration);
             }
         }

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -115,6 +115,7 @@ public static class ConfigHandler
         config.ConstItem ??= new ConstItem();
 
         config.SimpleDNSItem ??= InitBuiltinSimpleDNS();
+        config.SimpleDNSItem.BlockAAAAQuery ??= false;
         config.SimpleDNSItem.FakeIPRange ??= Global.FakeIPRanges.FirstOrDefault();
         config.SimpleDNSItem.GlobalFakeIp ??= true;
         config.SimpleDNSItem.BootstrapDNS ??= Global.DomainPureIPDNSAddress.FirstOrDefault();
@@ -921,6 +922,7 @@ public static class ConfigHandler
             WgInterfaceAddress = profileItem.GetProtocolExtra().WgInterfaceAddress?.TrimEx(),
             WgReserved = wgReserved,
             WgMtu = profileItem.GetProtocolExtra().WgMtu is null or <= 0 ? Global.TunMtus.First() : profileItem.GetProtocolExtra().WgMtu,
+            WgDns = profileItem.GetProtocolExtra().WgDns?.TrimEx(),
         });
 
         if (profileItem.Password.IsNullOrEmpty())
@@ -1752,15 +1754,13 @@ public static class ConfigHandler
         {
             lstProfiles = SingboxFmt.ResolveToCustomOutbound(strData, subRemarks);
         }
-        if (lstProfiles.Count == 0)
+        if (lstProfiles.Count > 0)
         {
-            return -1;
-        }
-
-        var count = await AddBatchCustomServers(config, lstProfiles, subid, isSub);
-        if (count > 0)
-        {
-            return count;
+            var count = await AddBatchCustomServers(config, lstProfiles, subid, isSub);
+            if (count > 0)
+            {
+                return count;
+            }
         }
 
         if (HtmlPageFmt.IsHtmlPage(strData))
@@ -1797,16 +1797,11 @@ public static class ConfigHandler
         {
             ECoreType.Xray => V2rayFmt.ResolveToCustom(strData, subRemarks),
             ECoreType.sing_box => SingboxFmt.ResolveToCustom(strData, subRemarks),
-            _ => null
+            _ => null,
         };
 
-        if (lstProfiles is not null)
+        if (lstProfiles?.Count > 0)
         {
-            if (lstProfiles.Count == 0)
-            {
-                return -1;
-            }
-
             var count = await AddBatchCustomServers(config, lstProfiles, subid, isSub);
             if (count > 0)
             {
@@ -2616,7 +2611,7 @@ public static class ConfigHandler
             items = await AppManager.Instance.RoutingItems();
         }
 
-        if (!blImportAdvancedRules && items.Count(u => u.Remarks.StartsWith(ver)) > 0)
+        if (!blImportAdvancedRules && items.Count() > 0) // items.Count(u => u.Remarks.StartsWith(ver)) > 0)
         {
             //migrate
             //TODO Temporary code to be removed later

v2rayN/ServiceLib/Handler/ConnectionHandler.cs

@@ -5,14 +5,14 @@ public static class ConnectionHandler
     private static readonly string _tag = "ConnectionHandler";
 
     /// <summary>
-    /// Runs ping and IP checks and returns a formatted result string.
+    /// Runs ping and IP checks.
     /// </summary>
-    public static async Task<string> RunAvailabilityCheck()
+    public static async Task<AvailabilityCheckResult> RunAvailabilityCheck()
     {
         var time = await GetRealPingTimeInfo();
         var ip = time > 0 ? await GetIPInfo() : Global.None;
 
-        return string.Format(ResUI.TestMeOutput, time, ip);
+        return new AvailabilityCheckResult(time, ip);
     }
 
     /// <summary>

v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs

@@ -1,5 +1,3 @@
-using System.Collections.Specialized;
-
 namespace ServiceLib.Handler.Fmt;
 
 public class BaseFmt
@@ -344,8 +342,13 @@ public class BaseFmt
         return query[key] ?? defaultValue;
     }
 
+    /// <summary>
+    /// Values are already unescaped by <see cref="Utils.ParseQueryString" />, so this must not
+    /// unescape them a second time: a value that still holds a valid percent sequence after the
+    /// first pass - an obfuscation password of "ob%41fs", say - would decay into "obAfs".
+    /// </summary>
     protected static string GetQueryDecoded(NameValueCollection query, string key, string defaultValue = "")
     {
-        return Utils.UrlDecode(GetQueryValue(query, key, defaultValue));
+        return GetQueryValue(query, key, defaultValue);
     }
 }

v2rayN/ServiceLib/Handler/Fmt/Hysteria2Fmt.cs

@@ -17,7 +17,11 @@ public class Hysteria2Fmt : BaseFmt
         }
 
         item.Address = url.IdnHost;
-        item.Port = url.Port;
+        // The URI scheme makes the port optional and defaults it to 443. Uri.Port answers -1 for
+        // an unregistered scheme carrying no port, which ProfileItem.IsValid then rejects.
+        // Only -1 means "omitted": an explicit ":0" has to stay 0 and be rejected the way it
+        // always was, instead of being quietly redirected to a server the link never named.
+        item.Port = url.Port == -1 ? 443 : url.Port;
         item.Remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
         item.Password = Utils.UrlDecode(url.UserInfo);
 
@@ -166,15 +170,19 @@ public class Hysteria2Fmt : BaseFmt
         }
         if (item.CertSha.IsNullOrEmpty())
         {
-            item.CertSha = GetQueryDecoded(query, "pinSHA256");
-            // NOTE:
-            // To accommodate Xray changes,
-            // some providers issue self-signed cert links with `insecure = false` and a certificate fingerprint,
-            // breaking interoperability between Xray, official Hysteria 2 client, and sing-box.
-            // Since this won't compromise the overall security model,
-            // `insecure = true` is automatically set when a fingerprint is detected,
-            // and the value is restored when generating configurations.
-            item.AllowInsecure = Global.StringTrue;
+            var pinSHA256 = GetQueryDecoded(query, "pinSHA256");
+            item.CertSha = pinSHA256;
+            if (!pinSHA256.IsNullOrEmpty())
+            {
+                // NOTE:
+                // To accommodate Xray changes,
+                // some providers issue self-signed cert links with `insecure = false` and a certificate fingerprint,
+                // breaking interoperability between Xray, official Hysteria 2 client, and sing-box.
+                // Since this won't compromise the overall security model,
+                // `insecure = true` is automatically set when a fingerprint is detected,
+                // and the value is restored when generating configurations.
+                item.AllowInsecure = Global.StringTrue;
+            }
         }
         item.EchConfigList = GetQueryDecoded(query, "ech");
         item.SetProtocolExtra(item.GetProtocolExtra() with
@@ -219,6 +227,11 @@ public class Hysteria2Fmt : BaseFmt
             var sha = item.CertSha;
             dicQuery.Add("pinSHA256", Utils.UrlEncode(sha));
         }
+        else if (!item.Cert.IsNullOrEmpty()
+            && CertPemManager.GetLeafCertSha256Thumbprint(item.Cert) is { Length: > 0 } thumbprint)
+        {
+            dicQuery.Add("pinSHA256", Utils.UrlEncode(thumbprint));
+        }
         if (!item.EchConfigList.IsNullOrEmpty())
         {
             dicQuery.Add("ech", Utils.UrlEncode(item.EchConfigList));

v2rayN/ServiceLib/Handler/Fmt/SingboxFmt.cs

@@ -34,9 +34,9 @@ public class SingboxFmt : BaseFmt
         if (!isOutbound)
         {
             var fullProfile = ResolveFull(jsonObject, subRemarks);
-            profileList.Add(fullProfile);
             if (fullProfile is not null)
             {
+                profileList.Add(fullProfile);
                 return profileList;
             }
         }

v2rayN/ServiceLib/Handler/Fmt/V2rayFmt.cs

@@ -34,9 +34,9 @@ public class V2rayFmt : BaseFmt
         if (!isOutbound)
         {
             var fullProfile = ResolveFull(jsonObject, subRemarks);
-            profileList.Add(fullProfile);
             if (fullProfile is not null)
             {
+                profileList.Add(fullProfile);
                 return profileList;
             }
         }

v2rayN/ServiceLib/Handler/Fmt/WireguardFmt.cs

@@ -31,6 +31,7 @@ public class WireguardFmt : BaseFmt
             WgReserved = GetQueryDecoded(query, "reserved"),
             WgInterfaceAddress = GetQueryDecoded(query, "address"),
             WgMtu = int.TryParse(GetQueryDecoded(query, "mtu"), out var mtuVal) ? mtuVal : null,
+            WgDns = GetQueryDecoded(query, "dns"),
         });
 
         return item;
@@ -71,6 +72,10 @@ public class WireguardFmt : BaseFmt
         {
             dicQuery.Add("mtu", protoExtra.WgMtu.ToString());
         }
+        if (!protoExtra.WgDns.IsNullOrEmpty())
+        {
+            dicQuery.Add("dns", Utils.UrlEncode(protoExtra.WgDns));
+        }
         return ToUri(EConfigType.WireGuard, item.Address, item.Port, item.Password, dicQuery, remark);
     }
 
@@ -133,6 +138,7 @@ public class WireguardFmt : BaseFmt
 
         var wgMtu = interfaceDic.TryGetValue("MTU", out var mtuStr) && int.TryParse(mtuStr, out var mtuVal) ? mtuVal : 0;
         var wgInterfaceAddress = interfaceDic.TryGetValue("Address", out var interfaceAddress) ? interfaceAddress : string.Empty;
+        var wgDns = interfaceDic.TryGetValue("DNS", out var dns) ? dns : string.Empty;
 
         var index = 0;
         var resultList = new List<ProfileItem>();
@@ -156,6 +162,7 @@ public class WireguardFmt : BaseFmt
                 WgInterfaceAddress = wgInterfaceAddress,
                 WgReserved = (peerDic.TryGetValue("Reserved", out var reserved) ? reserved : string.Empty).NullIfEmpty(),
                 WgMtu = wgMtu > 0 ? wgMtu : null,
+                WgDns = wgDns,
             };
 
             var item = new ProfileItem

v2rayN/ServiceLib/Handler/SubscriptionHandler.cs

@@ -82,7 +82,7 @@ public static class SubscriptionHandler
 
     private static DownloadService CreateDownloadHandler(string hashCode, Func<bool, string, Task> updateFunc)
     {
-        var downloadHandle = new DownloadService();
+        var downloadHandle = new DownloadService { AcceptHeader = "*/*" };
         downloadHandle.Error += (sender2, args) =>
         {
             updateFunc?.Invoke(false, $"{hashCode}{args.GetException().Message}");

v2rayN/ServiceLib/Helper/DownloaderHelper.cs

@@ -55,8 +55,6 @@ public class DownloaderHelper
         await using var stream = await downloader.DownloadFileTaskAsync(address: url, cts.Token);
         using StreamReader reader = new(stream);
 
-        downloadOpt = null;
-
         return await reader.ReadToEndAsync(cts.Token);
     }
 
@@ -128,72 +126,150 @@ public class DownloaderHelper
         using var cts = new CancellationTokenSource();
         cts.CancelAfter(TimeSpan.FromSeconds(timeout));
         await using var stream = await downloader.DownloadFileTaskAsync(address: url, cts.Token);
-
-        downloadOpt = null;
     }
 
-    public async Task DownloadFileAsync(IWebProxy? webProxy, string url, string fileName, IProgress<double> progress, int timeout)
+    public async Task DownloadFileAsync(IWebProxy? webProxy, FileDownloadRequest request, Action<FileDownloadState> onProgress, TimeSpan connectTimeout, CancellationToken cancellationToken = default)
     {
-        if (url.IsNullOrEmpty())
+        ArgumentNullException.ThrowIfNull(request);
+        if (request.FilePath.IsNullOrEmpty())
         {
-            throw new ArgumentNullException(nameof(url));
+            throw new ArgumentNullException(nameof(request.FilePath));
         }
-        if (fileName.IsNullOrEmpty())
+        if (File.Exists(request.FilePath))
         {
-            throw new ArgumentNullException(nameof(fileName));
-        }
-        if (File.Exists(fileName))
-        {
-            File.Delete(fileName);
+            File.Delete(request.FilePath);
         }
 
-        var connectTimeout = Math.Clamp(timeout / 5, 2, 5);
+        var state = new FileDownloadState
+        {
+            Request = request,
+        };
+
         var requestConfiguration = new RequestConfiguration()
         {
-            ConnectTimeout = connectTimeout * 1000,
-            Proxy = webProxy
+            ConnectTimeout = (int)connectTimeout.TotalMilliseconds,
+            Proxy = webProxy,
         };
         var downloadOpt = new DownloadConfiguration()
         {
-            BlockTimeout = timeout * 1000,
-            MaxTryAgainOnFailure = 2,
+            ChunkCount = 100,
+            MinimumChunkSize = 8 * 1024 * 1024, // 8 MB
+            MinimumSizeOfChunking = 8 * 1024 * 1024, // 8 MB
+            ParallelDownload = true,
+            ParallelCount = 4,
+
             RequestConfiguration = requestConfiguration,
             CustomHttpMessageHandlerFactory = () => GetSocketsHttpHandler(requestConfiguration),
         };
 
-        var progressPercentage = 0;
-        var hasValue = false;
         await using var downloader = new Downloader.DownloadService(downloadOpt);
-        downloader.DownloadStarted += (sender, value) => progress?.Report(0);
+        downloader.DownloadStarted += (sender, value) =>
+        {
+            state = state with
+            {
+                TotalBytes = value.TotalBytesToReceive,
+            };
+            onProgress.Invoke(state);
+        };
         downloader.DownloadProgressChanged += (sender, value) =>
         {
-            hasValue = true;
-            var percent = (int)value.ProgressPercentage;//   Convert.ToInt32((totalRead * 1d) / (total * 1d) * 100);
-            if (progressPercentage != percent && percent % 10 == 0)
+            state = state with
             {
-                progressPercentage = percent;
-                progress.Report(percent);
-            }
+                DownloadedBytes = value.ReceivedBytesSize,
+                TotalBytes = value.TotalBytesToReceive,
+                SpeedBytesPerSecond = value.BytesPerSecondSpeed,
+            };
+            onProgress.Invoke(state);
         };
         downloader.DownloadFileCompleted += (sender, value) =>
         {
-            if (progress != null)
+            state = state with
             {
-                if (hasValue && value.Error == null)
-                {
-                    progress.Report(101);
-                }
-                else if (value.Error != null)
-                {
-                    throw value.Error;
-                }
-            }
+                Completed = true,
+                Error = value.Error,
+            };
+            onProgress.Invoke(state);
         };
 
-        using var cts = new CancellationTokenSource();
-        await downloader.DownloadFileTaskAsync(url, fileName, cts.Token);
+        await downloader.DownloadFileTaskAsync(request.FileUrl, request.FilePath, cancellationToken);
+    }
 
-        downloadOpt = null;
+    public async Task DownloadSmallFilesAsync(IWebProxy? webProxy, List<FileDownloadRequest> requests, Action<ReadOnlyMemory<FileDownloadState>> onProgress, TimeSpan connectTimeout, CancellationToken cancellationToken = default)
+    {
+        if (requests is not { Count: > 0 })
+        {
+            throw new ArgumentNullException(nameof(requests));
+        }
+
+        var states = new FileDownloadState[requests.Count];
+        for (var i = 0; i < requests.Count; i++)
+        {
+            states[i] = new FileDownloadState
+            {
+                Request = requests[i],
+            };
+        }
+        var readOnlyStates = new ReadOnlyMemory<FileDownloadState>(states);
+
+        var requestConfiguration = new RequestConfiguration()
+        {
+            ConnectTimeout = (int)connectTimeout.TotalMilliseconds,
+            Proxy = webProxy,
+
+            KeepAlive = true,
+        };
+        using var socketsHttpHandler = GetSocketsHttpHandler(requestConfiguration);
+
+        var parallelOptions = new ParallelOptions
+        {
+            MaxDegreeOfParallelism = 4,
+            //CancellationToken = cancellationToken,
+        };
+
+        await Parallel.ForEachAsync(Enumerable.Range(0, requests.Count), parallelOptions, async (index, parallelCancellationToken) =>
+        {
+            var request = requests[index];
+            var downloadOpt = new DownloadConfiguration()
+            {
+                RequestConfiguration = requestConfiguration,
+                // ReSharper disable once AccessToDisposedClosure
+                CustomHttpMessageHandlerFactory = () => socketsHttpHandler,
+            };
+            await using var downloader = new Downloader.DownloadService(downloadOpt);
+            downloader.DownloadStarted += (sender, value) =>
+            {
+                states[index] = states[index] with
+                {
+                    DownloadedBytes = 0,
+                    TotalBytes = value.TotalBytesToReceive,
+                    SpeedBytesPerSecond = 0,
+                    Completed = false,
+                };
+                onProgress.Invoke(readOnlyStates);
+            };
+            downloader.DownloadProgressChanged += (sender, value) =>
+            {
+                states[index] = states[index] with
+                {
+                    DownloadedBytes = value.ReceivedBytesSize,
+                    TotalBytes = value.TotalBytesToReceive,
+                    SpeedBytesPerSecond = value.BytesPerSecondSpeed,
+                    Completed = false,
+                };
+                onProgress.Invoke(readOnlyStates);
+            };
+            downloader.DownloadFileCompleted += (sender, value) =>
+            {
+                var newState = states[index] with { Completed = true };
+                if (value.Error != null)
+                {
+                    newState = newState with { Error = value.Error };
+                }
+                states[index] = newState;
+                onProgress.Invoke(readOnlyStates);
+            };
+            await downloader.DownloadFileTaskAsync(request.FileUrl, request.FilePath, parallelCancellationToken);
+        });
     }
 
     // https://github.com/bezzad/Downloader/blob/a75a6e431acd6cbba6293f7afdcf676544a09174/src/Downloader/SocketClient.cs#L45
@@ -213,7 +289,7 @@ public class DownloaderHelper
             PooledConnectionIdleTimeout = config.KeepAliveTimeout,
             PooledConnectionLifetime = Timeout.InfiniteTimeSpan,
             EnableMultipleHttp2Connections = true,
-            ConnectTimeout = TimeSpan.FromMilliseconds(config.ConnectTimeout)
+            ConnectTimeout = TimeSpan.FromMilliseconds(config.ConnectTimeout),
         };
 
         // Set up the SslClientAuthenticationOptions for custom certificate validation

v2rayN/ServiceLib/Manager/CertPemManager.cs

@@ -281,6 +281,37 @@ public class CertPemManager
         }
     }
 
+    public static string GetLeafCertSha256Thumbprint(string pemCertChain, bool includeColon = false)
+    {
+        var certs = ParsePemChain(pemCertChain);
+        if (certs.Count == 0)
+        {
+            return string.Empty;
+        }
+        foreach (var certStr in certs)
+        {
+            try
+            {
+                var cert = X509Certificate2.CreateFromPem(certStr);
+                var extension = cert.Extensions
+                    .OfType<X509BasicConstraintsExtension>()
+                    .FirstOrDefault();
+                var isCa = extension?.CertificateAuthority == true;
+                if (isCa)
+                {
+                    continue;
+                }
+                var thumbprint = cert.GetCertHashString(HashAlgorithmName.SHA256);
+                return includeColon ? string.Join(":", thumbprint.Chunk(2).Select(c => new string(c))) : thumbprint;
+            }
+            catch
+            {
+                // Ignore
+            }
+        }
+        return string.Empty;
+    }
+
     private static readonly Lazy<X509Certificate2Collection> _chromeRootCerts = new(() =>
     {
         var pemText = EmbedUtils.GetEmbedText(Global.ChromeRootCertFileName);

v2rayN/ServiceLib/Manager/ClashApiManager.cs

@@ -1,113 +1,104 @@
-using static ServiceLib.Models.Dto.ClashProxies;
-
 namespace ServiceLib.Manager;
 
 public sealed class ClashApiManager
 {
+    private const string _tag = "ClashApiManager";
     private static readonly Lazy<ClashApiManager> instance = new(() => new());
     public static ClashApiManager Instance => instance.Value;
 
-    private static readonly string _tag = "ClashApiHandler";
-    private Dictionary<string, ProxiesItem>? _proxies;
-    public Dictionary<string, object> ProfileContent { get; set; }
+    private static string ApiUrl => $"{Global.HttpProtocol}{Global.Loopback}:{AppManager.Instance.StatePort2}";
 
-    public async Task<Tuple<ClashProxies, ClashProviders>?> GetClashProxiesAsync()
+    public async Task<ClashItem?> GetProxies()
     {
         for (var i = 0; i < 3; i++)
         {
-            var url = $"{GetApiUrl()}/proxies";
-            var result = await HttpClientHelper.Instance.TryGetAsync(url);
-            var clashProxies = JsonUtils.Deserialize<ClashProxies>(result);
+            var url = $"{ApiUrl}/proxies";
+            var resultTask = HttpClientHelper.Instance.TryGetAsync(url);
 
-            var url2 = $"{GetApiUrl()}/providers/proxies";
-            var result2 = await HttpClientHelper.Instance.TryGetAsync(url2);
+            var url2 = $"{ApiUrl}/providers/proxies";
+            var result2Task = HttpClientHelper.Instance.TryGetAsync(url2);
+
+            await Task.WhenAll(resultTask, result2Task);
+
+            var result = await resultTask;
+            var result2 = await result2Task;
+            var clashProxies = JsonUtils.Deserialize<ClashProxies>(result);
             var clashProviders = JsonUtils.Deserialize<ClashProviders>(result2);
 
-            if (clashProxies != null || clashProviders != null)
+            if (clashProxies is null && clashProviders is null)
             {
-                _proxies = clashProxies?.proxies;
-                return new Tuple<ClashProxies, ClashProviders>(clashProxies, clashProviders);
+                await Task.Delay(2000);
+                continue;
             }
 
-            await Task.Delay(2000);
+            var item = new ClashItem();
+            if (clashProxies?.proxies is { Count: > 0 } proxies)
+            {
+                item = item with { Proxies = proxies };
+            }
+            if (clashProviders.providers is { Count: > 0 } providers)
+            {
+                foreach (var provider in providers)
+                {
+                    foreach (var proxy in provider.Value.proxies ?? [])
+                    {
+                        if (string.IsNullOrEmpty(proxy.name)
+                            || !item.Proxies.TryAdd(proxy.name, proxy))
+                        {
+                            continue;
+                        }
+                        item.ProviderIndexMap.Add(proxy.name, provider.Key);
+                    }
+                }
+            }
+
+            return item;
         }
 
         return null;
     }
 
-    public void ClashProxiesDelayTest(bool blAll, List<ClashProxyModel> lstProxy, Func<ClashProxyModel?, string, Task> updateFunc)
+    public async Task<int> TestDelay(string name, ClashItem? clashItem)
     {
-        Task.Run(async () =>
+        if (clashItem?.ProviderIndexMap.TryGetValue(name, out var providerName) == true)
         {
-            if (blAll)
-            {
-                if (_proxies == null)
-                {
-                    await GetClashProxiesAsync();
-                }
-                lstProxy = [];
-                lstProxy.AddRange(from kv in _proxies ?? []
-                                  where !Global.notAllowTestType.Contains(kv.Value.type?.ToLower())
-                                  select new ClashProxyModel()
-                                  {
-                                      Name = kv.Value.name,
-                                      Type = kv.Value.type?.ToLower(),
-                                  });
-            }
-
-            if (lstProxy is not { Count: > 0 })
-            {
-                return;
-            }
-            var urlBase = $"{GetApiUrl()}/proxies";
-            urlBase += @"/{0}/delay?timeout=10000&url=" + AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl;
-
-            var tasks = new List<Task>();
-            foreach (var it in lstProxy)
-            {
-                if (Global.notAllowTestType.Contains(it.Type.ToLower()))
-                {
-                    continue;
-                }
-                var name = it.Name;
-                var url = string.Format(urlBase, name);
-                tasks.Add(Task.Run(async () =>
-                {
-                    var result = await HttpClientHelper.Instance.TryGetAsync(url);
-                    await updateFunc?.Invoke(it, result);
-                }));
-            }
-            await Task.WhenAll(tasks);
-            await Task.Delay(1000);
-            await updateFunc?.Invoke(null, "");
-        });
+            return await TestProviderProxyDelay(name, providerName);
+        }
+        return await TestProxyDelay(name);
     }
 
-    public List<ProxiesItem>? GetClashProxyGroups()
+    private async Task<int> TestProxyDelay(string name)
+    {
+        var url = $"{ApiUrl}/proxies/{Utils.UrlEncode(name)}/delay?timeout=10000&url=" +
+                  Utils.UrlEncode(AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl);
+        return await SendTestRequest(url);
+    }
+
+    private async Task<int> TestProviderProxyDelay(string name, string providerName)
+    {
+        var url =
+            $"{ApiUrl}/providers/proxies/{Utils.UrlEncode(providerName)}/{Utils.UrlEncode(name)}/healthcheck?timeout=10000&url=" +
+            Utils.UrlEncode(AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl);
+        return await SendTestRequest(url);
+    }
+
+    private async Task<int> SendTestRequest(string url)
+    {
+        var result = await HttpClientHelper.Instance.TryGetAsync(url);
+        var jsonObject = JsonUtils.ParseJson(result) as JsonObject;
+        return jsonObject?["delay"] is { } n && n.GetValueKind() == JsonValueKind.Number &&
+               n.GetValue<JsonElement>().TryGetInt32(out var v)
+            ? v
+            : -1;
+    }
+
+    public async Task SetActiveProxy(string groupName, string nodeName)
     {
         try
         {
-            var fileContent = ProfileContent;
-            if (fileContent is null || fileContent?.ContainsKey("proxy-groups") == false)
-            {
-                return null;
-            }
-            return JsonUtils.Deserialize<List<ProxiesItem>>(JsonUtils.Serialize(fileContent["proxy-groups"]));
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-            return null;
-        }
-    }
-
-    public async Task ClashSetActiveProxy(string name, string nameNode)
-    {
-        try
-        {
-            var url = $"{GetApiUrl()}/proxies/{name}";
+            var url = $"{ApiUrl}/proxies/{Utils.UrlEncode(groupName)}";
             var headers = new Dictionary<string, string>();
-            headers.Add("name", nameNode);
+            headers.Add("name", nodeName);
             await HttpClientHelper.Instance.PutAsync(url, headers);
         }
         catch (Exception ex)
@@ -116,39 +107,67 @@ public sealed class ClashApiManager
         }
     }
 
-    public async Task ClashConfigUpdate(Dictionary<string, string> headers)
+    public async Task UpdateClashMode(string mode)
     {
-        if (_proxies == null)
+        var headers = new Dictionary<string, string>
         {
-            return;
-        }
+            { "mode", mode },
+        };
+        await UpdateConfig(headers);
+    }
 
-        var urlBase = $"{GetApiUrl()}/configs";
+    public async Task UpdateConfig(Dictionary<string, string> headers)
+    {
+        var urlBase = $"{ApiUrl}/configs";
 
         await HttpClientHelper.Instance.PatchAsync(urlBase, headers);
     }
 
-    public async Task ClashConfigReload(string filePath)
+    public async Task<List<string>> GetClashModes()
     {
-        await ClashConnectionClose("");
-        try
+        var jsonNode = await GetConfig();
+        if ((jsonNode?["mode-list"] ?? jsonNode?["modes"]) is not JsonArray { Count: > 0 } modesArray)
         {
-            var url = $"{GetApiUrl()}/configs?force=true";
-            var headers = new Dictionary<string, string>();
-            headers.Add("path", filePath);
-            await HttpClientHelper.Instance.PutAsync(url, headers);
+            return [];
         }
-        catch (Exception ex)
+        var modes = new List<string>();
+        foreach (var mode in modesArray)
         {
-            Logging.SaveLog(_tag, ex);
+            if (mode is JsonValue jsonValue && jsonValue.GetValueKind() == JsonValueKind.String)
+            {
+                modes.Add(jsonValue.GetValue<string>());
+            }
         }
+        return modes;
     }
 
-    public async Task<ClashConnections?> GetClashConnectionsAsync()
+    public async Task<string?> GetClashMode()
+    {
+        var jsonNode = await GetConfig();
+        if (jsonNode["mode"] is not JsonValue jsonValue || jsonValue.GetValueKind() != JsonValueKind.String)
+        {
+            return null;
+        }
+        return jsonValue.GetValue<string>();
+    }
+
+    public async Task<JsonObject> GetConfig()
+    {
+        var url = $"{ApiUrl}/configs";
+        var result = await HttpClientHelper.Instance.TryGetAsync(url);
+        var jsonNode = JsonUtils.ParseJson(result);
+        if (jsonNode is not JsonObject jsonObject)
+        {
+            return new JsonObject();
+        }
+        return jsonObject;
+    }
+
+    public async Task<ClashConnections?> GetConnections()
     {
         try
         {
-            var url = $"{GetApiUrl()}/connections";
+            var url = $"{ApiUrl}/connections";
             var result = await HttpClientHelper.Instance.TryGetAsync(url);
             var clashConnections = JsonUtils.Deserialize<ClashConnections>(result);
 
@@ -162,11 +181,11 @@ public sealed class ClashApiManager
         return null;
     }
 
-    public async Task ClashConnectionClose(string id)
+    public async Task CloseConnection(string id)
     {
         try
         {
-            var url = $"{GetApiUrl()}/connections/{id}";
+            var url = $"{ApiUrl}/connections/{id}";
             await HttpClientHelper.Instance.DeleteAsync(url);
         }
         catch (Exception ex)
@@ -174,9 +193,4 @@ public sealed class ClashApiManager
             Logging.SaveLog(_tag, ex);
         }
     }
-
-    private string GetApiUrl()
-    {
-        return $"{Global.HttpProtocol}{Global.Loopback}:{AppManager.Instance.StatePort2}";
-    }
 }

v2rayN/ServiceLib/Manager/CoreInfoManager.cs

@@ -229,6 +229,7 @@ public sealed class CoreInfoManager
                     DownloadUrlLinuxLoong64 = urlSingbox + "/download/{0}/sing-box-{1}-linux-loong64.tar.gz",
                     DownloadUrlOSX64 = urlSingbox + "/download/{0}/sing-box-{1}-darwin-amd64.tar.gz",
                     DownloadUrlOSXArm64 = urlSingbox + "/download/{0}/sing-box-{1}-darwin-arm64.tar.gz",
+                    LockedMaxVersion = new SemanticVersion(1, 14, int.MaxValue),
                     Match = "sing-box",
                     VersionArg = "version",
                 },

v2rayN/ServiceLib/Manager/TaskManager.cs

@@ -12,7 +12,11 @@ public class TaskManager
         _config = config;
         _updateFunc = updateFunc;
 
-        Task.Run(ScheduledTasks);
+        _ = Task.Factory.StartNew(
+            ScheduledTasks,
+            CancellationToken.None,
+            TaskCreationOptions.LongRunning,
+            TaskScheduler.Default);
     }
 
     private async Task ScheduledTasks()
@@ -57,8 +61,8 @@ public class TaskManager
                 //Logging.SaveLog("Execute delete expired files");
 
                 FileUtils.DeleteExpiredFiles(Utils.GetBinConfigPath(), DateTime.Now.AddHours(-1), "Test");
-                FileUtils.DeleteExpiredFiles(Utils.GetLogPath(), DateTime.Now.AddMonths(-1));
-                FileUtils.DeleteExpiredFiles(Utils.GetTempPath(), DateTime.Now.AddMonths(-1));
+                FileUtils.DeleteExpiredFiles(Utils.GetLogPath(), DateTime.Now.AddDays(-7));
+                FileUtils.DeleteExpiredFiles(Utils.GetTempPath(), DateTime.Now.AddDays(-7));
 
                 try
                 {
@@ -136,7 +140,7 @@ public class TaskManager
 
         var updateService = new UpdateService(_config, async (success, msg) => await Task.CompletedTask);
 
-        var msgs = await updateService.CheckHasUpdateOnlyAll(_config.CheckUpdateItem.CheckPreReleaseUpdate);
+        var msgs = await updateService.CheckHasUpdateOnlyAll(_config.CheckUpdateItem.CheckPreReleaseUpdate, _config.CheckUpdateItem.UpdateViaProxy);
         foreach (var msg in msgs)
         {
             await _updateFunc?.Invoke(false, msg);

v2rayN/ServiceLib/Models/Configs/ConfigItems.cs

@@ -209,7 +209,6 @@ public class HysteriaItem
 [Serializable]
 public class ClashUIItem
 {
-    public ERuleMode RuleMode { get; set; }
     public bool EnableIPv6 { get; set; }
     public bool EnableMixinContent { get; set; }
     public int ProxiesSorting { get; set; }
@@ -244,6 +243,7 @@ public class WebDavItem
 public class CheckUpdateItem
 {
     public bool CheckPreReleaseUpdate { get; set; }
+    public bool UpdateViaProxy { get; set; } = true;
     public List<string>? SelectedCoreTypes { get; set; }
 }
 
@@ -279,6 +279,7 @@ public class SimpleDNSItem
     public bool? GlobalFakeIp { get; set; }
     public string? FakeIPRange { get; set; }
     public bool? BlockBindingQuery { get; set; }
+    public bool? BlockAAAAQuery { get; set; }
     public string? DirectDNS { get; set; }
     public string? RemoteDNS { get; set; }
     public string? BootstrapDNS { get; set; }

v2rayN/ServiceLib/Models/CoreConfigs/CoreConfigContext.cs

@@ -25,6 +25,10 @@ public record CoreConfigContext
     public bool IsWindows { get; init; }
     public bool IsMacOS { get; init; }
 
+    // Defaults to true so that a context built without this flag keeps routing IPv6 into the
+    // tunnel; only a positive detection of the host having no global IPv6 address turns it off.
+    public bool HasGlobalIPv6Address { get; init; } = true;
+
     // Generation Context
     public Dictionary<object, string> CustomOutboundMap { get; init; } = new();
 }

v2rayN/ServiceLib/Models/CoreConfigs/CoreInfo.cs

@@ -16,6 +16,7 @@ public class CoreInfo
     public string? DownloadUrlLinuxLoong64 { get; set; }
     public string? DownloadUrlOSX64 { get; set; }
     public string? DownloadUrlOSXArm64 { get; set; }
+    public SemanticVersion? LockedMaxVersion { get; set; }
     public string? Match { get; set; }
     public string? VersionArg { get; set; }
     public bool AbsolutePath { get; set; }

v2rayN/ServiceLib/Models/CoreConfigs/SingboxConfig.cs

@@ -8,6 +8,7 @@ public class SingboxConfig
     public List<Outbound4Sbox> outbounds { get; set; }
     public List<Endpoints4Sbox>? endpoints { get; set; }
     public Route4Sbox route { get; set; }
+    public List<HttpClient4Sbox>? http_clients { get; set; }
     public Experimental4Sbox? experimental { get; set; }
 }
 
@@ -24,6 +25,7 @@ public class Dns4Sbox
     public List<Server4Sbox> servers { get; set; }
     public List<Rule4Sbox> rules { get; set; }
     public string? final { get; set; }
+    public bool? optimistic { get; set; }
     public string? strategy { get; set; }
     public bool? disable_cache { get; set; }
     public bool? disable_expire { get; set; }
@@ -94,6 +96,11 @@ public class Rule4Sbox
     public bool? rule_set_ip_cidr_match_source { get; set; }
     public bool? rule_set_ip_cidr_accept_empty { get; set; }
     public bool? tls_record_fragment { get; set; }
+    public string? preferred_by { get; set; }
+    public string? match_response { get; set; } // or bool
+    public string? tag { get; set; }
+    public bool? race { get; set; }
+    public bool? speculative { get; set; }
 }
 
 [Serializable]
@@ -108,7 +115,6 @@ public class Inbound4Sbox
     public int? mtu { get; set; }
     public bool? auto_route { get; set; }
     public bool? strict_route { get; set; }
-    public bool? endpoint_independent_nat { get; set; }
     public string? stack { get; set; }
     public List<User4Sbox> users { get; set; }
     public List<string>? route_exclude_address { get; set; }
@@ -318,10 +324,12 @@ public class Ruleset4Sbox
     public string? format { get; set; }
     public string? path { get; set; }
     public string? url { get; set; }
-    public string? download_detour { get; set; }
+    public string? http_client { get; set; }
     public string? update_interval { get; set; }
 }
 
+public class HttpClient4Sbox : BaseServer4Sbox;
+
 public abstract class DialFields4Sbox
 {
     public string? detour { get; set; }

v2rayN/ServiceLib/Models/CoreConfigs/V2rayConfig.cs

@@ -172,6 +172,8 @@ public class Outboundsettings4Ray
     public int? workers { get; set; }
 
     public int? version { get; set; }
+
+    public List<string>? remoteDNS { get; set; }
 }
 
 public class WireguardPeer4Ray
@@ -241,6 +243,7 @@ public class Dns4Ray
     public List<object> servers { get; set; }
     public bool? serveStale { get; set; }
     public bool? enableParallelQuery { get; set; }
+    public string? queryStrategy { get; set; }
     public string? tag { get; set; }
 }
 

v2rayN/ServiceLib/Models/Dto/AvailabilityCheckResult.cs

@@ -0,0 +1,6 @@
+namespace ServiceLib.Models.Dto;
+
+public sealed record AvailabilityCheckResult(int Time, string Ip)
+{
+    public string? GetValidIp() => Ip == Global.None ? null : Ip;
+}

v2rayN/ServiceLib/Models/Dto/ClashItem.cs

@@ -0,0 +1,44 @@
+namespace ServiceLib.Models.Dto;
+
+public record ClashItem
+{
+    public Dictionary<string, ClashProxy> Proxies { get; init; } = [];
+    public Dictionary<string, string> ProviderIndexMap { get; init; } = [];
+
+    public bool IsEmpty() => Proxies.Count == 0;
+}
+
+public record ClashProxy
+{
+    public List<string>? all { get; init; }
+    public List<HistoryItem>? history { get; init; }
+    public string? name { get; init; }
+    public string? type { get; init; }
+    public bool udp { get; init; }
+    public string? now { get; init; }
+    public int delay { get; init; }
+
+    public record HistoryItem
+    {
+        public string? time { get; init; }
+        public int delay { get; init; }
+    }
+}
+
+public record ClashProvider
+{
+    public string? name { get; init; }
+    public List<ClashProxy>? proxies { get; init; }
+    public string? type { get; init; }
+    public string? vehicleType { get; init; }
+}
+
+public record ClashProxies
+{
+    public Dictionary<string, ClashProxy> proxies { get; init; } = [];
+}
+
+public record ClashProviders
+{
+    public Dictionary<string, ClashProvider> providers { get; init; } = [];
+}

v2rayN/ServiceLib/Models/Dto/ClashProviders.cs

@@ -1,16 +0,0 @@
-using static ServiceLib.Models.Dto.ClashProxies;
-
-namespace ServiceLib.Models.Dto;
-
-public class ClashProviders
-{
-    public Dictionary<string, ProvidersItem>? providers { get; set; }
-
-    public class ProvidersItem
-    {
-        public string? name { get; set; }
-        public List<ProxiesItem>? proxies { get; set; }
-        public string? type { get; set; }
-        public string? vehicleType { get; set; }
-    }
-}

v2rayN/ServiceLib/Models/Dto/ClashProxies.cs

@@ -1,23 +0,0 @@
-namespace ServiceLib.Models.Dto;
-
-public class ClashProxies
-{
-    public Dictionary<string, ProxiesItem>? proxies { get; set; }
-
-    public class ProxiesItem
-    {
-        public List<string>? all { get; set; }
-        public List<HistoryItem>? history { get; set; }
-        public string? name { get; set; }
-        public string? type { get; set; }
-        public bool udp { get; set; }
-        public string? now { get; set; }
-        public int delay { get; set; }
-    }
-
-    public class HistoryItem
-    {
-        public string? time { get; set; }
-        public int delay { get; set; }
-    }
-}

v2rayN/ServiceLib/Models/Dto/ClashProxyModel.cs

@@ -3,9 +3,9 @@ namespace ServiceLib.Models.Dto;
 [Serializable]
 public partial class ClashProxyModel : ReactiveObject
 {
-    public string? Name { get; set; }
+    public required string Name { get; set; }
 
-    public string? Type { get; set; }
+    public required string Type { get; set; }
 
     public string? Now { get; set; }
 

v2rayN/ServiceLib/Models/Dto/FileDownloadState.cs

@@ -0,0 +1,22 @@
+namespace ServiceLib.Models.Dto;
+
+public record FileDownloadState
+{
+    public required FileDownloadRequest Request { get; init; }
+    public long DownloadedBytes { get; init; } = 0;
+    public long TotalBytes { get; init; } = 0;
+    public double SpeedBytesPerSecond { get; init; } = 0;
+    public bool Completed { get; init; } = false;
+
+    public Exception? Error { get; init; }
+    public bool IsFailed => Error != null;
+}
+
+public record FileDownloadRequest
+{
+    public required string FileUrl { get; init; }
+    public required string FilePath { get; init; }
+    public string? DisplayFileName { get; init; }
+
+    public string FileName => DisplayFileName ?? Path.GetFileName(FilePath);
+}

v2rayN/ServiceLib/Models/Dto/SemanticVersion.cs

@@ -1,18 +1,20 @@
 namespace ServiceLib.Models.Dto;
 
-public class SemanticVersion
+public class SemanticVersion : IEquatable<SemanticVersion>, IComparable
 {
+    private readonly string? build;
     private readonly int major;
     private readonly int minor;
     private readonly int patch;
-    private readonly string version;
+    private readonly string? prerelease;
+    private readonly string raw;
 
     public SemanticVersion(int major, int minor, int patch)
     {
         this.major = major;
         this.minor = minor;
         this.patch = patch;
-        version = $"{major}.{minor}.{patch}";
+        raw = $"{major}.{minor}.{patch}";
     }
 
     public SemanticVersion(string? version)
@@ -24,26 +26,41 @@ public class SemanticVersion
                 major = 0;
                 minor = 0;
                 patch = 0;
+                raw = $"{major}.{minor}.{patch}";
                 return;
             }
-            this.version = version.RemovePrefix('v');
+            raw = version;
 
-            var parts = this.version.Split('.');
-            if (parts.Length == 2)
+            var span = version.StartsWith("v", StringComparison.OrdinalIgnoreCase)
+                ? version.AsSpan(1)
+                : version.AsSpan();
+            var plusIdx = span.IndexOf('+');
+            var metadataSpan = plusIdx >= 0 ? span[(plusIdx + 1)..] : [];
+            var leftOfPlus = plusIdx >= 0 ? span[..plusIdx] : span;
+            var dashIdx = leftOfPlus.IndexOf('-');
+            var versionSpan = dashIdx >= 0 ? leftOfPlus[..dashIdx] : leftOfPlus;
+            var preReleaseSpan = dashIdx >= 0 ? leftOfPlus[(dashIdx + 1)..] : [];
+
+            build = metadataSpan.Length > 0 ? metadataSpan.ToString() : null;
+            prerelease = preReleaseSpan.Length > 0 ? preReleaseSpan.ToString() : null;
+
+            var parts = versionSpan.ToString().Split('.');
+            switch (parts.Length)
             {
-                major = int.Parse(parts.First());
-                minor = int.Parse(parts.Last());
-                patch = 0;
-            }
-            else if (parts.Length is 3 or 4)
-            {
-                major = int.Parse(parts[0]);
-                minor = int.Parse(parts[1]);
-                patch = int.Parse(parts[2]);
-            }
-            else
-            {
-                throw new ArgumentException("Invalid version string");
+                case 2:
+                    major = int.Parse(parts.First());
+                    minor = int.Parse(parts.Last());
+                    patch = 0;
+                    break;
+
+                case 3 or 4:
+                    major = int.Parse(parts[0]);
+                    minor = int.Parse(parts[1]);
+                    patch = int.Parse(parts[2]);
+                    break;
+
+                default:
+                    throw new ArgumentException("Invalid version string");
             }
         }
         catch
@@ -51,135 +68,186 @@ public class SemanticVersion
             major = 0;
             minor = 0;
             patch = 0;
+            raw = $"{major}.{minor}.{patch}";
+        }
+    }
+
+    public bool Equals(SemanticVersion? other)
+    {
+        if (other is null)
+        {
+            return false;
+        }
+        if (ReferenceEquals(this, other))
+        {
+            return true;
+        }
+        return major == other.major && minor == other.minor && patch == other.patch && prerelease == other.prerelease;
+    }
+
+    public static bool TryParse(string? version, out SemanticVersion? result)
+    {
+        try
+        {
+            result = new SemanticVersion(version);
+            return true;
+        }
+        catch
+        {
+            result = null;
+            return false;
         }
     }
 
     public override bool Equals(object? obj)
     {
-        if (obj is SemanticVersion other)
-        {
-            return major == other.major && minor == other.minor && patch == other.patch;
-        }
-        else
-        {
-            return false;
-        }
+        return obj is SemanticVersion other && Equals(other);
     }
 
     public override int GetHashCode()
     {
-        return major.GetHashCode() ^ minor.GetHashCode() ^ patch.GetHashCode();
+        return HashCode.Combine(major, minor, patch, prerelease);
     }
 
-    /// <summary>
-    /// Use ToVersionString(string? prefix) instead if possible.
-    /// </summary>
-    /// <returns>major.minor.patch</returns>
     public override string ToString()
     {
-        return version;
+        return raw;
     }
 
-    public string ToVersionString(string? prefix = null)
+    public string ToStandardVersionString(string? prefix = null)
     {
-        if (prefix == null)
+        var sb = new StringBuilder();
+        if (!string.IsNullOrEmpty(prefix))
         {
-            return version;
+            sb.Append(prefix);
         }
-        else
+        sb.Append($"{major}.{minor}.{patch}");
+        if (!string.IsNullOrEmpty(prerelease))
         {
-            return $"{prefix}{version}";
+            sb.Append($"-{prerelease}");
         }
+        if (!string.IsNullOrEmpty(build))
+        {
+            sb.Append($"+{build}");
+        }
+        return sb.ToString();
     }
 
-    public static bool operator ==(SemanticVersion v1, SemanticVersion v2)
-    { return v1.Equals(v2); }
+    public static bool operator <(SemanticVersion left, SemanticVersion right)
+    {
+        return left.CompareTo(right) < 0;
+    }
 
-    public static bool operator !=(SemanticVersion v1, SemanticVersion v2)
-    { return !v1.Equals(v2); }
+    public static bool operator >(SemanticVersion left, SemanticVersion right)
+    {
+        return left.CompareTo(right) > 0;
+    }
 
-    public static bool operator >=(SemanticVersion v1, SemanticVersion v2)
-    { return v1.GreaterEquals(v2); }
+    public static bool operator <=(SemanticVersion left, SemanticVersion right)
+    {
+        return left.CompareTo(right) <= 0;
+    }
 
-    public static bool operator <=(SemanticVersion v1, SemanticVersion v2)
-    { return v1.LessEquals(v2); }
+    public static bool operator >=(SemanticVersion left, SemanticVersion right)
+    {
+        return left.CompareTo(right) >= 0;
+    }
 
     #region Private
 
-    private bool GreaterEquals(SemanticVersion other)
+    public int CompareTo(SemanticVersion other)
     {
-        if (major < other.major)
+        if (major != other.major)
         {
-            return false;
+            return major.CompareTo(other.major);
         }
-        else if (major > other.major)
+        if (minor != other.minor)
         {
-            return true;
+            return minor.CompareTo(other.minor);
         }
-        else
+        if (patch != other.patch)
         {
-            if (minor < other.minor)
+            return patch.CompareTo(other.patch);
+        }
+        return ComparePreRelease(prerelease, other.prerelease);
+    }
+
+    public int CompareTo(object? obj)
+    {
+        if (obj is null)
+        {
+            return 1;
+        }
+        if (obj is SemanticVersion other)
+        {
+            return CompareTo(other);
+        }
+        throw new ArgumentException("Object is not a SemanticVersion");
+    }
+
+    private static int ComparePreRelease(string? left, string? right)
+    {
+        if (string.IsNullOrEmpty(left) && string.IsNullOrEmpty(right))
+        {
+            return 0;
+        }
+        if (string.IsNullOrEmpty(left))
+        {
+            return 1;
+        }
+        if (string.IsNullOrEmpty(right))
+        {
+            return -1;
+        }
+
+        var leftSpan = left.AsSpan();
+        var rightSpan = right.AsSpan();
+        using var leftEnum = leftSpan.Split('.').GetEnumerator();
+        using var rightEnum = rightSpan.Split('.').GetEnumerator();
+
+        while (true)
+        {
+            var hasLeft = leftEnum.MoveNext();
+            var hasRight = rightEnum.MoveNext();
+
+            if (!hasLeft && !hasRight)
             {
-                return false;
+                return 0;
             }
-            else if (minor > other.minor)
+            if (!hasLeft)
             {
-                return true;
+                return -1;
             }
-            else
+            if (!hasRight)
             {
-                if (patch < other.patch)
-                {
-                    return false;
-                }
-                else if (patch > other.patch)
-                {
-                    return true;
-                }
-                else
-                {
-                    return true;
-                }
+                return 1;
+            }
+
+            var leftSegment = leftSpan[leftEnum.Current];
+            var rightSegment = rightSpan[rightEnum.Current];
+
+            var segCmp = CompareSegment(leftSegment, rightSegment);
+            if (segCmp != 0)
+            {
+                return segCmp;
             }
         }
     }
 
-    private bool LessEquals(SemanticVersion other)
+    private static int CompareSegment(ReadOnlySpan<char> left, ReadOnlySpan<char> right)
     {
-        if (major < other.major)
+        var leftIsNum = ulong.TryParse(left, out var leftNum);
+        var rightIsNum = ulong.TryParse(right, out var rightNum);
+
+        return (leftIsNum, rightIsNum) switch
         {
-            return true;
-        }
-        else if (major > other.major)
-        {
-            return false;
-        }
-        else
-        {
-            if (minor < other.minor)
-            {
-                return true;
-            }
-            else if (minor > other.minor)
-            {
-                return false;
-            }
-            else
-            {
-                if (patch < other.patch)
-                {
-                    return true;
-                }
-                else if (patch > other.patch)
-                {
-                    return false;
-                }
-                else
-                {
-                    return true;
-                }
-            }
-        }
+            (true, true) => leftNum.CompareTo(rightNum),
+
+            (false, true) => 1,
+            (true, false) => -1,
+
+            (false, false) => left.SequenceCompareTo(right),
+        };
     }
 
     #endregion Private

v2rayN/ServiceLib/Models/Entities/ProtocolExtraItem.cs

@@ -27,6 +27,7 @@ public record ProtocolExtraItem
     public string? WgInterfaceAddress { get; init; }
     public string? WgReserved { get; init; }
     public int? WgMtu { get; init; }
+    public string? WgDns { get; init; }
 
     // hysteria2
     public string? SalamanderPass { get; init; }

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -987,6 +987,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Latency Test 的本地化字符串。
+        /// </summary>
+        public static string menuDelaytest {
+            get {
+                return ResourceManager.GetString("menuDelaytest", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 DNS Settings 的本地化字符串。
         /// </summary>
@@ -1401,15 +1410,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Latency Test 的本地化字符串。
-        /// </summary>
-        public static string menuProxiesDelaytest {
-            get {
-                return ResourceManager.GetString("menuProxiesDelaytest", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Part Node Latency Test 的本地化字符串。
         /// </summary>
@@ -2769,6 +2769,24 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Block AAAA Queries 的本地化字符串。
+        /// </summary>
+        public static string TbBlockAAAAQueries {
+            get {
+                return ResourceManager.GetString("TbBlockAAAAQueries", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Block IPv6 queries when enabled 的本地化字符串。
+        /// </summary>
+        public static string TbBlockAAAAQueriesTips {
+            get {
+                return ResourceManager.GetString("TbBlockAAAAQueriesTips", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Block SVCB and HTTPS Queries 的本地化字符串。
         /// </summary>
@@ -2779,7 +2797,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Block ECH and HTTP/3 availability checks when enabled 的本地化字符串。
+        ///   查找类似 Block ECH and HTTP/3 availability checks when enabled. Always enabled in Xray 的本地化字符串。
         /// </summary>
         public static string TbBlockSVCBHTTPSQueriesTips {
             get {
@@ -2997,6 +3015,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 DNS 的本地化字符串。
+        /// </summary>
+        public static string TbDNS {
+            get {
+                return ResourceManager.GetString("TbDNS", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 DNS Hosts: (&quot;domain1 ip1 ip2&quot; per line) 的本地化字符串。
         /// </summary>
@@ -4211,6 +4238,15 @@ namespace ServiceLib.Resx {
                 return ResourceManager.GetString("TbSettingsEnableCheckPreReleaseUpdate", resourceCulture);
             }
         }
+
+        /// <summary>
+        ///   查找类似 Update via proxy 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableUpdateViaProxy {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableUpdateViaProxy", resourceCulture);
+            }
+        }
         
         /// <summary>
         ///   查找类似 Enable sorting Configurations by drag-n-drop (requires restart) 的本地化字符串。
@@ -4509,6 +4545,42 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Xray Mux setting 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsMux4Ray {
+            get {
+                return ResourceManager.GetString("TbSettingsMux4Ray", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Xray Mux concurrency 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsMux4RayConcurrency {
+            get {
+                return ResourceManager.GetString("TbSettingsMux4RayConcurrency", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Xray Mux XUDP concurrency 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsMux4RayXudpConcurrency {
+            get {
+                return ResourceManager.GetString("TbSettingsMux4RayXudpConcurrency", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Xray Mux XUDP proxy UDP443 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsMux4RayXudpProxyUDP443 {
+            get {
+                return ResourceManager.GetString("TbSettingsMux4RayXudpProxyUDP443", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 sing-box Mux Protocol 的本地化字符串。
         /// </summary>
@@ -5031,6 +5103,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Xray Only 的本地化字符串。
+        /// </summary>
+        public static string TbXrayOnly {
+            get {
+                return ResourceManager.GetString("TbXrayOnly", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 The delay: {0} ms, {1} 的本地化字符串。
         /// </summary>

v2rayN/ServiceLib/Resx/ResUI.fa.resx

@@ -693,6 +693,9 @@
   <data name="TbSettingsEnableCheckPreReleaseUpdate" xml:space="preserve">
     <value>به روز رسانی های پیش از انتشار را بررسی شود</value>
   </data>
+  <data name="TbSettingsEnableUpdateViaProxy" xml:space="preserve">
+    <value>به‌روزرسانی از طریق پروکسی</value>
+  </data>
   <data name="TbSettingsException" xml:space="preserve">
     <value>استثنا</value>
   </data>
@@ -1215,7 +1218,7 @@
   <data name="menuModeRule" xml:space="preserve">
     <value>قانون</value>
   </data>
-  <data name="menuProxiesDelaytest" xml:space="preserve">
+  <data name="menuDelaytest" xml:space="preserve">
     <value>تست تأخیر</value>
   </data>
   <data name="menuProxiesDelaytestPart" xml:space="preserve">
@@ -1456,7 +1459,7 @@
     <value>Custom DNS Enabled, This Page's Settings Invalid</value>
   </data>
   <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
-    <value>Block ECH and HTTP/3 availability checks when enabled</value>
+    <value>Block ECH and HTTP/3 availability checks when enabled. Always enabled in Xray</value>
   </data>
   <data name="FillCorrectConfigTemplateText" xml:space="preserve">
     <value>Please fill in the correct config template</value>

v2rayN/ServiceLib/Resx/ResUI.fr.resx

@@ -1212,7 +1212,7 @@
   <data name="menuModeRule" xml:space="preserve">
     <value>Règle</value>
   </data>
-  <data name="menuProxiesDelaytest" xml:space="preserve">
+  <data name="menuDelaytest" xml:space="preserve">
     <value>Test de latence</value>
   </data>
   <data name="menuProxiesDelaytestPart" xml:space="preserve">
@@ -1453,7 +1453,7 @@
     <value>DNS personnalisé activé ; la configuration de cette page sera ignorée</value>
   </data>
   <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
-    <value>Une fois activé, bloque les requêtes ECH et de disponibilité HTTP/3</value>
+    <value>Block ECH and HTTP/3 availability checks when enabled. Always enabled in Xray</value>
   </data>
   <data name="FillCorrectConfigTemplateText" xml:space="preserve">
     <value>Veuillez saisir un modèle de configuration valide</value>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -1215,7 +1215,7 @@
   <data name="menuModeRule" xml:space="preserve">
     <value>Szabály</value>
   </data>
-  <data name="menuProxiesDelaytest" xml:space="preserve">
+  <data name="menuDelaytest" xml:space="preserve">
     <value>Késleltetés teszt</value>
   </data>
   <data name="menuProxiesDelaytestPart" xml:space="preserve">
@@ -1456,7 +1456,7 @@
     <value>Custom DNS Enabled, This Page's Settings Invalid</value>
   </data>
   <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
-    <value>Block ECH and HTTP/3 availability checks when enabled</value>
+    <value>Block ECH and HTTP/3 availability checks when enabled. Always enabled in Xray</value>
   </data>
   <data name="FillCorrectConfigTemplateText" xml:space="preserve">
     <value>Please fill in the correct config template</value>

v2rayN/ServiceLib/Resx/ResUI.id.resx

@@ -1215,7 +1215,7 @@
   <data name="menuModeRule" xml:space="preserve">
     <value>Aturan</value>
   </data>
-  <data name="menuProxiesDelaytest" xml:space="preserve">
+  <data name="menuDelaytest" xml:space="preserve">
     <value>Uji latensi</value>
   </data>
   <data name="menuProxiesDelaytestPart" xml:space="preserve">
@@ -1456,7 +1456,7 @@
     <value>DNS kustom diaktifkan, pengaturan halaman ini tidak berlaku</value>
   </data>
   <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
-    <value>Blokir pemeriksaan ketersediaan ECH dan HTTP/3 saat diaktifkan</value>
+    <value>Block ECH and HTTP/3 availability checks when enabled. Always enabled in Xray</value>
   </data>
   <data name="FillCorrectConfigTemplateText" xml:space="preserve">
     <value>Isi template konfigurasi yang benar</value>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -693,6 +693,9 @@
   <data name="TbSettingsEnableCheckPreReleaseUpdate" xml:space="preserve">
     <value>Check for pre-release</value>
   </data>
+  <data name="TbSettingsEnableUpdateViaProxy" xml:space="preserve">
+    <value>Update via proxy</value>
+  </data>
   <data name="TbSettingsException" xml:space="preserve">
     <value>Exception</value>
   </data>
@@ -1020,6 +1023,15 @@
   <data name="TbSettingsMux4SboxProtocol" xml:space="preserve">
     <value>sing-box Mux Protocol</value>
   </data>
+  <data name="TbSettingsMux4RayConcurrency" xml:space="preserve">
+    <value>Xray Mux concurrency</value>
+  </data>
+  <data name="TbSettingsMux4RayXudpConcurrency" xml:space="preserve">
+    <value>Xray Mux XUDP concurrency</value>
+  </data>
+  <data name="TbSettingsMux4RayXudpProxyUDP443" xml:space="preserve">
+    <value>Xray Mux XUDP proxy UDP443</value>
+  </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
     <value>Process (Linux/Windows)</value>
   </data>
@@ -1221,7 +1233,7 @@
   <data name="menuModeRule" xml:space="preserve">
     <value>Rule</value>
   </data>
-  <data name="menuProxiesDelaytest" xml:space="preserve">
+  <data name="menuDelaytest" xml:space="preserve">
     <value>Latency Test</value>
   </data>
   <data name="menuProxiesDelaytestPart" xml:space="preserve">
@@ -1462,7 +1474,7 @@
     <value>Custom DNS Enabled, This Page's Settings Invalid</value>
   </data>
   <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
-    <value>Block ECH and HTTP/3 availability checks when enabled</value>
+    <value>Block ECH and HTTP/3 availability checks when enabled. Always enabled in Xray</value>
   </data>
   <data name="FillCorrectConfigTemplateText" xml:space="preserve">
     <value>Please fill in the correct config template</value>
@@ -1860,4 +1872,19 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="LvCustomCoreType" xml:space="preserve">
     <value>Custom config core</value>
   </data>
-</root>
+  <data name="TbXrayOnly" xml:space="preserve">
+    <value>Xray Only</value>
+  </data>
+  <data name="TbBlockAAAAQueries" xml:space="preserve">
+    <value>Block AAAA Queries</value>
+  </data>
+  <data name="TbBlockAAAAQueriesTips" xml:space="preserve">
+    <value>Block IPv6 queries when enabled</value>
+  </data>
+  <data name="TbDNS" xml:space="preserve">
+    <value>DNS</value>
+  </data>
+  <data name="TbSettingsMux4Ray" xml:space="preserve">
+    <value>Xray Mux setting</value>
+  </data>
+</root>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1221,7 +1221,7 @@
   <data name="menuModeRule" xml:space="preserve">
     <value>Правила</value>
   </data>
-  <data name="menuProxiesDelaytest" xml:space="preserve">
+  <data name="menuDelaytest" xml:space="preserve">
     <value>Тест задержки</value>
   </data>
   <data name="menuProxiesDelaytestPart" xml:space="preserve">
@@ -1462,7 +1462,7 @@
     <value>Включён пользовательский DNS — настройки на этой странице не применяются</value>
   </data>
   <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
-    <value>При включении блокирует проверки доступности ECH и HTTP/3</value>
+    <value>При включении блокирует запросы доступности ECH и HTTP/3. В Xray включено всегда</value>
   </data>
   <data name="FillCorrectConfigTemplateText" xml:space="preserve">
     <value>Пожалуйста, заполните корректный шаблон конфигурации</value>
@@ -1860,4 +1860,13 @@
   <data name="LvCustomCoreType" xml:space="preserve">
     <value>Ядро пользовательской конфигурации</value>
   </data>
+  <data name="TbXrayOnly" xml:space="preserve">
+    <value>Только Xray</value>
+  </data>
+  <data name="TbBlockAAAAQueries" xml:space="preserve">
+    <value>Блокировать DNS-запросы AAAA</value>
+  </data>
+  <data name="TbBlockAAAAQueriesTips" xml:space="preserve">
+    <value>При включении блокирует DNS-запросы IPv6</value>
+  </data>
 </root>

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

@@ -693,6 +693,9 @@
   <data name="TbSettingsEnableCheckPreReleaseUpdate" xml:space="preserve">
     <value>检查 Pre-Release</value>
   </data>
+  <data name="TbSettingsEnableUpdateViaProxy" xml:space="preserve">
+    <value>通过代理更新</value>
+  </data>
   <data name="TbSettingsException" xml:space="preserve">
     <value>例外</value>
   </data>
@@ -1218,7 +1221,7 @@
   <data name="menuModeRule" xml:space="preserve">
     <value>规则</value>
   </data>
-  <data name="menuProxiesDelaytest" xml:space="preserve">
+  <data name="menuDelaytest" xml:space="preserve">
     <value>延迟测试</value>
   </data>
   <data name="menuProxiesDelaytestPart" xml:space="preserve">
@@ -1459,7 +1462,7 @@
     <value>自定义 DNS 已启用，此页面配置将无效</value>
   </data>
   <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
-    <value>开启后将阻止 ECH 和 HTTP/3 可用性查询</value>
+    <value>开启后将阻止 ECH 和 HTTP/3 可用性查询。Xray 固定开启</value>
   </data>
   <data name="FillCorrectConfigTemplateText" xml:space="preserve">
     <value>请填写正确的配置模板</value>
@@ -1861,4 +1864,19 @@
   <data name="LvCustomCoreType" xml:space="preserve">
     <value>自定义配置核心</value>
   </data>
+  <data name="TbXrayOnly" xml:space="preserve">
+    <value>仅 Xray</value>
+  </data>
+  <data name="TbBlockAAAAQueries" xml:space="preserve">
+    <value>阻止 AAAA 查询</value>
+  </data>
+  <data name="TbBlockAAAAQueriesTips" xml:space="preserve">
+    <value>开启后将阻止 IPv6 查询</value>
+  </data>
+  <data name="TbDNS" xml:space="preserve">
+    <value>DNS</value>
+  </data>
+  <data name="TbSettingsMux4Ray" xml:space="preserve">
+    <value>Xray Mux 设置</value>
+  </data>
 </root>

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

@@ -693,6 +693,9 @@
   <data name="TbSettingsEnableCheckPreReleaseUpdate" xml:space="preserve">
     <value>檢查 Pre-Release</value>
   </data>
+  <data name="TbSettingsEnableUpdateViaProxy" xml:space="preserve">
+    <value>透過代理更新</value>
+  </data>
   <data name="TbSettingsException" xml:space="preserve">
     <value>例外</value>
   </data>
@@ -1218,7 +1221,7 @@
   <data name="menuModeRule" xml:space="preserve">
     <value>規則</value>
   </data>
-  <data name="menuProxiesDelaytest" xml:space="preserve">
+  <data name="menuDelaytest" xml:space="preserve">
     <value>延遲測試</value>
   </data>
   <data name="menuProxiesDelaytestPart" xml:space="preserve">
@@ -1459,7 +1462,7 @@
     <value>已啟用自訂 DNS，此頁面的設定將不會生效</value>
   </data>
   <data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
-    <value>啟用後將封鎖 ECH 與 HTTP/3 可用性查詢</value>
+    <value>啟用後將封鎖 ECH 與 HTTP/3 可用性查詢。Xray 固定啟用</value>
   </data>
   <data name="FillCorrectConfigTemplateText" xml:space="preserve">
     <value>請填寫正確的設定範本</value>
@@ -1861,4 +1864,4 @@
   <data name="LvCustomCoreType" xml:space="preserve">
     <value>自訂設定核心</value>
   </data>
-</root>
+</root>

v2rayN/ServiceLib/Sample/dns_singbox_normal

@@ -17,17 +17,15 @@
       "rule_set": [
         "geosite-google"
       ],
-      "server": "remote",
-      "strategy": "prefer_ipv4"
+      "server": "remote"
     },
     {
       "rule_set": [
         "geosite-cn"
       ],
-      "server": "local",
-      "strategy": "prefer_ipv4"
+      "server": "local"
     }
   ],
   "final": "remote",
   "strategy": "prefer_ipv4"
-}
+}

v2rayN/ServiceLib/Sample/tun_singbox_dns

@@ -17,15 +17,13 @@
       "rule_set": [
         "geosite-google"
       ],
-      "server": "remote",
-      "strategy": "prefer_ipv4"
+      "server": "remote"
     },
     {
       "rule_set": [
         "geosite-cn"
       ],
-      "server": "local",
-      "strategy": "prefer_ipv4"
+      "server": "local"
     }
   ],
   "final": "remote",

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs

@@ -1,3 +1,6 @@
+using YamlDotNet.Core;
+using YamlDotNet.RepresentationModel;
+
 namespace ServiceLib.Services.CoreConfig;
 
 /// <summary>
@@ -91,17 +94,7 @@ public class CoreConfigClashService(Config config, bool isTunEnabled)
             fileContent["ipv6"] = config.ClashUIItem.EnableIPv6;
 
             //mode
-            if (!fileContent.ContainsKey("mode"))
-            {
-                fileContent["mode"] = nameof(ERuleMode.Rule).ToLower();
-            }
-            else
-            {
-                if (config.ClashUIItem.RuleMode != ERuleMode.Unchanged)
-                {
-                    fileContent["mode"] = config.ClashUIItem.RuleMode.ToString().ToLower();
-                }
-            }
+            fileContent.TryAdd("mode", nameof(ERuleMode.Rule));
 
             //enable tun mode
             if (isTunEnabled)
@@ -127,7 +120,27 @@ public class CoreConfigClashService(Config config, bool isTunEnabled)
                 Logging.SaveLog($"{_tag}-Mixin", ex);
             }
 
+            // Mihomo parses plain values such as 815458e4 as floats, so quote REALITY short IDs.
+            var originalRealityShortIds = new List<(Dictionary<object, object> RealityOptions, string ShortId)>();
+            if (fileContent.GetValueOrDefault("proxies") is List<object> proxies)
+            {
+                foreach (var proxy in proxies.OfType<Dictionary<object, object>>())
+                {
+                    if (proxy.GetValueOrDefault("reality-opts") is Dictionary<object, object> realityOptions
+                        && realityOptions.GetValueOrDefault("short-id") is string shortId
+                        && !shortId.StartsWith(tagYamlStr2, StringComparison.Ordinal))
+                    {
+                        originalRealityShortIds.Add((realityOptions, shortId));
+                        realityOptions["short-id"] = new YamlScalarNode(shortId) { Style = ScalarStyle.DoubleQuoted };
+                    }
+                }
+            }
+
             var txtFileNew = YamlUtils.ToYaml(fileContent).Replace(tagYamlStr2, tagYamlStr3);
+            foreach (var (realityOptions, shortId) in originalRealityShortIds)
+            {
+                realityOptions["short-id"] = shortId;
+            }
             await File.WriteAllTextAsync(fileName, txtFileNew);
             //check again
             if (!File.Exists(fileName))
@@ -136,8 +149,6 @@ public class CoreConfigClashService(Config config, bool isTunEnabled)
                 return ret;
             }
 
-            ClashApiManager.Instance.ProfileContent = fileContent;
-
             ret.Msg = string.Format(ResUI.SuccessfulConfiguration, $"{node.GetSummary()}");
             ret.Success = true;
             return ret;

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

@@ -125,7 +125,8 @@ public partial class CoreConfigSingboxService
         fullConfigTemplateNode["outbounds"] = customOutboundsNode;
 
         // Process endpoints
-        if (fullConfigTemplateNode["endpoints"] is JsonArray { Count: > 0 } coreConfigEndpointsNode)
+        var coreConfigEndpointsNode = coreConfigNode?["endpoints"] as JsonArray ?? [];
+        if (coreConfigEndpointsNode is { Count: > 0 })
         {
             var customEndpointsNode = fullConfigTemplateNode["endpoints"] as JsonArray ?? [];
             foreach (var endpoint in coreConfigEndpointsNode)

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

@@ -17,36 +17,11 @@ public partial class CoreConfigSingboxService
             GenDnsRules();
 
             _coreConfig.dns ??= new Dns4Sbox();
-            _coreConfig.dns.independent_cache = true;
+            _coreConfig.dns.optimistic = context.SimpleDnsItem.ServeStale == true ? true : null;
 
             // final dns
-            var routing = context.RoutingItem;
-            var useDirectDns = false;
-            if (routing != null)
-            {
-                var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet) ?? [];
-
-                if (rules?.LastOrDefault() is { OutboundTag: Global.DirectTag } lastRule)
-                {
-                    var noDomain = lastRule.Domain == null || lastRule.Domain.Count == 0;
-                    var noProcess = lastRule.Process == null || lastRule.Process.Count == 0;
-                    var isAnyIp = lastRule.Ip == null || lastRule.Ip.Count == 0 || lastRule.Ip.Contains("0.0.0.0/0");
-                    var isAnyPort = string.IsNullOrEmpty(lastRule.Port) || lastRule.Port == "0-65535";
-                    var isAnyNetwork = string.IsNullOrEmpty(lastRule.Network) || lastRule.Network == "tcp,udp";
-                    useDirectDns = noDomain && noProcess && isAnyIp && isAnyPort && isAnyNetwork;
-                }
-            }
+            var useDirectDns = UseDirectDns();
             _coreConfig.dns.final = useDirectDns ? Global.SingboxDirectDNSTag : Global.SingboxRemoteDNSTag;
-            var simpleDnsItem = context.SimpleDnsItem;
-            if ((!useDirectDns) && simpleDnsItem.FakeIP == true && simpleDnsItem.GlobalFakeIp == false)
-            {
-                _coreConfig.dns.rules.Add(new()
-                {
-                    server = Global.SingboxFakeDNSTag,
-                    query_type = new List<int> { 1, 28 }, // A and AAAA
-                    rewrite_ttl = 1,
-                });
-            }
         }
         catch (Exception ex)
         {
@@ -59,14 +34,24 @@ public partial class CoreConfigSingboxService
         var simpleDnsItem = context.SimpleDnsItem;
         var finalDns = GenBootstrapDns();
 
-        var directDns = ParseDnsAddress(simpleDnsItem.DirectDNS ?? Global.DomainDirectDNSAddress.First());
-        directDns.tag = Global.SingboxDirectDNSTag;
-        directDns.domain_resolver = Global.SingboxLocalDNSTag;
+        var directDnsList = ParseDnsAddresses(simpleDnsItem.DirectDNS ?? Global.DomainDirectDNSAddress.First());
+        for (var i = 0; i < directDnsList.Count; i++)
+        {
+            var directDns = directDnsList[i];
+            var tag = string.Format(Global.SingboxDirectDNSTagTemplate, i + 1);
+            directDns.tag = tag;
+            directDns.domain_resolver = Global.SingboxLocalDNSTag;
+        }
 
-        var remoteDns = ParseDnsAddress(simpleDnsItem.RemoteDNS ?? Global.DomainRemoteDNSAddress.First());
-        remoteDns.tag = Global.SingboxRemoteDNSTag;
-        remoteDns.detour = Global.ProxyTag;
-        remoteDns.domain_resolver = Global.SingboxLocalDNSTag;
+        var remoteDnsList = ParseDnsAddresses(simpleDnsItem.RemoteDNS ?? Global.DomainRemoteDNSAddress.First());
+        for (var i = 0; i < remoteDnsList.Count; i++)
+        {
+            var remoteDns = remoteDnsList[i];
+            var tag = string.Format(Global.SingboxRemoteDNSTagTemplate, i + 1);
+            remoteDns.tag = tag;
+            remoteDns.detour = Global.ProxyTag;
+            remoteDns.domain_resolver = Global.SingboxLocalDNSTag;
+        }
 
         var hostsDns = new Server4Sbox
         {
@@ -118,26 +103,28 @@ public partial class CoreConfigSingboxService
             {
                 finalDns.domain_resolver = Global.SingboxHostsDNSTag;
             }
-            if (remoteDns.server == host.Key)
-            {
-                remoteDns.domain_resolver = Global.SingboxHostsDNSTag;
-            }
-            if (directDns.server == host.Key)
+            foreach (var directDns in directDnsList.Where(directDns => directDns.server == host.Key))
             {
                 directDns.domain_resolver = Global.SingboxHostsDNSTag;
             }
+            foreach (var remoteDns in remoteDnsList.Where(remoteDns => remoteDns.server == host.Key))
+            {
+                remoteDns.domain_resolver = Global.SingboxHostsDNSTag;
+            }
         }
 
         _coreConfig.dns ??= new Dns4Sbox();
         _coreConfig.dns.servers ??= [];
-        _coreConfig.dns.servers.Add(remoteDns);
-        _coreConfig.dns.servers.Add(directDns);
+        _coreConfig.dns.servers.AddRange(remoteDnsList);
+        _coreConfig.dns.servers.AddRange(directDnsList);
         _coreConfig.dns.servers.Add(hostsDns);
 
         // fake ip
         if (simpleDnsItem.FakeIP == true)
         {
-            var fakeipRange = simpleDnsItem.FakeIPRange.IsNullOrEmpty() ? Global.FakeIPRanges.First() : simpleDnsItem.FakeIPRange;
+            var fakeipRange = simpleDnsItem.FakeIPRange.IsNullOrEmpty()
+                ? Global.FakeIPRanges.First()
+                : simpleDnsItem.FakeIPRange;
             var fakeip = new Server4Sbox
             {
                 tag = Global.SingboxFakeDNSTag,
@@ -164,33 +151,33 @@ public partial class CoreConfigSingboxService
         _coreConfig.dns ??= new Dns4Sbox();
         _coreConfig.dns.rules ??= [];
 
-        _coreConfig.dns.rules.Add(new() { ip_accept_any = true, server = Global.SingboxHostsDNSTag });
+        _coreConfig.dns.rules.Add(new()
+        {
+            preferred_by = Global.SingboxHostsDNSTag,
+            server = Global.SingboxHostsDNSTag,
+        });
 
         if (context.ProtectDomainList.Count > 0)
         {
             _coreConfig.dns.rules.Add(new()
             {
                 server = Global.SingboxDirectDNSTag,
-                strategy = Utils.DomainStrategy4Sbox(simpleDnsItem.Strategy4ProxyDial),
                 domain = context.ProtectDomainList.ToList(),
             });
         }
 
-        _coreConfig.dns.rules.AddRange(new[]
-        {
+        _coreConfig.dns.rules.AddRange([
             new Rule4Sbox
             {
                 server = Global.SingboxRemoteDNSTag,
-                strategy = Utils.DomainStrategy4Sbox(simpleDnsItem.Strategy4Proxy),
-                clash_mode = nameof(ERuleMode.Global)
+                clash_mode = nameof(ERuleMode.Global),
             },
             new Rule4Sbox
             {
                 server = Global.SingboxDirectDNSTag,
-                strategy = Utils.DomainStrategy4Sbox(simpleDnsItem.Strategy4Freedom),
-                clash_mode = nameof(ERuleMode.Direct)
-            }
-        });
+                clash_mode = nameof(ERuleMode.Direct),
+            },
+        ]);
 
         foreach (var kvp in Utils.ParseHostsToDictionary(simpleDnsItem.Hosts))
         {
@@ -199,7 +186,7 @@ public partial class CoreConfigSingboxService
             {
                 continue;
             }
-            var rule = new Rule4Sbox()
+            var rule = new Rule4Sbox
             {
                 query_type = [1, 5, 28], // A, CNAME and AAAA
                 action = "predefined",
@@ -262,13 +249,14 @@ public partial class CoreConfigSingboxService
             {
                 query_type = [64, 65],
                 action = "predefined",
-                rcode = "NOERROR"
+                rcode = "NOERROR",
             });
         }
 
         if (simpleDnsItem.FakeIP == true && simpleDnsItem.GlobalFakeIp != false)
         {
-            var fakeipFilterRule = JsonUtils.Deserialize<Rule4Sbox>(EmbedUtils.GetEmbedText(Global.SingboxFakeIPFilterFileName));
+            var fakeipFilterRule =
+                JsonUtils.Deserialize<Rule4Sbox>(EmbedUtils.GetEmbedText(Global.SingboxFakeIPFilterFileName));
             fakeipFilterRule.invert = true;
             var rule4Fake = new Rule4Sbox
             {
@@ -282,31 +270,45 @@ public partial class CoreConfigSingboxService
                     {
                         query_type = [1, 28], // A and AAAA
                     },
-                    fakeipFilterRule
-                ]
+                    fakeipFilterRule,
+                ],
             };
 
             _coreConfig.dns.rules.Add(rule4Fake);
         }
 
+        if (simpleDnsItem.BlockAAAAQuery == true)
+        {
+            _coreConfig.dns.rules.Add(new()
+            {
+                query_type = [28],
+                action = "predefined",
+                rcode = "NOERROR",
+            });
+        }
+
         var routing = context.RoutingItem;
         if (routing == null)
         {
             return;
         }
 
+        var directDnsList = _coreConfig.dns.servers
+            .Where(s => s.tag?.StartsWith(Global.SingboxDirectDNSTagPrefix) == true).ToList();
+        var remoteDnsList = _coreConfig.dns.servers
+            .Where(s => s.tag?.StartsWith(Global.SingboxRemoteDNSTagPrefix) == true).ToList();
+
         var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet) ?? [];
-        var expectedIPCidr = new List<string>();
-        var expectedIPsRegions = new List<string>();
+        var expectedIPCidr = new HashSet<string>();
+        var expectedIPsRegions = new HashSet<string>();
         var regionName = string.Empty;
 
         if (!string.IsNullOrEmpty(simpleDnsItem?.DirectExpectedIPs))
         {
-            var ipItems = simpleDnsItem.DirectExpectedIPs
-                .Split(new[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries)
+            var ipItems = (Utils.String2List(simpleDnsItem.DirectExpectedIPs) ?? [])
                 .Select(s => s.Trim())
                 .Where(s => !string.IsNullOrEmpty(s))
-                .ToList();
+                .ToHashSet();
 
             foreach (var ip in ipItems)
             {
@@ -349,35 +351,60 @@ public partial class CoreConfigSingboxService
 
             if (item.OutboundTag == Global.DirectTag)
             {
-                rule.server = Global.SingboxDirectDNSTag;
-                rule.strategy = Utils.DomainStrategy4Sbox(simpleDnsItem.Strategy4Freedom);
+                Rule4Sbox? rule4ExpectedIPs = null;
 
                 if (expectedIPsRegions.Count > 0 && rule.geosite?.Count > 0 && !regionName.IsNullOrEmpty())
                 {
-                    var regionGeosite = rule.geosite.Where(g => g.EndsWith($"-{regionName}", StringComparison.OrdinalIgnoreCase)
-                                                     || g.EndsWith($"@{regionName}", StringComparison.OrdinalIgnoreCase)
-                                                     || g == regionName).ToList();
+                    var regionGeosite = rule.geosite.Where(g =>
+                        g.EndsWith($"-{regionName}", StringComparison.OrdinalIgnoreCase)
+                        || g.EndsWith($"@{regionName}", StringComparison.OrdinalIgnoreCase)
+                        || g == regionName).ToList();
                     if (regionGeosite.Count > 0)
                     {
                         rule.geosite.RemoveAll(regionGeosite.Contains);
-                        var rule4ExpectedIPs = JsonUtils.DeepCopy(rule);
+                        rule4ExpectedIPs = JsonUtils.DeepCopy(rule);
                         rule4ExpectedIPs.geosite = regionGeosite;
+                    }
+                }
+
+                if (rule.geosite?.Count > 0 || rule.domain?.Count > 0)
+                {
+                    AddRules(rule, item, directDnsList);
+                }
+
+                if (rule4ExpectedIPs is not null)
+                {
+                    var expectedRuleList = BuildMultiRules(rule4ExpectedIPs, item, directDnsList);
+                    foreach (var expectedRule in
+                             expectedRuleList.Where(expectedRule => expectedRule.action == "respond"))
+                    {
                         if (expectedIPsRegions.Count > 0)
                         {
-                            rule4ExpectedIPs.geoip = expectedIPsRegions;
+                            expectedRule.geoip = expectedIPsRegions.ToList();
                         }
                         if (expectedIPCidr.Count > 0)
                         {
-                            rule4ExpectedIPs.ip_cidr = expectedIPCidr;
+                            expectedRule.ip_cidr = expectedIPCidr.ToList();
                         }
-                        _coreConfig.dns.rules.Add(rule4ExpectedIPs);
                     }
+                    _coreConfig.dns.rules.AddRange(expectedRuleList);
+                    var fallbackRemoteRuleList = BuildMultiRules(rule4ExpectedIPs, item, remoteDnsList);
+                    if (expectedRuleList.LastOrDefault()?.race == true)
+                    {
+                        foreach (var fallbackRemoteRule in fallbackRemoteRuleList.Where(fallbackRemoteRule =>
+                                     fallbackRemoteRule.action == "evaluate"))
+                        {
+                            fallbackRemoteRule.speculative = true;
+                        }
+                    }
+                    _coreConfig.dns.rules.AddRange(fallbackRemoteRuleList);
                 }
             }
             else if (item.OutboundTag == Global.BlockTag)
             {
                 rule.action = "predefined";
                 rule.rcode = "NXDOMAIN";
+                _coreConfig.dns.rules.Add(rule);
             }
             else
             {
@@ -385,15 +412,104 @@ public partial class CoreConfigSingboxService
                 {
                     var rule4Fake = JsonUtils.DeepCopy(rule);
                     rule4Fake.server = Global.SingboxFakeDNSTag;
-                    rule4Fake.query_type = new List<int> { 1, 28 }; // A and AAAA
+                    rule4Fake.query_type = new List<int>
+                    {
+                        1,
+                        28,
+                    }; // A and AAAA
                     rule4Fake.rewrite_ttl = 1;
                     _coreConfig.dns.rules.Add(rule4Fake);
                 }
-                rule.server = Global.SingboxRemoteDNSTag;
-                rule.strategy = Utils.DomainStrategy4Sbox(simpleDnsItem.Strategy4Proxy);
+                AddRules(rule, item, remoteDnsList);
             }
+        }
+        var useDirectDns = UseDirectDns();
+        if ((!useDirectDns) && simpleDnsItem.FakeIP == true && simpleDnsItem.GlobalFakeIp == false)
+        {
+            _coreConfig.dns.rules.Add(new()
+            {
+                server = Global.SingboxFakeDNSTag,
+                query_type =
+                [
+                    1,
+                    28,
+                ], // A and AAAA
+                rewrite_ttl = 1,
+            });
+        }
+        var tempRuleItem = new RulesItem
+        {
+            Id = $"final-{Utils.GetGuid(false)}",
+            Enabled = true,
+        };
+        AddRules(new(), tempRuleItem, useDirectDns ? directDnsList : remoteDnsList);
+        return;
 
-            _coreConfig.dns.rules.Add(rule);
+        static List<Rule4Sbox> BuildParallelRules(Rule4Sbox rule, RulesItem item, List<Server4Sbox> dnsList)
+        {
+            var evaluateRuleList = new List<Rule4Sbox>();
+            var racingMatchingRuleList = new List<Rule4Sbox>();
+            foreach (var dnsServer in dnsList)
+            {
+                var dnsServerTag = dnsServer.tag;
+                var evaluateRule = JsonUtils.DeepCopy(rule);
+                evaluateRule.action = "evaluate";
+                // Maybe rule index is better than id? Not sure, but id is unique, so use id for now.
+                var evaluateTag = $"{dnsServerTag}-{item.Id}";
+                evaluateRule.tag = evaluateTag;
+                evaluateRule.server = dnsServerTag;
+                evaluateRuleList.Add(evaluateRule);
+                var racingMatchingRule = new Rule4Sbox
+                {
+                    match_response = evaluateTag,
+                    race = true,
+                    action = "respond",
+                };
+                racingMatchingRuleList.Add(racingMatchingRule);
+            }
+            return [.. evaluateRuleList, .. racingMatchingRuleList];
+        }
+
+        static List<Rule4Sbox> BuildSerialRules(Rule4Sbox rule, RulesItem item, List<Server4Sbox> dnsList)
+        {
+            var ruleList = new List<Rule4Sbox>();
+            foreach (var dnsServer in dnsList)
+            {
+                var dnsServerTag = dnsServer.tag;
+                var evaluateRule = JsonUtils.DeepCopy(rule);
+                evaluateRule.action = "evaluate";
+                // Maybe rule index is better than id? Not sure, but id is unique, so use id for now.
+                var evaluateTag = $"{dnsServerTag}-{item.Id}";
+                evaluateRule.tag = evaluateTag;
+                evaluateRule.server = dnsServerTag;
+                ruleList.Add(evaluateRule);
+                var racingMatchingRule = new Rule4Sbox
+                {
+                    match_response = evaluateTag,
+                    action = "respond",
+                };
+                ruleList.Add(racingMatchingRule);
+            }
+            return ruleList;
+        }
+
+        List<Rule4Sbox> BuildMultiRules(Rule4Sbox rule, RulesItem item, List<Server4Sbox> dnsList)
+        {
+            return simpleDnsItem.ParallelQuery == true ? BuildParallelRules(rule, item, dnsList) : BuildSerialRules(rule, item, dnsList);
+        }
+
+        void AddRules(Rule4Sbox rule, RulesItem item, List<Server4Sbox> dnsList)
+        {
+            if (dnsList.Count == 1)
+            {
+                rule.server = dnsList.First().tag;
+                _coreConfig.dns.rules.Add(rule);
+            }
+            else
+            {
+                var ruleList = BuildMultiRules(rule, item, dnsList);
+                _coreConfig.dns.rules.AddRange(ruleList);
+            }
         }
     }
 
@@ -422,11 +538,15 @@ public partial class CoreConfigSingboxService
             var strDNS = string.Empty;
             if (context.IsTunEnabled)
             {
-                strDNS = string.IsNullOrEmpty(item?.TunDNS) ? EmbedUtils.GetEmbedText(Global.TunSingboxDNSFileName) : item?.TunDNS;
+                strDNS = string.IsNullOrEmpty(item?.TunDNS)
+                    ? EmbedUtils.GetEmbedText(Global.TunSingboxDNSFileName)
+                    : item?.TunDNS;
             }
             else
             {
-                strDNS = string.IsNullOrEmpty(item?.NormalDNS) ? EmbedUtils.GetEmbedText(Global.DNSSingboxNormalFileName) : item?.NormalDNS;
+                strDNS = string.IsNullOrEmpty(item?.NormalDNS)
+                    ? EmbedUtils.GetEmbedText(Global.DNSSingboxNormalFileName)
+                    : item?.NormalDNS;
             }
 
             var dns4Sbox = JsonUtils.Deserialize<Dns4Sbox>(strDNS);
@@ -454,15 +574,18 @@ public partial class CoreConfigSingboxService
         dns4Sbox.rules.Insert(0, new()
         {
             server = tag,
-            clash_mode = nameof(ERuleMode.Direct)
+            clash_mode = nameof(ERuleMode.Direct),
         });
         dns4Sbox.rules.Insert(0, new()
         {
-            server = dns4Sbox.servers.Where(t => t.detour == Global.ProxyTag).Select(t => t.tag).FirstOrDefault() ?? "remote",
-            clash_mode = nameof(ERuleMode.Global)
+            server = dns4Sbox.servers.Where(t => t.detour == Global.ProxyTag).Select(t => t.tag).FirstOrDefault() ??
+                     "remote",
+            clash_mode = nameof(ERuleMode.Global),
         });
 
-        var finalDnsAddress = string.IsNullOrEmpty(dnsItem?.DomainDNSAddress) ? Global.DomainPureIPDNSAddress.FirstOrDefault() : dnsItem?.DomainDNSAddress;
+        var finalDnsAddress = string.IsNullOrEmpty(dnsItem?.DomainDNSAddress)
+            ? Global.DomainPureIPDNSAddress.FirstOrDefault()
+            : dnsItem?.DomainDNSAddress;
 
         var localDnsServer = ParseDnsAddress(finalDnsAddress);
         localDnsServer.tag = tag;
@@ -490,9 +613,21 @@ public partial class CoreConfigSingboxService
         };
     }
 
+    private static List<Server4Sbox> ParseDnsAddresses(string addresses)
+    {
+        var servers = new List<Server4Sbox>();
+        var addressList = Utils.String2List(addresses)?.ToList();
+        if (addressList is not { Count: > 0 })
+        {
+            return servers;
+        }
+        servers.AddRange(addressList.Select(ParseDnsAddress).Where(s => s != null));
+        return servers;
+    }
+
     private static Server4Sbox? ParseDnsAddress(string address)
     {
-        var addressFirst = address?.Split(address.Contains(',') ? ',' : ';').FirstOrDefault()?.Trim();
+        var addressFirst = Utils.String2List(address)?.FirstOrDefault()?.Trim();
         if (string.IsNullOrEmpty(addressFirst))
         {
             return null;
@@ -537,10 +672,33 @@ public partial class CoreConfigSingboxService
         {
             server.server_port = port;
         }
-        if ((server.type == "https" || server.type == "h3") && !string.IsNullOrEmpty(path) && path != "/")
+        if (server.type is "https" or "h3" && !string.IsNullOrEmpty(path) && path != "/")
         {
             server.path = path;
         }
         return server;
     }
+
+    private bool UseDirectDns()
+    {
+        var routing = context.RoutingItem;
+        var useDirectDns = false;
+        if (routing == null)
+        {
+            return useDirectDns;
+        }
+        var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet) ?? [];
+
+        if (rules?.LastOrDefault() is not { OutboundTag: Global.DirectTag } lastRule)
+        {
+            return useDirectDns;
+        }
+        var noDomain = lastRule.Domain == null || lastRule.Domain.Count == 0;
+        var noProcess = lastRule.Process == null || lastRule.Process.Count == 0;
+        var isAnyIp = lastRule.Ip == null || lastRule.Ip.Count == 0 || lastRule.Ip.Contains("0.0.0.0/0");
+        var isAnyPort = string.IsNullOrEmpty(lastRule.Port) || lastRule.Port == "0-65535";
+        var isAnyNetwork = string.IsNullOrEmpty(lastRule.Network) || lastRule.Network == "tcp,udp";
+        useDirectDns = noDomain && noProcess && isAnyIp && isAnyPort && isAnyNetwork;
+        return useDirectDns;
+    }
 }

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

@@ -244,7 +244,7 @@ public partial class CoreConfigSingboxService
             var resolveRule = new Rule4Sbox
             {
                 action = "resolve",
-                strategy = domainStrategy
+                strategy = domainStrategy,
             };
             if (_config.RoutingBasicItem.DomainStrategy == Global.IPOnDemand)
             {

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

@@ -79,6 +79,7 @@ public partial class CoreConfigSingboxService
 
         //Add ruleset srs
         _coreConfig.route.rule_set = [];
+        var containRemoteRuleset = false;
         foreach (var item in new HashSet<string>(ruleSets))
         {
             if (item.IsNullOrEmpty())
@@ -94,11 +95,13 @@ public partial class CoreConfigSingboxService
                         type = "local",
                         format = "binary",
                         tag = item,
-                        path = pathSrs
+                        path = pathSrs,
                     };
                 }
                 else
                 {
+                    containRemoteRuleset = true;
+
                     var srsUrl = string.IsNullOrEmpty(_config.ConstItem.SrsSourceUrl)
                         ? Global.SingboxRulesetUrl
                         : _config.ConstItem.SrsSourceUrl;
@@ -109,11 +112,21 @@ public partial class CoreConfigSingboxService
                         format = "binary",
                         tag = item,
                         url = string.Format(srsUrl, item.StartsWith(geosite) ? geosite : geoip, item),
-                        download_detour = Global.ProxyTag
+                        http_client = Global.SingboxSrsDownloadHttpClientTag,
                     };
                 }
             }
             _coreConfig.route.rule_set.Add(customRuleset);
         }
+
+        if (containRemoteRuleset)
+        {
+            _coreConfig.http_clients ??= [];
+            _coreConfig.http_clients.Add(new()
+            {
+                tag = Global.SingboxSrsDownloadHttpClientTag,
+                detour = Global.ProxyTag,
+            });
+        }
     }
 }

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

@@ -82,6 +82,11 @@ public partial class CoreConfigV2rayService
             dnsItem.serveStale = simpleDnsItem?.ServeStale is true ? true : null;
             dnsItem.enableParallelQuery = simpleDnsItem?.ParallelQuery is true ? true : null;
 
+            if (simpleDnsItem.BlockAAAAQuery == true)
+            {
+                dnsItem.queryStrategy = "UseIPv4";
+            }
+
             // DNS routing
             var directDnsTags = dnsItem.servers
                 .Select(server =>
@@ -154,16 +159,16 @@ public partial class CoreConfigV2rayService
         var directDNSAddress = ParseDnsAddresses(simpleDNSItem?.DirectDNS, Global.DomainDirectDNSAddress.First());
         var remoteDNSAddress = ParseDnsAddresses(simpleDNSItem?.RemoteDNS, Global.DomainRemoteDNSAddress.First());
 
-        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 directDomainList = new HashSet<string>();
+        var directGeositeList = new HashSet<string>();
+        var proxyDomainList = new HashSet<string>();
+        var proxyGeositeList = new HashSet<string>();
+        var expectedDomainList = new HashSet<string>();
+        var expectedIPs = new HashSet<string>();
         var regionName = string.Empty;
 
         var bootstrapDNSAddress = ParseDnsAddresses(simpleDNSItem?.BootstrapDNS, Global.DomainPureIPDNSAddress.First());
-        var dnsServerDomains = new List<string>();
+        var dnsServerDomains = new HashSet<string>();
 
         foreach (var dns in directDNSAddress)
         {
@@ -189,15 +194,13 @@ public partial class CoreConfigV2rayService
                 dnsServerDomains.Add($"full:{domain}");
             }
         }
-        dnsServerDomains = dnsServerDomains.Distinct().ToList();
 
         if (!string.IsNullOrEmpty(simpleDNSItem?.DirectExpectedIPs))
         {
-            expectedIPs = simpleDNSItem.DirectExpectedIPs
-                .Split(new[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries)
+            expectedIPs = (Utils.String2List(simpleDNSItem.DirectExpectedIPs) ?? [])
                 .Select(s => s.Trim())
                 .Where(s => !string.IsNullOrEmpty(s))
-                .ToList();
+                .ToHashSet();
 
             foreach (var region in from ip in expectedIPs
                                    where ip.StartsWith(Global.GeoIPPrefix, StringComparison.OrdinalIgnoreCase)
@@ -264,15 +267,19 @@ public partial class CoreConfigV2rayService
             }
         }
 
-        if (context.ProtectDomainList.Count > 0)
-        {
-            directDomainList.AddRange(context.ProtectDomainList);
-        }
-
         dnsItem.servers ??= [];
 
         var directDnsTagIndex = 1;
 
+        if (dnsServerDomains.Count > 0)
+        {
+            AddDnsServers(bootstrapDNSAddress, dnsServerDomains);
+        }
+        if (context.ProtectDomainList.Count > 0)
+        {
+            AddDnsServers(directDNSAddress, context.ProtectDomainList, true);
+        }
+
         if (simpleDNSItem.FakeIP == true)
         {
             var fakeIPMatchDomain = new HashSet<string>(proxyDomainList);
@@ -286,7 +293,7 @@ public partial class CoreConfigV2rayService
             if (fakeIPMatchDomain.Count > 0)
             {
                 GenFakeDns();
-                AddDnsServers(["fakedns"], fakeIPMatchDomain.ToList());
+                AddDnsServers(["fakedns"], fakeIPMatchDomain);
             }
         }
 
@@ -295,10 +302,6 @@ public partial class CoreConfigV2rayService
         AddDnsServers(remoteDNSAddress, proxyGeositeList);
         AddDnsServers(directDNSAddress, directGeositeList, true);
         AddDnsServers(directDNSAddress, expectedDomainList, true, expectedIPs);
-        if (dnsServerDomains.Count > 0)
-        {
-            AddDnsServers(bootstrapDNSAddress, dnsServerDomains);
-        }
 
         var useDirectDns = false;
 
@@ -331,7 +334,7 @@ public partial class CoreConfigV2rayService
 
         static List<string> ParseDnsAddresses(string? dnsInput, string defaultAddress)
         {
-            var addresses = dnsInput?.Split(dnsInput.Contains(',') ? ',' : ';')
+            var addresses = (Utils.String2List(dnsInput) ?? [])
                 .Select(addr => addr.Trim())
                 .Where(addr => !string.IsNullOrEmpty(addr))
                 .Select(addr => addr.StartsWith("dhcp", StringComparison.OrdinalIgnoreCase) ? "localhost" : addr)
@@ -340,7 +343,7 @@ public partial class CoreConfigV2rayService
             return addresses.Count > 0 ? addresses : new List<string> { defaultAddress };
         }
 
-        static DnsServer4Ray CreateDnsServer(string dnsAddress, List<string> domains, List<string>? expectedIPs = null)
+        static DnsServer4Ray CreateDnsServer(string dnsAddress, HashSet<string> domains, HashSet<string>? expectedIPs = null)
         {
             var (domain, scheme, port, path) = Utils.ParseUrl(dnsAddress);
             var domainFinal = dnsAddress;
@@ -360,13 +363,13 @@ public partial class CoreConfigV2rayService
                 address = domainFinal,
                 port = portFinal,
                 skipFallback = true,
-                domains = domains.Count > 0 ? domains : null,
-                expectedIPs = expectedIPs?.Count > 0 ? expectedIPs : null
+                domains = domains.Count > 0 ? domains.ToList() : null,
+                expectedIPs = expectedIPs?.Count > 0 ? expectedIPs.ToList() : null
             };
             return dnsServer;
         }
 
-        void AddDnsServers(List<string> dnsAddresses, List<string> domains, bool isDirectDns = false, List<string>? expectedIPs = null)
+        void AddDnsServers(List<string> dnsAddresses, HashSet<string> domains, bool isDirectDns = false, HashSet<string>? expectedIPs = null)
         {
             if (domains.Count <= 0)
             {

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

@@ -70,7 +70,11 @@ public partial class CoreConfigV2rayService
                 // Route both families into the tunnel regardless of EnableIPv6Address. That option only
                 // controls whether the interface gets an IPv6 address; leaving ::/0 out of the routing
                 // table makes IPv6 follow the system default route and bypass the tunnel entirely.
-                tunInbound.settings.autoSystemRoutingTable = ["0.0.0.0/0", "::/0"];
+                // A host without a global IPv6 address is the exception: it has nothing to leak,
+                // and IPv6 sent into the tunnel would have no way back out.
+                tunInbound.settings.autoSystemRoutingTable = context.HasGlobalIPv6Address
+                    ? ["0.0.0.0/0", "::/0"]
+                    : ["0.0.0.0/0"];
                 if (_config.TunModeItem.EnableIPv6Address == true)
                 {
                     var address6 = _config.TunModeItem.IPv6Address.NullIfEmpty() ?? Global.TunIPv6Address.First();
@@ -95,7 +99,9 @@ public partial class CoreConfigV2rayService
                         .Where(x => x != null).ToList();
 
                     var includeList = new List<IPNetwork2> { wholeInternet };
-                    var includeListV6 = new List<IPNetwork2> { wholeInternetV6 };
+                    var includeListV6 = context.HasGlobalIPv6Address
+                        ? new List<IPNetwork2> { wholeInternetV6 }
+                        : new List<IPNetwork2>();
 
                     foreach (var exclude in excludeList)
                     {

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

@@ -297,7 +297,8 @@ public partial class CoreConfigV2rayService
                             secretKey = _node.Password,
                             reserved = Utils.String2List(protocolExtra.WgReserved)?.Select(s => s.Trim()).Select(int.Parse).ToList(),
                             mtu = protocolExtra.WgMtu > 0 ? protocolExtra.WgMtu : Global.TunMtus.First(),
-                            peers = [peer]
+                            remoteDNS = Utils.String2List(protocolExtra.WgDns)?.Select(s => s.Trim()).ToList(),
+                            peers = [peer],
                         };
                         outbound.settings = setting;
                         outbound.settings.vnext = null;

v2rayN/ServiceLib/Services/DownloadService.cs

@@ -11,6 +11,8 @@ public class DownloadService
 
     public event ErrorEventHandler? Error;
 
+    public string? AcceptHeader { get; init; }
+
     private static readonly string _tag = "DownloadService";
 
     /// <summary>
@@ -42,21 +44,88 @@ public class DownloadService
     /// <summary>
     /// Downloads a file and reports progress through events.
     /// </summary>
-    public async Task DownloadFileAsync(string url, string fileName, bool blProxy, int downloadTimeout)
+    public async Task DownloadFileAsync(FileDownloadRequest request, bool blProxy, TimeSpan connectTimeout)
     {
         try
         {
-            UpdateCompleted?.Invoke(this, new UpdateResult(false, $"{ResUI.Downloading}   {url}"));
-
-            var progress = new Progress<double>();
-            progress.ProgressChanged += (sender, value) => UpdateCompleted?.Invoke(this, new UpdateResult(value > 100, $"...{value}%"));
+            UpdateCompleted?.Invoke(this, new UpdateResult(false, $"{ResUI.Downloading}   {request.FileUrl}"));
 
             var webProxy = await GetWebProxy(blProxy);
             await DownloaderHelper.Instance.DownloadFileAsync(webProxy,
-                url,
-                fileName,
-                progress,
-                downloadTimeout);
+                request,
+                OnProgress,
+                connectTimeout);
+
+            void OnProgress(FileDownloadState state)
+            {
+                UpdateCompleted?.Invoke(this, new UpdateResult(state.Completed, $"{Utils.HumanFy((long)state.SpeedBytesPerSecond / 1024)}/s | {Utils.HumanFy(state.DownloadedBytes / 1024)}/{Utils.HumanFy(state.TotalBytes / 1024)}"));
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+
+            Error?.Invoke(this, new ErrorEventArgs(ex));
+            if (ex.InnerException != null)
+            {
+                Error?.Invoke(this, new ErrorEventArgs(ex.InnerException));
+            }
+        }
+    }
+
+    public async Task DownloadSmallFilesAsync(List<FileDownloadRequest> requests, bool blProxy, TimeSpan connectTimeout)
+    {
+        try
+        {
+            UpdateCompleted?.Invoke(this, new UpdateResult(false, $"{ResUI.Downloading} 0/{requests.Count}"));
+
+            var webProxy = await GetWebProxy(blProxy);
+            await DownloaderHelper.Instance.DownloadSmallFilesAsync(webProxy,
+                requests,
+                OnProgress,
+                connectTimeout);
+
+            void OnProgress(ReadOnlyMemory<FileDownloadState> states)
+            {
+                var span = states.Span;
+                var completedCount = 0;
+                var downloadingStates = new List<FileDownloadState>();
+                foreach (ref readonly var item in span)
+                {
+                    if (item.Completed)
+                    {
+                        completedCount++;
+                    }
+                    else if (item.TotalBytes > 0)
+                    {
+                        downloadingStates.Add(item);
+                    }
+                }
+                var totalSpeed = downloadingStates.Sum(x => x.SpeedBytesPerSecond);
+                var totalDownloadedBytes = downloadingStates.Sum(x => x.DownloadedBytes);
+                var totalTotalBytes = downloadingStates.Sum(x => x.TotalBytes);
+                var downloadingFileName = string.Join(", ", downloadingStates.Select(x => x.Request.FileName));
+                var allCompleted = completedCount == span.Length;
+                if (allCompleted)
+                {
+                    // check and throw errors if any
+                    FileDownloadState? failedState = null;
+                    foreach (ref readonly var item in span)
+                    {
+                        if (!item.IsFailed)
+                        {
+                            continue;
+                        }
+                        failedState = item;
+                        break;
+                    }
+                    if (failedState?.Error != null)
+                    {
+                        throw failedState.Error;
+                    }
+                }
+                UpdateCompleted?.Invoke(this, new UpdateResult(allCompleted, $"{completedCount}/{span.Length} | {Utils.HumanFy((long)totalSpeed / 1024)}/s {Utils.HumanFy(totalDownloadedBytes / 1024)}/{Utils.HumanFy(totalTotalBytes / 1024)} {downloadingFileName}"));
+            }
         }
         catch (Exception ex)
         {
@@ -186,6 +255,10 @@ public class DownloadService
                 userAgent = Utils.GetVersion(false);
             }
             client.DefaultRequestHeaders.UserAgent.TryParseAdd(userAgent);
+            if (AcceptHeader.IsNotEmpty())
+            {
+                client.DefaultRequestHeaders.Accept.ParseAdd(AcceptHeader);
+            }
 
             Uri uri = new(url);
             //Authorization Header

v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs

@@ -17,7 +17,11 @@ public class StatisticsSingboxService
         _updateFunc = updateFunc;
         _exitFlag = false;
 
-        _ = Task.Run(Run);
+        _ = Task.Factory.StartNew(
+            Run,
+            CancellationToken.None,
+            TaskCreationOptions.LongRunning,
+            TaskScheduler.Default);
     }
 
     private async Task Init()

v2rayN/ServiceLib/Services/Statistics/StatisticsXrayService.cs

@@ -15,7 +15,11 @@ public class StatisticsXrayService
         _updateFunc = updateFunc;
         _exitFlag = false;
 
-        _ = Task.Run(Run);
+        _ = Task.Factory.StartNew(
+            Run,
+            CancellationToken.None,
+            TaskCreationOptions.LongRunning,
+            TaskScheduler.Default);
     }
 
     public void Close()

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -1,13 +1,13 @@
 namespace ServiceLib.Services;
 
-public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
+public partial class UpdateService(Config config, Func<bool, string, Task> updateFunc)
 {
     private readonly Config? _config = config;
     private readonly Func<bool, string, Task>? _updateFunc = updateFunc;
     private readonly int _timeout = 30;
     private static readonly string _tag = "UpdateService";
 
-    public async Task CheckUpdateGuiN(bool preRelease)
+    public async Task CheckUpdateGuiN(bool preRelease, bool blProxy = true)
     {
         var url = string.Empty;
         var fileName = string.Empty;
@@ -31,15 +31,15 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
         };
 
         await UpdateFunc(false, string.Format(ResUI.MsgStartUpdating, ECoreType.v2rayN));
-        var result = await CheckUpdateAsync(downloadHandle, ECoreType.v2rayN, preRelease);
+        var result = await CheckUpdateAsync(downloadHandle, ECoreType.v2rayN, preRelease, blProxy);
         if (result.Success)
         {
             await UpdateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, ECoreType.v2rayN));
             await UpdateFunc(false, result.Msg);
 
-            url = result.Url.ToString();
+            url = result.Url!;
             fileName = Utils.GetTempPath(Utils.GetGuid());
-            await downloadHandle.DownloadFileAsync(url, fileName, true, _timeout);
+            await downloadHandle.DownloadFileAsync(new() { FileUrl = url, FilePath = fileName }, blProxy, TimeSpan.FromSeconds(_timeout));
         }
         else
         {
@@ -47,7 +47,7 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
         }
     }
 
-    public async Task CheckUpdateCore(ECoreType type, bool preRelease)
+    public async Task CheckUpdateCore(ECoreType type, bool preRelease, bool blProxy = true)
     {
         var url = string.Empty;
         var fileName = string.Empty;
@@ -80,16 +80,16 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
         };
 
         await UpdateFunc(false, string.Format(ResUI.MsgStartUpdating, type));
-        var result = await CheckUpdateAsync(downloadHandle, type, preRelease);
+        var result = await CheckUpdateAsync(downloadHandle, type, preRelease, blProxy);
         if (result.Success)
         {
             await UpdateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, type));
             await UpdateFunc(false, result.Msg);
 
-            url = result.Url.ToString();
+            url = result.Url!;
             var ext = url.Contains(".tar.gz") ? ".tar.gz" : Path.GetExtension(url);
             fileName = Utils.GetTempPath(Utils.GetGuid() + ext);
-            await downloadHandle.DownloadFileAsync(url, fileName, true, _timeout);
+            await downloadHandle.DownloadFileAsync(new() { FileUrl = url, FilePath = fileName }, blProxy, TimeSpan.FromSeconds(_timeout));
         }
         else
         {
@@ -100,7 +100,7 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
         }
     }
 
-    public async Task<UpdateResult> CheckHasUpdateOnly(ECoreType type, bool preRelease)
+    public async Task<UpdateResult> CheckHasUpdateOnly(ECoreType type, bool preRelease, bool blProxy = true)
     {
         if (!CoreInfoManager.Instance.IsCheckUpdateSupported(type))
         {
@@ -109,10 +109,10 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
 
         var downloadHandle = new DownloadService();
         var checkPreRelease = CoreInfoManager.Instance.GetCheckPreRelease(type, preRelease);
-        return await CheckUpdateAsync(downloadHandle, type, checkPreRelease);
+        return await CheckUpdateAsync(downloadHandle, type, checkPreRelease, blProxy);
     }
 
-    public async Task<List<string>> CheckHasUpdateOnlyAll(bool preRelease)
+    public async Task<List<string>> CheckHasUpdateOnlyAll(bool preRelease, bool blProxy = true)
     {
         var msgs = new List<string>();
         foreach (var type in CoreInfoManager.Instance.GetCheckUpdateCoreTypes())
@@ -122,7 +122,7 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
                 continue;
             }
 
-            var result = await CheckHasUpdateOnly(type, preRelease);
+            var result = await CheckHasUpdateOnly(type, preRelease, blProxy);
             if (result.Success && result.Version != null)
             {
                 var msg = string.Format(ResUI.MsgCheckUpdateHasNewVersion, type, result.Version);
@@ -137,21 +137,25 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
         return msgs;
     }
 
-    public async Task UpdateGeoFileAll()
+    public async Task UpdateGeoFileAll(bool blProxy = true)
     {
-        await UpdateGeoFiles();
-        await UpdateOtherFiles();
-        await UpdateSrsFileAll();
+        var requests = new List<FileDownloadRequest>();
+        requests.AddRange(GetGeoFilesRequest());
+        requests.AddRange(GetOtherFilesRequest());
+        requests.AddRange(await GetSrsFileAllRequest());
+        // NOTE: srs files are more small, so we reverse the order to ensure a good download experience for the user.
+        requests.Reverse();
+        await DownloadGeoFiles(requests, blProxy);
         await UpdateFunc(true, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, "geo"));
     }
 
     #region CheckUpdate private
 
-    private async Task<UpdateResult> CheckUpdateAsync(DownloadService downloadHandle, ECoreType type, bool preRelease)
+    private async Task<UpdateResult> CheckUpdateAsync(DownloadService downloadHandle, ECoreType type, bool preRelease, bool blProxy)
     {
         try
         {
-            var result = await GetRemoteVersion(downloadHandle, type, preRelease);
+            var result = await GetRemoteVersion(downloadHandle, type, preRelease, blProxy);
             if (!result.Success || result.Version is null)
             {
                 return result;
@@ -166,14 +170,14 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
         }
     }
 
-    private async Task<UpdateResult> GetRemoteVersion(DownloadService downloadHandle, ECoreType type, bool preRelease)
+    private async Task<UpdateResult> GetRemoteVersion(DownloadService downloadHandle, ECoreType type, bool preRelease, bool blProxy)
     {
         var coreInfo = CoreInfoManager.Instance.GetCoreInfo(type);
         var tagName = string.Empty;
-        if (preRelease)
+        if (preRelease || coreInfo?.LockedMaxVersion != null)
         {
             var url = coreInfo?.ReleaseApiUrl;
-            var result = await downloadHandle.TryDownloadString(url, true, Global.AppName);
+            var result = await downloadHandle.TryDownloadString(url, blProxy, Global.AppName);
             if (result.IsNullOrEmpty())
             {
                 return new UpdateResult(false, "");
@@ -183,11 +187,29 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
             var gitHubRelease = preRelease ? gitHubReleases?.First() : gitHubReleases?.First(r => r.Prerelease == false);
             tagName = gitHubRelease?.TagName;
             //var body = gitHubRelease?.Body;
+
+            if (coreInfo?.LockedMaxVersion != null)
+            {
+                var lockedMaxVersion = coreInfo.LockedMaxVersion;
+                var remoteVersion = new SemanticVersion(tagName);
+                if (remoteVersion > lockedMaxVersion)
+                {
+                    var fallbackRelease = gitHubReleases?
+                        .Where(r => preRelease || !r.Prerelease)
+                        .Select(r => new { Release = r, IsValid = SemanticVersion.TryParse(r.TagName, out var v), Version = v })
+                        .Where(x => x.IsValid && x.Version <= coreInfo.LockedMaxVersion)
+                        .MaxBy(x => x.Version)?
+                        .Release;
+
+                    gitHubRelease = fallbackRelease;
+                    tagName = gitHubRelease?.TagName;
+                }
+            }
         }
         else
         {
             var url = Path.Combine(coreInfo.Url, "latest");
-            var lastUrl = await downloadHandle.UrlRedirectAsync(url, true);
+            var lastUrl = await downloadHandle.UrlRedirectAsync(url, blProxy);
             if (lastUrl == null)
             {
                 return new UpdateResult(false, "");
@@ -198,6 +220,9 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
         return new UpdateResult(true, new SemanticVersion(tagName));
     }
 
+    [GeneratedRegex(@"v?(?<version>\d+\.\d+\.\d+(?:-[0-9a-zA-Z.-]+)?(?:\+[0-9a-zA-Z.-]+)?)", RegexOptions.IgnoreCase)]
+    private static partial Regex SemVerRegex();
+
     private async Task<SemanticVersion> GetCoreVersion(ECoreType type)
     {
         try
@@ -223,23 +248,7 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
 
             var result = await Utils.GetCliWrapOutput(filePath, coreInfo.VersionArg);
             var echo = result ?? "";
-            var version = string.Empty;
-            switch (type)
-            {
-                case ECoreType.v2fly:
-                case ECoreType.Xray:
-                case ECoreType.v2fly_v5:
-                    version = Regex.Match(echo, $"{coreInfo.Match} ([0-9.]+) \\(").Groups[1].Value;
-                    break;
-
-                case ECoreType.mihomo:
-                    version = Regex.Match(echo, $"v[0-9.]+").Groups[0].Value;
-                    break;
-
-                case ECoreType.sing_box:
-                    version = Regex.Match(echo, $"([0-9.]+)").Groups[1].Value;
-                    break;
-            }
+            var version = SemVerRegex().Match(echo).Groups["version"].Value;
             return new SemanticVersion(version);
         }
         catch (Exception ex)
@@ -265,30 +274,25 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
                 case ECoreType.v2fly:
                 case ECoreType.Xray:
                 case ECoreType.v2fly_v5:
-                    {
-                        curVersion = await GetCoreVersion(type);
-                        message = string.Format(ResUI.IsLatestCore, type, curVersion.ToVersionString("v"));
-                        url = string.Format(coreUrl, version.ToVersionString("v"));
-                        break;
-                    }
                 case ECoreType.mihomo:
                     {
                         curVersion = await GetCoreVersion(type);
-                        message = string.Format(ResUI.IsLatestCore, type, curVersion);
-                        url = string.Format(coreUrl, version.ToVersionString("v"));
+                        message = string.Format(ResUI.IsLatestCore, type, curVersion.ToStandardVersionString("v"));
+                        url = string.Format(coreUrl, version);
                         break;
                     }
+
                 case ECoreType.sing_box:
                     {
                         curVersion = await GetCoreVersion(type);
-                        message = string.Format(ResUI.IsLatestCore, type, curVersion.ToVersionString("v"));
-                        url = string.Format(coreUrl, version.ToVersionString("v"), version);
+                        message = string.Format(ResUI.IsLatestCore, type, curVersion.ToStandardVersionString("v"));
+                        url = string.Format(coreUrl, version, version.ToString().RemovePrefix("v"));
                         break;
                     }
                 case ECoreType.v2rayN:
                     {
                         curVersion = new SemanticVersion(Utils.GetVersionInfo());
-                        message = string.Format(ResUI.IsLatestN, type, curVersion);
+                        message = string.Format(ResUI.IsLatestN, type, curVersion.ToStandardVersionString("v"));
                         url = string.Format(coreUrl, version);
                         break;
                     }
@@ -296,7 +300,7 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
                     throw new ArgumentException("Type");
             }
 
-            if (curVersion >= version && version != new SemanticVersion(0, 0, 0))
+            if (curVersion >= version && !version.Equals(new SemanticVersion(0, 0, 0)))
             {
                 return new UpdateResult(false, message);
             }
@@ -363,41 +367,53 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
 
     #region Geo private
 
-    private async Task UpdateGeoFiles()
+    private List<FileDownloadRequest> GetGeoFilesRequest()
     {
         var geoUrl = string.IsNullOrEmpty(_config?.ConstItem.GeoSourceUrl)
             ? Global.GeoUrl
             : _config.ConstItem.GeoSourceUrl;
 
         List<string> files = ["geosite", "geoip"];
-        foreach (var geoName in files)
-        {
-            var fileName = $"{geoName}.dat";
-            var targetPath = Utils.GetBinPath($"{fileName}");
-            var url = string.Format(geoUrl, geoName);
-
-            await DownloadGeoFile(url, fileName, targetPath);
-        }
+        return
+        [
+            .. from geoName in files
+            let fileName = $"{geoName}.dat"
+            let targetPath = Utils.GetBinPath($"{fileName}")
+            let url = string.Format(geoUrl, geoName)
+            select new FileDownloadRequest()
+            {
+                FileUrl = url,
+                FilePath = targetPath,
+                DisplayFileName = fileName,
+            },
+        ];
     }
 
-    private async Task UpdateOtherFiles()
+    private List<FileDownloadRequest> GetOtherFilesRequest()
     {
         //If it is not in China area, no update is required
         if (_config.ConstItem.GeoSourceUrl.IsNotEmpty())
         {
-            return;
+            return [];
         }
 
-        foreach (var url in Global.OtherGeoUrls)
-        {
-            var fileName = Path.GetFileName(url);
-            var targetPath = Utils.GetBinPath($"{fileName}");
-
-            await DownloadGeoFile(url, fileName, targetPath);
-        }
+        return
+        [
+            .. Global.OtherGeoUrls.Select(url =>
+            {
+                var fileName = Path.GetFileName(url);
+                var targetPath = Utils.GetBinPath($"{fileName}");
+                return new FileDownloadRequest()
+                {
+                    FileUrl = url,
+                    FilePath = targetPath,
+                    DisplayFileName = fileName,
+                };
+            }),
+        ];
     }
 
-    private async Task UpdateSrsFileAll()
+    private async Task<List<FileDownloadRequest>> GetSrsFileAllRequest()
     {
         var geoipFiles = new List<string>();
         var geoSiteFiles = new List<string>();
@@ -432,15 +448,12 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
             Directory.CreateDirectory(path);
         }
 
-        foreach (var item in geoipFiles.Distinct())
-        {
-            await UpdateSrsFile("geoip", item);
-        }
-
-        foreach (var item in geoSiteFiles.Distinct())
-        {
-            await UpdateSrsFile("geosite", item);
-        }
+        return
+        [
+            .. geoipFiles.Distinct().Select(f => (type: "geoip", file: f))
+                .Concat(geoSiteFiles.Distinct().Select(f => (type: "geosite", file: f)))
+                .Select(item => GetSrsFileRequest(item.type, item.file)),
+        ];
     }
 
     private void AddPrefixedItems(List<string>? items, string prefix, List<string> output)
@@ -500,7 +513,7 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
         }
     }
 
-    private async Task UpdateSrsFile(string type, string srsName)
+    private FileDownloadRequest GetSrsFileRequest(string type, string srsName)
     {
         var srsUrl = string.IsNullOrEmpty(_config.ConstItem.SrsSourceUrl)
                         ? Global.SingboxRulesetUrl
@@ -510,33 +523,57 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
         var targetPath = Path.Combine(Utils.GetBinPath("srss"), fileName);
         var url = string.Format(srsUrl, type, $"{type}-{srsName}", srsName);
 
-        await DownloadGeoFile(url, fileName, targetPath);
+        return new FileDownloadRequest()
+        {
+            FileUrl = url,
+            FilePath = targetPath,
+            DisplayFileName = fileName,
+        };
     }
 
-    private async Task DownloadGeoFile(string url, string fileName, string targetPath)
+    private async Task DownloadGeoFiles(List<FileDownloadRequest> requests, bool blProxy)
     {
-        var tmpFileName = Utils.GetTempPath(Utils.GetGuid());
+        var tmpFilePathDict = new Dictionary<string, string>();
+        var tmpFileRequests = new List<FileDownloadRequest>();
+        foreach (var request in requests)
+        {
+            var tmpFilePath = Utils.GetTempPath(Utils.GetGuid());
+            tmpFilePathDict[request.FilePath] = tmpFilePath;
+            tmpFileRequests.Add(request with
+            {
+                FilePath = tmpFilePath,
+            });
+        }
 
         DownloadService downloadHandle = new();
         downloadHandle.UpdateCompleted += (sender2, args) =>
         {
             if (args.Success)
             {
-                _ = UpdateFunc(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, fileName));
+                //_ = UpdateFunc(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, fileName));
 
-                try
+                foreach (var request in requests)
                 {
-                    if (File.Exists(tmpFileName))
+                    try
                     {
-                        File.Copy(tmpFileName, targetPath, true);
+                        //if (File.Exists(tmpFileName))
+                        //{
+                        //    File.Copy(tmpFileName, targetPath, true);
 
-                        File.Delete(tmpFileName);
-                        //await    UpdateFunc(true, "");
+                        //    File.Delete(tmpFileName);
+                        //    //await    UpdateFunc(true, "");
+                        //}
+                        var tmpFileName = tmpFilePathDict[request.FilePath];
+                        if (File.Exists(tmpFileName))
+                        {
+                            File.Copy(tmpFileName, request.FilePath, true);
+                            File.Delete(tmpFileName);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        _ = UpdateFunc(false, ex.Message);
                     }
-                }
-                catch (Exception ex)
-                {
-                    _ = UpdateFunc(false, ex.Message);
                 }
             }
             else
@@ -549,7 +586,7 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
             _ = UpdateFunc(false, args.GetException().Message);
         };
 
-        await downloadHandle.DownloadFileAsync(url, tmpFileName, true, _timeout);
+        await downloadHandle.DownloadSmallFilesAsync(tmpFileRequests, blProxy, TimeSpan.FromSeconds(_timeout));
     }
 
     #endregion Geo private

v2rayN/ServiceLib/ViewModels/AddGroupServerViewModel.cs

@@ -218,8 +218,7 @@ public partial class AddGroupServerViewModel : MyReactiveObject, ICloseable
 
     public async Task UpdatePreviewList()
     {
-        AllProfilePreviewItemsObs.Clear();
-        AllProfilePreviewItemsObs.AddRange(await GroupProfileManager.GetChildProfileItemsByProtocolExtra(GetUpdatedProtocolExtra()));
+        AllProfilePreviewItemsObs.ReplaceRange(await GroupProfileManager.GetChildProfileItemsByProtocolExtra(GetUpdatedProtocolExtra()));
     }
 
     private async Task SaveServerAsync()

v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs

@@ -70,6 +70,9 @@ public partial class AddServerViewModel : MyReactiveObject, ICloseable
     [Reactive]
     public partial int WgMtu { get; set; }
 
+    [Reactive]
+    public partial string WgDns { get; set; }
+
     [Reactive]
     public partial bool Uot { get; set; }
 
@@ -310,6 +313,7 @@ public partial class AddServerViewModel : MyReactiveObject, ICloseable
         WgInterfaceAddress = protocolExtra.WgInterfaceAddress ?? string.Empty;
         WgReserved = protocolExtra.WgReserved ?? string.Empty;
         WgMtu = protocolExtra.WgMtu ?? 1280;
+        WgDns = protocolExtra.WgDns ?? string.Empty;
         Uot = protocolExtra.Uot ?? false;
         CongestionControl = protocolExtra.CongestionControl ?? string.Empty;
         InsecureConcurrency = protocolExtra.InsecureConcurrency > 0 ? protocolExtra.InsecureConcurrency : null;
@@ -431,6 +435,7 @@ public partial class AddServerViewModel : MyReactiveObject, ICloseable
             WgInterfaceAddress = WgInterfaceAddress.NullIfEmpty(),
             WgReserved = WgReserved.NullIfEmpty(),
             WgMtu = WgMtu >= 576 ? WgMtu : null,
+            WgDns = WgDns.NullIfEmpty(),
             Uot = Uot ? true : null,
             CongestionControl = CongestionControl.NullIfEmpty(),
             InsecureConcurrency = InsecureConcurrency > 0 ? InsecureConcurrency : null,

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -13,6 +13,7 @@ public partial class CheckUpdateViewModel : MyReactiveObject
     public ReactiveCommand<RxVoid, RxVoid> CheckUpdateCmd { get; }
     public ReactiveCommand<RxVoid, RxVoid> CheckOnlyCmd { get; }
     [Reactive] public partial bool EnableCheckPreReleaseUpdate { get; set; }
+    [Reactive] public partial bool EnableUpdateViaProxy { get; set; }
 
     public CheckUpdateViewModel()
     {
@@ -33,11 +34,13 @@ public partial class CheckUpdateViewModel : MyReactiveObject
         });
 
         EnableCheckPreReleaseUpdate = _config.CheckUpdateItem.CheckPreReleaseUpdate;
+        EnableUpdateViaProxy = _config.CheckUpdateItem.UpdateViaProxy;
 
-        this.WhenAnyValue(
-        x => x.EnableCheckPreReleaseUpdate,
-        y => y == true)
-            .Subscribe(c => _ = OnCheckPreReleaseUpdateChanged());
+        this.WhenAnyValue(x => x.EnableCheckPreReleaseUpdate)
+            .SubscribeAsync(async _ => await OnCheckPreReleaseUpdateChanged());
+
+        this.WhenAnyValue(x => x.EnableUpdateViaProxy)
+            .Subscribe(c => _ = OnUpdateViaProxyChanged());
 
         RefreshCheckUpdateItems();
     }
@@ -50,8 +53,7 @@ public partial class CheckUpdateViewModel : MyReactiveObject
 
         models.Add(GetGeoFileCheckUpdateModel());
 
-        CheckUpdateModels.Clear();
-        CheckUpdateModels.AddRange(models);
+        CheckUpdateModels.ReplaceRange(models);
     }
 
     private CheckUpdateModel GetCheckUpdateModel(ECoreType coreType)
@@ -98,6 +100,16 @@ public partial class CheckUpdateViewModel : MyReactiveObject
         await SaveSelectedCoreTypes();
     }
 
+    private async Task OnUpdateViaProxyChanged()
+    {
+        if (_config.CheckUpdateItem.UpdateViaProxy == EnableUpdateViaProxy)
+        {
+            return;
+        }
+        _config.CheckUpdateItem.UpdateViaProxy = EnableUpdateViaProxy;
+        await SaveSelectedCoreTypes();
+    }
+
     private async Task SaveSelectedCoreTypes()
     {
         _config.CheckUpdateItem.SelectedCoreTypes =
@@ -145,7 +157,7 @@ public partial class CheckUpdateViewModel : MyReactiveObject
             }
 
             var updateService = new UpdateService(_config, async (success, msg) => await Task.CompletedTask);
-            var result = await updateService.CheckHasUpdateOnly(item.CoreType.Value, EnableCheckPreReleaseUpdate);
+            var result = await updateService.CheckHasUpdateOnly(item.CoreType.Value, EnableCheckPreReleaseUpdate, EnableUpdateViaProxy);
             if (result.Success && result.Version != null)
             {
                 await UpdateView(item.CoreType, string.Format(ResUI.MsgCheckUpdateHasNewVersion, item.CoreType, result.Version));
@@ -193,7 +205,7 @@ public partial class CheckUpdateViewModel : MyReactiveObject
                 }
                 await CheckUpdateN(EnableCheckPreReleaseUpdate);
             }
-            else if (item.CoreType == ECoreType.Xray)
+            else if (item.CoreType is ECoreType.Xray or ECoreType.sing_box)
             {
                 await CheckUpdateCore(item, EnableCheckPreReleaseUpdate);
             }
@@ -230,7 +242,7 @@ public partial class CheckUpdateViewModel : MyReactiveObject
                 UpdatedPlusPlus(null, "");
             }
         }
-        await new UpdateService(_config, _updateUI).UpdateGeoFileAll()
+        await new UpdateService(_config, _updateUI).UpdateGeoFileAll(EnableUpdateViaProxy)
             .ContinueWith(t => UpdatedPlusPlus(null, ""));
     }
 
@@ -245,7 +257,7 @@ public partial class CheckUpdateViewModel : MyReactiveObject
                 UpdatedPlusPlus(_v2rayN, msg);
             }
         }
-        await new UpdateService(_config, _updateUI).CheckUpdateGuiN(preRelease)
+        await new UpdateService(_config, _updateUI).CheckUpdateGuiN(preRelease, EnableUpdateViaProxy)
             .ContinueWith(t => UpdatedPlusPlus(_v2rayN, ""));
     }
 
@@ -263,7 +275,7 @@ public partial class CheckUpdateViewModel : MyReactiveObject
 
         if (model.CoreType.HasValue)
         {
-            await new UpdateService(_config, _updateUI).CheckUpdateCore(model.CoreType.Value, preRelease)
+            await new UpdateService(_config, _updateUI).CheckUpdateCore(model.CoreType.Value, preRelease, EnableUpdateViaProxy)
                 .ContinueWith(t => UpdatedPlusPlus(model.CoreType, ""));
         }
     }

v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs

@@ -2,33 +2,18 @@ namespace ServiceLib.ViewModels;
 
 public partial class ClashConnectionsViewModel : MyReactiveObject
 {
-    public BulkObservableCollection<ClashConnectionModel> ConnectionItems { get; } = [];
-
-    [Reactive]
-    public partial ClashConnectionModel SelectedSource { get; set; }
-
-    public ReactiveCommand<RxVoid, RxVoid> ConnectionCloseCmd { get; }
-    public ReactiveCommand<RxVoid, RxVoid> ConnectionCloseAllCmd { get; }
-
-    [Reactive]
-    public partial string HostFilter { get; set; }
-
-    [Reactive]
-    public partial bool AutoRefresh { get; set; }
-
     public ClashConnectionsViewModel()
     {
         _config = AppManager.Instance.Config;
         AutoRefresh = _config.ClashUIItem.ConnectionsAutoRefresh;
 
         var canEditRemove = this.WhenAnyValue(
-         x => x.SelectedSource,
-         selectedSource => selectedSource != null && selectedSource.Id.IsNotEmpty());
+            x => x.SelectedSource,
+            selectedSource => selectedSource?.Id?.IsNotEmpty() == true);
 
         this.WhenAnyValue(
-           x => x.AutoRefresh,
-           y => y == true)
-               .Subscribe(c => { _config.ClashUIItem.ConnectionsAutoRefresh = AutoRefresh; });
+                x => x.AutoRefresh)
+            .Subscribe(_ => { _config.ClashUIItem.ConnectionsAutoRefresh = AutoRefresh; });
         ConnectionCloseCmd = ReactiveCommand.CreateFromTask(async () =>
         {
             await ClashConnectionClose(false);
@@ -39,17 +24,28 @@ public partial class ClashConnectionsViewModel : MyReactiveObject
             await ClashConnectionClose(true);
         });
 
-        _ = Init();
+        _ = Task.Factory.StartNew(
+            async () => await GetClashConnectionsTask(),
+            CancellationToken.None,
+            TaskCreationOptions.LongRunning,
+            TaskScheduler.Default
+        );
     }
 
-    private async Task Init()
-    {
-        await DelayTestTask();
-    }
+    public BulkObservableCollection<ClashConnectionModel> ConnectionItems { get; } = [];
+
+    [Reactive] public partial ClashConnectionModel SelectedSource { get; set; }
+
+    public ReactiveCommand<RxVoid, RxVoid> ConnectionCloseCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> ConnectionCloseAllCmd { get; }
+
+    [Reactive] public partial string HostFilter { get; set; }
+
+    [Reactive] public partial bool AutoRefresh { get; set; }
 
     private async Task GetClashConnections()
     {
-        var ret = await ClashApiManager.Instance.GetClashConnectionsAsync();
+        var ret = await ClashApiManager.Instance.GetConnections();
         if (ret == null)
         {
             return;
@@ -63,13 +59,12 @@ public partial class ClashConnectionsViewModel : MyReactiveObject
 
     public async Task RefreshConnections(List<ConnectionItem>? connections)
     {
-        ConnectionItems.Clear();
-
         var dtNow = DateTime.Now;
         var lstModel = new List<ClashConnectionModel>();
         foreach (var item in connections ?? [])
         {
-            var host = $"{(item.metadata.host.IsNullOrEmpty() ? item.metadata.destinationIP : item.metadata.host)}:{item.metadata.destinationPort}";
+            var host =
+                $"{(item.metadata.host.IsNullOrEmpty() ? item.metadata.destinationIP : item.metadata.host)}:{item.metadata.destinationPort}";
             if (HostFilter.IsNotEmpty() && !host.Contains(HostFilter))
             {
                 continue;
@@ -83,17 +78,13 @@ public partial class ClashConnectionsViewModel : MyReactiveObject
                 Host = host,
                 Time = (dtNow - item.start).TotalSeconds < 0 ? 1 : (dtNow - item.start).TotalSeconds,
                 Elapsed = (dtNow - item.start).ToString(@"hh\:mm\:ss"),
-                Chain = $"{item.rule} , {string.Join("->", item.chains ?? [])}"
+                Chain = $"{item.rule} , {string.Join("->", item.chains ?? [])}",
             };
 
             lstModel.Add(model);
         }
-        if (lstModel.Count <= 0)
-        {
-            return;
-        }
 
-        ConnectionItems.AddRange(lstModel);
+        ConnectionItems.ReplaceRange(lstModel);
         await Task.CompletedTask;
     }
 
@@ -103,47 +94,39 @@ public partial class ClashConnectionsViewModel : MyReactiveObject
         if (!all)
         {
             var item = SelectedSource;
-            if (item is null)
+            if (string.IsNullOrEmpty(item?.Id))
             {
                 return;
             }
             id = item.Id;
         }
-        else
-        {
-            ConnectionItems.Clear();
-        }
-        await ClashApiManager.Instance.ClashConnectionClose(id);
+        await ClashApiManager.Instance.CloseConnection(id);
         await GetClashConnections();
     }
 
-    public async Task DelayTestTask()
+    public async Task GetClashConnectionsTask()
     {
-        _ = Task.Run(async () =>
+        var numOfExecuted = 1;
+        while (true)
         {
-            var numOfExecuted = 1;
-            while (true)
+            await Task.Delay(1000 * 5);
+            numOfExecuted++;
+            if (!(AutoRefresh && AppManager.Instance.ShowInTaskbar &&
+                  AppManager.Instance.IsRunningCore(ECoreType.sing_box)))
             {
-                await Task.Delay(1000 * 5);
-                numOfExecuted++;
-                if (!(AutoRefresh && AppManager.Instance.ShowInTaskbar && AppManager.Instance.IsRunningCore(ECoreType.sing_box)))
-                {
-                    continue;
-                }
-
-                if (_config.ClashUIItem.ConnectionsRefreshInterval <= 0)
-                {
-                    continue;
-                }
-
-                if (numOfExecuted % _config.ClashUIItem.ConnectionsRefreshInterval != 0)
-                {
-                    continue;
-                }
-                await GetClashConnections();
+                continue;
             }
-        });
 
-        await Task.CompletedTask;
+            if (_config.ClashUIItem.ConnectionsRefreshInterval <= 0)
+            {
+                continue;
+            }
+
+            if (numOfExecuted % _config.ClashUIItem.ConnectionsRefreshInterval != 0)
+            {
+                continue;
+            }
+            await GetClashConnections();
+        }
     }
 }

v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs

@@ -1,36 +1,9 @@
-using static ServiceLib.Models.Dto.ClashProviders;
-using static ServiceLib.Models.Dto.ClashProxies;
-
 namespace ServiceLib.ViewModels;
 
 public partial class ClashProxiesViewModel : MyReactiveObject
 {
-    private Dictionary<string, ProxiesItem>? _proxies;
-    private Dictionary<string, ProvidersItem>? _providers;
     private readonly int _delayTimeout = 99999999;
-
-    public BulkObservableCollection<ClashProxyModel> ProxyGroups { get; } = [];
-    public BulkObservableCollection<ClashProxyModel> ProxyDetails { get; } = [];
-
-    [Reactive]
-    public partial ClashProxyModel SelectedGroup { get; set; }
-
-    [Reactive]
-    public partial ClashProxyModel SelectedDetail { get; set; }
-
-    public ReactiveCommand<RxVoid, RxVoid> ProxiesReloadCmd { get; }
-    public ReactiveCommand<RxVoid, RxVoid> ProxiesDelayTestCmd { get; }
-    public ReactiveCommand<RxVoid, RxVoid> ProxiesDelayTestPartCmd { get; }
-    public ReactiveCommand<RxVoid, RxVoid> ProxiesSelectActivityCmd { get; }
-
-    [Reactive]
-    public partial int RuleModeSelected { get; set; }
-
-    [Reactive]
-    public partial int SortingSelected { get; set; }
-
-    [Reactive]
-    public partial bool AutoRefresh { get; set; }
+    private ClashItem _clashItem = new();
 
     public ClashProxiesViewModel()
     {
@@ -40,169 +13,158 @@ public partial class ClashProxiesViewModel : MyReactiveObject
         {
             await ProxiesReload();
         });
-        ProxiesDelayTestCmd = ReactiveCommand.CreateFromTask(async () =>
+        ProxyDelayTestCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            await ProxiesDelayTest(true);
+            if (!string.IsNullOrEmpty(SelectedDetail?.Name))
+            {
+                await TestProxyDelay(SelectedDetail.Name);
+            }
         });
 
-        ProxiesDelayTestPartCmd = ReactiveCommand.CreateFromTask(async () =>
+        GroupProxiesDelayTestCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            await ProxiesDelayTest(false);
+            await TestGroupProxiesDelay();
         });
         ProxiesSelectActivityCmd = ReactiveCommand.CreateFromTask(async () =>
         {
             await SetActiveProxy();
         });
 
-        SelectedGroup = new();
-        SelectedDetail = new();
         AutoRefresh = _config.ClashUIItem.ProxiesAutoRefresh;
         SortingSelected = _config.ClashUIItem.ProxiesSorting;
-        RuleModeSelected = (int)_config.ClashUIItem.RuleMode;
+        RuleModeSelected = nameof(ERuleMode.Rule);
 
         #region WhenAnyValue && ReactiveCommand
 
-        this.WhenAnyValue(
-           x => x.SelectedGroup,
-           y => y != null && y.Name.IsNotEmpty())
-               .Subscribe(RefreshProxyDetails);
+        this.WhenAnyValue(x => x.SelectedGroup)
+            .Where(y => y != null && y.Name.IsNotEmpty())
+            .Subscribe(_ => RefreshProxyDetails());
 
-        this.WhenAnyValue(
-           x => x.RuleModeSelected,
-           y => y >= 0)
-               .Subscribe(async c => await DoRuleModeSelected(c));
+        this.WhenAnyValue(x => x.RuleModeSelected)
+            .Where(y => !string.IsNullOrEmpty(y))
+            .Skip(1)
+            .SubscribeAsync(async x => await SetRuleMode(x));
 
-        this.WhenAnyValue(
-           x => x.SortingSelected,
-           y => y >= 0)
-              .Subscribe(DoSortingSelected);
+        this.WhenAnyValue(x => x.SortingSelected)
+            .Where(y => y >= 0)
+            .Subscribe(_ => DoSortingSelected());
 
-        this.WhenAnyValue(
-        x => x.AutoRefresh,
-        y => y == true)
-            .Subscribe(c => { _config.ClashUIItem.ProxiesAutoRefresh = AutoRefresh; });
+        this.WhenAnyValue(x => x.AutoRefresh)
+            .Where(y => y)
+            .Subscribe(_ => { _config.ClashUIItem.ProxiesAutoRefresh = AutoRefresh; });
 
         #endregion WhenAnyValue && ReactiveCommand
 
-        _ = Init();
+        _ = Task.Factory.StartNew(
+            async () => await GetClashProxiesTask(),
+            CancellationToken.None,
+            TaskCreationOptions.LongRunning,
+            TaskScheduler.Default
+        );
     }
 
-    private async Task Init()
-    {
-        await DelayTestTask();
-    }
+    public BulkObservableCollection<ClashProxyModel> ProxyGroups { get; } = [];
+    public BulkObservableCollection<ClashProxyModel> ProxyDetails { get; } = [];
 
-    private async Task DoRuleModeSelected(bool c)
-    {
-        if (!c)
-        {
-            return;
-        }
-        if (_config.ClashUIItem.RuleMode == (ERuleMode)RuleModeSelected)
-        {
-            return;
-        }
-        await SetRuleModeCheck((ERuleMode)RuleModeSelected);
-    }
+    public BulkObservableCollection<string> ClashModes { get; } = new(Enum.GetNames<ERuleMode>().ToList());
 
-    public async Task SetRuleModeCheck(ERuleMode mode)
-    {
-        if (_config.ClashUIItem.RuleMode == mode)
-        {
-            return;
-        }
-        await SetRuleMode(mode);
-    }
+    [Reactive] public partial ClashProxyModel? SelectedGroup { get; set; }
 
-    private void DoSortingSelected(bool c)
+    [Reactive] public partial ClashProxyModel? SelectedDetail { get; set; }
+
+    public ReactiveCommand<RxVoid, RxVoid> ProxiesReloadCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> ProxyDelayTestCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> GroupProxiesDelayTestCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> ProxiesSelectActivityCmd { get; }
+
+    [Reactive] public partial string RuleModeSelected { get; set; }
+
+    [Reactive] public partial int SortingSelected { get; set; }
+
+    [Reactive] public partial bool AutoRefresh { get; set; }
+
+    private void DoSortingSelected()
     {
-        if (!c)
-        {
-            return;
-        }
         if (SortingSelected != _config.ClashUIItem.ProxiesSorting)
         {
             _config.ClashUIItem.ProxiesSorting = SortingSelected;
         }
 
-        RefreshProxyDetails(c);
+        RefreshProxyDetails();
     }
 
     public async Task ProxiesReload()
     {
-        await GetClashProxies(true);
-        await ProxiesDelayTest();
+        await GetClashProxies();
+        await GetClashModes();
     }
 
+    #region task
+
+    public async Task GetClashProxiesTask()
+    {
+        var numOfExecuted = 1;
+        while (true)
+        {
+            await Task.Delay(1000 * 60);
+            numOfExecuted++;
+            if (!(AutoRefresh && AppManager.Instance.ShowInTaskbar &&
+                  AppManager.Instance.IsRunningCore(ECoreType.sing_box)))
+            {
+                continue;
+            }
+            if (_config.ClashUIItem.ProxiesAutoDelayTestInterval <= 0)
+            {
+                continue;
+            }
+            if (numOfExecuted % _config.ClashUIItem.ProxiesAutoDelayTestInterval != 0)
+            {
+                continue;
+            }
+            await GetClashProxies();
+        }
+    }
+
+    #endregion task
+
     #region proxy function
 
-    private async Task SetRuleMode(ERuleMode mode)
+    private async Task SetRuleMode(string mode)
     {
-        _config.ClashUIItem.RuleMode = mode;
-
-        if (mode != ERuleMode.Unchanged)
-        {
-            Dictionary<string, string> headers = new()
-                {
-                    { "mode", mode.ToString().ToLower() }
-                };
-            await ClashApiManager.Instance.ClashConfigUpdate(headers);
-        }
+        await ClashApiManager.Instance.UpdateClashMode(mode);
     }
 
-    private async Task GetClashProxies(bool refreshUI)
+    private async Task GetClashProxies()
     {
-        var ret = await ClashApiManager.Instance.GetClashProxiesAsync();
-        if (ret?.Item1 == null || ret.Item2 == null)
+        var ret = await ClashApiManager.Instance.GetProxies();
+        if (ret?.IsEmpty() != false)
         {
             return;
         }
-        _proxies = ret.Item1.proxies;
-        _providers = ret?.Item2.providers;
+        _clashItem = ret;
 
-        if (refreshUI)
-        {
-            RxSchedulers.MainThreadScheduler.Schedule(() => _ = RefreshProxyGroups());
-        }
+        RxSchedulers.MainThreadScheduler.Schedule(() => _ = RefreshProxyGroups());
     }
 
     public async Task RefreshProxyGroups()
     {
-        if (_proxies == null)
+        if (_clashItem.IsEmpty())
         {
             return;
         }
 
         var selectedName = SelectedGroup?.Name;
-        ProxyGroups.Clear();
 
         var lstProxyGroups = new List<ClashProxyModel>();
-        var proxyGroups = ClashApiManager.Instance.GetClashProxyGroups();
-        if (proxyGroups is { Count: > 0 })
-        {
-            foreach (var it in proxyGroups)
-            {
-                if (it.name.IsNullOrEmpty() || !_proxies.TryGetValue(it.name, out var item))
-                {
-                    continue;
-                }
-                if (!Global.allowSelectType.Contains(item.type.ToLower()))
-                {
-                    continue;
-                }
-                lstProxyGroups.Add(new ClashProxyModel()
-                {
-                    Now = item.now,
-                    Name = item.name,
-                    Type = item.type
-                });
-            }
-        }
 
-        //from api
-        foreach (var kv in _proxies)
+        var globalName = "GLOBAL";
+        foreach (var kv in _clashItem.Proxies)
         {
-            if (!Global.allowSelectType.Contains(kv.Value.type.ToLower()))
+            if (!Global.allowSelectType.Contains(kv.Value.type?.ToLower()))
+            {
+                continue;
+            }
+            if (kv.Key == globalName)
             {
                 continue;
             }
@@ -211,52 +173,49 @@ public partial class ClashProxiesViewModel : MyReactiveObject
             {
                 continue;
             }
-            lstProxyGroups.Add(new ClashProxyModel()
+            lstProxyGroups.Add(new ClashProxyModel
             {
                 Now = kv.Value.now,
                 Name = kv.Key,
-                Type = kv.Value.type
+                Type = kv.Value.type,
+            });
+        }
+        if (_clashItem.Proxies.TryGetValue(globalName, out var globalProxy))
+        {
+            lstProxyGroups.Add(new ClashProxyModel
+            {
+                Now = globalProxy.now,
+                Name = globalName,
+                Type = globalProxy.type,
             });
         }
 
-        ProxyGroups.AddRange(lstProxyGroups);
+        ProxyGroups.ReplaceRange(lstProxyGroups);
 
         if (ProxyGroups is { Count: > 0 })
         {
-            if (selectedName != null && ProxyGroups.Any(t => t.Name == selectedName))
-            {
-                SelectedGroup = ProxyGroups.FirstOrDefault(t => t.Name == selectedName);
-            }
-            else
-            {
-                SelectedGroup = ProxyGroups.First();
-            }
+            SelectedGroup = ProxyGroups.FirstOrDefault(t => t.Name == selectedName) ?? ProxyGroups.First();
         }
         else
         {
-            SelectedGroup = new();
+            SelectedGroup = null;
         }
         await Task.CompletedTask;
     }
 
-    private void RefreshProxyDetails(bool c)
+    private void RefreshProxyDetails()
     {
-        ProxyDetails.Clear();
-        if (!c)
-        {
-            return;
-        }
         var name = SelectedGroup?.Name;
         if (name.IsNullOrEmpty())
         {
             return;
         }
-        if (_proxies == null)
+        if (_clashItem.IsEmpty())
         {
             return;
         }
 
-        _proxies.TryGetValue(name, out var proxy);
+        _clashItem.Proxies.TryGetValue(name, out var proxy);
         if (proxy?.all == null)
         {
             return;
@@ -271,7 +230,7 @@ public partial class ClashProxiesViewModel : MyReactiveObject
             }
             var delay = proxy2.history?.Count > 0 ? proxy2.history.Last().delay : -1;
 
-            lstDetails.Add(new ClashProxyModel()
+            lstDetails.Add(new ClashProxyModel
             {
                 IsActive = item == proxy.now,
                 Name = item,
@@ -280,7 +239,7 @@ public partial class ClashProxiesViewModel : MyReactiveObject
                 DelayName = delay <= 0 ? string.Empty : $"{delay}ms",
             });
         }
-        //sort
+        // sort
         switch (SortingSelected)
         {
             case 0:
@@ -290,101 +249,95 @@ public partial class ClashProxiesViewModel : MyReactiveObject
             case 1:
                 lstDetails = lstDetails.OrderBy(t => t.Name).ToList();
                 break;
-
-            default:
-                break;
         }
-        ProxyDetails.AddRange(lstDetails);
+        ProxyDetails.ReplaceRange(lstDetails);
     }
 
-    private ProxiesItem? TryGetProxy(string name)
+    private ClashProxy? TryGetProxy(string? name)
     {
-        if (_proxies == null)
+        if (name.IsNullOrEmpty())
         {
             return null;
         }
-        _proxies.TryGetValue(name, out var proxy2);
-        if (proxy2 != null)
-        {
-            return proxy2;
-        }
-        //from providers
-        if (_providers != null)
-        {
-            foreach (var kv in _providers)
-            {
-                if (Global.proxyVehicleType.Contains(kv.Value.vehicleType.ToLower()))
-                {
-                    var proxy3 = kv.Value.proxies.FirstOrDefault(t => t.name == name);
-                    if (proxy3 != null)
-                    {
-                        return proxy3;
-                    }
-                }
-            }
-        }
-        return null;
+        _clashItem.Proxies.TryGetValue(name, out var proxy2);
+        return proxy2;
     }
 
     public async Task SetActiveProxy()
     {
-        if (SelectedGroup == null || SelectedGroup.Name.IsNullOrEmpty())
+        if (SelectedGroup.Name.IsNullOrEmpty())
         {
             return;
         }
-        if (SelectedDetail == null || SelectedDetail.Name.IsNullOrEmpty())
+        if (SelectedDetail.Name.IsNullOrEmpty())
         {
             return;
         }
-        var name = SelectedGroup.Name;
-        if (name.IsNullOrEmpty())
+        var groupName = SelectedGroup.Name;
+        if (groupName.IsNullOrEmpty())
         {
             return;
         }
-        var nameNode = SelectedDetail.Name;
-        if (nameNode.IsNullOrEmpty())
+        var nodeName = SelectedDetail.Name;
+        if (nodeName.IsNullOrEmpty())
         {
             return;
         }
-        var selectedProxy = TryGetProxy(name);
-        if (selectedProxy == null || selectedProxy.type != "Selector")
+        var selectedProxy = TryGetProxy(groupName);
+        if (selectedProxy is not { type: "Selector" })
         {
             NoticeManager.Instance.Enqueue(ResUI.OperationFailed);
             return;
         }
 
-        await ClashApiManager.Instance.ClashSetActiveProxy(name, nameNode);
-
-        selectedProxy.now = nameNode;
-        var group = ProxyGroups.FirstOrDefault(it => it.Name == SelectedGroup.Name);
-        if (group != null)
-        {
-            group.Now = nameNode;
-            var group2 = JsonUtils.DeepCopy(group);
-            ProxyGroups.Replace(group, group2);
-
-            SelectedGroup = group2;
-        }
+        await ClashApiManager.Instance.SetActiveProxy(groupName, nodeName);
+        await GetClashProxies();
         NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
     }
 
-    private async Task ProxiesDelayTest(bool blAll = true)
+    private async Task GetClashModes()
     {
-        ClashApiManager.Instance.ClashProxiesDelayTest(blAll, ProxyDetails.ToList(), async (item, result) =>
+        var ret = await ClashApiManager.Instance.GetClashModes();
+        if (ret is not { Count: > 0 })
         {
-            if (item == null || result.IsNullOrEmpty())
-            {
-                return;
-            }
+            return;
+        }
+        ClashModes.ReplaceRange(ret);
+        var currentMode = await ClashApiManager.Instance.GetClashMode();
+        if (currentMode.IsNullOrEmpty())
+        {
+            return;
+        }
+        RuleModeSelected = currentMode;
+    }
 
-            var model = new SpeedTestResult() { IndexId = item.Name, Delay = result };
-            RxSchedulers.MainThreadScheduler.Schedule(() =>
-            {
-                _ = ProxiesDelayTestResult(model);
-            });
-            await Task.CompletedTask;
+    private async Task TestProxyDelay(string name)
+    {
+        var result = await ClashApiManager.Instance.TestDelay(name, _clashItem);
+        var model = new SpeedTestResult
+        {
+            IndexId = name,
+            Delay = result.ToString(),
+        };
+        await ProxiesDelayTestResult(model);
+    }
+
+    private async Task TestGroupProxiesDelay()
+    {
+        var groupProxy = TryGetProxy(SelectedGroup.Name);
+        if (!Global.allowSelectType.Contains(groupProxy?.type))
+        {
+            return;
+        }
+
+        var options = new ParallelOptions
+        {
+            MaxDegreeOfParallelism = 4,
+        };
+        await Parallel.ForEachAsync(groupProxy?.all ?? [], options, async (name, _) =>
+        {
+            await TestProxyDelay(name);
         });
-        await Task.CompletedTask;
     }
 
     public async Task ProxiesDelayTestResult(SpeedTestResult result)
@@ -394,56 +347,10 @@ public partial class ClashProxiesViewModel : MyReactiveObject
         {
             return;
         }
-
-        var dicResult = JsonUtils.Deserialize<Dictionary<string, object>>(result.Delay);
-        if (dicResult != null && dicResult.TryGetValue("delay", out var value))
-        {
-            detail.Delay = Convert.ToInt32(value.ToString());
-            detail.DelayName = $"{detail.Delay}ms";
-        }
-        else if (dicResult != null && dicResult.TryGetValue("message", out var value1))
-        {
-            detail.Delay = _delayTimeout;
-            detail.DelayName = $"{value1}";
-        }
-        else
-        {
-            detail.Delay = _delayTimeout;
-            detail.DelayName = string.Empty;
-        }
+        detail.Delay = Convert.ToInt32(result.Delay);
+        detail.DelayName = $"{detail.Delay}ms";
         await Task.CompletedTask;
     }
 
     #endregion proxy function
-
-    #region task
-
-    public async Task DelayTestTask()
-    {
-        _ = Task.Run(async () =>
-          {
-              var numOfExecuted = 1;
-              while (true)
-              {
-                  await Task.Delay(1000 * 60);
-                  numOfExecuted++;
-                  if (!(AutoRefresh && AppManager.Instance.ShowInTaskbar && AppManager.Instance.IsRunningCore(ECoreType.sing_box)))
-                  {
-                      continue;
-                  }
-                  if (_config.ClashUIItem.ProxiesAutoDelayTestInterval <= 0)
-                  {
-                      continue;
-                  }
-                  if (numOfExecuted % _config.ClashUIItem.ProxiesAutoDelayTestInterval != 0)
-                  {
-                      continue;
-                  }
-                  await ProxiesDelayTest();
-              }
-          });
-        await Task.CompletedTask;
-    }
-
-    #endregion task
 }

v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs

@@ -9,6 +9,7 @@ public partial class DNSSettingViewModel : MyReactiveObject, ICloseable
     [Reactive] public partial bool FakeIP { get; set; }
     [Reactive] public partial string FakeIPRange { get; set; }
     [Reactive] public partial bool BlockBindingQuery { get; set; }
+    [Reactive] public partial bool BlockAAAAQuery { get; set; }
     [Reactive] public partial string DirectDNS { get; set; }
     [Reactive] public partial string RemoteDNS { get; set; }
     [Reactive] public partial string BootstrapDNS { get; set; }
@@ -74,6 +75,7 @@ public partial class DNSSettingViewModel : MyReactiveObject, ICloseable
         FakeIP = item.FakeIP ?? false;
         FakeIPRange = item.FakeIPRange ?? string.Empty;
         BlockBindingQuery = item.BlockBindingQuery ?? false;
+        BlockAAAAQuery = item.BlockAAAAQuery ?? false;
         DirectDNS = item.DirectDNS ?? string.Empty;
         RemoteDNS = item.RemoteDNS ?? string.Empty;
         BootstrapDNS = item.BootstrapDNS ?? string.Empty;
@@ -108,6 +110,7 @@ public partial class DNSSettingViewModel : MyReactiveObject, ICloseable
         _config.SimpleDNSItem.FakeIP = FakeIP;
         _config.SimpleDNSItem.FakeIPRange = FakeIPRange;
         _config.SimpleDNSItem.BlockBindingQuery = BlockBindingQuery;
+        _config.SimpleDNSItem.BlockAAAAQuery = BlockAAAAQuery;
         _config.SimpleDNSItem.DirectDNS = DirectDNS;
         _config.SimpleDNSItem.RemoteDNS = RemoteDNS;
         _config.SimpleDNSItem.BootstrapDNS = BootstrapDNS;

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -257,19 +257,19 @@ public partial class MainWindowViewModel : MyReactiveObject
         AppEvents.AddServerViaClipboardRequested
             .AsObservable()
             .ObserveOn(RxSchedulers.MainThreadScheduler)
-            .Subscribe(async _ => await AddServerViaClipboardAsync(null));
+            .SubscribeAsync(async _ => await AddServerViaClipboardAsync(null));
 
         AppEvents.HasUpdateNotified
             .AsObservable()
             .ObserveOn(RxSchedulers.MainThreadScheduler)
-            .Subscribe(async bl => BlNewUpdate = bl);
+            .Subscribe(bl => BlNewUpdate = bl);
 
         #endregion AppEvents
 
         ProfilesViewModel.RefreshServersRequested
             .AsObservable()
             .ObserveOn(RxSchedulers.MainThreadScheduler)
-            .Subscribe(async _ => await RefreshServers());
+            .SubscribeAsync(async _ => await RefreshServers());
 
         var vmReloadRequestedList = new List<IObservable<RxVoid>>
         {
@@ -282,23 +282,23 @@ public partial class MainWindowViewModel : MyReactiveObject
         {
             reloadRequested
                 .ObserveOn(RxSchedulers.MainThreadScheduler)
-                .Subscribe(async _ => await Reload());
+                .SubscribeAsync(async _ => await Reload());
         }
 
         StatusBarViewModel.AddServerViaScanRequested
             .AsObservable()
             .ObserveOn(RxSchedulers.MainThreadScheduler)
-            .Subscribe(async _ => await AddServerViaScanAsync());
+            .SubscribeAsync(async _ => await AddServerViaScanAsync());
 
         StatusBarViewModel.AddServerViaClipboardRequested
             .AsObservable()
             .ObserveOn(RxSchedulers.MainThreadScheduler)
-            .Subscribe(async _ => await AddServerViaClipboardAsync(null));
+            .SubscribeAsync(async _ => await AddServerViaClipboardAsync(null));
 
         StatusBarViewModel.ShowHideWindowRequested
             .AsObservable()
             .ObserveOn(RxSchedulers.MainThreadScheduler)
-            .Subscribe(async blShow =>
+            .SubscribeAsync(async blShow =>
             {
                 await ShowHideWindowInteraction.HandleSafe(blShow);
             });
@@ -306,12 +306,12 @@ public partial class MainWindowViewModel : MyReactiveObject
         StatusBarViewModel.SetDefaultServerRequested
             .AsObservable()
             .ObserveOn(RxSchedulers.MainThreadScheduler)
-            .Subscribe(async indexId => await ProfilesViewModel.SetDefaultServer(indexId));
+            .SubscribeAsync(async indexId => await ProfilesViewModel.SetDefaultServer(indexId));
 
         StatusBarViewModel.SubscriptionsUpdateRequested
             .AsObservable()
             .ObserveOn(RxSchedulers.MainThreadScheduler)
-            .Subscribe(async blProxy => await UpdateSubscriptionProcess("", blProxy));
+            .SubscribeAsync(async blProxy => await UpdateSubscriptionProcess("", blProxy));
 
         _ = Init();
     }
@@ -690,7 +690,18 @@ public partial class MainWindowViewModel : MyReactiveObject
             });
             RxSchedulers.MainThreadScheduler.Schedule(async () =>
             {
-                await StatusBarViewModel.TestServerAvailability();
+                var result = await StatusBarViewModel.TestServerAvailability();
+                if (result == null || profileItem.IndexId.IsNullOrEmpty())
+                {
+                    return;
+                }
+               
+                await ProfilesViewModel.SetSpeedTestResult(new()
+                {
+                    IndexId = profileItem.IndexId,
+                    IpInfo = result.Ip,
+                    Delay = result.Time > 0 ? result.Time.ToString() : null
+                });
             });
 
             var showClashUI = AppManager.Instance.IsRunningCore(ECoreType.sing_box);

v2rayN/ServiceLib/ViewModels/MsgViewModel.cs

@@ -22,18 +22,16 @@ public partial class MsgViewModel : MyReactiveObject
         AutoRefresh = _config.MsgUIItem.AutoRefresh ?? true;
 
         this.WhenAnyValue(
-           x => x.MsgFilter)
-               .Subscribe(c => DoMsgFilter());
+                x => x.MsgFilter)
+            .Subscribe(c => DoMsgFilter());
 
-        this.WhenAnyValue(
-          x => x.AutoRefresh,
-          y => y == true)
-              .Subscribe(c => _config.MsgUIItem.AutoRefresh = AutoRefresh);
+        this.WhenAnyValue(x => x.AutoRefresh)
+            .Subscribe(_ => _config.MsgUIItem.AutoRefresh = AutoRefresh);
 
         AppEvents.SendMsgViewRequested
-         .AsObservable()
-         //.ObserveOn(RxSchedulers.MainThreadScheduler)
-         .Subscribe(content => _ = AppendQueueMsg(content));
+            .AsObservable()
+            //.ObserveOn(RxSchedulers.MainThreadScheduler)
+            .Subscribe(content => _ = AppendQueueMsg(content));
     }
 
     public void FlushQueueMsg()
@@ -74,9 +72,9 @@ public partial class MsgViewModel : MyReactiveObject
             {
                 try
                 {
-                    await DispatcherShowMsgInteraction.HandleSafe(sb.ToString());
+                    await DispatcherShowMsgInteraction.Handle(sb.ToString());
                 }
-                catch (Exception)
+                catch
                 {
                     _queueMsg.Enqueue(sb.ToString());
                 }

v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs

@@ -22,6 +22,9 @@ public partial class OptionSettingViewModel : MyReactiveObject, ICloseable
     [Reactive] public partial string DefUserAgent { get; set; }
     [Reactive] public partial string SendThrough { get; set; }
     [Reactive] public partial string BindInterface { get; set; }
+    [Reactive] public partial int? Mux4RayConcurrency { get; set; }
+    [Reactive] public partial int? Mux4RayXudpConcurrency { get; set; }
+    [Reactive] public partial string Mux4RayXudpProxyUDP443 { get; set; }
     [Reactive] public partial string Mux4SboxProtocol { get; set; }
     [Reactive] public partial bool EnableCacheFile4Sbox { get; set; }
     [Reactive] public partial int? HyUpMbps { get; set; }
@@ -152,6 +155,9 @@ public partial class OptionSettingViewModel : MyReactiveObject, ICloseable
         DefUserAgent = _config.CoreBasicItem.DefUserAgent;
         SendThrough = _config.CoreBasicItem.SendThrough ?? string.Empty;
         BindInterface = _config.CoreBasicItem.BindInterface ?? string.Empty;
+        Mux4RayConcurrency = _config.Mux4RayItem.Concurrency;
+        Mux4RayXudpConcurrency = _config.Mux4RayItem.XudpConcurrency;
+        Mux4RayXudpProxyUDP443 = _config.Mux4RayItem.XudpProxyUDP443 ?? string.Empty;
         Mux4SboxProtocol = _config.Mux4SboxItem.Protocol;
         EnableCacheFile4Sbox = _config.CoreBasicItem.EnableCacheFile4Sbox;
         HyUpMbps = _config.HysteriaItem.UpMbps;
@@ -327,6 +333,9 @@ public partial class OptionSettingViewModel : MyReactiveObject, ICloseable
         _config.CoreBasicItem.DefUserAgent = DefUserAgent;
         _config.CoreBasicItem.SendThrough = SendThrough.TrimEx();
         _config.CoreBasicItem.BindInterface = BindInterface.TrimEx();
+        _config.Mux4RayItem.Concurrency = Mux4RayConcurrency > 0 ? Mux4RayConcurrency : null;
+        _config.Mux4RayItem.XudpConcurrency = Mux4RayXudpConcurrency > 0 ? Mux4RayXudpConcurrency : null;
+        _config.Mux4RayItem.XudpProxyUDP443 = Mux4RayXudpProxyUDP443.NullIfEmpty();
         _config.Mux4SboxItem.Protocol = Mux4SboxProtocol;
         _config.CoreBasicItem.EnableCacheFile4Sbox = EnableCacheFile4Sbox;
         _config.HysteriaItem.UpMbps = HyUpMbps ?? 0;

v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs

@@ -3,7 +3,7 @@ namespace ServiceLib.ViewModels;
 public partial class ProfilesSelectViewModel : MyReactiveObject, ICloseable
 {
     public event EventHandler? RequestClose;
-    
+
     public Interaction<RxVoid, RxVoid> ProfilesFocusInteraction { get; } = new();
 
     #region private prop
@@ -61,24 +61,22 @@ public partial class ProfilesSelectViewModel : MyReactiveObject, ICloseable
             SelectFinish();
         });
 
-        this.WhenAnyValue(
-            x => x.SelectedSub,
-            y => y != null && !y.Remarks.IsNullOrEmpty() && _subIndexId != y.Id)
-                .Subscribe(async c => await SubSelectedChangedAsync(c));
+        this.WhenAnyValue(x => x.SelectedSub)
+            .Where(y => y != null && !y.Remarks.IsNullOrEmpty() && _subIndexId != y.Id)
+            .SubscribeAsync(async _ => await SubSelectedChangedAsync());
 
-        this.WhenAnyValue(
-          x => x.ServerFilter,
-          y => y != null && _serverFilter != y)
-              .Subscribe(async c => await ServerFilterChanged(c));
+        this.WhenAnyValue(x => x.ServerFilter)
+            .Where(y => y != null && _serverFilter != y)
+            .SubscribeAsync(async _ => await ServerFilterChanged());
 
         // React to ConfigType filter changes
         this.WhenAnyValue(x => x.FilterExclude)
             .Skip(1)
-            .Subscribe(async _ => await RefreshServersBiz());
+            .SubscribeAsync(async _ => await RefreshServersBiz());
 
         this.WhenAnyValue(x => x.FilterConfigTypes)
             .Skip(1)
-            .Subscribe(async _ => await RefreshServersBiz());
+            .SubscribeAsync(async _ => await RefreshServersBiz());
 
         #endregion WhenAnyValue && ReactiveCommand
 
@@ -128,12 +126,8 @@ public partial class ProfilesSelectViewModel : MyReactiveObject, ICloseable
 
     #region Servers && Groups
 
-    private async Task SubSelectedChangedAsync(bool c)
+    private async Task SubSelectedChangedAsync()
     {
-        if (!c)
-        {
-            return;
-        }
         _subIndexId = SelectedSub?.Id;
 
         await RefreshServers();
@@ -141,12 +135,8 @@ public partial class ProfilesSelectViewModel : MyReactiveObject, ICloseable
         await ProfilesFocusInteraction.HandleSafe(RxVoid.Default);
     }
 
-    private async Task ServerFilterChanged(bool c)
+    private async Task ServerFilterChanged()
     {
-        if (!c)
-        {
-            return;
-        }
         _serverFilter = ServerFilter;
         if (_serverFilter.IsNullOrEmpty())
         {
@@ -163,8 +153,7 @@ public partial class ProfilesSelectViewModel : MyReactiveObject, ICloseable
     {
         var lstModel = await GetProfileItemsEx(_subIndexId, _serverFilter);
 
-        ProfileItems.Clear();
-        ProfileItems.AddRange(lstModel);
+        ProfileItems.ReplaceRange(lstModel);
         if (lstModel.Count > 0)
         {
             var selected = lstModel.FirstOrDefault(t => t.IndexId == _config.IndexId);
@@ -177,8 +166,7 @@ public partial class ProfilesSelectViewModel : MyReactiveObject, ICloseable
         var subItems = await AppManager.Instance.SubItems();
         subItems.Insert(0, new SubItem { Remarks = ResUI.AllGroupServers });
 
-        SubItems.Clear();
-        SubItems.AddRange(subItems);
+        SubItems.ReplaceRange(subItems);
 
         SelectedSub = (_config.SubIndexId.IsNotEmpty()
                         ? subItems.FirstOrDefault(t => t.Id == _config.SubIndexId)
@@ -298,8 +286,7 @@ public partial class ProfilesSelectViewModel : MyReactiveObject, ICloseable
             : ProfileItems.OrderByDescending(KeySelector, comparer);
 
         var list = sorted.ToList();
-        ProfileItems.Clear();
-        ProfileItems.AddRange(list);
+        ProfileItems.ReplaceRange(list);
 
         _dicHeaderSort[colName] = !asc;
 

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -103,19 +103,16 @@ public partial class ProfilesViewModel : MyReactiveObject
            x => x.SelectedProfile,
            selectedSource => selectedSource != null && !selectedSource.IndexId.IsNullOrEmpty());
 
-        this.WhenAnyValue(
-            x => x.SelectedSub,
-            y => y != null && !y.Remarks.IsNullOrEmpty() && _config.SubIndexId != y.Id)
-                .Subscribe(async c => await SubSelectedChangedAsync(c));
-        this.WhenAnyValue(
-             x => x.SelectedMoveToGroup,
-             y => y != null && !y.Remarks.IsNullOrEmpty())
-                 .Subscribe(async c => await MoveToGroup(c));
+        this.WhenAnyValue(x => x.SelectedSub)
+            .Where(y => y != null && !y.Remarks.IsNullOrEmpty() && _config.SubIndexId != y.Id)
+            .SubscribeAsync(async _ => await SubSelectedChangedAsync());
+        this.WhenAnyValue(x => x.SelectedMoveToGroup)
+            .Where(y => y != null && !y.Remarks.IsNullOrEmpty())
+            .SubscribeAsync(async _ => await MoveToGroup());
 
-        this.WhenAnyValue(
-          x => x.ServerFilter,
-          y => y != null && _serverFilter != y)
-              .Subscribe(async c => await ServerFilterChanged(c));
+        this.WhenAnyValue(x => x.ServerFilter)
+            .Where(y => y != null && _serverFilter != y)
+            .SubscribeAsync(async _ => await ServerFilterChanged());
 
         //servers delete
         EditServerCmd = ReactiveCommand.CreateFromTask(async () =>
@@ -249,7 +246,7 @@ public partial class ProfilesViewModel : MyReactiveObject
         AppEvents.DispatcherStatisticsRequested
             .AsObservable()
             .ObserveOn(RxSchedulers.MainThreadScheduler)
-            .Subscribe(async result => await UpdateStatistics(result));
+            .SubscribeAsync(async result => await UpdateStatistics(result));
 
         #endregion AppEvents
 
@@ -335,12 +332,8 @@ public partial class ProfilesViewModel : MyReactiveObject
 
     #region Servers && Groups
 
-    private async Task SubSelectedChangedAsync(bool c)
+    private async Task SubSelectedChangedAsync()
     {
-        if (!c)
-        {
-            return;
-        }
         _config.SubIndexId = SelectedSub?.Id;
 
         await RefreshServers();
@@ -348,12 +341,8 @@ public partial class ProfilesViewModel : MyReactiveObject
         await ProfilesFocusInteraction.HandleSafe(RxVoid.Default);
     }
 
-    private async Task ServerFilterChanged(bool c)
+    private async Task ServerFilterChanged()
     {
-        if (!c)
-        {
-            return;
-        }
         _serverFilter = ServerFilter;
         if (_serverFilter.IsNullOrEmpty())
         {
@@ -375,8 +364,7 @@ public partial class ProfilesViewModel : MyReactiveObject
         var lstModel = await GetProfileItemsEx(_config.SubIndexId, _serverFilter);
         _lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel)) ?? [];
 
-        ProfileItems.Clear();
-        ProfileItems.AddRange(lstModel ?? []);
+        ProfileItems.ReplaceRange(lstModel ?? []);
         if (lstModel?.Count > 0)
         {
             ProfileItemModel? selected = null;
@@ -397,8 +385,7 @@ public partial class ProfilesViewModel : MyReactiveObject
         var subItems = await AppManager.Instance.SubItems();
         subItems.Insert(0, new SubItem { Remarks = ResUI.AllGroupServers });
 
-        SubItems.Clear();
-        SubItems.AddRange(subItems);
+        SubItems.ReplaceRange(subItems);
 
         SelectedSub = (_config.SubIndexId.IsNotEmpty()
                         ? subItems.FirstOrDefault(t => t.Id == _config.SubIndexId)
@@ -672,13 +659,8 @@ public partial class ProfilesViewModel : MyReactiveObject
     }
 
     //move server
-    private async Task MoveToGroup(bool c)
+    private async Task MoveToGroup()
     {
-        if (!c)
-        {
-            return;
-        }
-
         var lstSelected = await GetProfileItems(true);
         if (lstSelected == null)
         {
@@ -901,7 +883,7 @@ public partial class ProfilesViewModel : MyReactiveObject
         if (await AppManager.Instance.WindowDialog.ShowDialogAsync(subEditViewModel) == true)
         {
             await RefreshSubscriptions();
-            await SubSelectedChangedAsync(true);
+            await SubSelectedChangedAsync();
         }
     }
 
@@ -920,7 +902,7 @@ public partial class ProfilesViewModel : MyReactiveObject
         await ConfigHandler.DeleteSubItem(_config, item.Id);
 
         await RefreshSubscriptions();
-        await SubSelectedChangedAsync(true);
+        await SubSelectedChangedAsync();
     }
 
     #endregion Subscription

v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs

@@ -100,8 +100,6 @@ public partial class RoutingRuleSettingViewModel : MyReactiveObject, ICloseable
 
     public void RefreshRulesItems()
     {
-        RulesItems.Clear();
-
         var models = new List<RulesItemModel>();
         foreach (var item in _rules)
         {
@@ -120,7 +118,7 @@ public partial class RoutingRuleSettingViewModel : MyReactiveObject, ICloseable
             };
             models.Add(it);
         }
-        RulesItems.AddRange(models);
+        RulesItems.ReplaceRange(models);
     }
 
     public async Task RuleEditAsync(bool blNew)

v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs

@@ -61,10 +61,10 @@ public partial class RoutingSettingViewModel : MyReactiveObject
             x => x.DomainStrategy4Singbox)
             .Skip(1)
             .DistinctUntilChanged()
-            .Subscribe(x =>
+            .SubscribeAsync(async x =>
             {
                 IsModified = true;
-                _ = SaveSettingsAsync();
+                await SaveSettingsAsync();
             });
     }
 
@@ -83,7 +83,6 @@ public partial class RoutingSettingViewModel : MyReactiveObject
 
     public async Task RefreshRoutingItems()
     {
-        RoutingItems.Clear();
         var models = new List<RoutingItemModel>();
 
         var routings = await AppManager.Instance.RoutingItems();
@@ -102,7 +101,7 @@ public partial class RoutingSettingViewModel : MyReactiveObject
             };
             models.Add(it);
         }
-        RoutingItems.AddRange(models);
+        RoutingItems.ReplaceRange(models);
     }
 
     /// <summary>

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -123,26 +123,21 @@ public partial class StatusBarViewModel : MyReactiveObject
 
         #region WhenAnyValue && ReactiveCommand
 
-        this.WhenAnyValue(
-                x => x.SelectedRouting,
-                y => y != null && !y.Remarks.IsNullOrEmpty())
-            .Subscribe(async c => await RoutingSelectedChangedAsync(c));
+        this.WhenAnyValue(x => x.SelectedRouting)
+            .Where(y => y != null && !y.Remarks.IsNullOrEmpty())
+            .SubscribeAsync(async _ => await RoutingSelectedChangedAsync());
 
-        this.WhenAnyValue(
-                x => x.SelectedServer,
-                y => y != null && !y.Text.IsNullOrEmpty())
-            .Subscribe(ServerSelectedChanged);
+        this.WhenAnyValue(x => x.SelectedServer)
+            .Where(y => y != null && !y.Text.IsNullOrEmpty())
+            .Subscribe(_ => ServerSelectedChanged());
 
         SystemProxySelected = (int)_config.SystemProxyItem.SysProxyType;
-        this.WhenAnyValue(
-                x => x.SystemProxySelected,
-                y => y >= 0)
-            .Subscribe(async c => await DoSystemProxySelected(c));
+        this.WhenAnyValue(x => x.SystemProxySelected)
+            .Where(y => y >= 0)
+            .SubscribeAsync(async _ => await DoSystemProxySelected());
 
-        this.WhenAnyValue(
-                x => x.EnableTun,
-                y => y == true)
-            .Subscribe(async c => await DoEnableTun(c));
+        this.WhenAnyValue(x => x.EnableTun)
+            .SubscribeAsync(async _ => await DoEnableTun());
 
         CopyProxyCmdToClipboardCmd = ReactiveCommand.CreateFromTask(async () =>
         {
@@ -207,12 +202,12 @@ public partial class StatusBarViewModel : MyReactiveObject
         AppEvents.DispatcherStatisticsRequested
             .AsObservable()
             .ObserveOn(RxSchedulers.MainThreadScheduler)
-            .Subscribe(async result => await UpdateStatistics(result));
+            .SubscribeAsync(async result => await UpdateStatistics(result));
 
         AppEvents.SysProxyChangeRequested
             .AsObservable()
             .ObserveOn(RxSchedulers.MainThreadScheduler)
-            .Subscribe(async result => await SetListenerType(result));
+            .SubscribeAsync(async result => await SetListenerType(result));
 
         #endregion AppEvents
 
@@ -300,19 +295,14 @@ public partial class StatusBarViewModel : MyReactiveObject
         var models = lstModel.Select(it => new ComboItem { ID = it.IndexId, Text = it.GetSummary() }).ToList();
 
         BlServers = true;
-        Servers.Clear();
-        Servers.AddRange(models);
+        Servers.ReplaceRange(models);
 
         // Update the ItemsSource before SelectedItem so a collection reset does not clear the tray selection.
         SelectedServer = models.FirstOrDefault(it => it.ID == _config.IndexId) ?? new();
     }
 
-    private void ServerSelectedChanged(bool c)
+    private void ServerSelectedChanged()
     {
-        if (!c)
-        {
-            return;
-        }
         if (SelectedServer == null)
         {
             return;
@@ -324,20 +314,32 @@ public partial class StatusBarViewModel : MyReactiveObject
         SetDefaultServerRequested.Publish(SelectedServer.ID);
     }
 
-    public async Task TestServerAvailability()
+    public async Task<AvailabilityCheckResult?> TestServerAvailability()
     {
         var item = await ConfigHandler.GetDefaultServer(_config);
         if (item == null)
         {
-            return;
+            return null;
         }
 
         await TestServerAvailabilitySub(ResUI.Speedtesting);
 
-        var msg = await Task.Run(ConnectionHandler.RunAvailabilityCheck);
+        var result = await Task.Run(ConnectionHandler.RunAvailabilityCheck);
+        var msg = string.Format(ResUI.TestMeOutput, result.Time, result.Ip);
+
+        var ip = result.GetValidIp();
+        if (ip.IsNotEmpty())
+        {
+            ProfileExManager.Instance.SetTestIpInfo(item.IndexId, ip);
+        }
+        if (result.Time > 0)
+        {
+            ProfileExManager.Instance.SetTestDelay(item.IndexId, result.Time);
+        }
 
         NoticeManager.Instance.SendMessageEx(msg);
         await TestServerAvailabilitySub(msg);
+        return result;
     }
 
     private async Task TestServerAvailabilitySub(string msg)
@@ -390,19 +392,13 @@ public partial class StatusBarViewModel : MyReactiveObject
     {
         var routings = await AppManager.Instance.RoutingItems();
 
-        RoutingItems.Clear();
-        RoutingItems.AddRange(routings);
+        RoutingItems.ReplaceRange(routings);
 
         SelectedRouting = routings.FirstOrDefault(t => t.IsActive == true);
     }
 
-    private async Task RoutingSelectedChangedAsync(bool c)
+    private async Task RoutingSelectedChangedAsync()
     {
-        if (!c)
-        {
-            return;
-        }
-
         if (SelectedRouting == null)
         {
             return;
@@ -422,12 +418,8 @@ public partial class StatusBarViewModel : MyReactiveObject
         }
     }
 
-    private async Task DoSystemProxySelected(bool c)
+    private async Task DoSystemProxySelected()
     {
-        if (!c)
-        {
-            return;
-        }
         if (_config.SystemProxyItem.SysProxyType == (ESysProxyType)SystemProxySelected)
         {
             return;
@@ -435,7 +427,7 @@ public partial class StatusBarViewModel : MyReactiveObject
         await SetListenerType((ESysProxyType)SystemProxySelected);
     }
 
-    private async Task DoEnableTun(bool c)
+    private async Task DoEnableTun()
     {
         if (_config.TunModeItem.EnableTun == EnableTun)
         {

v2rayN/ServiceLib/ViewModels/SubEditViewModel.cs

@@ -9,6 +9,7 @@ public partial class SubEditViewModel : MyReactiveObject, ICloseable
 
     [Reactive]
     public partial string CustomCoreType { get; set; }
+
     [Reactive]
     public partial string PrevProfile { get; set; }
 

v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs

@@ -55,8 +55,7 @@ public partial class SubSettingViewModel : MyReactiveObject
 
     public async Task RefreshSubItems()
     {
-        SubItems.Clear();
-        SubItems.AddRange(await AppManager.Instance.SubItems());
+        SubItems.ReplaceRange(await AppManager.Instance.SubItems());
     }
 
     public async Task EditSubAsync(bool blNew)

v2rayN/v2rayN.Desktop/Common/MacAppUtils.cs

@@ -16,7 +16,7 @@ internal static class MacAppUtils
     public static bool IsWindowMiniaturized(Window window)
         => window.TryGetPlatformHandle() is IMacOSTopLevelPlatformHandle { NSWindow: not 0 } handle
             && objc_msgSend_bool(handle.NSWindow, sel_registerName("isMiniaturized"));
-    
+
     [DllImport(LibObjC)]
     private static extern nint objc_getClass(string name);
 
@@ -29,7 +29,7 @@ internal static class MacAppUtils
     [DllImport(LibObjC, EntryPoint = "objc_msgSend")]
     [return: MarshalAs(UnmanagedType.I1)]
     private static extern bool objc_msgSend_bool(nint receiver, nint selector);
-    
+
     [DllImport(LibObjC, EntryPoint = "objc_msgSend")]
     private static extern void objc_msgSend(nint receiver, nint selector, nint argument);
 }

v2rayN/v2rayN.Desktop/Common/SimpleViewLocator.cs

@@ -1,3 +1,4 @@
+using System.Runtime.CompilerServices;
 using Avalonia.Controls.Templates;
 using v2rayN.Desktop.ViewModels;
 using v2rayN.Desktop.Views;
@@ -9,6 +10,7 @@ public class SimpleViewLocator : IDataTemplate
     private static readonly Lazy<SimpleViewLocator> _instance = new(() => new SimpleViewLocator());
 
     private readonly Dictionary<Type, Func<Control?>> _locator = new();
+    private readonly ConditionalWeakTable<object, Control> _cachedViews = new();
 
     private SimpleViewLocator()
     {
@@ -45,9 +47,18 @@ public class SimpleViewLocator : IDataTemplate
             return new TextBlock { Text = "No VM provided" };
         }
 
-        _locator.TryGetValue(data.GetType(), out var factory);
+        var vmType = data.GetType();
+        if (!_locator.TryGetValue(vmType, out var factory))
+        {
+            return new TextBlock { Text = $"VM Not Registered: {vmType}" };
+        }
 
-        return factory?.Invoke() ?? new TextBlock { Text = $"VM Not Registered: {data.GetType()}" };
+        if (ShouldCache(vmType))
+        {
+            return _cachedViews.GetValue(data, _ => CreateView(factory, vmType));
+        }
+
+        return CreateView(factory, vmType);
     }
 
     public bool Match(object? data)
@@ -55,6 +66,19 @@ public class SimpleViewLocator : IDataTemplate
         return data is MyReactiveObject;
     }
 
+    private static bool ShouldCache(Type vmType)
+    {
+        return vmType == typeof(MsgViewModel)
+               || vmType == typeof(ClashProxiesViewModel)
+               || vmType == typeof(ClashConnectionsViewModel)
+               || vmType == typeof(ProfilesViewModel);
+    }
+
+    private static Control CreateView(Func<Control?> factory, Type vmType)
+    {
+        return factory.Invoke() ?? new TextBlock { Text = $"View Factory Returned Null: {vmType}" };
+    }
+
     public void RegisterViewFactory<TViewModel>(Func<Control> factory) where TViewModel : class
     {
         _locator.Add(typeof(TViewModel), factory);

v2rayN/v2rayN.Desktop/DesignData/DesignData.cs

@@ -1,4 +1,3 @@
-using ServiceLib.Models.Entities;
 using System.Diagnostics;
 using v2rayN.Desktop.Manager;
 using v2rayN.Desktop.ViewModels;