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
 
@@ -146,7 +146,7 @@ jobs:
           $xrayTag = "v$xrayVer"
           $singTag = "v$singVer"
 
-          $xrayUrl = "https://github.com/XTLS/Xray-core/releases/download/$xrayTag/Xray-windows-32.zip"
+          $xrayUrl = "https://github.com/autorepobot/Xray/releases/download/$xrayTag/Xray-windows-32.zip"
           $singUrl = "https://github.com/SagerNet/sing-box/releases/download/$singTag/sing-box-$singVer-windows-386.zip"
 
           Write-Host "Bundled Xray version: $xrayVer"

.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/**'
-      - 'v2rayN/ServiceLib/Handler/Fmt/**'
+      - '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 --project ./v2rayN/ServiceLib.Tests -c Release --results-directory ./TestResults -- --report-trx
-      run: dotnet test ./ServiceLib.Tests
+
+    - name: Comment PR with results
+      if: always()
+      uses: EnricoMi/publish-unit-test-result-action@v2
+      with:
+        files: ./TestResults/*.trx
+        comment_mode: failures

README.md

@@ -50,6 +50,8 @@ Read the Wiki for usage guides and configuration details.
 | Linux | ✅ | - | ✅ | ✅ | ✅ |
 | macOS | ✅ | - | ✅ | - | - |
 
+Minimum OS requirements: [Release files introduction](https://github.com/2dust/v2rayN/wiki/Release-files-introduction) / 最低系统要求：[发布文件介绍](https://github.com/2dust/v2rayN/wiki/Release-files-introduction)
+
 ---
 
 ## GPG Verification / GPG 签名校验

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_VERSION="10.0.111"
-DOTNET_LOONGARCH_TAG="v10.0.110-loongarch64"
+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-osx.sh

@@ -54,7 +54,7 @@ cat >"$PackagePath/v2rayN.app/Contents/Info.plist" <<-EOF
   <key>NSHighResolutionCapable</key>
   <true/>
   <key>LSMinimumSystemVersion</key>
-  <string>13.7</string>
+  <string>13.6</string>
 </dict>
 </plist>
 EOF

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_VERSION="10.0.111"
-DOTNET_LOONGARCH_TAG="v10.0.110-loongarch64"
+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.4</Version>
+        <Version>7.24.9</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/Directory.Packages.props

@@ -6,32 +6,30 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Avalonia.AvaloniaEdit" Version="12.0.0" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="12.1.0" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="12.1.2" />
-    <PackageVersion Include="Avalonia.Desktop" Version="12.1.0" />
+    <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.0.3" />
+    <PackageVersion Include="ReactiveUI.Avalonia" Version="12.1.1" />
-    <PackageVersion Include="CliWrap" Version="3.10.2" />
+    <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" />
-    <PackageVersion Include="ReactiveUI" Version="23.2.28" />
+    <PackageVersion Include="ReactiveUI" Version="24.1.0" />
-    <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
+    <PackageVersion Include="ReactiveUI.SourceGenerators" Version="3.2.0" />
-    <PackageVersion Include="ReactiveUI.WPF" Version="23.2.28" />
+    <PackageVersion Include="ReactiveUI.WPF" Version="24.1.0" />
-    <PackageVersion Include="Semi.Avalonia" Version="12.1.0" />
+    <PackageVersion Include="Semi.Avalonia" Version="12.1.0.1" />
     <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="12.0.0" />
-    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="12.1.0" />
+    <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.3.10" />
+    <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" />

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();
+        await validatorResult.Success.Should().BeFalse();
-        validatorResult.Errors.Should().Contain(msg => ContainsCycleDependencyMessage(msg));
+        await validatorResult.Errors.Should().Contain(ContainsCycleDependencyMessage);
-        context.AllProxiesMap.Should().NotContainKey(groupA.IndexId);
+        await context.AllProxiesMap.Should().NotContainKey(groupA.IndexId);
-        context.AllProxiesMap.Should().NotContainKey(groupB.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();
+        await validatorResult.Success.Should().BeFalse();
-        validatorResult.Errors.Should().Contain(msg => ContainsCycleDependencyMessage(msg));
+        await validatorResult.Errors.Should().Contain(ContainsCycleDependencyMessage);
-        context.AllProxiesMap.Should().NotContainKey(groupA.IndexId);
+        await context.AllProxiesMap.Should().NotContainKey(groupA.IndexId);
-        context.AllProxiesMap.Should().NotContainKey(groupB.IndexId);
+        await context.AllProxiesMap.Should().NotContainKey(groupB.IndexId);
-        context.AllProxiesMap.Should().NotContainKey(groupC.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();
+        await validatorResult.Success.Should().BeTrue();
-        validatorResult.Errors.Should().BeEmpty();
+        await validatorResult.Errors.Should().BeEmpty();
-        validatorResult.Warnings.Should().Contain(msg => ContainsCycleDependencyMessage(msg));
+        await validatorResult.Warnings.Should().Contain(ContainsCycleDependencyMessage);
 
-        context.AllProxiesMap.Should().ContainKey(leaf.IndexId);
+        await context.AllProxiesMap.Should().ContainKey(leaf.IndexId);
-        context.AllProxiesMap.Should().ContainKey(groupA.IndexId);
+        await context.AllProxiesMap.Should().ContainKey(groupA.IndexId);
-        context.AllProxiesMap.Should().NotContainKey(groupB.IndexId);
+        await context.AllProxiesMap.Should().NotContainKey(groupB.IndexId);
-        groupA.GetProtocolExtra().ChildItems.Should().Be(leaf.IndexId);
+        await groupA.GetProtocolExtra().ChildItems.Should().BeEqualTo(leaf.IndexId);
     }
 
     private static string NewId(string prefix)

v2rayN/ServiceLib.Tests/CoreConfig/CoreConfigTestFactory.cs

@@ -150,6 +150,23 @@ internal static class CoreConfigTestFactory
         };
     }
 
+    public static ProfileItem CreateCustomOutboundNode(ECoreType coreType, string indexId = "node-custom-1",
+        string remarks = "demo-custom-outbound", string address = "custom_outbound.json")
+    {
+        return new ProfileItem
+        {
+            IndexId = indexId,
+            ConfigType = EConfigType.Outbound,
+            CoreType = coreType,
+            Remarks = remarks,
+            Address = address,
+            Port = 0,
+            Network = nameof(ETransport.raw),
+            StreamSecurity = string.Empty,
+            Subid = string.Empty,
+        };
+    }
+
     public static ProfileItem CreatePolicyGroupNode(ECoreType coreType, string indexId, string remarks,
         IEnumerable<string> childIndexIds)
     {
@@ -234,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]
+    [Test]
-    public void GenerateClientConfigContent_ShouldGenerateBasicProxyConfig()
+    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}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
-        result.Data.Should().NotBeNull();
+        await result.Data.Should().NotBeNull();
 
         var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString());
-        singboxConfig.Should().NotBeNull();
+        await singboxConfig.Should().NotBeNull();
-        singboxConfig!.outbounds.Should().Contain(o => o.tag == Global.ProxyTag && o.type == "socks");
+        await singboxConfig!.outbounds.Should().Contain(o => o.tag == Global.ProxyTag && o.type == "socks");
-        singboxConfig.inbounds.Should().Contain(i => i.type == nameof(EInboundProtocol.mixed));
+        await singboxConfig.inbounds.Should().Contain(i => i.type == nameof(EInboundProtocol.mixed));
     }
 
-    [Fact]
+    [Test]
-    public void GenerateClientConfigContent_TunWithLoopbackPreSocks_ShouldKeepMixedInbound()
+    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]
+    [Test]
-    public void GenerateClientConfigContent_BindInterface_ShouldUseDialBindInterface()
+    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");
+        await proxy.bind_interface.Should().BeEqualTo("eth0");
-        proxy.detour.Should().BeNullOrEmpty();
+        await proxy.detour.Should().BeNull().Or.BeEmpty();
     }
 
-    [Fact]
+    [Test]
-    public void GenerateClientConfigContent_PolicyGroup_ShouldExpandChildrenAndBuildSelector()
+    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");
+        await 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");
+        await 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));
+        await 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.StartsWith("proxy-2-", StringComparison.Ordinal));
     }
 
-    [Fact]
+    [Test]
-    public void GenerateClientConfigContent_ProxyChain_ShouldBuildDetourChain()
+    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");
+        await 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));
+        await 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.detour ?? string.Empty).StartsWith("chain-proxy-1-", StringComparison.Ordinal));
     }
 
-    [Fact]
+    [Test]
-    public void GenerateClientConfigContent_PolicyGroupWithProxyChain_ShouldBuildCombinedOutbounds()
+    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");
+        await 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");
+        await 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));
+        await 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));
+        await 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.StartsWith("proxy-2-", StringComparison.Ordinal));
     }
 
-    [Fact]
+    [Test]
-    public void GenerateClientConfigContent_ProxyChainWithPolicyGroup_ShouldBuildClonedChainBranches()
+    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");
+        await 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");
+        await 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));
+        await 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-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]
+    [Test]
-    public void GenerateClientConfigContent_RoutingSplit_DirectAndBlock_ShouldApplyRules()
+    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]
+    [Test]
-    public void GenerateClientConfigContent_RoutingSplit_ByRemark_ShouldGenerateTargetOutbound()
+    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]
+    [Test]
-    public void GenerateClientConfigContent_DirectExpectedIPs_ShouldApplyGeoipAndCidrToDirectDnsRule()
+    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]
+    [Test]
-    public void GenerateClientConfigContent_BootstrapDNS_ShouldConfigurePureIPResolver()
+    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}");
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
-        config.SimpleDNSItem.BootstrapDNS.Should().Be(bootstrapDns);
+        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);
+        var bootstrapServer = cfg.dns?.servers.FirstOrDefault(s => s.tag == Global.SingboxLocalDNSTag);
-        bootstrapServer.Should().NotBeNull();
+        await bootstrapServer.Should().NotBeNull();
-        (bootstrapServer?.server ?? string.Empty).Should().Contain(bootstrapDns);
+        await bootstrapServer!.server.Should().Contain(bootstrapDns);
     }
 
-    [Fact]
+    [Test]
-    public void GenerateClientConfigContent_DnsFallback_LastRuleDirect_ShouldUseDirectFinalDns()
+    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]
+    [Test]
-    public void GenerateClientConfigContent_DirectExpectedIPs_NonMatchingRegion_ShouldNotApplyExpectedRule()
+    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]
+    [Test]
-    [InlineData("geosite:cn", "geosite-cn")]
+    [Arguments("geosite:cn", "geosite-cn")]
-    [InlineData("geosite:geolocation-cn", "geosite-geolocation-cn")]
+    [Arguments("geosite:geolocation-cn", "geosite-geolocation-cn")]
-    [InlineData("geosite:tld-cn", "geosite-tld-cn")]
+    [Arguments("geosite:tld-cn", "geosite-tld-cn")]
-    public void GenerateClientConfigContent_DirectExpectedIPs_RegionVariant_ShouldApplyExpectedRule(string domainTag,
+    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]
+    [Test]
-    public void GenerateClientConfigContent_Hosts_ShouldPopulateHostsServerAndDomainResolver()
+    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();
+        await hostsServer.Should().NotBeNull();
-        hostsServer!.predefined.Should().ContainKey("resolver.example");
+        await hostsServer!.predefined.Should().ContainKey("resolver.example");
-        hostsServer.predefined!["resolver.example"].Should().Contain("1.1.1.1");
+        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();
+        await directServer.Should().NotBeNull();
-        directServer!.domain_resolver.Should().Be(Global.SingboxHostsDNSTag);
+        await directServer!.domain_resolver.Should().BeEqualTo(Global.SingboxHostsDNSTag);
     }
 
-    [Fact]
+    [Test]
-    public void GenerateClientConfigContent_RawDnsEnabled_ShouldUseCustomDnsAndInjectLocalResolver()
+    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");
+        await 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);
+        await cfg.dns.servers.Should().Contain(s => s.tag == Global.SingboxLocalDNSTag);
-        cfg.dns.rules.Should().Contain(r => r.clash_mode == nameof(ERuleMode.Global));
+        await 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.rules.Should().Contain(r => r.clash_mode == nameof(ERuleMode.Direct));
     }
 
-    [Fact]
+    [Test]
-    public void GenerateClientConfigContent_Hysteria2Realm_ShouldEmitHttpsServerUrl()
+    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");
+        await proxy.type.Should().BeEqualTo("hysteria2");
-        proxy.realm.Should().NotBeNull();
+        await proxy.realm.Should().NotBeNull();
-        proxy.realm!.server_url.Should().StartWith("https://");
+        await proxy.realm!.server_url.Should().StartWith("https://");
-        proxy.realm.server_url.Should().Contain("realm.hy2.io");
+        await proxy.realm.server_url.Should().Contain("realm.hy2.io");
-        proxy.realm.token.Should().Be("public");
+        await proxy.realm.token.Should().BeEqualTo("public");
-        proxy.realm.realm_id.Should().Be("my-realm-id");
+        await proxy.realm.realm_id.Should().BeEqualTo("my-realm-id");
-        proxy.realm.stun_servers.Should().Contain("turn.cloudflare.com:3478");
+        await proxy.realm.stun_servers.Should().Contain("turn.cloudflare.com:3478");
-        proxy.server.Should().BeNull();
+        await proxy.server.Should().BeNull();
     }
 
-    [Fact]
+    [Test]
-    public void GenerateClientConfigContent_TunSystemStackWithIpv6_ShouldUsePrefixWithPeerAddress()
+    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,18 +684,55 @@ 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");
         }
     }
 
+
+    [Test]
+    public async Task GenerateClientConfigContent_CustomOutbound_ShouldReplaceWithUserCustomOutboundJson()
+    {
+        var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
+        CoreConfigTestFactory.BindAppManagerConfig(config);
+
+        var customNode = CoreConfigTestFactory.CreateCustomOutboundNode(ECoreType.sing_box, "n-custom", "custom-singbox");
+        var customJsonContent = """
+        {
+          "type": "shadowsocks",
+          "server": "1.2.3.4",
+          "server_port": 8388,
+          "method": "aes-128-gcm",
+          "password": "custom_password"
+        }
+        """;
+
+        var context = CoreConfigTestFactory.CreateContext(config, customNode, ECoreType.sing_box);
+        context.CustomOutboundContent[customNode.IndexId] = customJsonContent;
+
+        var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
+
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
+        await result.Data.Should().NotBeNull();
+
+        var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString());
+        await cfg.Should().NotBeNull();
+        var proxyOutbound = cfg!.outbounds.FirstOrDefault(o => o.tag == Global.ProxyTag);
+        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]
+    [Test]
-    public void GenerateClientConfigContent_ShouldGenerateBasicProxyConfig()
+    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();
+        await result.Success.Should().BeTrue();
-        result.Data.Should().NotBeNull();
+        await result.Data.Should().NotBeNull();
 
         var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString());
-        v2rayConfig.Should().NotBeNull();
+        await v2rayConfig.Should().NotBeNull();
-        v2rayConfig!.outbounds.Should().Contain(o => o.tag == Global.ProxyTag && o.protocol == "vmess");
+        await v2rayConfig!.outbounds.Should().Contain(o => o.tag == Global.ProxyTag && o.protocol == "vmess");
-        v2rayConfig.inbounds.Should().Contain(i => i.protocol == nameof(EInboundProtocol.mixed));
+        await v2rayConfig.inbounds.Should().Contain(i => i.protocol == nameof(EInboundProtocol.mixed));
     }
 
-    [Fact]
+    [Test]
-    public void GenerateClientConfigContent_HttpOutbound_ShouldEmitHeadersInSettings()
+    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");
+        await outbound.settings.address!.ToString().Should().BeEqualTo("proxy.example.com");
-        outbound.settings.port.Should().Be(8080);
+        await outbound.settings.port.Should().BeEqualTo(8080);
-        outbound.settings.user.Should().Be("user");
+        await outbound.settings.user.Should().BeEqualTo("user");
-        outbound.settings.pass.Should().Be("pass");
+        await outbound.settings.pass.Should().BeEqualTo("pass");
-        outbound.settings.level.Should().Be(1);
+        await outbound.settings.level.Should().BeEqualTo(1);
-        outbound.settings.headers.Should().NotBeNull();
+        await outbound.settings.headers.Should().NotBeNull();
-        var headers = JsonUtils.ParseJson(outbound.settings.headers.ToString());
+        var headers = JsonUtils.ParseJson(outbound.settings.headers!.ToString());
-        headers["User-Agent"]!.GetValue<string>().Should().Be("v2rayN");
+        await headers["User-Agent"]!.GetValue<string>().Should().BeEqualTo("v2rayN");
-        headers["Set-Cookie"]!.AsArray()
+        await headers["Set-Cookie"]!.AsArray()
             .Select(item => item!.GetValue<string>())
-            .Should().Equal("a=1", "b=2");
+            .Should().BeEquivalentTo(["a=1", "b=2"]);
-        outbound.settings.servers.Should().BeNull();
+        await outbound.settings.servers.Should().BeNull();
-        outbound.settings.vnext.Should().BeNull();
+        await outbound.settings.vnext.Should().BeNull();
     }
  
-    [Fact]
+    [Test]
-    public void GenerateClientConfigContent_PolicyGroup_ShouldExpandChildrenAndBuildBalancer()
+    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));
+        await 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.StartsWith("proxy-2-", StringComparison.Ordinal));
-        cfg.routing.balancers.Should().NotBeNull();
+        await cfg.routing.balancers.Should().NotBeNull();
-        cfg.routing.balancers!.Should().Contain(b => b.tag == Global.ProxyTag + Global.BalancerTagSuffix);
+        await cfg.routing.balancers!.Should().Contain(b => b.tag == Global.ProxyTag + Global.BalancerTagSuffix);
     }
 
-    [Fact]
+    [Test]
-    public void GenerateClientConfigContent_ProxyChain_ShouldBuildDialerProxyChain()
+    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]
+    [Test]
-    public void GenerateClientConfigContent_PolicyGroupWithProxyChain_ShouldBuildCombinedOutbounds()
+    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));
+        await 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));
+        await 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.StartsWith("proxy-2-", StringComparison.Ordinal));
-        cfg.routing.balancers.Should().NotBeNull();
+        await cfg.routing.balancers.Should().NotBeNull();
-        cfg.routing.balancers!.Should().Contain(b => b.tag == Global.ProxyTag + Global.BalancerTagSuffix);
+        await cfg.routing.balancers!.Should().Contain(b => b.tag == Global.ProxyTag + Global.BalancerTagSuffix);
     }
 
-    [Fact]
+    [Test]
-    public void GenerateClientConfigContent_ProxyChainWithPolicyGroup_ShouldBuildClonedChainBranches()
+    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));
+        await 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-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();
+        await cfg.routing.balancers.Should().NotBeNull();
-        cfg.routing.balancers!.Should().Contain(b => b.tag == Global.ProxyTag + Global.BalancerTagSuffix);
+        await cfg.routing.balancers!.Should().Contain(b => b.tag == Global.ProxyTag + Global.BalancerTagSuffix);
     }
 
-    [Fact]
+    [Test]
-    public void GenerateClientConfigContent_RoutingSplit_DirectAndBlock_ShouldApplyRules()
+    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]
+    [Test]
-    public void GenerateClientConfigContent_RoutingSplit_ByRemark_ShouldGenerateTargetOutbound()
+    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]
+    [Test]
-    public void GenerateClientConfigContent_DirectExpectedIPs_ShouldApplyExpectedIPsToDirectDnsServer()
+    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]
+    [Test]
-    public void GenerateClientConfigContent_BootstrapDNS_ShouldApplyToDnsServerDomains()
+    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]
+    [Test]
-    public void GenerateClientConfigContent_DnsFallback_LastRuleDirect_ShouldUseDirectDnsServers()
+    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]
+    [Test]
-    public void GenerateClientConfigContent_DirectExpectedIPs_NonMatchingRegion_ShouldNotApplyExpectedIPs()
+    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]
+    [Test]
-    [InlineData("geosite:cn")]
+    [Arguments("geosite:cn")]
-    [InlineData("geosite:geolocation-cn")]
+    [Arguments("geosite:geolocation-cn")]
-    [InlineData("geosite:tld-cn")]
+    [Arguments("geosite:tld-cn")]
-    public void GenerateClientConfigContent_DirectExpectedIPs_RegionVariant_ShouldApplyExpectedIPs(string domainTag)
+    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]
+    [Test]
-    public void GenerateClientConfigContent_Hosts_ShouldPopulateDnsHosts()
+    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();
+        await dns.hosts.Should().NotBeNull();
-        dns.hosts!.Should().ContainKey("resolver.example");
+        await dns.hosts!.Should().ContainKey("resolver.example");
-        JsonUtils.Serialize(dns.hosts!["resolver.example"]).Should().Contain("1.1.1.1");
+        await JsonUtils.Serialize(dns.hosts!["resolver.example"]).Should().Contain("1.1.1.1");
     }
 
-    [Fact]
+    [Test]
-    public void GenerateClientConfigContent_RawDnsEnabled_ShouldUseCustomDnsConfig()
+    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");
+        await JsonUtils.Serialize(dns.servers).Should().Contain("8.8.8.8");
-        dns.hosts.Should().NotBeNull();
+        await dns.hosts.Should().NotBeNull();
-        dns.hosts!.Should().ContainKey("raw.example");
+        await dns.hosts!.Should().ContainKey("raw.example");
-        JsonUtils.Serialize(dns.hosts!["raw.example"]).Should().Contain("1.1.1.1");
+        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();
+        await directOutbound.Should().NotBeNull();
-        directOutbound!.streamSettings.sockopt!.domainStrategy.Should().Be("UseIPv4");
+        await directOutbound!.streamSettings.sockopt!.domainStrategy.Should().BeEqualTo("UseIPv4");
     }
 
-    [Fact]
+    [Test]
-    public void GenerateClientConfigContent_TunRouteExcludeAddress()
+    [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,15 +619,54 @@ 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");
+        await tunInbound!.settings.autoSystemRoutingTable.Should().NotContain("0.0.0.0/0");
-        tunInbound!.settings.autoSystemRoutingTable.Should().Contain("10.0.0.0/32");
+        await 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().Contain("10.0.0.2/31");
+    }
+
+    [Test]
+    public async Task GenerateClientConfigContent_CustomOutbound_ShouldReplaceWithUserCustomOutboundJson()
+    {
+        var config = CoreConfigTestFactory.CreateConfig(ECoreType.Xray);
+        CoreConfigTestFactory.BindAppManagerConfig(config);
+
+        var customNode = CoreConfigTestFactory.CreateCustomOutboundNode(ECoreType.Xray, "n-custom", "custom-xray");
+        var customJsonContent = """
+        {
+          "protocol": "shadowsocks",
+          "settings": {
+            "servers": [
+              {
+                "address": "1.2.3.4",
+                "port": 8388,
+                "method": "aes-128-gcm",
+                "password": "custom_password"
+              }
+            ]
+          }
+        }
+        """;
+
+        var context = CoreConfigTestFactory.CreateContext(config, customNode, ECoreType.Xray);
+        context.CustomOutboundContent[customNode.IndexId] = customJsonContent;
+
+        var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
+
+        await result.Success.Should().BeTrue().Because($"ret msg: {result.Msg}");
+        await result.Data.Should().NotBeNull();
+
+        var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString());
+        await cfg.Should().NotBeNull();
+        var proxyOutbound = cfg!.outbounds.FirstOrDefault(o => o.tag == Global.ProxyTag);
+        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]
+    /// <summary>
-    public void GetShareUriAndResolveConfig_Vmess_ShouldRoundTripBasicFields()
+    /// 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);
+        await resolved.ConfigType.Should().BeEqualTo(EConfigType.VMess);
-        resolved.Remarks.Should().Be(source.Remarks);
+        await resolved.Remarks.Should().BeEqualTo(source.Remarks);
-        resolved.Address.Should().Be(source.Address);
+        await resolved.Address.Should().BeEqualTo(source.Address);
-        resolved.Port.Should().Be(source.Port);
+        await resolved.Port.Should().BeEqualTo(source.Port);
-        resolved.Password.Should().Be(source.Password);
+        await resolved.Password.Should().BeEqualTo(source.Password);
-        resolved.GetProtocolExtra().AlterId.Should().Be(source.GetProtocolExtra().AlterId);
+        await resolved.GetProtocolExtra().AlterId.Should().BeEqualTo(source.GetProtocolExtra().AlterId);
     }
 
-    [Fact]
+    [Test]
-    public void GetShareUriAndResolveConfig_Vless_ShouldRoundTripBasicFields()
+    public async Task GetShareUriAndResolveConfig_Vless_ShouldRoundTripBasicFields()
     {
         var source = CreateVlessProfile();
 
-        var resolved = ExportThenImport(source);
+        var resolved = await ExportThenImport(source);
 
-        resolved.ConfigType.Should().Be(EConfigType.VLESS);
+        await resolved.ConfigType.Should().BeEqualTo(EConfigType.VLESS);
-        resolved.Remarks.Should().Be(source.Remarks);
+        await resolved.Remarks.Should().BeEqualTo(source.Remarks);
-        resolved.Address.Should().Be(source.Address);
+        await resolved.Address.Should().BeEqualTo(source.Address);
-        resolved.Port.Should().Be(source.Port);
+        await resolved.Port.Should().BeEqualTo(source.Port);
-        resolved.Password.Should().Be(source.Password);
+        await resolved.Password.Should().BeEqualTo(source.Password);
-        resolved.GetProtocolExtra().VlessEncryption.Should().Be(Global.None);
+        await resolved.GetProtocolExtra().VlessEncryption.Should().BeEqualTo(Global.None);
     }
 
-    [Fact]
+    [Test]
-    public void GetShareUriAndResolveConfig_Shadowsocks_ShouldRoundTripBasicFields()
+    public async Task GetShareUriAndResolveConfig_Shadowsocks_ShouldRoundTripBasicFields()
     {
         var source = CreateShadowsocksProfile();
 
-        var resolved = ExportThenImport(source);
+        var resolved = await ExportThenImport(source);
 
-        resolved.ConfigType.Should().Be(EConfigType.Shadowsocks);
+        await resolved.ConfigType.Should().BeEqualTo(EConfigType.Shadowsocks);
-        resolved.Remarks.Should().Be(source.Remarks);
+        await resolved.Remarks.Should().BeEqualTo(source.Remarks);
-        resolved.Address.Should().Be(source.Address);
+        await resolved.Address.Should().BeEqualTo(source.Address);
-        resolved.Port.Should().Be(source.Port);
+        await resolved.Port.Should().BeEqualTo(source.Port);
-        resolved.Password.Should().Be(source.Password);
+        await resolved.Password.Should().BeEqualTo(source.Password);
-        resolved.GetProtocolExtra().SsMethod.Should().Be(source.GetProtocolExtra().SsMethod);
+        await resolved.GetProtocolExtra().SsMethod.Should().BeEqualTo(source.GetProtocolExtra().SsMethod);
     }
 
-    [Fact]
+    [Test]
-    public void GetShareUriAndResolveConfig_Socks_ShouldRoundTripBasicFields()
+    public async Task GetShareUriAndResolveConfig_Socks_ShouldRoundTripBasicFields()
     {
         var source = CreateSocksProfile();
 
-        var resolved = ExportThenImport(source);
+        var resolved = await ExportThenImport(source);
 
-        resolved.ConfigType.Should().Be(EConfigType.SOCKS);
+        await resolved.ConfigType.Should().BeEqualTo(EConfigType.SOCKS);
-        resolved.Remarks.Should().Be(source.Remarks);
+        await resolved.Remarks.Should().BeEqualTo(source.Remarks);
-        resolved.Address.Should().Be(source.Address);
+        await resolved.Address.Should().BeEqualTo(source.Address);
-        resolved.Port.Should().Be(source.Port);
+        await resolved.Port.Should().BeEqualTo(source.Port);
-        resolved.Username.Should().Be(source.Username);
+        await resolved.Username.Should().BeEqualTo(source.Username);
-        resolved.Password.Should().Be(source.Password);
+        await resolved.Password.Should().BeEqualTo(source.Password);
     }
 
-    [Fact]
+    [Test]
-    public void ResolveConfig_UnsupportedProtocol_ShouldReturnNull()
+    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();
+        await resolved.Should().BeNull();
-        msg.Should().NotBeNullOrWhiteSpace();
+        await msg.Should().NotBeNull();
+        await msg.Should().NotBeEmpty();
     }
 
-    [Fact]
+    [Test]
-    public void GetShareUri_UnsupportedConfigType_ShouldReturnNull()
+    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();
+        await uri.Should().NotBeNull();
-        uri!.StartsWith(Global.ProtocolShares[source.ConfigType], StringComparison.OrdinalIgnoreCase).Should()
+
-            .BeTrue();
+        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]
+    [Test]
-    public void TryParse_ShouldParseValidRealm()
+    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();
+        await result.Should().BeTrue();
-        realm.Should().NotBeNull();
+        await realm.Should().NotBeNull();
 
-        realm.IsHttp.Should().BeFalse();
+        await realm.IsHttp.Should().BeFalse();
-        realm.Token.Should().Be("public");
+        await realm.Token.Should().BeEqualTo("public");
-        realm.RendezvousHost.Should().Be("realm.hy2.io");
+        await realm.RendezvousHost.Should().BeEqualTo("realm.hy2.io");
-        realm.RendezvousPort.Should().Be(443);
+        await realm.RendezvousPort.Should().BeEqualTo(443);
-        realm.RealmName.Should().Be("57f9be7c-2810-4f5b-8cb9-260bc84d6c90");
+        await realm.RealmName.Should().BeEqualTo("57f9be7c-2810-4f5b-8cb9-260bc84d6c90");
-        realm.StunList.Should().HaveCount(2);
+        await realm.StunList.Should().HaveCount(2);
-        realm.StunList.Should().Contain("example.stun:3478");
+        await realm.StunList.Should().Contain("example.stun:3478");
-        realm.StunList.Should().Contain("example2.stun:3478");
+        await realm.StunList.Should().Contain("example2.stun:3478");
     }
 
-    [Fact]
+    [Test]
-    public void ToUri_ShouldGenerateValidUri()
+    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");
+        await uri.Should().Contain("realm://public@realm.hy2.io");
-        uri.Should().Contain("/57f9be7c-2810-4f5b-8cb9-260bc84d6c90");
+        await uri.Should().Contain("/57f9be7c-2810-4f5b-8cb9-260bc84d6c90");
-        uri.Should().Contain("stun=example.stun:3478");
+        await uri.Should().Contain("stun=example.stun:3478");
-        uri.Should().Contain("stun=example2.stun:3478");
+        await uri.Should().Contain("stun=example2.stun:3478");
     }
 
-    [Fact]
+    [Test]
-    public void GetShareUriAndResolveConfig_Hy2Realm_ShouldRoundTripBasicFields()
+    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();
+        await resolved.Should().NotBeNull();
-        resolved.Password.Should().Be("your_password");
+        await resolved.Password.Should().BeEqualTo("your_password");
         var result = HyRealm.TryParse(resolved.GetProtocolExtra().Hy2RealmUrl, out var realm);
-        result.Should().BeTrue();
+        await result.Should().BeTrue();
-        realm.Should().NotBeNull();
+        await realm.Should().NotBeNull();
-        realm.Token.Should().Be("mytoken");
+        await realm.Token.Should().BeEqualTo("mytoken");
 
         // To uri
         var uri = Hysteria2Fmt.ToUri(resolved);
-        uri.Should().Contain("hysteria2+realm://mytoken@rendezvous.example.com");
+        await uri.Should().Contain("hysteria2+realm://mytoken@rendezvous.example.com");
-        uri.Should().EndWith("#remark");
+        await uri.Should().EndWith("#remark");
     }
 
-    [Fact]
+    [Test]
-    public void ToServerUrl_ShouldIncludeSchemeForSingbox()
+    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]
+    [Test]
-    public void ResolveRealm_Issue9635_ShouldProduceHttpsServerUrl()
+    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();
+        await HyRealm.TryParse(resolved!.GetProtocolExtra().Hy2RealmUrl, out var realm).Should().BeTrue();
-        realm!.ToServerUrl().Should().StartWith("https://");
+        await realm!.ToServerUrl().Should().StartWith("https://");
-        realm.ToServerUrl().Should().Contain("realm.hy2.io");
+        await realm.ToServerUrl().Should().Contain("realm.hy2.io");
-        realm.StunList.Should().Contain("turn.cloudflare.com:3478");
+        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]
+    [Test]
-    public void ToUriAndResolve_ShouldRoundTripPolicyGroupReferences()
+    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();
+        await resolved.Should().NotBeNull();
-        resolved.Should().HaveCount(3);
+        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);
+        await resolvedGroup.ConfigType.Should().BeEqualTo(EConfigType.PolicyGroup);
-        resolvedGroup.GetProtocolExtra().SubChildItems.Should().Be("sub-123");
+        await resolvedGroup.GetProtocolExtra().SubChildItems.Should().BeEqualTo("sub-123");
-        resolvedGroup.GetProtocolExtra().ChildItems.Should().Be($"{resolvedChildA.IndexId},{resolvedChildB.IndexId}");
+        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]
+    [Test]
-    public void ResolveConfig_ShouldParsePeersAndIgnoreInlineComments()
+    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();
+        await resolved.Should().NotBeNull();
-        resolved.Should().HaveCount(2);
+        await resolved.Should().HaveCount(2);
 
         var first = resolved![0];
-        first.Address.Should().Be("2001:db8::1");
+        await first.Address.Should().BeEqualTo("2001:db8::1");
-        first.Port.Should().Be(51820);
+        await first.Port.Should().BeEqualTo(51820);
-        first.Password.Should().Be("interface-private-key");
+        await first.Password.Should().BeEqualTo("interface-private-key");
-        first.GetProtocolExtra().WgReserved.Should().Be("1, 2, 3");
+        await first.GetProtocolExtra().WgReserved.Should().BeEqualTo("1, 2, 3");
-        first.GetProtocolExtra().WgInterfaceAddress.Should().Be("10.0.0.2/32, fd00::2/128");
+        await first.GetProtocolExtra().WgInterfaceAddress.Should().BeEqualTo("10.0.0.2/32, fd00::2/128");
-        first.GetProtocolExtra().WgMtu.Should().Be(1420);
+        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");
+        await second.Address.Should().BeEqualTo("example.com");
-        second.Port.Should().Be(12345);
+        await second.Port.Should().BeEqualTo(12345);
     }
 }

v2rayN/ServiceLib.Tests/GlobalUsings.cs

@@ -3,9 +3,6 @@ global using System.Diagnostics;
 global using System.Net;
 global using System.Net.NetworkInformation;
 global using System.Net.Sockets;
-global using System.Reactive;
-global using System.Reactive.Disposables;
-global using System.Reactive.Linq;
 global using System.Reflection;
 global using System.Runtime.InteropServices;
 global using System.Security.Cryptography;
@@ -15,10 +12,7 @@ global using System.Text.Json;
 global using System.Text.Json.Nodes;
 global using System.Text.Json.Serialization;
 global using System.Text.RegularExpressions;
-global using DynamicData;
-global using DynamicData.Binding;
 global using ReactiveUI;
-global using ReactiveUI.Fody.Helpers;
 global using ServiceLib.Base;
 global using ServiceLib.Common;
 global using ServiceLib.Enums;

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]
+    [Test]
-    [InlineData(ECoreType.sing_box)]
+    [Arguments(ECoreType.sing_box)]
-    [InlineData(ECoreType.mihomo)]
+    [Arguments(ECoreType.mihomo)]
-    [InlineData(ECoreType.Xray)]
+    [Arguments(ECoreType.Xray)]
-    public void ShouldRunAsSudo_TunLaunchOnNonWindows_RequiresElevation(ECoreType coreType)
+    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]
+    [Test]
-    public void ShouldRunAsSudo_NonTunLaunch_ShouldNotElevate()
+    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();
+        await 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.Xray, isNonWindows: true).Should().BeFalse();
     }
 
-    [Fact]
+    [Test]
-    public void ShouldRunAsSudo_OnWindows_ShouldNotElevate()
+    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]
+    [Test]
-    [InlineData(ECoreType.v2fly)]
+    [Arguments(ECoreType.v2fly)]
-    [InlineData(ECoreType.hysteria)]
+    [Arguments(ECoreType.hysteria)]
-    [InlineData(null)]
+    [Arguments(null)]
-    public void ShouldRunAsSudo_UnsupportedCoreType_ShouldNotElevate(ECoreType? coreType)
+    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>
+    <PropertyGroup>
-    <OutputType>Exe</OutputType>
+        <OutputType>Exe</OutputType>
-    <IsPackable>false</IsPackable>
+        <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
+        <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
+    </PropertyGroup>
 
-  <ItemGroup>
+    <ItemGroup>
-    <PackageReference Include="AwesomeAssertions" />
+        <PackageReference Include="TUnit" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+        <PackageReference Include="TUnit.Assertions.Should" />
-    <PackageReference Include="xunit.runner.visualstudio">
+    </ItemGroup>
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="xunit.v3" />
-  </ItemGroup>
 
-  <ItemGroup>
+    <ItemGroup>
-    <ProjectReference Include="..\ServiceLib\ServiceLib.csproj" />
+        <ProjectReference Include="..\ServiceLib\ServiceLib.csproj" />
-  </ItemGroup>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Using Include="TUnit.Assertions.Should" />
+        <Using Include="TUnit.Assertions.Should.Extensions" />
+    </ItemGroup>
 
 </Project>

v2rayN/ServiceLib/Base/BulkObservableCollection.cs

@@ -0,0 +1,66 @@
+namespace ServiceLib.Base;
+
+public class BulkObservableCollection<T> : ObservableCollection<T>
+{
+    private bool _suppressNotification = false;
+
+    protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
+    {
+        if (!_suppressNotification)
+        {
+            base.OnCollectionChanged(e);
+        }
+    }
+
+    protected override void OnPropertyChanged(PropertyChangedEventArgs e)
+    {
+        if (!_suppressNotification)
+        {
+            base.OnPropertyChanged(e);
+        }
+    }
+
+    public void AddRange(IEnumerable<T>? collection)
+    {
+        if (collection == null)
+        {
+            return;
+        }
+
+        _suppressNotification = true;
+        try
+        {
+            foreach (var item in collection)
+            {
+                Add(item);
+            }
+        }
+        finally
+        {
+            _suppressNotification = false;
+            OnPropertyChanged(new PropertyChangedEventArgs(nameof(Count)));
+            OnPropertyChanged(new PropertyChangedEventArgs("Item[]"));
+            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+        }
+    }
+
+    public bool Replace(T oldItem, T newItem)
+    {
+        var index = Items.IndexOf(oldItem);
+        if (index < 0)
+        {
+            return false;
+        }
+
+        Items[index] = newItem;
+
+        OnPropertyChanged(new PropertyChangedEventArgs("Item[]"));
+        OnCollectionChanged(new NotifyCollectionChangedEventArgs(
+            NotifyCollectionChangedAction.Replace,
+            newItem,
+            oldItem,
+            index));
+
+        return true;
+    }
+}

v2rayN/ServiceLib/Common/Extension.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
 
 namespace ServiceLib.Common;
 
@@ -92,7 +93,7 @@ public static class Extension
 
     public static bool IsComplexType(this EConfigType configType)
     {
-        return configType is EConfigType.Custom or EConfigType.PolicyGroup or EConfigType.ProxyChain;
+        return configType is EConfigType.Custom or EConfigType.Outbound or EConfigType.PolicyGroup or EConfigType.ProxyChain;
     }
 
     /// <summary>
@@ -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;
@@ -753,11 +754,11 @@ public class Utils
         return false;
     }
 
-    public static int GetFreePort(int defaultPort = 0)
+    public static int GetFreePort(int defaultPort)
     {
         try
         {
-            if (!(defaultPort == 0 || Utils.PortInUse(defaultPort)))
+            if (!PortInUse(defaultPort))
             {
                 return defaultPort;
             }

v2rayN/ServiceLib/Enums/EConfigType.cs

@@ -14,6 +14,7 @@ public enum EConfigType
     HTTP = 10,
     Anytls = 11,
     Naive = 12,
+    Outbound = 13,
     PolicyGroup = 101,
     ProxyChain = 102,
 }

v2rayN/ServiceLib/Events/AppEvents.cs

@@ -2,7 +2,7 @@ namespace ServiceLib.Events;
 
 public static class AppEvents
 {
-    public static readonly EventChannel<Unit> AddServerViaClipboardRequested = new();
+    public static readonly EventChannel<RxVoid> AddServerViaClipboardRequested = new();
     public static readonly EventChannel<bool> HasUpdateNotified = new();
 
     public static readonly EventChannel<ServerSpeedItem> DispatcherStatisticsRequested = new();
@@ -10,7 +10,7 @@ public static class AppEvents
     public static readonly EventChannel<string> SendSnackMsgRequested = new();
     public static readonly EventChannel<string> SendMsgViewRequested = new();
 
-    public static readonly EventChannel<Unit> AppExitRequested = new();
+    public static readonly EventChannel<RxVoid> AppExitRequested = new();
     public static readonly EventChannel<bool> ShutdownRequested = new();
 
     public static readonly EventChannel<ESysProxyType> SysProxyChangeRequested = new();

v2rayN/ServiceLib/Events/EventChannel.cs

@@ -1,27 +1,38 @@
-using System.Reactive.Subjects;
-
 namespace ServiceLib.Events;
 
 public sealed class EventChannel<T>
 {
-    private readonly ISubject<T> _subject = Subject.Synchronize(new Subject<T>());
+    private readonly Signal<T> _signal = new();
+    private readonly Lock _gate = new();
+    private readonly IObservable<T> _observable;
+
+    public EventChannel()
+    {
+        _observable = _signal.Synchronize(_gate);
+    }
 
     public IObservable<T> AsObservable()
     {
-        return _subject.AsObservable();
+        return _observable;
     }
 
     public void Publish(T value)
     {
-        _subject.OnNext(value);
+        lock (_gate)
+        {
+            _signal.OnNext(value);
+        }
     }
 
     public void Publish()
     {
-        if (typeof(T) != typeof(Unit))
+        if (typeof(T) != typeof(RxVoid))
         {
-            throw new InvalidOperationException("Publish() without value is only valid for EventChannel<Unit>.");
+            throw new InvalidOperationException("Publish() without value is only valid for EventChannel<RxVoid>.");
+        }
+        lock (_gate)
+        {
+            _signal.OnNext((T)(object)RxVoid.Default);
         }
-        _subject.OnNext((T)(object)Unit.Default);
     }
 }

v2rayN/ServiceLib/FodyWeavers.xml

@@ -1,3 +0,0 @@
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-  <ReactiveUI />
-</Weavers>

v2rayN/ServiceLib/GlobalUsings.cs

@@ -1,11 +1,15 @@
 global using System.Collections.Concurrent;
+global using System.Collections.ObjectModel;
+global using System.Collections.Specialized;
+global using System.ComponentModel;
 global using System.Diagnostics;
 global using System.Net;
 global using System.Net.NetworkInformation;
 global using System.Net.Sockets;
-global using System.Reactive;
+global using ReactiveUI.Primitives;
-global using System.Reactive.Disposables;
+global using ReactiveUI.Primitives.Concurrency;
-global using System.Reactive.Linq;
+global using ReactiveUI.Primitives.Disposables;
+global using ReactiveUI.Primitives.Signals;
 global using System.Reflection;
 global using System.Runtime.InteropServices;
 global using System.Runtime.Versioning;
@@ -16,10 +20,8 @@ global using System.Text.Json;
 global using System.Text.Json.Nodes;
 global using System.Text.Json.Serialization;
 global using System.Text.RegularExpressions;
-global using DynamicData;
-global using DynamicData.Binding;
 global using ReactiveUI;
-global using ReactiveUI.Fody.Helpers;
+global using ReactiveUI.SourceGenerators;
 global using ServiceLib.Base;
 global using ServiceLib.Common;
 global using ServiceLib.Enums;
@@ -39,3 +41,5 @@ global using ServiceLib.Services;
 global using ServiceLib.Services.CoreConfig;
 global using ServiceLib.Services.Statistics;
 global using SQLite;
+
+

v2rayN/ServiceLib/Handler/Builder/CoreConfigContextBuilder.cs

@@ -95,6 +95,7 @@ public class CoreConfigContextBuilder
                 context.AllProxiesMap[$"remark:{ruleItem.OutboundTag}"] = actRuleNode;
             }
         }
+
         if (context.IsTunEnabled && context.AppConfig.TunModeItem.RouteExcludeAddress is { Count: > 0 })
         {
             var appConfig = JsonUtils.DeepCopy(config);
@@ -202,7 +203,7 @@ public class CoreConfigContextBuilder
                 Context = preSocksResult.Context with
                 {
                     ProtectDomainList =
-                    [.. nodeContext.ProtectDomainList ?? [], .. preSocksResult.Context.ProtectDomainList ?? []],
+                    [.. nodeContext.ProtectDomainList, .. preSocksResult.Context.ProtectDomainList],
                     ProtectCoreTypeList = protectCoreTypeList,
                 },
             };
@@ -322,14 +323,14 @@ public class CoreConfigContextBuilder
         {
             return await RegisterGroupNodeAsync(context, node);
         }
-        return RegisterSingleNodeAsync(context, node);
+        return await RegisterSingleNodeAsync(context, node);
     }
 
     /// <summary>
     ///     Validates a single (non-group) node and, on success, adds it to the proxy map
     ///     and records any domain addresses that should bypass the proxy.
     /// </summary>
-    private static NodeValidatorResult RegisterSingleNodeAsync(CoreConfigContext context, ProfileItem node)
+    private static async Task<NodeValidatorResult> RegisterSingleNodeAsync(CoreConfigContext context, ProfileItem node)
     {
         if (node.ConfigType.IsGroupType())
         {
@@ -337,6 +338,29 @@ public class CoreConfigContextBuilder
         }
 
         var nodeValidatorResult = NodeValidator.Validate(node, context.RunCoreType);
+
+        if (node.ConfigType == EConfigType.Outbound)
+        {
+            var addressFileName = node.Address;
+            if (!File.Exists(addressFileName))
+            {
+                addressFileName = Utils.GetConfigPath(addressFileName);
+            }
+            if (!File.Exists(addressFileName))
+            {
+                nodeValidatorResult.Errors.Add(string.Format(ResUI.MsgCustomOutboundFileNotFound, node.Remarks, addressFileName));
+            }
+            try
+            {
+                var fileContent = await File.ReadAllTextAsync(addressFileName);
+                context.CustomOutboundContent[node.IndexId] = fileContent;
+            }
+            catch
+            {
+                nodeValidatorResult.Errors.Add(string.Format(ResUI.MsgCustomOutboundFileNotFound, node.Remarks, addressFileName));
+            }
+        }
+
         var msgs = new List<string>([.. nodeValidatorResult.Errors, .. nodeValidatorResult.Warnings]);
         if (msgs.Count > 0)
         {
@@ -360,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;
@@ -438,7 +462,7 @@ public class CoreConfigContextBuilder
 
             if (!childNode.ConfigType.IsGroupType())
             {
-                var childNodeResult = RegisterSingleNodeAsync(context, childNode);
+                var childNodeResult = await RegisterSingleNodeAsync(context, childNode);
                 childNodeValidatorResult.Warnings.AddRange(childNodeResult.Warnings.Select(w =>
                     string.Format(ResUI.MsgGroupChildNodeWarning, node.Remarks, childNode.Remarks, w)));
                 childNodeValidatorResult.Errors.AddRange(childNodeResult.Errors.Select(e =>

v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs

@@ -36,6 +36,15 @@ public class NodeValidator
             return;
         }
 
+        if (item.ConfigType is EConfigType.Outbound)
+        {
+            if (item.CoreType != coreType)
+            {
+                v.Error(string.Format(ResUI.MsgCoreNotSupportProtocol, coreType.ToString(), item.ConfigType));
+            }
+            return;
+        }
+
         if (item.ConfigType.IsGroupType())
         {
             // Group logic is handled in ValidateGroupNode
@@ -106,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
@@ -122,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
@@ -138,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();
@@ -382,6 +383,13 @@ public static class ConfigHandler
                 {
                 }
             }
+            else if (profileItem.ConfigType == EConfigType.Outbound)
+            {
+                profileItem.Address = Utils.GetConfigPath(profileItem.Address);
+                if (await AddCustomOutboundServer(config, profileItem, false) == 0)
+                {
+                }
+            }
             else
             {
                 await AddServerCommon(config, profileItem, true);
@@ -579,6 +587,43 @@ public static class ConfigHandler
         return 0;
     }
 
+    public static async Task<int> AddCustomOutboundServer(Config config, ProfileItem profileItem, bool blDelete, bool toFile = true)
+    {
+        var fileName = profileItem.Address;
+        if (!File.Exists(fileName))
+        {
+            return -1;
+        }
+        var ext = Path.GetExtension(fileName);
+        var newFileName = $"{Utils.GetGuid()}{ext}";
+        //newFileName = Path.Combine(Utile.GetTempPath(), newFileName);
+
+        try
+        {
+            File.Copy(fileName, Utils.GetConfigPath(newFileName));
+            if (blDelete)
+            {
+                File.Delete(fileName);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            return -1;
+        }
+
+        profileItem.Address = newFileName;
+        profileItem.ConfigType = EConfigType.Outbound;
+        if (profileItem.Remarks.IsNullOrEmpty())
+        {
+            profileItem.Remarks = $"import custom outbound@{DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")}";
+        }
+
+        await AddServerCommon(config, profileItem, toFile);
+
+        return 0;
+    }
+
     /// <summary>
     /// Edit an existing custom server configuration
     /// Updates the server's properties without changing the file
@@ -600,6 +645,8 @@ public static class ConfigHandler
             item.CoreType = profileItem.CoreType;
             item.DisplayLog = profileItem.DisplayLog;
             item.PreSocksPort = profileItem.PreSocksPort;
+
+            item.ProtoExtra = profileItem.ProtoExtra;
         }
 
         if (await SQLiteHelper.Instance.UpdateAsync(item) > 0)
@@ -875,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())
@@ -1479,7 +1527,7 @@ public static class ConfigHandler
             var matchedChildProfiles = childProfiles?.Where(p =>
                     p != null &&
                     p.IsValid() &&
-                    !p.ConfigType.IsComplexType() &&
+                    (!p.ConfigType.IsComplexType() || p.ConfigType == EConfigType.Outbound) &&
                     (extraItem.Filter.IsNullOrEmpty() || Regex.IsMatch(p.Remarks, extraItem.Filter))
                 )
                 .ToList() ?? [];
@@ -1675,68 +1723,191 @@ public static class ConfigHandler
         }
 
         var subItem = await AppManager.Instance.GetSubItem(subid);
-        var subRemarks = subItem?.Remarks;
-        var preSocksPort = subItem?.PreSocksPort;
 
-        List<ProfileItem>? lstProfiles = null;
+        if (subItem?.CustomCoreType is null)
-        //Is sing-box array configuration
-        if (lstProfiles is null || lstProfiles.Count <= 0)
         {
-            lstProfiles = SingboxFmt.ResolveFullArray(strData, subRemarks);
+            return await AddBatchServersDefaultCustom(config, strData, subid, isSub, subItem);
         }
-        //Is v2ray array configuration
+
-        if (lstProfiles is null || lstProfiles.Count <= 0)
+        return await AddBatchServersSpecificCustom(config, strData, subid, isSub, subItem);
+    }
+
+    private static async Task<int> AddBatchServersDefaultCustom(
+        Config config,
+        string strData,
+        string subid,
+        bool isSub,
+        SubItem? subItem)
+    {
+        var subRemarks = subItem?.Remarks;
+        // Prioritize using complete custom parsing, followed by custom outbound parsing.
+        var lstProfiles = V2rayFmt.ResolveToCustom(strData, subRemarks);
+        if (lstProfiles.Count == 0)
         {
-            lstProfiles = V2rayFmt.ResolveFullArray(strData, subRemarks);
+            lstProfiles = SingboxFmt.ResolveToCustom(strData, subRemarks);
         }
-        if (lstProfiles is { Count: > 0 })
+        if (lstProfiles.Count == 0)
         {
-            var count = 0;
+            lstProfiles = V2rayFmt.ResolveToCustomOutbound(strData, subRemarks);
-            foreach (var it in lstProfiles)
+        }
-            {
+        if (lstProfiles.Count == 0)
-                it.Subid = subid;
+        {
-                it.IsSub = isSub;
+            lstProfiles = SingboxFmt.ResolveToCustomOutbound(strData, subRemarks);
-                it.PreSocksPort = preSocksPort;
+        }
-                if (await AddCustomServer(config, it, true) == 0)
+        if (lstProfiles.Count > 0)
-                {
+        {
-                    count++;
+            var count = await AddBatchCustomServers(config, lstProfiles, subid, isSub);
-                }
-            }
             if (count > 0)
             {
                 return count;
             }
         }
 
-        ProfileItem? profileItem = null;
+        if (HtmlPageFmt.IsHtmlPage(strData))
-        //Is sing-box configuration
-        profileItem ??= SingboxFmt.ResolveFull(strData, subRemarks);
-        //Is v2ray configuration
-        profileItem ??= V2rayFmt.ResolveFull(strData, subRemarks);
-        //Is Html Page
-        if (profileItem is null && HtmlPageFmt.IsHtmlPage(strData))
         {
             return -1;
         }
-        //Is Clash configuration
+
-        profileItem ??= ClashFmt.ResolveFull(strData, subRemarks);
+        var profileItem = ClashFmt.ResolveFull(strData, subRemarks)
-        //Is hysteria configuration
+            ?? Hysteria2Fmt.ResolveFull2(strData, subRemarks);
-        profileItem ??= Hysteria2Fmt.ResolveFull2(strData, subRemarks);
+
-        if (profileItem is null || profileItem.Address.IsNullOrEmpty())
+        if (profileItem == null)
         {
             return -1;
         }
 
         profileItem.Subid = subid;
         profileItem.IsSub = isSub;
-        profileItem.PreSocksPort = preSocksPort;
+        profileItem.PreSocksPort = subItem?.PreSocksPort;
-        if (await AddCustomServer(config, profileItem, true) == 0)
+
+        return await AddCustomServer(config, profileItem, true) == 0 ? 1 : -1;
+    }
+
+    private static async Task<int> AddBatchServersSpecificCustom(
+        Config config,
+        string strData,
+        string subid,
+        bool isSub,
+        SubItem subItem)
+    {
+        var subRemarks = subItem.Remarks;
+        var customCoreType = subItem.CustomCoreType!.Value;
+
+        var lstProfiles = customCoreType switch
         {
-            return 1;
+            ECoreType.Xray => V2rayFmt.ResolveToCustom(strData, subRemarks),
+            ECoreType.sing_box => SingboxFmt.ResolveToCustom(strData, subRemarks),
+            _ => null,
+        };
+
+        if (lstProfiles?.Count > 0)
+        {
+            var count = await AddBatchCustomServers(config, lstProfiles, subid, isSub);
+            if (count > 0)
+            {
+                return count;
+            }
         }
-        else
+
+        return await SaveCustomRawFileServer(config, strData, subid, isSub, subItem, customCoreType);
+    }
+
+    private static async Task<int> AddBatchCustomServers(
+        Config config,
+        List<ProfileItem> lstProfiles,
+        string subid,
+        bool isSub)
+    {
+        var count = 0;
+        foreach (var it in lstProfiles)
         {
-            return -1;
+            it.Subid = subid;
+            it.IsSub = isSub;
+
+            if (it.ConfigType == EConfigType.Custom)
+            {
+                if (await AddCustomServer(config, it, true) == 0)
+                {
+                    count++;
+                }
+            }
+            else
+            {
+                if (await AddCustomOutboundServer(config, it, true) == 0)
+                {
+                    count++;
+                }
+            }
+        }
+        return count;
+    }
+
+    private static async Task<int> SaveCustomRawFileServer(
+        Config config,
+        string strData,
+        string subid,
+        bool isSub,
+        SubItem subItem,
+        ECoreType customCoreType)
+    {
+        var ext = DetectFileExtension(strData);
+        var fileName = Utils.GetTempPath($"{Utils.GetGuid(false)}{ext}");
+        await File.WriteAllTextAsync(fileName, strData);
+
+        var profileItem = new ProfileItem
+        {
+            CoreType = customCoreType,
+            ConfigType = EConfigType.Custom,
+            Address = fileName,
+            Remarks = subItem.Remarks ?? customCoreType.ToString(),
+            Subid = subid,
+            IsSub = isSub,
+            PreSocksPort = subItem.PreSocksPort,
+        };
+
+        return await AddCustomServer(config, profileItem, true) == 0 ? 1 : -1;
+
+        static string DetectFileExtension(string data)
+        {
+            var trimmed = data.AsSpan().TrimStart();
+            if (trimmed.IsEmpty)
+            {
+                return string.Empty;
+            }
+
+            if (trimmed[0] is '{' or '[')
+            {
+                return ".json";
+            }
+
+            if (trimmed.StartsWith("---"))
+            {
+                return ".yaml";
+            }
+
+            foreach (var line in trimmed.EnumerateLines())
+            {
+                var lineTrimmed = line.TrimStart();
+                if (lineTrimmed.IsEmpty || lineTrimmed.StartsWith("#"))
+                {
+                    continue;
+                }
+
+                var colonIndex = lineTrimmed.IndexOf(':');
+                if (colonIndex > 0)
+                {
+                    var keySpan = lineTrimmed[..colonIndex];
+                    if (!keySpan.Contains(' ') && !keySpan.Contains('\t'))
+                    {
+                        if (colonIndex == lineTrimmed.Length - 1 || lineTrimmed[colonIndex + 1] is ' ' or '\t' or '\r' or '\n')
+                        {
+                            return ".yaml";
+                        }
+                    }
+                }
+            }
+
+            return string.Empty;
         }
     }
 
@@ -1837,6 +2008,7 @@ public static class ConfigHandler
                     EConfigType.Anytls => await AddAnytlsServer(config, profileItem, false),
                     EConfigType.Naive => await AddNaiveServer(config, profileItem, false),
                     EConfigType.PolicyGroup or EConfigType.ProxyChain => await AddServerCommon(config, profileItem, false),
+                    EConfigType.Outbound => await AddCustomOutboundServer(config, profileItem, true, false),
                     _ => -1,
                 };
                 if (addStatus == 0)
@@ -2038,6 +2210,7 @@ public static class ConfigHandler
             item.NextProfile = subItem.NextProfile;
             item.PreSocksPort = subItem.PreSocksPort;
             item.Memo = subItem.Memo;
+            item.CustomCoreType = subItem.CustomCoreType;
         }
 
         if (item.Id.IsNullOrEmpty())
@@ -2078,7 +2251,7 @@ public static class ConfigHandler
         {
             return -1;
         }
-        var customProfile = await SQLiteHelper.Instance.TableAsync<ProfileItem>().Where(t => t.Subid == subid && t.ConfigType == EConfigType.Custom).ToListAsync();
+        var customProfile = await SQLiteHelper.Instance.TableAsync<ProfileItem>().Where(t => t.Subid == subid && (t.ConfigType == EConfigType.Custom || t.ConfigType == EConfigType.Outbound)).ToListAsync();
         if (isSub)
         {
             await SQLiteHelper.Instance.ExecuteAsync($"delete from ProfileItem where isSub = 1 and subid = '{subid}'");
@@ -2438,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/AnytlsFmt.cs

@@ -25,6 +25,11 @@ public class AnytlsFmt : BaseFmt
         var query = Utils.ParseQueryString(parsedUrl.Query);
         ResolveUriQuery(query, ref item);
 
+        if (GetQueryValue(query, "insecure") == "1")
+        {
+            item.AllowInsecure = Global.StringTrue;
+        }
+
         return item;
     }
 
@@ -41,6 +46,10 @@ public class AnytlsFmt : BaseFmt
         }
         var pw = item.Password;
         var dicQuery = new Dictionary<string, string>();
+        if (item.GetAllowInsecure())
+        {
+            dicQuery.Add("insecure", "1");
+        }
         ToUriQuery(item, Global.None, ref dicQuery);
 
         return ToUri(EConfigType.Anytls, item.Address, item.Port, pw, dicQuery, remark);

v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs

@@ -1,11 +1,7 @@
-using System.Collections.Specialized;
-
 namespace ServiceLib.Handler.Fmt;
 
 public class BaseFmt
 {
-    private static readonly string[] _allowInsecureArray = new[] { "insecure", "allowInsecure", "allow_insecure" };
-
     private static string UrlEncodeSafe(string? value) => Utils.UrlEncode(value ?? string.Empty);
 
     protected static string GetIpv6(string address)
@@ -67,7 +63,6 @@ public class BaseFmt
             {
                 dicQuery.Add("alpn", Utils.UrlEncode(item.Alpn));
             }
-            ToUriQueryAllowInsecure(item, ref dicQuery);
         }
         if (item.EchConfigList.IsNotEmpty())
         {
@@ -196,25 +191,6 @@ public class BaseFmt
             dicQuery.Add("alpn", Utils.UrlEncode(item.Alpn));
         }
 
-        ToUriQueryAllowInsecure(item, ref dicQuery);
-
-        return 0;
-    }
-
-    private static int ToUriQueryAllowInsecure(ProfileItem item, ref Dictionary<string, string> dicQuery)
-    {
-        if (item.GetAllowInsecure())
-        {
-            // Add two for compatibility
-            dicQuery.Add("insecure", "1");
-            dicQuery.Add("allowInsecure", "1");
-        }
-        else
-        {
-            dicQuery.Add("insecure", "0");
-            dicQuery.Add("allowInsecure", "0");
-        }
-
         return 0;
     }
 
@@ -252,19 +228,6 @@ public class BaseFmt
             item.Finalmask = string.Empty;
         }
 
-        if (_allowInsecureArray.Any(k => GetQueryDecoded(query, k) == "1"))
-        {
-            item.AllowInsecure = Global.StringTrue;
-        }
-        else if (_allowInsecureArray.Any(k => GetQueryDecoded(query, k) == "0"))
-        {
-            item.AllowInsecure = Global.StringFalse;
-        }
-        else
-        {
-            item.AllowInsecure = string.Empty;
-        }
-
         var net = GetQueryValue(query, "type", nameof(ETransport.raw));
         if (net == Global.RawNetworkAlias)
         {
@@ -379,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);
 
@@ -162,10 +164,27 @@ public class Hysteria2Fmt : BaseFmt
 
     private static void ResolveHy2UriQuery(NameValueCollection query, ref ProfileItem item)
     {
+        if (GetQueryValue(query, "insecure") == "1")
+        {
+            item.AllowInsecure = Global.StringTrue;
+        }
         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"),
@@ -198,12 +217,25 @@ public class Hysteria2Fmt : BaseFmt
 
     private static void ToHy2UriQuery(ProfileItem item, ref Dictionary<string, string> dicQuery)
     {
+        if (item.GetAllowInsecure())
+        {
+            dicQuery.Add("insecure", "1");
+        }
         if (!item.CertSha.IsNullOrEmpty()
             && !item.CertSha.Contains(','))
         {
             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/InnerFmt.cs

@@ -1,6 +1,6 @@
 namespace ServiceLib.Handler.Fmt;
 
-public class InnerFmt
+public class InnerFmt : BaseFmt
 {
     private static readonly Lazy<string> SessionSalt = new(() => Utils.GetGuid(false));
 
@@ -50,19 +50,19 @@ public class InnerFmt
             var protocolExtra = item.GetProtocolExtra();
             // Only allow "self" as a special value for SubChildItems to avoid possible sources of attacks,
             // which means it will be replaced with the subid, otherwise set it to null
-            //if (!protocolExtra.SubChildItems.IsNullOrEmpty())
+            // if (!protocolExtra.SubChildItems.IsNullOrEmpty())
             if (protocolExtra.SubChildItems == "self")
             {
                 protocolExtra = protocolExtra with
                 {
-                    SubChildItems = subid
+                    SubChildItems = subid,
                 };
             }
             else
             {
                 protocolExtra = protocolExtra with
                 {
-                    SubChildItems = null
+                    SubChildItems = null,
                 };
             }
             if (Utils.String2List(protocolExtra.ChildItems) is { Count: > 0 } childIndexIds)
@@ -73,14 +73,14 @@ public class InnerFmt
                     .ToList();
                 protocolExtra = protocolExtra with
                 {
-                    ChildItems = Utils.List2String(newChildIndexIds)
+                    ChildItems = Utils.List2String(newChildIndexIds),
                 };
             }
             else
             {
                 protocolExtra = protocolExtra with
                 {
-                    ChildItems = null
+                    ChildItems = null,
                 };
             }
             item.SetProtocolExtra(protocolExtra);
@@ -120,7 +120,7 @@ public class InnerFmt
                 {
                     protocolExtra = protocolExtra with
                     {
-                        SubChildItems = "self"
+                        SubChildItems = "self",
                     };
                 }
                 if (Utils.String2List(protocolExtra.ChildItems) is { Count: > 0 } childIndexIds)
@@ -131,7 +131,7 @@ public class InnerFmt
                         .ToList();
                     protocolExtra = protocolExtra with
                     {
-                        ChildItems = Utils.List2String(newChildIndexIds)
+                        ChildItems = Utils.List2String(newChildIndexIds),
                     };
                 }
                 itemClone.SetProtocolExtra(protocolExtra);
@@ -175,6 +175,19 @@ public class InnerFmt
             jsonObj["TransportExtra"] = JsonUtils.Serialize(transportExtraObj, false);
             jsonObj.Remove("TransportExtraObj");
         }
+        var customOutboundFilePath = string.Empty;
+        if (jsonObj.TryGetPropertyValue("CustomOutboundObj", out var customOutboundNode)
+            && customOutboundNode is JsonObject customOutboundObj)
+        {
+            var customOutboundContent = JsonUtils.Serialize(customOutboundObj, new JsonSerializerOptions
+            {
+                WriteIndented = true,
+                DefaultIgnoreCondition = JsonIgnoreCondition.Never,
+                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+            });
+            customOutboundFilePath = WriteAllText(customOutboundContent);
+            jsonObj.Remove("CustomOutboundObj");
+        }
         var profileItem = JsonUtils.Deserialize<ProfileItem>(JsonUtils.Serialize(jsonObj, false));
         if (profileItem is null)
         {
@@ -193,6 +206,14 @@ public class InnerFmt
         {
             return null;
         }
+        if (profileItem.ConfigType is EConfigType.Outbound)
+        {
+            if (customOutboundFilePath.IsNullOrEmpty())
+            {
+                return null;
+            }
+            profileItem.Address = customOutboundFilePath;
+        }
         var protocolExtra = profileItem.GetProtocolExtra();
         var multipleLoad = protocolExtra.MultipleLoad;
         if (multipleLoad is not null && !Enum.IsDefined(typeof(EMultipleLoad), multipleLoad))
@@ -209,6 +230,26 @@ public class InnerFmt
         {
             return null;
         }
+        if (item.ConfigType is EConfigType.Outbound)
+        {
+            var customOutboundFilePath = item.Address;
+            if (!File.Exists(customOutboundFilePath))
+            {
+                customOutboundFilePath = Utils.GetConfigPath(customOutboundFilePath);
+            }
+            if (!File.Exists(customOutboundFilePath))
+            {
+                return null;
+            }
+            if (!customOutboundFilePath.IsNullOrEmpty()
+                && File.Exists(customOutboundFilePath)
+                && File.ReadAllText(customOutboundFilePath) is { Length: > 0 } customOutboundContent
+                && JsonUtils.ParseJson(customOutboundContent) is JsonObject customOutboundObj)
+            {
+                jsonObj["CustomOutboundObj"] = customOutboundObj;
+                jsonObj.Remove("Address");
+            }
+        }
         // unflatten
         // move jsonObj.ProtoExtra (string) to jsonObj.ProtoExtraObj
         // move jsonObj.TransportExtra (string) to jsonObj.TransportExtraObj
@@ -296,7 +337,7 @@ public class InnerFmt
             JsonValue value when value.TryGetValue<string>(out var str) => string.IsNullOrEmpty(str),
             JsonObject obj => obj.Count == 0,
             JsonArray arr => arr.Count == 0,
-            _ => false
+            _ => false,
         };
     }
 }

v2rayN/ServiceLib/Handler/Fmt/SingboxFmt.cs

@@ -2,19 +2,103 @@ namespace ServiceLib.Handler.Fmt;
 
 public class SingboxFmt : BaseFmt
 {
-    public static List<ProfileItem>? ResolveFullArray(string strData, string? subRemarks)
+    public static List<ProfileItem> ResolveToCustom(string strData, string? subRemarks)
     {
-        var configObjects = JsonUtils.Deserialize<object[]>(strData);
+        var jsonNode = JsonUtils.ParseJson(strData);
-        if (configObjects is not { Length: > 0 })
+        return ResolveCommon(jsonNode, subRemarks, false);
+    }
+
+    public static List<ProfileItem> ResolveToCustomOutbound(string strData, string? subRemarks)
+    {
+        var jsonNode = JsonUtils.ParseJson(strData);
+        return ResolveCommon(jsonNode, subRemarks, true);
+    }
+
+    private static List<ProfileItem> ResolveCommon(JsonNode? jsonNode, string? subRemarks, bool isOutbound)
+    {
+        if (jsonNode is JsonArray jsonArray)
+        {
+            return
+            [
+                .. jsonArray.Select(item => ResolveCommon(item, subRemarks, isOutbound))
+                    .Where(list => list is { Count: > 0 })
+                    .SelectMany(list => list),
+            ];
+        }
+        if (jsonNode is not JsonObject jsonObject)
+        {
+            return [];
+        }
+        // Process the individual JSON object
+        var profileList = new List<ProfileItem>();
+        if (!isOutbound)
+        {
+            var fullProfile = ResolveFull(jsonObject, subRemarks);
+            if (fullProfile is not null)
+            {
+                profileList.Add(fullProfile);
+                return profileList;
+            }
+        }
+        profileList.AddRange(ResolveFullToOutbound(jsonObject, subRemarks));
+        if (profileList.Count != 0)
+        {
+            return profileList;
+        }
+        var outboundProfile = ResolveOutbound(jsonObject, subRemarks);
+        if (outboundProfile is not null)
+        {
+            profileList.Add(outboundProfile);
+        }
+        return profileList;
+    }
+
+    private static ProfileItem? ResolveFull(JsonObject jsonObject, string? subRemarks)
+    {
+        if (jsonObject?["inbounds"] == null
+            || jsonObject["outbounds"] == null)
         {
             return null;
         }
 
-        List<ProfileItem> lstResult = [];
+        if (jsonObject["outbounds"] is JsonArray outboundsArray)
-        foreach (var configObject in configObjects)
         {
-            var objectString = JsonUtils.Serialize(configObject);
+            if (!outboundsArray.Any(IsValidSingboxOutbound))
-            var profileIt = ResolveFull(objectString, subRemarks);
+            {
+                return null;
+            }
+        }
+        else
+        {
+            return null;
+        }
+
+        var fileName = WriteAllText(JsonUtils.Serialize(jsonObject));
+        var profileItem = new ProfileItem
+        {
+            ConfigType = EConfigType.Custom,
+            CoreType = ECoreType.sing_box,
+            Address = fileName,
+            Remarks = subRemarks ?? "singbox_custom",
+        };
+
+        return profileItem;
+    }
+
+    private static List<ProfileItem> ResolveFullToOutbound(JsonObject jsonObject, string? subRemarks)
+    {
+        if (jsonObject?["outbounds"] is not JsonArray outboundsArray)
+        {
+            return [];
+        }
+        List<ProfileItem> lstResult = [];
+        foreach (var outbound in outboundsArray)
+        {
+            if (outbound is not JsonObject outboundObj)
+            {
+                continue;
+            }
+            var profileIt = ResolveOutbound(outboundObj, subRemarks);
             if (profileIt != null)
             {
                 lstResult.Add(profileIt);
@@ -23,25 +107,58 @@ public class SingboxFmt : BaseFmt
         return lstResult;
     }
 
-    public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+    private static ProfileItem? ResolveOutbound(JsonObject jsonObject, string? subRemarks)
     {
-        var config = JsonUtils.ParseJson(strData);
+        if (!IsValidSingboxOutbound(jsonObject))
-        if (config?["inbounds"] == null
-            || config["outbounds"] == null
-            || config["route"] == null
-            || config["dns"] == null)
         {
             return null;
         }
-
+        var type = jsonObject["type"]?.ToString();
-        var fileName = WriteAllText(strData);
+        if (type is null or "direct" or "block" or "dns" or "selector" or "urltest")
+        {
+            return null;
+        }
+        var tag = jsonObject["tag"]?.ToString();
+        var remarks = $"{type}_{tag}";
+        var fileName = WriteAllText(JsonUtils.Serialize(jsonObject));
         var profileItem = new ProfileItem
         {
+            ConfigType = EConfigType.Outbound,
             CoreType = ECoreType.sing_box,
             Address = fileName,
-            Remarks = subRemarks ?? "singbox_custom"
+            Remarks = remarks,
         };
-
         return profileItem;
     }
+
+    private static bool IsValidSingboxOutbound(JsonNode? jsonNode)
+    {
+        if (jsonNode is not JsonObject jsonObject)
+        {
+            return false;
+        }
+        var matchedCounter = 0;
+        if (string.IsNullOrEmpty(jsonObject["type"]?.ToString()))
+        {
+            return false;
+        }
+        matchedCounter += 1;
+        if (!string.IsNullOrEmpty(jsonObject["tag"]?.ToString()))
+        {
+            matchedCounter += 1;
+        }
+        if (!string.IsNullOrEmpty(jsonObject["server"]?.ToString()))
+        {
+            matchedCounter += 1;
+        }
+        if (!string.IsNullOrEmpty(jsonObject["server_port"]?.ToString()))
+        {
+            matchedCounter += 1;
+        }
+        if (!string.IsNullOrEmpty(jsonObject["tls"]?.ToString()))
+        {
+            matchedCounter += 1;
+        }
+        return matchedCounter >= 2;
+    }
 }

v2rayN/ServiceLib/Handler/Fmt/TrojanFmt.cs

@@ -2,6 +2,8 @@ namespace ServiceLib.Handler.Fmt;
 
 public class TrojanFmt : BaseFmt
 {
+    private static readonly List<string> _insecureQueryKeys = new() { "allowInsecure", "insecure" };
+
     public static ProfileItem? Resolve(string str, out string msg)
     {
         msg = ResUI.ConfigurationFormatIncorrect;
@@ -23,6 +25,10 @@ public class TrojanFmt : BaseFmt
         item.Password = Utils.UrlDecode(url.UserInfo);
 
         var query = Utils.ParseQueryString(url.Query);
+        if (_insecureQueryKeys.Any(q => GetQueryValue(query, q) == "1"))
+        {
+            item.AllowInsecure = Global.StringTrue;
+        }
         item.SetProtocolExtra(item.GetProtocolExtra() with { Flow = GetQueryValue(query, "flow") });
         ResolveUriQuery(query, ref item);
 
@@ -41,6 +47,10 @@ public class TrojanFmt : BaseFmt
             remark = "#" + Utils.UrlEncode(item.Remarks);
         }
         var dicQuery = new Dictionary<string, string>();
+        if (item.GetAllowInsecure())
+        {
+            _insecureQueryKeys.ForEach(q => dicQuery.Add(q, "1"));
+        }
         if (!item.GetProtocolExtra().Flow.IsNullOrEmpty())
         {
             dicQuery.Add("flow", item.GetProtocolExtra().Flow);

v2rayN/ServiceLib/Handler/Fmt/TuicFmt.cs

@@ -30,6 +30,10 @@ public class TuicFmt : BaseFmt
 
         var query = Utils.ParseQueryString(url.Query);
         ResolveUriQuery(query, ref item);
+        if (GetQueryValue(query, "allow_insecure") == "1")
+        {
+            item.AllowInsecure = Global.StringTrue;
+        }
         item.SetProtocolExtra(item.GetProtocolExtra() with
         {
             CongestionControl = GetQueryValue(query, "congestion_control")
@@ -53,7 +57,10 @@ public class TuicFmt : BaseFmt
 
         var dicQuery = new Dictionary<string, string>();
         ToUriQueryLite(item, ref dicQuery);
-
+        if (item.GetAllowInsecure())
+        {
+            dicQuery.Add("allow_insecure", "1");
+        }
         if (!item.GetProtocolExtra().CongestionControl.IsNullOrEmpty())
         {
             dicQuery.Add("congestion_control", item.GetProtocolExtra().CongestionControl);

v2rayN/ServiceLib/Handler/Fmt/V2rayFmt.cs

@@ -2,47 +2,166 @@ namespace ServiceLib.Handler.Fmt;
 
 public class V2rayFmt : BaseFmt
 {
-    public static List<ProfileItem>? ResolveFullArray(string strData, string? subRemarks)
+    public static List<ProfileItem> ResolveToCustom(string strData, string? subRemarks)
     {
-        var configObjects = JsonUtils.Deserialize<object[]>(strData);
+        var jsonNode = JsonUtils.ParseJson(strData);
-        if (configObjects is not { Length: > 0 })
+        return ResolveCommon(jsonNode, subRemarks, false);
+    }
+
+    public static List<ProfileItem> ResolveToCustomOutbound(string strData, string? subRemarks)
+    {
+        var jsonNode = JsonUtils.ParseJson(strData);
+        return ResolveCommon(jsonNode, subRemarks, true);
+    }
+
+    private static List<ProfileItem> ResolveCommon(JsonNode? jsonNode, string? subRemarks, bool isOutbound)
+    {
+        if (jsonNode is JsonArray jsonArray)
+        {
+            return
+            [
+                .. jsonArray.Select(item => ResolveCommon(item, subRemarks, isOutbound))
+                    .Where(list => list is { Count: > 0 })
+                    .SelectMany(list => list),
+            ];
+        }
+        if (jsonNode is not JsonObject jsonObject)
+        {
+            return [];
+        }
+        // Process the individual JSON object
+        var profileList = new List<ProfileItem>();
+        if (!isOutbound)
+        {
+            var fullProfile = ResolveFull(jsonObject, subRemarks);
+            if (fullProfile is not null)
+            {
+                profileList.Add(fullProfile);
+                return profileList;
+            }
+        }
+        profileList.AddRange(ResolveFullToOutbound(jsonObject, subRemarks));
+        if (profileList.Count != 0)
+        {
+            return profileList;
+        }
+        var outboundProfile = ResolveOutbound(jsonObject, subRemarks);
+        if (outboundProfile is not null)
+        {
+            profileList.Add(outboundProfile);
+        }
+        return profileList;
+    }
+
+    private static ProfileItem? ResolveFull(JsonObject jsonObject, string? subRemarks)
+    {
+        if (jsonObject?["inbounds"] == null
+            || jsonObject["outbounds"] == null)
         {
             return null;
         }
 
-        List<ProfileItem> lstResult = [];
+        if (jsonObject["outbounds"] is JsonArray outboundsArray)
-        foreach (var configObject in configObjects)
         {
-            var objectString = JsonUtils.Serialize(configObject);
+            if (!outboundsArray.Any(IsValidV2rayOutbound))
-            var profileIt = ResolveFull(objectString, subRemarks);
+            {
+                return null;
+            }
+        }
+        else
+        {
+            return null;
+        }
+
+        var fileName = WriteAllText(JsonUtils.Serialize(jsonObject));
+
+        var profileItem = new ProfileItem
+        {
+            ConfigType = EConfigType.Custom,
+            CoreType = ECoreType.Xray,
+            Address = fileName,
+            Remarks = jsonObject["remarks"]?.ToString() ?? subRemarks ?? "v2ray_custom",
+        };
+
+        return profileItem;
+    }
+
+    public static List<ProfileItem> ResolveFullToOutbound(JsonObject jsonObject, string? subRemarks)
+    {
+        if (jsonObject["outbounds"] is not JsonArray outboundsArray)
+        {
+            return [];
+        }
+        List<ProfileItem> lstResult = [];
+        foreach (var outbound in outboundsArray)
+        {
+            if (outbound is not JsonObject outboundObj)
+            {
+                continue;
+            }
+            var profileIt = ResolveOutbound(outboundObj, subRemarks);
             if (profileIt != null)
             {
                 lstResult.Add(profileIt);
             }
         }
-
         return lstResult;
     }
 
-    public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+    public static ProfileItem? ResolveOutbound(JsonObject jsonObject, string? subRemarks)
     {
-        var config = JsonUtils.ParseJson(strData);
+        if (!IsValidV2rayOutbound(jsonObject))
-        if (config?["inbounds"] == null
-            || config["outbounds"] == null
-            || config["routing"] == null)
         {
             return null;
         }
-
+        var protocol = jsonObject["protocol"]?.ToString();
-        var fileName = WriteAllText(strData);
+        if (protocol is null or "freedom" or "blackhole" or "dns" or "loopback")
-
+        {
+            return null;
+        }
+        var tag = jsonObject["tag"]?.ToString();
+        var remarks = $"{protocol}_{tag}";
+        var fileName = WriteAllText(JsonUtils.Serialize(jsonObject));
         var profileItem = new ProfileItem
         {
+            ConfigType = EConfigType.Outbound,
             CoreType = ECoreType.Xray,
             Address = fileName,
-            Remarks = config?["remarks"]?.ToString() ?? subRemarks ?? "v2ray_custom"
+            Remarks = remarks,
         };
-
         return profileItem;
     }
+
+    private static bool IsValidV2rayOutbound(JsonNode? jsonNode)
+    {
+        if (jsonNode is not JsonObject jsonObject)
+        {
+            return false;
+        }
+
+        var matchedCounter = 0;
+        if (string.IsNullOrEmpty(jsonObject["protocol"]?.ToString()))
+        {
+            return false;
+        }
+        matchedCounter += 1;
+        if (!string.IsNullOrEmpty(jsonObject["settings"]?.ToString()))
+        {
+            matchedCounter += 1;
+        }
+        if (!string.IsNullOrEmpty(jsonObject["streamSettings"]?.ToString()))
+        {
+            matchedCounter += 1;
+        }
+        if (!string.IsNullOrEmpty(jsonObject["tag"]?.ToString()))
+        {
+            matchedCounter += 1;
+        }
+        if (!string.IsNullOrEmpty(jsonObject["mux"]?.ToString()))
+        {
+            matchedCounter += 1;
+        }
+
+        return matchedCounter >= 3;
+    }
 }

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

v2rayN/ServiceLib/Manager/CertPemManager.cs

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

v2rayN/ServiceLib/Manager/CoreAdminManager.cs

@@ -91,6 +91,8 @@ public class CoreAdminManager
                 .ExecuteBufferedAsync();
 
             await UpdateFunc(false, result.StandardOutput.ToString());
+
+            await Task.Delay(1000); // Wait for a second to ensure the process is killed
         }
         catch (Exception ex)
         {

v2rayN/ServiceLib/Manager/GroupProfileManager.cs

@@ -118,7 +118,7 @@ public class GroupProfileManager
         return childProfiles?.Where(p =>
                 p != null &&
                 p.IsValid() &&
-                !p.ConfigType.IsComplexType() &&
+                (!p.ConfigType.IsComplexType() || p.ConfigType == EConfigType.Outbound) &&
                 (extra.Filter.IsNullOrEmpty() || Regex.IsMatch(p.Remarks, extra.Filter))
             )
             .ToList() ?? [];

v2rayN/ServiceLib/Manager/ProfileExManager.cs

@@ -1,5 +1,3 @@
-//using System.Reactive.Linq;
-
 namespace ServiceLib.Manager;
 
 public class ProfileExManager

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

@@ -11,6 +11,8 @@ public record CoreConfigContext
     public Config AppConfig { get; init; } = new();
     public FullConfigTemplateItem? FullConfigTemplate { get; init; } = new();
 
+    public Dictionary<string, string> CustomOutboundContent { get; init; } = new();
+
     // Test ServerTestItem Map
     public Dictionary<string, string> ServerTestItemMap { get; init; } = new();
 
@@ -22,4 +24,7 @@ public record CoreConfigContext
 
     public bool IsWindows { get; init; }
     public bool IsMacOS { get; init; }
+
+    // Generation Context
+    public Dictionary<object, string> CustomOutboundMap { get; init; } = new();
 }

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; }
 }
 
@@ -364,8 +367,6 @@ public class StreamSettings4Ray
 
 public class TlsSettings4Ray
 {
-    public bool? allowInsecure { get; set; }
-
     public string? serverName { get; set; }
 
     public List<string>? alpn { get; set; }

v2rayN/ServiceLib/Models/Dto/CheckUpdateModel.cs

@@ -1,10 +1,10 @@
 namespace ServiceLib.Models.Dto;
 
-public class CheckUpdateModel : ReactiveObject
+public partial class CheckUpdateModel : ReactiveObject
 {
     public bool? IsSelected { get; set; }
     public ECoreType? CoreType { get; set; }
-    [Reactive] public string? Remarks { get; set; }
+    [Reactive] public partial string? Remarks { get; set; }
     public string? FileName { get; set; }
     public bool? IsFinished { get; set; }
     public bool IsGeoFile { get; set; }

v2rayN/ServiceLib/Models/Dto/ClashProxyModel.cs

@@ -1,7 +1,7 @@
 namespace ServiceLib.Models.Dto;
 
 [Serializable]
-public class ClashProxyModel : ReactiveObject
+public partial class ClashProxyModel : ReactiveObject
 {
     public string? Name { get; set; }
 
@@ -9,9 +9,9 @@ public class ClashProxyModel : ReactiveObject
 
     public string? Now { get; set; }
 
-    [Reactive] public int Delay { get; set; }
+    [Reactive] public partial int Delay { get; set; }
 
-    [Reactive] public string? DelayName { get; set; }
+    [Reactive] public partial string? DelayName { get; set; }
 
     public bool IsActive { get; set; }
 }

v2rayN/ServiceLib/Models/Dto/FileDownloadState.cs

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

v2rayN/ServiceLib/Models/Dto/ProfileItemModel.cs

@@ -1,7 +1,7 @@
 namespace ServiceLib.Models.Dto;
 
 [Serializable]
-public class ProfileItemModel : ReactiveObject
+public partial class ProfileItemModel : ReactiveObject
 {
     public bool IsActive { get; set; }
     public string IndexId { get; set; }
@@ -16,30 +16,30 @@ public class ProfileItemModel : ReactiveObject
     public int Sort { get; set; }
 
     [Reactive]
-    public int Delay { get; set; }
+    public partial int Delay { get; set; }
 
     public decimal Speed { get; set; }
 
     [Reactive]
-    public string DelayVal { get; set; }
+    public partial string DelayVal { get; set; }
 
     [Reactive]
-    public string SpeedVal { get; set; }
+    public partial string SpeedVal { get; set; }
 
     [Reactive]
-    public string IpInfo { get; set; }
+    public partial string IpInfo { get; set; }
 
     [Reactive]
-    public string TodayUp { get; set; }
+    public partial string TodayUp { get; set; }
 
     [Reactive]
-    public string TodayDown { get; set; }
+    public partial string TodayDown { get; set; }
 
     [Reactive]
-    public string TotalUp { get; set; }
+    public partial string TotalUp { get; set; }
 
     [Reactive]
-    public string TotalDown { get; set; }
+    public partial string TotalDown { get; set; }
 
     public string GetSummary()
     {

v2rayN/ServiceLib/Models/Entities/ProfileItem.cs

@@ -66,7 +66,7 @@ public class ProfileItem
 
     public bool IsValid()
     {
-        if (IsComplex())
+        if (IsComplex() || ConfigType == EConfigType.Outbound)
         {
             return true;
         }

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; }
@@ -51,4 +52,7 @@ public record ProtocolExtraItem
     public string? SubChildItems { get; init; }
     public string? Filter { get; init; }
     public EMultipleLoad? MultipleLoad { get; init; }
+
+    // custom outbound
+    public bool? IsSingboxEndpoint { get; init; }
 }

v2rayN/ServiceLib/Models/Entities/SubItem.cs

@@ -33,4 +33,6 @@ public class SubItem
     public int? PreSocksPort { get; set; }
 
     public string? Memo { get; set; }
+
+    public ECoreType? CustomCoreType { get; set; }
 }

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -178,7 +178,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Failed to import custom configuration Configuration 的本地化字符串。
+        ///   查找类似 Failed to import configuration 的本地化字符串。
         /// </summary>
         public static string FailedImportedCustomServer {
             get {
@@ -268,7 +268,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please browse to import Configuration configuration 的本地化字符串。
+        ///   查找类似 Please browse to import configuration 的本地化字符串。
         /// </summary>
         public static string FillServerAddressCustom {
             get {
@@ -438,6 +438,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Custom config core 的本地化字符串。
+        /// </summary>
+        public static string LvCustomCoreType {
+            get {
+                return ResourceManager.GetString("LvCustomCoreType", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Custom icon 的本地化字符串。
         /// </summary>
@@ -735,6 +744,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Add a custom outbound 的本地化字符串。
+        /// </summary>
+        public static string menuAddCustomOutboundServer {
+            get {
+                return ResourceManager.GetString("menuAddCustomOutboundServer", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Add a custom configuration 的本地化字符串。
         /// </summary>
@@ -1933,7 +1951,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Warning: Xray will disable allowInsecure (skip certificate verification) in August 2026. Please switch to pinnedPeerCertSha256 (fixed certificate fingerprint) as soon as possible. allowInsecure will not be usable after its expiration. 的本地化字符串。
+        ///   查找类似 The current node uses an unencrypted connection, meaning your communications could be directly monitored by network intermediaries controlled by authoritarian governments. For security reasons, nodes of this type cannot connect via Xray-core versions 26.2.6 or higher. If this is a self-built node, please enable TLS or other secure encryption, or pin the certificate using pinSHA256. If this is an airport/provider node, please contact your service provider for a technical upgrade. If the provider refuses to c [字符串的其余部分被截断]&quot;; 的本地化字符串。
         /// </summary>
         public static string MsgAllowInsecureDeprecated {
             get {
@@ -1977,6 +1995,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Custom outbound {0} file not found: {1} 的本地化字符串。
+        /// </summary>
+        public static string MsgCustomOutboundFileNotFound {
+            get {
+                return ResourceManager.GetString("MsgCustomOutboundFileNotFound", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Downloaded GeoFile: {0} successfully 的本地化字符串。
         /// </summary>
@@ -2626,7 +2653,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Custom configuration Configuration imported successfully 的本地化字符串。
+        ///   查找类似 Custom configuration imported successfully 的本地化字符串。
         /// </summary>
         public static string SuccessfullyImportedCustomServer {
             get {
@@ -2742,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>
@@ -2752,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 {
@@ -2925,6 +2970,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Only single outbound/endpoint supported for xray/sing-box 的本地化字符串。
+        /// </summary>
+        public static string TbCustomOutboundTip {
+            get {
+                return ResourceManager.GetString("TbCustomOutboundTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Direct Target Resolution Strategy 的本地化字符串。
         /// </summary>
@@ -2961,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>
@@ -4995,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

@@ -142,7 +142,7 @@
     <value>Failed to get the default configuration</value>
   </data>
   <data name="FailedImportedCustomServer" xml:space="preserve">
-    <value>Failed to import custom configuration Configuration</value>
+    <value>Failed to import configuration</value>
   </data>
   <data name="FailedReadConfiguration" xml:space="preserve">
     <value>Failed to read configuration file</value>
@@ -283,7 +283,7 @@
     <value>Configuration successful. {0}</value>
   </data>
   <data name="SuccessfullyImportedCustomServer" xml:space="preserve">
-    <value>Custom configuration Configuration imported successfully</value>
+    <value>Custom configuration imported successfully</value>
   </data>
   <data name="SuccessfullyImportedServerViaClipboard" xml:space="preserve">
     <value>{0} Configurations have been imported from clipboard</value>
@@ -385,7 +385,7 @@
     <value>All</value>
   </data>
   <data name="FillServerAddressCustom" xml:space="preserve">
-    <value>Please browse to import Configuration configuration</value>
+    <value>Please browse to import configuration</value>
   </data>
   <data name="Speedtesting" xml:space="preserve">
     <value>Testing...</value>
@@ -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>
@@ -1848,4 +1848,28 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="TbIpv4Address" xml:space="preserve">
     <value>Ipv4 Address</value>
   </data>
+  <data name="menuAddCustomOutboundServer" xml:space="preserve">
+    <value>Add a custom outbound</value>
+  </data>
+  <data name="MsgCustomOutboundFileNotFound" xml:space="preserve">
+    <value>Custom outbound {0} file not found: {1}</value>
+  </data>
+  <data name="TbCustomOutboundTip" xml:space="preserve">
+    <value>Only single outbound/endpoint supported for xray/sing-box</value>
+  </data>
+  <data name="LvCustomCoreType" xml:space="preserve">
+    <value>Custom config core</value>
+  </data>
+  <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

@@ -268,7 +268,7 @@
     <value>Сначала выберите сервер</value>
   </data>
   <data name="RemoveDuplicateServerResult" xml:space="preserve">
-    <value>Дедупликация конфигураций завершена. Было: {0}, Стало: {1}.</value>
+    <value>Дедупликация конфигураций завершена. Было: {0}, Стало: {1}</value>
   </data>
   <data name="RemoveServer" xml:space="preserve">
     <value>Вы уверены, что хотите удалить сервер?</value>
@@ -1048,7 +1048,7 @@
     <value>HTTP-заголовки</value>
   </data>
   <data name="TipHttpOutboundHeaders" xml:space="preserve">
-    <value>Пользовательские заголовки исходящего HTTP-запроса. Введите JSON-объект, значения которого — строка или массив строк.</value>
+    <value>Пользовательские заголовки исходящего HTTP-запроса. Введите JSON-объект, значения которого — строка или массив строк</value>
   </data>
   <data name="LvPrevProfile" xml:space="preserve">
     <value>Псевдоним предыдущего прокси</value>
@@ -1120,28 +1120,28 @@
     <value>Длина фрагмента</value>
   </data>
   <data name="TbSettingsFragmentLengthTip" xml:space="preserve">
-    <value>Диапазон размера фрагмента в байтах (например, 50-100). Первое значение не больше второго. Пусто = по умолчанию.</value>
+    <value>Диапазон размера фрагмента в байтах (например, 50-100). Первое значение не больше второго. Пусто = по умолчанию</value>
   </data>
   <data name="TbSettingsFragmentInterval" xml:space="preserve">
     <value>Интервал фрагментации</value>
   </data>
   <data name="TbSettingsFragmentIntervalTip" xml:space="preserve">
-    <value>Задержка между фрагментами в мс (например, 10-20). Диапазон 1-100. Первое значение не больше второго. Пусто = по умолчанию.</value>
+    <value>Задержка между фрагментами в мс (например, 10-20). Диапазон 1-100. Первое значение не больше второго. Пусто = по умолчанию</value>
   </data>
   <data name="TbSettingsFragmentMaxSplit" xml:space="preserve">
     <value>Макс. разделение</value>
   </data>
   <data name="TbSettingsFragmentMaxSplitTip" xml:space="preserve">
-    <value>Максимальное число разделений (0 = без лимита, 0-10000). Только для Xray-core. Пусто = по умолчанию.</value>
+    <value>Максимальное число разделений (0 = без лимита, 0-10000). Только для Xray-core. Пусто = по умолчанию</value>
   </data>
   <data name="TbSettingsFragmentFallbackDelay" xml:space="preserve">
     <value>Резервная задержка</value>
   </data>
   <data name="TbSettingsFragmentFallbackDelayTip" xml:space="preserve">
-    <value>Резервная задержка для TLS-фрагмента. Только для sing-box. Пусто = по умолчанию.</value>
+    <value>Резервная задержка для TLS-фрагмента. Только для sing-box. Пусто = по умолчанию</value>
   </data>
   <data name="FillFragmentParameterError" xml:space="preserve">
-    <value>Неверный формат диапазона. Используйте 'from-to' (например, 50-100).</value>
+    <value>Неверный формат диапазона. Используйте 'from-to' (например, 50-100)</value>
   </data>
   <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
     <value>Включить файл кэша для sing-box (файлы наборов правил)</value>
@@ -1351,7 +1351,7 @@
     <value>Пароль sudo системы</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
-    <value>Пароль sudo будет проверен в терминале. Если из-за ошибки проверки приложение начнёт работать некорректно, перезапустите его. Пароль не сохраняется — его нужно вводить после каждого перезапуска.</value>
+    <value>Пароль sudo будет проверен в терминале. Если из-за ошибки проверки приложение начнёт работать некорректно, перезапустите его. Пароль не сохраняется — его нужно вводить после каждого перезапуска</value>
   </data>
   <data name="TransportHeaderType5" xml:space="preserve">
     <value>XHTTP-режим</value>
@@ -1411,7 +1411,7 @@
     <value>Можно указать псевдоним из конфигурации, убедитесь, что он существует и уникален</value>
   </data>
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
-    <value>Неверный пароль, попробуйте ещё раз.</value>
+    <value>Неверный пароль, попробуйте ещё раз</value>
   </data>
   <data name="TbMldsa65Verify" xml:space="preserve">
     <value>Mldsa65Verify</value>
@@ -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>
@@ -1492,7 +1492,7 @@
     <value>Добавляет только конфигурацию Outbound и Endpoint. Нажмите, чтобы открыть документ</value>
   </data>
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
-    <value>Эта функция предназначена для продвинутых пользователей и особых случаев. После включения игнорируются базовые настройки ядра, DNS и маршрутизации. Вы должны самостоятельно корректно задать порт системного прокси, учёт трафика и другие связанные параметры — всё настраивается вручную.</value>
+    <value>Эта функция предназначена для продвинутых пользователей и особых случаев. После включения игнорируются базовые настройки ядра, DNS и маршрутизации. Вы должны самостоятельно корректно задать порт системного прокси, учёт трафика и другие связанные параметры — всё настраивается вручную</value>
   </data>
   <data name="MsgStartParsingSubscription" xml:space="preserve">
     <value>Начинается разбор и обработка содержимого подписки</value>
@@ -1501,7 +1501,7 @@
     <value>Выбрать профиль</value>
   </data>
   <data name="TbFakeIPTips" xml:space="preserve">
-    <value>Applies globally by default, and built-in FakeIP filtering is only built into sing-box.</value>
+    <value>Применяется глобально по умолчанию; встроенная фильтрация FakeIP есть только в sing-box</value>
   </data>
   <data name="PleaseAddAtLeastOneServer" xml:space="preserve">
     <value>Добавьте хотя бы одну конфигурацию</value>
@@ -1588,7 +1588,7 @@
     <value>Привязанный сертификат (заполните любое из полей)
 При указании сертификат будет привязан, а «Пропустить проверку сертификата» отключится.
 
-Получение сертификата может завершиться неудачей при использовании самоподписанного сертификата или при наличии ненадёжного / вредоносного ЦС в системе.</value>
+Получение сертификата может завершиться неудачей при использовании самоподписанного сертификата или при наличии ненадёжного / вредоносного ЦС в системе</value>
   </data>
   <data name="TbFetchCert" xml:space="preserve">
     <value>Получить сертификат</value>
@@ -1642,10 +1642,10 @@
     <value>По умолчанию используется только при разрешении имён в процессе маршрутизации; убедитесь, что удалённый сервер может достичь этого DNS</value>
   </data>
   <data name="TbDirectResolveStrategyTips" xml:space="preserve">
-    <value>Если не задано или «AsIs», используется системный DNS; иначе — встроенный DNS-модуль.</value>
+    <value>Если не задано или «AsIs», используется системный DNS; иначе — встроенный DNS-модуль</value>
   </data>
   <data name="TbRemoteResolveStrategyTips" xml:space="preserve">
-    <value>Если не задано или «AsIs», разрешение DNS выполняется DNS удалённого сервера; иначе — встроенный DNS-модуль.</value>
+    <value>Если не задано или «AsIs», разрешение DNS выполняется DNS удалённого сервера; иначе — встроенный DNS-модуль</value>
   </data>
   <data name="TbHopInt7" xml:space="preserve">
     <value>Интервал смены портов (Port Hopping)</value>
@@ -1660,37 +1660,37 @@
     <value>Правило маршрутизации {0}, исходящий узел {1}, предупреждение: {2}</value>
   </data>
   <data name="MsgRoutingRuleOutboundNodeError" xml:space="preserve">
-    <value>Правило маршрутизации {0}, исходящий узел {1}, ошибка: {2}. Используется только прокси-узел.</value>
+    <value>Правило маршрутизации {0}, исходящий узел {1}, ошибка: {2}. Используется только прокси-узел</value>
   </data>
   <data name="MsgGroupCycleDependency" xml:space="preserve">
-    <value>Группа {0} имеет циклическую зависимость на дочерний узел {1}. Узел пропущен.</value>
+    <value>Группа {0} имеет циклическую зависимость на дочерний узел {1}. Узел пропущен</value>
   </data>
   <data name="MsgGroupChildNodeWarning" xml:space="preserve">
     <value>Группа {0}: предупреждение дочернего узла {1}: {2}</value>
   </data>
   <data name="MsgGroupChildNodeError" xml:space="preserve">
-    <value>Группа {0}: ошибка дочернего узла {1}: {2}. Узел пропущен.</value>
+    <value>Группа {0}: ошибка дочернего узла {1}: {2}. Узел пропущен</value>
   </data>
   <data name="MsgGroupChildGroupNodeWarning" xml:space="preserve">
     <value>Группа {0}: предупреждение дочернего узла группы {1}: {2}</value>
   </data>
   <data name="MsgGroupChildGroupNodeError" xml:space="preserve">
-    <value>Группа {0}: ошибка дочернего узла группы {1}: {2}. Узел пропущен.</value>
+    <value>Группа {0}: ошибка дочернего узла группы {1}: {2}. Узел пропущен</value>
   </data>
   <data name="MsgGroupNoValidChildNode" xml:space="preserve">
-    <value>У группы {0} нет допустимых дочерних узлов.</value>
+    <value>У группы {0} нет допустимых дочерних узлов</value>
   </data>
   <data name="MsgRoutingRuleEmptyOutboundTag" xml:space="preserve">
-    <value>У правила маршрутизации {0} пустой исходящий тег. Используется только прокси-узел.</value>
+    <value>У правила маршрутизации {0} пустой исходящий тег. Используется только прокси-узел</value>
   </data>
   <data name="MsgRoutingRuleOutboundNodeNotFound" xml:space="preserve">
-    <value>Правило маршрутизации {0}, исходящий узел {1} не найден. Используется только прокси-узел.</value>
+    <value>Правило маршрутизации {0}, исходящий узел {1} не найден. Используется только прокси-узел</value>
   </data>
   <data name="MsgSubscriptionPrevProfileNotFound" xml:space="preserve">
-    <value>Предыдущий прокси подписки {0} не найден. Пропущено.</value>
+    <value>Предыдущий прокси подписки {0} не найден. Пропущено</value>
   </data>
   <data name="MsgSubscriptionNextProfileNotFound" xml:space="preserve">
-    <value>Следующий прокси подписки {0} не найден. Пропущено.</value>
+    <value>Следующий прокси подписки {0} не найден. Пропущено</value>
   </data>
   <data name="menuGenGroupServer" xml:space="preserve">
     <value>Сгенерировать группу политик</value>
@@ -1756,7 +1756,7 @@
     <value>Привязать интерфейс</value>
   </data>
   <data name="TbSettingsBindInterfaceTip" xml:space="preserve">
-    <value>Для среды с несколькими сетевыми интерфейсами укажите имя интерфейса для исходящих подключений. На Linux/macOS работает только при включённом TUN.</value>
+    <value>Для среды с несколькими сетевыми интерфейсами укажите имя интерфейса для исходящих подключений. На Linux/macOS работает только при включённом TUN</value>
   </data>
   <data name="TbPreSharedKey" xml:space="preserve">
     <value>Общий ключ (PSK)</value>
@@ -1780,13 +1780,13 @@
     <value>Доступно обновление</value>
   </data>
   <data name="MsgAllowInsecureDeprecated" xml:space="preserve">
-    <value>Предупреждение: 1 августа 2026 г. Xray отключит пропуск проверки сертификата (allowInsecure). Как можно скорее перейдите на привязанный отпечаток сертификата (pinnedPeerCertSha256). После этой даты allowInsecure использовать будет нельзя.</value>
+    <value>Предупреждение: 1 августа 2026 г. Xray отключит пропуск проверки сертификата (allowInsecure). Как можно скорее перейдите на привязанный отпечаток сертификата (pinnedPeerCertSha256). После этой даты allowInsecure использовать будет нельзя</value>
   </data>
   <data name="TbRouteExcludeAddress" xml:space="preserve">
     <value>Адреса, исключаемые из маршрутизации</value>
   </data>
   <data name="TbRouteExcludeAddressTip" xml:space="preserve">
-    <value>Разделяйте запятыми (,).</value>
+    <value>Разделяйте запятыми (,)</value>
   </data>
   <data name="MsgTunRouteExcludeInvalidAddress" xml:space="preserve">
     <value>Недопустимый адрес в списке исключений маршрутизации TUN: {0}</value>
@@ -1798,22 +1798,22 @@
     <value>Включить финальную фрагментацию (Final Fragment)</value>
   </data>
   <data name="TbEnableFinalFragmentTip" xml:space="preserve">
-    <value>Разбивать конец пакетов на более мелкие фрагменты при отправке. Это может влиять на пропускную способность и задержку.</value>
+    <value>Разбивать конец пакетов на более мелкие фрагменты при отправке. Это может влиять на пропускную способность и задержку</value>
   </data>
   <data name="TbEnabletDnsViaProxy" xml:space="preserve">
     <value>DNS через Bridge</value>
   </data>
   <data name="MsgInsecureConfiguration" xml:space="preserve">
-    <value>Обнаружена небезопасная конфигурация: AllowInsecure включён, но сертификат не предоставлен. Это может привести к атаке «человек посередине» (MITM).</value>
+    <value>Обнаружена небезопасная конфигурация: AllowInsecure включён, но сертификат не предоставлен. Это может привести к атаке «человек посередине» (MITM)</value>
   </data>
   <data name="TbHy2RealmUrl" xml:space="preserve">
     <value>Realm URL</value>
   </data>
   <data name="InvalidHy2RealmUrl" xml:space="preserve">
-    <value>Некорректный Realm URL.</value>
+    <value>Некорректный Realm URL</value>
   </data>
   <data name="InvalidHttpOutboundHeaders" xml:space="preserve">
-    <value>Введите корректный JSON заголовков HTTP-запроса.</value>
+    <value>Введите корректный JSON заголовков HTTP-запроса</value>
   </data>
   <data name="TbHy2RealmUrlTip" xml:space="preserve">
     <value>Формат: realm://&lt;token&gt;@&lt;rendezvous-host&gt;[:port]/&lt;realm-name&gt;?stun=&lt;stun-host&gt;[:port]</value>
@@ -1822,12 +1822,51 @@
     <value>Размер пакета Gecko (мин/макс)</value>
   </data>
   <data name="TbLegacyProtectTip" xml:space="preserve">
-    <value>Если включено, используется sing-box TUN; иначе — xray TUN.</value>
+    <value>Если включено, используется sing-box TUN; иначе — xray TUN</value>
   </data>
   <data name="TbRootCertificateProvider" xml:space="preserve">
     <value>Поставщик корневых сертификатов</value>
   </data>
   <data name="TbRootCertificateProviderTip" xml:space="preserve">
-    <value>Применяется только к загрузкам и сетевым запросам графического интерфейса v2rayN. Не влияет на проверку сертификатов ядром.</value>
+    <value>Применяется только к загрузкам и сетевым запросам графического интерфейса v2rayN. Не влияет на проверку сертификатов ядром</value>
+  </data>
+  <data name="TbProxyDialResolveStrategy" xml:space="preserve">
+    <value>Стратегия разрешения DNS при подключении к прокси</value>
+  </data>
+  <data name="TbProxyDialResolveStrategyTip" xml:space="preserve">
+    <value>Не рекомендуется; может вызвать петли маршрутизации</value>
+  </data>
+  <data name="TbEnableHappyEyeballs" xml:space="preserve">
+    <value>Включить Happy Eyeballs</value>
+  </data>
+  <data name="TbEnableHappyEyeballsTip" xml:space="preserve">
+    <value>Требуется стратегия UseIP. При включении одновременно устанавливаются соединения по IPv4 и IPv6 и автоматически выбирается более быстрый доступный путь</value>
+  </data>
+  <data name="TbIpv6Address" xml:space="preserve">
+    <value>Адрес IPv6</value>
+  </data>
+  <data name="TbIpv4Address" xml:space="preserve">
+    <value>Адрес IPv4</value>
+  </data>
+  <data name="menuAddCustomOutboundServer" xml:space="preserve">
+    <value>Добавить пользовательский outbound</value>
+  </data>
+  <data name="MsgCustomOutboundFileNotFound" xml:space="preserve">
+    <value>Файл пользовательского outbound {0} не найден: {1}</value>
+  </data>
+  <data name="TbCustomOutboundTip" xml:space="preserve">
+    <value>Для xray/sing-box поддерживается только один outbound/endpoint</value>
+  </data>
+  <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>
@@ -1849,4 +1849,28 @@
   <data name="TbIpv4Address" xml:space="preserve">
     <value>Ipv4 地址</value>
   </data>
+  <data name="menuAddCustomOutboundServer" xml:space="preserve">
+    <value>添加自定义出站</value>
+  </data>
+  <data name="MsgCustomOutboundFileNotFound" xml:space="preserve">
+    <value>自定义出站 {0} 的文件未找到：{1}</value>
+  </data>
+  <data name="TbCustomOutboundTip" xml:space="preserve">
+    <value>仅支持 xray/sing-box 的单个 outbound/endpoin</value>
+  </data>
+  <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>
@@ -1849,4 +1849,16 @@
   <data name="TbIpv4Address" xml:space="preserve">
     <value>Ipv4 位址</value>
   </data>
+  <data name="menuAddCustomOutboundServer" xml:space="preserve">
+    <value>新增自訂出站</value>
+  </data>
+  <data name="MsgCustomOutboundFileNotFound" xml:space="preserve">
+    <value>自訂出站 {0} 的檔案未找到：{1}</value>
+  </data>
+  <data name="TbCustomOutboundTip" xml:space="preserve">
+    <value>僅支援 xray/sing-box 的單一 outbound/endpoint</value>
+  </data>
+  <data name="LvCustomCoreType" xml:space="preserve">
+    <value>自訂設定核心</value>
+  </data>
 </root>

v2rayN/ServiceLib/Sample/kill_as_sudo_linux_sh

@@ -66,6 +66,11 @@ kill_children "$PID"
 echo "Terminating main process: $PID"
 kill -9 "$PID" 2>/dev/null || true
 
+# Wait a little for process/port resources to be fully released
+FINAL_WAIT_SECONDS=1
+echo "Waiting ${FINAL_WAIT_SECONDS}s for resources to settle..."
+sleep "$FINAL_WAIT_SECONDS"
+
 echo "============================================"
 echo "Process $PID and all its children have been terminated"
 echo "============================================"

v2rayN/ServiceLib/Sample/kill_as_sudo_osx_sh

@@ -63,6 +63,11 @@ kill_descendants "$PID"
 echo "Terminating main process: $PID"
 kill -9 "$PID" 2>/dev/null || true
 
+# Wait a little for process/port resources to be fully released
+FINAL_WAIT_SECONDS=1
+echo "Waiting ${FINAL_WAIT_SECONDS}s for resources to settle..."
+sleep "$FINAL_WAIT_SECONDS"
+
 echo "============================================"
 echo "Process $PID and all its descendants have been terminated"
 echo "============================================"

v2rayN/ServiceLib/Sample/tun_singbox_rules

@@ -1,6 +1,8 @@
 [
   {
-    "network": "udp",
+    "network": [
+      "udp"
+    ],
     "port": [
       135,
       137,

v2rayN/ServiceLib/ServiceLib.csproj

@@ -10,7 +10,10 @@
 		<PackageReference Include="ReactiveUI">
 			<TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
-		<PackageReference Include="ReactiveUI.Fody" />
+		<PackageReference Include="ReactiveUI.SourceGenerators">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 		<PackageReference Include="sqlite-net-e" />
 		<PackageReference Include="Repobot.SQLite.Unofficial" />
 		<PackageReference Include="NLog" />

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

@@ -57,13 +57,10 @@ public partial class CoreConfigSingboxService(CoreConfigContext context)
 
             ConvertGeo2Ruleset();
 
-            ApplyOutboundBindInterface();
-            ApplyOutboundSendThrough();
-
             ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
             ret.Success = true;
 
-            ret.Data = ApplyFullConfigTemplate();
+            ret.Data = ApplyFinalConfigModifiers();
             return ret;
         }
         catch (Exception ex)
@@ -107,7 +104,7 @@ public partial class CoreConfigSingboxService(CoreConfigContext context)
 
             foreach (var it in selecteds)
             {
-                if (!(Global.SingboxSupportConfigType.Contains(it.ConfigType) || it.ConfigType.IsGroupType()))
+                if (!(Global.SingboxSupportConfigType.Contains(it.ConfigType) || it.ConfigType.IsGroupType() || it.ConfigType is EConfigType.Outbound))
                 {
                     continue;
                 }
@@ -174,7 +171,7 @@ public partial class CoreConfigSingboxService(CoreConfigContext context)
             ApplyOutboundBindInterface();
             ApplyOutboundSendThrough();
             ret.Success = true;
-            ret.Data = JsonUtils.Serialize(_coreConfig);
+            ret.Data = ApplyCustomOutboundReplace();
             return ret;
         }
         catch (Exception ex)
@@ -236,7 +233,7 @@ public partial class CoreConfigSingboxService(CoreConfigContext context)
 
             ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
             ret.Success = true;
-            ret.Data = JsonUtils.Serialize(_coreConfig);
+            ret.Data = ApplyCustomOutboundReplace();
             return ret;
         }
         catch (Exception ex)

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

@@ -2,54 +2,138 @@ namespace ServiceLib.Services.CoreConfig;
 
 public partial class CoreConfigSingboxService
 {
-    private string ApplyFullConfigTemplate()
+    private string ApplyFinalConfigModifiers()
+    {
+        ApplyOutboundBindInterface();
+        ApplyOutboundSendThrough();
+
+        var coreConfigContent = ApplyCustomOutboundReplace();
+
+        return ApplyFullConfigTemplate(coreConfigContent);
+    }
+
+    private string ApplyCustomOutboundReplace()
+    {
+        var coreConfigContent = JsonUtils.Serialize(_coreConfig);
+        if (context.CustomOutboundMap.Count == 0)
+        {
+            return coreConfigContent;
+        }
+        var coreConfigNode = JsonNode.Parse(coreConfigContent) as JsonObject;
+        var coreConfigOutboundsNode = coreConfigNode?["outbounds"] as JsonArray ?? [];
+        ReplaceCustomOutbounds(_coreConfig.outbounds, coreConfigOutboundsNode);
+        coreConfigNode!["outbounds"] = coreConfigOutboundsNode;
+        var coreConfigEndpointsNode = coreConfigNode?["endpoints"] as JsonArray ?? [];
+        ReplaceCustomOutbounds(_coreConfig.endpoints, coreConfigEndpointsNode);
+        if (coreConfigEndpointsNode.Count > 0)
+        {
+            coreConfigNode!["endpoints"] = coreConfigEndpointsNode;
+        }
+        else
+        {
+            coreConfigNode?.Remove("endpoints");
+        }
+        return JsonUtils.Serialize(coreConfigNode);
+
+        void ReplaceCustomOutbounds(IReadOnlyList<BaseServer4Sbox>? source, JsonArray jsonArrayOutbounds)
+        {
+            foreach (var outbound in source ?? [])
+            {
+                if (!context.CustomOutboundMap.TryGetValue(outbound, out var customOutboundIndex))
+                {
+                    continue;
+                }
+                var outboundTag = outbound.tag;
+                var outboundDetour = outbound.detour ?? string.Empty;
+                var outboundBindInterface = outbound.bind_interface ?? string.Empty;
+                var customOutboundContent = context.CustomOutboundContent[customOutboundIndex];
+                var containTagPlaceholder = customOutboundContent.Contains("{{tag}}");
+                var containDetourPlaceholder = customOutboundContent.Contains("{{detour}}");
+                var containBindInterfacePlaceholder = customOutboundContent.Contains("{{interface}}");
+                customOutboundContent = customOutboundContent.Replace("{{tag}}", outboundTag);
+                customOutboundContent = customOutboundContent.Replace("{{detour}}", outboundDetour);
+                customOutboundContent = customOutboundContent.Replace("{{interface}}", outboundBindInterface);
+                var customOutboundObj = JsonUtils.ParseJson(customOutboundContent) as JsonObject;
+
+                if (!containTagPlaceholder)
+                {
+                    customOutboundObj?["tag"] = outboundTag;
+                }
+                if (!containDetourPlaceholder && !outboundDetour.IsNullOrEmpty())
+                {
+                    customOutboundObj?["detour"] = outboundDetour;
+                }
+                else if (outboundDetour.IsNullOrEmpty())
+                {
+                    customOutboundObj?.Remove("detour");
+                }
+                if (!containBindInterfacePlaceholder && !outboundBindInterface.IsNullOrEmpty())
+                {
+                    customOutboundObj?["bind_interface"] = outboundBindInterface;
+                }
+
+                var index = jsonArrayOutbounds
+                    .Select((node, idx) => new { node, idx })
+                    .FirstOrDefault(x => x.node?["tag"]?.ToString() == outboundTag)?.idx ?? -1;
+                if (index != -1)
+                {
+                    jsonArrayOutbounds[index] = customOutboundObj;
+                }
+            }
+        }
+    }
+
+    private string ApplyFullConfigTemplate(string coreConfigContent)
     {
         var fullConfigTemplate = context.FullConfigTemplate;
         if (fullConfigTemplate is not { Enabled: true })
         {
-            return JsonUtils.Serialize(_coreConfig);
+            return coreConfigContent;
         }
 
         var fullConfigTemplateItem = context.IsTunEnabled ? fullConfigTemplate.TunConfig : fullConfigTemplate.Config;
         if (fullConfigTemplateItem.IsNullOrEmpty())
         {
-            return JsonUtils.Serialize(_coreConfig);
+            return coreConfigContent;
         }
 
         var fullConfigTemplateNode = JsonNode.Parse(fullConfigTemplateItem);
         if (fullConfigTemplateNode == null)
         {
-            return JsonUtils.Serialize(_coreConfig);
+            return coreConfigContent;
         }
 
         // Process outbounds
         var customOutboundsNode = fullConfigTemplateNode["outbounds"] as JsonArray ?? [];
-        foreach (var outbound in _coreConfig.outbounds)
+        var coreConfigNode = JsonNode.Parse(coreConfigContent);
+        var coreConfigOutboundsNode = coreConfigNode?["outbounds"] as JsonArray ?? [];
+        foreach (var outbound in coreConfigOutboundsNode)
         {
-            if (outbound.type.ToLower() is "direct" or "block")
+            if (outbound["type"]?.ToString()?.ToLower() is "direct" or "block")
             {
                 if (fullConfigTemplate.AddProxyOnly == true)
                 {
                     continue;
                 }
             }
-            else if (outbound.detour.IsNullOrEmpty() && !fullConfigTemplate.ProxyDetour.IsNullOrEmpty() && !Utils.IsPrivateNetwork(outbound.server ?? string.Empty))
+            if (outbound["detour"] is null && !fullConfigTemplate.ProxyDetour.IsNullOrEmpty() && !Utils.IsPrivateNetwork(outbound["server"]?.ToString() ?? string.Empty))
             {
-                outbound.detour = fullConfigTemplate.ProxyDetour;
+                outbound["detour"] = fullConfigTemplate.ProxyDetour;
             }
             customOutboundsNode.Add(JsonUtils.DeepCopy(outbound));
         }
         fullConfigTemplateNode["outbounds"] = customOutboundsNode;
 
         // Process endpoints
-        if (_coreConfig.endpoints is { Count: > 0 })
+        var coreConfigEndpointsNode = coreConfigNode?["endpoints"] as JsonArray ?? [];
+        if (coreConfigEndpointsNode is { Count: > 0 })
         {
             var customEndpointsNode = fullConfigTemplateNode["endpoints"] as JsonArray ?? [];
-            foreach (var endpoint in _coreConfig.endpoints)
+            foreach (var endpoint in coreConfigEndpointsNode)
             {
-                if (endpoint.detour.IsNullOrEmpty() && !fullConfigTemplate.ProxyDetour.IsNullOrEmpty())
+                if (endpoint["detour"] is null && !fullConfigTemplate.ProxyDetour.IsNullOrEmpty())
                 {
-                    endpoint.detour = fullConfigTemplate.ProxyDetour;
+                    endpoint["detour"] = fullConfigTemplate.ProxyDetour;
                 }
                 customEndpointsNode.Add(JsonUtils.DeepCopy(endpoint));
             }

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 expectedIPCidr = new HashSet<string>();
-        var expectedIPsRegions = new List<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/SingboxInboundService.cs

@@ -21,26 +21,27 @@ public partial class CoreConfigSingboxService
                 };
                 _coreConfig.inbounds.Add(inbound);
 
+                var inboundConf = _config.Inbound.First();
                 inbound.listen_port = listenPort;
 
-                if (_config.Inbound.First().SecondLocalPortEnabled)
+                if (inboundConf.SecondLocalPortEnabled)
                 {
                     var inbound2 = BuildInbound(inbound, EInboundProtocol.socks2, true);
                     _coreConfig.inbounds.Add(inbound2);
                 }
 
-                if (_config.Inbound.First().AllowLANConn)
+                if (inboundConf.AllowLANConn)
                 {
-                    if (_config.Inbound.First().NewPort4LAN)
+                    if (inboundConf.NewPort4LAN)
                     {
                         var inbound3 = BuildInbound(inbound, EInboundProtocol.socks3, true);
                         inbound3.listen = listen;
                         _coreConfig.inbounds.Add(inbound3);
 
                         //auth
-                        if (_config.Inbound.First().User.IsNotEmpty() && _config.Inbound.First().Pass.IsNotEmpty())
+                        if (inboundConf.User.IsNotEmpty() && inboundConf.Pass.IsNotEmpty())
                         {
-                            inbound3.users = new() { new() { username = _config.Inbound.First().User, password = _config.Inbound.First().Pass } };
+                            inbound3.users = new() { new() { username = inboundConf.User, password = inboundConf.Pass } };
                         }
                     }
                     else

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

@@ -11,7 +11,7 @@ public partial class CoreConfigSingboxService
     private List<BaseServer4Sbox> BuildAllProxyOutbounds(string baseTagName = Global.ProxyTag, bool withSelector = true)
     {
         var proxyOutboundList = new List<BaseServer4Sbox>();
-        if (!_node.ConfigType.IsComplexType())
+        if (!_node.ConfigType.IsGroupType())
         {
             var outbound = BuildProxyOutbound(baseTagName);
             proxyOutboundList.Add(outbound);
@@ -35,6 +35,10 @@ public partial class CoreConfigSingboxService
     {
         var outbound = BuildProxyServer();
         outbound.tag = baseTagName;
+        if (_node.ConfigType == EConfigType.Outbound)
+        {
+            context.CustomOutboundMap[outbound] = _node.IndexId;
+        }
         return outbound;
     }
 
@@ -59,6 +63,20 @@ public partial class CoreConfigSingboxService
         try
         {
             var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
+            if (_node.ConfigType == EConfigType.Outbound)
+            {
+                if (_node.GetProtocolExtra().IsSingboxEndpoint == true)
+                {
+                    var endpoint = JsonUtils.Deserialize<Endpoints4Sbox>(txtOutbound);
+                    return endpoint;
+                }
+                else
+                {
+                    var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                    return outbound;
+                }
+            }
+
             if (_node.ConfigType == EConfigType.WireGuard)
             {
                 var endpoint = JsonUtils.Deserialize<Endpoints4Sbox>(txtOutbound);
@@ -593,7 +611,7 @@ public partial class CoreConfigSingboxService
         {
             type = "selector",
             tag = baseTagName,
-            outbounds = JsonUtils.DeepCopy(proxyTags),
+            outbounds = [.. proxyTags],
             interrupt_exist_connections = false,
         };
         outSelector.outbounds.Insert(0, outUrltest.tag);
@@ -721,9 +739,9 @@ public partial class CoreConfigSingboxService
         return resultOutbounds;
     }
 
-    private static List<BaseServer4Sbox> CloneOutbounds(List<BaseServer4Sbox> source)
+    private List<BaseServer4Sbox> CloneOutbounds(List<BaseServer4Sbox> source)
     {
-        if (source is null || source.Count == 0)
+        if (source is not { Count: > 0 })
         {
             return [];
         }
@@ -740,9 +758,14 @@ public partial class CoreConfigSingboxService
             {
                 clone = JsonUtils.DeepCopy(endpoint);
             }
-            if (clone is not null)
+            if (clone is null)
             {
-                result.Add(clone);
+                continue;
+            }
+            result.Add(clone);
+            if (context.CustomOutboundMap.ContainsKey(item))
+            {
+                context.CustomOutboundMap[clone] = context.CustomOutboundMap[item];
             }
         }
         return result;

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

@@ -43,6 +43,28 @@ public partial class CoreConfigSingboxService
                     _coreConfig.route.rules.AddRange(tunRules);
                 }
 
+                // 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 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.Select(ToSingleAddressPrefix)],
+                        action = "reject",
+                        method = "drop",
+                    });
+                }
+
                 var lstDirectExe = BuildRoutingDirectExe();
                 if (lstDirectExe.Count > 0)
                 {
@@ -268,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);
@@ -558,7 +588,8 @@ public partial class CoreConfigSingboxService
 
         if (node == null
             || (!Global.SingboxSupportConfigType.Contains(node.ConfigType)
-            && !node.ConfigType.IsGroupType()))
+            && !node.ConfigType.IsGroupType()
+            && node.ConfigType is not EConfigType.Outbound))
         {
             return Global.ProxyTag;
         }

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

@@ -64,8 +64,6 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
             {
                 ApplyFinalFragment();
             }
-            ApplyOutboundBindInterface();
-            ApplyOutboundSendThrough();
 
             var finalRule = BuildFinalRule();
             if (!string.IsNullOrEmpty(finalRule?.balancerTag))
@@ -75,7 +73,7 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
 
             ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
             ret.Success = true;
-            ret.Data = ApplyFullConfigTemplate();
+            ret.Data = ApplyFinalConfigModifiers();
             return ret;
         }
         catch (Exception ex)
@@ -119,7 +117,7 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
 
             foreach (var it in selecteds)
             {
-                if (!(Global.XraySupportConfigType.Contains(it.ConfigType) || it.ConfigType.IsGroupType()))
+                if (!(Global.XraySupportConfigType.Contains(it.ConfigType) || it.ConfigType.IsGroupType() || it.ConfigType is EConfigType.Outbound))
                 {
                     continue;
                 }
@@ -216,7 +214,7 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
             ApplyOutboundSendThrough();
             //ret.Msg =string.Format(ResUI.SuccessfulConfiguration"), node.getSummary());
             ret.Success = true;
-            ret.Data = JsonUtils.Serialize(_coreConfig);
+            ret.Data = ApplyCustomOutboundReplace();
             return ret;
         }
         catch (Exception ex)
@@ -293,7 +291,7 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
 
             ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
             ret.Success = true;
-            ret.Data = JsonUtils.Serialize(_coreConfig);
+            ret.Data = ApplyCustomOutboundReplace();
             return ret;
         }
         catch (Exception ex)

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

@@ -2,24 +2,105 @@ namespace ServiceLib.Services.CoreConfig;
 
 public partial class CoreConfigV2rayService
 {
-    private string ApplyFullConfigTemplate()
+    private string ApplyFinalConfigModifiers()
+    {
+        ApplyOutboundBindInterface();
+        ApplyOutboundSendThrough();
+
+        var coreConfigContent = ApplyCustomOutboundReplace();
+
+        return ApplyFullConfigTemplate(coreConfigContent);
+    }
+
+    private string ApplyCustomOutboundReplace()
+    {
+        var coreConfigContent = JsonUtils.Serialize(_coreConfig);
+        if (context.CustomOutboundMap.Count == 0)
+        {
+            return coreConfigContent;
+        }
+        var coreConfigNode = JsonNode.Parse(coreConfigContent) as JsonObject;
+        var coreConfigOutboundsNode = coreConfigNode?["outbounds"] as JsonArray ?? [];
+
+        foreach (var outbound in _coreConfig.outbounds ?? [])
+        {
+            if (!context.CustomOutboundMap.TryGetValue(outbound, out var customOutboundIndex))
+            {
+                continue;
+            }
+            var outboundTag = outbound.tag;
+            var outboundDetour = outbound.streamSettings?.sockopt?.dialerProxy ?? string.Empty;
+            var outboundBindInterface = outbound.streamSettings?.sockopt?.Interface ?? string.Empty;
+            var customOutboundContent = context.CustomOutboundContent[customOutboundIndex];
+            var containTagPlaceholder = customOutboundContent.Contains("{{tag}}");
+            var containDetourPlaceholder = customOutboundContent.Contains("{{detour}}");
+            var containBindInterfacePlaceholder = customOutboundContent.Contains("{{interface}}");
+            customOutboundContent = customOutboundContent.Replace("{{tag}}", outboundTag);
+            customOutboundContent = customOutboundContent.Replace("{{detour}}", outboundDetour);
+            customOutboundContent = customOutboundContent.Replace("{{interface}}", outboundBindInterface);
+            var customOutboundObj = JsonUtils.ParseJson(customOutboundContent) as JsonObject;
+
+            if (!containTagPlaceholder)
+            {
+                customOutboundObj?["tag"] = outboundTag;
+            }
+            if (!containDetourPlaceholder && !outboundDetour.IsNullOrEmpty())
+            {
+                customOutboundObj!["streamSettings"] ??= new JsonObject();
+                customOutboundObj["streamSettings"]["sockopt"] ??= new JsonObject();
+                customOutboundObj["streamSettings"]["sockopt"]["dialerProxy"] = outboundDetour;
+                if (customOutboundObj["streamSettings"]?["xhttpSettings"]?["extra"]?["downloadSettings"] is JsonObject downloadSettings)
+                {
+                    downloadSettings["sockopt"] ??= new JsonObject();
+                    downloadSettings["sockopt"]["dialerProxy"] = outboundDetour;
+                }
+            }
+            else if (outboundDetour.IsNullOrEmpty())
+            {
+                (customOutboundObj?["streamSettings"]?["sockopt"] as JsonObject)?.Remove("dialerProxy");
+            }
+            if (!containBindInterfacePlaceholder && !outboundBindInterface.IsNullOrEmpty())
+            {
+                customOutboundObj!["streamSettings"] ??= new JsonObject();
+                customOutboundObj["streamSettings"]["sockopt"] ??= new JsonObject();
+                customOutboundObj["streamSettings"]["sockopt"]["interface"] = outboundBindInterface;
+                if (customOutboundObj["streamSettings"]?["xhttpSettings"]?["extra"]?["downloadSettings"] is JsonObject downloadSettings)
+                {
+                    downloadSettings["sockopt"] ??= new JsonObject();
+                    downloadSettings["sockopt"]["interface"] = outboundBindInterface;
+                }
+            }
+
+            var index = coreConfigOutboundsNode
+                .Select((node, idx) => new { node, idx })
+                .FirstOrDefault(x => x.node?["tag"]?.ToString() == outboundTag)?.idx ?? -1;
+            if (index != -1)
+            {
+                coreConfigOutboundsNode[index] = customOutboundObj;
+            }
+        }
+
+        return JsonUtils.Serialize(coreConfigNode);
+    }
+
+    private string ApplyFullConfigTemplate(string coreConfigContent)
     {
         var fullConfigTemplate = context.FullConfigTemplate;
         if (fullConfigTemplate is not { Enabled: true })
         {
-            return JsonUtils.Serialize(_coreConfig);
+            return coreConfigContent;
         }
 
         var fullConfigTemplateItem = context.IsTunEnabled ? fullConfigTemplate.TunConfig : fullConfigTemplate.Config;
         if (fullConfigTemplateItem.IsNullOrEmpty())
         {
-            return JsonUtils.Serialize(_coreConfig);
+            return coreConfigContent;
         }
 
         var fullConfigTemplateNode = JsonNode.Parse(fullConfigTemplateItem);
         if (fullConfigTemplateNode == null)
         {
-            return JsonUtils.Serialize(_coreConfig);
+            return coreConfigContent;
         }
 
         // Handle balancer and rules modifications (for multiple load scenarios)
@@ -74,8 +155,8 @@ public partial class CoreConfigV2rayService
             else
             {
                 var subjectSelector = _coreConfig.observatory.subjectSelector;
-                subjectSelector.AddRange(fullConfigTemplateNode["observatory"]?["subjectSelector"]?.AsArray()?.Select(x => x?.GetValue<string>()) ?? []);
+                subjectSelector?.AddRange(fullConfigTemplateNode["observatory"]?["subjectSelector"]?.AsArray()?.Select(x => x?.GetValue<string>()) ?? []);
-                fullConfigTemplateNode["observatory"]["subjectSelector"] = JsonNode.Parse(JsonUtils.Serialize(subjectSelector.Distinct().ToList()));
+                fullConfigTemplateNode["observatory"]?["subjectSelector"] = JsonNode.Parse(JsonUtils.Serialize(subjectSelector?.Distinct().ToList()));
             }
         }
 
@@ -88,16 +169,18 @@ public partial class CoreConfigV2rayService
             else
             {
                 var subjectSelector = _coreConfig.burstObservatory.subjectSelector;
-                subjectSelector.AddRange(fullConfigTemplateNode["burstObservatory"]?["subjectSelector"]?.AsArray()?.Select(x => x?.GetValue<string>()) ?? []);
+                subjectSelector?.AddRange(fullConfigTemplateNode["burstObservatory"]?["subjectSelector"]?.AsArray()?.Select(x => x?.GetValue<string>()) ?? []);
-                fullConfigTemplateNode["burstObservatory"]["subjectSelector"] = JsonNode.Parse(JsonUtils.Serialize(subjectSelector.Distinct().ToList()));
+                fullConfigTemplateNode["burstObservatory"]?["subjectSelector"] = JsonNode.Parse(JsonUtils.Serialize(subjectSelector?.Distinct().ToList()));
             }
         }
 
         var customOutboundsNode = new JsonArray();
 
-        foreach (var outbound in _coreConfig.outbounds)
+        var coreConfigNode = JsonNode.Parse(coreConfigContent);
+        var coreConfigOutboundsNode = coreConfigNode?["outbounds"] as JsonArray ?? [];
+        foreach (var outbound in coreConfigOutboundsNode)
         {
-            if (outbound.protocol.ToLower() is "blackhole" or "dns" or "freedom")
+            if (outbound?["protocol"]?.ToString()?.ToLower() is "blackhole" or "dns" or "freedom")
             {
                 if (fullConfigTemplate.AddProxyOnly == true)
                 {
@@ -105,14 +188,22 @@ public partial class CoreConfigV2rayService
                 }
             }
             else if (!fullConfigTemplate.ProxyDetour.IsNullOrEmpty()
-                && (outbound.streamSettings?.sockopt?.dialerProxy.IsNullOrEmpty() ?? true))
+                && (outbound["streamSettings"]?["sockopt"]?["dialerProxy"].ToString().IsNullOrEmpty() ?? true))
             {
-                var outboundAddress = outbound.settings?.servers?.FirstOrDefault()?.address
+                var outboundAddress = outbound["settings"]?["servers"]?.AsArray()?.FirstOrDefault()?["address"]?.ToString()
-                    ?? outbound.settings?.vnext?.FirstOrDefault()?.address
+                    ?? outbound["settings"]?["vnext"]?.AsArray()?.FirstOrDefault()?["address"]?.ToString()
                     ?? string.Empty;
                 if (!Utils.IsPrivateNetwork(outboundAddress))
                 {
-                    FillDialerProxy(outbound, fullConfigTemplate.ProxyDetour);
+                    //FillDialerProxy(outbound, fullConfigTemplate.ProxyDetour);
+                    outbound["streamSettings"] ??= new JsonObject();
+                    outbound["streamSettings"]["sockopt"] ??= new JsonObject();
+                    outbound["streamSettings"]["sockopt"]["dialerProxy"] = fullConfigTemplate.ProxyDetour;
+                    if (outbound["streamSettings"]?["xhttpSettings"]?["extra"]?["downloadSettings"] is JsonObject downloadSettings)
+                    {
+                        downloadSettings["sockopt"] ??= new JsonObject();
+                        downloadSettings["sockopt"]["dialerProxy"] = fullConfigTemplate.ProxyDetour;
+                    }
                 }
             }
             customOutboundsNode.Add(JsonUtils.DeepCopy(outbound));

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 directDomainList = new HashSet<string>();
-        var directGeositeList = new List<string>();
+        var directGeositeList = new HashSet<string>();
-        var proxyDomainList = new List<string>();
+        var proxyDomainList = new HashSet<string>();
-        var proxyGeositeList = new List<string>();
+        var proxyGeositeList = new HashSet<string>();
-        var expectedDomainList = new List<string>();
+        var expectedDomainList = new HashSet<string>();
-        var expectedIPs = new List<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,
+                domains = domains.Count > 0 ? domains.ToList() : null,
-                expectedIPs = expectedIPs?.Count > 0 ? expectedIPs : 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

@@ -9,37 +9,38 @@ public partial class CoreConfigV2rayService
             var listen = "0.0.0.0";
             var listenPort = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
             _coreConfig.inbounds = [];
-            var inbound = BuildInbound(_config.Inbound.First(), EInboundProtocol.socks, true);
+            var inboundConf = _config.Inbound.First();
+            var inbound = BuildInbound(inboundConf, EInboundProtocol.socks, true);
             var isUsingLocalMixedPort = _node.Address == Global.Loopback && _node.Port == listenPort;
 
             if (!context.IsTunEnabled || !isUsingLocalMixedPort)
             {
                 _coreConfig.inbounds.Add(inbound);
 
-                if (_config.Inbound.First().SecondLocalPortEnabled)
+                if (inboundConf.SecondLocalPortEnabled)
                 {
-                    var inbound2 = BuildInbound(_config.Inbound.First(), EInboundProtocol.socks2, true);
+                    var inbound2 = BuildInbound(inboundConf, EInboundProtocol.socks2, true);
                     _coreConfig.inbounds.Add(inbound2);
                 }
 
-                if (_config.Inbound.First().AllowLANConn)
+                if (inboundConf.AllowLANConn)
                 {
-                    if (_config.Inbound.First().NewPort4LAN)
+                    if (inboundConf.NewPort4LAN)
                     {
-                        var inbound3 = BuildInbound(_config.Inbound.First(), EInboundProtocol.socks3, true);
+                        var inbound3 = BuildInbound(inboundConf, EInboundProtocol.socks3, true);
                         inbound3.listen = listen;
                         _coreConfig.inbounds.Add(inbound3);
 
                         // auth
-                        if (_config.Inbound.First().User.IsNotEmpty() && _config.Inbound.First().Pass.IsNotEmpty())
+                        if (inboundConf.User.IsNotEmpty() && inboundConf.Pass.IsNotEmpty())
                         {
                             inbound3.settings.auth = "password";
                             inbound3.settings.accounts =
                             [
                                 new()
                                 {
-                                    user = _config.Inbound.First().User,
+                                    user = inboundConf.User,
-                                    pass = _config.Inbound.First().Pass,
+                                    pass = inboundConf.Pass,
                                 },
 
                             ];
@@ -66,20 +67,23 @@ 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();
                 if (!bindInterface.IsNullOrEmpty())
                 {
                     tunInbound.settings.autoOutboundsInterface = bindInterface;
                 }
                 tunInbound.sniffing = inbound.sniffing;
+                // tunInbound.sniffing.routeOnly = inbound.sniffing.routeOnly;
                 tunInbound.sniffing.routeOnly = true;
 
                 if (_config.TunModeItem.RouteExcludeAddress is { Count: > 0 })
@@ -117,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();
-                        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();
-                    }
                 }
 
                 _coreConfig.inbounds.Add(tunInbound);

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

@@ -52,6 +52,12 @@ public partial class CoreConfigV2rayService
     {
         var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
         var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
+        if (_node.ConfigType == EConfigType.Outbound)
+        {
+            outbound.tag = baseTagName;
+            context.CustomOutboundMap[outbound] = _node.IndexId;
+            return outbound;
+        }
         FillOutbound(outbound);
         outbound.tag = baseTagName;
         return outbound;
@@ -291,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;
@@ -404,7 +411,6 @@ public partial class CoreConfigV2rayService
 
                 TlsSettings4Ray tlsSettings = new()
                 {
-                    allowInsecure = _node.GetAllowInsecure(),
                     alpn = _node.GetAlpn(),
                     fingerprint = _node.Fingerprint.IsNullOrEmpty() ? _config.CoreBasicItem.DefFingerprint : _node.Fingerprint,
                     echConfigList = _node.EchConfigList.NullIfEmpty(),
@@ -438,12 +444,10 @@ public partial class CoreConfigV2rayService
                     }
                     tlsSettings.certificates = certsettings;
                     tlsSettings.disableSystemRoot = true;
-                    tlsSettings.allowInsecure = false;
                 }
                 else if (!_node.CertSha.IsNullOrEmpty())
                 {
                     tlsSettings.pinnedPeerCertSha256 = _node.CertSha;
-                    tlsSettings.allowInsecure = false;
                 }
                 streamSettings.tlsSettings = tlsSettings;
             }
@@ -509,6 +513,7 @@ public partial class CoreConfigV2rayService
                             settings = new MaskSettings4Ray { value = kcpSeed },
                         });
                     }
+                    kcpFinalmask.udp?.Reverse();
                     streamSettings.kcpSettings = kcpSettings;
                     streamSettings.finalmask = kcpFinalmask;
                     break;
@@ -663,6 +668,7 @@ public partial class CoreConfigV2rayService
                         version = 2,
                         auth = _node.Password,
                     };
+                    hy2Finalmask.udp?.Reverse();
                     streamSettings.finalmask = hy2Finalmask;
                     break;
 
@@ -788,12 +794,12 @@ public partial class CoreConfigV2rayService
                     }
                     else if (chainStartNodes.Count > 1)
                     {
-                        var existedChainNodes = JsonUtils.DeepCopy(resultOutbounds);
+                        var existedChainNodes = CloneOutbounds(resultOutbounds);
                         resultOutbounds.Clear();
                         var j = 0;
                         foreach (var chainStartNode in chainStartNodes)
                         {
-                            var existedChainNodesClone = JsonUtils.DeepCopy(existedChainNodes);
+                            var existedChainNodesClone = CloneOutbounds(existedChainNodes);
                             foreach (var existedChainNode in existedChainNodesClone)
                             {
                                 var cloneTag = $"{existedChainNode.tag}-clone-{j + 1}";
@@ -955,4 +961,19 @@ public partial class CoreConfigV2rayService
 
         return fragmentMask;
     }
+
+    private List<Outbounds4Ray> CloneOutbounds(List<Outbounds4Ray> outbounds)
+    {
+        var clonedOutbounds = new List<Outbounds4Ray>();
+        foreach (var outbound in outbounds)
+        {
+            var clonedOutbound = JsonUtils.DeepCopy(outbound);
+            clonedOutbounds.Add(clonedOutbound);
+            if (context.CustomOutboundMap.ContainsKey(outbound))
+            {
+                context.CustomOutboundMap[clonedOutbound] = context.CustomOutboundMap[outbound];
+            }
+        }
+        return clonedOutbounds;
+    }
 }

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

@@ -188,7 +188,8 @@ public partial class CoreConfigV2rayService
 
         if (node == null
             || (!Global.XraySupportConfigType.Contains(node.ConfigType)
-            && !node.ConfigType.IsGroupType()))
+            && !node.ConfigType.IsGroupType()
+            && node.ConfigType is not EConfigType.Outbound))
         {
             return Global.ProxyTag;
         }

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}"));
+            UpdateCompleted?.Invoke(this, new UpdateResult(false, $"{ResUI.Downloading}   {request.FileUrl}"));
-
-            var progress = new Progress<double>();
-            progress.ProgressChanged += (sender, value) => UpdateCompleted?.Invoke(this, new UpdateResult(value > 100, $"...{value}%"));
 
             var webProxy = await GetWebProxy(blProxy);
             await DownloaderHelper.Instance.DownloadFileAsync(webProxy,
-                url,
+                request,
-                fileName,
+                OnProgress,
-                progress,
+                connectTimeout);
-                downloadTimeout);
+
+            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();
+        var requests = new List<FileDownloadRequest>();
-        await UpdateOtherFiles();
+        requests.AddRange(GetGeoFilesRequest());
-        await UpdateSrsFileAll();
+        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)
+        return
-        {
+        [
-            var fileName = $"{geoName}.dat";
+            .. from geoName in files
-            var targetPath = Utils.GetBinPath($"{fileName}");
+            let fileName = $"{geoName}.dat"
-            var url = string.Format(geoUrl, geoName);
+            let targetPath = Utils.GetBinPath($"{fileName}")
-
+            let url = string.Format(geoUrl, geoName)
-            await DownloadGeoFile(url, fileName, targetPath);
+            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)
+        return
-        {
+        [
-            var fileName = Path.GetFileName(url);
+            .. Global.OtherGeoUrls.Select(url =>
-            var targetPath = Utils.GetBinPath($"{fileName}");
+            {
-
+                var fileName = Path.GetFileName(url);
-            await DownloadGeoFile(url, fileName, targetPath);
+                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())
+        return
-        {
+        [
-            await UpdateSrsFile("geoip", item);
+            .. geoipFiles.Distinct().Select(f => (type: "geoip", file: f))
-        }
+                .Concat(geoSiteFiles.Distinct().Select(f => (type: "geosite", file: f)))
-
+                .Select(item => GetSrsFileRequest(item.type, item.file)),
-        foreach (var item in geoSiteFiles.Distinct())
+        ];
-        {
-            await UpdateSrsFile("geosite", item);
-        }
     }
 
     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);
+                        //    File.Delete(tmpFileName);
-                        //await    UpdateFunc(true, "");
+                        //    //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/AddGroupServerViewModel.cs

@@ -1,45 +1,45 @@
 namespace ServiceLib.ViewModels;
 
-public class AddGroupServerViewModel : MyReactiveObject, ICloseable
+public partial class AddGroupServerViewModel : MyReactiveObject, ICloseable
 {
     public event EventHandler? RequestClose;
 
     [Reactive]
-    public ProfileItem SelectedSource { get; set; }
+    public partial ProfileItem SelectedSource { get; set; }
 
     [Reactive]
-    public ProfileItem SelectedChild { get; set; }
+    public partial ProfileItem SelectedChild { get; set; }
 
     [Reactive]
-    public IList<ProfileItem> SelectedChildren { get; set; }
+    public partial IList<ProfileItem> SelectedChildren { get; set; }
 
     [Reactive]
-    public string? CoreType { get; set; }
+    public partial string? CoreType { get; set; }
 
     [Reactive]
-    public string? PolicyGroupType { get; set; }
+    public partial string? PolicyGroupType { get; set; }
 
     [Reactive]
-    public SubItem? SelectedSubItem { get; set; }
+    public partial SubItem? SelectedSubItem { get; set; }
 
     [Reactive]
-    public string? Filter { get; set; }
+    public partial string? Filter { get; set; }
 
-    public IObservableCollection<SubItem> SubItems { get; } = new ObservableCollectionExtended<SubItem>();
+    public BulkObservableCollection<SubItem> SubItems { get; } = [];
 
-    public IObservableCollection<ProfileItem> ChildItemsObs { get; } = new ObservableCollectionExtended<ProfileItem>();
+    public BulkObservableCollection<ProfileItem> ChildItemsObs { get; } = [];
 
-    public IObservableCollection<ProfileItem> AllProfilePreviewItemsObs { get; } = new ObservableCollectionExtended<ProfileItem>();
+    public BulkObservableCollection<ProfileItem> AllProfilePreviewItemsObs { get; } = [];
 
-    public ReactiveCommand<Unit, Unit> AddCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddCmd { get; }
-    public ReactiveCommand<Unit, Unit> RemoveCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> RemoveCmd { get; }
 
-    public ReactiveCommand<Unit, Unit> MoveTopCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> MoveTopCmd { get; }
-    public ReactiveCommand<Unit, Unit> MoveUpCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> MoveUpCmd { get; }
-    public ReactiveCommand<Unit, Unit> MoveDownCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> MoveDownCmd { get; }
-    public ReactiveCommand<Unit, Unit> MoveBottomCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> MoveBottomCmd { get; }
 
-    public ReactiveCommand<Unit, Unit> SaveCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> SaveCmd { get; }
 
     public AddGroupServerViewModel(ProfileItem profileItem)
     {

v2rayN/ServiceLib/ViewModels/AddServer2ViewModel.cs

@@ -1,20 +1,23 @@
 namespace ServiceLib.ViewModels;
 
-public class AddServer2ViewModel : MyReactiveObject, ICloseable
+public partial class AddServer2ViewModel : MyReactiveObject, ICloseable
 {
     public event EventHandler? RequestClose;
 
-    public Interaction<Unit, string?> BrowseConfigFileInteraction { get; } = new();
+    public Interaction<RxVoid, string?> BrowseConfigFileInteraction { get; } = new();
 
     [Reactive]
-    public ProfileItem SelectedSource { get; set; }
+    public partial ProfileItem SelectedSource { get; set; }
 
     [Reactive]
-    public string? CoreType { get; set; }
+    public partial string? CoreType { get; set; }
 
-    public ReactiveCommand<Unit, Unit> BrowseServerCmd { get; }
+    [Reactive]
-    public ReactiveCommand<Unit, Unit> EditServerCmd { get; }
+    public partial bool IsSingboxEndpoint { get; set; }
-    public ReactiveCommand<Unit, Unit> SaveServerCmd { get; }
+
+    public ReactiveCommand<RxVoid, RxVoid> BrowseServerCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> EditServerCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> SaveServerCmd { get; }
     public bool IsModified { get; set; }
 
     public AddServer2ViewModel(ProfileItem profileItem)
@@ -23,7 +26,7 @@ public class AddServer2ViewModel : MyReactiveObject, ICloseable
 
         BrowseServerCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            var fileName = await BrowseConfigFileInteraction.Handle(Unit.Default);
+            var fileName = await BrowseConfigFileInteraction.HandleSafe(RxVoid.Default);
             if (fileName.IsNullOrEmpty())
             {
                 return;
@@ -40,7 +43,10 @@ public class AddServer2ViewModel : MyReactiveObject, ICloseable
         });
 
         SelectedSource = profileItem.IndexId.IsNullOrEmpty() ? profileItem : JsonUtils.DeepCopy(profileItem);
-        CoreType = SelectedSource?.CoreType?.ToString();
+        var coreStr = SelectedSource?.CoreType?.ToString();
+        coreStr = coreStr.IsNullOrEmpty() ? Global.CoreTypes.FirstOrDefault() : coreStr;
+        CoreType = coreStr;
+        IsSingboxEndpoint = SelectedSource?.GetProtocolExtra()?.IsSingboxEndpoint ?? false;
     }
 
     private async Task SaveServerAsync()
@@ -58,6 +64,10 @@ public class AddServer2ViewModel : MyReactiveObject, ICloseable
             return;
         }
         SelectedSource.CoreType = CoreType.IsNullOrEmpty() ? null : Enum.Parse<ECoreType>(CoreType);
+        SelectedSource.SetProtocolExtra(SelectedSource?.GetProtocolExtra() with
+        {
+            IsSingboxEndpoint = IsSingboxEndpoint ? true : null,
+        });
 
         if (await ConfigHandler.EditCustomServer(_config, SelectedSource) == 0)
         {
@@ -80,7 +90,8 @@ public class AddServer2ViewModel : MyReactiveObject, ICloseable
         var item = await AppManager.Instance.GetProfileItem(SelectedSource.IndexId);
         item ??= SelectedSource;
         item.Address = fileName;
-        if (await ConfigHandler.AddCustomServer(_config, item, false) == 0)
+        var result = item.ConfigType == EConfigType.Outbound ? await ConfigHandler.AddCustomOutboundServer(_config, item, false) : await ConfigHandler.AddCustomServer(_config, item, false);
+        if (result == 0)
         {
             NoticeManager.Instance.Enqueue(ResUI.SuccessfullyImportedCustomServer);
             if (item.IndexId.IsNotEmpty())

v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs

@@ -1,131 +1,134 @@
 namespace ServiceLib.ViewModels;
 
-public class AddServerViewModel : MyReactiveObject, ICloseable
+public partial class AddServerViewModel : MyReactiveObject, ICloseable
 {
     public event EventHandler? RequestClose;
 
     [Reactive]
-    public ProfileItem SelectedSource { get; set; }
+    public partial ProfileItem SelectedSource { get; set; }
 
     [Reactive]
-    public string? CoreType { get; set; }
+    public partial string? CoreType { get; set; }
 
     [Reactive]
-    public bool AllowInsecure { get; set; }
+    public partial bool AllowInsecure { get; set; }
 
     [Reactive]
-    public bool MuxEnabled { get; set; }
+    public partial bool MuxEnabled { get; set; }
 
     [Reactive]
-    public string Cert { get; set; }
+    public partial string Cert { get; set; }
 
     [Reactive]
-    public string CertTip { get; set; }
+    public partial string CertTip { get; set; }
 
     [Reactive]
-    public string CertSha { get; set; }
+    public partial string CertSha { get; set; }
 
     [Reactive]
-    public string SalamanderPass { get; set; }
+    public partial string SalamanderPass { get; set; }
 
     [Reactive]
-    public int AlterId { get; set; }
+    public partial int AlterId { get; set; }
 
     [Reactive]
-    public string Ports { get; set; }
+    public partial string Ports { get; set; }
 
     [Reactive]
-    public int? UpMbps { get; set; }
+    public partial int? UpMbps { get; set; }
 
     [Reactive]
-    public int? DownMbps { get; set; }
+    public partial int? DownMbps { get; set; }
 
     [Reactive]
-    public string HopInterval { get; set; }
+    public partial string HopInterval { get; set; }
 
     [Reactive]
-    public string Flow { get; set; }
+    public partial string Flow { get; set; }
 
     [Reactive]
-    public string VmessSecurity { get; set; }
+    public partial string VmessSecurity { get; set; }
 
     [Reactive]
-    public string VlessEncryption { get; set; }
+    public partial string VlessEncryption { get; set; }
 
     [Reactive]
-    public string SsMethod { get; set; }
+    public partial string SsMethod { get; set; }
 
     [Reactive]
-    public string WgPublicKey { get; set; }
+    public partial string WgPublicKey { get; set; }
 
     [Reactive]
-    public string WgPresharedKey { get; set; }
+    public partial string WgPresharedKey { get; set; }
 
     [Reactive]
-    public string WgInterfaceAddress { get; set; }
+    public partial string WgInterfaceAddress { get; set; }
 
     [Reactive]
-    public string WgReserved { get; set; }
+    public partial string WgReserved { get; set; }
 
     [Reactive]
-    public int WgMtu { get; set; }
+    public partial int WgMtu { get; set; }
 
     [Reactive]
-    public bool Uot { get; set; }
+    public partial string WgDns { get; set; }
 
     [Reactive]
-    public string CongestionControl { get; set; }
+    public partial bool Uot { get; set; }
 
     [Reactive]
-    public int? InsecureConcurrency { get; set; }
+    public partial string CongestionControl { get; set; }
 
     [Reactive]
-    public bool NaiveQuic { get; set; }
+    public partial int? InsecureConcurrency { get; set; }
 
     [Reactive]
-    public string HttpHeadersJson { get; set; }
+    public partial bool NaiveQuic { get; set; }
 
     [Reactive]
-    public string Hy2RealmUrl { get; set; }
+    public partial string HttpHeadersJson { get; set; }
 
     [Reactive]
-    public int GeckoMinPacketSize { get; set; }
+    public partial string Hy2RealmUrl { get; set; }
 
     [Reactive]
-    public int GeckoMaxPacketSize { get; set; }
+    public partial int GeckoMinPacketSize { get; set; }
 
     [Reactive]
-    public string RawHeaderType { get; set; }
+    public partial int GeckoMaxPacketSize { get; set; }
 
     [Reactive]
-    public string Host { get; set; }
+    public partial string RawHeaderType { get; set; }
 
     [Reactive]
-    public string Path { get; set; }
+    public partial string Host { get; set; }
 
     [Reactive]
-    public string XhttpMode { get; set; }
+    public partial string Path { get; set; }
 
     [Reactive]
-    public string XhttpExtra { get; set; }
+    public partial string XhttpMode { get; set; }
 
     [Reactive]
-    public string GrpcAuthority { get; set; }
+    public partial string XhttpExtra { get; set; }
 
     [Reactive]
-    public string GrpcServiceName { get; set; }
+    public partial string GrpcAuthority { get; set; }
 
     [Reactive]
-    public string GrpcMode { get; set; }
+    public partial string GrpcServiceName { get; set; }
 
     [Reactive]
-    public string KcpHeaderType { get; set; }
+    public partial string GrpcMode { get; set; }
 
     [Reactive]
-    public string KcpSeed { get; set; }
+    public partial string KcpHeaderType { get; set; }
 
     [Reactive]
-    public int? KcpMtu { get; set; }
+    public partial string KcpSeed { get; set; }
+
+    [Reactive]
+    public partial int? KcpMtu { get; set; }
 
     public string TransportHeaderType
     {
@@ -239,9 +242,9 @@ public class AddServerViewModel : MyReactiveObject, ICloseable
         }
     }
 
-    public ReactiveCommand<Unit, Unit> FetchCertCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> FetchCertCmd { get; }
-    public ReactiveCommand<Unit, Unit> FetchCertChainCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> FetchCertChainCmd { get; }
-    public ReactiveCommand<Unit, Unit> SaveCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> SaveCmd { get; }
 
     public AddServerViewModel(ProfileItem profileItem)
     {
@@ -310,6 +313,7 @@ public 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 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/BackupAndRestoreViewModel.cs

@@ -1,19 +1,19 @@
 namespace ServiceLib.ViewModels;
 
-public class BackupAndRestoreViewModel : MyReactiveObject
+public partial class BackupAndRestoreViewModel : MyReactiveObject
 {
     private readonly string _guiConfigs = "guiConfigs";
     private static string BackupFileName => $"backup_{DateTime.Now:yyyyMMddHHmmss}.zip";
 
-    public ReactiveCommand<Unit, Unit> RemoteBackupCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> RemoteBackupCmd { get; }
-    public ReactiveCommand<Unit, Unit> RemoteRestoreCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> RemoteRestoreCmd { get; }
-    public ReactiveCommand<Unit, Unit> WebDavCheckCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> WebDavCheckCmd { get; }
 
     [Reactive]
-    public WebDavItem SelectedSource { get; set; }
+    public partial WebDavItem SelectedSource { get; set; }
 
     [Reactive]
-    public string OperationMsg { get; set; } = string.Empty;
+    public partial string OperationMsg { get; set; } = string.Empty;
 
     public BackupAndRestoreViewModel()
     {

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -1,18 +1,18 @@
 namespace ServiceLib.ViewModels;
 
-public class CheckUpdateViewModel : MyReactiveObject
+public partial class CheckUpdateViewModel : MyReactiveObject
 {
     private const string _geo = "GeoFiles";
     private readonly ECoreType _v2rayN = ECoreType.v2rayN;
     private List<CheckUpdateModel> _lstUpdated = [];
     private static readonly string _tag = "CheckUpdateViewModel";
 
-    public EventChannel<Unit> ReloadRequested { get; } = new();
+    public EventChannel<RxVoid> ReloadRequested { get; } = new();
 
-    public IObservableCollection<CheckUpdateModel> CheckUpdateModels { get; } = new ObservableCollectionExtended<CheckUpdateModel>();
+    public BulkObservableCollection<CheckUpdateModel> CheckUpdateModels { get; } = [];
-    public ReactiveCommand<Unit, Unit> CheckUpdateCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> CheckUpdateCmd { get; }
-    public ReactiveCommand<Unit, Unit> CheckOnlyCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> CheckOnlyCmd { get; }
-    [Reactive] public bool EnableCheckPreReleaseUpdate { get; set; }
+    [Reactive] public partial bool EnableCheckPreReleaseUpdate { get; set; }
 
     public CheckUpdateViewModel()
     {
@@ -288,10 +288,9 @@ public class CheckUpdateViewModel : MyReactiveObject
 
     private async Task UpdateFinishedSub(bool blReload)
     {
-        RxSchedulers.MainThreadScheduler.Schedule(blReload, (scheduler, blReload) =>
+        RxSchedulers.MainThreadScheduler.Schedule(() =>
         {
             _ = UpdateFinishedResult(blReload);
-            return Disposable.Empty;
         });
         await Task.CompletedTask;
     }
@@ -404,10 +403,9 @@ public class CheckUpdateViewModel : MyReactiveObject
             Remarks = msg,
         };
 
-        RxSchedulers.MainThreadScheduler.Schedule(item, (scheduler, model) =>
+        RxSchedulers.MainThreadScheduler.Schedule(() =>
         {
-            _ = UpdateViewResult(model);
+            _ = UpdateViewResult(item);
-            return Disposable.Empty;
         });
         await Task.CompletedTask;
     }

v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs

@@ -1,20 +1,20 @@
 namespace ServiceLib.ViewModels;
 
-public class ClashConnectionsViewModel : MyReactiveObject
+public partial class ClashConnectionsViewModel : MyReactiveObject
 {
-    public IObservableCollection<ClashConnectionModel> ConnectionItems { get; } = new ObservableCollectionExtended<ClashConnectionModel>();
+    public BulkObservableCollection<ClashConnectionModel> ConnectionItems { get; } = [];
 
     [Reactive]
-    public ClashConnectionModel SelectedSource { get; set; }
+    public partial ClashConnectionModel SelectedSource { get; set; }
 
-    public ReactiveCommand<Unit, Unit> ConnectionCloseCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> ConnectionCloseCmd { get; }
-    public ReactiveCommand<Unit, Unit> ConnectionCloseAllCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> ConnectionCloseAllCmd { get; }
 
     [Reactive]
-    public string HostFilter { get; set; }
+    public partial string HostFilter { get; set; }
 
     [Reactive]
-    public bool AutoRefresh { get; set; }
+    public partial bool AutoRefresh { get; set; }
 
     public ClashConnectionsViewModel()
     {
@@ -55,10 +55,9 @@ public class ClashConnectionsViewModel : MyReactiveObject
             return;
         }
 
-        RxSchedulers.MainThreadScheduler.Schedule(ret?.connections, (scheduler, model) =>
+        RxSchedulers.MainThreadScheduler.Schedule(() =>
         {
-            _ = RefreshConnections(model);
+            _ = RefreshConnections(ret?.connections);
-            return Disposable.Empty;
         });
     }
 

v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs

@@ -1,37 +1,36 @@
-using System.Reactive.Concurrency;
 using static ServiceLib.Models.Dto.ClashProviders;
 using static ServiceLib.Models.Dto.ClashProxies;
 
 namespace ServiceLib.ViewModels;
 
-public class ClashProxiesViewModel : MyReactiveObject
+public partial class ClashProxiesViewModel : MyReactiveObject
 {
     private Dictionary<string, ProxiesItem>? _proxies;
     private Dictionary<string, ProvidersItem>? _providers;
     private readonly int _delayTimeout = 99999999;
 
-    public IObservableCollection<ClashProxyModel> ProxyGroups { get; } = new ObservableCollectionExtended<ClashProxyModel>();
+    public BulkObservableCollection<ClashProxyModel> ProxyGroups { get; } = [];
-    public IObservableCollection<ClashProxyModel> ProxyDetails { get; } = new ObservableCollectionExtended<ClashProxyModel>();
+    public BulkObservableCollection<ClashProxyModel> ProxyDetails { get; } = [];
 
     [Reactive]
-    public ClashProxyModel SelectedGroup { get; set; }
+    public partial ClashProxyModel SelectedGroup { get; set; }
 
     [Reactive]
-    public ClashProxyModel SelectedDetail { get; set; }
+    public partial ClashProxyModel SelectedDetail { get; set; }
 
-    public ReactiveCommand<Unit, Unit> ProxiesReloadCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> ProxiesReloadCmd { get; }
-    public ReactiveCommand<Unit, Unit> ProxiesDelayTestCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> ProxiesDelayTestCmd { get; }
-    public ReactiveCommand<Unit, Unit> ProxiesDelayTestPartCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> ProxiesDelayTestPartCmd { get; }
-    public ReactiveCommand<Unit, Unit> ProxiesSelectActivityCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> ProxiesSelectActivityCmd { get; }
 
     [Reactive]
-    public int RuleModeSelected { get; set; }
+    public partial int RuleModeSelected { get; set; }
 
     [Reactive]
-    public int SortingSelected { get; set; }
+    public partial int SortingSelected { get; set; }
 
     [Reactive]
-    public bool AutoRefresh { get; set; }
+    public partial bool AutoRefresh { get; set; }
 
     public ClashProxiesViewModel()
     {
@@ -379,10 +378,9 @@ public class ClashProxiesViewModel : MyReactiveObject
             }
 
             var model = new SpeedTestResult() { IndexId = item.Name, Delay = result };
-            RxSchedulers.MainThreadScheduler.Schedule(model, (scheduler, model) =>
+            RxSchedulers.MainThreadScheduler.Schedule(() =>
             {
                 _ = ProxiesDelayTestResult(model);
-                return Disposable.Empty;
             });
             await Task.CompletedTask;
         });

v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs

@@ -1,44 +1,45 @@
 namespace ServiceLib.ViewModels;
 
-public class DNSSettingViewModel : MyReactiveObject, ICloseable
+public partial class DNSSettingViewModel : MyReactiveObject, ICloseable
 {
     public event EventHandler? RequestClose;
 
-    [Reactive] public bool UseSystemHosts { get; set; }
+    [Reactive] public partial bool UseSystemHosts { get; set; }
-    [Reactive] public bool AddCommonHosts { get; set; }
+    [Reactive] public partial bool AddCommonHosts { get; set; }
-    [Reactive] public bool FakeIP { get; set; }
+    [Reactive] public partial bool FakeIP { get; set; }
-    [Reactive] public string FakeIPRange { get; set; }
+    [Reactive] public partial string FakeIPRange { get; set; }
-    [Reactive] public bool BlockBindingQuery { get; set; }
+    [Reactive] public partial bool BlockBindingQuery { get; set; }
-    [Reactive] public string DirectDNS { get; set; }
+    [Reactive] public partial bool BlockAAAAQuery { get; set; }
-    [Reactive] public string RemoteDNS { get; set; }
+    [Reactive] public partial string DirectDNS { get; set; }
-    [Reactive] public string BootstrapDNS { get; set; }
+    [Reactive] public partial string RemoteDNS { get; set; }
-    [Reactive] public string Strategy4Freedom { get; set; }
+    [Reactive] public partial string BootstrapDNS { get; set; }
-    [Reactive] public string Strategy4Proxy { get; set; }
+    [Reactive] public partial string Strategy4Freedom { get; set; }
-    [Reactive] public string Strategy4ProxyDial { get; set; }
+    [Reactive] public partial string Strategy4Proxy { get; set; }
-    [Reactive] public string Hosts { get; set; }
+    [Reactive] public partial string Strategy4ProxyDial { get; set; }
-    [Reactive] public string DirectExpectedIPs { get; set; }
+    [Reactive] public partial string Hosts { get; set; }
-    [Reactive] public bool ParallelQuery { get; set; }
+    [Reactive] public partial string DirectExpectedIPs { get; set; }
-    [Reactive] public bool ServeStale { get; set; }
+    [Reactive] public partial bool ParallelQuery { get; set; }
-    [Reactive] public bool EnableHappyEyeballs { get; set; }
+    [Reactive] public partial bool ServeStale { get; set; }
+    [Reactive] public partial bool EnableHappyEyeballs { get; set; }
 
-    [Reactive] public bool UseSystemHostsCompatible { get; set; }
+    [Reactive] public partial bool UseSystemHostsCompatible { get; set; }
-    [Reactive] public string DomainStrategy4FreedomCompatible { get; set; } = string.Empty;
+    [Reactive] public partial string DomainStrategy4FreedomCompatible { get; set; } = string.Empty;
-    [Reactive] public string DomainDNSAddressCompatible { get; set; } = string.Empty;
+    [Reactive] public partial string DomainDNSAddressCompatible { get; set; } = string.Empty;
-    [Reactive] public string NormalDNSCompatible { get; set; } = string.Empty;
+    [Reactive] public partial string NormalDNSCompatible { get; set; } = string.Empty;
-    [Reactive] public string TunDNSCompatible { get; set; } = string.Empty;
+    [Reactive] public partial string TunDNSCompatible { get; set; } = string.Empty;
 
-    [Reactive] public string DomainStrategy4Freedom2Compatible { get; set; } = string.Empty;
+    [Reactive] public partial string DomainStrategy4Freedom2Compatible { get; set; } = string.Empty;
-    [Reactive] public string DomainDNSAddress2Compatible { get; set; } = string.Empty;
+    [Reactive] public partial string DomainDNSAddress2Compatible { get; set; } = string.Empty;
-    [Reactive] public string NormalDNS2Compatible { get; set; } = string.Empty;
+    [Reactive] public partial string NormalDNS2Compatible { get; set; } = string.Empty;
-    [Reactive] public string TunDNS2Compatible { get; set; } = string.Empty;
+    [Reactive] public partial string TunDNS2Compatible { get; set; } = string.Empty;
-    [Reactive] public bool RayCustomDNSEnableCompatible { get; set; }
+    [Reactive] public partial bool RayCustomDNSEnableCompatible { get; set; }
-    [Reactive] public bool SBCustomDNSEnableCompatible { get; set; }
+    [Reactive] public partial bool SBCustomDNSEnableCompatible { get; set; }
 
-    [ObservableAsProperty] public bool IsSimpleDNSEnabled { get; }
+    public bool IsSimpleDNSEnabled => !(RayCustomDNSEnableCompatible && SBCustomDNSEnableCompatible);
 
-    public ReactiveCommand<Unit, Unit> SaveCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> SaveCmd { get; }
-    public ReactiveCommand<Unit, Unit> ImportDefConfig4V2rayCompatibleCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> ImportDefConfig4V2rayCompatibleCmd { get; }
-    public ReactiveCommand<Unit, Unit> ImportDefConfig4SingboxCompatibleCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> ImportDefConfig4SingboxCompatibleCmd { get; }
 
     public DNSSettingViewModel()
     {
@@ -60,8 +61,7 @@ public class DNSSettingViewModel : MyReactiveObject, ICloseable
         });
 
         this.WhenAnyValue(x => x.RayCustomDNSEnableCompatible, x => x.SBCustomDNSEnableCompatible)
-            .Select(x => x is not { Item1: true, Item2: true })
+            .Subscribe(_ => this.RaisePropertyChanged(nameof(IsSimpleDNSEnabled)));
-            .ToPropertyEx(this, x => x.IsSimpleDNSEnabled);
 
         _ = Init();
     }
@@ -75,6 +75,7 @@ public 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;
@@ -109,6 +110,7 @@ public 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/FullConfigTemplateViewModel.cs

@@ -1,42 +1,42 @@
 namespace ServiceLib.ViewModels;
 
-public class FullConfigTemplateViewModel : MyReactiveObject, ICloseable
+public partial class FullConfigTemplateViewModel : MyReactiveObject, ICloseable
 {
     public event EventHandler? RequestClose;
 
     #region Reactive
 
     [Reactive]
-    public bool EnableFullConfigTemplate4Ray { get; set; }
+    public partial bool EnableFullConfigTemplate4Ray { get; set; }
 
     [Reactive]
-    public bool EnableFullConfigTemplate4Singbox { get; set; }
+    public partial bool EnableFullConfigTemplate4Singbox { get; set; }
 
     [Reactive]
-    public string FullConfigTemplate4Ray { get; set; } = string.Empty;
+    public partial string FullConfigTemplate4Ray { get; set; } = string.Empty;
 
     [Reactive]
-    public string FullTunConfigTemplate4Ray { get; set; } = string.Empty;
+    public partial string FullTunConfigTemplate4Ray { get; set; } = string.Empty;
 
     [Reactive]
-    public string FullConfigTemplate4Singbox { get; set; } = string.Empty;
+    public partial string FullConfigTemplate4Singbox { get; set; } = string.Empty;
 
     [Reactive]
-    public string FullTunConfigTemplate4Singbox { get; set; } = string.Empty;
+    public partial string FullTunConfigTemplate4Singbox { get; set; } = string.Empty;
 
     [Reactive]
-    public bool AddProxyOnly4Ray { get; set; }
+    public partial bool AddProxyOnly4Ray { get; set; }
 
     [Reactive]
-    public bool AddProxyOnly4Singbox { get; set; }
+    public partial bool AddProxyOnly4Singbox { get; set; }
 
     [Reactive]
-    public string ProxyDetour4Ray { get; set; } = string.Empty;
+    public partial string ProxyDetour4Ray { get; set; } = string.Empty;
 
     [Reactive]
-    public string ProxyDetour4Singbox { get; set; } = string.Empty;
+    public partial string ProxyDetour4Singbox { get; set; } = string.Empty;
 
-    public ReactiveCommand<Unit, Unit> SaveCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> SaveCmd { get; }
 
     #endregion Reactive
 

v2rayN/ServiceLib/ViewModels/GlobalHotkeySettingViewModel.cs

@@ -6,7 +6,7 @@ public class GlobalHotkeySettingViewModel : MyReactiveObject, ICloseable
 
     private readonly List<KeyEventItem> _globalHotkeys;
 
-    public ReactiveCommand<Unit, Unit> SaveCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> SaveCmd { get; }
 
     public GlobalHotkeySettingViewModel()
     {

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -1,13 +1,11 @@
-using System.Reactive.Concurrency;
-
 namespace ServiceLib.ViewModels;
 
-public class MainWindowViewModel : MyReactiveObject
+public partial class MainWindowViewModel : MyReactiveObject
 {
-    public Interaction<Unit, string?> ReadTextFromClipboardInteraction { get; } = new();
+    public Interaction<RxVoid, string?> ReadTextFromClipboardInteraction { get; } = new();
-    public Interaction<Unit, byte[]?> ScanScreenInteraction { get; } = new();
+    public Interaction<RxVoid, byte[]?> ScanScreenInteraction { get; } = new();
-    public Interaction<Unit, string?> BrowseImageFileInteraction { get; } = new();
+    public Interaction<RxVoid, string?> BrowseImageFileInteraction { get; } = new();
-    public Interaction<bool?, Unit> ShowHideWindowInteraction { get; } = new();
+    public Interaction<bool?, RxVoid> ShowHideWindowInteraction { get; } = new();
 
     public bool DesignMode { get; set; }
 
@@ -22,67 +20,68 @@ public class MainWindowViewModel : MyReactiveObject
     #region Menu
 
     //servers
-    public ReactiveCommand<Unit, Unit> AddVmessServerCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddVmessServerCmd { get; }
 
-    public ReactiveCommand<Unit, Unit> AddVlessServerCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddVlessServerCmd { get; }
-    public ReactiveCommand<Unit, Unit> AddShadowsocksServerCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddShadowsocksServerCmd { get; }
-    public ReactiveCommand<Unit, Unit> AddSocksServerCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddSocksServerCmd { get; }
-    public ReactiveCommand<Unit, Unit> AddHttpServerCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddHttpServerCmd { get; }
-    public ReactiveCommand<Unit, Unit> AddTrojanServerCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddTrojanServerCmd { get; }
-    public ReactiveCommand<Unit, Unit> AddHysteria2ServerCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddHysteria2ServerCmd { get; }
-    public ReactiveCommand<Unit, Unit> AddTuicServerCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddTuicServerCmd { get; }
-    public ReactiveCommand<Unit, Unit> AddWireguardServerCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddWireguardServerCmd { get; }
-    public ReactiveCommand<Unit, Unit> AddAnytlsServerCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddAnytlsServerCmd { get; }
-    public ReactiveCommand<Unit, Unit> AddNaiveServerCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddNaiveServerCmd { get; }
-    public ReactiveCommand<Unit, Unit> AddCustomServerCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddCustomServerCmd { get; }
-    public ReactiveCommand<Unit, Unit> AddPolicyGroupServerCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddCustomOutboundServerCmd { get; }
-    public ReactiveCommand<Unit, Unit> AddProxyChainServerCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddPolicyGroupServerCmd { get; }
-    public ReactiveCommand<Unit, Unit> AddServerViaClipboardCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddProxyChainServerCmd { get; }
-    public ReactiveCommand<Unit, Unit> AddServerViaScanCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddServerViaClipboardCmd { get; }
-    public ReactiveCommand<Unit, Unit> AddServerViaImageCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddServerViaScanCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> AddServerViaImageCmd { get; }
 
     //Subscription
-    public ReactiveCommand<Unit, Unit> SubSettingCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> SubSettingCmd { get; }
 
-    public ReactiveCommand<Unit, Unit> SubUpdateCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> SubUpdateCmd { get; }
-    public ReactiveCommand<Unit, Unit> SubUpdateViaProxyCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> SubUpdateViaProxyCmd { get; }
-    public ReactiveCommand<Unit, Unit> SubGroupUpdateCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> SubGroupUpdateCmd { get; }
-    public ReactiveCommand<Unit, Unit> SubGroupUpdateViaProxyCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> SubGroupUpdateViaProxyCmd { get; }
 
     //Setting
-    public ReactiveCommand<Unit, Unit> OptionSettingCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> OptionSettingCmd { get; }
 
-    public ReactiveCommand<Unit, Unit> RoutingSettingCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> RoutingSettingCmd { get; }
-    public ReactiveCommand<Unit, Unit> DNSSettingCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> DNSSettingCmd { get; }
-    public ReactiveCommand<Unit, Unit> FullConfigTemplateCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> FullConfigTemplateCmd { get; }
-    public ReactiveCommand<Unit, Unit> GlobalHotkeySettingCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> GlobalHotkeySettingCmd { get; }
-    public ReactiveCommand<Unit, Unit> RebootAsAdminCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> RebootAsAdminCmd { get; }
-    public ReactiveCommand<Unit, Unit> ClearServerStatisticsCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> ClearServerStatisticsCmd { get; }
-    public ReactiveCommand<Unit, Unit> OpenTheFileLocationCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> OpenTheFileLocationCmd { get; }
 
     //Presets
-    public ReactiveCommand<Unit, Unit> RegionalPresetDefaultCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> RegionalPresetDefaultCmd { get; }
 
-    public ReactiveCommand<Unit, Unit> RegionalPresetRussiaCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> RegionalPresetRussiaCmd { get; }
 
-    public ReactiveCommand<Unit, Unit> RegionalPresetIranCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> RegionalPresetIranCmd { get; }
 
-    public ReactiveCommand<Unit, Unit> ReloadCmd { get; }
+    public ReactiveCommand<RxVoid, RxVoid> ReloadCmd { get; }
 
     [Reactive]
-    public bool BlReloadEnabled { get; set; }
+    public partial bool BlReloadEnabled { get; set; }
 
     [Reactive]
-    public bool ShowClashUI { get; set; }
+    public partial bool ShowClashUI { get; set; }
 
     [Reactive]
-    public int TabMainSelectedIndex { get; set; }
+    public partial int TabMainSelectedIndex { get; set; }
 
-    [Reactive] public bool BlIsWindows { get; set; }
+    [Reactive] public partial bool BlIsWindows { get; set; }
 
-    [Reactive] public bool BlNewUpdate { get; set; }
+    [Reactive] public partial bool BlNewUpdate { get; set; }
 
-    [Reactive] public EGirdOrientation MainGirdOrientation { get; set; }
+    [Reactive] public partial EGirdOrientation MainGirdOrientation { get; set; }
 
     #endregion Menu
 
@@ -145,6 +144,10 @@ public class MainWindowViewModel : MyReactiveObject
         {
             await AddServerAsync(EConfigType.Custom);
         });
+        AddCustomOutboundServerCmd = ReactiveCommand.CreateFromTask(async () =>
+        {
+            await AddServerAsync(EConfigType.Outbound);
+        });
         AddPolicyGroupServerCmd = ReactiveCommand.CreateFromTask(async () =>
         {
             await AddServerAsync(EConfigType.PolicyGroup);
@@ -268,7 +271,7 @@ public class MainWindowViewModel : MyReactiveObject
             .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async _ => await RefreshServers());
 
-        var vmReloadRequestedList = new List<IObservable<Unit>>
+        var vmReloadRequestedList = new List<IObservable<RxVoid>>
         {
             ProfilesViewModel.ReloadRequested.AsObservable(),
             StatusBarViewModel.ReloadRequested.AsObservable(),
@@ -297,7 +300,7 @@ public class MainWindowViewModel : MyReactiveObject
             .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async blShow =>
             {
-                await ShowHideWindowInteraction.Handle(blShow);
+                await ShowHideWindowInteraction.HandleSafe(blShow);
             });
 
         StatusBarViewModel.SetDefaultServerRequested
@@ -407,12 +410,26 @@ public class MainWindowViewModel : MyReactiveObject
 
     private async Task RefreshServersDispatcherAsync()
     {
-        await Observable.Start(async () => await RefreshServers(), RxSchedulers.MainThreadScheduler);
+        //await Observable.Start(async () => await RefreshServers(), RxSchedulers.MainThreadScheduler);
+        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);
+        //await Observable.Start(async () => await ProfilesViewModel.RefreshSubscriptions(), RxSchedulers.MainThreadScheduler);
+        await Signal.FromAsync(async () =>
+            {
+                await ProfilesViewModel.RefreshSubscriptions();
+                return RxVoid.Default;
+            })
+            .SubscribeOn(RxSchedulers.MainThreadScheduler)
+            .ToTask();
     }
 
     #endregion Servers && Groups
@@ -429,7 +446,7 @@ public class MainWindowViewModel : MyReactiveObject
         };
 
         bool? ret = false;
-        if (eConfigType == EConfigType.Custom)
+        if (eConfigType is EConfigType.Custom or EConfigType.Outbound)
         {
             var addServer2ViewModel = new AddServer2ViewModel(item);
             ret = await AppManager.Instance.WindowDialog.ShowDialogAsync(addServer2ViewModel);
@@ -459,7 +476,7 @@ public class MainWindowViewModel : MyReactiveObject
         var stringData = clipboardData;
         if (clipboardData == null)
         {
-            var result = await ReadTextFromClipboardInteraction.Handle(Unit.Default);
+            var result = await ReadTextFromClipboardInteraction.HandleSafe(RxVoid.Default);
             if (result.IsNullOrEmpty())
             {
                 NoticeManager.Instance.Enqueue(ResUI.OperationFailed);
@@ -482,7 +499,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     public async Task AddServerViaScanAsync()
     {
-        var result = await ScanScreenInteraction.Handle(Unit.Default);
+        var result = await ScanScreenInteraction.HandleSafe(RxVoid.Default);
         await ScanScreenResult(result);
     }
 
@@ -494,7 +511,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     public async Task AddServerViaImageAsync()
     {
-        var imageFileName = await BrowseImageFileInteraction.Handle(Unit.Default);
+        var imageFileName = await BrowseImageFileInteraction.HandleSafe(RxVoid.Default);
         await AddScanResultAsync(imageFileName);
     }
 
@@ -683,10 +700,12 @@ public class MainWindowViewModel : MyReactiveObject
                 //{
                 //    await ClashProxiesViewModel.ProxiesReload();
                 //}, RxSchedulers.MainThreadScheduler);
-                RxSchedulers.MainThreadScheduler.Schedule(async () =>
+                await Signal.FromAsync(async () =>
-                {
+                    {
-                    await ClashProxiesViewModel.ProxiesReload();
+                        await ClashProxiesViewModel.ProxiesReload();
-                });
+                        return RxVoid.Default;
+                    }).SubscribeOn(RxSchedulers.MainThreadScheduler)
+                    .ToTask();
             }
 
             ReloadResult(showClashUI);