🐛 Misc

✨账号切换新增 GOG Discord平台

.github/workflows/CI.yml

@@ -68,19 +68,19 @@ jobs:
         run: dotnet --info
 
       - name: Build BD.WTTS.Client.AppHost
-        run: dotnet build -c Release src\BD.WTTS.Client.AppHost\BD.WTTS.Client.AppHost.csproj --nologo -v q --property:WarningLevel=1;DebugType=pdbonly 
+        run: dotnet build -c Release src\BD.WTTS.Client.AppHost\BD.WTTS.Client.AppHost.csproj --nologo -v q --property:WarningLevel=1 --property:DebugType=pdbonly 
 
       - name: Build BD.WTTS.Client.Plugins.Accelerator.ReverseProxy
-        run: dotnet build -c Release src\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy.csproj --nologo -v q --property:WarningLevel=1;DebugType=pdbonly 
+        run: dotnet build -c Release src\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy.csproj --nologo -v q --property:WarningLevel=1 --property:DebugType=pdbonly 
 
       - name: Build BD.WTTS.Client.Avalonia.App
-        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.App\BD.WTTS.Client.Avalonia.App.csproj --nologo -v q --property:WarningLevel=1;DebugType=pdbonly 
+        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.App\BD.WTTS.Client.Avalonia.App.csproj --nologo -v q --property:WarningLevel=1 --property:DebugType=pdbonly 
 
       - name: Build BD.WTTS.Client.Avalonia.Designer.HostApp
-        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.Designer.HostApp\BD.WTTS.Client.Avalonia.Designer.HostApp.csproj --nologo -v q --property:WarningLevel=1;DebugType=pdbonly 
+        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.Designer.HostApp\BD.WTTS.Client.Avalonia.Designer.HostApp.csproj --nologo -v q --property:WarningLevel=1 --property:DebugType=pdbonly 
 
       - name: Test
-        run: dotnet test src/BD.WTTS.UnitTest/BD.WTTS.UnitTest.csproj -c Release -p:GeneratePackageOnBuild=false --nologo -v q --property:WarningLevel=1;DebugType=pdbonly 
+        run: dotnet test src/BD.WTTS.UnitTest/BD.WTTS.UnitTest.csproj -c Release -p:GeneratePackageOnBuild=false --nologo -v q --property:WarningLevel=1 --property:DebugType=pdbonly 
 
 #  release:
 #    name: Release

README.md

