🚧 Misc

* 🐛 修复证书过期后加速失效的问题

* 🐛 修复证书过期跨天情况下的加速error情景

* 🎨 CertService 使用证书默认到期时间

.gitmodules

@@ -37,3 +37,6 @@
 [submodule "ref/Facepunch.Steamworks"]
 	path = ref/Facepunch.Steamworks
 	url = https://github.com/BeyondDimension/Facepunch.Steamworks.git
+[submodule "ref/appcenter-sdk-dotnet"]
+	path = ref/appcenter-sdk-dotnet
+	url = https://github.com/BeyondDimension/appcenter-sdk-dotnet.git

WattToolkit.sln

@@ -214,10 +214,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Facepunch.Steamworks.Posix"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steam++", "src\BD.WTTS.Client.AppHost.Bridge\Steam++.csproj", "{26D8AA24-2ACE-4167-BC2B-117B9BB76AA4}"
 EndProject
-Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "BD.WTTS.Client.AppHost.Bridge.Package", "src\BD.WTTS.Client.AppHost.Bridge.Package\BD.WTTS.Client.AppHost.Bridge.Package.wapproj", "{27795C79-2994-4514-8656-BA34FCEE8901}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArchiSteamFarm", "ref\ArchiSteamFarm\ArchiSteamFarm\ArchiSteamFarm.csproj", "{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AppCenter", "AppCenter", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.AppCenter.Any", "ref\appcenter-sdk-dotnet\SDK\AppCenter\BD.AppCenter.Any\BD.AppCenter.Any.csproj", "{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.AppCenter.Analytics.Any", "ref\appcenter-sdk-dotnet\SDK\AppCenterAnalytics\BD.AppCenter.Analytics.Any\BD.AppCenter.Analytics.Any.csproj", "{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1232,36 +1236,6 @@ Global
 		{26D8AA24-2ACE-4167-BC2B-117B9BB76AA4}.Release|x64.Build.0 = Release|Any CPU
 		{26D8AA24-2ACE-4167-BC2B-117B9BB76AA4}.Release|x86.ActiveCfg = Release|Any CPU
 		{26D8AA24-2ACE-4167-BC2B-117B9BB76AA4}.Release|x86.Build.0 = Release|Any CPU
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM.ActiveCfg = Debug|ARM
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM.Build.0 = Debug|ARM
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM.Deploy.0 = Debug|ARM
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM64.Build.0 = Debug|ARM64
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x64.ActiveCfg = Debug|x64
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x64.Build.0 = Debug|x64
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x64.Deploy.0 = Debug|x64
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x86.ActiveCfg = Debug|x86
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x86.Build.0 = Debug|x86
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x86.Deploy.0 = Debug|x86
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM.ActiveCfg = Release|ARM
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM.Build.0 = Release|ARM
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM.Deploy.0 = Release|ARM
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM64.ActiveCfg = Release|ARM64
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM64.Build.0 = Release|ARM64
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM64.Deploy.0 = Release|ARM64
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x64.ActiveCfg = Release|x64
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x64.Build.0 = Release|x64
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x64.Deploy.0 = Release|x64
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x86.ActiveCfg = Release|x86
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x86.Build.0 = Release|x86
-		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x86.Deploy.0 = Release|x86
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1282,6 +1256,46 @@ Global
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|x64.Build.0 = Release|Any CPU
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|x86.ActiveCfg = Release|Any CPU
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|x86.Build.0 = Release|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|ARM.Build.0 = Debug|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|x64.Build.0 = Debug|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|x86.Build.0 = Debug|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|ARM.ActiveCfg = Release|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|ARM.Build.0 = Release|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|ARM64.Build.0 = Release|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|x64.ActiveCfg = Release|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|x64.Build.0 = Release|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|x86.ActiveCfg = Release|Any CPU
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|x86.Build.0 = Release|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|x64.Build.0 = Debug|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|x86.Build.0 = Debug|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|ARM.Build.0 = Release|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|ARM64.Build.0 = Release|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|x64.ActiveCfg = Release|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|x64.Build.0 = Release|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|x86.ActiveCfg = Release|Any CPU
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1347,8 +1361,10 @@ Global
 		{638745C0-B699-4009-9764-05434C511403} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
 		{35676E23-8E54-4785-A75B-98EB0650596B} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
 		{26D8AA24-2ACE-4167-BC2B-117B9BB76AA4} = {5541B406-4A9A-4AC8-AA77-CE14E133DB80}
-		{27795C79-2994-4514-8656-BA34FCEE8901} = {5541B406-4A9A-4AC8-AA77-CE14E133DB80}
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
+		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {90E88965-DB90-4B49-94F5-6D2965491988}
+		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {567F588F-E95C-4286-8B30-DB3B2200221C}

build/linux/online_install.sh

@@ -3,6 +3,12 @@
 default_base_path="$HOME/WattToolkit"
 base_path="$default_base_path"
 
+# 检查是否以root身份执行
+if [ "$EUID" -eq 0 ]; then
+  echo "此脚本不能以root身份执行。"
+  exit 1
+fi
+
 # 循环直到用户输入有效路径或直接回车
 while true; do
     # 使用 zenity 提示用户选择安装路径或使用默认路径
@@ -41,7 +47,45 @@ base_url="https://api.steampp.net"
 architecture=1
 app_name="Watt Toolkit"
 PROCESS_NAMES=("$exec_name" "$app_name")
-export LC_ALL=en_US.UTF-8
+Check_LC_Code() {
+    # 检查当前 LANG 环境变量
+    current_lang="${LC_ALL:-$LANG}"
+    echo "当前语言环境: $current_lang"
+
+    # 检查是否为 C 或 C.UTF-8
+    if [ "$current_lang" = "C" ] || [ "$current_lang" = "C.UTF-8" ]; then
+        echo "当前语言环境是 C 或 C.UTF-8，需要修改。"
+
+        # 列出系统支持的语言环境
+        supported_locales=$(locale -a)
+        if [ -z "$supported_locales" ]; then
+            echo "未能获取到支持的语言环境列表。请检查系统配置。"
+            return 1
+        fi
+
+        # 遍历支持的语言环境列表，找到第一个不是 C 或 C.UTF-8 的项
+        first_non_c_locale=""
+        for locale in $supported_locales; do
+            if [ "$locale" != "C" ] && [ "$locale" != "C.UTF-8" ]; then
+                first_non_c_locale="$locale"
+                break
+            fi
+        done
+
+        # 检查是否找到了非 C/C.UTF-8 的语言环境
+        if [ -n "$first_non_c_locale" ]; then
+            echo "修改语言环境为支持列表中的第一个非 C/C.UTF-8 项：$first_non_c_locale"
+            export LC_ALL="$first_non_c_locale"
+            echo "语言环境已修改为 $first_non_c_locale。"
+        else
+            echo "未能找到非 C/C.UTF-8 的语言环境。请检查系统配置。"
+            return 1
+        fi
+    else
+        echo "当前语言环境不是 C 或 C.UTF-8，无需修改。"
+    fi
+}
+Check_LC_Code
 Install_certutil() {
     # 判断发行版类型
     if command -v certutil &>/dev/null; then
@@ -360,34 +404,44 @@ Kill_Process
 Decompression
 # xdg-icon-resource install "$base_path/Icons/Watt-Toolkit.png" --size 128 Watt-Toolkit
 InitDesktop() {
+    # 检查XDG_DESKTOP_DIR环境变量，如果未设置则使用默认值
+    XDG_DESKTOP_DIR="${XDG_DESKTOP_DIR:-$HOME/Desktop}"
+
     while true; do
         # 使用 zenity 提示用户选择安装路径或使用默认路径
-        choice=$(zenity --list --radiolist --title="请选择要添加到的位置" --column="选择" --column="路径" TRUE "$HOME/.local/share/applications/" FALSE "$HOME/Desktop")
+        choice=$(zenity --list --radiolist --title="请选择要添加到的位置" \
+            --column="选择" --column="路径" \
+            TRUE "$XDG_DESKTOP_DIR" \
+            FALSE "$HOME/.local/share/applications/")
 
         # 检查用户输入
         if [ "$choice" == "$HOME/.local/share/applications/" ]; then
             target_dir="$HOME/.local/share/applications/"
             break
-        elif [ "$choice" == "$HOME/Desktop" ]; then
-            target_dir="$HOME/Desktop/"
+        elif [ "$choice" == "$XDG_DESKTOP_DIR" ]; then
+            target_dir="$XDG_DESKTOP_DIR"
             break
         else
-            echo "无效选项，请输入 1 或 2。"
+            # 无效选项时给出提示，并继续循环
+            zenity --info --text="无效选项，请重新选择。"
         fi
     done
-    #添加桌面文件
+
+    # 添加桌面文件
     rm -rf "$target_dir/Watt Toolkit.desktop" 2>/dev/null
-    echo "#!/usr/bin/env xdg-open
+    cat <<EOT > "$target_dir/Watt Toolkit.desktop"
 [Desktop Entry]
 Name=Watt Toolkit
 Exec=$base_path/$exec_name.sh
 Icon=$base_path/Icons/Watt-Toolkit.png
 Terminal=false
 Type=Application
-StartupNotify=false" >"$target_dir/Watt Toolkit.desktop"
+StartupNotify=false
+EOT
     chmod +x "$target_dir/Watt Toolkit.desktop"
-
 }
+
+
 InitDesktop
 # update-desktop-database ~/.local/share/applications
 #运行程序

build/settings_v4_app.json

@@ -973,7 +973,7 @@
         },
         {
           "TypeName": "string",
-          "PropertyName": "CustomDohAddres",
+          "PropertyName": "CustomDohAddres2",
           "DefaultValue": "null",
           "DefaultValueIsConst": true,
           "Summary": "自定义 DNS over HTTPS 地址",

doc/program-file-structure/Windows.md

@@ -1,43 +0,0 @@
-# Steam++ v3.X Program File Structure for Windows
-
-- dotnet 共享运行时，删除后将使用已安装的运行时，此目参考 ```C:\Program Files\dotnet```，可自行升级行库小版本号，二进制兼容
-	- host
-		- fxr
-			- x.y.z
-				- hostfxr.dll
-	- shared
-		- Microsoft.AspNetCore.App
-			- x.y.z
-		- Microsoft.NETCore.App
-			- x.y.z
-- native
-    - win-x64
-        - 7z.dll
-        - av_libglesv2.dll
-        - e_sqlite3.dll
-        - libHarfBuzzSharp.dll
-        - libSkiaSharp.dll
-        - WebView2Loader.dll
-        - WinDivert.dll
-        - WinDivert64.sys
-- assemblies 主模块程序集
-- modules 可选模块
-    - ~~Update 自更新模块，删除该文件夹后禁用更新~~
-        - Steam++.Update.exe 更新程序，CDN 分发更包，下载与解压在主程序中，此进程仅退出主程执行覆盖操作
-    - Accelerator 网络加速
-        - Steam++.Accelerator.exe 控制台子服务进，使用匿名管道与主进程通信，无参数或指定某参数(待定)启动时可读取配置文件启动加速，可全独立运行，ASP.NET Core Web API 项目，支持 Docker
-        - Steam++.Plugins.Accelerator.dll 插件程集
-    - AccountSwitch 账号切换
-        - Steam++.Plugins.AccountSwitch.dll
-    - ~~ArchiSteamFarm~~
-        - Steam++.ArchiSteamFarm.exe
-        - Steam++.Plugins.ArchiSteamFarm.dll
-    - GameList 库存游戏
-        - Steam++.Plugins.GameList.dll
-    - LocalAuth 本地令牌
-        - Steam++.Plugins.LocalAuth.dll
-    - GameTools 游戏工具
-        - Steam++.Plugins.GameTools.dll
-- Steam++.exe (主启动程序).NET Framework 二进制主程序  
-- Steam++.exe.config 使用该配置文件以允许在 .NET Framework 3.5 ~ 4.8.1 中任意版本中兼容运行(从 Windows 7 ~ 11 中所有系统自带运行时)  
-- ~~Steam++.Uninstall.exe 卸载程序(WinForms?AOT?)~~ 

src/AssemblyInfo.Constants.cs

@@ -21,7 +21,7 @@ public static partial class AssemblyInfo
     /// <summary>
     /// RC 版本号，范围 0~9，只增不减
     /// </summary>
-    const string ver_for_rc = "9";
+    const string ver_for_rc = "12";
 
     public const string FileVersion = $"{Version2}.{ver_for_rc}1{ver_for_preview}.0";
 

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

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
-  xmlns:desktop2="http://schemas.microsoft.com/appx/manifest/desktop/windows10/2"
-  IgnorableNamespaces="uap rescap desktop desktop2">
-
-	<Identity
-	  Name="4651ED44255E.47979655102CE"
-	  Publisher="CN=A90E406B-B2D3-4A23-B061-0FA1D65C4F66"
-	  Version="3.0.207.0" />
-
-	<Properties>
-		<DisplayName>Watt Toolkit</DisplayName>
-		<PublisherDisplayName>软妹币玩家</PublisherDisplayName>
-		<Logo>Images\StoreLogo.png</Logo>
-	</Properties>
-
-	<Dependencies>
-		<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
-		<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
-	</Dependencies>
-
-	<Resources>
-		<Resource Language="x-generate"/>
-	</Resources>
-
-	<Applications>
-		<Application Id="App"
-		  Executable="$targetnametoken$.exe"
-		  EntryPoint="$targetentrypoint$">
-			<uap:VisualElements
-			  DisplayName="Watt Toolkit"
-			  Description="「Watt Toolkit」是一个开源跨平台的多功能游戏工具箱，此工具的大部分功能都是需要您下载安装 Steam 才能使用。"
-			  BackgroundColor="transparent"
-			  Square150x150Logo="Images\Square150x150Logo.png"
-			  Square44x44Logo="Images\Square44x44Logo.png">
-				<uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png"  Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png" ShortName="Steam++">
-					<uap:ShowNameOnTiles>
-						<uap:ShowOn Tile="square150x150Logo"/>
-						<uap:ShowOn Tile="wide310x150Logo"/>
-						<uap:ShowOn Tile="square310x310Logo"/>
-					</uap:ShowNameOnTiles>
-				</uap:DefaultTile >
-				<uap:SplashScreen Image="Images\SplashScreen.png" />
-				<uap:InitialRotationPreference>
-					<uap:Rotation Preference="landscape"/>
-				</uap:InitialRotationPreference>
-				<uap:LockScreen BadgeLogo="Images\BadgeLogo.png" Notification="badgeAndTileText"/>
-			</uap:VisualElements>
-			<Extensions>
-				<desktop:Extension Category="windows.fullTrustProcess" Executable="Steam++\Steam++.exe" />
-				<desktop:Extension Category="windows.startupTask" Executable="Steam++\Steam++.exe" EntryPoint="Windows.FullTrustApplication">
-					<desktop:StartupTask TaskId="BootAutoStartTask" Enabled="true" DisplayName="Steam++ System Boot Run" />
-				</desktop:Extension>
-				<uap:Extension Category="windows.protocol">
-					<uap:Protocol Name="spp">
-						<uap:Logo>Images\Square44x44Logo.png</uap:Logo>
-						<uap:DisplayName>Steam++ URI Scheme</uap:DisplayName>
-					</uap:Protocol>
-				</uap:Extension>
-			</Extensions>
-		</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" />
-		<rescap:Capability Name="allowElevation" />
-	</Capabilities>
-</Package>

src/BD.WTTS.Client.AppHost/App.config

@@ -10,6 +10,6 @@
 		<legacyCorruptedStateExceptionsPolicy enabled="true"/>
 	</runtime>
 	<appSettings>
-		<add key="d" value="8.0.0"/>
+		<add key="d" value="9.0.0"/>
 	</appSettings>
 </configuration>

src/BD.WTTS.Client.AppHost/Program.cs

@@ -16,7 +16,7 @@ static unsafe partial class Program
 {
     static Program()
     {
-        dotnet_version_major = "8";
+        dotnet_version_major = "9";
         dotnet_version_minor = "0";
         dotnet_version_build = "0";
         dotnet_version = $"{dotnet_version_major}.{dotnet_version_minor}.{dotnet_version_build}";
@@ -426,8 +426,8 @@ static unsafe partial class Program
         if (!File.Exists(config_path) || !File.Exists(dotnetlib_path))
         {
 #if DEBUG
-            config_path = string.Join(Path.DirectorySeparatorChar.ToString(), new[] { ProjectUtils.ProjPath, "src", "BD.WTTS.Client.Avalonia.App", "bin", "Debug", $"net{dotnet_version_major}.{dotnet_version_minor}-windows10.0.19041.0", $"{dotnet_dll_name}.runtimeconfig.json" });
-            dotnetlib_path = string.Join(Path.DirectorySeparatorChar.ToString(), new[] { ProjectUtils.ProjPath, "src", "BD.WTTS.Client.Avalonia.App", "bin", "Debug", $"net{dotnet_version_major}.{dotnet_version_minor}-windows10.0.19041.0", $"{dotnet_dll_name}.dll" });
+            config_path = string.Join(Path.DirectorySeparatorChar.ToString(), new[] { ProjectUtils.ProjPath, "src", "BD.WTTS.Client.Avalonia.App", "bin", "Debug", $"net{dotnet_version_major}.{dotnet_version_minor}-windows10.0.19041", $"{dotnet_dll_name}.runtimeconfig.json" });
+            dotnetlib_path = string.Join(Path.DirectorySeparatorChar.ToString(), new[] { ProjectUtils.ProjPath, "src", "BD.WTTS.Client.Avalonia.App", "bin", "Debug", $"net{dotnet_version_major}.{dotnet_version_minor}-windows10.0.19041", $"{dotnet_dll_name}.dll" });
 #else
             ShowErrMessageBox($"Loading assembly failed \"{dotnetlib_path}\"");
             return (int)ExitCode.EntryPointFileNotFound;

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

@@ -95,31 +95,37 @@
 		<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
 	</ItemGroup>
 
-	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' AND Exists('$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net8.0\System.Drawing.Common.dll')">
-		<!-- Windows Only -->
-		<!-- 修复：存在 Microsoft.WindowsDesktop.App 依赖时不会将 System.Drawing.Common.dll 复制到输出目录-->
-		<None Include="$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net8.0\System.Drawing.Common.dll">
+	<!--<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' AND Exists('$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net9.0\System.Drawing.Common.dll')">
+		--><!-- Windows Only --><!--
+		--><!-- 修复：存在 Microsoft.WindowsDesktop.App 依赖时不会将 System.Drawing.Common.dll 复制到输出目录--><!--
+		<None Include="$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net9.0\System.Drawing.Common.dll">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<Reference Include="System.Drawing.Common">
-			<HintPath>$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net8.0\System.Drawing.Common.dll</HintPath>
+			<HintPath>$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net9.0\System.Drawing.Common.dll</HintPath>
+		</Reference>
+		<None Include="$(NugetPackageRoot)\microsoft.win32.systemevents\9.0.0\runtimes\win\lib\net9.0\Microsoft.Win32.SystemEvents.dll">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<Reference Include="Microsoft.Win32.SystemEvents">
+			<HintPath>$(NugetPackageRoot)\microsoft.win32.systemevents\9.0.0\runtimes\win\lib\net9.0\Microsoft.Win32.SystemEvents.dll</HintPath>
 		</Reference>
 	</ItemGroup>
 
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' AND Exists('$(NugetPackageRoot)\splat.drawing\$(Version_Splat_Drawing)\lib\net7.0\Splat.Drawing.dll')">
-		<!-- Windows Only -->
-		<!-- 修复：Splat.Drawing 包存在 WPF 的依赖项 -->
+		--><!-- Windows Only --><!--
+		--><!-- 修复：Splat.Drawing 包存在 WPF 的依赖项 --><!--
 		<PackageReference Include="Splat.Drawing">
 			<ExcludeAssets>all</ExcludeAssets>
 		</PackageReference>
 		<Reference Include="Splat.Drawing">
 			<HintPath>$(NugetPackageRoot)\splat.drawing\$(Version_Splat_Drawing)\lib\net7.0\Splat.Drawing.dll</HintPath>
 		</Reference>
-		<!-- 修复：System.Reactive 包存在 System.Windows.Forms 的依赖项 -->
+		--><!-- 修复：System.Reactive 包存在 System.Windows.Forms 的依赖项 --><!--
 		<Reference Include="System.Reactive">
 			<HintPath>$(NugetPackageRoot)\system.reactive\$(Version_System_Reactive)\lib\net6.0\System.Reactive.dll</HintPath>
 		</Reference>
-	</ItemGroup>
+	</ItemGroup>-->
 
 	<Import Project="..\TFM_NETX_WITH_DESKTOP.props" />
 

src/BD.WTTS.Client.Avalonia.App/Info.plist

@@ -8,8 +8,6 @@
 	<string>3.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>3.0.0.0</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.15</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

src/BD.WTTS.Client.Avalonia/Services.Implementation/UI/Widgets/AvaloniaToastServiceImpl.cs

@@ -44,16 +44,21 @@ sealed class AvaloniaToastServiceImpl : IToastService
         if (NotificationManager == null)
         {
             var host = AvaloniaWindowManagerImpl.GetWindowTopLevel();
-
-            NotificationManager = new SnackbarManager(host)
+            if (host != null)
             {
-                Position = NotificationPosition.BottomRight,
-                MaxItems = 5,
-            };
+                NotificationManager = new SnackbarManager(host)
+                {
+                    Position = NotificationPosition.BottomRight,
+                    MaxItems = 5,
+                };
+            }
         }
 
-        var notificationType = GetNotificationType(icon);
-        NotificationManager.Show(text, notificationType: notificationType);
+        if (NotificationManager != null)
+        {
+            var notificationType = GetNotificationType(icon);
+            NotificationManager.Show(text, notificationType: notificationType);
+        }
     }
 
     /// <inheritdoc cref="Show(string, int?)"/>

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

@@ -76,7 +76,7 @@ public sealed partial class App : Application
                     Log.Error(nameof(Steamworks), ex, "Steamworks.SteamClient Init");
                 }
             }
-#endif 
+#endif
         }
         catch (Exception ex)
         {
@@ -111,6 +111,12 @@ public sealed partial class App : Application
             {
                 Task2.InBackground(() => appWindow.SplashScreen?.RunTasks(CancellationToken.None));
             }
+
+            IPlatformService.Instance.SetSystemSessionEnding(() =>
+            {
+                Log.Info("System Shutdown", "Application SafeExit...");
+                Shutdown();
+            });
         }
         else if (ApplicationLifetime is ISingleViewApplicationLifetime singleView)
         {
@@ -246,8 +252,8 @@ public sealed partial class App : Application
             try
             {
                 Uri uri = new(urlString);
-                if (uri.Host.EndsWith("steampp.net", StringComparison.OrdinalIgnoreCase) ||
-                    uri.Host.EndsWith("mossimo.net", StringComparison.OrdinalIgnoreCase))
+                if (uri.Host.EndsWith(Constants.Urls.OfficialWebsiteHost, StringComparison.OrdinalIgnoreCase) &&
+                    uri.Query.EndsWith(Constants.Urls.Komaasharu_IsAuthQuery, StringComparison.OrdinalIgnoreCase))
                 {
                     await UserService.Current.OpenAuthUrl(urlString);
                     return;

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

@@ -65,7 +65,7 @@
                 </spp:AppItem>
 
                 <spp:AppItem
-                    Title="Wo Long: Fallen Dynasty （卧龙：苍天陨落）"
+                    Title="Wo Long: Fallen Dynasty （卧龙：苍天陨落）（卧龙：苍天陨落）（卧龙：苍天陨落）（卧龙：苍天陨落）"
                     MaxHeight="120"
                     Description="This is a description of whatver this does"
                     Tags="111">
@@ -181,7 +181,7 @@
                                 Grid.Row="2"
                                 Grid.Column="1"
                                 Grid.ColumnSpan="2"
-                                Margin="0,5"
+                                Margin="0,5,12,5"
                                 VerticalAlignment="Top"
                                 Classes="CaptionTextBlockStyle"
                                 FontSize="12"

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

@@ -61,6 +61,10 @@ public class SnackbarManager : TemplatedControl, IManagedNotificationManager
         {
             Install(host);
         }
+        else
+        {
+            Log.Error("SnackbarManager", "Install Faild, host is null");
+        }
 
         UpdatePseudoClasses(Position);
     }

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

@@ -110,7 +110,7 @@
 		<PackageReference Include="Utf8StringInterpolation" />
 	</ItemGroup>
 
-	<ItemGroup Condition="$([MSBuild]::IsOSPlatform('windows')) AND ($(RuntimeIdentifier.StartsWith('win-')) OR $(RuntimeIdentifier) == '')">
+	<ItemGroup Condition="!$(DefineConstants.Contains('REMOVE_DNS_INTERCEPT')) AND $([MSBuild]::IsOSPlatform('windows')) AND ($(RuntimeIdentifier.StartsWith('win-')) OR $(RuntimeIdentifier) == '')">
 		<PackageReference Include="Aigio.WinDivertSharp" />
 	</ItemGroup>
 

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Extensions/ServiceCollectionExtensions.cs

@@ -148,6 +148,7 @@ public static partial class ServiceCollectionExtensions
 
 #if WINDOWS
 
+#if !REMOVE_DNS_INTERCEPT
     /// <summary>
     /// 注册数据包拦截器
     /// </summary>
@@ -170,6 +171,7 @@ public static partial class ServiceCollectionExtensions
 
         return services;
     }
+#endif
 
 #endif
 }

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

@@ -129,7 +129,7 @@ sealed partial class CertificateManagerImpl : ICertificateManager
 
     bool SharedCreateRootCertificate()
     {
-        RootCertificate ??= LoadRootCertificate();
+        RootCertificate = LoadRootCertificate();
 
         if (RootCertificate != null)
         {

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services.Implementation/HttpServer/Certificates/CertService.cs

@@ -83,7 +83,7 @@ sealed class CertService
             entry.SetAbsoluteExpiration(notAfter);
 
             var subjectName = new X500DistinguishedName($"CN={domain}");
-            using var serverCert = CertGenerator.CreateEndCertificate(caCert, subjectName, GetDomains(), notBefore, notAfter);
+            using var serverCert = CertGenerator.CreateEndCertificate(caCert, subjectName, GetDomains());
             var serverCertPfx = serverCert.Export(X509ContentType.Pfx);
             // 将生成的证书导出后重新创建一个
             return new X509Certificate2(serverCertPfx);

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

@@ -84,7 +84,7 @@ sealed partial class HttpReverseProxyMiddleware
             !reverseProxyConfig.Service.OnlyEnableProxyScript)
         {
             // 部分运营商将奇怪的域名解析到 127.0.0.1 再此排除这些不支持的代理域名
-            var ip = await reverseProxyConfig.DnsAnalysis.AnalysisDomainIpAsync(context.Request.Host.Value, IDnsAnalysisService.DNS_Dnspods).FirstOrDefaultAsync();
+            var ip = await reverseProxyConfig.DnsAnalysis.AnalysisDomainIpAsync(context.Request.Host.Value!, IDnsAnalysisService.DNS_Dnspods).FirstOrDefaultAsync();
             if (ip == null || IPAddress.IsLoopback(ip))
             {
                 context.Response.StatusCode = StatusCodes.Status500InternalServerError;

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

@@ -24,7 +24,7 @@ sealed class DnsDohAnalysisService : GeneralHttpClientFactory
     {
     }
 
-    public const string DefaultDohAddres = Dnspod_DohAddres;
+    public const string DefaultDohAddres = Dnspod_DohAddres2;
 
     static Uri GetDohAddres(string? dohAddres)
     {
@@ -63,6 +63,12 @@ sealed class DnsDohAnalysisService : GeneralHttpClientFactory
         var client = new HttpClient(handler);
         client.BaseAddress = dohAddresUri;
         var dnsClient = new DnsHttpClient(client);
+        //暂未考虑释放问题 注意！
+        //foreach (var dc in dnsClients.Values)
+        //{
+        //    dc.Dispose();
+        //}
+        //dnsClients.Clear();
         dnsClients.TryAdd(dohAddresUri, dnsClient);
         return dnsClient;
     }

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

@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/DnsInterceptHostedService.cs
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 
 // ReSharper disable once CheckNamespace
 namespace BD.WTTS.Services.Implementation;

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

@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Dns/DnsInterceptor.cs
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 
 using WinDivertSharp;
 using DNS.Protocol;

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

@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Tcp/GitInterceptor.cs
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 
 using static BD.WTTS.Models.Abstractions.IReverseProxyConfig;
 

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

@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Tcp/HttpInterceptor.cs
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 
 using static BD.WTTS.Models.Abstractions.IReverseProxyConfig;
 

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

@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Tcp/HttpsInterceptor.cs
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 
 using static BD.WTTS.Models.Abstractions.IReverseProxyConfig;
 

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

@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Tcp/SshInterceptor.cs
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 
 using static BD.WTTS.Models.Abstractions.IReverseProxyConfig;
 

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

@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/TcpInterceptHostedService.cs
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 
 using static BD.WTTS.Models.Abstractions.IReverseProxyConfig;
 

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

@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Tcp/TcpInterceptor.cs
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 
 using WinDivertSharp;
 

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

@@ -23,7 +23,7 @@ partial class YarpReverseProxyServiceImpl
         services.AddReverseProxyServer();
         services.AddFlowAnalyze();
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
         if (ProxyMode == ProxyMode.DNSIntercept)
         {
             services.AddPacketIntercept();

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

@@ -47,9 +47,40 @@ sealed partial class YarpReverseProxyServiceImpl : ReverseProxyServiceImpl, IRev
             ICertificateManager.Constants.CheckRootCertificate(
                 platformService,
                 CertificateManager);
+
+            X509Certificate2? cer = CertificateManager.RootCertificatePackable;
+            if (cer is not null && DateTime.Now <= cer.NotAfter && cer.NotAfter <= DateTime.Now.AddMonths(1))
+            {
+                var interval = cer.NotAfter - DateTime.Now;
+
+                _certificateTimer = new System.Timers.Timer(interval)
+                {
+                    AutoReset = false,
+                };
+
+                _certificateTimer.Elapsed += async (_, _) =>
+                {
+                    ICertificateManager.Constants.CheckRootCertificate(
+                        platformService,
+                        CertificateManager);
+
+                    await StopProxyAsync();
+                    await StartProxyImpl();
+                };
+                _certificateTimer.Start();
+            }
         }
     }
 
+    private System.Timers.Timer? _certificateTimer;
+
+    private void StopCertificateTimer()
+    {
+        _certificateTimer?.Stop();
+        _certificateTimer?.Dispose();
+        _certificateTimer = null;
+    }
+
     protected override Task<StartProxyResult> StartProxyImpl() => Task.FromResult(StartProxyCore());
 
     StartProxyResult StartProxyCore()
@@ -153,6 +184,7 @@ sealed partial class YarpReverseProxyServiceImpl : ReverseProxyServiceImpl, IRev
 
     public async Task StopProxyAsync()
     {
+        StopCertificateTimer();
         Scripts = null;
         if (app == null) return;
         await app.StopAsync();

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services/Certificate/ICertificateManager.cs

@@ -196,6 +196,11 @@ public interface ICertificateManager
                 // 生成证书
                 certificateManager.GenerateCertificate();
 
+                packable = GetRootCertificatePackable();
+                certificate2 = packable;
+                if (certificate2 == null)
+                    return StartProxyResultCode.GetX509Certificate2Fail;
+
                 // 安装证书
                 ICertificateManager.Constants.TrustRootCertificate(
                     GetCerFilePath, platformService, certificate2);

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

@@ -124,7 +124,7 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
-	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
+	<ItemGroup Condition="!$(DefineConstants.Contains('REMOVE_DNS_INTERCEPT')) AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
 		<Compile Update="Properties\WinDivertResource.Designer.cs">
 			<DesignTime>True</DesignTime>
 			<AutoGen>True</AutoGen>
@@ -136,7 +136,7 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
-	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'windows'">
+	<ItemGroup Condition="$(DefineConstants.Contains('REMOVE_DNS_INTERCEPT')) OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'windows'">
 		<Compile Remove="Properties\WinDivertResource.Designer.cs" />
 		<EmbeddedResource Remove="Properties\WinDivertResource.resx" />
 	</ItemGroup>

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

@@ -1,4 +1,4 @@
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 using WinDivertBinRes = BD.WTTS.Properties.WinDivertResource;
 
 namespace Mobius.Helpers;
@@ -46,8 +46,10 @@ static class WinDivertInitHelper
 
         void GetData()
         {
-            if (data != default)
+            if (data == default)
+            {
                 data = GetWinDivertBinRes();
+            }
         }
 
         if (libraryPath != null && libraryDirPath != null)

src/BD.WTTS.Client.Plugins.Accelerator/Models/ProxyDomainGroupViewModel.cs

@@ -0,0 +1,48 @@
+using FluentAvalonia.Core;
+using System.Reactive;
+
+namespace BD.WTTS.Models;
+
+public class ProxyDomainGroupViewModel : ReactiveObject
+{
+    private readonly INetworkTestService networkTestService = INetworkTestService.Instance;
+
+    public string Name { get; set; } = string.Empty;
+
+    public string IconUrl { get; set; } = string.Empty;
+
+    public ReadOnlyCollection<ProxyDomainViewModel>? EnableProxyDomainVMs { get; set; }
+
+    public ReactiveCommand<Unit, Unit> ConnectTestCommand { get; set; }
+
+    public ProxyDomainGroupViewModel()
+    {
+        ConnectTestCommand = ReactiveCommand.CreateFromTask(async () =>
+        {
+            if (EnableProxyDomainVMs == null)
+            {
+                Toast.Show(ToastIcon.Warning, "没有可测试的项目");
+                return;
+            }
+
+            var tasks = EnableProxyDomainVMs.Select(async enableDomain =>
+            {
+                enableDomain.DelayMillseconds = "- ms";
+                var (success, delayMs) = await networkTestService.TestOpenUrlAsync(enableDomain.Url);
+                enableDomain.DelayMillseconds = success switch
+                {
+                    true when delayMs > 20000 => "Timeout",
+                    true => delayMs.ToString() + " ms",
+                    false => "error",
+                };
+            });
+
+            await Task.WhenAll(tasks);
+
+            if (EnableProxyDomainVMs.Count(x => x.DelayMillseconds == "Timeout") == EnableProxyDomainVMs.Count)
+            {
+                Toast.Show(ToastIcon.Error, "当前测试项全部未通过，请检查网络链接状况，以及代理设置里的设置项是否正常。");
+            }
+        });
+    }
+}

src/BD.WTTS.Client.Plugins.Accelerator/Models/ProxyDomainViewModel.cs

@@ -0,0 +1,55 @@
+using Avalonia.Media;
+
+namespace BD.WTTS.Models;
+
+public class ProxyDomainViewModel : ReactiveObject
+{
+    private readonly INetworkTestService networkTestService = INetworkTestService.Instance;
+
+    public string Name { get; }
+
+    public ProxyType ProxyType { get; }
+
+    public string Url { get; }
+
+    [Reactive]
+    public string DelayMillseconds { get; set; } = string.Empty;
+
+    [ObservableAsProperty]
+    public bool RetestButtonVisible { get; }
+
+    [ObservableAsProperty]
+    public IBrush DelayColor { get; } = null!;
+
+    public ReadOnlyCollection<ProxyDomainViewModel>? Children { get; }
+
+    public ProxyDomainViewModel(string name, ProxyType proxyType, string url, List<ProxyDomainViewModel>? children = null)
+    {
+        Name = name;
+        ProxyType = proxyType;
+        Url = url;
+        Children = children?.AsReadOnly();
+
+        this.WhenAnyValue(x => x.DelayMillseconds)
+            .Subscribe(delay => Children?.ForEach(child => child.DelayMillseconds = delay));
+
+        this.WhenAnyValue(x => x.DelayMillseconds)
+            .Select(d => d != string.Empty && d != "-")
+            .ToPropertyEx(this, x => x.RetestButtonVisible);
+
+        const int DelayMiddle = 1000;
+        this.WhenAnyValue(x => x.DelayMillseconds)
+            .Select(d => d switch
+            {
+                "Timeout" or "error" => Brushes.Red,
+                var s when s.Split(' ') is [var num, "ms"] && int.TryParse(num, out int ms)
+                   => ms switch
+                   {
+                       <= DelayMiddle => Brushes.Green,
+                       > DelayMiddle => Brushes.Orange,
+                   },
+                _ => Brushes.Gray,
+            })
+            .ToPropertyEx(this, x => x.DelayColor);
+    }
+}

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

@@ -375,7 +375,13 @@ internal partial class NetworkTestService : INetworkTestService
         DnsQueryAnswerRecord.DnsRecordType dnsRecordType = DnsQueryAnswerRecord.DnsRecordType.A,
         CancellationToken cancellationToken = default)
     {
-        using HttpClient client = new HttpClient();
+        var handler = new HttpClientHandler
+        {
+            UseCookies = false,
+            UseProxy = false,
+            Proxy = HttpNoProxy.Instance,
+        };
+        using HttpClient client = new HttpClient(handler);
 
         string queryUrl = $"{dohServer}?name={testDomain}&type={dnsRecordType}";
 

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

@@ -2,6 +2,7 @@
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using BD.Common.Models;
+using BD.WTTS.Helpers;
 using BD.WTTS.UI.Views.Controls;
 using BD.WTTS.UI.Views.Pages;
 using FluentAvalonia.UI.Controls;
@@ -52,7 +53,7 @@ public sealed partial class GameAcceleratorService
     [Reactive]
     public DateTime? VipEndTime { get; set; }
 
-    const string VipEndTimeStringDef = "新用户免费试用 2 天";
+    const string VipEndTimeStringDef = "新用户免费试用";
 
     [Reactive]
     public string? VipEndTimeString { get; set; } = VipEndTimeStringDef;
@@ -353,9 +354,16 @@ public sealed partial class GameAcceleratorService
             if (UserService.Current.User?.WattOpenId == null)
             {
                 Toast.Show(ToastIcon.Warning, "需要登录账号才能使用游戏加速功能!");
+                UserService.Current.ShowWindow();
                 app.IsAccelerating = false;
                 return;
             }
+
+            TracepointHelper.TrackEvent(nameof(GameAccelerator), new Dictionary<string, string> {
+                { "GameId", app.Id.ToString() },
+                { "GameName", app.Name ?? string.Empty },
+            });
+
             var xunYouIsInstall = await Ioc.Get<IAcceleratorService>().XY_IsInstall();
             if (xunYouIsInstall.HandleUI(out var isInstall))
             {
@@ -604,6 +612,7 @@ public sealed partial class GameAcceleratorService
                 Toast.Show(ToastIcon.Info, "已安装Watt加速器");
                 return;
             }
+            TracepointHelper.TrackEvent("DownloadInstallAccelerator");
             var td = new TaskDialog
             {
                 Title = "下载插件",
@@ -770,6 +779,11 @@ public sealed partial class GameAcceleratorService
 
     public async Task ShowXunYouWindow(bool showHide)
     {
+        //if (UserService.Current.User?.WattOpenId != null)
+        //    await Ioc.Get<IAcceleratorService>().XY_StartEx2(
+        //                            UserService.Current.User.WattOpenId,
+        //                            UserService.Current.User.NickName, 0, 0, 0);
+
         var result = await Ioc.Get<IAcceleratorService>().XY_ShowWinodw(showHide);
     }
 }

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

@@ -1,4 +1,6 @@
 // ReSharper disable once CheckNamespace
+using BD.WTTS.Helpers;
+
 namespace BD.WTTS.Services;
 
 partial class ProxyService
@@ -36,10 +38,15 @@ partial class ProxyService
             Toast.Show(ToastIcon.Warning, Strings.CommunityFix_AccEmpty);
         }
 
+        TracepointHelper.TrackEvent("StartProxy", new Dictionary<string, string> {
+            { "ProxyType", ProxySettings.ProxyMode.Value.ToString() },
+            { "ProxyScriptStatus", ProxySettings.IsEnableScript.Value.ToString() },
+        });
+
         IReadOnlyCollection<ScriptIPCDTO>? scripts = default;
         bool isEnableScript = ProxySettings.IsEnableScript.Value;
         bool isOnlyWorkSteamBrowser = ProxySettings.IsOnlyWorkSteamBrowser.Value;
-        ushort proxyPort = ProxySettings.SystemProxyPortId.Value;
+        ushort proxyPort = ProxySettings.SystemProxyPortId.Value == 0 ? ProxySettings.SystemProxyPortId.Default : ProxySettings.SystemProxyPortId.Value;
         string? proxyIp = ProxySettings.SystemProxyIp.Value;
         proxyMode = defaultProxyMode;
         bool isProxyGOG = ProxySettings.IsProxyGOG.Value;
@@ -64,7 +71,7 @@ partial class ProxyService
         string? proxyDNS = ProxySettings.ProxyMasterDns.Value;
         bool isSupportIpv6 = await RefreshIpv6Support();
         bool useDoh = ProxySettings.UseDoh.Value;
-        string? customDohAddres = ProxySettings.CustomDohAddres.Value;
+        string? customDohAddres = ProxySettings.CustomDohAddres2.Value;
 
         Lazy<IPAddress> proxyIp_ = new(() => ReverseProxySettings.GetProxyIp(proxyIp));
         void SetProxyIp(IPAddress proxyIPAddress)
@@ -120,6 +127,9 @@ partial class ProxyService
 
         switch (proxyMode)
         {
+#if REMOVE_DNS_INTERCEPT
+            case ProxyMode.DNSIntercept:
+#endif
             case ProxyMode.Hosts:
                 var inUsePort = SocketHelper.IsUsePort(proxyIp_.Value, httpsPort);
                 if (inUsePort)
@@ -186,7 +196,7 @@ partial class ProxyService
                     return Strings.CommunityFix_SetAsSystemPACProxyFail;
                 }
                 break;
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
             case ProxyMode.DNSIntercept:
                 {
                     await Mobius.Helpers.WinDivertInitHelper.InitializeAsync();
@@ -315,6 +325,9 @@ partial class ProxyService
 #endif
         switch (proxyMode) // 先停止接入代理流量
         {
+#if REMOVE_DNS_INTERCEPT
+            case ProxyMode.DNSIntercept:
+#endif
             case ProxyMode.Hosts:
                 var needClear = hostsFileService.ContainsHostsByTag();
                 if (needClear)
@@ -351,7 +364,7 @@ partial class ProxyService
                     await platformService.SetAsSystemPACProxyAsync(false);
                 }
                 break;
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
             case ProxyMode.DNSIntercept:
                 {
                     // 停止时也调用初始化