up 7.24.9

The Code Test workflow only has a pull_request trigger, so the suite
never runs against master itself: a direct push is untested, and a
merge can break tests even when the pull request's own check was
green, because checks run on the PR head rather than on the merged
result. Add a push trigger for master with the same paths filter.

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

.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.6</Version>
+        <Version>7.24.9</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/Directory.Packages.props

@@ -9,13 +9,11 @@
     <PackageVersion Include="Avalonia.Controls.DataGrid" Version="12.1.2" />
     <PackageVersion Include="Avalonia.Desktop" Version="12.1.1" />
     <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="CliWrap" Version="3.10.5" />
     <PackageVersion Include="Downloader" Version="5.9.5" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.4.1" />
     <PackageVersion Include="MaterialDesignThemes" Version="5.3.2" />
     <PackageVersion Include="QRCoder" Version="1.8.0" />
@@ -25,15 +23,15 @@
     <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

@@ -251,4 +251,12 @@ internal static class CoreConfigTestFactory
         config.TunModeItem.RouteExcludeAddress = ["10.0.0.1/32", "192.168.1.0/24", "fc00::/7"];
         return config;
     }
+
+    public static Config CreateConfigWithTun(ECoreType coreType, bool enableIPv6Address)
+    {
+        var config = CreateConfig(coreType);
+        config.TunModeItem.EnableTun = true;
+        config.TunModeItem.EnableIPv6Address = enableIPv6Address;
+        return config;
+    }
 }

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,100 @@ 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_BindInterface_ShouldUseDialBindInterface()
+    [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
+        // embedded template makes JsonUtils.Deserialize return null and silently
+        // drops every one of them.
+        var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
+        config.TunModeItem.EnableTun = true;
+        CoreConfigTestFactory.BindAppManagerConfig(config);
+
+        var node = CoreConfigTestFactory.CreateVmessNode(ECoreType.sing_box);
+        var context = CoreConfigTestFactory.CreateContext(config, node, ECoreType.sing_box) with
+        {
+            IsTunEnabled = true,
+        };
+
+        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.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");
+        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");
+    }
+
+    [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`
+        // writes such a packet straight back into the TUN, which routes it to the
+        // outbound again - an infinite loop that pins a CPU core. Observed in the wild
+        // with WebRTC ICE connectivity checks against the TUN's own fc00::/7 ULA
+        // address, sustaining ~8k packets/s out of the TUN interface.
+        var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
+        config.TunModeItem.EnableTun = true;
+        config.TunModeItem.EnableIPv6Address = true;
+        CoreConfigTestFactory.BindAppManagerConfig(config);
+
+        var node = CoreConfigTestFactory.CreateVmessNode(ECoreType.sing_box);
+        var context = CoreConfigTestFactory.CreateContext(config, node, ECoreType.sing_box) with
+        {
+            IsTunEnabled = true,
+        };
+
+        var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
+
+        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 self = IPAddress.Parse(address.Split('/').First());
+            var hostBits = self.AddressFamily == AddressFamily.InterNetworkV6 ? 128 : 32;
+            var expected = $"{self}/{hostBits}";
+            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");
+        }
+
+        // The match has to stay on the addresses themselves. sing-tun derives the TUN's DNS
+        // entry from the address right after the interface's own, and every prefix offered
+        // 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));
+        await dropRule.ip_cidr.Should().All(c => c.EndsWith("/32", StringComparison.Ordinal) || c.EndsWith("/128", StringComparison.Ordinal));
+    }
+
+    [Test]
+    public async Task GenerateClientConfigContent_BindInterface_ShouldUseDialBindInterface()
     {
         var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
         config.CoreBasicItem.BindInterface = "eth0";
@@ -71,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);
@@ -97,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);
@@ -124,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);
@@ -157,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);
@@ -190,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);
@@ -244,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);
@@ -293,21 +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()
+    [Test]
+    public async Task GenerateClientConfigContent_DirectExpectedIPs_ShouldApplyGeoipAndCidrToDirectDnsRule()
     {
         var config = CoreConfigTestFactory.CreateConfigWithDirectExpectedIPs(
             ECoreType.sing_box,
@@ -338,7 +410,7 @@ 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 =>
@@ -347,11 +419,11 @@ public class CoreConfigSingboxServiceTests
             && r.rule_set?.Contains("geosite-cn") == true
             && r.rule_set?.Contains("geoip-cn") == true) ?? false;
 
-        hasExpectedRule.Should().BeTrue();
+        await 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);
@@ -362,17 +434,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";
@@ -405,14 +477,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");
@@ -442,21 +514,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 =
@@ -484,7 +556,7 @@ 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 =>
@@ -492,11 +564,11 @@ public class CoreConfigSingboxServiceTests
             && 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();
+        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";
@@ -508,21 +580,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);
@@ -551,22 +623,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.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]
+    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);
@@ -579,22 +651,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.
@@ -612,23 +684,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);
@@ -649,17 +722,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,22 +549,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 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");
     }
 
-    [Fact]
-    public void GenerateClientConfigContent_TunRouteExcludeAddress()
+    [Test]
+    [Arguments(false)]
+    [Arguments(true)]
+    public async Task GenerateClientConfigContent_Tun_ShouldRouteIPv6IntoTunnel(bool enableIPv6Address)
+    {
+        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);
+
+        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");
+        await tunInbound.settings.autoSystemRoutingTable.Should().Contain("::/0");
+
+        // EnableIPv6Address governs the interface address only, never the routing table.
+        await tunInbound.settings.gateway.Should().HaveCount(enableIPv6Address ? 2 : 1);
+    }
+
+    [Test]
+    public async Task GenerateClientConfigContent_TunRouteExcludeAddress_ShouldIncludeIPv6Ranges()
+    {
+        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);
+
+        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(x => x.Contains(':'));
+    }
+
+    [Test]
+    public async Task GenerateClientConfigContent_TunRouteExcludeAddress()
     {
         var config = CoreConfigTestFactory.CreateConfigWithTunRouteExcludeAddress(ECoreType.Xray);
         CoreConfigTestFactory.BindAppManagerConfig(config);
@@ -581,20 +619,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);
@@ -621,14 +659,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/Common/Extension.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
 
 namespace ServiceLib.Common;
 
@@ -134,4 +135,30 @@ public static class Extension
                     .Replace("\r", replacement)
                     .Replace("\n", replacement);
     }
+
+    public static async Task<TOutput> HandleSafe<TInput, TOutput>(
+        this Interaction<TInput, TOutput> interaction,
+        TInput input,
+        TOutput defaultValue = default!,
+        [CallerMemberName] string memberName = "",
+        [CallerFilePath] string filePath = "",
+        [CallerLineNumber] int lineNumber = 0)
+    {
+        try
+        {
+            return await interaction.Handle(input);
+        }
+        catch (UnhandledInteractionException<TInput, TOutput> ex)
+        {
+            var title = $"Unhandled interaction exception in {memberName} at {filePath}:{lineNumber}";
+            Logging.SaveLog(title, ex);
+            return defaultValue;
+        }
+        catch (Exception 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;

v2rayN/ServiceLib/Common/WindowsUtils.cs

@@ -54,12 +54,12 @@ internal static class WindowsUtils
 
     public static async Task RemoveTunDevice()
     {
-        var tunNameList = new List<string> { "singbox_tun", "xray_tun" };
+        var tunNameList = new List<string> { "wintunsingbox_tun", "xray_tun" };
         foreach (var tunName in tunNameList)
         {
             try
             {
-                var sum = MD5.HashData(Encoding.UTF8.GetBytes($"wintun{tunName}"));
+                var sum = MD5.HashData(Encoding.UTF8.GetBytes(tunName));
                 var guid = new Guid(sum);
                 var pnpUtilPath = @"C:\Windows\System32\pnputil.exe";
                 var arg = $$""" /remove-device  "SWD\Wintun\{{{guid}}}" """;

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/Handler/Builder/CoreConfigContextBuilder.cs

@@ -1,5 +1,3 @@
-using System.ComponentModel.DataAnnotations;
-
 namespace ServiceLib.Handler.Builder;
 
 public record CoreConfigContextBuilderResult(CoreConfigContext Context, NodeValidatorResult ValidatorResult)
@@ -205,7 +203,7 @@ public class CoreConfigContextBuilder
                 Context = preSocksResult.Context with
                 {
                     ProtectDomainList =
-                    [.. nodeContext.ProtectDomainList ?? [], .. preSocksResult.Context.ProtectDomainList ?? []],
+                    [.. nodeContext.ProtectDomainList, .. preSocksResult.Context.ProtectDomainList],
                     ProtectCoreTypeList = protectCoreTypeList,
                 },
             };
@@ -386,7 +384,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/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

@@ -1,5 +1,3 @@
-using System.Collections.Specialized;
-
 namespace ServiceLib.Handler.Fmt;
 
 public class Hysteria2Fmt : BaseFmt
@@ -19,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);
 
@@ -168,8 +170,21 @@ public class Hysteria2Fmt : BaseFmt
         }
         if (item.CertSha.IsNullOrEmpty())
         {
-            item.CertSha = GetQueryDecoded(query, "pinSHA256");
+            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
         {
             Ports = GetQueryDecoded(query, "mport"),
@@ -212,6 +227,15 @@ 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));
+        }
         var protocolExtraItem = item.GetProtocolExtra();
         var isGecko = !protocolExtraItem.GeckoMinPacketSize.IsNullOrEmpty() || !protocolExtraItem.GeckoMaxPacketSize.IsNullOrEmpty();
         if (!protocolExtraItem.SalamanderPass.IsNullOrEmpty())

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/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/Models/Configs/ConfigItems.cs

@@ -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/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/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/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

@@ -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>
@@ -5031,6 +5058,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

@@ -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.fr.resx

@@ -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

@@ -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

@@ -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

@@ -1462,7 +1462,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 +1860,16 @@ 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>
+</root>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -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

@@ -1459,7 +1459,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 +1861,16 @@
   <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>
 </root>

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

@@ -1417,7 +1417,7 @@
     <value>新增 [Anytls] 節點</value>
   </data>
   <data name="TbRemoteDNS" xml:space="preserve">
-    <value>遠程 DNS</value>
+    <value>遠端 DNS</value>
   </data>
   <data name="TbDomesticDNS" xml:space="preserve">
     <value>直連 DNS</value>
@@ -1429,16 +1429,16 @@
     <value>代理目標解析策略</value>
   </data>
   <data name="TbAddCommonDNSHosts" xml:space="preserve">
-    <value>新增常用 DNS Hosts</value>
+    <value>新增常用 DNS 主機對應</value>
   </data>
   <data name="TbFakeIP" xml:space="preserve">
     <value>FakeIP</value>
   </data>
   <data name="TbBlockSVCBHTTPSQueries" xml:space="preserve">
-    <value>阻止 SVCB 和 HTTPS 查詢</value>
+    <value>封鎖 SVCB 與 HTTPS 查詢</value>
   </data>
   <data name="TbDNSHostsConfig" xml:space="preserve">
-    <value>DNS Hosts：（“網域名稱1 ip1 ip2” 一行一個）</value>
+    <value>DNS 主機對應：（每行一組「網域名稱1 ip1 ip2」）</value>
   </data>
   <data name="ThBasicDNSSettings" xml:space="preserve">
     <value>DNS 基礎設定</value>
@@ -1447,49 +1447,49 @@
     <value>DNS 進階設定</value>
   </data>
   <data name="TbValidateDirectExpectedIPs" xml:space="preserve">
-    <value>校驗相應地區域名 IP</value>
+    <value>驗證區域網域名稱的 IP</value>
   </data>
   <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
-    <value>配置後，會對相應地區域名（如 geosite:cn - geoip:cn）的返回 IP 進行校驗，僅返回期望 IP</value>
+    <value>設定後，系統會驗證區域網域名稱（例如 geosite:cn - geoip:cn）所傳回的 IP，並只傳回預期的 IP。</value>
   </data>
   <data name="TbCustomDNSEnable" xml:space="preserve">
     <value>啟用自訂 DNS</value>
   </data>
   <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
-    <value>自訂 DNS 已啟用，此頁面配置將無效</value>
+    <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>
+    <value>請填寫正確的設定範本</value>
   </data>
   <data name="menuFullConfigTemplate" xml:space="preserve">
-    <value>完整配置範本設定</value>
+    <value>完整設定範本</value>
   </data>
   <data name="TbFullConfigTemplateEnable" xml:space="preserve">
-    <value>啟用完整配置範本</value>
+    <value>啟用完整設定範本</value>
   </data>
   <data name="TbRayFullConfigTemplate" xml:space="preserve">
-    <value>v2ray 完整配置範本</value>
+    <value>v2ray 完整設定範本</value>
   </data>
   <data name="TbRayFullConfigTemplateDesc" xml:space="preserve">
-    <value>僅添加出站配置，routing.balancers 和 routing.rules.outboundTag，點擊查看文檔</value>
+    <value>僅新增出站設定、routing.balancers 與 routing.rules.outboundTag。點選以查看說明文件</value>
   </data>
   <data name="TbAddProxyProtocolOutboundOnly" xml:space="preserve">
-    <value>不添加非代理協定出站</value>
+    <value>不新增非代理協定出站</value>
   </data>
   <data name="TbSetUpstreamProxyDetour" xml:space="preserve">
-    <value>設定上游代理 tag</value>
+    <value>設定上游代理標籤</value>
   </data>
   <data name="TbSBFullConfigTemplate" xml:space="preserve">
-    <value>sing-box 完整配置範本</value>
+    <value>sing-box 完整設定範本</value>
   </data>
   <data name="TbSBFullConfigTemplateDesc" xml:space="preserve">
-    <value>僅添加出站和端點配置，點擊查看文檔</value>
+    <value>僅新增出站與端點設定。點選以查看說明文件</value>
   </data>
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
-    <value>此功能供高級用戶和有特殊需求的用戶使用。 啟用此功能後，將忽略 Core 的基礎設定，DNS 設定 ，路由設定。你需要保證系統代理的埠和流量統計等功能的配置正確，一切都由你來設定。</value>
+    <value>此功能適合進階使用者與有特殊需求的使用者。啟用後，Core 基礎設定、DNS 設定與路由設定將被忽略。請確認系統代理連接埠、流量統計及其他相關設定皆正確；所有項目都必須由您自行設定。</value>
   </data>
   <data name="MsgStartParsingSubscription" xml:space="preserve">
     <value>開始解析和處理訂閱內容</value>
@@ -1498,10 +1498,10 @@
     <value>選擇節點</value>
   </data>
   <data name="TbFakeIPTips" xml:space="preserve">
-    <value>默認全局生效，僅在 sing-box 中內置 FakeIP 過濾。</value>
+    <value>預設會套用至全域；內建 FakeIP 過濾僅支援 sing-box。</value>
   </data>
   <data name="PleaseAddAtLeastOneServer" xml:space="preserve">
-    <value>請至少添加一個節點</value>
+    <value>請至少新增一個設定檔</value>
   </data>
   <data name="TbConfigTypePolicyGroup" xml:space="preserve">
     <value>策略組</value>
@@ -1627,7 +1627,7 @@
     <value>提供過期快取（Serve Stale）</value>
   </data>
   <data name="TbParallelQuery" xml:space="preserve">
-    <value>并行查詢</value>
+    <value>並行查詢</value>
   </data>
   <data name="TbDomesticDNSTips" xml:space="preserve">
     <value>預設僅在路由期間進行解析時調用</value>
@@ -1861,4 +1861,4 @@
   <data name="LvCustomCoreType" xml:space="preserve">
     <value>自訂設定核心</value>
   </data>
-</root>
+</root>

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs

@@ -1,3 +1,6 @@
+using YamlDotNet.Core;
+using YamlDotNet.RepresentationModel;
+
 namespace ServiceLib.Services.CoreConfig;
 
 /// <summary>
@@ -127,7 +130,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))

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

@@ -282,13 +282,23 @@ 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)
         {
@@ -296,8 +306,8 @@ public partial class CoreConfigSingboxService
         }
 
         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))
@@ -306,7 +316,7 @@ public partial class CoreConfigSingboxService
                 .Split(new[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries)
                 .Select(s => s.Trim())
                 .Where(s => !string.IsNullOrEmpty(s))
-                .ToList();
+                .ToHashSet();
 
             foreach (var ip in ipItems)
             {
@@ -364,11 +374,11 @@ public partial class CoreConfigSingboxService
                         rule4ExpectedIPs.geosite = regionGeosite;
                         if (expectedIPsRegions.Count > 0)
                         {
-                            rule4ExpectedIPs.geoip = expectedIPsRegions;
+                            rule4ExpectedIPs.geoip = expectedIPsRegions.ToList();
                         }
                         if (expectedIPCidr.Count > 0)
                         {
-                            rule4ExpectedIPs.ip_cidr = expectedIPCidr;
+                            rule4ExpectedIPs.ip_cidr = expectedIPCidr.ToList();
                         }
                         _coreConfig.dns.rules.Add(rule4ExpectedIPs);
                     }

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

@@ -48,12 +48,18 @@ public partial class CoreConfigSingboxService
                 // packet straight back into the TUN, which hands it to the outbound again -
                 // an infinite loop that pins a CPU core. Drop instead of rejecting so no
                 // ICMP unreachable is generated back towards the same addresses.
+                //
+                // Match each address on its own, not the prefix it carries. On Linux sing-tun
+                // registers Inet4Address[0].Addr().Next() with systemd-resolved as a "~." DNS
+                // upstream, and every prefix offered here is a /30 or /126, so carrying the
+                // prefix through would cover that resolver address too and drop every system
+                // name lookup along with the loop.
                 var tunAddresses = _coreConfig.inbounds.FirstOrDefault(i => i.type == "tun")?.address;
                 if (tunAddresses?.Count > 0)
                 {
                     _coreConfig.route.rules.Add(new()
                     {
-                        ip_cidr = [.. tunAddresses],
+                        ip_cidr = [.. tunAddresses.Select(ToSingleAddressPrefix)],
                         action = "reject",
                         method = "drop",
                     });
@@ -284,6 +290,14 @@ public partial class CoreConfigSingboxService
         }
     }
 
+    private static string ToSingleAddressPrefix(string address)
+    {
+        var addr = address.Split('/').First();
+        return IPAddress.TryParse(addr, out var ip)
+            ? $"{addr}/{(ip.AddressFamily == AddressFamily.InterNetworkV6 ? 128 : 32)}"
+            : address;
+    }
+
     private List<string> BuildRoutingDirectExe()
     {
         var directExeSet = new HashSet<string>(StringComparer.OrdinalIgnoreCase);

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,7 +194,6 @@ public partial class CoreConfigV2rayService
                 dnsServerDomains.Add($"full:{domain}");
             }
         }
-        dnsServerDomains = dnsServerDomains.Distinct().ToList();
 
         if (!string.IsNullOrEmpty(simpleDNSItem?.DirectExpectedIPs))
         {
@@ -197,7 +201,7 @@ public partial class CoreConfigV2rayService
                 .Split(new[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries)
                 .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 +268,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 +294,7 @@ public partial class CoreConfigV2rayService
             if (fakeIPMatchDomain.Count > 0)
             {
                 GenFakeDns();
-                AddDnsServers(["fakedns"], fakeIPMatchDomain.ToList());
+                AddDnsServers(["fakedns"], fakeIPMatchDomain);
             }
         }
 
@@ -295,10 +303,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;
 
@@ -340,7 +344,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 +364,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

@@ -67,12 +67,14 @@ public partial class CoreConfigV2rayService
 
                 var address = _config.TunModeItem.IPv4Address.NullIfEmpty() ?? Global.TunIPv4Address.First();
                 tunInbound.settings.gateway = [address];
-                tunInbound.settings.autoSystemRoutingTable = ["0.0.0.0/0"];
+                // 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"];
                 if (_config.TunModeItem.EnableIPv6Address == true)
                 {
                     var address6 = _config.TunModeItem.IPv6Address.NullIfEmpty() ?? Global.TunIPv6Address.First();
                     tunInbound.settings.gateway.Add(address6);
-                    tunInbound.settings.autoSystemRoutingTable.Add("::/0");
                 }
 
                 var bindInterface = _config.CoreBasicItem.BindInterface?.TrimEx();
@@ -81,7 +83,8 @@ public partial class CoreConfigV2rayService
                     tunInbound.settings.autoOutboundsInterface = bindInterface;
                 }
                 tunInbound.sniffing = inbound.sniffing;
-                tunInbound.sniffing.routeOnly = inbound.sniffing.routeOnly;
+                // tunInbound.sniffing.routeOnly = inbound.sniffing.routeOnly;
+                tunInbound.sniffing.routeOnly = true;
 
                 if (_config.TunModeItem.RouteExcludeAddress is { Count: > 0 })
                 {
@@ -118,15 +121,8 @@ public partial class CoreConfigV2rayService
                     includeList = IPNetwork2.Supernet(includeList.ToArray()).ToList();
                     includeListV6 = IPNetwork2.Supernet(includeListV6.ToArray()).ToList();
 
-                    if (_config.TunModeItem.EnableIPv6Address)
-                    {
-                        tunInbound.settings.autoSystemRoutingTable = includeList.Select(x => x.ToString())
-                            .Concat(includeListV6.Select(x => x.ToString())).ToList();
-                    }
-                    else
-                    {
-                        tunInbound.settings.autoSystemRoutingTable = includeList.Select(x => x.ToString()).ToList();
-                    }
+                    tunInbound.settings.autoSystemRoutingTable = includeList.Select(x => x.ToString())
+                        .Concat(includeListV6.Select(x => x.ToString())).ToList();
                 }
 
                 _coreConfig.inbounds.Add(tunInbound);

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;
@@ -512,6 +513,7 @@ public partial class CoreConfigV2rayService
                             settings = new MaskSettings4Ray { value = kcpSeed },
                         });
                     }
+                    kcpFinalmask.udp?.Reverse();
                     streamSettings.kcpSettings = kcpSettings;
                     streamSettings.finalmask = kcpFinalmask;
                     break;
@@ -666,6 +668,7 @@ public partial class CoreConfigV2rayService
                         version = 2,
                         auth = _node.Password,
                     };
+                    hy2Finalmask.udp?.Reverse();
                     streamSettings.finalmask = hy2Finalmask;
                     break;
 

v2rayN/ServiceLib/Services/DownloadService.cs

@@ -42,21 +42,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)
         {

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -37,9 +37,9 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
             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 }, true, TimeSpan.FromSeconds(_timeout));
         }
         else
         {
@@ -86,10 +86,10 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
             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 }, true, TimeSpan.FromSeconds(_timeout));
         }
         else
         {
@@ -139,9 +139,13 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
 
     public async Task UpdateGeoFileAll()
     {
-        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);
         await UpdateFunc(true, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, "geo"));
     }
 
@@ -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)
     {
-        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, true, TimeSpan.FromSeconds(_timeout));
     }
 
     #endregion Geo private

v2rayN/ServiceLib/ViewModels/AddServer2ViewModel.cs

@@ -26,7 +26,7 @@ public partial class AddServer2ViewModel : MyReactiveObject, ICloseable
 
         BrowseServerCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            var fileName = await BrowseConfigFileInteraction.Handle(RxVoid.Default);
+            var fileName = await BrowseConfigFileInteraction.HandleSafe(RxVoid.Default);
             if (fileName.IsNullOrEmpty())
             {
                 return;

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/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

@@ -85,8 +85,6 @@ public partial class MainWindowViewModel : MyReactiveObject
 
     #endregion Menu
 
-    private readonly SynchronizationContext _uiContext = SynchronizationContext.Current;
-
     #region Init
 
     public MainWindowViewModel()
@@ -302,7 +300,7 @@ public partial class MainWindowViewModel : MyReactiveObject
             .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async blShow =>
             {
-                await ShowHideWindowInteraction.Handle(blShow);
+                await ShowHideWindowInteraction.HandleSafe(blShow);
             });
 
         StatusBarViewModel.SetDefaultServerRequested
@@ -413,14 +411,25 @@ public partial class MainWindowViewModel : MyReactiveObject
     private async Task RefreshServersDispatcherAsync()
     {
         //await Observable.Start(async () => await RefreshServers(), RxSchedulers.MainThreadScheduler);
-        _uiContext?.Post(_ => _ = RefreshServers(), null);
+        await Signal.FromAsync(async () =>
+            {
+                await RefreshServers();
+                return RxVoid.Default;
+            })
+            .SubscribeOn(RxSchedulers.MainThreadScheduler)
+            .ToTask();
     }
 
     private async Task RefreshSubscriptions()
     {
         //await Observable.Start(async () => await ProfilesViewModel.RefreshSubscriptions(), RxSchedulers.MainThreadScheduler);
-
-        _uiContext?.Post(_ => _ = ProfilesViewModel.RefreshSubscriptions(), null);
+        await Signal.FromAsync(async () =>
+            {
+                await ProfilesViewModel.RefreshSubscriptions();
+                return RxVoid.Default;
+            })
+            .SubscribeOn(RxSchedulers.MainThreadScheduler)
+            .ToTask();
     }
 
     #endregion Servers && Groups
@@ -467,7 +476,7 @@ public partial class MainWindowViewModel : MyReactiveObject
         var stringData = clipboardData;
         if (clipboardData == null)
         {
-            var result = await ReadTextFromClipboardInteraction.Handle(RxVoid.Default);
+            var result = await ReadTextFromClipboardInteraction.HandleSafe(RxVoid.Default);
             if (result.IsNullOrEmpty())
             {
                 NoticeManager.Instance.Enqueue(ResUI.OperationFailed);
@@ -490,7 +499,7 @@ public partial class MainWindowViewModel : MyReactiveObject
 
     public async Task AddServerViaScanAsync()
     {
-        var result = await ScanScreenInteraction.Handle(RxVoid.Default);
+        var result = await ScanScreenInteraction.HandleSafe(RxVoid.Default);
         await ScanScreenResult(result);
     }
 
@@ -502,7 +511,7 @@ public partial class MainWindowViewModel : MyReactiveObject
 
     public async Task AddServerViaImageAsync()
     {
-        var imageFileName = await BrowseImageFileInteraction.Handle(RxVoid.Default);
+        var imageFileName = await BrowseImageFileInteraction.HandleSafe(RxVoid.Default);
         await AddScanResultAsync(imageFileName);
     }
 
@@ -691,10 +700,12 @@ public partial class MainWindowViewModel : MyReactiveObject
                 //{
                 //    await ClashProxiesViewModel.ProxiesReload();
                 //}, RxSchedulers.MainThreadScheduler);
-                RxSchedulers.MainThreadScheduler.Schedule(async () =>
-                {
-                    await ClashProxiesViewModel.ProxiesReload();
-                });
+                await Signal.FromAsync(async () =>
+                    {
+                        await ClashProxiesViewModel.ProxiesReload();
+                        return RxVoid.Default;
+                    }).SubscribeOn(RxSchedulers.MainThreadScheduler)
+                    .ToTask();
             }
 
             ReloadResult(showClashUI);

v2rayN/ServiceLib/ViewModels/MsgViewModel.cs

@@ -74,7 +74,7 @@ public partial class MsgViewModel : MyReactiveObject
             {
                 try
                 {
-                    await DispatcherShowMsgInteraction.Handle(sb.ToString());
+                    await DispatcherShowMsgInteraction.HandleSafe(sb.ToString());
                 }
                 catch (Exception)
                 {

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
@@ -138,13 +138,7 @@ public partial class ProfilesSelectViewModel : MyReactiveObject, ICloseable
 
         await RefreshServers();
 
-        try
-        {
-            await ProfilesFocusInteraction.Handle(RxVoid.Default);
-        }
-        catch (UnhandledInteractionException<RxVoid, RxVoid>)
-        {
-        }
+        await ProfilesFocusInteraction.HandleSafe(RxVoid.Default);
     }
 
     private async Task ServerFilterChanged(bool c)

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -345,13 +345,7 @@ public partial class ProfilesViewModel : MyReactiveObject
 
         await RefreshServers();
 
-        try
-        {
-            await ProfilesFocusInteraction.Handle(RxVoid.Default);
-        }
-        catch (UnhandledInteractionException<RxVoid, RxVoid>)
-        {
-        }
+        await ProfilesFocusInteraction.HandleSafe(RxVoid.Default);
     }
 
     private async Task ServerFilterChanged(bool c)
@@ -395,13 +389,7 @@ public partial class ProfilesViewModel : MyReactiveObject
             SelectedProfile = selected ?? lstModel.First();
         }
 
-        try
-        {
-            await DispatcherRefreshServersBizInteraction.Handle(RxVoid.Default);
-        }
-        catch (UnhandledInteractionException<RxVoid, RxVoid>)
-        {
-        }
+        await DispatcherRefreshServersBizInteraction.HandleSafe(RxVoid.Default);
     }
 
     public async Task RefreshSubscriptions()
@@ -419,7 +407,7 @@ public partial class ProfilesViewModel : MyReactiveObject
 
     public async Task AdjustMainLvColWidth()
     {
-        await AdjustMainLvColWidthInteraction.Handle(RxVoid.Default);
+        await AdjustMainLvColWidthInteraction.HandleSafe(RxVoid.Default);
     }
 
     private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)
@@ -535,7 +523,7 @@ public partial class ProfilesViewModel : MyReactiveObject
         {
             return;
         }
-        if (await ShowYesNoInteraction.Handle(ResUI.RemoveServer) == false)
+        if (await ShowYesNoInteraction.HandleSafe(ResUI.RemoveServer) == false)
         {
             return;
         }
@@ -556,7 +544,7 @@ public partial class ProfilesViewModel : MyReactiveObject
 
     private async Task RemoveDuplicateServer()
     {
-        if (await ShowYesNoInteraction.Handle(ResUI.RemoveServer) == false)
+        if (await ShowYesNoInteraction.HandleSafe(ResUI.RemoveServer) == false)
         {
             return;
         }
@@ -631,7 +619,7 @@ public partial class ProfilesViewModel : MyReactiveObject
             return;
         }
 
-        await ShareServerInteraction.Handle(url);
+        await ShareServerInteraction.HandleSafe(url);
     }
 
     private async Task GenGroupAllServer()
@@ -799,13 +787,13 @@ public partial class ProfilesViewModel : MyReactiveObject
             }
             else
             {
-                await SetClipboardDataInteraction.Handle((string)result.Data);
+                await SetClipboardDataInteraction.HandleSafe((string)result.Data);
                 NoticeManager.Instance.SendMessage(ResUI.OperationSuccess);
             }
         }
         else
         {
-            await SaveFileDialogInteraction.Handle(item);
+            await SaveFileDialogInteraction.HandleSafe(item);
         }
     }
 
@@ -854,11 +842,11 @@ public partial class ProfilesViewModel : MyReactiveObject
         {
             if (blEncode)
             {
-                await SetClipboardDataInteraction.Handle(Utils.Base64Encode(sb.ToString()));
+                await SetClipboardDataInteraction.HandleSafe(Utils.Base64Encode(sb.ToString()));
             }
             else
             {
-                await SetClipboardDataInteraction.Handle(sb.ToString());
+                await SetClipboardDataInteraction.HandleSafe(sb.ToString());
             }
             NoticeManager.Instance.SendMessage(ResUI.BatchExportURLSuccessfully);
         }
@@ -881,7 +869,7 @@ public partial class ProfilesViewModel : MyReactiveObject
 
         if (!result.IsNullOrEmpty())
         {
-            await SetClipboardDataInteraction.Handle(result);
+            await SetClipboardDataInteraction.HandleSafe(result);
             NoticeManager.Instance.SendMessage(ResUI.BatchExportURLSuccessfully);
         }
         else
@@ -925,7 +913,7 @@ public partial class ProfilesViewModel : MyReactiveObject
             return;
         }
 
-        if (await ShowYesNoInteraction.Handle(ResUI.RemoveServer) == false)
+        if (await ShowYesNoInteraction.HandleSafe(ResUI.RemoveServer) == false)
         {
             return;
         }

v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs

@@ -25,6 +25,21 @@ public partial class RoutingRuleDetailsViewModel : MyReactiveObject, ICloseable
     [Reactive]
     public partial bool AutoSort { get; set; }
 
+    [Reactive]
+    public partial string OutboundTag { get; set; }
+
+    [Reactive]
+    public partial string Remarks { get; set; }
+
+    [Reactive]
+    public partial string Port { get; set; }
+
+    [Reactive]
+    public partial string Network { get; set; }
+
+    [Reactive]
+    public partial bool Enabled { get; set; }
+
     public ReactiveCommand<RxVoid, RxVoid> SelectProfileCmd { get; }
     public ReactiveCommand<RxVoid, RxVoid> SaveCmd { get; }
 
@@ -57,6 +72,11 @@ public partial class RoutingRuleDetailsViewModel : MyReactiveObject, ICloseable
         IP = Utils.List2String(SelectedSource.Ip, true);
         Process = Utils.List2String(SelectedSource.Process, true);
         RuleType = SelectedSource.RuleType?.ToString();
+        OutboundTag = SelectedSource.OutboundTag;
+        Remarks = SelectedSource.Remarks;
+        Port = SelectedSource.Port;
+        Network = SelectedSource.Network;
+        Enabled = SelectedSource.Enabled;
     }
 
     private async Task SaveRulesAsync()
@@ -80,6 +100,11 @@ public partial class RoutingRuleDetailsViewModel : MyReactiveObject, ICloseable
         SelectedSource.Protocol = ProtocolItems?.ToList();
         SelectedSource.InboundTag = InboundTagItems?.ToList();
         SelectedSource.RuleType = RuleType.IsNullOrEmpty() ? null : Enum.Parse<ERuleType>(RuleType);
+        SelectedSource.OutboundTag = OutboundTag;
+        SelectedSource.Remarks = Remarks;
+        SelectedSource.Port = Port;
+        SelectedSource.Network = Network;
+        SelectedSource.Enabled = Enabled;
 
         var hasRule = SelectedSource.Domain?.Count > 0
           || SelectedSource.Ip?.Count > 0
@@ -110,8 +135,7 @@ public partial class RoutingRuleDetailsViewModel : MyReactiveObject, ICloseable
         var profileItem = await profileSelectViewModel.GetProfileItem();
         if (profileItem != null)
         {
-            SelectedSource.OutboundTag = profileItem.Remarks;
-            SelectedSource = JsonUtils.DeepCopy(SelectedSource);
+            OutboundTag = profileItem.Remarks;
         }
     }
 }

v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs

@@ -48,7 +48,7 @@ public partial class RoutingRuleSettingViewModel : MyReactiveObject, ICloseable
         });
         ImportRulesFromFileCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            var fileName = await BrowseRulesFileInteraction.Handle(RxVoid.Default);
+            var fileName = await BrowseRulesFileInteraction.HandleSafe(RxVoid.Default);
             await ImportRulesFromFileAsync(fileName);
         });
         ImportRulesFromClipboardCmd = ReactiveCommand.CreateFromTask(async () =>
@@ -156,7 +156,7 @@ public partial class RoutingRuleSettingViewModel : MyReactiveObject, ICloseable
             NoticeManager.Instance.Enqueue(ResUI.PleaseSelectRules);
             return;
         }
-        if (await ShowYesNoInteraction.Handle(ResUI.RemoveServer) == false)
+        if (await ShowYesNoInteraction.HandleSafe(ResUI.RemoveServer) == false)
         {
             return;
         }
@@ -199,7 +199,7 @@ public partial class RoutingRuleSettingViewModel : MyReactiveObject, ICloseable
                 DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
                 PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
             };
-            await SetClipboardDataInteraction.Handle(JsonUtils.Serialize(lst, options));
+            await SetClipboardDataInteraction.HandleSafe(JsonUtils.Serialize(lst, options));
         }
     }
 
@@ -277,7 +277,7 @@ public partial class RoutingRuleSettingViewModel : MyReactiveObject, ICloseable
         var stringData = clipboardData;
         if (clipboardData == null)
         {
-            var result = await ReadTextFromClipboardInteraction.Handle(RxVoid.Default);
+            var result = await ReadTextFromClipboardInteraction.HandleSafe(RxVoid.Default);
             if (result.IsNullOrEmpty())
             {
                 NoticeManager.Instance.Enqueue(ResUI.OperationFailed);
@@ -315,7 +315,7 @@ public partial class RoutingRuleSettingViewModel : MyReactiveObject, ICloseable
     private async Task<int> AddBatchRoutingRulesAsync(RoutingItem routingItem, string? clipboardData)
     {
         var blReplace = false;
-        if (await ShowYesNoInteraction.Handle(ResUI.AddBatchRoutingRulesYesNo) == false)
+        if (await ShowYesNoInteraction.HandleSafe(ResUI.AddBatchRoutingRulesYesNo) == false)
         {
             blReplace = true;
         }

v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs

@@ -147,7 +147,7 @@ public partial class RoutingSettingViewModel : MyReactiveObject
             NoticeManager.Instance.Enqueue(ResUI.PleaseSelectRules);
             return;
         }
-        if (await ShowYesNoInteraction.Handle(ResUI.RemoveServer) == false)
+        if (await ShowYesNoInteraction.HandleSafe(ResUI.RemoveServer) == false)
         {
             return;
         }

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -243,7 +243,7 @@ public partial class StatusBarViewModel : MyReactiveObject
         sb.AppendLine($"{cmd} HTTPS_PROXY={Global.HttpProtocol}{address}");
         sb.AppendLine($"{cmd} ALL_PROXY={Global.Socks5Protocol}{address}");
 
-        await SetClipboardDataInteraction.Handle(sb.ToString());
+        await SetClipboardDataInteraction.HandleSafe(sb.ToString());
     }
 
     private async Task AddServerViaClipboard()
@@ -297,21 +297,14 @@ public partial class StatusBarViewModel : MyReactiveObject
             return;
         }
 
-        var models = new List<ComboItem>();
-        BlServers = true;
-        foreach (var it in lstModel)
-        {
-            var name = it.GetSummary();
+        var models = lstModel.Select(it => new ComboItem { ID = it.IndexId, Text = it.GetSummary() }).ToList();
 
-            var item = new ComboItem() { ID = it.IndexId, Text = name };
-            models.Add(item);
-            if (_config.IndexId == it.IndexId)
-            {
-                SelectedServer = item;
-            }
-        }
+        BlServers = true;
         Servers.Clear();
         Servers.AddRange(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)
@@ -389,14 +382,7 @@ public partial class StatusBarViewModel : MyReactiveObject
 
         if (blChange)
         {
-            try
-            {
-                await DispatcherRefreshIconInteraction.Handle(RxVoid.Default);
-            }
-            catch (UnhandledInteractionException<RxVoid, RxVoid>)
-            {
-                // Ignore
-            }
+            await DispatcherRefreshIconInteraction.HandleSafe(RxVoid.Default);
         }
     }
 
@@ -432,7 +418,7 @@ public partial class StatusBarViewModel : MyReactiveObject
         {
             NoticeManager.Instance.SendMessageEx(ResUI.TipChangeRouting);
             ReloadRequested.Publish();
-            await DispatcherRefreshIconInteraction.Handle(RxVoid.Default);
+            await DispatcherRefreshIconInteraction.HandleSafe(RxVoid.Default);
         }
     }
 
@@ -469,7 +455,7 @@ public partial class StatusBarViewModel : MyReactiveObject
             }
             else
             {
-                var password = await PasswordInputInteraction.Handle(RxVoid.Default);
+                var password = await PasswordInputInteraction.HandleSafe(RxVoid.Default);
                 if (password.IsNullOrEmpty())
                 {
                     _config.TunModeItem.EnableTun = false;

v2rayN/ServiceLib/ViewModels/SubEditViewModel.cs

@@ -10,6 +10,12 @@ public partial class SubEditViewModel : MyReactiveObject, ICloseable
     [Reactive]
     public partial string CustomCoreType { get; set; }
 
+    [Reactive]
+    public partial string PrevProfile { get; set; }
+
+    [Reactive]
+    public partial string NextProfile { get; set; }
+
     public ReactiveCommand<RxVoid, RxVoid> SelectPrevProfileCmd { get; }
     public ReactiveCommand<RxVoid, RxVoid> SelectNextProfileCmd { get; }
     public ReactiveCommand<RxVoid, RxVoid> SaveCmd { get; }
@@ -23,8 +29,7 @@ public partial class SubEditViewModel : MyReactiveObject, ICloseable
             var profileItem = await SelectProfileAsync();
             if (profileItem != null)
             {
-                SelectedSource?.PrevProfile = profileItem.Remarks;
-                SelectedSource = JsonUtils.DeepCopy(SelectedSource);
+                PrevProfile = profileItem.Remarks;
             }
         });
         SelectNextProfileCmd = ReactiveCommand.CreateFromTask(async () =>
@@ -32,8 +37,7 @@ public partial class SubEditViewModel : MyReactiveObject, ICloseable
             var profileItem = await SelectProfileAsync();
             if (profileItem != null)
             {
-                SelectedSource?.NextProfile = profileItem.Remarks;
-                SelectedSource = JsonUtils.DeepCopy(SelectedSource);
+                NextProfile = profileItem.Remarks;
             }
         });
         SaveCmd = ReactiveCommand.CreateFromTask(async () =>
@@ -43,6 +47,8 @@ public partial class SubEditViewModel : MyReactiveObject, ICloseable
 
         SelectedSource = subItem.Id.IsNullOrEmpty() ? subItem : JsonUtils.DeepCopy(subItem);
         CustomCoreType = SelectedSource.CustomCoreType?.ToString() ?? string.Empty;
+        PrevProfile = SelectedSource.PrevProfile;
+        NextProfile = SelectedSource.NextProfile;
     }
 
     private async Task SaveSubAsync()
@@ -72,6 +78,8 @@ public partial class SubEditViewModel : MyReactiveObject, ICloseable
         }
 
         SelectedSource.CustomCoreType = Enum.TryParse<ECoreType>(CustomCoreType, out var coreType) ? coreType : null;
+        SelectedSource.PrevProfile = PrevProfile;
+        SelectedSource.NextProfile = NextProfile;
 
         if (await ConfigHandler.AddSubItem(_config, SelectedSource) == 0)
         {

v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs

@@ -40,7 +40,7 @@ public partial class SubSettingViewModel : MyReactiveObject
         }, canEditRemove);
         SubShareCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            await ShareSubInteraction.Handle(SelectedSource?.Url);
+            await ShareSubInteraction.HandleSafe(SelectedSource?.Url);
         }, canEditRemove);
 
         _ = Init();
@@ -84,7 +84,7 @@ public partial class SubSettingViewModel : MyReactiveObject
 
     private async Task DeleteSubAsync()
     {
-        if (await ShowYesNoInteraction.Handle(ResUI.RemoveServer) == false)
+        if (await ShowYesNoInteraction.HandleSafe(ResUI.RemoveServer) == false)
         {
             return;
         }

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/DesignData/DesignData.cs

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

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml

@@ -580,7 +580,7 @@
                     Grid.Row="2"
                     ColumnDefinitions="300,Auto"
                     IsVisible="False"
-                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
 
                     <TextBlock
                         Grid.Row="1"
@@ -649,7 +649,7 @@
                         Grid.Column="1"
                         Width="400"
                         Margin="{StaticResource Margin4}"
-                        PlaceholderText="Ipv4,Ipv6" />
+                        PlaceholderText="Ipv4, Ipv6" />
 
                     <TextBlock
                         Grid.Row="6"
@@ -665,6 +665,21 @@
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         PlaceholderText="1280" />
+
+                    <TextBlock
+                        Grid.Row="7"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbDNS}" />
+                    <TextBox
+                        x:Name="txtDns"
+                        Grid.Row="7"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left"
+                        PlaceholderText="1.1.1.1, 2606:4700:4700::1111" />
                 </Grid>
                 <Grid
                     x:Name="gridAnytls"
@@ -1265,8 +1280,10 @@
                                             Width="400"
                                             Margin="{StaticResource Margin4}"
                                             VerticalAlignment="Center"
-                                            Text="{x:Static resx:ResUI.TbCertSha256Tips}"
-                                            TextWrapping="Wrap" />
+                                            TextWrapping="Wrap">
+                                            <Run Text="{x:Static resx:ResUI.TbCertSha256Tips}" />
+                                            <Run FontWeight="Bold" Text="{x:Static resx:ResUI.TbXrayOnly}" />
+                                        </TextBlock>
                                         <TextBox
                                             x:Name="txtCertSha256Pinning"
                                             Width="400"

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

@@ -1,5 +1,4 @@
 using v2rayN.Desktop.Base;
-using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views;
 
@@ -126,6 +125,7 @@ public partial class AddServerWindow : WindowBase<AddServerViewModel>
                             this.Bind(ViewModel, vm => vm.WgReserved, v => v.txtPath9.Text).DisposeWith(currentTypeDisposables);
                             this.Bind(ViewModel, vm => vm.WgInterfaceAddress, v => v.txtRequestHost9.Text).DisposeWith(currentTypeDisposables);
                             this.Bind(ViewModel, vm => vm.WgMtu, v => v.txtShortId9.Text).DisposeWith(currentTypeDisposables);
+                            this.Bind(ViewModel, vm => vm.WgDns, v => v.txtDns.Text).DisposeWith(currentTypeDisposables);
                             break;
 
                         case EConfigType.Anytls:

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml

@@ -242,7 +242,7 @@
                         x:Name="gridAdvancedDNSSettings"
                         Margin="{StaticResource Margin8}"
                         ColumnDefinitions="Auto,Auto,*"
-                        RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,*">
+                        RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,*">
 
                         <TextBlock
                             x:Name="txtAdvancedDNSSettingsInvalid"
@@ -338,17 +338,38 @@
                             Grid.Column="0"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbBlockAAAAQueries}" />
+                        <ToggleSwitch
+                            x:Name="togBlockAAAAQuery"
+                            Grid.Row="5"
+                            Grid.Column="1"
+                            Margin="{StaticResource Margin4}"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center" />
+                        <TextBlock
+                            Grid.Row="5"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbBlockAAAAQueriesTips}"
+                            TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="6"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPs}" />
                         <ComboBox
                             x:Name="cmbDirectExpectedIPs"
-                            Grid.Row="5"
+                            Grid.Row="6"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             IsEditable="True" />
                         <TextBlock
-                            Grid.Row="5"
+                            Grid.Row="6"
                             Grid.Column="2"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
@@ -356,7 +377,7 @@
                             TextWrapping="Wrap" />
 
                         <TextBlock
-                            Grid.Row="6"
+                            Grid.Row="7"
                             Grid.Column="0"
                             Grid.ColumnSpan="3"
                             Margin="{StaticResource Margin4}"
@@ -365,7 +386,7 @@
 
                         <TextBox
                             x:Name="txtHosts"
-                            Grid.Row="7"
+                            Grid.Row="8"
                             Grid.Column="0"
                             Grid.ColumnSpan="3"
                             Margin="{StaticResource Margin4}"

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

@@ -35,6 +35,7 @@ public partial class DNSSettingWindow : WindowBase<DNSSettingViewModel>
             this.Bind(ViewModel, vm => vm.FakeIP, v => v.togFakeIP.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.FakeIPRange, v => v.cmbFakeIPRange.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.BlockBindingQuery, v => v.togBlockBindingQuery.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.BlockAAAAQuery, v => v.togBlockAAAAQuery.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.DirectDNS, v => v.cmbDirectDNS.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.RemoteDNS, v => v.cmbRemoteDNS.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.BootstrapDNS, v => v.cmbBootstrapDNS.Text).DisposeWith(disposables);

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs

@@ -28,6 +28,8 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
             lstProfiles.SetValue(DragDrop.AllowDropProperty, true);
 
             lstProfiles.AddHandler(PointerPressedEvent, LstProfiles_PointerPressed, RoutingStrategies.Bubble, true);
+            lstProfiles.AddHandler(PointerMovedEvent, LstProfiles_PointerMoved, RoutingStrategies.Bubble, true);
+            lstProfiles.AddHandler(PointerReleasedEvent, LstProfiles_PointerReleased, RoutingStrategies.Bubble, true);
             lstProfiles.AddHandler(DragDrop.DragOverEvent, LstProfiles_DragOver, RoutingStrategies.Bubble);
             lstProfiles.AddHandler(DragDrop.DropEvent, LstProfiles_Drop, RoutingStrategies.Bubble);
         }
@@ -435,31 +437,66 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
 
     #region Drag and Drop
 
-    private static readonly DataFormat<object> LstProfilesRowFormat =
-        DataFormat.CreateInProcessFormat<object>("LstProfilesRow");
+    private static readonly DataFormat<ProfileItemModel> LstProfilesRowFormat =
+        DataFormat.CreateInProcessFormat<ProfileItemModel>("LstProfilesRow");
+    private (Point, PointerPressedEventArgs)? _dragStartPoint;
 
-    private async void LstProfiles_PointerPressed(object? sender, PointerPressedEventArgs e)
+    private void LstProfiles_PointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        var properties = e.GetCurrentPoint(this).Properties;
+        if (properties.IsLeftButtonPressed)
+        {
+            _dragStartPoint = (e.GetPosition(this), e);
+        }
+    }
+
+    private async void LstProfiles_PointerMoved(object? sender, PointerEventArgs e)
     {
         try
         {
-            if (e.Source is not Visual visualSource)
+            if (_dragStartPoint == null)
             {
                 return;
             }
 
+            var properties = e.GetCurrentPoint(this).Properties;
+            if (!properties.IsLeftButtonPressed)
+            {
+                _dragStartPoint = null;
+                return;
+            }
+
+            var currentPoint = e.GetPosition(this);
+            var startPoint = _dragStartPoint.Value.Item1;
+            var delta = startPoint - currentPoint;
+
+            var threshold = new Vector(4, 4);
+
+            if (!(Math.Abs(delta.X) >= threshold.X) && !(Math.Abs(delta.Y) >= threshold.Y))
+            {
+                return;
+            }
+            var dragStartEventArgs = _dragStartPoint.Value.Item2;
+            _dragStartPoint = null;
+
+            if (e.Source is not Visual visualSource)
+            {
+                return;
+            }
             var row = visualSource.FindAncestorOfType<DataGridRow>(true);
             if (row?.DataContext == null)
             {
                 return;
             }
 
-            if (e.GetCurrentPoint(row).Properties.IsLeftButtonPressed)
-            {
-                var dragData = new DataTransfer();
-                var item = DataTransferItem.Create(LstProfilesRowFormat, row.DataContext);
-                dragData.Add(item);
-                await DragDrop.DoDragDropAsync(e, dragData, DragDropEffects.Move);
-            }
+            e.Handled = true;
+
+            var dragData = new DataTransfer();
+            var item = DataTransferItem.Create(LstProfilesRowFormat, row.DataContext as ProfileItemModel);
+
+            dragData.Add(item);
+
+            await DragDrop.DoDragDropAsync(dragStartEventArgs, dragData, DragDropEffects.Move);
         }
         catch
         {
@@ -467,6 +504,11 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
         }
     }
 
+    private void LstProfiles_PointerReleased(object? sender, PointerReleasedEventArgs e)
+    {
+        _dragStartPoint = null;
+    }
+
     private void LstProfiles_DragOver(object? sender, DragEventArgs e)
     {
         if (!e.DataTransfer.Contains(LstProfilesRowFormat))

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

@@ -26,12 +26,12 @@ public partial class RoutingRuleDetailsWindow : WindowBase<RoutingRuleDetailsVie
                 .Subscribe(InitializeData)
                 .DisposeWith(disposables);
 
-            this.Bind(ViewModel, vm => vm.SelectedSource.OutboundTag, v => v.cmbOutboundTag.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.SelectedSource.Remarks, v => v.txtRemarks.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.SelectedSource.OutboundTag, v => v.cmbOutboundTag.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.SelectedSource.Port, v => v.txtPort.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.SelectedSource.Network, v => v.cmbNetwork.SelectedValue).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.SelectedSource.Enabled, v => v.togEnabled.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.OutboundTag, v => v.cmbOutboundTag.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.Remarks, v => v.txtRemarks.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.OutboundTag, v => v.cmbOutboundTag.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.Port, v => v.txtPort.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.Network, v => v.cmbNetwork.SelectedValue).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.Enabled, v => v.togEnabled.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.Domain, v => v.txtDomain.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.IP, v => v.txtIP.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.Process, v => v.txtProcess.Text).DisposeWith(disposables);

v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs

@@ -25,8 +25,8 @@ public partial class SubEditWindow : WindowBase<SubEditViewModel>
             this.Bind(ViewModel, vm => vm.SelectedSource.Sort, v => v.txtSort.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.Filter, v => v.txtFilter.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.ConvertTarget, v => v.cmbConvertTarget.SelectedValue).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.SelectedSource.PrevProfile, v => v.txtPrevProfile.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.SelectedSource.NextProfile, v => v.txtNextProfile.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.PrevProfile, v => v.txtPrevProfile.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.NextProfile, v => v.txtNextProfile.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.PreSocksPort, v => v.txtPreSocksPort.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.Memo, v => v.txtMemo.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.CustomCoreType, v => v.cmbCustomCoreType.SelectedValue).DisposeWith(disposables);

v2rayN/v2rayN/Views/AddServerWindow.xaml

@@ -748,6 +748,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="300" />
@@ -830,7 +831,7 @@
                         Grid.Column="1"
                         Width="400"
                         Margin="{StaticResource Margin4}"
-                        materialDesign:HintAssist.Hint="Ipv4,Ipv6"
+                        materialDesign:HintAssist.Hint="Ipv4, Ipv6"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
@@ -849,6 +850,23 @@
                         HorizontalAlignment="Left"
                         materialDesign:HintAssist.Hint="1280"
                         Style="{StaticResource DefTextBox}" />
+
+                    <TextBlock
+                        Grid.Row="7"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbDNS}" />
+                    <TextBox
+                        x:Name="txtDns"
+                        Grid.Row="7"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left"
+                        materialDesign:HintAssist.Hint="1.1.1.1, 2606:4700:4700::1111"
+                        Style="{StaticResource DefTextBox}" />
                 </Grid>
                 <Grid
                     x:Name="gridAnytls"
@@ -1593,8 +1611,10 @@
                                     Margin="{StaticResource Margin4}"
                                     VerticalAlignment="Center"
                                     Style="{StaticResource ToolbarTextBlock}"
-                                    Text="{x:Static resx:ResUI.TbCertSha256Tips}"
-                                    TextWrapping="Wrap" />
+                                    TextWrapping="Wrap">
+                                    <Run Text="{x:Static resx:ResUI.TbCertSha256Tips}" />
+                                    <Run FontWeight="Bold" Text="{x:Static resx:ResUI.TbXrayOnly}" />
+                                </TextBlock>
                                 <TextBox
                                     x:Name="txtCertSha256Pinning"
                                     Width="400"

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -124,6 +124,7 @@ public partial class AddServerWindow
                             this.Bind(ViewModel, vm => vm.WgReserved, v => v.txtPath9.Text).DisposeWith(currentTypeDisposables);
                             this.Bind(ViewModel, vm => vm.WgInterfaceAddress, v => v.txtRequestHost9.Text).DisposeWith(currentTypeDisposables);
                             this.Bind(ViewModel, vm => vm.WgMtu, v => v.txtShortId9.Text).DisposeWith(currentTypeDisposables);
+                            this.Bind(ViewModel, vm => vm.WgDns, v => v.txtDns.Text).DisposeWith(currentTypeDisposables);
                             break;
 
                         case EConfigType.Anytls:

v2rayN/v2rayN/Views/DNSSettingWindow.xaml

@@ -278,6 +278,7 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
@@ -387,17 +388,39 @@
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbBlockAAAAQueries}" />
+                        <ToggleButton
+                            x:Name="togBlockAAAAQuery"
+                            Grid.Row="5"
+                            Grid.Column="1"
+                            Margin="{StaticResource Margin8}"
+                            HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="5"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbBlockAAAAQueriesTips}"
+                            TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="6"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPs}" />
                         <ComboBox
                             x:Name="cmbDirectExpectedIPs"
-                            Grid.Row="5"
+                            Grid.Row="6"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource Margin8}"
                             IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
                         <TextBlock
-                            Grid.Row="5"
+                            Grid.Row="6"
                             Grid.Column="2"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
@@ -406,7 +429,7 @@
                             TextWrapping="Wrap" />
 
                         <TextBlock
-                            Grid.Row="6"
+                            Grid.Row="7"
                             Grid.Column="0"
                             Grid.ColumnSpan="3"
                             Margin="{StaticResource Margin8}"
@@ -415,7 +438,7 @@
                             Text="{x:Static resx:ResUI.TbDNSHostsConfig}" />
                         <TextBox
                             x:Name="txtHosts"
-                            Grid.Row="7"
+                            Grid.Row="8"
                             Grid.Column="0"
                             Grid.ColumnSpan="3"
                             Margin="{StaticResource Margin8}"

v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs

@@ -31,6 +31,7 @@ public partial class DNSSettingWindow
             this.Bind(ViewModel, vm => vm.FakeIP, v => v.togFakeIP.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.FakeIPRange, v => v.cmbFakeIPRange.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.BlockBindingQuery, v => v.togBlockBindingQuery.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.BlockAAAAQuery, v => v.togBlockAAAAQuery.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.DirectDNS, v => v.cmbDirectDNS.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.RemoteDNS, v => v.cmbRemoteDNS.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.BootstrapDNS, v => v.cmbBootstrapDNS.Text).DisposeWith(disposables);

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs

@@ -23,11 +23,11 @@ public partial class RoutingRuleDetailsWindow
                 .Subscribe(InitializeData)
                 .DisposeWith(disposables);
 
-            this.Bind(ViewModel, vm => vm.SelectedSource.Remarks, v => v.txtRemarks.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.SelectedSource.OutboundTag, v => v.cmbOutboundTag.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.SelectedSource.Port, v => v.txtPort.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.SelectedSource.Network, v => v.cmbNetwork.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.SelectedSource.Enabled, v => v.togEnabled.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.Remarks, v => v.txtRemarks.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.OutboundTag, v => v.cmbOutboundTag.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.Port, v => v.txtPort.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.Network, v => v.cmbNetwork.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.Enabled, v => v.togEnabled.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.Domain, v => v.txtDomain.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.IP, v => v.txtIP.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.Process, v => v.txtProcess.Text).DisposeWith(disposables);

v2rayN/v2rayN/Views/SubEditWindow.xaml.cs

@@ -22,8 +22,8 @@ public partial class SubEditWindow
             this.Bind(ViewModel, vm => vm.SelectedSource.Sort, v => v.txtSort.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.Filter, v => v.txtFilter.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.ConvertTarget, v => v.cmbConvertTarget.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.SelectedSource.PrevProfile, v => v.txtPrevProfile.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.SelectedSource.NextProfile, v => v.txtNextProfile.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.PrevProfile, v => v.txtPrevProfile.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.NextProfile, v => v.txtNextProfile.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.PreSocksPort, v => v.txtPreSocksPort.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.Memo, v => v.txtMemo.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.CustomCoreType, v => v.cmbCustomCoreType.Text).DisposeWith(disposables);