@@ -16,7 +16,7 @@
 [![NET 7.0](https://img.shields.io/badge/dotnet-7.0-purple.svg?style=flat-square&color=512bd4)](https://learn.microsoft.com/zh-cn/dotnet/core/whats-new/dotnet-7)
 [![C# 11](https://img.shields.io/badge/c%23-11-brightgreen.svg?style=flat-square&color=6da86a)](https://learn.microsoft.com/zh-cn/dotnet/csharp/whats-new/csharp-11)
 
-[![爱发电](https://img.shields.io/badge/爱发电-软妹币玩家-blue.svg?style=flat-square&color=ea4aaa&logo=github-sponsors)](https://afdian.net/@rmbgame)
+[![爱发电](https://img.shields.io/badge/爱发电-软妹币玩家-blue.svg?style=flat-square&color=ea4aaa&logo=github-sponsors)](https://afdian.com/@rmbgame)
 [![Kofi](https://img.shields.io/badge/Kofi-RMBGAME-orange.svg?style=flat-square&logo=kofi)](https://ko-fi.com/rmbgame)
 [![Patreon](https://img.shields.io/badge/Patreon-RMBGAME-red.svg?style=flat-square&logo=patreon)](https://www.patreon.com/rmbgame)
 

build/settings_v4_app.json

@@ -988,6 +988,15 @@
           "Summary": "加速页面 Tab 选项卡选中下标",
           "IsRegionOrEndregion": null,
           "IsValueType": null
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "AutoShowWattAcceleratorWindow",
+          "DefaultValue": "true",
+          "DefaultValueIsConst": true,
+          "Summary": "加速后自动唤起 Watt 加速器界面",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
         }
       ],
       "Usings": ""

ref/Directory.Build.props

@@ -0,0 +1,5 @@
+<Project>
+	<PropertyGroup>
+		<CheckEolWorkloads>false</CheckEolWorkloads>
+	</PropertyGroup>
+</Project>

ref/WinDivert.mpo.txt

@@ -0,0 +1,11 @@
+    static void WinDivert()
+    {
+        var dllWinDivert = Path.Combine(ProjectUtils.ProjPath, "ref", "WinDivert.dll");
+        var sysWinDivert64 = Path.Combine(ProjectUtils.ProjPath, "ref", "WinDivert64.sys");
+
+        byte[][] data = [File.ReadAllBytes(dllWinDivert), File.ReadAllBytes(sysWinDivert64)];
+        var bytes = MemoryPackSerializer.Serialize(data);
+        bytes.AsSpan().Reverse();
+
+        File.WriteAllBytes(Path.Combine(ProjectUtils.ProjPath, "ref", "WinDivert.mpo"), bytes);
+    }

src/AssemblyInfo.Constants.cs

@@ -3,14 +3,6 @@ namespace BD.WTTS;
 /// <summary>
 /// 提供用来获取应用程序信息（如版本号、说明、加载的程序集等）的属性。
 /// </summary>
-[Mobius3(
-"""
-Mobius.AssemblyInfo
-AssemblyInfo.cs
-AssemblyInfo.Version.cs
-AssemblyInfo.Version.NativeHost.cs
-AssemblyInfo.Version.Setup.Windows.cs
-""")]
 public static partial class AssemblyInfo
 {
     const string Version2 = "3.0";
@@ -24,14 +16,14 @@ public static partial class AssemblyInfo
     /// <summary>
     /// 预览版本号，范围 1~9，只增不减
     /// </summary>
-    const string ver_for_preview = "8";
+    const string ver_for_preview = "9";
 
     /// <summary>
     /// RC 版本号，范围 0~9，只增不减
     /// </summary>
-    const string ver_for_rc = "8";
+    const string ver_for_rc = "9";
 
-    public const string FileVersion = $"{Version2}.{ver_for_rc}0{ver_for_preview}.0";
+    public const string FileVersion = $"{Version2}.{ver_for_rc}1{ver_for_preview}.0";
 
     //public const string InformationalVersion = Version;
     //public const string InformationalVersion = $"{Version}-preview.{ver_for_preview}";
@@ -154,20 +146,4 @@ false
 
 #endif
 
-}
-
-[AttributeUsage(AttributeTargets.All, Inherited = false)]
-sealed class Mobius3Attribute : Attribute
-{
-    public Mobius3Attribute()
-    {
-
-    }
-
-    public Mobius3Attribute(string str)
-    {
-
-    }
-
-    public bool Obsolete { get; set; }
 }

src/AssemblyInfo.Xaml.cs

@@ -1,4 +1,3 @@
-// Mobius Properties\XmlnsDefinition.cs
 #if (WINDOWS || MACCATALYST || MACOS || LINUX) && !(IOS || ANDROID)
 // C# 10 定义全局 using
 

src/Avalonia.Skia.Internals/Avalonia.Skia.Internals.csproj

@@ -7,6 +7,7 @@
 		<DelaySign>false</DelaySign>
 		<AssemblyOriginatorKeyFile>$(MSBuildProjectDirectory)\..\..\avalonia.snk</AssemblyOriginatorKeyFile>
 		<!--https://github.com/AvaloniaUI/Avalonia/blob/0.10.10/build/SharedVersion.props#L18-->
+		<AvaloniaAccessUnstablePrivateApis>true</AvaloniaAccessUnstablePrivateApis>
 	</PropertyGroup>
 
 	<ItemGroup>

src/BD.WTTS.Client.AppHost.Bridge.Package/Package.appxmanifest

@@ -11,7 +11,7 @@
 	<Identity
 	  Name="4651ED44255E.47979655102CE"
 	  Publisher="CN=A90E406B-B2D3-4A23-B061-0FA1D65C4F66"
-	  Version="3.0.999.0" />
+	  Version="3.0.207.0" />
 
 	<Properties>
 		<DisplayName>Watt Toolkit</DisplayName>
@@ -66,6 +66,15 @@
 		</Application>
 	</Applications>
 
+	<Extensions>
+		<desktop2:Extension Category="windows.firewallRules">
+			<desktop2:FirewallRules Executable="Steam++\modules\Accelerator\Steam++.Accelerator.exe">
+				<desktop2:Rule Direction="in" IPProtocol="TCP" Profile="all"/>
+				<desktop2:Rule Direction="in" IPProtocol="UDP" Profile="all"/>
+			</desktop2:FirewallRules>
+		</desktop2:Extension>
+	</Extensions>
+
 	<Capabilities>
 		<Capability Name="internetClient" />
 		<rescap:Capability Name="runFullTrust" />

src/BD.WTTS.Client.Avalonia.App/BD.WTTS.Client.Avalonia.App.csproj

@@ -91,9 +91,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="BD.Common.XmlnsDefinition.Avalonia">
-			<Aliases>BD_Common_XmlnsDefinition_Avalonia</Aliases>
-		</PackageReference>
 		<ProjectReference Include="..\BD.WTTS.Client.Avalonia\BD.WTTS.Client.Avalonia.csproj" />
 		<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
 	</ItemGroup>

src/BD.WTTS.Client.Avalonia.Designer.HostApp/BD.WTTS.Client.Avalonia.Designer.HostApp.csproj

@@ -68,9 +68,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="Moq" />
-		<PackageReference Include="BD.Common.XmlnsDefinition.Avalonia">
-			<Aliases>BD_Common_XmlnsDefinition_Avalonia</Aliases>
-		</PackageReference>
 		<ProjectReference Include="..\BD.WTTS.Client.Avalonia\BD.WTTS.Client.Avalonia.csproj" />
 		<ProjectReference Include="..\BD.WTTS.Client.Plugins.Accelerator\BD.WTTS.Client.Plugins.Accelerator.csproj" />
 		<ProjectReference Include="..\BD.WTTS.Client.Plugins.ArchiSteamFarmPlus\BD.WTTS.Client.Plugins.ArchiSteamFarmPlus.csproj" />

src/BD.WTTS.Client.Avalonia/BD.WTTS.Client.Avalonia.csproj

@@ -4,6 +4,7 @@
 		<RootNamespace>BD.WTTS</RootNamespace>
 		<DefineConstants>AVALONIA;$(DefineConstants)</DefineConstants>
 		<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+		<AvaloniaAccessUnstablePrivateApis>true</AvaloniaAccessUnstablePrivateApis>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -72,9 +73,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="BD.Common.XmlnsDefinition.Avalonia">
-			<Aliases>BD_Common_XmlnsDefinition_Avalonia</Aliases>
-		</PackageReference>
 		<PackageReference Include="BD.Common" />
 		<PackageReference Include="BD.Common.Primitives" />
 		<PackageReference Include="BD.Common.Essentials" />

src/BD.WTTS.Client.Avalonia/Extensions/WindowTransparencyLevelExtensions.cs

@@ -13,6 +13,7 @@ public static class WindowTransparencyLevelExtensions
             WindowBackgroundMaterial.Blur => WindowTransparencyLevel.Blur,
             WindowBackgroundMaterial.AcrylicBlur => WindowTransparencyLevel.AcrylicBlur,
             WindowBackgroundMaterial.Mica => WindowTransparencyLevel.Mica,
+            WindowBackgroundMaterial.Transparent => WindowTransparencyLevel.Transparent,
             _ => WindowTransparencyLevel.None,
         };
     }

src/BD.WTTS.Client.Avalonia/Services.Implementation/UI/Views/Windows/AvaloniaWindowManagerImpl.cs

@@ -95,7 +95,7 @@ public sealed class AvaloniaWindowManagerImpl : IWindowManagerImpl
         Func<bool>? cancelCloseAction = null,
         bool disableScroll = false)
         where TPageViewModel : ViewModelBase
-    {
+  {
         var td = new TaskDialogEx
         {
             Title = title,
@@ -111,6 +111,12 @@ public sealed class AvaloniaWindowManagerImpl : IWindowManagerImpl
             XamlRoot = GetWindowTopLevel(),
         };
 
+        if (td.XamlRoot == null)
+        {
+            Toast.LogAndShowT(new Exception("在 AppWindow 为 Null 时，无法弹出 Taskdialog."));
+            return false;
+        }
+
         if (viewModel != null)
         {
             if (viewModel is IWindowViewModel window)

src/BD.WTTS.Client.Avalonia/UI/App.Theme.cs

@@ -7,28 +7,12 @@ namespace BD.WTTS.UI;
 
 partial class App
 {
-    [Mobius(
-"""
-App.DefaultActualTheme
-""")]
     const AppTheme _DefaultActualTheme = AppTheme.FollowingSystem;
 
-    [Mobius(
-"""
-App.DefaultActualTheme
-""")]
     AppTheme IApplication.DefaultActualTheme => _DefaultActualTheme;
 
-    [Mobius(
-"""
-App.mTheme
-""")]
     AppTheme mTheme = _DefaultActualTheme;
 
-    [Mobius(
-"""
-App.Theme
-""")]
     public AppTheme Theme
     {
         get => mTheme;
@@ -66,10 +50,6 @@ App.Theme
         }
     }
 
-    [Mobius(
-"""
-App.SetThemeNotChangeValue
-""")]
     public void SetThemeNotChangeValue(AppTheme value)
     {
         var mode = value switch
@@ -91,10 +71,6 @@ App.SetThemeNotChangeValue
         }
     }
 
-    [Mobius(
-"""
-App.SetThemeAccent
-""")]
     public static void SetThemeAccent(string? colorHex)
     {
         if (colorHex == null)

src/BD.WTTS.Client.Avalonia/UI/App.TrayIcon.cs

@@ -9,34 +9,14 @@ namespace BD.WTTS.UI;
 
 partial class App
 {
-    [Mobius(
-"""
-App.TrayMenus
-""")]
     public Dictionary<string, TrayMenuItem> TrayMenus { get; } = new Dictionary<string, TrayMenuItem>();
 
-    [Mobius(
-"""
-App.TrayIcons
-""")]
     public TrayIcons TrayIcons { get; init; } = new TrayIcons();
 
-    [Mobius(
-"""
-App.trayIconMenus
-""")]
     readonly Dictionary<string, ICommand> trayIconMenus = new();
 
-    [Mobius(
-"""
-App.TrayIconMenus
-""")]
     public IReadOnlyDictionary<string, ICommand> TrayIconMenus => trayIconMenus;
 
-    [Mobius(
-"""
-App.InitTrayIcon
-""")]
     void InitTrayIcon()
     {
         if (ApplicationLifetime is not
@@ -83,14 +63,50 @@ App.InitTrayIcon
 #else
                 s.HasTrayIcon ? ShutdownMode.OnExplicitShutdown : ShutdownMode.OnMainWindowClose;
 #endif
-
+#if MACOS
+            if (Current!.TryGetFeature<IActivatableLifetime>() is { } activatableLifetime)
+            {
+                activatableLifetime.Activated += ActivatableLifetimeOnActivated;
+                // macOS 中 右键隐藏 会触发目前不需要使用
+                //activatableLifetime.Deactivated += ActivatableLifetimeOnDeactivated;
+            }
+#endif
         }
     }
 
-    [Mobius(
-"""
-App.UpdateMenuItems
-""")]
+#if MACOS
+    /// <summary>
+    /// 从 macOS Dock 栏恢复窗口显示
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ActivatableLifetimeOnActivated(object? sender, ActivatedEventArgs e)
+    {
+        switch (e.Kind)
+        {
+            case ActivationKind.Background:
+            case ActivationKind.Reopen:
+                RestoreMainWindow();
+                break;
+        }
+    }
+
+    ///// <summary>
+    ///// macOS 中 右键隐藏 会触发目前不需要使用
+    ///// </summary>
+    ///// <param name="sender"></param>
+    ///// <param name="e"></param>
+    //private void ActivatableLifetimeOnDeactivated(object? sender, ActivatedEventArgs e)
+    //{
+    //    switch (e.Kind)
+    //    {
+    //        case ActivationKind.Background:
+    //            Console.WriteLine($"ActivatableLifetimeOnDeactivated {e.Kind}");
+    //            break;
+    //    }
+    //}
+#endif
+
     public void UpdateMenuItems()
     {
         MainThread2.BeginInvokeOnMainThread(() =>
@@ -190,10 +206,6 @@ App.UpdateMenuItems
         });
     }
 
-    [Mobius(
-"""
-App.UpdateMenuItems
-""")]
     public void UpdateMenuItems(string menuKey, TrayMenuItem trayMenuItem)
     {
         if (TrayMenus != null)

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/Button.axaml

@@ -9,6 +9,11 @@
             <StackPanel Spacing="10">
                 <HyperlinkButton Content="更新日志" />
                 <Button Content="更新日志" Theme="{StaticResource HyperlinkButton}" />
+                <Button Classes="TransparentAccent" Content="更新日志" />
+                <Button
+                    Classes="TransparentAccent"
+                    Content="更新日志"
+                    IsEnabled="False" />
                 <Button
                     Content="更新日志"
                     IsEnabled="False"
@@ -221,6 +226,15 @@
         <Setter Property="Background" Value="Transparent" />
     </Style>
 
+    <Style Selector="Button.TransparentAccent /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForeground}" />
+    </Style>
 
+    <Style Selector="Button.TransparentAccent:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForegroundPointerOver}" />
+    </Style>
 
+    <Style Selector="Button.TransparentAccent:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForegroundPressed}" />
+    </Style>
 </Styles>

src/BD.WTTS.Client.Avalonia/UI/Styling/Icons.axaml

@@ -86,4 +86,10 @@
     <StreamGeometry x:Key="Phone">
         M15.75 2C16.9926 2 18 3.00736 18 4.25V19.75C18 20.9926 16.9926 22 15.75 22H8.25C7.00736 22 6 20.9926 6 19.75V4.25C6 3.00736 7.00736 2 8.25 2H15.75ZM13.25 18H10.75C10.3358 18 10 18.3358 10 18.75C10 19.1642 10.3358 19.5 10.75 19.5H13.25C13.6642 19.5 14 19.1642 14 18.75C14 18.3358 13.6642 18 13.25 18Z
     </StreamGeometry>
+    <StreamGeometry x:Key="GOGGalaxy">
+        M304.99296 650.144H185.98496a17.12 17.12 0 0 0-16.992 17.184v85.344c0 8.992 7.68 16.992 16.992 16.992h119.52v56.32H156.16096a43.84 43.84 0 0 1-43.488-44v-144.512c0-23.968 19.68-43.488 44-43.488h148.32z m43.168-157.824c0 24.832-20 44.832-44.832 44.832H112.19296v-57.696h161.312a16.896 16.896 0 0 0 17.024-16.992V272.64a17.024 17.024 0 0 0-17.024-17.184H187.36096a17.152 17.152 0 0 0-17.536 17.184v86.144c0 9.856 7.68 17.024 17.024 17.024H256.00096v57.632H157.02496a44.544 44.544 0 0 1-44.832-44.32V242.304c0-24.352 20.192-44.32 44.832-44.32H303.04096c24.672 0 44.64 19.968 44.64 44.32v249.984z m563.168 333.664h-56.32v-175.84h-39.68a17.12 17.12 0 0 0-16.992 17.184v158.624h-56.832v-175.84h-39.68a17.12 17.12 0 0 0-16.992 17.184v158.624h-56.832v-188.512c0-23.968 19.68-43.488 44-43.488h239.328z m0.512-333.664c0 24.832-20.192 44.832-44.832 44.832h-191.136v-57.696h161.312a16.96 16.96 0 0 0 17.024-16.992V272.64a17.12 17.12 0 0 0-17.024-17.184h-86.656a17.024 17.024 0 0 0-17.024 17.184v86.144c0 9.856 7.68 17.024 17.024 17.024h69.152v57.632h-98.688a44.352 44.352 0 0 1-44.64-44.32V242.304c0-24.352 19.968-44.32 44.64-44.32h146.336c24.832 0 44.832 19.968 44.832 44.32v249.984zM585.34496 198.016h-146.688c-24.832 0-44.512 19.968-44.512 44.32v146.816a44.16 44.16 0 0 0 44.512 44.32h146.688a44.48 44.48 0 0 0 44.512-44.32V242.336c0-24.352-20.192-44.32-44.512-44.32z m-12.672 74.656v86.144c0 9.504-7.68 17.024-17.152 17.024h-86.688a16.96 16.96 0 0 1-16.992-17.024V272.96c0-9.312 7.328-16.992 16.992-16.992h85.856c9.824 0 16.992 7.68 16.992 16.992z m-33.824 321.344h-144.672c-24.16 0-43.808 19.488-43.808 43.488v144.512c0 24.32 19.68 44 43.808 44h144.672c24.32 0 44-19.68 44-44v-144.512c0-23.968-19.68-43.488-44-43.488z m-12.864 73.344v85.344a16.96 16.96 0 0 1-16.992 16.992v-0.352h-84.864a17.12 17.12 0 0 1-17.152-17.152v-84.832a17.28 17.28 0 0 1 17.152-17.184h85.344c9.344 0 17.024 7.84 17.024 17.184z m476.16-620.352A74.24 74.24 0 0 0 949.31296 24.64H74.65696A74.304 74.304 0 0 0 0.00096 99.296v825.344a74.304 74.304 0 0 0 74.656 74.656h874.656a74.304 74.304 0 0 0 74.656-74.656V99.296c0-20.32-8.48-39.168-21.856-52.832z m0 877.664a52.416 52.416 0 0 1-52.832 52.832H74.65696a52.576 52.576 0 0 1-53.344-52.832V99.328a52.672 52.672 0 0 1 52.832-52.832H948.80096c29.344 0 52.992 23.68 52.992 52.832v825.344z
+    </StreamGeometry>
+    <StreamGeometry x:Key="Discord">
+        M1049.062 139.672a3 3 0 0 0-1.528-1.4A970.13 970.13 0 0 0 808.162 64.06a3.632 3.632 0 0 0-3.846 1.82 674.922 674.922 0 0 0-29.8 61.2 895.696 895.696 0 0 0-268.852 0 619.082 619.082 0 0 0-30.27-61.2 3.78 3.78 0 0 0-3.848-1.82 967.378 967.378 0 0 0-239.376 74.214 3.424 3.424 0 0 0-1.576 1.352C78.136 367.302 36.372 589.38 56.86 808.708a4.032 4.032 0 0 0 1.53 2.75 975.332 975.332 0 0 0 293.65 148.378 3.8 3.8 0 0 0 4.126-1.352A696.4 696.4 0 0 0 416.24 860.8a3.72 3.72 0 0 0-2.038-5.176 642.346 642.346 0 0 1-91.736-43.706 3.77 3.77 0 0 1-0.37-6.252 502.094 502.094 0 0 0 18.218-14.274 3.638 3.638 0 0 1 3.8-0.512c192.458 87.834 400.82 87.834 591 0a3.624 3.624 0 0 1 3.848 0.466 469.066 469.066 0 0 0 18.264 14.32 3.768 3.768 0 0 1-0.324 6.252 602.814 602.814 0 0 1-91.78 43.66 3.75 3.75 0 0 0-2 5.222 782.11 782.11 0 0 0 60.028 97.63 3.728 3.728 0 0 0 4.126 1.4A972.096 972.096 0 0 0 1221.4 811.458a3.764 3.764 0 0 0 1.53-2.704c24.528-253.566-41.064-473.824-173.868-669.082zM444.982 675.16c-57.944 0-105.688-53.174-105.688-118.478s46.818-118.482 105.688-118.482c59.33 0 106.612 53.64 105.686 118.478 0 65.308-46.82 118.482-105.686 118.482z m390.76 0c-57.942 0-105.686-53.174-105.686-118.478s46.818-118.482 105.686-118.482c59.334 0 106.614 53.64 105.688 118.478 0 65.308-46.354 118.482-105.688 118.482z
+    </StreamGeometry>
 </ResourceDictionary>

src/BD.WTTS.Client.Avalonia/UI/Views/Abstractions/Windows/ReactiveAppWindow.cs

@@ -14,6 +14,8 @@ public class ReactiveAppWindow<TViewModel> : AppWindow, IViewFor<TViewModel>, IV
     public static readonly StyledProperty<bool> IsSaveWindowSizeProperty = AvaloniaProperty
         .Register<ReactiveAppWindow<TViewModel>, bool>(nameof(IsSaveWindowSize), true);
 
+    private bool _isInitialize;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="ReactiveAppWindow{TViewModel}"/> class.
     /// </summary>
@@ -127,27 +129,32 @@ public class ReactiveAppWindow<TViewModel> : AppWindow, IViewFor<TViewModel>, IV
             {
                 var primaryScreenBounds = screen.Bounds;
 
-                if (CanResize && !IsVisible)
+                if (CanResize && !_isInitialize && !IsVisible)
                 {
+                    WindowStartupLocation = WindowStartupLocation.Manual;
+                    var scalingOffset = 31 - ((screen.Scaling - 1) / 0.5); // appwindow偏移量
+
                     if (SizePosition.Width > 0 &&
                         primaryScreenBounds.Width >= SizePosition.Width)
                         Width = SizePosition.Width;
 
                     if (SizePosition.Height > 0 &&
                         primaryScreenBounds.Height >= SizePosition.Height)
-                        Height = SizePosition.Height;
+                        Height = SizePosition.Height - scalingOffset;
 
                     if (SizePosition.X > 0 && SizePosition.Y > 0)
                     {
-                        var leftTopPoint = new PixelPoint(SizePosition.X, SizePosition.Y);
+                        var offsetY = (int)Math.Round(scalingOffset * screen.Scaling);
+                        //var offsetY = scalingOffset;
+                        var leftTopPoint = new PixelPoint(SizePosition.X, SizePosition.Y + offsetY);
                         var rightBottomPoint = new PixelPoint(SizePosition.X + (int)Width, SizePosition.Y + (int)Height);
                         if (primaryScreenBounds.Contains(leftTopPoint) &&
                            primaryScreenBounds.Contains(rightBottomPoint))
                         {
                             Position = leftTopPoint;
-                            WindowStartupLocation = WindowStartupLocation.Manual;
                         }
                     }
+                    _isInitialize = true;
                 }
             }
         }

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/SnackbarManager.cs

@@ -193,4 +193,39 @@ public class SnackbarManager : TemplatedControl, IManagedNotificationManager
         PseudoClasses.Set(":bottomleft", position == NotificationPosition.BottomLeft);
         PseudoClasses.Set(":bottomright", position == NotificationPosition.BottomRight);
     }
+
+    /// <inheritdoc/>
+    public void Close(INotification notification)
+    {
+        Dispatcher.UIThread.VerifyAccess();
+
+        //if (_items.Remove(notification, out var notificationCard))
+        //{
+        //    notificationCard.Close();
+        //}
+    }
+
+    /// <inheritdoc/>
+    public void Close(object content)
+    {
+        Dispatcher.UIThread.VerifyAccess();
+
+        //if (_items.Remove(content, out var notificationCard))
+        //{
+        //    notificationCard.Close();
+        //}
+    }
+
+    /// <inheritdoc/>
+    public void CloseAll()
+    {
+        Dispatcher.UIThread.VerifyAccess();
+
+        //foreach (var kvp in _items)
+        //{
+        //    kvp.Close();
+        //}
+
+        _items?.Clear();
+    }
 }

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Widgets/FixedWrapPanel.cs

@@ -85,44 +85,36 @@ public class FixedWrapPanel : Panel, INavigableContainer
     /// <inheritdoc/>
     protected override Size MeasureOverride(Size constraint)
     {
+        var panelSize = default(MutableSize);
+        var lineSize = default(MutableSize);
+        int itemsInCurrentLine = 0;
         double itemWidth = (constraint.Width - (Spacing * (ItemsPerLine - 1))) / ItemsPerLine;
-        MutableSize currentLineSize = default;
-        MutableSize panelSize = default;
-        Size lineConstraint = new(constraint.Width, constraint.Height);
-        Size childConstraint = new(itemWidth - Spacing, constraint.Height);
 
-        for (int i = 0, count = Children.Count; i < count; i++)
+        foreach (var child in Children.OfType<Control>())
         {
-            Control child = Children[i];
-            if (child is null)
-            {
-                continue;
-            }
+            child.Measure(new Size(itemWidth, constraint.Height));
+            var childSize = child.DesiredSize;
 
-            child.Measure(childConstraint);
-            Size childSize = new(itemWidth, child.DesiredSize.Height);
-
-            if (MathUtilities.GreaterThan(currentLineSize.Width + childSize.Width + Spacing, lineConstraint.Width))
+            if (itemsInCurrentLine == ItemsPerLine)
             {
-                // Need to switch to another line
-                panelSize.Width = Max(currentLineSize.Width, panelSize.Width);
-                panelSize.Height += currentLineSize.Height;
-                currentLineSize = new(childSize);
+                // Start a new line
+                panelSize.Width = Math.Max(panelSize.Width, lineSize.Width);
+                panelSize.Height += lineSize.Height + Spacing;
+                lineSize = new MutableSize(childSize.Width, childSize.Height);
+                itemsInCurrentLine = 1;
             }
             else
             {
-                // Continue to accumulate a line
-                currentLineSize.Width += childSize.Width + Spacing;
-                currentLineSize.Height = Max(childSize.Height, currentLineSize.Height);
+                // Add to the current line
+                lineSize.Width += childSize.Width + (itemsInCurrentLine > 0 ? Spacing : 0);
+                lineSize.Height = Math.Max(lineSize.Height, childSize.Height);
+                itemsInCurrentLine++;
             }
         }
 
-        // The last line size, if any should be added
-        panelSize.Width = Max(currentLineSize.Width, panelSize.Width);
-        panelSize.Height = currentLineSize.Height;
-
-        if (double.IsInfinity(panelSize.Width))
-            panelSize.Width = 0;
+        // Add the last line size
+        panelSize.Width = Math.Max(panelSize.Width, lineSize.Width);
+        panelSize.Height += lineSize.Height;
 
         return panelSize.ToSize();
     }
@@ -130,41 +122,33 @@ public class FixedWrapPanel : Panel, INavigableContainer
     /// <inheritdoc/>
     protected override Size ArrangeOverride(Size finalSize)
     {
-        double itemWidth = (finalSize.Width - (Spacing * (ItemsPerLine - 1))) / ItemsPerLine;
-        int firstInLine = 0;
-        double accumulatedHeight = 0;
-        var currentLineSize = default(MutableSize);
-
-        for (int i = 0; i < Children.Count; i++)
+        var itemWidth = (finalSize.Width - (Spacing * (ItemsPerLine - 1))) / ItemsPerLine;
+        var position = default(MutablePoint);
+        var lineHeight = 0.0;
+        int itemsInCurrentLine = 0;
+        try
         {
-            Control child = Children[i];
-            if (child == null)
+            foreach (var child in Children.OfType<Control>())
             {
-                continue;
-            }
+                if (itemsInCurrentLine == ItemsPerLine)
+                {
+                    // Move to the next line
+                    position.X = 0;
+                    position.Y += lineHeight + Spacing;
+                    lineHeight = 0;
+                    itemsInCurrentLine = 0;
+                }
 
-            MutableSize itemSize = new(itemWidth, child.DesiredSize.Height);
-            if (MathUtilities.GreaterThan(currentLineSize.Width + itemSize.Width, finalSize.Width))
-            {
-                // Need to switch to another line
-                ArrangeLine(accumulatedHeight, currentLineSize.Height, firstInLine, i, itemWidth);
-                accumulatedHeight += currentLineSize.Height;
-                currentLineSize = itemSize;
-                firstInLine = i;
-            }
-            else
-            {
-                // Continue to accumulate a line
-                currentLineSize.Width += itemSize.Width;
-                currentLineSize.Height = Max(itemSize.Height, currentLineSize.Height);
+                var childSize = new Size(itemWidth, child.DesiredSize.Height);
+                child.Arrange(new Rect(position.ToPoint(), childSize));
+
+                position.X += itemWidth + Spacing;
+                lineHeight = Math.Max(lineHeight, childSize.Height);
+                itemsInCurrentLine++;
             }
         }
-
-        if (firstInLine < Children.Count)
-        {
-            // Arrange the last line, if any
-            ArrangeLine(accumulatedHeight, currentLineSize.Height, firstInLine, Children.Count, itemWidth);
-        }
+        catch
+        { }
 
         return finalSize;
     }
@@ -180,19 +164,32 @@ public class FixedWrapPanel : Panel, INavigableContainer
                 continue;
             }
 
-            if (i < end - 1)
+            try
             {
-                child.Arrange(new Rect(x, y, width - Spacing, height));
-                x += width + Spacing;
-            }
-            else
-            {
-                child.Arrange(new Rect(x, y, width, height));
-                x += width;
+                if (i < end - 1 || i % ItemsPerLine == 0)
+                {
+
+                    child.Arrange(new Rect(x, y, width - Spacing, height));
+                    x += width + Spacing;
+                }
+                else
+                {
+                    child.Arrange(new Rect(x, y, width, height));
+                    x += width;
+                }
             }
+            catch { }
         }
     }
 
+    record struct MutablePoint
+    {
+        internal double X;
+        internal double Y;
+
+        internal readonly Point ToPoint() => new Point(X, Y);
+    }
+
     record struct MutableSize
     {
         internal MutableSize(double width, double height)

src/BD.WTTS.Client.Avalonia/UI/Views/Pages/DebugPage.axaml

@@ -135,11 +135,15 @@
             <ItemsControl>
                 <ItemsControl.Items>
                     <Border Height="30" Background="Red" />
-                    <Border Background="Blue" />
-                    <Border Background="Yellow" />
+                    <Border Height="30" Background="Blue" />
                     <Border Height="30" Background="Yellow" />
-                    <Border Background="Red" />
-                    <Border Background="Blue" />
+                    <Border Height="30" Background="Yellow" />
+                    <Border Height="30" Background="Red" />
+                    <Border Height="30" Background="Blue" />
+                    <Border Height="30" Background="Blue" />
+                    <Border Height="30" Background="Blue" />
+                    <Border Height="30" Background="Blue" />
+                    <Border Height="30" Background="Red" />
                 </ItemsControl.Items>
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>

src/BD.WTTS.Client.Avalonia/UI/Views/Pages/HomePage.axaml

@@ -74,13 +74,18 @@
             MaxWidth="1080"
             Spacing="20">
             <spp:Snackbar
-                Title="{Binding Path=Res.Notice_Tray_Title, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
                 VerticalAlignment="Top"
                 IsClosable="False"
                 IsOpen="True"
                 IsVisible="{spp:OnPlatform !GA}"
                 Message="当前使用的程序版本为测试版本，可能会有各种各样不可言明的 Bug，遇到问题请理性反馈，谢谢。"
                 Severity="Warning" />
+            <spp:Snackbar
+                VerticalAlignment="Top"
+                IsClosable="False"
+                IsOpen="True"
+                IsVisible="{spp:OnPlatform !GA}"
+                Message="如果您不喜欢当前主页为默认启动页面可以在【设置-界面设置-启动时默认打开页面】处更改" />
             <spp:Snackbar
                 Title="{Binding Path=Res.Notice_Tray_Title, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
                 VerticalAlignment="Top"
@@ -282,6 +287,7 @@
                             <!--<Border spp:Animations.EnableAnimations="True">-->
                             <spp:AppItem
                                 Title="{Binding Name}"
+                                MinHeight="250"
                                 MaxWidth="260"
                                 Classes="Vertical Scale"
                                 ClickCommand="{Binding OpenBrowserCommand, Source={x:Static spp:App.Instance}}"

src/BD.WTTS.Client.Avalonia/UI/Views/Pages/MainView.axaml

@@ -218,6 +218,7 @@
                                                         <TextBlock Text="{Binding Path=User.NickName, Mode=OneWay, Source={x:Static s:UserService.Current}}" />
                                                         <Border
                                                             Padding="5,1"
+                                                            HorizontalAlignment="Left"
                                                             VerticalAlignment="Center"
                                                             CornerRadius="2"
                                                             IsVisible="{Binding Path=User.UserType, Mode=OneWay, Source={x:Static s:UserService.Current}, Converter={StaticResource EnumEqualValueConverter}, ConverterParameter={x:Static enum:UserType.Sponsor}}">

src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_UI.axaml

@@ -341,6 +341,7 @@
                 <ComboBox SelectedItem="{Binding Source={x:Static ms:UISettings.WindowBackgroundMaterial}, Path=Value, Mode=TwoWay}">
                     <ComboBox.Items>
                         <spp:WindowBackgroundMaterial>None</spp:WindowBackgroundMaterial>
+                        <spp:WindowBackgroundMaterial>Transparent</spp:WindowBackgroundMaterial>
                         <spp:WindowBackgroundMaterial>Blur</spp:WindowBackgroundMaterial>
                         <spp:WindowBackgroundMaterial>AcrylicBlur</spp:WindowBackgroundMaterial>
                         <spp:WindowBackgroundMaterial>Mica</spp:WindowBackgroundMaterial>

src/BD.WTTS.Client.Avalonia/UI/Views/Windows/MainWindow.axaml.cs

@@ -62,7 +62,7 @@ public sealed partial class MainWindow : ReactiveAppWindow<MainWindowViewModel>
                 pageType = page.PageType;
             }
         }
-        INavigationService.Instance.Navigate(pageType ?? typeof(PluginStorePage));
+        INavigationService.Instance.Navigate(pageType ?? typeof(HomePage));
         return true;
     }
 

src/BD.WTTS.Client.IPC/Mobius/MobiusAttribute.cs

@@ -1,17 +0,0 @@
-namespace BD;
-
-[AttributeUsage(AttributeTargets.All, Inherited = false)]
-public sealed class MobiusAttribute : Attribute
-{
-    public MobiusAttribute()
-    {
-
-    }
-
-    public MobiusAttribute(string str)
-    {
-
-    }
-
-    public bool Obsolete { get; set; }
-}

src/BD.WTTS.Client.IPC/Services/IPCSubProcessService.cs

@@ -6,7 +6,6 @@ namespace BD.WTTS.Services;
 /// <summary>
 /// 子进程的 IPC 服务实现
 /// </summary>
-[Mobius(Obsolete = true)]
 public interface IPCSubProcessService : IDisposable
 {
     /// <summary>
@@ -312,10 +311,29 @@ sealed class IPCSubProcessFileSystem : IOPath.FileSystemBase
         config.LoggingRules.Add(new LoggingRule("*", minLevel, target));
     }
 
+    public static string GetLogDirPath(string? moduleName = null, string? cacheDirectory = null)
+    {
+        cacheDirectory ??= IOPath.CacheDirectory;
+
+        string logDirPath;
+        if (moduleName == null)
+        {
+            logDirPath = Path.Combine(cacheDirectory, LogDirName);
+        }
+        else
+        {
+            var dirName = GetDirectoryName(moduleName);
+            logDirPath = Path.Combine(cacheDirectory, LogDirName, dirName);
+        }
+
+        IOPath.DirCreateByNotExists(logDirPath);
+        return logDirPath;
+    }
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static void InitLog(
         ref string? logDirPath,
-        string? mainProcessModuleName = null,
+        string? moduleName = null,
         string? alias = null,
         string? cacheDirectory = null
 #if STARTUP_WATCH_TRACE || DEBUG
@@ -336,16 +354,8 @@ sealed class IPCSubProcessFileSystem : IOPath.FileSystemBase
 
         cacheDirectory ??= IOPath.CacheDirectory;
 
-        if (mainProcessModuleName == null)
-        {
-            logDirPath = Path.Combine(cacheDirectory, LogDirName);
-        }
-        else
-        {
-            var dirName = GetDirectoryName(mainProcessModuleName);
-            logDirPath = Path.Combine(cacheDirectory, LogDirName, dirName);
-        }
-        IOPath.DirCreateByNotExists(logDirPath);
+        logDirPath = GetLogDirPath(moduleName, cacheDirectory);
+
 #if (STARTUP_WATCH_TRACE || DEBUG) && !LIB_CLIENT_IPC
         if (watchTrace) Startup.WatchTrace.Record("InitLog.IOPath");
 #endif

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy.csproj

@@ -76,6 +76,9 @@
 		<Compile Include="..\BD.WTTS.Client\Services\Platform\IPlatformService.OS.Linux.Etc.Os_Release.cs">
 			<LinkBase>Services\Platform</LinkBase>
 		</Compile>
+		<Compile Include="..\BD.WTTS.Client\Services\Mvvm\LogConsoleService.Logger.cs">
+			<LinkBase>Services\Mvvm</LinkBase>
+		</Compile>
 	</ItemGroup>
 
 	<ItemGroup>
@@ -104,6 +107,7 @@
 		<PackageReference Include="System.Drawing.Common" />
 		<PackageReference Include="System.Runtime.Caching" />
 		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
+		<PackageReference Include="Utf8StringInterpolation" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$([MSBuild]::IsOSPlatform('windows')) AND ($(RuntimeIdentifier.StartsWith('win-')) OR $(RuntimeIdentifier) == '')">

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Mobius/MobiusAttribute.cs

@@ -1,17 +0,0 @@
-namespace BD;
-
-[AttributeUsage(AttributeTargets.All, Inherited = false)]
-public sealed class MobiusAttribute : Attribute
-{
-    public MobiusAttribute()
-    {
-
-    }
-
-    public MobiusAttribute(string str)
-    {
-
-    }
-
-    public bool Obsolete { get; set; }
-}

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Models/Abstractions/IReverseProxyConfig.cs

@@ -20,7 +20,7 @@ public partial interface IReverseProxyConfig
     /// </summary>
     /// <param name="domain"></param>
     /// <returns></returns>
-    bool IsMatch(string domain) => TryGetDomainConfig(domain, out _);
+    bool IsMatch(string url) => TryGetDomainConfig(url, out _);
 
     /// <summary>
     /// 尝试获取域名配置
@@ -28,7 +28,7 @@ public partial interface IReverseProxyConfig
     /// <param name="domain"></param>
     /// <param name="value"></param>
     /// <returns></returns>
-    bool TryGetDomainConfig(string domain, [MaybeNullWhen(false)] out IDomainConfig value);
+    bool TryGetDomainConfig(string url, [MaybeNullWhen(false)] out IDomainConfig value);
 
     /// <summary>
     /// 尝试获取脚本配置
@@ -36,7 +36,7 @@ public partial interface IReverseProxyConfig
     /// <param name="domain"></param>
     /// <param name="value"></param>
     /// <returns></returns>
-    bool TryGetScriptConfig(string domain, [MaybeNullWhen(false)] out IEnumerable<IScriptConfig> value);
+    bool TryGetScriptConfig(string url, [MaybeNullWhen(false)] out IEnumerable<IScriptConfig> value);
 
     /// <summary>
     /// 尝试获取脚本内容

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Models/ReverseProxyConfig.cs

@@ -148,26 +148,26 @@ sealed class ReverseProxyConfig : IReverseProxyConfig
     //    return result;
     //}
 
-    public bool TryGetDomainConfig(string domain, [MaybeNullWhen(false)] out IDomainConfig value)
+    public bool TryGetDomainConfig(string url, [MaybeNullWhen(false)] out IDomainConfig value)
     {
         //value = domainConfigCache.GetOrAdd(domain.Host, GetDomainConfig);
 
-        var uri = new UriBuilder(domain).Uri;
+        var uri = new UriBuilder(url).Uri;
 
         domainConfigCache.TryGetValue(uri.Host, out value);
         if (value != null)
             return true;
 
-        value = GetDomainConfig(domain);
+        value = GetDomainConfig(url);
         if (value == null)
             return false;
 
         domainConfigCache.TryAdd(uri.Host, value);
         return true;
 
-        IDomainConfig? GetDomainConfig(string domain)
+        IDomainConfig? GetDomainConfig(string url)
         {
-            var key = domainConfigs.Keys.FirstOrDefault(item => item.IsMatch(domain));
+            var key = domainConfigs.Keys.FirstOrDefault(item => item.IsMatch(url));
             return key == null ? null : domainConfigs[key];
         }
     }

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Program.cs

@@ -81,6 +81,7 @@ static void ConfigureServices(IServiceCollection services)
 #if DEBUG
         l.AddConsole();
 #endif
+        l.AddProvider(new LogConsoleService.Utf8StringLoggerProvider(moduleName));
     });
 
     // 设置仓储层数据库文件存放路径

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services.Implementation/Http/LifetimeHttpHandler.cs

@@ -12,10 +12,10 @@ sealed class LifetimeHttpHandler : DelegatingHandler
 
     public LifeTimeKey LifeTimeKey { get; }
 
-    public LifetimeHttpHandler(IDomainResolver domainResolver, LifeTimeKey lifeTimeKey, TimeSpan lifeTime, Action<LifetimeHttpHandler> deactivateAction)
+    public LifetimeHttpHandler(IDomainResolver domainResolver, IWebProxy webProxy, LifeTimeKey lifeTimeKey, TimeSpan lifeTime, Action<LifetimeHttpHandler> deactivateAction)
     {
         LifeTimeKey = lifeTimeKey;
-        InnerHandler = new ReverseProxyHttpClientHandler(lifeTimeKey.DomainConfig, domainResolver);
+        InnerHandler = new ReverseProxyHttpClientHandler(lifeTimeKey.DomainConfig, domainResolver, webProxy);
         timer = new Timer(OnTimerCallback, deactivateAction, lifeTime, Timeout.InfiniteTimeSpan);
     }
 

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services.Implementation/Http/ReverseProxyHttpClient.cs

@@ -15,7 +15,7 @@ public class ReverseProxyHttpClient : HttpMessageInvoker
     //   = new(new ProductHeaderValue(Constants.HARDCODED_APP_NAME_NEW + "_" + DateTimeOffset.UtcNow.Ticks, ThisAssembly.Version));
 
     public ReverseProxyHttpClient(IDomainConfig domainConfig, IDomainResolver domainResolver)
-        : this(new ReverseProxyHttpClientHandler(domainConfig, domainResolver), disposeHandler: true)
+        : this(new ReverseProxyHttpClientHandler(domainConfig, domainResolver, HttpNoProxy.Instance), disposeHandler: true)
     {
     }
 

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services.Implementation/Http/ReverseProxyHttpClientHandler.cs

@@ -7,12 +7,14 @@ sealed class ReverseProxyHttpClientHandler : DelegatingHandler
 {
     readonly IDomainConfig domainConfig;
     readonly IDomainResolver domainResolver;
+    readonly IWebProxy webProxy;
     readonly TimeSpan connectTimeout = TimeSpan.FromSeconds(10d);
 
-    public ReverseProxyHttpClientHandler(IDomainConfig domainConfig, IDomainResolver domainResolver)
+    public ReverseProxyHttpClientHandler(IDomainConfig domainConfig, IDomainResolver domainResolver, IWebProxy webProxy)
     {
         this.domainConfig = domainConfig;
         this.domainResolver = domainResolver;
+        this.webProxy = webProxy;
         InnerHandler = CreateSocketsHttpHandler();
     }
 
@@ -53,12 +55,199 @@ sealed class ReverseProxyHttpClientHandler : DelegatingHandler
     {
         Proxy = HttpNoProxy.Instance,
         UseProxy = false,
+        PreAuthenticate = false,
         UseCookies = false,
         AllowAutoRedirect = false,
         AutomaticDecompression = DecompressionMethods.None,
         ConnectCallback = ConnectCallback,
+        EnableMultipleHttp2Connections = true,
+        RequestHeaderEncodingSelector = (_, _) => Encoding.UTF8,
+        ResponseHeaderEncodingSelector = (_, _) => Encoding.UTF8,
     };
 
+    private async ValueTask<Stream> ConnectThroughProxyAsync(SocketsHttpConnectionContext context, CancellationToken cancellationToken)
+    {
+        if (context.InitialRequestMessage.RequestUri == null)
+        {
+            throw new InvalidOperationException("Request URI is null");
+        }
+        var proxyUri = webProxy.GetProxy(context.InitialRequestMessage.RequestUri);
+        if (proxyUri == null)
+        {
+            throw new InvalidOperationException("Proxy URI is null");
+        }
+
+        var proxyEndPoint = new DnsEndPoint(proxyUri.Host, proxyUri.Port);
+        var socket = new Socket(SocketType.Stream, ProtocolType.Tcp);
+        await socket.ConnectAsync(proxyEndPoint, cancellationToken);
+
+        var stream = new NetworkStream(socket, ownsSocket: true);
+
+        // 确定代理类型
+        var proxyType = DetermineProxyType(proxyUri);
+
+        switch (proxyType)
+        {
+            case ExternalProxyType.Http:
+                await ConnectHttpProxy(stream, context, cancellationToken);
+                break;
+            case ExternalProxyType.Socks4:
+                await ConnectSocks4Proxy(stream, context, cancellationToken);
+                break;
+            case ExternalProxyType.Socks5:
+                await ConnectSocks5Proxy(stream, context, cancellationToken);
+                break;
+        }
+
+        if (context.InitialRequestMessage.RequestUri.Scheme == "https" || context.InitialRequestMessage.RequestUri.Port == 443)
+        {
+            var requestContext = context.InitialRequestMessage.GetRequestContext();
+            var tlsSniValue = requestContext.TlsSniValue;
+            var sslStream = new SslStream(stream, leaveInnerStreamOpen: false);
+            await sslStream.AuthenticateAsClientAsync(new SslClientAuthenticationOptions
+            {
+                TargetHost = tlsSniValue.Value,
+                RemoteCertificateValidationCallback = (sender, cert, chain, errors) => true,
+            }, cancellationToken);
+
+            return sslStream;
+        }
+
+        return stream;
+    }
+
+    private ExternalProxyType DetermineProxyType(Uri proxyUri)
+    {
+        return proxyUri.Scheme.ToLower() switch
+        {
+            "socks4" => ExternalProxyType.Socks4,
+            "socks5" => ExternalProxyType.Socks5,
+            _ => ExternalProxyType.Http
+        };
+
+        throw new NotImplementedException("Proxy type determination needs to be implemented");
+    }
+
+    private async Task ConnectHttpProxy(NetworkStream stream, SocketsHttpConnectionContext context, CancellationToken cancellationToken)
+    {
+        var credentials = webProxy.Credentials as NetworkCredential;
+        var authHeader = credentials != null
+            ? $"Proxy-Authorization: Basic {Convert.ToBase64String(Encoding.ASCII.GetBytes($"{credentials.UserName}:{credentials.Password}"))}\r\n"
+            : string.Empty;
+
+        var connectRequest = $"CONNECT {context.DnsEndPoint.Host}:{context.DnsEndPoint.Port} HTTP/1.1\r\n" +
+                             $"Host: {context.DnsEndPoint.Host}:{context.DnsEndPoint.Port}\r\n" +
+                             $"{authHeader}\r\n";
+
+        var connectBytes = Encoding.ASCII.GetBytes(connectRequest);
+        await stream.WriteAsync(connectBytes, cancellationToken);
+
+        var buffer = new byte[1024];
+        var bytesRead = await stream.ReadAsync(buffer, cancellationToken);
+        var response = Encoding.ASCII.GetString(buffer, 0, bytesRead);
+
+        if (!response.StartsWith("HTTP/1.1 200"))
+        {
+            throw new Exception($"Proxy connection failed: {response}");
+        }
+    }
+
+    private async Task ConnectSocks4Proxy(NetworkStream stream, SocketsHttpConnectionContext context, CancellationToken cancellationToken)
+    {
+        var credentials = webProxy.Credentials as NetworkCredential;
+        var userId = credentials?.UserName ?? string.Empty;
+
+        var destinationAddress = await GetIPEndPointsAsync(context.DnsEndPoint, cancellationToken).FirstAsync();
+        var portBytes = BitConverter.GetBytes((ushort)context.DnsEndPoint.Port);
+        if (BitConverter.IsLittleEndian) Array.Reverse(portBytes);
+
+        var request = new byte[] { 0x04, 0x01 }
+            .Concat(portBytes)
+            .Concat(destinationAddress.Address.GetAddressBytes())
+            .Concat(Encoding.ASCII.GetBytes(userId))
+            .Concat(new byte[] { 0x00 })
+            .ToArray();
+
+        await stream.WriteAsync(request, cancellationToken);
+
+        var response = new byte[8];
+        await stream.ReadAsync(response, cancellationToken);
+
+        if (response[1] != 0x5A)
+        {
+            throw new Exception($"SOCKS4 proxy connection failed: {response[1]}");
+        }
+    }
+
+    private async Task ConnectSocks5Proxy(NetworkStream stream, SocketsHttpConnectionContext context, CancellationToken cancellationToken)
+    {
+        var credentials = webProxy.Credentials as NetworkCredential;
+
+        // SOCKS5 握手
+        byte[] authMethod = credentials != null ? new byte[] { 0x02 } : new byte[] { 0x00 };
+        await stream.WriteAsync(new byte[] { 0x05, 0x01 }.Concat(authMethod).ToArray(), cancellationToken);
+
+        var response = new byte[2];
+        await stream.ReadAsync(response, cancellationToken);
+
+        if (response[0] != 0x05)
+        {
+            throw new Exception("SOCKS5 handshake failed");
+        }
+
+        // 如果需要身份验证
+        if (response[1] == 0x02 && credentials != null)
+        {
+            var userBytes = Encoding.ASCII.GetBytes(credentials.UserName);
+            var passBytes = Encoding.ASCII.GetBytes(credentials.Password);
+            var authRequest = new byte[] { 0x01, (byte)userBytes.Length }
+                .Concat(userBytes)
+                .Concat(new byte[] { (byte)passBytes.Length })
+                .Concat(passBytes)
+                .ToArray();
+
+            await stream.WriteAsync(authRequest, cancellationToken);
+
+            var authResponse = new byte[2];
+            await stream.ReadAsync(authResponse, cancellationToken);
+
+            if (authResponse[1] != 0x00)
+            {
+                throw new Exception("SOCKS5 authentication failed");
+            }
+        }
+
+        // 发送连接请求
+        byte[] addressBytes;
+        byte addressType;
+        if (IPAddress.TryParse(context.DnsEndPoint.Host, out IPAddress? ipAddress))
+        {
+            addressBytes = ipAddress.GetAddressBytes();
+            addressType = (byte)(ipAddress.AddressFamily == AddressFamily.InterNetwork ? 1 : 4);
+        }
+        else
+        {
+            addressBytes = Encoding.ASCII.GetBytes(context.DnsEndPoint.Host);
+            addressType = 3; // 域名
+        }
+
+        var request = new byte[] { 0x05, 0x01, 0x00, addressType }
+            .Concat(addressType == 3 ? new[] { (byte)addressBytes.Length } : Array.Empty<byte>())
+            .Concat(addressBytes)
+            .Concat(BitConverter.GetBytes((ushort)context.DnsEndPoint.Port).Reverse())
+            .ToArray();
+
+        await stream.WriteAsync(request, cancellationToken);
+
+        var connectResponse = new byte[10];
+        await stream.ReadAsync(connectResponse, cancellationToken);
+
+        if (connectResponse[1] != 0x00)
+        {
+            throw new Exception($"SOCKS5 connection failed: {connectResponse[1]}");
+        }
+    }
+
     /// <summary>
     /// 连接回调
     /// </summary>
@@ -67,6 +256,11 @@ sealed class ReverseProxyHttpClientHandler : DelegatingHandler
     /// <returns></returns>
     async ValueTask<Stream> ConnectCallback(SocketsHttpConnectionContext context, CancellationToken cancellationToken)
     {
+        if (webProxy != null && !HttpNoProxy.IsNoProxy(webProxy))
+        {
+            return await ConnectThroughProxyAsync(context, cancellationToken);
+        }
+
         var innerExceptions = new List<Exception>();
         var ipEndPoints = GetIPEndPointsAsync(context.DnsEndPoint, cancellationToken);
 

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services.Implementation/HttpServer/Middleware/HttpLocalRequestMiddleware.cs

@@ -1,3 +1,4 @@
+using System.Net;
 using MediaTypeHeaderValue = System.Net.Http.Headers.MediaTypeHeaderValue;
 
 // ReSharper disable once CheckNamespace
@@ -140,11 +141,6 @@ sealed class HttpLocalRequestMiddleware
                 return null;
             }
 
-            StringValues cookie = context.Request.Headers["cookie-steamTool"];
-            if (StringValues.IsNullOrEmpty(cookie))
-                cookie = context.Request.Headers["Cookie"];
-            StringValues referer = context.Request.Headers["Referer-steamTool"];
-
             context.Response.Headers.AccessControlAllowOrigin = context.Request.Headers.Origin.Count == 0 ? "*" : context.Request.Headers.Origin;
             context.Response.Headers.AccessControlAllowHeaders = "*";
             context.Response.Headers.AccessControlAllowMethods = "*";
@@ -166,29 +162,30 @@ sealed class HttpLocalRequestMiddleware
                     Method = methodObj,
                     Content = hasReqContent ? new StreamContent(context.Request.Body) : null,
                 };
-                req.Headers.UserAgent.ParseAdd(context.Request.Headers.UserAgent);
-                if (!StringValues.IsNullOrEmpty(cookie))
+                foreach (var item in context.Request.Headers)
                 {
-                    CookieHttpClient.CookieContainer.Add(new Cookie
-                    {
-                        CommentUri = requestUri,
-                        Domain = requestUri.Host,
-                        Value = cookie,
-                    });
-                    // req.Headers.Add("Cookie", cookie);
-                }
-                if (!StringValues.IsNullOrEmpty(referer))
-                {
-                    try
-                    {
-                        var refererUri = new Uri(referer.ToString());
-                        req.Headers.Referrer = refererUri;
-                    }
-                    catch
+                    var headers = item.Key.ToLower();
+                    if (headers.EndsWith("-steamtool"))
                     {
 
+                        if (headers.Equals("cookie", StringComparison.OrdinalIgnoreCase))
+                        {
+                            CookieHttpClient.CookieContainer.Add(new Cookie
+                            {
+                                CommentUri = requestUri,
+                                Domain = requestUri.Host,
+                                Value = item.Value
+                            });
+                        }
+                        if (headers.Equals("referer", StringComparison.OrdinalIgnoreCase))
+                        {
+                            var refererUri = new Uri(item.Value.ToString());
+                            req.Headers.Referrer = refererUri;
+                        }
+                        req.Headers.TryAddWithoutValidation(item.Key.TrimEnd("-steamtool"), (IEnumerable<string?>)item.Value);
                     }
                 }
+                req.Headers.UserAgent.ParseAdd(context.Request.Headers.UserAgent);
                 if (hasReqContent)
                 {
                     req.Content!.Headers.ContentType = MediaTypeHeaderValue.Parse(context.Request.ContentType.ThrowIsNull());

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services.Implementation/HttpServer/Middleware/HttpReverseProxyMiddleware.cs

@@ -1,5 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.HttpServer/HttpReverseProxyMiddleware.cs
 
+using Microsoft.AspNetCore.Http;
 using Yarp.ReverseProxy.Forwarder;
 
 // ReSharper disable once CheckNamespace
@@ -38,6 +39,7 @@ sealed partial class HttpReverseProxyMiddleware
     public async Task InvokeAsync(HttpContext context, RequestDelegate next)
     {
         var url = context.Request.GetDisplayUrl();
+        //var url = context.Request.GetDisplayUrl().Remove(0, context.Request.Scheme.Length + 3);
 
         var isScriptInject = reverseProxyConfig.TryGetScriptConfig(url, out var scriptConfigs);
 
@@ -50,9 +52,31 @@ sealed partial class HttpReverseProxyMiddleware
             context.Response.Body = memoryStream;
         }
 
-        if (TryGetDomainConfig(url, out var domainConfig) == false)
+        if (TryGetDomainConfig(url.Remove(0, context.Request.Scheme.Length + 3), out var domainConfig) == false)
         {
-            await next(context);
+            if (reverseProxyConfig.Service.TwoLevelAgentEnable)
+            {
+                var httpClient = httpClientFactory.CreateHttpClient("GlobalProxy", defaultDomainConfig);
+                var destinationPrefix = GetDestinationPrefix(context.Request.Scheme, context.Request.Host, null);
+                var forwarderRequestConfig = new ForwarderRequestConfig()
+                {
+                    Version = context.Request.Protocol switch
+                    {
+                        var protocol when protocol.StartsWith("HTTP/2") => System.Net.HttpVersion.Version20,
+                        var protocol when protocol.StartsWith("HTTP/3") => System.Net.HttpVersion.Version30,
+                        _ => System.Net.HttpVersion.Version11,
+                    },
+                };
+                var error = await httpForwarder.SendAsync(context, destinationPrefix, httpClient, forwarderRequestConfig, HttpTransformer.Empty);
+                if (error != ForwarderError.None)
+                {
+                    await HandleErrorAsync(context, error);
+                }
+            }
+            else
+            {
+                await next(context);
+            }
             return;
         }
 
@@ -158,7 +182,7 @@ sealed partial class HttpReverseProxyMiddleware
             return true;
         }
 
-        var host = new Uri(uri).Host;
+        var host = new UriBuilder(uri).Host;
         // 未配置的域名，但仍然被解析到本机 IP 的域名
         if (IsDomain(host))
         {

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services.Implementation/LazyReverseProxyServiceImpl.cs

@@ -23,6 +23,8 @@ sealed class LazyReverseProxyServiceImpl : IReverseProxyService
 
     public byte[]? GetFlowStatistics_Bytes() => impl().GetFlowStatistics_Bytes();
 
+    public string? GetLogAllMessage() => impl().GetLogAllMessage();
+
     public async Task<StartProxyResult> StartProxyAsync(byte[] reverseProxySettings)
     {
         var result = await impl().StartProxyAsync(reverseProxySettings);

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services.Implementation/Net/DnsDohAnalysisService.cs

@@ -53,14 +53,14 @@ sealed class DnsDohAnalysisService : GeneralHttpClientFactory
     {
         if (dnsClients.TryGetValue(dohAddresUri, out var value))
             return value;
-        var client = CreateClient($"{TAG}_{dohAddresUri}", HttpHandlerCategory.Default);
-        //var handler = new HttpClientHandler
-        //{
-        //    UseCookies = false,
-        //    UseProxy = false,
-        //    Proxy = HttpNoProxy.Instance,
-        //};
-        //var client = new HttpClient(handler);
+        //var client = CreateClient($"{TAG}_{dohAddresUri}", HttpHandlerCategory.Default);
+        var handler = new HttpClientHandler
+        {
+            UseCookies = false,
+            UseProxy = false,
+            Proxy = HttpNoProxy.Instance,
+        };
+        var client = new HttpClient(handler);
         client.BaseAddress = dohAddresUri;
         var dnsClient = new DnsHttpClient(client);
         dnsClients.TryAdd(dohAddresUri, dnsClient);

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services.Implementation/ReverseProxyHttpClientFactory.cs

@@ -1,11 +1,14 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.Http/HttpClientFactory.cs
 
 // ReSharper disable once CheckNamespace
+using System.Net;
+
 namespace BD.WTTS.Services.Implementation;
 
 sealed class ReverseProxyHttpClientFactory : IReverseProxyHttpClientFactory
 {
     readonly IDomainResolver domainResolver;
+    readonly IWebProxy webProxy;
 
     /// <summary>
     /// 首次生命周期
@@ -27,9 +30,19 @@ sealed class ReverseProxyHttpClientFactory : IReverseProxyHttpClientFactory
     /// </summary>
     readonly ConcurrentDictionary<LifeTimeKey, Lazy<LifetimeHttpHandler>> httpHandlerLazyCache = new();
 
-    public ReverseProxyHttpClientFactory(IDomainResolver domainResolver)
+    public ReverseProxyHttpClientFactory(IDomainResolver domainResolver, IReverseProxyConfig reverseProxyConfig)
     {
         this.domainResolver = domainResolver;
+        if (reverseProxyConfig.Service.TwoLevelAgentEnable)
+        {
+            this.webProxy = new WebProxy($"{reverseProxyConfig.Service.TwoLevelAgentProxyType}://{reverseProxyConfig.Service.TwoLevelAgentIp}:{reverseProxyConfig.Service.TwoLevelAgentPortId}", true, null, null);
+            if (!string.IsNullOrEmpty(reverseProxyConfig.Service.TwoLevelAgentUserName) || !string.IsNullOrEmpty(reverseProxyConfig.Service.TwoLevelAgentPassword))
+            {
+                webProxy.Credentials = new NetworkCredential(reverseProxyConfig.Service.TwoLevelAgentUserName, reverseProxyConfig.Service.TwoLevelAgentPassword);
+            }
+        }
+        else
+            this.webProxy = HttpNoProxy.Instance;
     }
 
     public ReverseProxyHttpClient CreateHttpClient(string domain, IDomainConfig domainConfig)
@@ -43,7 +56,7 @@ sealed class ReverseProxyHttpClientFactory : IReverseProxyHttpClientFactory
     }
 
     LifetimeHttpHandler CreateLifetimeHttpHandler(LifeTimeKey lifeTimeKey, TimeSpan lifeTime)
-        => new(domainResolver, lifeTimeKey, lifeTime, OnLifetimeHttpHandlerDeactivate);
+        => new(domainResolver, webProxy, lifeTimeKey, lifeTime, OnLifetimeHttpHandlerDeactivate);
 
     void OnLifetimeHttpHandlerDeactivate(LifetimeHttpHandler lifetimeHttpHandler)
     {

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services.Implementation/ReverseProxyServiceImpl.cs

@@ -164,10 +164,13 @@ abstract class ReverseProxyServiceImpl : IReverseProxySettings
         {
             if (string.IsNullOrWhiteSpace(reverseProxySettings.ProxyIp))
                 return StartProxyResultCode.Exception;
-            var inUsePort = SocketHelper.IsUsePort(IPAddress.Parse(reverseProxySettings.ProxyIp!), 443);
-            if (inUsePort)
+            if (reverseProxySettings.ProxyMode == ProxyMode.Hosts)
             {
-                return StartProxyResultCode.BindPortError;
+                var inUsePort = SocketHelper.IsUsePort(IPAddress.Parse(reverseProxySettings.ProxyIp!), 443);
+                if (inUsePort)
+                {
+                    return StartProxyResultCode.BindPortError;
+                }
             }
         }
 

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services.Implementation/YarpReverseProxyServiceImpl.cs

@@ -65,6 +65,8 @@ sealed partial class YarpReverseProxyServiceImpl : ReverseProxyServiceImpl, IRev
                 WebRootPath = RootPath,
             });
 
+            builder.Logging.AddProvider(new LogConsoleService.Utf8StringLoggerProvider(AssemblyInfo.Accelerator));
+
             builder.Services.Configure<HostFilteringOptions>(static o =>
             {
                 o.AllowEmptyHosts = true;
@@ -80,17 +82,19 @@ sealed partial class YarpReverseProxyServiceImpl : ReverseProxyServiceImpl, IRev
             builder.WebHost.UseKestrel(options =>
             {
                 options.AddServerHeader = false;
+                options.RequestHeaderEncodingSelector = _ => Encoding.UTF8;
+                options.ResponseHeaderEncodingSelector = _ => Encoding.UTF8;
                 options.NoLimit();
 #if WINDOWS
 #if !NET7_0_OR_GREATER
-                            if (OperatingSystem2.IsWindows7())
-                            {
-                                //https://github.com/dotnet/aspnetcore/issues/22563
-                                options.ConfigureHttpsDefaults(httpsOptions =>
-                                {
-                                    httpsOptions.SslProtocols = SslProtocols.Tls12 | SslProtocols.Tls13;
-                                });
-                            }
+                if (OperatingSystem2.IsWindows7())
+                {
+                    //https://github.com/dotnet/aspnetcore/issues/22563
+                    options.ConfigureHttpsDefaults(httpsOptions =>
+                    {
+                        httpsOptions.SslProtocols = SslProtocols.Tls12 | SslProtocols.Tls13;
+                    });
+                }
 #endif
                 //options.ListenSshReverseProxy();
                 //options.ListenGitReverseProxy();
@@ -165,6 +169,12 @@ sealed partial class YarpReverseProxyServiceImpl : ReverseProxyServiceImpl, IRev
         return bytes;
     }
 
+    public string? GetLogAllMessage()
+    {
+        var result = LogConsoleService.Builder;
+        return result.ToString();
+    }
+
     // IDisposable
 
     protected override void DisposeCore()

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services/IReverseProxyService.cs

@@ -15,6 +15,12 @@ partial interface IReverseProxyService
     /// </summary>
     /// <returns></returns>
     byte[]? GetFlowStatistics_Bytes();
+
+    /// <summary>
+    /// 获取所有日志信息
+    /// </summary>
+    /// <returns></returns>
+    string? GetLogAllMessage();
 }
 
 public static partial class ReverseProxyServiceExtensions

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services/Net/IDnsAnalysisService.Constants.cs

@@ -12,8 +12,8 @@ public partial interface IDnsAnalysisService // 公共常量定义
     const string DNS_Ali_DohAddres2 = "https://223.6.6.6/dns-query";
     const string DNS_Ali_DohAddres3 = "https://223.5.5.5/dns-query";
 
-    const string Dnspod_DohAddres = "https://1.12.12.12";
-    const string Dnspod_DohAddres2 = "https://doh.pub";
+    const string Dnspod_DohAddres = "https://1.12.12.12/dns-query";
+    const string Dnspod_DohAddres2 = "https://doh.pub/dns-query";
     const string Dnspod_DohAddres3 = "https://120.53.53.53/dns-query";
 
     const string Google_DohAddres = "https://dns.google";

src/BD.WTTS.Client.Plugins.Accelerator/Enums/TransportProtocol.cs

@@ -0,0 +1,7 @@
+namespace BD.WTTS.Enums;
+
+public enum TransportProtocol
+{
+    Tcp,
+    Udp,
+}

src/BD.WTTS.Client.Plugins.Accelerator/Helpers/WinDivertInitHelper.cs

@@ -42,6 +42,14 @@ static class WinDivertInitHelper
     /// </summary>
     public static async Task InitializeAsync()
     {
+        (byte[] WinDivert_dll, byte[] WinDivert64_sys) data = default;
+
+        void GetData()
+        {
+            if (data != default)
+                data = GetWinDivertBinRes();
+        }
+
         if (libraryPath != null && libraryDirPath != null)
         {
             bool isWrite;
@@ -55,9 +63,10 @@ static class WinDivertInitHelper
                 }
                 else
                 {
+                    GetData();
                     var libraryBytes = await File.ReadAllBytesAsync(libraryPath);
                     var libraryHash = SHA256.HashData(libraryBytes);
-                    var libraryHashRes = SHA256.HashData(WinDivertBinRes.WinDivert_dll);
+                    var libraryHashRes = SHA256.HashData(data.WinDivert_dll!);
                     if (libraryHash.SequenceEqual(libraryHashRes)) // 哈希值相同，不写入
                     {
                         isWrite = false;
@@ -76,14 +85,15 @@ static class WinDivertInitHelper
 
             if (isWrite) // 检查文件不存在时写入
             {
+                GetData();
                 switch (RuntimeInformation.ProcessArchitecture)
                 {
                     //case Architecture.X86:
                     //    break;
                     case Architecture.X64:
                         IOPath.DirCreateByNotExists(libraryDirPath);
-                        var task1 = File.WriteAllBytesAsync(Path.Combine(libraryDirPath, "WinDivert64.sys"), WinDivertBinRes.WinDivert64_sys);
-                        var task2 = File.WriteAllBytesAsync(libraryPath, WinDivertBinRes.WinDivert_dll);
+                        var task1 = File.WriteAllBytesAsync(Path.Combine(libraryDirPath, "WinDivert64.sys"), data.WinDivert64_sys!);
+                        var task2 = File.WriteAllBytesAsync(libraryPath, data.WinDivert_dll!);
                         await Task.WhenAll(task1, task2);
                         break;
                 }
@@ -128,5 +138,15 @@ static class WinDivertInitHelper
                 break;
         }
     }
+
+    static (byte[] WinDivert_dll, byte[] WinDivert64_sys) GetWinDivertBinRes()
+    {
+        byte[] bytes = WinDivertBinRes.WinDivert_mpo;
+        bytes.AsSpan().Reverse();
+
+        var data = MemoryPackSerializer.Deserialize<byte[][]>(bytes)!;
+
+        return (data[0], data[1]);
+    }
 }
 #endif

src/BD.WTTS.Client.Plugins.Accelerator/Properties/WinDivertResource.Designer.cs

@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
 //     运行时版本:4.0.30319.42000
@@ -63,19 +63,9 @@ namespace BD.WTTS.Properties {
         /// <summary>
         ///   查找 System.Byte[] 类型的本地化资源。
         /// </summary>
-        internal static byte[] WinDivert_dll {
+        internal static byte[] WinDivert_mpo {
             get {
-                object obj = ResourceManager.GetObject("WinDivert_dll", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   查找 System.Byte[] 类型的本地化资源。
-        /// </summary>
-        internal static byte[] WinDivert64_sys {
-            get {
-                object obj = ResourceManager.GetObject("WinDivert64_sys", resourceCulture);
+                object obj = ResourceManager.GetObject("WinDivert_mpo", resourceCulture);
                 return ((byte[])(obj));
             }
         }

src/BD.WTTS.Client.Plugins.Accelerator/Properties/WinDivertResource.resx

@@ -99,10 +99,7 @@
 		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 	</resheader>
 	<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-	<data name="WinDivert64_sys" type="System.Resources.ResXFileRef, System.Windows.Forms">
-		<value>..\..\..\ref\WinDivert64.sys;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</data>
-	<data name="WinDivert_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
-		<value>..\..\..\ref\WinDivert.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	<data name="WinDivert_mpo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\..\..\ref\WinDivert.mpo;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 	</data>
 </root>

src/BD.WTTS.Client.Plugins.Accelerator/Services.Implementation/BackendAcceleratorServiceImpl.XunYou.cs

@@ -80,6 +80,11 @@ partial class BackendAcceleratorServiceImpl
     /// <inheritdoc/>
     public async Task<ApiRsp<bool>> XY_IsInstall(CancellationToken cancellationToken = default)
     {
+        if (!XunYouSDK.IsSupported)
+        {
+            return ApiRspHelper.Ok(false);
+        }
+
         var result = XunYouSDK.IsInstall();
         await Task.CompletedTask;
         return result;
@@ -88,6 +93,11 @@ partial class BackendAcceleratorServiceImpl
     /// <inheritdoc/>
     public async Task<ApiRsp<XunYouUninstallCode>> XY_Uninstall(CancellationToken cancellationToken = default)
     {
+        if (!XunYouSDK.IsSupported)
+        {
+            return ApiRspHelper.Ok(XunYouUninstallCode.卸载成功);
+        }
+
         var result = XunYouSDK.Uninstall();
         await Task.CompletedTask;
         return result;
@@ -104,9 +114,16 @@ partial class BackendAcceleratorServiceImpl
         string? svrPath = default,
         CancellationToken cancellationToken = default)
     {
+        if (!XunYouSDK.IsSupported)
+        {
+            return ApiRspHelper.Ok(0);
+        }
+
+        var show = XunYouShowCommands.SW_HIDE;
         var result = XunYouSDK.StartEx2(
             openid,
             nickname,
+            show,
             gameid,
             area,
             server,
@@ -128,6 +145,11 @@ partial class BackendAcceleratorServiceImpl
       string? svrName = default,
       CancellationToken cancellationToken = default)
     {
+        if (!XunYouSDK.IsSupported)
+        {
+            return ApiRspHelper.Ok(0);
+        }
+
         var result = XunYouSDK.StartAccel(
             gameid,
             area,
@@ -141,6 +163,11 @@ partial class BackendAcceleratorServiceImpl
     /// <inheritdoc/>
     public async Task<ApiRsp<XunYouAccelStateModel?>> XY_GetAccelStateEx(CancellationToken cancellationToken = default)
     {
+        if (!XunYouSDK.IsSupported)
+        {
+            return ApiRspHelper.Ok((XunYouAccelStateModel?)null);
+        }
+
         var result = GetXunYouAccelStateModel(lastXunYouState);
         await Task.CompletedTask;
         return result;
@@ -149,6 +176,11 @@ partial class BackendAcceleratorServiceImpl
     /// <inheritdoc/>
     public async IAsyncEnumerable<ApiRsp<int>> XY_Install(string installPath, [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
+        if (!XunYouSDK.IsSupported)
+        {
+            yield break;
+        }
+
         var channel = Channel.CreateUnbounded<int>();
         int XunYouDownLoadCallback(int par, nint thisptr)
         {
@@ -177,6 +209,11 @@ partial class BackendAcceleratorServiceImpl
     /// <inheritdoc/>
     public async Task<ApiRsp<XunYouSendResultCode>> XY_StopAccel(CancellationToken cancellationToken = default)
     {
+        if (!XunYouSDK.IsSupported)
+        {
+            return ApiRspHelper.Ok(XunYouSendResultCode.发送成功);
+        }
+
         var result = XunYouSDK.Stop();
         await Task.CompletedTask;
         return result;
@@ -185,6 +222,11 @@ partial class BackendAcceleratorServiceImpl
     /// <inheritdoc/>
     public async Task<ApiRsp<XunYouIsRunningCode>> XY_IsRunning(CancellationToken cancellationToken = default)
     {
+        if (!XunYouSDK.IsSupported)
+        {
+            return ApiRspHelper.Ok(XunYouIsRunningCode.加速器未启动);
+        }
+
         var result = XunYouSDK.IsRunning();
         await Task.CompletedTask;
         return result;
@@ -193,8 +235,26 @@ partial class BackendAcceleratorServiceImpl
     /// <inheritdoc/>
     public async Task<ApiRsp<XunYouStartGameCode>> XY_StartGame(CancellationToken cancellationToken = default)
     {
+        if (!XunYouSDK.IsSupported)
+        {
+            return ApiRspHelper.Ok(XunYouStartGameCode.失败);
+        }
+
         var result = XunYouSDK.StartGame();
         await Task.CompletedTask;
         return result;
     }
+
+    /// <inheritdoc/>
+    public async Task<ApiRsp<int>> XY_ShowWinodw(bool showHide, CancellationToken cancellationToken = default)
+    {
+        if (!XunYouSDK.IsSupported)
+        {
+            return ApiRspHelper.Ok(0);
+        }
+
+        XunYouSDK.xunyou_show(Convert.ToInt32(showHide));
+        await Task.CompletedTask;
+        return ApiRspHelper.Ok(0);
+    }
 }

src/BD.WTTS.Client.Plugins.Accelerator/Services.Implementation/NetworkTestService.cs

@@ -0,0 +1,932 @@
+using STUN.Client;
+using STUN.StunResult;
+using System.Net.NetworkInformation;
+
+namespace BD.WTTS.Services.Implementation;
+
+internal partial class NetworkTestService : INetworkTestService
+{
+    #region 常量
+
+    // 默认测试地址
+    const string DEFAULT_TESTSERVER_HOSTNAME = "stun.syncthing.net";
+
+    const int DEFAULT_PORT = 3478;
+    const int DEFAULT_TLSPORT = 5349;
+
+    // 默认端口号
+    const int DEFAULT_TESTSTUN3489_PORT = DEFAULT_PORT;
+
+    // 默认端口号
+    const int DEFAULT_TESTSTUN5389_PORT = DEFAULT_PORT;
+
+    #endregion 常量
+
+    public NetworkTestService()
+    {
+    }
+
+    #region Ping
+
+    /// <summary>
+    /// 将 Internet 控制消息协议 (ICMP) 回显请求消息发送到远程计算机，并等待来自该计算机的 ICMP 回送答复消息。 有关 ICMP 消息的详细说明，请参阅 RFC 792，可从 https://www.ietf.org获取。
+    /// </summary>
+    /// <param name="testHostNameOrAddress"></param>
+    /// <param name="timeout"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public async Task<PingReply> TestPingAsync(string testHostNameOrAddress, TimeSpan timeout, CancellationToken cancellationToken = default)
+    {
+        using Ping p = new Ping();
+
+        var reply = await p.SendPingAsync(
+                testHostNameOrAddress,
+                timeout,
+                cancellationToken: cancellationToken
+            );
+
+        return reply;
+    }
+
+    #endregion Ping
+
+    #region Upload/Download Speed Test
+
+    public async Task<(bool success, double? rate)> TestUploadSpeedAsync(
+            string uploadServerUrl,
+            byte[] uploadBytes,
+            CancellationToken cancellationToken = default
+        )
+    {
+        using HttpClient testClient = new HttpClient();
+
+        return await TestUploadSpeedCoreAsync(
+                () => testClient,
+                BuildUploadContent,
+                uploadServerUrl,
+                uploadBytes,
+                cancellationToken
+            );
+
+        static MultipartFormDataContent BuildUploadContent(byte[] data)
+        {
+            MultipartFormDataContent cotent = new MultipartFormDataContent();
+
+            cotent.Add(new ByteArrayContent(data));
+
+            return cotent;
+        }
+    }
+
+    public async Task<(bool success, double? rate)> TestDownloadSpeedAsync(string downloadUrl, CancellationToken cancellationToken = default)
+    {
+        using HttpClient testClient = new HttpClient();
+
+        return await TestDownloadSpeedCoreAsync(downloadUrl, () => testClient, cancellationToken);
+    }
+
+    /// <summary>
+    /// 测试上传速度
+    /// </summary>
+    /// <param name="httpClientFunc">自定义用于发送 http 请求的 client </param>
+    /// <param name="uploadContentFunc">自定义上传内容类型</param>
+    /// <param name="uploadServerUrl"></param>
+    /// <param name="uploadBytes"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    static async Task<(bool success, double? rate)> TestUploadSpeedCoreAsync(
+                Func<HttpClient> httpClientFunc,
+                Func<byte[], HttpContent> uploadContentFunc,
+                string uploadServerUrl,
+                byte[] uploadBytes,
+                CancellationToken cancellationToken = default
+            )
+    {
+        if (string.IsNullOrWhiteSpace(uploadServerUrl))
+            return (false, null);
+
+        var uploadContent = uploadContentFunc(uploadBytes);
+        try
+        {
+            var httpClient = httpClientFunc();
+
+            Stopwatch watch = Stopwatch.StartNew();
+
+            var resp = await httpClient.PostAsync(uploadServerUrl, uploadContent, cancellationToken);
+
+            resp.EnsureSuccessStatusCode();
+
+            watch.Stop();
+
+            return (true, GetRate(uploadBytes.Length, watch.Elapsed.TotalSeconds));
+        }
+        catch (Exception ex)
+        {
+            Log.Error(nameof(NetworkTestService), ex, "测试上传异常");
+        }
+
+        return (false, null);
+    }
+
+    /// <summary>
+    /// 测试下载速度
+    /// </summary>
+    /// <param name="url"></param>
+    /// <param name="httpClientFunc"></param>
+    /// <returns></returns>
+    static async Task<(bool success, double? rate)> TestDownloadSpeedCoreAsync(string url, Func<HttpClient>? httpClientFunc = null, CancellationToken cancellationToken = default)
+    {
+        var httpClient = httpClientFunc?.Invoke() ?? new HttpClient();
+
+        try
+        {
+            Stopwatch watch = Stopwatch.StartNew();
+
+            var resp = await httpClient.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+
+            resp.EnsureSuccessStatusCode();
+
+            var bytesArray = await resp.Content.ReadAsByteArrayAsync(cancellationToken);
+
+            watch.Stop();
+
+            return (true, GetRate(bytesArray.Length, watch.Elapsed.TotalSeconds));
+        }
+        catch (Exception ex)
+        {
+            Log.Error(nameof(NetworkTestService), ex, "测试下载异常");
+            return (false, null);
+        }
+        finally
+        {
+            if (httpClientFunc == null)
+                httpClient.Dispose();
+        }
+    }
+
+    static double GetRate(long byteArrayLength, double seconds)
+    {
+        if (seconds == 0)
+            throw new ArgumentException("时间不能小于0", nameof(seconds));
+
+        long bits = byteArrayLength * 8;
+        double megabits = bits / 1_000_000.0; // 将比特转换为兆比特
+
+        return megabits / seconds; // 返回速率，单位是 Mbps
+    }
+
+    #endregion Upload/Download Speed Test
+
+    #region STUN 测试
+
+    #region RFC3489
+
+    StunClient3489? _stunClient;
+
+    /// <summary>
+    /// 测试 STUN 客户端 基于 RFC3489
+    /// </summary>
+    /// <param name="testServerHostName">测试服务地址</param>
+    /// <param name="testServerPort">测试服务端口</param>
+    /// <param name="localIPEndPoint">本机 IP </param>
+    /// <param name="force">强制刷新</param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public async Task<ClassicStunResult?> TestStunClient3489Async(
+            string? testServerHostName = DEFAULT_TESTSERVER_HOSTNAME,
+            int? testServerPort = DEFAULT_TESTSTUN3489_PORT,
+            IPEndPoint? localIPEndPoint = null,
+            bool force = false,
+            CancellationToken cancellationToken = default
+        )
+    {
+        testServerHostName ??= DEFAULT_TESTSERVER_HOSTNAME;
+        testServerPort ??= DEFAULT_TESTSTUN3489_PORT;
+
+        if (_stunClient == null || force)
+            _stunClient = await GetStunClient3489Async(testServerHostName, testServerPort.Value, localIPEndPoint);
+
+        try
+        {
+            await _stunClient.QueryAsync(cancellationToken);
+        }
+        catch (OperationCanceledException) { throw; }
+        catch (Exception ex)
+        {
+            Log.Error(nameof(NetworkTestService), ex, "TestStunClient3489Async 异常");
+            return null;
+        }
+
+        return _stunClient.State;
+    }
+
+    private async ValueTask<StunClient3489> GetStunClient3489Async(string serverHostName, int port, IPEndPoint? localIPEndPoint = null)
+    {
+        IPEndPoint serverEndpoint = await GetServerIPEndPointAsync(serverHostName, port);
+
+        IPEndPoint localEndpoint = localIPEndPoint ?? new IPEndPoint(IPAddress.Any, default);
+
+        var client = new StunClient3489(
+             serverEndpoint,
+             localEndpoint
+             );
+
+        return client;
+    }
+
+    private async Task<IPEndPoint> GetServerIPEndPointAsync(string hostNameOrAddress, int port)
+    {
+        var serverIps = await Dns.GetHostAddressesAsync(hostNameOrAddress);
+
+        IPEndPoint serverEndpoint = new IPEndPoint(serverIps.First(), port);
+
+        return serverEndpoint;
+    }
+
+    #endregion RFC3489
+
+    #region RFC5389
+
+    /// <summary>
+    /// 测试 STUN 客户端 基于 RFC5389
+    /// </summary>
+    /// <param name="protocol"></param>
+    /// <param name="testServerHostName"></param>
+    /// <param name="testServerPort"></param>
+    /// <param name="localIPEndPoint"></param>
+    /// <param name="force"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public async Task<StunResult5389?> TestStunClient5389Async(
+            TransportProtocol protocol,
+            string? testServerHostName = DEFAULT_TESTSERVER_HOSTNAME,
+            int? testServerPort = DEFAULT_TESTSTUN5389_PORT,
+            IPEndPoint? localIPEndPoint = null,
+            CancellationToken cancellationToken = default
+        )
+    {
+        testServerHostName ??= DEFAULT_TESTSERVER_HOSTNAME;
+        testServerPort ??= DEFAULT_TESTSTUN5389_PORT;
+
+        IStunClient5389 client = await GetStunClient5389Async(protocol, testServerHostName, testServerPort.Value, localIPEndPoint);
+
+        if (client == null)
+            return null;
+
+        try
+        {
+            await client.QueryAsync(cancellationToken);
+        }
+        catch (OperationCanceledException) { throw; }
+        catch (Exception ex)
+        {
+            Log.Error(nameof(NetworkTestService), ex, "TestStunClient5389Async 异常");
+            return null;
+        }
+
+        return client.State;
+    }
+
+    private async ValueTask<IStunClient5389> GetStunClient5389Async(TransportProtocol protocol, string serverHostName, int port, IPEndPoint? localIPEndPoint = null)
+    {
+        IPEndPoint serverEndpoint = await GetServerIPEndPointAsync(serverHostName, port);
+
+        IPEndPoint localEndpoint = localIPEndPoint ?? new IPEndPoint(IPAddress.Any, default);
+
+        IStunClient5389 client = protocol == TransportProtocol.Tcp
+            ? new StunClient5389TCP(serverEndpoint, localEndpoint)
+            : new StunClient5389UDP(serverEndpoint, localEndpoint);
+
+        return client;
+    }
+
+    #endregion RFC5389
+
+    #endregion STUN 测试
+
+    #region DNS 查询
+
+    /// <summary>
+    /// 测试 DNS UDP
+    /// </summary>
+    /// <param name="testDomain">要测试的域名</param>
+    /// <param name="dnsServerIp">DNS 服务地址</param>
+    /// <param name="dnsServerPort">DNS 服务端口</param>
+    /// <param name="dnsRecordType"> dns 测试类型 </param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public async Task<(long DelayMs, IPAddress[] Address)> TestDNSAsync(
+            string testDomain,
+            string dnsServerIp,
+            int dnsServerPort,
+            DnsQueryAnswerRecord.DnsRecordType dnsRecordType = DnsQueryAnswerRecord.DnsRecordType.A,
+            CancellationToken cancellationToken = default
+        )
+    {
+        using UdpClient udpClient = new UdpClient(dnsServerIp, dnsServerPort);
+
+        var query = new DnsQueryUdpRequest(testDomain, dnsRecordType);
+
+        Stopwatch watch = Stopwatch.StartNew();
+
+        await udpClient.SendAsync(query, cancellationToken);
+
+        var receivedData = await udpClient.ReceiveAsync(cancellationToken);
+
+        watch.Stop();
+
+        var dnsQueryResponse = new DnsQueryUdpResponse(receivedData.Buffer);
+
+        return (watch.ElapsedMilliseconds, dnsQueryResponse.GetAddresses().ToArray());
+    }
+
+    /// <summary>
+    /// 测试 DNS Over Https
+    /// </summary>
+    /// <param name="testDomain"></param>
+    /// <param name="dohServer"></param>
+    /// <param name="dnsRecordType"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public async Task<(long DelayMs, IPAddress[] Address)> TestDNSOverHttpsAsync(
+        string testDomain,
+        string dohServer,
+        DnsQueryAnswerRecord.DnsRecordType dnsRecordType = DnsQueryAnswerRecord.DnsRecordType.A,
+        CancellationToken cancellationToken = default)
+    {
+        var handler = new HttpClientHandler
+        {
+            UseCookies = false,
+            UseProxy = false,
+            Proxy = HttpNoProxy.Instance,
+        };
+        using var client = new HttpClient(handler);
+
+        string queryUrl = $"{dohServer}?name={testDomain}&type={dnsRecordType}";
+
+        Stopwatch watch = Stopwatch.StartNew();
+
+        HttpResponseMessage? resp = null;
+        try
+        {
+            resp = await client.GetAsync(queryUrl, HttpCompletionOption.ResponseContentRead, cancellationToken);
+
+            resp.EnsureSuccessStatusCode();
+        }
+        finally
+        {
+            watch.Stop();
+        }
+
+        var queryResp = await resp.Content.ReadFromJsonAsync<DnsQueryJsonResponse>();
+
+        return (watch.ElapsedMilliseconds, queryResp?.GetAddresses().ToArray() ?? Array.Empty<IPAddress>());
+    }
+
+    #region DNS 解析定义
+
+    internal interface IDnsQueryResponse
+    {
+        List<DnsQueryAnswerRecord> Answers { get; }
+
+        IEnumerable<IPAddress> GetAddresses();
+    }
+
+    internal record DnsQueryUdpResponse : DnsQueryUdpRequest, IDnsQueryResponse
+    {
+        public ushort AnswerCount { get; init; } // (ushort)((_origin[6] << 8) | _origin[7]);
+
+        public ushort AuthorityCount { get; init; } // (ushort)((_origin[8] << 8) | _origin[9]);
+
+        public ushort AdditionalCount { get; init; } // (ushort)((_origin[10] << 8) | _origin[11]);
+
+        public List<DnsQueryAnswerRecord> Answers { get; init; }
+
+        private readonly byte[] _origin;
+
+        public DnsQueryUdpResponse(byte[] origin) : base(origin)
+        {
+            _origin = origin;
+
+            AnswerCount = (ushort)((origin[Position++] << 8) | origin[Position++]);
+            AuthorityCount = (ushort)((origin[Position++] << 8) | origin[Position++]);
+            AdditionalCount = (ushort)((origin[Position++] << 8) | origin[Position++]);
+
+            //  跳过查询问题部分
+            for (int i = 0; i < QuestionCount; i++)
+            {
+                Position = SkipName(origin, Position);
+                Position += 4; // 跳过类型
+            }
+
+            Answers = new List<DnsQueryAnswerRecord>();
+
+            Position = ParseRecords(origin, Position, AnswerCount, Answers);
+            Position = ParseRecords(origin, Position, AuthorityCount, Answers);
+            Position = ParseRecords(origin, Position, AdditionalCount, Answers);
+        }
+
+        private static int ParseRecords(byte[] response, int position, int recordCount, List<DnsQueryAnswerRecord> answers)
+        {
+            for (int i = 0; i < recordCount; i++)
+            {
+                position = ParseName(response, position, out var parsedName);
+
+                int @type = (response[position++] << 8) | response[position++];
+                int @class = (response[position++] << 8) | response[position++];
+                long ttl = (response[position++] << 24) | (response[position++] << 16) | (response[position++] << 8) | response[position++];
+                int dataLength = (response[position++] << 8) | response[position++];
+
+                if (@type == (int)DnsQueryAnswerRecord.DnsRecordType.A && dataLength == 4) // Type A (IPv4)
+                {
+                    var ipAddress = new byte[4];
+                    Array.Copy(response, position, ipAddress, 0, 4);
+
+                    answers.Add(
+                            new DnsQueryAnswerRecord.A(
+                                    parsedName!,
+                                    (DnsQueryAnswerRecord.DnsRecordType)@type,
+                                    ttl,
+                                    new IPAddress(ipAddress)
+                                )
+                        );
+                }
+                else if (@type == (int)DnsQueryAnswerRecord.DnsRecordType.AAAA && dataLength == 16) // Type AAAA (IPv6)
+                {
+                    var ipAddress = new byte[16];
+                    Array.Copy(response, position, ipAddress, 0, 16);
+
+                    answers.Add(
+                          new DnsQueryAnswerRecord.AAAA(
+                                  parsedName!,
+                                  (DnsQueryAnswerRecord.DnsRecordType)@type,
+                                  ttl,
+                                  new IPAddress(ipAddress)
+                              )
+                      );
+                }
+                else if (type == (int)DnsQueryAnswerRecord.DnsRecordType.CNAME)
+                {
+                    ParseName(response, position, out var parsedCName);
+
+                    if (string.IsNullOrEmpty(parsedCName))
+                    {
+                        Log.Error(nameof(NetworkTestService), $"解析 DNS CName字段异常 name :{parsedName}, data length :{dataLength}");
+                        continue;
+                    }
+
+                    answers.Add(
+                            new DnsQueryAnswerRecord.CName(
+                                  parsedName!,
+                                  (DnsQueryAnswerRecord.DnsRecordType)@type,
+                                  ttl,
+                                  parsedCName!
+                                )
+                            );
+                }
+                else
+                {
+                    Log.Error(nameof(NetworkTestService), $"未支持的 DNS响应记录 type :{@type} ,class :{@class} name :{parsedName}, data length :{dataLength}");
+                    continue;
+                }
+
+                position += dataLength;
+            }
+
+            return position;
+        }
+
+        private static int ParseName(byte[] response, int position, out string? name)
+        {
+            StringBuilder nameBuilder = new StringBuilder();
+            int originalPosition = position;
+            bool isPointer = false;
+
+            // 0表示结束
+            while (response[position] != 0)
+            {
+                // dns 协议 名称可能是 指针 或者 直接表示
+                // 如果大于等于 192 表示是指针开始
+                if (response[position] >= 192)
+                {
+                    if (!isPointer)
+                    {
+                        originalPosition = position + 2;
+                        isPointer = true;
+                    }
+                    // 因为 00111111 可以忽略前两位 用 0x3F 掩码获取指针
+                    int pointer = ((response[position] & 0x3F) << 8) | response[position + 1];
+                    position = pointer;
+                }
+                else
+                {
+                    int length = response[position];
+                    position++;
+                    nameBuilder.Append(Encoding.ASCII.GetString(response, position, length));
+                    position += length;
+                    if (response[position] != 0)
+                    {
+                        nameBuilder.Append('.');
+                    }
+                }
+            }
+
+            if (!isPointer)
+            {
+                position++;
+            }
+            else
+            {
+                position = originalPosition;
+            }
+
+            name = nameBuilder.ToString();
+            return position;
+        }
+
+        private static int SkipName(byte[] response, int position)
+        {
+            if (response[position] >= 192)
+            {
+                return position + 2; // Name is a pointer
+            }
+
+            while (response[position] != 0)
+            {
+                position += response[position] + 1;
+            }
+            return position + 1;
+        }
+
+        public IEnumerable<IPAddress> GetAddresses()
+        {
+            foreach (var answer in Answers)
+            {
+                if (answer is DnsQueryAnswerRecord.A a)
+                {
+                    yield return a.Data;
+                }
+                else if (answer is DnsQueryAnswerRecord.AAAA aaaa)
+                {
+                    yield return aaaa.Data;
+                }
+            }
+            yield break;
+        }
+    }
+
+    internal record DnsQueryUdpRequest
+    {
+        public ushort QueryId { get; init; } // (ushort)((_origin[0] << 8) | _origin[1]);
+
+        public ushort Flags { get; init; } //(ushort)((_origin[2] << 8) | _origin[3]);
+
+        public ushort QuestionCount { get; init; } //  (ushort)((_origin[4] << 8) | _origin[5]);
+
+        public int Length => _origin.Length;
+
+        protected int Position { get; set; }
+
+        private readonly byte[] _origin;
+
+        public DnsQueryUdpRequest(byte[] origin)
+        {
+            _origin = origin;
+
+            Position = default;
+            QueryId = (ushort)((origin[Position++] << 8) | origin[Position++]);
+            Flags = (ushort)((origin[Position++] << 8) | origin[Position++]);
+            QuestionCount = (ushort)((origin[Position++] << 8) | origin[Position++]);
+        }
+
+        public DnsQueryUdpRequest(string domainName, DnsQueryAnswerRecord.DnsRecordType type = DnsQueryAnswerRecord.DnsRecordType.A)
+            : this(CreateDnsQuery(domainName, type))
+        {
+        }
+
+        public static byte[] CreateDnsQuery(string domainName, DnsQueryAnswerRecord.DnsRecordType type = DnsQueryAnswerRecord.DnsRecordType.A)
+        {
+            // 12字节报文头部
+            const int DNS_QUERY_HEADER_BYTECOUNT = 12;
+            // 2字节终止符长度
+            const int DNS_QUERY_END_BYTECOUNT = 2;
+            // 4字节查询类型和查询类字段
+            const int DNS_QUERY_QUERYTYPE_BYTECOUNT = 4;
+
+            // dns queryId 范围是一个16位字段,16位无符号的范围就是0-65535
+            var queryId = (ushort)Random.Shared.Next(0, 65536);
+
+            byte[] dnsQuery = new byte[
+                DNS_QUERY_HEADER_BYTECOUNT
+                + domainName.Length
+                + DNS_QUERY_END_BYTECOUNT
+                + DNS_QUERY_QUERYTYPE_BYTECOUNT
+            ];
+
+            BuildQueryHeader(queryId, dnsQuery);
+            BuildBody(domainName, dnsQuery);
+
+            return dnsQuery;
+
+            void BuildQueryHeader(ushort queryId, byte[] query)
+            {
+                // 查询 ID 是一个 16 位（2 字节）的字段。
+                // 为了将这个 16 位的整数值分配到字节数组 dnsQuery 的两个字节中，
+                // 我们需要将其高 8 位和低 8 位分别存储在数组的第一个和第二个字节中
+                query[0] = (byte)(queryId >> 8);
+                query[1] = (byte)(queryId & 0xFF);
+
+                // 标志字段（Flags） 2 - 3 包含各种控制标志
+                // 如查询/响应（QR）、操作码（Opcode）、授权回答（AA）、截断（TC）、递归期望（RD）、递归可用（RA）等
+                query[2] = 0x01;
+
+                // 问题计数（QDCOUNT）4 - 5 表示查询问题部分的数量
+                query[5] = 0x01;
+
+                // 其他查询报文中通常为 0
+                // 回答记录计数（ANCOUNT),授权记录计数（NSCOUNT）,附加记录计数（ARCOUNT）
+            }
+
+            void BuildBody(string domainName, byte[] query)
+            {
+                // 获取域名组成部分 因为后面要根据部分长度和内容填充结果
+                string[] domainParts = domainName.Split('.');
+
+                int currentPosition = 12;
+
+                // 根据 dns 查询报文 每一部分开始都要填充这一部分的长度
+                foreach (var domainPart in domainParts)
+                {
+                    // 标志当前 part 的长度
+                    query[currentPosition++] = (byte)domainPart.Length;
+
+                    // 获取填充的字节
+                    var fillBytes = Encoding.ASCII.GetBytes(domainPart);
+
+                    // 移动到当前查询体中
+                    fillBytes.CopyTo(query, currentPosition);
+
+                    // 移动当前填充开始位置
+                    currentPosition += fillBytes.Length;
+                }
+                // 0 表示域名结束
+                query[currentPosition++] = 0x00;
+
+                // 填充 查询类型和查询类字段
+                query[currentPosition++] = 0x00;
+                query[currentPosition++] = (byte)type;  // 表示查询类型为 A 记录（IPv4 地址）。
+                query[currentPosition++] = 0x00;
+                query[currentPosition++] = 0x01;  // 表示查询类为 IN（Internet 类）。
+            }
+        }
+
+        public static implicit operator byte[](DnsQueryUdpRequest data)
+        {
+            return data._origin;
+        }
+
+        public static implicit operator ReadOnlyMemory<byte>(DnsQueryUdpRequest data)
+        {
+            return data._origin;
+        }
+    }
+
+    internal record DnsQueryJsonResponse : IDnsQueryResponse
+    {
+        [S_JsonProperty("Status")]
+        public int Status { get; init; }
+
+        [S_JsonProperty("TC")]
+        public bool TC { get; init; }
+
+        [S_JsonProperty("RD")]
+        public bool RD { get; init; }
+
+        [S_JsonProperty("RA")]
+        public bool RA { get; init; }
+
+        [S_JsonProperty("AD")]
+        public bool AD { get; init; }
+
+        [S_JsonProperty("CD")]
+        public bool CD { get; init; }
+
+        [S_JsonProperty("Answer")]
+        public List<DnsQueryAnswerRecord> Answers { get; init; }
+
+        public DnsQueryJsonResponse(
+                int status,
+                bool tc,
+                bool rd,
+                bool ra,
+                bool ad,
+                bool cd,
+                List<DnsQueryAnswerRecord>? answers
+            )
+        {
+            Status = status;
+            TC = tc;
+            RD = rd;
+            RA = ra;
+            AD = ad;
+            CD = cd;
+            Answers = answers?.ToList() ?? new();
+        }
+
+        public IEnumerable<IPAddress> GetAddresses()
+        {
+            return Answers.Aggregate(Enumerable.Empty<IPAddress>(), (acc, x) =>
+            {
+                if (x is DnsQueryAnswerRecord.A ipv4)
+                {
+                    return acc.Append(ipv4.Data);
+                }
+                else if (x is DnsQueryAnswerRecord.AAAA ipv6)
+                {
+                    return acc.Append(ipv6.Data);
+                }
+                return acc;
+            });
+        }
+    }
+
+    class DnsQueryAnswerRecordConverter : System.Text.Json.Serialization.JsonConverter<DnsQueryAnswerRecord>
+    {
+        public override DnsQueryAnswerRecord? Read(ref Utf8JsonReader reader, Type typeToConvert, SystemTextJsonSerializerOptions options)
+        {
+            if (typeToConvert == typeof(DnsQueryAnswerRecord))
+            {
+                if (reader.TokenType == JsonTokenType.StartObject)
+                {
+                    var json = JsonDocument.ParseValue(ref reader);
+
+                    if (json.RootElement.TryGetProperty("type", out var typeElement))
+                    {
+                        var type = typeElement.GetInt32();
+
+                        if (type == (int)DnsQueryAnswerRecord.DnsRecordType.A)
+                        {
+                            return json.RootElement.Deserialize<DnsQueryAnswerRecord.A>();
+                        }
+                        else if (type == (int)DnsQueryAnswerRecord.DnsRecordType.AAAA)
+                        {
+                            return json.RootElement.Deserialize<DnsQueryAnswerRecord.AAAA>();
+                        }
+                        else if (type == (int)DnsQueryAnswerRecord.DnsRecordType.CNAME)
+                        {
+                            return json.RootElement.Deserialize<DnsQueryAnswerRecord.CName>();
+                        }
+                    }
+                }
+            }
+            return null;
+        }
+
+        public override void Write(Utf8JsonWriter writer, DnsQueryAnswerRecord value, SystemTextJsonSerializerOptions options)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    [System.Text.Json.Serialization.JsonConverter(typeof(DnsQueryAnswerRecordConverter))]
+    [JsonDerivedType(typeof(DnsQueryAnswerRecord.A))]
+    [JsonDerivedType(typeof(DnsQueryAnswerRecord.AAAA))]
+    [JsonDerivedType(typeof(DnsQueryAnswerRecord.CName))]
+    internal record DnsQueryAnswerRecord
+    {
+        [S_JsonProperty("name")]
+        public string Name { get; set; }
+
+        [S_JsonProperty("type")]
+        public DnsRecordType Type { get; set; }
+
+        [S_JsonProperty("TTL")]
+        public long Ttl { get; set; }
+
+        public DnsQueryAnswerRecord(
+                string name,
+                DnsRecordType type,
+                long ttl
+            )
+        {
+            Name = name;
+            Type = @type;
+            Ttl = ttl;
+            //Data = data;
+            //DataLength = data.Length;
+        }
+
+        #region DnsQueryAnswerRecord 子类派生
+
+        internal record A : DnsQueryAnswerRecord
+        {
+            public A(string name, DnsRecordType type, long ttl, IPAddress data) : base(name, type, ttl)
+            {
+                Data = data;
+            }
+
+            [S_JsonProperty("data")]
+            [SystemTextJsonConverter(typeof(IPAddressConverter))]
+            public IPAddress Data { get; set; }
+        }
+
+        internal record AAAA : DnsQueryAnswerRecord
+        {
+            public AAAA(string name, DnsRecordType type, long ttl, IPAddress data) : base(name, type, ttl)
+            {
+                Data = data;
+            }
+
+            [S_JsonProperty("data")]
+            [SystemTextJsonConverter(typeof(IPAddressConverter))]
+            public IPAddress Data { get; set; }
+        }
+
+        internal record CName : DnsQueryAnswerRecord
+        {
+            public CName(string name, DnsRecordType type, long ttl, string data) : base(name, type, ttl)
+            {
+                Data = data;
+            }
+
+            [S_JsonProperty("data")]
+            public string Data { get; set; }
+        }
+
+        #endregion DnsQueryAnswerRecord 子类派生
+
+        class IPAddressConverter : System.Text.Json.Serialization.JsonConverter<IPAddress>
+        {
+            public override IPAddress? Read(ref Utf8JsonReader reader, Type typeToConvert, SystemTextJsonSerializerOptions options)
+            {
+                IPAddress? result = null;
+
+                // 目前只解析字符串
+                if (reader.TokenType == JsonTokenType.String)
+                {
+                    string? ipString = reader.GetString();
+                    result = !string.IsNullOrWhiteSpace(ipString) ? IPAddress.Parse(ipString) : default;
+                }
+                // byte 数组支持
+                else if (reader.TokenType == JsonTokenType.StartArray)
+                {
+                    List<byte> bytes = new List<byte>();
+
+                    while (reader.Read())
+                    {
+                        if (reader.TokenType == JsonTokenType.EndArray)
+                            break;
+
+                        if (reader.TokenType == JsonTokenType.Number)
+                        {
+                            bytes.Add((byte)reader.GetInt32());
+                        }
+                        else if (reader.TokenType == JsonTokenType.String)
+                        {
+                            if (byte.TryParse(reader.GetString(), out byte byteValue))
+                            {
+                                bytes.Add(byteValue);
+                            }
+                        }
+                    }
+
+                    result = bytes.Count == 4 || bytes.Count == 16 ? new IPAddress(bytes.ToArray()) : default;
+                }
+
+                return result;
+            }
+
+            public override void Write(Utf8JsonWriter writer, IPAddress value, SystemTextJsonSerializerOptions options)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        internal enum DnsRecordClass : ushort
+        {
+            Internet = 1,     // Internet(IN)
+            Chaos = 3,        // Chaos(CH)
+            Hesiod = 4,       // Hesiod(HS)
+            QCLASSNONE = 254, // QCLASS NONE
+            QCLASSANY = 255,  // QCLASS * (ANY)
+        }
+
+        // 域名系统记录类型 (省略了有些未使用的类型)
+        internal enum DnsRecordType : byte
+        {
+            A = 1,       // 指定域名对应的IPv4地址
+            AAAA = 28,   // 指定域名对应的IPv6地址
+            CNAME = 5,   // 别名记录,
+            MX = 15,     // 邮件交换记录,
+            NS = 2,      // 指定该域名由哪个DNS服务器来进行解析
+            TXT = 16,    // 主机名或域名的说明
+            SOA = 6,     // 起始授权机构
+            PTR = 12,    // 反向IP查询
+            ANY = 255,   // 所有DNS记录类型
+        }
+    }
+
+    #endregion DNS 解析定义
+
+    #endregion DNS 查询
+}

src/BD.WTTS.Client.Plugins.Accelerator/Services/IAcceleratorService.XunYou.cs

@@ -87,6 +87,12 @@ partial interface IAcceleratorService // XunYou
     /// </summary>
     /// <returns></returns>
     Task<ApiRsp<XunYouStartGameCode>> XY_StartGame(CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// 迅游加速器显示隐藏
+    /// </summary>
+    /// <returns></returns>
+    Task<ApiRsp<int>> XY_ShowWinodw(bool showHide, CancellationToken cancellationToken = default);
 }
 
 partial interface IXunYouAccelStateToFrontendCallback

src/BD.WTTS.Client.Plugins.Accelerator/Services/INetworkTestService.cs

@@ -0,0 +1,111 @@
+using STUN.StunResult;
+using System.Net.NetworkInformation;
+using static BD.WTTS.Services.Implementation.NetworkTestService;
+
+namespace BD.WTTS.Services;
+
+internal interface INetworkTestService : IHttpRequestTestService, IStunTestService
+{
+    /// <summary>
+    /// Ping
+    /// </summary>
+    /// <param name="testHostNameOrAddress"></param>
+    /// <param name="timeout"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task<PingReply> TestPingAsync(string testHostNameOrAddress, TimeSpan timeout, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// 测试 DNS UDP
+    /// </summary>
+    /// <param name="testDomain"></param>
+    /// <param name="dnsServerIp"></param>
+    /// <param name="dnsServerPort"></param>
+    /// <param name="dnsRecordType"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task<(long DelayMs, IPAddress[] Address)> TestDNSAsync(
+            string testDomain,
+            string dnsServerIp,
+            int dnsServerPort,
+            DnsQueryAnswerRecord.DnsRecordType dnsRecordType = DnsQueryAnswerRecord.DnsRecordType.A,
+            CancellationToken cancellationToken = default
+        );
+
+    /// <summary>
+    /// 测试 DNS Over Https
+    /// </summary>
+    /// <param name="testDomain"></param>
+    /// <param name="dohServer"></param>
+    /// <param name="dnsRecordType"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task<(long DelayMs, IPAddress[] Address)> TestDNSOverHttpsAsync(
+            string testDomain,
+            string dohServer,
+            DnsQueryAnswerRecord.DnsRecordType dnsRecordType = DnsQueryAnswerRecord.DnsRecordType.A,
+            CancellationToken cancellationToken = default
+        );
+}
+
+internal interface IHttpRequestTestService
+{
+    /// <summary>
+    /// 测试上传速度
+    /// </summary>
+    /// <param name="uploadServerUrl"></param>
+    /// <param name="uploadBytes"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task<(bool success, double? rate)> TestUploadSpeedAsync(
+            string uploadServerUrl,
+            byte[] uploadBytes,
+            CancellationToken cancellationToken = default
+        );
+
+    /// <summary>
+    /// 测试下载速度
+    /// </summary>
+    /// <param name="downloadUrl"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task<(bool success, double? rate)> TestDownloadSpeedAsync(string downloadUrl, CancellationToken cancellationToken = default);
+}
+
+internal interface IStunTestService
+{
+    /// <summary>
+    /// 测试 STUN Client RFC3489
+    /// </summary>
+    /// <param name="testServerHostName">STUN 服务地址</param>
+    /// <param name="testServerPort">STUN 服务端口</param>
+    /// <param name="localIPEndPoint">本机IP</param>
+    /// <param name="force">刷新测试 Client</param>
+    /// <remarks></remarks>
+    /// <returns></returns>
+    Task<ClassicStunResult?> TestStunClient3489Async(
+            string? testServerHostName = default,
+            int? testServerPort = default,
+            IPEndPoint? localIPEndPoint = default,
+            bool force = false,
+            CancellationToken cancellationToken = default
+        );
+
+    /// <summary>
+    /// 测试 STUN Client RFC5389
+    /// </summary>
+    /// <param name="protocol">使用的传输协议 Tcp,Udp</param>
+    /// <param name="testServerHostName">STUN 服务地址</param>
+    /// <param name="testServerPort">STUN 服务端口</param>
+    /// <param name="localIPEndPoint">本机IP</param>
+    /// <param name="force"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task<StunResult5389?> TestStunClient5389Async(
+            TransportProtocol protocol,
+            string? testServerHostName = default,
+            int? testServerPort = default,
+            IPEndPoint? localIPEndPoint = null,
+            CancellationToken cancellationToken = default
+        );
+}

src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/GameAcceleratorService.cs

@@ -66,7 +66,14 @@ public sealed partial class GameAcceleratorService
         DeleteMyGameCommand = ReactiveCommand.Create<XunYouGameViewModel>(DeleteMyGame);
         GameAcceleratorCommand = ReactiveCommand.CreateFromTask<XunYouGameViewModel>(GameAccelerator);
         GameLaunchCommand = ReactiveCommand.CreateFromTask<XunYouGameViewModel>(GameLaunch);
-        InstallAcceleratorCommand = ReactiveCommand.CreateFromTask(InstallAccelerator);
+        InstallAcceleratorCommand = ReactiveCommand.CreateFromTask(async () =>
+        {
+            if (await IWindowManager.Instance.ShowTaskDialogAsync(new MessageBoxWindowViewModel(),
+    pageContent: new AcceleratorPathAskBox(), title: "游戏加速", isCancelButton: false, isOkButton: false))
+            {
+                await InstallAccelerator();
+            }
+        });
         UninstallAcceleratorCommand = ReactiveCommand.Create(UninstallAccelerator);
         AcceleratorChangeAreaCommand = ReactiveCommand.Create<XunYouGameViewModel>(AcceleratorChangeArea);
 
@@ -247,8 +254,13 @@ public sealed partial class GameAcceleratorService
     /// <summary>
     /// 设置加速游戏状态
     /// </summary>
-    void SetGameStatus(XunYouGameViewModel game, int areaId = 0, int serverId = 0)
+    async void SetGameStatus(XunYouGameViewModel game, int areaId = 0, int serverId = 0)
     {
+        if (!XunYouSDK.IsSupported)
+        {
+            return;
+        }
+
         if (CurrentAcceleratorGame != null && CurrentAcceleratorGame.Id == game.Id)
         {
             CurrentAcceleratorGame.IsAccelerating = false;
@@ -295,6 +307,10 @@ public sealed partial class GameAcceleratorService
 
         //加速后
         Toast.Show(ToastIcon.Success, "加速成功");
+        if (ProxySettings.AutoShowWattAcceleratorWindow.Value)
+        {
+            _ = ShowXunYouWindow(true);
+        }
         int testSpeedCallback(SpeedCallbackWrapper w)
         {
             if (CurrentAcceleratorGame != null)
@@ -321,6 +337,11 @@ public sealed partial class GameAcceleratorService
 
     public async Task GameAccelerator(XunYouGameViewModel app)
     {
+        if (!XunYouSDK.IsSupported)
+        {
+            return;
+        }
+
         if (app.IsAccelerating)
             return;
 
@@ -348,7 +369,7 @@ public sealed partial class GameAcceleratorService
                     //}
 
                     if (!await IWindowManager.Instance.ShowTaskDialogAsync(new MessageBoxWindowViewModel(),
-                        pageContent: new AcceleratorPathAskBox(), title: "未安装加速插件", isCancelButton: true))
+                        pageContent: new AcceleratorPathAskBox(), title: "游戏加速", isCancelButton: false, isOkButton: false))
                     {
                         app.IsAccelerating = false;
                         return;
@@ -746,4 +767,9 @@ public sealed partial class GameAcceleratorService
             }
         }
     }
+
+    public async Task ShowXunYouWindow(bool showHide)
+    {
+        var result = await Ioc.Get<IAcceleratorService>().XY_ShowWinodw(showHide);
+    }
 }

src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/ProxyService.Operate.cs

@@ -206,7 +206,7 @@ partial class ProxyService
             }
         }
 
-        string? proxyToken = proxyDomains.Any_Nullable(s => s.ProxyType == ProxyType.ServerAccelerate) ?
+        string? proxyToken = proxyDomains.Any_Nullable(s => s.ProxyType == ProxyType.ServerAccelerate || s.Items.Any_Nullable(x => x.ProxyType == ProxyType.ServerAccelerate)) ?
             await TryRequestServerSideProxyToken() : null;
 
         ReverseProxySettings reverseProxySettings = new(proxyDomains, scripts,

src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/ProxyService.cs

@@ -1,5 +1,7 @@
 // ReSharper disable once CheckNamespace
 using Avalonia.Data;
+using Google.Protobuf.WellKnownTypes;
+using System.Linq;
 
 namespace BD.WTTS.Services;
 
@@ -65,12 +67,12 @@ public sealed partial class ProxyService
               .ToObservableChangeSet()
               .AutoRefresh(x => x.ObservableItems)
               .TransformMany(t => t.ObservableItems ?? new ObservableCollection<AccelerateProjectDTO>())
-              .AutoRefresh(x => x.Checked)
-              .WhenPropertyChanged(x => x.Checked, false)
+              .AutoRefresh(x => x.ThreeStateEnable)
+              .WhenPropertyChanged(x => x.ThreeStateEnable, false)
               .Subscribe(_ =>
               {
                   IsChangeSupportProxyServicesStatus = true;
-                  ProxySettings.SupportProxyServicesStatus.Value = EnableProxyDomains?.Select(k => k.Id.ToString()).ToImmutableHashSet();
+                  ProxySettings.SupportProxyServicesStatus.Value = GetAccelerateEnableAllIds(EnableProxyDomains).ToImmutableHashSet();
               }));
 
         this.WhenAnyValue(v => v.ProxyScripts)
@@ -152,10 +154,10 @@ public sealed partial class ProxyService
         }
     }
 
-    public IEnumerable<AccelerateProjectDTO>? GetEnableProxyDomains()
+    public IEnumerable<AccelerateProjectDTO> GetEnableProxyDomains()
     {
         if (!ProxyDomains.Items.Any_Nullable())
-            return null;
+            return [];
         var data = ProxyDomains.Items
             .Where(x => x.Items != null)
             .SelectMany(s => s.Items!.Where(w => w.ThreeStateEnable != false));
@@ -163,7 +165,7 @@ public sealed partial class ProxyService
         return data;
     }
 
-    public IReadOnlyCollection<AccelerateProjectDTO>? EnableProxyDomains => GetEnableProxyDomains()?.ToImmutableArray();
+    public IReadOnlyCollection<AccelerateProjectDTO>? EnableProxyDomains => GetEnableProxyDomains().ToImmutableArray();
 
     //static IEnumerable<AccelerateProjectDTO>? GetProxyDomainsItems(AccelerateProjectDTO accelerates)
     //{
@@ -403,22 +405,8 @@ public sealed partial class ProxyService
         {
             var items = ProxyDomains.Items!.SelectMany(s => s.Items!);
             var enableItems = ProxySettings.SupportProxyServicesStatus.Value;
-            foreach (var item in items)
-            {
-                if (enableItems.Contains(item.Id.ToString()))
-                {
-                    item.ThreeStateEnable = true;
-                }
-            }
+            RestoreAccelerateEnableAllIds(items, enableItems);
         }
-
-        //if (IsLoadImage && ProxyDomains.Items.Any_Nullable())
-        //{
-        //    foreach (var item in ProxyDomains.Items)
-        //    {
-        //        item.ImageStream = ImageChannelType.AccelerateGroup.GetImageAsync(ImageUrlHelper.GetImageApiUrlById(item.ImageId));
-        //    }
-        //}
     }
 
     public static bool IsChangeSupportProxyServicesStatus { get; set; }
@@ -462,6 +450,29 @@ public sealed partial class ProxyService
         }
     }
 
+    private IEnumerable<string> GetAccelerateEnableAllIds(IEnumerable<AccelerateProjectDTO>? nodes)
+    {
+        if (nodes == null)
+            return Enumerable.Empty<string>();
+        return nodes.Where(s => s.ThreeStateEnable == true).SelectMany(node => new[] { node.Id.ToString() }.Concat(GetAccelerateEnableAllIds(node.Items)));
+    }
+
+    private void RestoreAccelerateEnableAllIds(IEnumerable<AccelerateProjectDTO> nodes, IReadOnlyCollection<string> enableItems)
+    {
+        foreach (var node in nodes)
+        {
+            if (node.Items.Any_Nullable())
+            {
+                RestoreAccelerateEnableAllIds(node.Items, enableItems);
+                continue;
+            }
+            if (enableItems.Contains(node.Id.ToString()))
+            {
+                node.ThreeStateEnable = true;
+            }
+        }
+    }
+
     Timer? timer;
 
     public void StartTimer()

src/BD.WTTS.Client.Plugins.Accelerator/Settings/Abstractions/IProxySettings.cs

@@ -160,6 +160,11 @@ public partial interface IProxySettings
     /// </summary>
     int AcceleratorTabsSelectedIndex { get; set; }
 
+    /// <summary>
+    /// 加速后自动唤起 Watt 加速器界面
+    /// </summary>
+    bool AutoShowWattAcceleratorWindow { get; set; }
+
     /// <summary>
     /// 启用脚本自动检查更新的默认值
     /// </summary>
@@ -280,4 +285,9 @@ public partial interface IProxySettings
     /// </summary>
     static readonly int DefaultAcceleratorTabsSelectedIndex = 0;
 
+    /// <summary>
+    /// 加速后自动唤起 Watt 加速器界面的默认值
+    /// </summary>
+    const bool DefaultAutoShowWattAcceleratorWindow = true;
+
 }

src/BD.WTTS.Client.Plugins.Accelerator/Settings/ProxySettings.cs

@@ -203,6 +203,12 @@ public sealed partial class ProxySettings_ : IProxySettings, ISettings, ISetting
     [MPKey(23), MP2Key(23), JsonPropertyOrder(23)]
     public int AcceleratorTabsSelectedIndex { get; set; } = IProxySettings.DefaultAcceleratorTabsSelectedIndex;
 
+    /// <summary>
+    /// 加速后自动唤起 Watt 加速器界面
+    /// </summary>
+    [MPKey(24), MP2Key(24), JsonPropertyOrder(24)]
+    public bool AutoShowWattAcceleratorWindow { get; set; } = IProxySettings.DefaultAutoShowWattAcceleratorWindow;
+
 }
 
 public static partial class ProxySettings
@@ -371,4 +377,10 @@ public static partial class ProxySettings
     public static SettingsStructProperty<int, ProxySettings_> AcceleratorTabsSelectedIndex { get; }
         = new(DefaultAcceleratorTabsSelectedIndex);
 
+    /// <summary>
+    /// 加速后自动唤起 Watt 加速器界面
+    /// </summary>
+    public static SettingsStructProperty<bool, ProxySettings_> AutoShowWattAcceleratorWindow { get; }
+        = new(DefaultAutoShowWattAcceleratorWindow);
+
 }

src/BD.WTTS.Client.Plugins.Accelerator/UI/ViewModels/AcceleratorPageViewModel.cs

@@ -65,6 +65,10 @@ public sealed partial class AcceleratorPageViewModel
                 certificateManager.GetCerFilePathGeneratedWhenNoFileExists();
                 platformService.OpenFolder(certificateManager.PfxFilePath);
             });
+            OpenLogFileCommand = ReactiveCommand.Create(() =>
+            {
+                platformService.OpenFolder(IPCSubProcessFileSystem.GetLogDirPath(Plugin.Instance.UniqueEnglishName));
+            });
         }
     }
 

src/BD.WTTS.Client.Plugins.Accelerator/UI/ViewModels/AcceleratorPageViewModel.props.cs

@@ -30,4 +30,6 @@ public sealed partial class AcceleratorPageViewModel : TabItemViewModel
     public ICommand? ProxySettingsCommand { get; }
 
     public ICommand? TrustCerCommand { get; }
+
+    public ICommand? OpenLogFileCommand { get; }
 }

src/BD.WTTS.Client.Plugins.Accelerator/UI/ViewModels/GameAccelerator/AllGamesListPageViewModel.cs

@@ -9,17 +9,20 @@ public sealed class AllGamesListPageViewModel : WindowViewModel
     {
         XunYouGames = new ObservableCollection<XunYouGameViewModel>();
 
-        Task2.InBackground(() =>
+        if (XunYouSDK.IsSupported)
         {
-            var games = XunYouSDK.GetAllGames();
-            if (games != null)
+            Task2.InBackground(() =>
             {
-                XunYouGames.Clear();
-                foreach (var game in games)
+                var games = XunYouSDK.GetAllGames();
+                if (games != null)
                 {
-                    XunYouGames.Add(new XunYouGameViewModel(game));
+                    XunYouGames.Clear();
+                    foreach (var game in games)
+                    {
+                        XunYouGames.Add(new XunYouGameViewModel(game));
+                    }
                 }
-            }
-        });
+            });
+        }
     }
 }

src/BD.WTTS.Client.Plugins.Accelerator/UI/ViewModels/ProxySettingsWindowViewModel.cs

@@ -11,8 +11,8 @@ public sealed class ProxySettingsWindowViewModel : WindowViewModel
         Title = DisplayName;
     }
 
-    public IEnumerable<ExternalProxyType> ProxyTypes { get; }
-        = Enum2.GetAll<ExternalProxyType>();
+    //public IEnumerable<ExternalProxyType> ProxyTypes { get; }
+    //    = Enum2.GetAll<ExternalProxyType>();
 
     public IEnumerable<string> ProxyDNSs { get; } = new[]
     {

src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/AcceleratorPathAskBox.axaml

@@ -10,7 +10,14 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
-    <StackPanel Spacing="6">
+    <StackPanel Spacing="15">
+
+        <TextBlock FontSize="21" TextAlignment="Center">
+            <Run Text="下载 Watt加速器" />
+            <LineBreak />
+            <Run Text="拒绝游戏延迟，提高稳定性" />
+        </TextBlock>
+
         <ui:SettingsExpander
             Description="{Binding Source={x:Static ms:GameAcceleratorSettings.WattAcceleratorDirPath}, Path=Value}"
             Header="安装路径"
@@ -22,6 +29,16 @@
                 <Button Click="SelectWattAcceleratorInstallPath" Content="选择路径" />
             </ui:SettingsExpander.Footer>
         </ui:SettingsExpander>
-        <TextBlock Text="需要下载 Watt 加速器插件才可使用，确定要下载吗?" />
+
+        <!--<TextBlock Text="需要下载 Watt 加速器插件才可使用，确定要下载吗?" />-->
+
+        <Button
+            Margin="0,15"
+            Padding="20,10"
+            HorizontalAlignment="Center"
+            Classes="TransparentAccent"
+            Click="OKButton_Click"
+            Content="立即下载"
+            FontSize="14" />
     </StackPanel>
 </UserControl>

src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/AcceleratorPathAskBox.axaml.cs

@@ -1,9 +1,10 @@
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
+using Avalonia.ReactiveUI;
 
 namespace BD.WTTS.UI.Views.Controls;
 
-public partial class AcceleratorPathAskBox : UserControl
+public partial class AcceleratorPathAskBox : ReactiveUserControl<MessageBoxWindowViewModel>
 {
     public AcceleratorPathAskBox()
     {
@@ -30,4 +31,9 @@ public partial class AcceleratorPathAskBox : UserControl
             GameAcceleratorSettings.WattAcceleratorDirPath.Value = Path.Combine(path, "WattAccelerator");
         }
     }
+
+    private void OKButton_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+    {
+        this.ViewModel?.Close?.Invoke(true);
+    }
 }

src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/GameDetail.axaml

@@ -177,6 +177,15 @@
                                 FontSize="18"
                                 IsVisible="{Binding ShowStart}" />
 
+                            <Button
+                                Width="175"
+                                Height="42"
+                                Classes="accent"
+                                Command="{Binding ShowXunYouWindow, Source={x:Static s:GameAcceleratorService.Current}}"
+                                CommandParameter="True"
+                                Content="{x:Static spp:Strings.GameAccelerator_ShowWattAccelerator}"
+                                FontSize="18" />
+
                             <Button
                                 Width="150"
                                 Height="42"

src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/ProxyChartView.axaml.cs

@@ -1,14 +1,10 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Data;
 using Avalonia.Threading;
 using Avalonia.VisualTree;
 using LiveChartsCore;
-using LiveChartsCore.Motion;
 using LiveChartsCore.SkiaSharpView;
 using LiveChartsCore.SkiaSharpView.Avalonia;
-using LiveChartsCore.SkiaSharpView.Drawing;
-using SkiaSharp;
 
 namespace BD.WTTS.UI.Views.Controls;
 

src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/ProxyLog.axaml

@@ -0,0 +1,20 @@
+<UserControl
+    x:Class="BD.WTTS.UI.Views.Controls.ProxyLog"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:AvaloniaEdit="using:AvaloniaEdit"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:s="https://steampp.net/services"
+    xmlns:spp="https://steampp.net/ui"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Border Background="{DynamicResource CardBackgroundFillColorDefaultBrush}" CornerRadius="{DynamicResource ControlCornerRadius}">
+        <AvaloniaEdit:TextEditor
+            x:Name="LogTextbox"
+            HorizontalScrollBarVisibility="Disabled"
+            IsReadOnly="True"
+            ShowLineNumbers="True" />
+    </Border>
+</UserControl>

src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/ProxyLog.axaml.cs

@@ -0,0 +1,92 @@
+using Avalonia.Controls;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+using AvaloniaEdit;
+using AvaloniaEdit.TextMate;
+using Org.BouncyCastle.Math;
+using TextMateSharp.Grammars;
+
+namespace BD.WTTS.UI.Views.Controls;
+
+public partial class ProxyLog : UserControl
+{
+    CancellationTokenSource cancellation = new();
+
+    public ProxyLog()
+    {
+        InitializeComponent();
+
+        var logTextbox = this.FindControl<TextEditor>("LogTextbox")!;
+
+        //Here we initialize RegistryOptions with the theme we want to use.
+        var registryOptions = new TextMateSharp.Grammars.RegistryOptions(ThemeName.Dark);
+
+        //Initial setup of TextMate.
+        var textMateInstallation = logTextbox.InstallTextMate(registryOptions);
+
+        //Here we are getting the language by the extension and right after that we are initializing grammar with this language.
+        //And that's all 😀, you are ready to use AvaloniaEdit with syntax highlighting!
+        textMateInstallation.SetGrammar(registryOptions.GetScopeByLanguageId(registryOptions.GetLanguageByExtension(".log").Id));
+
+        //logTextbox.Text = LogText;
+        //logTextbox.ScrollToLine(logTextbox.Document.LineCount);
+
+        logTextbox.TextChanged += LogTextbox_TextChanged;
+
+        ProxyService.Current.WhenAnyValue(x => x.ProxyStatus)
+                    .Subscribe(x =>
+                    {
+                        if (x)
+                        {
+                            cancellation = new CancellationTokenSource();
+                            Task2.InBackground(FlushLogsAsync, true);
+                        }
+                        else
+                        {
+                            if (cancellation != null)
+                            {
+                                cancellation.Cancel();
+                                cancellation.Dispose();
+                            }
+                        }
+                    });
+    }
+
+    private void LogTextbox_TextChanged(object? sender, EventArgs e)
+    {
+        LogTextbox.ScrollToLine(LogTextbox.Document.LineCount);
+    }
+
+    void FlushLogsAsync()
+    {
+        while (!cancellation.IsCancellationRequested)
+        {
+            try
+            {
+                var isAttachedToVisualTree = this.IsAttachedToVisualTree();
+                if (isAttachedToVisualTree)
+                {
+                    var logtext = IReverseProxyService.Constants.Instance.GetLogAllMessage();
+                    if (string.IsNullOrEmpty(logtext))
+                    {
+                        Thread.Sleep(1000);
+                        continue;
+                    }
+
+                    Dispatcher.UIThread.Post(() =>
+                    {
+                        if (LogTextbox.Text.Length != logtext.Length)
+                            LogTextbox.Text = logtext;
+                    });
+                }
+            }
+            catch
+            {
+            }
+            finally
+            {
+                Thread.Sleep(1000);
+            }
+        }
+    }
+}

src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/AcceleratorPage2.axaml

@@ -304,37 +304,59 @@
 
             <Separator Margin="0,8" Classes="Horizontal" />
 
-            <Button
-                HorizontalAlignment="Stretch"
-                Command="{Binding SetupCertificateCommand}"
-                Content="{x:Static spp:Strings.CommunityFix_SetupCertificate}" />
-            <Button
-                HorizontalAlignment="Stretch"
-                Command="{Binding DeleteCertificateCommand}"
-                Content="{x:Static spp:Strings.CommunityFix_DeleteCertificate}" />
-            <Button
-                HorizontalAlignment="Stretch"
-                Command="{Binding ShowCertificateCommand}"
-                Content="查看证书信息" />
-            <Button
-                HorizontalAlignment="Stretch"
-                Command="{Binding OpenCertificateDirCommand}"
-                Content="{x:Static spp:Strings.CommunityFix_OpenCertificateDir}" />
+            <ItemsControl>
+                <ItemsControl.Items>
+                    <Button
+                        HorizontalAlignment="Stretch"
+                        Command="{Binding SetupCertificateCommand}"
+                        Content="{x:Static spp:Strings.CommunityFix_SetupCertificate}" />
+                    <Button
+                        HorizontalAlignment="Stretch"
+                        Command="{Binding DeleteCertificateCommand}"
+                        Content="{x:Static spp:Strings.CommunityFix_DeleteCertificate}" />
+                    <Button
+                        HorizontalAlignment="Stretch"
+                        Command="{Binding ShowCertificateCommand}"
+                        Content="查看证书信息" />
+                    <Button
+                        HorizontalAlignment="Stretch"
+                        Command="{Binding OpenCertificateDirCommand}"
+                        Content="{x:Static spp:Strings.CommunityFix_OpenCertificateDir}" />
+                </ItemsControl.Items>
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <spp:FixedWrapPanel ItemsPerLine="2" Spacing="5" />
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+            </ItemsControl>
 
             <Separator Margin="0,8" Classes="Horizontal" />
 
-            <Button
-                HorizontalAlignment="Stretch"
-                Command="{Binding EditHostsFileCommand}"
-                Content="{x:Static spp:Strings.CommunityFix_EditHostsFile}" />
-            <Button
-                HorizontalAlignment="Stretch"
-                Command="{Binding ResetHostsFileCommand}"
-                Content="{x:Static spp:Strings.CommunityFix_ResetHostsFile}" />
-            <Button
-                HorizontalAlignment="Stretch"
-                Command="{Binding OpenHostsDirCommand}"
-                Content="{x:Static spp:Strings.CommunityFix_OpenHostsDir}" />
+            <ItemsControl>
+                <ItemsControl.Items>
+                    <Button
+                        HorizontalAlignment="Stretch"
+                        Command="{Binding EditHostsFileCommand}"
+                        Content="{x:Static spp:Strings.CommunityFix_EditHostsFile}" />
+                    <Button
+                        HorizontalAlignment="Stretch"
+                        Command="{Binding ResetHostsFileCommand}"
+                        Content="{x:Static spp:Strings.CommunityFix_ResetHostsFile}" />
+                    <Button
+                        HorizontalAlignment="Stretch"
+                        Command="{Binding OpenHostsDirCommand}"
+                        Content="{x:Static spp:Strings.CommunityFix_OpenHostsDir}" />
+                    <Button
+                        HorizontalAlignment="Stretch"
+                        Command="{Binding OpenLogFileCommand}"
+                        Content="打开加速日志文件夹" />
+                </ItemsControl.Items>
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <spp:FixedWrapPanel ItemsPerLine="2" Spacing="5" />
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+            </ItemsControl>
 
             <!--<ui:FAComboBox ItemsSource="{Binding Source={x:Static ms:ProxySettings.ProxyModes}, Path=., Mode=OneWay}" SelectedItem="{Binding Source={x:Static ms:ProxySettings.ProxyMode}, Path=Value, Mode=TwoWay}">
                 <ui:FAComboBox.ItemTemplate>
@@ -344,9 +366,19 @@
                 </ui:FAComboBox.ItemTemplate>
             </ui:FAComboBox>-->
 
-            <Separator Margin="0,8" Classes="Horizontal" />
+            <StackPanel IsVisible="{x:Static spp:XunYouSDK.IsSupported}}" Spacing="10">
+                <Separator Margin="0,8" Classes="Horizontal" />
 
-            <!--<TextBlock Text="{x:Static spp:Strings.GameAccelerator_WattAcceleratorInstallPath}" Theme="{StaticResource BodyStrongTextBlockStyle}" />
+                <TextBlock Text="Watt 加速器相关" Theme="{StaticResource BodyStrongTextBlockStyle}" />
+
+                <ToggleSwitch
+                    VerticalAlignment="Center"
+                    Classes="NoContent"
+                    IsChecked="{Binding Source={x:Static ms:ProxySettings.AutoShowWattAcceleratorWindow}, Path=Value, Mode=TwoWay}"
+                    OffContent="{x:Static spp:Strings.GameAccelerator_SetShowWattWindow}"
+                    OnContent="{x:Static spp:Strings.GameAccelerator_SetShowWattWindow}" />
+
+                <!--<TextBlock Text="{x:Static spp:Strings.GameAccelerator_WattAcceleratorInstallPath}" Theme="{StaticResource BodyStrongTextBlockStyle}" />
 
             <ui:SettingsExpander Description="{Binding Source={x:Static ms:GameAcceleratorSettings.WattAcceleratorDirPath}, Path=Value, Mode=OneWay}}" IsExpanded="True">
                 <ui:SettingsExpander.IconSource>
@@ -362,14 +394,31 @@
 
             </ui:SettingsExpander>-->
 
-            <Button
-                HorizontalAlignment="Stretch"
-                Command="{Binding InstallAcceleratorCommand, Source={x:Static s:GameAcceleratorService.Current}}"
-                Content="{x:Static spp:Strings.GameAccelerator_InstallWattAccelerator}" />
-            <Button
-                HorizontalAlignment="Stretch"
-                Command="{Binding UninstallAcceleratorCommand, Source={x:Static s:GameAcceleratorService.Current}}"
-                Content="{x:Static spp:Strings.GameAccelerator_UninstallWattAccelerator}" />
+                <!--<ItemsControl>
+                    <ItemsControl.Items>
+					</ItemsControl.Items>
+					<ItemsControl.ItemsPanel>
+						<ItemsPanelTemplate>
+							<spp:FixedWrapPanel ItemsPerLine="2" Spacing="5" />
+						</ItemsPanelTemplate>
+					</ItemsControl.ItemsPanel>
+				</ItemsControl>-->
+
+                <Button
+                    HorizontalAlignment="Stretch"
+                    Command="{Binding ShowXunYouWindow, Source={x:Static s:GameAcceleratorService.Current}}"
+                    CommandParameter="True"
+                    Content="{x:Static spp:Strings.GameAccelerator_ShowWattAccelerator}" />
+                <Button
+                    HorizontalAlignment="Stretch"
+                    Command="{Binding InstallAcceleratorCommand, Source={x:Static s:GameAcceleratorService.Current}}"
+                    Content="{x:Static spp:Strings.GameAccelerator_InstallWattAccelerator}" />
+                <Button
+                    HorizontalAlignment="Stretch"
+                    Command="{Binding UninstallAcceleratorCommand, Source={x:Static s:GameAcceleratorService.Current}}"
+                    Content="{x:Static spp:Strings.GameAccelerator_UninstallWattAccelerator}" />
+
+            </StackPanel>
         </StackPanel>
     </spp:PageBase.PaneContent>
     <Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,*">
@@ -379,9 +428,9 @@
             ItemContainerTheme="{StaticResource TabItemStyle}"
             Theme="{StaticResource TabStripStyle}">
             <TabStripItem Content="平台加速" IsVisible="{Binding Source={x:Static s:ProxyService.Current}, Path=!ProxyStatus, Mode=OneWay}">
-                <WrapPanel>
-                    <TextBlock Text="平台加速" />
-                    <Border
+                <!--<WrapPanel>-->
+                <TextBlock Text="平台加速" />
+                <!--<Border
                         Margin="5,0,0,0"
                         Padding="5,1"
                         VerticalAlignment="Center"
@@ -398,14 +447,15 @@
                             Foreground="White"
                             Text="免费" />
                     </Border>
-                </WrapPanel>
+                </WrapPanel>-->
             </TabStripItem>
+            <TabStripItem Content="{x:Static spp:Strings.CommunityFix_ProxyLog}" IsVisible="{Binding Source={x:Static s:ProxyService.Current}, Path=ProxyStatus, Mode=OneWay}" />
             <TabStripItem Content="{x:Static spp:Strings.CommunityFix_FlowStatistics}" IsVisible="{Binding Source={x:Static s:ProxyService.Current}, Path=ProxyStatus, Mode=OneWay}" />
             <TabStripItem Content="{x:Static spp:Strings.CommunityFix_Services}" IsVisible="{Binding Source={x:Static s:ProxyService.Current}, Path=ProxyStatus, Mode=OneWay}" />
             <TabStripItem Name="GameAccTab">
-                <WrapPanel>
-                    <TextBlock Text="游戏加速" />
-                    <Border
+                <!--<WrapPanel>-->
+                <TextBlock Text="游戏加速" />
+                <!--<Border
                         Margin="5,0,0,0"
                         Padding="5,1"
                         VerticalAlignment="Center"
@@ -421,8 +471,8 @@
                             FontSize="10"
                             Foreground="White"
                             Text="收费" />
-                    </Border>
-                </WrapPanel>
+                    </Border>-->
+                <!--</WrapPanel>-->
             </TabStripItem>
         </TabStrip>
         <Carousel
@@ -508,6 +558,8 @@
                     </ItemsControl>
                 </spp:ContentLoader>
             </ScrollViewer>
+            <!--  加速日志  -->
+            <spp:ProxyLog Margin="5,0" />
 
             <!--  流量统计  -->
             <spp:ProxyChartView Margin="5,0" />
@@ -531,6 +583,23 @@
                                         <StackPanel Margin="10">
                                             <DockPanel>
                                                 <TextBlock Text="{Binding Name}" />
+                                                <Border
+                                                    Padding="5,0"
+                                                    HorizontalAlignment="Left"
+                                                    CornerRadius="5"
+                                                    IsVisible="{Binding ProxyType, Converter={StaticResource EnumEqualValueConverter}, ConverterParameter={x:Static enum:ProxyType.ServerAccelerate}}"
+                                                    ToolTip.Tip="Beta 测试加速项，不稳定且随时可能调整">
+                                                    <Border.Background>
+                                                        <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+                                                            <GradientStop Offset="0.0" Color="#43cbff" />
+                                                            <GradientStop Offset="1.0" Color="#9708cc" />
+                                                        </LinearGradientBrush>
+                                                    </Border.Background>
+                                                    <TextBlock
+                                                        VerticalAlignment="Center"
+                                                        FontSize="10"
+                                                        Text="Beta" />
+                                                </Border>
                                             </DockPanel>
                                             <Separator Classes="Separator" />
                                         </StackPanel>
@@ -737,7 +806,7 @@
                     <Setter Property="VerticalAlignment" Value="Center" />
                 </Style>
             </StackPanel.Styles>
-            <Button Theme="{StaticResource TransparentButton}">
+            <Button Theme="{StaticResource TransparentButton}" ToolTip.ShowDelay="0">
                 <ToolTip.Tip>
                     <TextBlock>
                         <Run FontSize="16" Text="Q：为什么加速后流量一直显示 0KB ？" />
@@ -750,7 +819,7 @@
                         <Run Text="A：可以尝试执行以下操作进行修复，关闭加速，点击加速设置-移除证书再安装证书，重开加速。或者加速设置-代理设置-尝试更换doh地址或者关闭doh使用dns等方案。" />
                     </TextBlock>
                 </ToolTip.Tip>
-                <ui:FontIcon FontSize="22" Glyph="&#xE82F;" />
+                <ui:FontIcon FontSize="20" Glyph="&#xE82F;" />
             </Button>
             <TextBlock Text="{x:Static spp:Strings.CommunityFix_ProxyMode}" />
             <TextBlock Text="{Binding Source={x:Static ms:ProxySettings.ProxyMode}, Path=Value, Mode=OneWay, Converter={StaticResource EnumLocalizationNameConverter}}" />

src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ProxySettingsPage.axaml

@@ -35,17 +35,22 @@
                         Text="{Binding Source={x:Static ms:ProxySettings.ProxyMasterDns}, Path=Value, Mode=TwoWay}" />
                 </ui:SettingsExpanderItem.Footer>
             </ui:SettingsExpanderItem>
-            <!--<DockPanel>
-                <Label Content="监听端口"></Label>
-                <NumericUpDown Value="{Binding Source={x:Static ms:ProxySettings.HostProxyPortId},Path=Value, Mode=TwoWay}"
-                               FormatString="0"
-                               Maximum="65535"/>
-              </DockPanel>-->
+
+            <ui:SettingsExpanderItem Description="{Binding Path=Res.Settings_Proxy_SystemProxyPortId_Tip, Mode=OneWay, Source={x:Static s:ResourceService.Current}}">
+                <TextBlock Text="{Binding Path=Res.Settings_Proxy_SystemProxyPortId, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
+                <ui:SettingsExpanderItem.Footer>
+                    <NumericUpDown
+                        MaxWidth="200"
+                        FormatString="0"
+                        Maximum="65535"
+                        Value="{Binding Source={x:Static ms:ProxySettings.SystemProxyPortId}, Path=Value, Mode=TwoWay}" />
+                </ui:SettingsExpanderItem.Footer>
+            </ui:SettingsExpanderItem>
 
             <!--<DockPanel>
                 <TextBlock Text="IPV6支持：" />
                 <TextBlock Text="IPV6地址" ></TextBlock>
-                <Button Content="{Binding Path=Res.Refresh,Mode=OneWay,Source={x:Static resx:R.Current}}"></Button>
+                <Button Content="{Binding Path=Res.Refresh,Mode=OneWay,Source={x:Static s:ResourceService.Current}}"></Button>
               </DockPanel>-->
             <ui:SettingsExpanderItem>
                 <TextBlock Text="{Binding Path=Res.CommunityFix_AutoRunProxy, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
@@ -89,12 +94,72 @@
                 <Button Content="选择证书"/>
               </DockPanel>-->
 
-            <ui:SettingsExpanderItem Description="*该选项勾选后会导致程序的加速完全不生效，请确认是仅需要脚本功能后再启用">
+            <ui:SettingsExpanderItem Description="*该选项勾选后会导致程序的加速完全不生效，请确认是配合二级代理实现仅需要脚本功能后再启用">
                 <TextBlock Text="{Binding Path=Res.CommunityFix_ProxyOnlyOnScript, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
                 <ui:SettingsExpanderItem.Footer>
                     <ToggleSwitch Classes="LeftContent" IsChecked="{Binding Source={x:Static ms:ProxySettings.OnlyEnableProxyScript}, Path=Value, Mode=TwoWay}" />
                 </ui:SettingsExpanderItem.Footer>
             </ui:SettingsExpanderItem>
         </ui:SettingsExpander>
+
+
+        <ui:SettingsExpander
+            Description="*改动后需重启加速才能生效"
+            Header="{Binding Path=Res.Settings_Proxy_TwoLevelAgent, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
+            IsExpanded="True">
+            <ui:SettingsExpander.Footer>
+                <ToggleSwitch IsChecked="{Binding Source={x:Static ms:ProxySettings.TwoLevelAgentEnable}, Path=Value, Mode=TwoWay}" />
+            </ui:SettingsExpander.Footer>
+
+            <ui:SettingsExpanderItem>
+                <TextBlock Text="{Binding Path=Res.Settings_Proxy_ProxyType, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
+                <ui:SettingsExpanderItem.Footer>
+                    <ui:FAComboBox MinWidth="200" SelectedItem="{Binding Source={x:Static ms:ProxySettings.TwoLevelAgentProxyType}, Path=Value, Mode=TwoWay}">
+                        <ui:FAComboBox.Items>
+                            <spp:ExternalProxyType>Http</spp:ExternalProxyType>
+                            <spp:ExternalProxyType>Socks4</spp:ExternalProxyType>
+                            <spp:ExternalProxyType>Socks5</spp:ExternalProxyType>
+                        </ui:FAComboBox.Items>
+                    </ui:FAComboBox>
+                </ui:SettingsExpanderItem.Footer>
+            </ui:SettingsExpanderItem>
+
+            <ui:SettingsExpanderItem>
+                <TextBlock Text="{Binding Path=Res.Settings_Proxy_IPAddress, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
+                <ui:SettingsExpanderItem.Footer>
+                    <TextBox MinWidth="200" Text="{Binding Source={x:Static ms:ProxySettings.TwoLevelAgentIp}, Path=Value, Mode=TwoWay}" />
+                </ui:SettingsExpanderItem.Footer>
+            </ui:SettingsExpanderItem>
+
+            <ui:SettingsExpanderItem>
+                <TextBlock Text="{Binding Path=Res.Settings_Proxy_Port, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
+                <ui:SettingsExpanderItem.Footer>
+                    <NumericUpDown
+                        MinWidth="200"
+                        FormatString="0"
+                        Maximum="65535"
+                        Minimum="80"
+                        Value="{Binding Source={x:Static ms:ProxySettings.TwoLevelAgentPortId}, Path=Value, Mode=TwoWay}" />
+                </ui:SettingsExpanderItem.Footer>
+            </ui:SettingsExpanderItem>
+
+            <ui:SettingsExpanderItem>
+                <TextBlock Text="{Binding Path=Res.Settings_Proxy_UserName, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
+                <ui:SettingsExpanderItem.Footer>
+                    <TextBox MinWidth="200" Text="{Binding Source={x:Static ms:ProxySettings.TwoLevelAgentUserName}, Path=Value, Mode=TwoWay}" />
+                </ui:SettingsExpanderItem.Footer>
+            </ui:SettingsExpanderItem>
+
+            <ui:SettingsExpanderItem>
+                <TextBlock Text="{Binding Path=Res.Settings_Proxy_Password, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
+                <ui:SettingsExpanderItem.Footer>
+                    <TextBox
+                        MinWidth="200"
+                        Classes="revealPasswordButton"
+                        PasswordChar="{StaticResource PasswordChar}"
+                        Text="{Binding Source={x:Static ms:ProxySettings.TwoLevelAgentPassword}, Path=Value, Mode=TwoWay}" />
+                </ui:SettingsExpanderItem.Footer>
+            </ui:SettingsExpanderItem>
+        </ui:SettingsExpander>
     </StackPanel>
 </UserControl>

src/BD.WTTS.Client.Plugins.Accelerator/XunYouSDK/Methods/12.接口 xunyou_start_ex2.cs

@@ -16,6 +16,7 @@ partial class XunYouSDK // 12.接口 xunyou_start_ex2
     /// </summary>
     /// <param name="openid">登录 token，由调用方提供</param>
     /// <param name="nickname">账号昵称</param>
+    /// <param name="show"><see cref="PInvoke.User32.WindowStyles"/></param>
     /// <param name="gameid">游戏 id，由迅游给出明确值，或传 0，如果传 0，表示只启动迅游，不自动加速。</param>
     /// <param name="area">游戏分区 id ，由游戏给出区服名和 id 对照表，或传 0，如果传 0，表示只启动迅游，不自动加速。</param>
     /// <param name="server">游戏服 id</param>
@@ -28,6 +29,7 @@ partial class XunYouSDK // 12.接口 xunyou_start_ex2
     public static int StartEx2(
         string openid,
         string nickname,
+        XunYouShowCommands show = XunYouShowCommands.SW_HIDE,
         int gameid = 0,
         int area = 0,
         int server = 0,
@@ -51,7 +53,7 @@ partial class XunYouSDK // 12.接口 xunyou_start_ex2
 
             result = xunyou_start_ex2(appId, openid, openid_len,
                 userType, channel_no, channel_no.Length,
-                nickname, nickname_len, XunYouShowCommands.SW_HIDE,
+                nickname, nickname_len, show,
                 gameid,
                 area, server, xunyou_callback, ptr,
                 installPath, install_path_len, areaName,

src/BD.WTTS.Client.Plugins.Accelerator/XunYouSDK/Methods/22.接口 xunyou_start_ex3.cs

@@ -14,6 +14,7 @@ partial class XunYouSDK // 22.接口 xunyou_start_ex3
     /// </summary>
     /// <param name="jwt">登录 token，由调用方提供</param>
     /// <param name="nickname">账号昵称</param>
+    /// <param name="show"><see cref="PInvoke.User32.WindowStyles"/></param>
     /// <param name="gameid">游戏 id，由迅游给出明确值，或传 0，如果传 0，表示只启动迅游，不自动加速。</param>
     /// <param name="area">游戏分区 id ，由游戏给出区服名和 id 对照表，或传 0，如果传 0，表示只启动迅游，不自动加速。</param>
     /// <param name="server">游戏服 id</param>
@@ -26,6 +27,7 @@ partial class XunYouSDK // 22.接口 xunyou_start_ex3
     public static int StartEx3(
         string jwt,
         string nickname,
+        XunYouShowCommands show = XunYouShowCommands.SW_HIDE,
         int gameid = 0,
         int area = 0,
         int server = 0,
@@ -49,7 +51,7 @@ partial class XunYouSDK // 22.接口 xunyou_start_ex3
 
             result = xunyou_start_ex2(appId, jwt, jwt_len,
                 userType, channel_no, channel_no.Length,
-                nickname, nickname_len, XunYouShowCommands.SW_HIDE,
+                nickname, nickname_len, show,
                 gameid,
                 area, server, xunyou_callback, ptr,
                 installPath, install_path_len, areaName,

src/BD.WTTS.Client.Plugins.Accelerator/XunYouSDK/Methods/25.接口 xunyou_show.cs

@@ -0,0 +1,12 @@
+namespace Mobius;
+
+partial class XunYouSDK // 25.接口 xunyou_show
+{
+    /// <summary>
+    /// 设置当前启动客户端的显隐状态
+    /// </summary>
+    /// <param name="show">客户端显示状态(SW_HIDE)</param>
+    [LibraryImport(libraryName)]
+    [UnmanagedCallConv(CallConvs = [typeof(CallConvStdcall)])]
+    public static partial void xunyou_show(int show = 0);
+}

src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus.csproj

@@ -115,9 +115,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="BD.Common.XmlnsDefinition.Avalonia">
-			<Aliases>BD_Common_XmlnsDefinition_Avalonia</Aliases>
-		</PackageReference>
 		<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
 		<ProjectReference Include="..\BD.WTTS.Client.Avalonia\BD.WTTS.Client.Avalonia.csproj" />
 	</ItemGroup>

src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/Plugins/Plugin.cs

@@ -24,7 +24,7 @@ public sealed class Plugin : PluginBase<Plugin>, IPlugin
 
     protected sealed override string? AuthorOriginalString => null;
 
-    public sealed override string Description => moduleName;
+    public sealed override string Description => moduleName + " 控制台功能实现";
 
     public sealed override object? Icon => Resources.asf;
 

src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/Services.Implementation/ArchiSteamFarmServiceImpl.cs

@@ -69,7 +69,7 @@ public partial class ArchiSteamFarmServiceImpl : ReactiveObject, IArchiSteamFarm
                 isFirstStart = false;
             }
 
-            (var isSuccess, var ipcUrl) = await StartProcess();
+            (var isSuccess, var ipcUrl) = await StartProcessAsync();
             if (!isSuccess && !isFirstStart)
                 throw new ArgumentException();
             else
@@ -85,7 +85,7 @@ public partial class ArchiSteamFarmServiceImpl : ReactiveObject, IArchiSteamFarm
 
     #region StartProcess
 
-    private async Task<(bool IsSuccess, string Message)> StartProcess()
+    private async Task<(bool IsSuccess, string Message)> StartProcessAsync()
     {
         var isStartSuccess = false;
         var ipcUrl = string.Empty;
@@ -306,7 +306,7 @@ public partial class ArchiSteamFarmServiceImpl : ReactiveObject, IArchiSteamFarm
         }
     }
 
-    public async Task Restart()
+    public async Task RestartAsync()
     {
         Toast.Show(ToastIcon.Info, AppResources.ASF_Restarting, ToastLength.Short);
 

src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/Services/Mvvm/ASFService.cs

@@ -47,7 +47,7 @@ public sealed class ASFService : ReactiveObject
     {
         SteamBotsSourceList = new SourceCache<BotViewModel, string>(t => t.Bot.BotName);
 
-        archiSteamFarmService.OnConsoleWirteLine += OnConsoleWirteLine;
+        archiSteamFarmService.OnConsoleWirteLine += OnConsoleWriteLine;
 
         ASFSettings.ConsoleMaxLine.Subscribe(x =>
         {
@@ -58,9 +58,9 @@ public sealed class ASFService : ReactiveObject
         });
     }
 
-    void OnConsoleWirteLine(string message)
+    void OnConsoleWriteLine(string message)
     {
-        MainThread2.InvokeOnMainThreadAsync(() =>
+        MainThread2.BeginInvokeOnMainThread(() =>
         {
             //ConsoleLogBuilder.Append(message); // message 包含换行
             //var text = ConsoleLogBuilder.ToString();
@@ -74,7 +74,7 @@ public sealed class ASFService : ReactiveObject
         {
             return;
         }
-        archiSteamFarmService.ShellMessageInput(input);
+        _ = archiSteamFarmService.ShellMessageInput(input);
     }
 
     /// <summary>
@@ -287,7 +287,7 @@ public sealed class ASFService : ReactiveObject
         Toast.Show(ToastIcon.Success, string.Format(AppResources.LocalAuth_ImportSuccessTip_, num));
     }
 
-    public async Task SelectASFProgramLocation()
+    public async Task SelectASFProgramLocationAsync()
     {
         AvaloniaFilePickerFileTypeFilter fileTypes = new AvaloniaFilePickerFileTypeFilter.Item[] {
             new("ArchiSteamFarm") {
@@ -302,5 +302,77 @@ public sealed class ASFService : ReactiveObject
                 ASFSettings.ArchiSteamFarmExePath.Value = path;
         }, fileTypes);
     }
+
+    public async void DownloadASFAsync(string variant = "win-x64", IProgress<float>? progress = null, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            var assetName = $"{nameof(ASF)}-{variant}.zip";
+            using var httpClient = new HttpClient();
+            httpClient.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", IHttpPlatformHelperService.Instance.UserAgent);
+            using var latestReleaseStream = await httpClient.GetStreamAsync("https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/releases/latest", cancellationToken);
+            using var element = await JsonDocument.ParseAsync(latestReleaseStream, cancellationToken: cancellationToken);
+            if (element.RootElement.TryGetProperty("assets", out var assets) &&
+                assets.EnumerateArray().FirstOrDefault(s => s.GetProperty("name").ValueEquals(assetName))
+                .TryGetProperty("browser_download_url", out var downloadUrl))
+            {
+                var tag_name = element.RootElement.GetProperty("tag_name").GetString();
+                var downloadSavingPath = Path.Combine(Plugin.Instance.AppDataDirectory, $"ASF-{tag_name}", assetName);
+                var downloadSavingDir = Path.GetDirectoryName(downloadSavingPath)!;
+                Directory.CreateDirectory(downloadSavingDir);
+
+                var message = new HttpRequestMessage(HttpMethod.Get, downloadUrl.GetString());
+                var result = await httpClient.SendAsync(message, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+                using var contentStream = await result.Content.ReadAsStreamAsync(cancellationToken);
+
+                byte batch = 0;
+                long readThisBatch = 0;
+                long batchIncreaseSize = result.Content.Headers.ContentLength.GetValueOrDefault() / 100;
+                await using (FileStream fileStream = new(downloadSavingPath, FileMode.Create, FileAccess.Write, FileShare.None, 4096, true))
+                {
+                    ArrayPool<byte> bytePool = ArrayPool<byte>.Shared;
+                    byte[] buffer = bytePool.Rent(4096);
+
+                    try
+                    {
+                        while (contentStream.CanRead)
+                        {
+                            int read = await contentStream.ReadAsync(buffer.AsMemory(0, buffer.Length), cancellationToken);
+
+                            if (read == 0)
+                                break;
+
+                            await fileStream.WriteAsync(buffer.AsMemory(0, read), cancellationToken);
+                            if ((progress == null) || (batchIncreaseSize == 0) || (batch >= 99))
+                            {
+                                continue;
+                            }
+
+                            readThisBatch += read;
+
+                            while ((readThisBatch >= batchIncreaseSize) && (batch < 99))
+                            {
+                                readThisBatch -= batchIncreaseSize;
+                                progress.Report(++batch);
+                            }
+                        }
+                    }
+                    finally
+                    {
+                        bytePool.Return(buffer);
+                    }
+                }
+
+                ZipFile.ExtractToDirectory(downloadSavingPath, downloadSavingDir);
+                ASFSettings.ArchiSteamFarmExePath.Value = Path.Combine(downloadSavingDir, "ArchiSteamFarm.exe");
+                progress?.Report(100);
+                Toast.Show(ToastIcon.Success, "ASF 下载成功");
+            }
+        }
+        catch (Exception ex)
+        {
+            Toast.LogAndShowT(ex, "ASF 文件下载异常");
+        }
+    }
 }
 #endif

src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/UI/ViewModels/ArchiSteamFarmExePathSettingsPageViewModel.cs

@@ -4,8 +4,16 @@ public partial class ArchiSteamFarmExePathSettingsPageViewModel : ViewModelBase
 {
     public ICommand SelectProgramPath { get; }
 
+    public ICommand DownloadASF { get; }
+
     public ArchiSteamFarmExePathSettingsPageViewModel()
     {
-        SelectProgramPath = ReactiveCommand.Create(ASFService.Current.SelectASFProgramLocation);
+        SelectProgramPath = ReactiveCommand.Create(ASFService.Current.SelectASFProgramLocationAsync);
+        DownloadASF = ReactiveCommand.Create(() =>
+        {
+            var progress = INotificationService.Instance.NotifyDownload(() => "开始下载 ASF ", NotificationType.NewVersion);
+            ASFService.Current.DownloadASFAsync(progress: progress);
+            Toast.Show(ToastIcon.Info, "等待后台下载文件", ToastLength.Short);
+        });
     }
 }

src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/UI/ViewModels/ArchiSteamFarmPlusPageViewModel.cs

@@ -9,7 +9,7 @@ public sealed partial class ArchiSteamFarmPlusPageViewModel : ViewModelBase
 
     public ArchiSteamFarmPlusPageViewModel()
     {
-        SelectASFExePath = ReactiveCommand.CreateFromTask(ASFService.Current.SelectASFProgramLocation);
+        SelectASFExePath = ReactiveCommand.CreateFromTask(ASFService.Current.SelectASFProgramLocationAsync);
 
         OpenWebUIConsole = ReactiveCommand.Create(() => ASFService.Current.OpenBrowser(null));
 
@@ -18,12 +18,12 @@ public sealed partial class ArchiSteamFarmPlusPageViewModel : ViewModelBase
         RunOrStop = ReactiveCommand.Create(RunOrStopASF);
     }
 
-    public override void Activation()
+    public override async void Activation()
     {
         base.Activation();
         if (string.IsNullOrEmpty(ASFSettings.ArchiSteamFarmExePath.Value))
         {
-            MainThread2.InvokeOnMainThreadAsync(async () =>
+            await MainThread2.InvokeOnMainThreadAsync(async () =>
             {
                 var model = new ArchiSteamFarmExePathSettingsPageViewModel();
                 await IWindowManager.Instance.ShowTaskDialogAsync(model,
@@ -44,7 +44,16 @@ public sealed partial class ArchiSteamFarmPlusPageViewModel : ViewModelBase
             StartOrStopASF_Click();
     }
 
-    public static void StartOrStopASF_Click(bool? startOrStop = null) => Task.Run(async () =>
+    protected override void Dispose(bool disposing)
+    {
+        if (disposing)
+        {
+            ASFService.Current.StopASFAsync().Wait();
+        }
+        base.Dispose(disposing);
+    }
+
+    public void StartOrStopASF_Click(bool? startOrStop = null) => _ = Task.Run(async () =>
     {
         var s = ASFService.Current;
         if (!s.IsASFRuning)

src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/UI/Views/Controls/ArchiSteamFarmExePathSettingsPage.axaml

@@ -26,5 +26,16 @@
                 <Button Command="{Binding SelectProgramPath}" Content="选择路径" />
             </ui:SettingsExpander.Footer>
         </ui:SettingsExpander>
+        <ui:SettingsExpander
+            Description="下载并设置 ASF 路径"
+            Header="还没有下载过ASF？请点击下载"
+            IsClickEnabled="True">
+            <ui:SettingsExpander.IconSource>
+                <ui:FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE896;" />
+            </ui:SettingsExpander.IconSource>
+            <ui:SettingsExpander.Footer>
+                <Button Command="{Binding DownloadASF}" Content="一键下载" />
+            </ui:SettingsExpander.Footer>
+        </ui:SettingsExpander>
     </StackPanel>
 </UserControl>

src/BD.WTTS.Client.Plugins.Authenticator/BD.WTTS.Client.Plugins.Authenticator.csproj

@@ -63,10 +63,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<!--<PackageReference Include="Avalonia" />
-		<PackageReference Include="BD.Common.XmlnsDefinition.Avalonia">
-			<Aliases>BD_Common_XmlnsDefinition_Avalonia</Aliases>
-		</PackageReference>-->
 		<PackageReference Include="ReactiveUI.Fody" />
 	</ItemGroup>
 

src/BD.WTTS.Client.Plugins.Authenticator/Helpers/AuthenticatorHelper.cs

@@ -475,6 +475,27 @@ public static class AuthenticatorHelper
         return filePath;
     }
 
+    public static async Task<IEnumerable<IFileResult>?> MultipleSelectFolderPath(string? fileExtension = null)
+    {
+        var options = new PickOptions();
+        if (!string.IsNullOrEmpty(fileExtension))
+        {
+            AvaloniaFilePickerFileTypeFilter fileTypes = new AvaloniaFilePickerFileTypeFilter.Item[] {
+                new($"{fileExtension} Files") {
+                    Patterns = new[] { $"*{fileExtension}", },
+                    //MimeTypes
+                    //AppleUniformTypeIdentifiers = 
+                },
+            };
+            options.FileTypes = fileTypes;
+        }
+        var filePaths = await FilePicker2.PickMultipleAsync(options);
+
+        if (!filePaths.Any_Nullable())
+            Toast.Show(ToastIcon.Warning, Strings.FilePathNotExist);
+        return filePaths;
+    }
+
     public static async Task<bool> VerifyMaxValue()
     {
         var auths = await AuthenticatorHelper.GetAllSourceAuthenticatorAsync();

src/BD.WTTS.Client.Plugins.Authenticator/UI/ViewModels/AuthenticatorImportPageViewModel.cs

@@ -1,5 +1,6 @@
 using BD.WTTS.UI.Views.Pages;
 using WinAuth;
+using static SteamKit2.DepotManifest;
 using SJsonSerializer = System.Text.Json.JsonSerializer;
 
 namespace BD.WTTS.UI.ViewModels;
@@ -16,6 +17,8 @@ public class AuthenticatorImportPageViewModel : ViewModelBase
     {
         AuthenticatorImportMethods = new List<AuthenticatorImportMethod>
         {
+            new AuthenticatorImportMethod(Strings.LocalAuth_Import.Format(Strings.LocalAuth_JoinSteamAuthenticator), Strings.LocalAuth_JoinSteamAuthenticatorDesc,
+                                            PageType: typeof(JoinSteamAuthenticatorPage)),
             new AuthenticatorImportMethod(Strings.Auth_SteamLoginImport, Strings.Steam_UserLoginTip,
                                             PageType: typeof(SteamLoginImportPage)),
             new AuthenticatorImportMethod(Strings.LocalAuth_Import.Format(Strings.SteamGuard), Strings.LocalAuth_SteamGuardImport,
@@ -26,8 +29,6 @@ public class AuthenticatorImportPageViewModel : ViewModelBase
                                                 if (await AuthenticatorHelper.VerifyMaxValue())
                                                     await ImportFromSdaFile();
                                             })),
-            new AuthenticatorImportMethod(Strings.LocalAuth_Import.Format(Strings.LocalAuth_JoinSteamAuthenticator), Strings.LocalAuth_JoinSteamAuthenticatorDesc,
-                                            PageType: typeof(JoinSteamAuthenticatorPage)),
             new AuthenticatorImportMethod(Strings.LocalAuth_Import.Format(Strings.WattToolKitV2), Strings.LocalAuth_WattToolKitV2Import,
                                             Command: ReactiveCommand.Create(async () =>
                                             {
@@ -68,34 +69,40 @@ public class AuthenticatorImportPageViewModel : ViewModelBase
     {
         try
         {
-            var filePath = await AuthenticatorHelper.SelectFolderPath(FileEx.maFile);
+            var filePaths = await AuthenticatorHelper.MultipleSelectFolderPath(FileEx.maFile);
 
-            if (string.IsNullOrEmpty(filePath)) return;
+            if (!filePaths.Any_Nullable())
+                return;
 
-            var text = await File.ReadAllTextAsync(filePath);
-
-            var sdaFileModel = SJsonSerializer.Deserialize(text, ImportFileModelJsonContext.Default.SdaFileModel);
-            sdaFileModel.ThrowIsNull();
-            var steamDataModel = new SdaFileConvertToSteamDataModel(sdaFileModel);
-
-            SteamAuthenticator steamAuthenticator = new()
+            foreach (var file in filePaths)
             {
-                DeviceId = sdaFileModel.DeviceId,
-                Serial = sdaFileModel.SerialNumber,
-                SecretKey = Convert.FromBase64String(sdaFileModel.SharedSecret),
-                SteamData = SJsonSerializer.Serialize(steamDataModel, ImportFileModelJsonContext.Default.SdaFileConvertToSteamDataModel),
-            };
+                if (!File.Exists(file.FullPath)) return;
+                var text = await File.ReadAllTextAsync(file.FullPath);
 
-            var authDto =
-                new AuthenticatorDTO()
+                var sdaFileModel = SJsonSerializer.Deserialize(text, ImportFileModelJsonContext.Default.SdaFileModel);
+                sdaFileModel.ThrowIsNull();
+                var steamDataModel = new SdaFileConvertToSteamDataModel(sdaFileModel);
+
+                SteamAuthenticator steamAuthenticator = new()
                 {
-                    Name = $"(Steam){steamAuthenticator.AccountName}",
-                    Value = steamAuthenticator,
-                    Created = DateTimeOffset.Now,
+                    DeviceId = sdaFileModel.DeviceId,
+                    Serial = sdaFileModel.SerialNumber,
+                    SecretKey = Convert.FromBase64String(sdaFileModel.SharedSecret),
+                    SteamData = SJsonSerializer.Serialize(steamDataModel, ImportFileModelJsonContext.Default.SdaFileConvertToSteamDataModel),
                 };
-            if (await AuthenticatorHelper.SaveAuthenticator(authDto))
-            {
-                Toast.Show(ToastIcon.Success, Strings.ModelContent_ImportSuccessful_.Format(authDto.Name));
+
+                var authDto =
+                    new AuthenticatorDTO()
+                    {
+                        Name = $"(Steam){steamAuthenticator.AccountName}",
+                        Value = steamAuthenticator,
+                        Created = DateTimeOffset.Now,
+                    };
+
+                if (await AuthenticatorHelper.SaveAuthenticator(authDto))
+                {
+                    Toast.Show(ToastIcon.Success, Strings.ModelContent_ImportSuccessful_.Format(authDto.Name));
+                }
             }
         }
         catch (Exception e)

src/BD.WTTS.Client.Plugins.Authenticator/UI/ViewModels/SteamTradePageViewModel.cs

@@ -1,8 +1,7 @@
-using AppResources = BD.WTTS.Client.Resources.Strings;
-
 using BD.SteamClient.Models;
 using BD.SteamClient.Services;
 using WinAuth;
+using AppResources = BD.WTTS.Client.Resources.Strings;
 using WSteamClient = WinAuth.SteamClient;
 
 namespace BD.WTTS.UI.ViewModels;
@@ -73,11 +72,61 @@ public sealed partial class SteamTradePageViewModel : WindowViewModel
         }
         else
         {
-            IsLogged = true;
+            IsLogged = await CheckAndRefreshToken();
+
             await GetConfirmations(_steamClient);
         }
     }
 
+    public async ValueTask<bool> CheckAndRefreshToken()
+    {
+        IsLoading = true;
+
+        // 不具备检查条件 没有保持的会话信息
+        if (_steamClient == null)
+            return false;
+
+        if (_steamClient.Session == null || _steamAuthenticator == null)
+            return false;
+
+        try
+        {
+            // token 依旧有效 直接返回
+            if (!_steamClient.Session.IsAccessTokenExpired())
+                return true;
+
+            // 是否有 refresh token
+            string? refreshToken = _steamClient.Session?.RefreshToken;
+
+            if (string.IsNullOrWhiteSpace(refreshToken))
+                return false;
+
+            var session = _steamClient.Session;
+
+            // 刷新 access token (有效时间同样为一天)
+            await session!.RefreshAccessToken(_steamClient);
+
+            // 使用原先获取的具体派生类型 修改数据
+            _steamAuthenticator.SessionData = session.ToString();
+
+            // 重置当前 client
+            if (!ResetCurrentClient())
+            {
+                return false;
+            }
+
+            // 通过原始令牌引用保存信息
+            await AuthenticatorHelper.SaveAuthenticator(_authenticatorDto)
+                .ConfigureAwait(false);
+
+            return true;
+        }
+        finally
+        {
+            IsLoading = false;
+        }
+    }
+
     public async Task Refresh()
     {
         if (_steamClient?.IsLoggedIn() == true)
@@ -161,6 +210,30 @@ public sealed partial class SteamTradePageViewModel : WindowViewModel
         IsLoading = false;
     }
 
+    bool ResetCurrentClient()
+    {
+        try
+        {
+            if (_steamAuthenticator == null)
+                return false;
+
+            _steamClient?.Dispose();
+
+            // 重新生成 client
+            _steamClient = _steamAuthenticator
+                .GetClient(ResourceService.GetCurrentCultureSteamLanguageName());
+
+            if (_steamClient == null)
+                return false;
+        }
+        catch (Exception)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
     async Task<IEnumerable<SteamTradeConfirmationModel>?> GetConfirmations(WSteamClient steamClient)
     {
         IsLoading = true;
@@ -314,7 +387,6 @@ public sealed partial class SteamTradePageViewModel : WindowViewModel
         //            Content = Strings.LocalAuth_AuthTrade_MessageBoxTip_.Format(statusText)
         //        }, statusText, isCancelButton: true, isDialog: false))
         //{
-
         Toast.Show(ToastIcon.Info, Strings.LocalAuth_AuthTrade_ConfirmTip_.Format(statusText));
 
         if (!await ChangeTradeStatus(status, selectedList)) return;

src/BD.WTTS.Client.Plugins.GameAccount/Models/PlatformAccount.props.cs

@@ -26,6 +26,8 @@ public sealed partial class PlatformAccount : ReactiveObject
 
     public bool IsRegDeleteOnClear { get; set; }
 
+    public bool AllFilesRequired { get; set; }
+
     public string? ExeExtraArgs { get; set; }
 
     public string? DefaultExePath { get; set; }

src/BD.WTTS.Client.Plugins.GameAccount/Services.Implementation/BasicPlatformSwitcher.cs

@@ -575,14 +575,16 @@ Windows Registry Editor Version 5.00
             // FILE OR FOLDER
             if (PathHelper.HandleFileOrFolder(accFile, savedFile, localCachePath, false, platform.FolderPath)) continue;
 
-            // Could not find file/folder
-            Toast.Show(ToastIcon.Error, AppResources.Error_CannotFindAccountFile_.Format(accFile));
-
-            return false;
-
-            // TODO: Run some action that can be specified in the Platforms.json file
-            // Add for the start, and end of this function -- To allow 'plugins'?
-            // Use reflection?
+            if (platform.AllFilesRequired)
+            {
+                // Could not find file/folder
+                Toast.Show(ToastIcon.Error, AppResources.Error_CannotFindAccountFile_.Format(accFile));
+                return false;
+            }
+            else
+            {
+                Log.Warn(nameof(CurrnetUserAdd), $"{accFile} Could not find file/folder");
+            }
         }
 
         JTokenHelper.SaveRegJson(regJson, platform.RegJsonPath(name));

src/BD.WTTS.Client.Plugins.GameAccount/Services.Implementation/SteamPlatformSwitcher.cs

@@ -46,7 +46,7 @@ public sealed class SteamPlatformSwitcher : IPlatformSwitcher
             }
             else
             {
-                await steamService.SetSteamCurrentUserAsync(string.Empty);
+                await ClearCurrentLoginUser(platform);
                 foreach (var user in users)
                 {
                     user.MostRecent = false;
@@ -62,7 +62,7 @@ public sealed class SteamPlatformSwitcher : IPlatformSwitcher
         return true;
     }
 
-    async ValueTask<bool> IPlatformSwitcher.ClearCurrentLoginUser(PlatformAccount platform)
+    public async ValueTask<bool> ClearCurrentLoginUser(PlatformAccount platform)
     {
         await steamService.SetSteamCurrentUserAsync(string.Empty);
         return true;
@@ -82,6 +82,7 @@ public sealed class SteamPlatformSwitcher : IPlatformSwitcher
 
     public async ValueTask NewUserLogin(PlatformAccount platform)
     {
+        await ClearCurrentLoginUser(platform);
         await SwapToAccount(null, platform);
     }
 

src/BD.WTTS.Client.Plugins.GameAccount/UI/Assets/Platforms.json

@@ -24,7 +24,8 @@
     "BackupFileTypesIgnore": null,
     "BackupFileTypesInclude": null,
     "UniqueIdPath": "REG:HKCU\\Software\\Epic Games\\Unreal Engine\\Identifiers:AccountId",
-    "UniqueIdType": 2
+    "UniqueIdType": 2,
+    "AllFilesRequired": true
   },
   {
     "FullName": "Ubisoft",
@@ -41,6 +42,7 @@
       "%LocalAppData%\\Ubisoft Game Launcher\\user.dat": "user.dat"
     },
     "ClearPaths": [ "SAME_AS_LOGIN_FILES" ],
+    "ProfilePicPath": "%Platform_Folder%\\cache\\avatars\\%UniqueId%_256.png",
     "CachePaths": [
       "%Platform_Folder%\\cache\\achievements",
       "%Platform_Folder%\\cache\\assets",
@@ -102,8 +104,9 @@
     ],
     "ClearPaths": [ "SAME_AS_LOGIN_FILES" ],
     "LoginFiles": {
-      "%LocalAppData%\\Riot Games\\Riot Client\\Data\\Cookies\\": "Cookies",
-      "%LocalAppData%\\Riot Games\\Riot Client\\Data\\RiotGamesPrivateSettings.yaml": "RiotGamesPrivateSettings.yaml",
+      "%LocalAppData%\\Riot Games\\Riot Client\\Data\\Cookies": "Cookies",
+      "%LocalAppData%\\Riot Games\\Riot Client\\Data\\Sessions": "Sessions",
+      "%LocalAppData%\\Riot Games\\Riot Client\\Data\\RiotClientPrivateSettings.yaml": "RiotClientPrivateSettings.yaml",
       "%LocalAppData%\\Riot Games\\Riot Client\\Config\\RiotClientSettings.yaml": "RiotClientSettings.yaml",
       "%LocalAppData%\\Riot Games\\Riot Client\\WattToolkit.id": "WattToolkit.id"
     },
@@ -150,6 +153,75 @@
     },
     "IsExitBeforeInteract": true,
     "UniqueIdPath": "%AppData%\\Battle.net\\Battle.net.config::$.Client.SavedAccountNames",
-    "UniqueIdType": 5
+    "UniqueIdType": 5,
+    "AllFilesRequired": true
+  },
+  {
+    "FullName": "GOG Galaxy",
+    "Icon": "GOGGalaxy",
+    "Platform": 64,
+    "PlatformIds": [ "g", "gog", "gog2" ],
+    "DefaultExePath": "%ProgramFiles(x86)%\\GOG Galaxy\\GalaxyClient.exe",
+    "ExesToEnd": [ "GalaxyClient.exe", "GOG Galaxy Notifications Renderer.exe", "GalaxyClientService.exe", "GalaxyCommunication.exe" ],
+    "ClearPaths": [ "SAME_AS_LOGIN_FILES" ],
+    "LoginFiles": {
+      "%LocalAppData%\\GOG.com\\Galaxy\\Configuration\\config.json": "LocalAppData\\config.json",
+      "REG:HKCU\\Software\\GOG.com\\Galaxy\\settings:username": "userId",
+      "REG:HKCU\\Software\\GOG.com\\Galaxy:refreshToken": "refreshToken",
+      "REG:HKCU\\Software\\GOG.com\\Galaxy\\settings:userId": "UNIQUE_ID",
+      "%ProgramData%\\GOG.com\\Galaxy\\webcache\\common\\Cache\\index": "ProgramData\\Cache\\index",
+      "%ProgramData%\\GOG.com\\Galaxy\\webcache\\common\\Cache\\data_*": "ProgramData\\Cache\\",
+      "%ProgramData%\\GOG.com\\Galaxy\\webcache\\common\\Code Cache\\js\\index-dir\\the-real-index": "ProgramData\\Code Cache\\js\\index-dir\\the-real-index",
+      "%ProgramData%\\GOG.com\\Galaxy\\webcache\\common\\GPUCache\\index": "ProgramData\\GPUCache\\index",
+      "%ProgramData%\\GOG.com\\Galaxy\\webcache\\common\\Local Storage\\leveldb": "ProgramData\\Local Storage\\leveldb\\",
+      "%ProgramData%\\GOG.com\\Galaxy\\webcache\\common\\Session Storage\\*.log": "ProgramData\\Session Storage\\",
+      "%ProgramData%\\GOG.com\\Galaxy\\webcache\\common\\Session Storage\\*.ldb": "ProgramData\\Session Storage\\",
+      "%ProgramData%\\GOG.com\\Galaxy\\webcache\\common\\Cookies": "ProgramData\\Cookies",
+      "%ProgramData%\\GOG.com\\Galaxy\\storage\\etags.db": "ProgramData\\storage\\etags.db",
+      "%ProgramData%\\GOG.com\\Galaxy\\storage\\galaxy-2.0.db*": "ProgramData\\storage\\",
+      "%ProgramData%\\GOG.com\\Galaxy\\config.json": "ProgramData\\config.json"
+    },
+    "ProfilePicPath": "%ProgramData%\\GOG.com\\Galaxy\\webcache\\%UniqueId%\\user\\%LARGEST%.jpg",
+    "CachePaths": [
+      "C:\\Program Files (x86)\\GOG Galaxy\\GPUCache",
+      "%ProgramData%\\GOG.com\\Galaxy\\webcache\\common\\Cache",
+      "%ProgramData%\\GOG.com\\Galaxy\\webcache\\common\\GPUCache"
+    ],
+    "BackupPaths": [
+      "%LocalAppData%\\GOG.com\\Galaxy\\Configuration\\"
+    ],
+    "UniqueIdFile": "HKCU\\Software\\GOG.com\\Galaxy\\settings:userId",
+    "UniqueIdType": 2
+  },
+  {
+    "FullName": "Discord",
+    "Icon": "Discord",
+    "Platform": 32768,
+    "PlatformIds": [ "d", "discord" ],
+    "DefaultExePath": "%LocalAppData%\\Discord\\Update.exe",
+    "ExeExtraArgs": "--processStart Discord.exe",
+    "ExesToEnd": [ "Discord.exe" ],
+    "PathListToClear": [ "SAME_AS_LOGIN_FILES" ],
+    "LoginFiles": {
+      "%AppData%\\discord\\settings.json": "settings.json",
+      "%AppData%\\discord\\Network Persistent State": "Network Persistent State",
+      "%AppData%\\discord\\Preferences": "Preferences",
+      "%AppData%\\discord\\TransportSecurity": "TransportSecurity",
+      "%AppData%\\discord\\Cache\\index": "Cache\\index",
+      "%AppData%\\discord\\Cache\\data_*": "Cache\\",
+      "%AppData%\\discord\\Code Cache\\js\\index-dir\\the-real-index": "Code Cache\\js\\index-dir\\the-real-index",
+      "%AppData%\\discord\\GPUCache\\index": "GPUCache\\index",
+      "%AppData%\\discord\\Local Storage\\leveldb": "Local Storage\\leveldb\\",
+      "%AppData%\\discord\\Session Storage\\*.log": "Session Storage\\",
+      "%AppData%\\discord\\Session Storage\\*.ldb": "Session Storage\\",
+      "%AppData%\\discord\\blob_storage": "blob_storage\\",
+      "%AppData%\\discord\\WattToolkit.id": "WattToolkit.id"
+    },
+    "IsExitBeforeInteract": true,
+    "CachePaths": [
+      "%AppData%\\discord\\Cache\\f_*"
+    ],
+    "UniqueIdFile": "%AppData%\\discord\\WattToolkit.id",
+    "UniqueIdType": 1
   }
-]
+]

src/BD.WTTS.Client.Plugins.GameAccount/UI/ViewModels/GameAccountPageViewModel.cs

@@ -94,11 +94,11 @@ public sealed partial class GameAccountPageViewModel
         GamePlatforms?[0].LoadUsers();
 
         var temp = GetSupportPlatforms();
-        if (temp != null)
+        if (temp != null && OperatingSystem2.IsWindows())
         {
             if (GameAccountSettings.EnablePlatforms.Any_Nullable())
             {
-                AddGamePlatforms = new ObservableCollection<PlatformAccount>();
+                AddGamePlatforms = [];
 
                 foreach (var p in temp)
                 {

src/BD.WTTS.Client.Plugins.GameList/UI/ViewModels/Pages/GameListPageViewModel.cs

@@ -233,6 +233,7 @@ public sealed partial class GameListPageViewModel : TabItemViewModel
                 if (result.IsOK())
                 {
                     Toast.Show(ToastIcon.Info, Strings.GameList_RuningWait);
+                    NavAppToSteamView(app);
                     app.StartSteamAppProcess(SteamAppRunType.UnlockAchievement);
                     SteamConnectService.Current.RuningSteamApps.TryAdd(app.AppId, app);
                 }

src/BD.WTTS.Client.Plugins.GameTools/BD.WTTS.Client.Plugins.GameTools.csproj

@@ -12,6 +12,7 @@
 	  <None Remove="UI\Assets\CounterStrike.png" />
 	  <None Remove="UI\Assets\CPU.png" />
 	  <None Remove="UI\Assets\movecross.png" />
+	  <None Remove="UI\Assets\movecross_hide.png" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -19,6 +20,7 @@
 	  <AvaloniaResource Include="UI\Assets\CounterStrike.png" />
 	  <AvaloniaResource Include="UI\Assets\CPU.png" />
 	  <AvaloniaResource Include="UI\Assets\movecross.png" />
+	  <AvaloniaResource Include="UI\Assets\movecross_hide.png" />
 	  <AvaloniaResource Include="UI\Assets\toolbox.ico" />
 	</ItemGroup>
 
@@ -72,6 +74,9 @@
 		<Compile Include="..\ImplicitUsings.NLog.cs">
 			<LinkBase>Properties</LinkBase>
 		</Compile>
+		<Compile Include="..\ImplicitUsings.Steam.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
 		<Compile Include="..\ImplicitUsings.Plugins.cs">
 			<LinkBase>Properties</LinkBase>
 		</Compile>
@@ -92,6 +97,9 @@
 	    <AutoGen>True</AutoGen>
 	    <DependentUpon>Resources.resx</DependentUpon>
 	  </Compile>
+	  <Compile Update="UI\Views\CsgoVacRepairPage.axaml.cs">
+	    <DependentUpon>CsgoVacRepairPage.axaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="UI\Views\GameToolsPage.axaml.cs">
 	    <DependentUpon>GameToolsPage.axaml</DependentUpon>
 	  </Compile>