code style

Bumps the packages group in /src/Snap.Hutao with 3 updates: [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest), [MSTest.TestAdapter](https://github.com/microsoft/testfx) and [MSTest.TestFramework](https://github.com/microsoft/testfx).


Updates `Microsoft.NET.Test.Sdk` from 17.9.0 to 17.10.0
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md)
- [Commits](https://github.com/microsoft/vstest/compare/v17.9.0...v17.10.0)

Updates `MSTest.TestAdapter` from 3.3.1 to 3.4.0
- [Release notes](https://github.com/microsoft/testfx/releases)
- [Changelog](https://github.com/microsoft/testfx/blob/main/docs/Changelog.md)
- [Commits](https://github.com/microsoft/testfx/compare/v3.3.1...v3.4.0)

Updates `MSTest.TestFramework` from 3.3.1 to 3.4.0
- [Release notes](https://github.com/microsoft/testfx/releases)
- [Changelog](https://github.com/microsoft/testfx/blob/main/docs/Changelog.md)
- [Commits](https://github.com/microsoft/testfx/compare/v3.3.1...v3.4.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: packages
- dependency-name: MSTest.TestAdapter
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: packages
- dependency-name: MSTest.TestFramework
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: packages
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/ISSUE_TEMPLATE/CHS-bug-report.yml

@@ -40,7 +40,7 @@ body:
     attributes:
       label: Snap Hutao 版本
       description: 在应用标题，应用程序的反馈中心界面中可以找到
-      placeholder: 例：1.4.15.0
+      placeholder: 例：1.9.9.0
     validations:
       required: true
 
@@ -62,20 +62,19 @@ body:
       description: 请设置一个你认为合适的分类，这将帮助我们快速定位问题
       options:
         - 安装和环境
-        - 成就管理
-        - 角色信息面板
         - 游戏启动器
+        - 祈愿记录
+        - 成就管理
+        - 我的角色
         - 实时便笺
         - 养成计算
-        - 文件缓存
-        - 祈愿记录
-        - 玩家查询
-        - 胡桃数据库
-        - 用户界面
-        - 胡桃云
-        - 胡桃帐号
-        - 签到
+        - 深境螺旋/胡桃数据库
         - Wiki
+        - 米游社账号面板
+        - 每日签到奖励
+        - 胡桃通行证/胡桃云
+        - 用户界面
+        - 文件缓存
         - 公告
         - 其它
     validations:

.github/ISSUE_TEMPLATE/ENG-bug-report.yml

@@ -40,7 +40,7 @@ body:
     attributes:
       label: Snap Hutao Version
       description: You can find the version in application's title bar
-      placeholder: e.g. 1.4.15.0
+      placeholder: e.g. 1.9.9.0
     validations:
       required: true
 
@@ -62,20 +62,19 @@ body:
       description: Please select the most associated category of your issue
       options:
         - Installation and Environment
+        - Game Launcher
+        - Wish Export
         - Achievement
         - My Character
-        - Game Launcher
         - Realtime Note
         - Develop Plan
-        - File Cache
-        - Wish Export
-        - Game Record
-        - Hutao Database
-        - User Interface
-        - Snap Hutao Cloud
-        - Snap Hutao Account
-        - Checkin
+        - Spiral Abyss
         - Wiki
+        - MiHoYo Account Panel
+        - Daily Checkin Reward
+        - Hutao Passport/Hutao Cloud
+        - User Interface
+        - File Cache
         - Announcement
         - Other
     validations:

.github/pull_request_template.md

@@ -0,0 +1,15 @@
+<!--- Hi, thanks for considering make a PR contribution to Snap Hutao, we appreciate your work. -->
+<!--- Before you create this PR, please fill the following form and checklist -->
+
+## Description
+
+<!--- Describe your changes -->
+
+## Related Issue
+
+<!--- If there's an associated issue, please use [GitHub Keyword](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests) to link it -->
+<!-- e.g. fix #999, resolve #999, close #999 -->
+
+## Checklist
+
+- [ ] The target PR branch is `develop` branch

.github/workflows/alpha.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - develop
+      - 'feat/*'
     paths-ignore:
       - '.gitattributes'
       - '.github/**'
@@ -28,7 +29,15 @@ on:
 
 jobs:
   build:
-    runs-on: self-hosted
+    runs-on: ${{ matrix.runner }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        runner:
+          - self-hosted
+          - windows-latest
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -73,7 +82,7 @@ jobs:
           > [!IMPORTANT]
           > 请注意，从 Snap Hutao Alpha 2023.12.21.3 开始，我们将使用全新的 CI 证书，原有的 Snap.Hutao.CI.cer 将在几天后过期停止使用。
           >
-          > 请安装 [DGP_Studio_CA.crt](https://github.com/DGP-Automation/Hutao-Auto-Release/releases/download/certificate-ca/DGP_Studio_CA.crt) 以安装测试版安装包
+          > 请安装 [DGP_Studio_CA.crt](https://github.com/DGP-Automation/Hutao-Auto-Release/releases/download/certificate-ca/DGP_Studio_CA.crt) 到 `受信任的根证书颁发机构` 以安装测试版安装包
           "
 
           echo $summary >> $Env:GITHUB_STEP_SUMMARY

.github/workflows/close_stale.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/stale@v9
         with:
           any-of-labels: 'needs-more-info,需要更多信息'
-          stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 3 days.'
+          stale-issue-message: 'This issue is stale because it has been open 7 days with no activity. Remove stale label or comment or this will be closed in 3 days.'
           days-before-stale: 7
           days-before-close: 3
           close-issue-reason: not_planned

README.md

@@ -17,7 +17,15 @@ You can follow the instructions in the [Quick Start](https://hut.ao/en/quick-sta
 
 ## 本地化翻译 / Localization
 
-![zh-TW translation](https://img.shields.io/badge/dynamic/json?color=blue&label=zh-TW&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27zh-TW%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json) ![en translation](https://img.shields.io/badge/dynamic/json?color=blue&label=en&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27en%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json) ![id translation](https://img.shields.io/badge/dynamic/json?color=blue&label=id&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27id%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json) ![ja translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ja&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27ja%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json) ![ko translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ko&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27ko%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)![pt-PT translation](https://img.shields.io/badge/dynamic/json?color=blue&label=pt-PT&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27pt-PT%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)  ![ru translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ru&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27ru%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)
+[![zh-TW translation](https://img.shields.io/badge/dynamic/json?color=blue&label=zh-TW&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27zh-TW%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao)
+[![en translation](https://img.shields.io/badge/dynamic/json?color=blue&label=en&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27en%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao)
+[![fr translation](https://img.shields.io/badge/dynamic/json?color=blue&label=fr&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27fr%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao)
+[![id translation](https://img.shields.io/badge/dynamic/json?color=blue&label=id&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27id%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao)
+[![ja translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ja&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27ja%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao)
+[![ko translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ko&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27ko%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao)
+[![pt-PT translation](https://img.shields.io/badge/dynamic/json?color=blue&label=pt-PT&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27pt-PT%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao)
+[![ru translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ru&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27ru%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao)
+[![vi translation](https://img.shields.io/badge/dynamic/json?color=blue&label=vi&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27vi%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao)
 
 Snap Hutao 使用 [Crowdin](https://translate.hut.ao/) 作为客户端文本翻译平台，在该平台上你可以为你熟悉的语言提交翻译文本。我们感谢每一个为 Snap Hutao 做出贡献的社区成员，并且欢迎更多的朋友能参与到这个项目中。
 
@@ -46,13 +54,13 @@ Snap Hutao uses [Crowdin](https://translate.hut.ao/) as a client text translatio
 * [CommunityToolkit/dotnet](https://github.com/CommunityToolkit/dotnet)
 * [CommunityToolkit/Labs-Windows](https://github.com/CommunityToolkit/Labs-Windows)
 * [CommunityToolkit/Windows](https://github.com/CommunityToolkit/Windows)
-* [dahall/taskscheduler](https://github.com/dahall/taskscheduler)
 * [dotnet/efcore](https://github.com/dotnet/efcore)
 * [dotnet/runtime](https://github.com/dotnet/runtime)
 * [DotNetAnalyzers/StyleCopAnalyzers](https://github.com/DotNetAnalyzers/StyleCopAnalyzers)
 * [microsoft/vs-validation](https://github.com/microsoft/vs-validation)
 * [microsoft/WindowsAppSDK](https://github.com/microsoft/WindowsAppSDK)
 * [microsoft/microsoft-ui-xaml](https://github.com/microsoft/microsoft-ui-xaml)
+* [quartznet/quartznet](https://github.com/quartznet/quartznet)
 
 ### 支撑项目 / Supporter Project
 
@@ -64,9 +72,9 @@ Snap Hutao uses [Crowdin](https://translate.hut.ao/) as a client text translatio
 Snap Hutao is currently using sponsored software from the following service providers.
 
 | [![](https://www.netlify.com/v3/img/components/netlify-light.svg)](https://www.netlify.com/) | [![](https://support.crowdin.com/assets/logos/core-logo/svg/crowdin-core-logo-cDark.svg)](https://crowdin.com/) | [![](https://gitlab.cn/images/icons/logos/logo-121-75.svg)](https://gitlab.cn/) |
-|:----------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------:|
-|              [![](https://github.com/DGP-Studio/Snap.Hutao/assets/10614984/73ae8b90-f3c7-4033-b2b7-f4126331ce66)](https://about.signpath.io)              |                        [![](https://github.com/DGP-Studio/Snap.Hutao/assets/10614984/49aed8ee-9f19-4a8a-998c-7b93ee286d65)](https://1password.com/)                         |  [![](https://github.com/DGP-Studio/Snap.Hutao/assets/10614984/ad121220-d2d3-4f49-b215-b6d063dc229d)](https://about.signpath.io)   |
-
+|:-:|:-:|:-:|
+|[![](https://github.com/DGP-Studio/Snap.Hutao/assets/10614984/73ae8b90-f3c7-4033-b2b7-f4126331ce66)](https://about.signpath.io)|[![](https://github.com/DGP-Studio/Snap.Hutao/assets/10614984/49aed8ee-9f19-4a8a-998c-7b93ee286d65)](https://1password.com/)|[![](https://github.com/DGP-Studio/Snap.Hutao/assets/10614984/ad121220-d2d3-4f49-b215-b6d063dc229d)](https://www.digitalocean.com)|
+|[![jetbrains](https://github.com/DGP-Studio/Snap.Hutao/assets/36357191/4105772a-728a-4a84-9c6e-d713a5698a20)](https://www.jetbrains.com/opensource/)|||
 
 - Netlify provides document and home page hosting service for Snap Hutao
 
@@ -80,6 +88,8 @@ Snap Hutao is currently using sponsored software from the following service prov
   
 - DigitalOcean provides reliable cloud database for Snap Hutao database backup
 
+- Jetbrains provides powerful IDE for Snap Hutao infrastructure services coding
+
 ## 开发 / Development
 
 ![Snap.Hutao](https://repobeats.axiom.co/api/embed/f029553fbe0c60689b1710476ec8512452163fc9.svg)

build.cake

@@ -11,6 +11,15 @@ var version = "version";
 var repoDir = "repoDir";
 var outputPath = "outputPath";
 
+// Extension
+
+static ProcessArgumentBuilder AppendIf(this ProcessArgumentBuilder builder, string text, bool condition)
+{
+    return condition ? builder.Append(text) : builder;
+}
+
+// Properties
+
 string solution
 {
     get => System.IO.Path.Combine(repoDir, "src", "Snap.Hutao", "Snap.Hutao.sln");
@@ -157,6 +166,7 @@ Task("Build binary package")
                                             .Append("/p:AppxPackageSigningEnabled=false")
                                             .Append("/p:AppxBundle=Never")
                                             .Append("/p:AppxPackageOutput=" + outputPath)
+                                            .AppendIf("/p:AlphaConstants=IS_ALPHA_BUILD", !AppVeyor.IsRunningOnAppVeyor)
     };
 
     DotNetBuild(project, settings);

src/Snap.Hutao/.editorconfig

@@ -110,7 +110,6 @@ dotnet_diagnostic.SA1642.severity = none
 
 dotnet_diagnostic.IDE0005.severity = warning
 dotnet_diagnostic.IDE0060.severity = none
-dotnet_diagnostic.IDE0290.severity = none
 
 # SA1208: System using directives should be placed before other using directives
 dotnet_diagnostic.SA1208.severity = none
@@ -321,7 +320,8 @@ dotnet_diagnostic.CA2227.severity = suggestion
 
 # CA2251: 使用 “string.Equals”
 dotnet_diagnostic.CA2251.severity = suggestion
-csharp_style_prefer_primary_constructors = true:suggestion
+
+csharp_style_prefer_primary_constructors = false:none
 
 [*.vb]
 #### 命名样式 ####

src/Snap.Hutao/Snap.Hutao.Test/BaseClassLibrary/UnsafeAccessorTest.cs

@@ -0,0 +1,28 @@
+using System.Runtime.CompilerServices;
+
+namespace Snap.Hutao.Test.BaseClassLibrary;
+
+[TestClass]
+public class UnsafeAccessorTest
+{
+    [TestMethod]
+    public void UnsafeAccessorCanGetInterfaceProperty()
+    {
+        TestClass test = new();
+        int value = InternalGetInterfaceProperty(test);
+        Assert.AreEqual(3, value);
+    }
+
+    [UnsafeAccessor(UnsafeAccessorKind.Method, Name = "get_TestProperty")]
+    private static extern int InternalGetInterfaceProperty(ITestInterface instance);
+
+    internal interface ITestInterface
+    {
+        internal int TestProperty { get; }
+    }
+
+    internal sealed class TestClass : ITestInterface
+    {
+        public int TestProperty { get; } = 3;
+    }
+}

src/Snap.Hutao/Snap.Hutao.Test/PlatformExtensions/DependencyInjectionTest.cs

@@ -1,5 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using System;
+using System.Linq;
 
 namespace Snap.Hutao.Test.PlatformExtensions;
 
@@ -10,7 +12,10 @@ public sealed class DependencyInjectionTest
         .AddSingleton<IService, ServiceA>()
         .AddSingleton<IService, ServiceB>()
         .AddScoped<IScopedService, ServiceA>()
+        .AddKeyedTransient<IKeyedService, KeyedServiceA>("A")
+        .AddKeyedTransient<IKeyedService, KeyedServiceB>("B")
         .AddTransient(typeof(IGenericService<>), typeof(GenericService<>))
+        .AddLogging(builder => builder.AddConsole())
         .BuildServiceProvider();
 
     [TestMethod]
@@ -41,6 +46,22 @@ public sealed class DependencyInjectionTest
         }
     }
 
+    [TestMethod]
+    public void LoggerWithInterfaceTypeCanBeResolved()
+    {
+        Assert.IsNotNull(services.GetService<ILogger<IScopedService>>());
+        Assert.IsNotNull(services.GetRequiredService<ILoggerFactory>().CreateLogger(nameof(IScopedService)));
+    }
+
+    [TestMethod]
+    public void KeyedServicesCanBeResolvedAsEnumerable()
+    {
+        Assert.IsNotNull(services.GetRequiredKeyedService<IKeyedService>("A"));
+        Assert.IsNotNull(services.GetRequiredKeyedService<IKeyedService>("B"));
+
+        Assert.AreEqual(0, services.GetServices<IKeyedService>().Count());
+    }
+
     private interface IService
     {
         Guid Id { get; }
@@ -86,4 +107,14 @@ public sealed class DependencyInjectionTest
         {
         }
     }
+
+    private interface IKeyedService;
+
+    private sealed class KeyedServiceA : IKeyedService
+    {
+    }
+
+    private sealed class KeyedServiceB : IKeyedService
+    {
+    }
 }

src/Snap.Hutao/Snap.Hutao.Test/RuntimeBehavior/UnsafeRuntimeBehaviorTest.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -46,7 +47,14 @@ public sealed class UnsafeRuntimeBehaviorTest
         Assert.AreEqual(1212, testStruct.Value4);
     }
 
-
+    [TestMethod]
+    public unsafe void UnsafeUtf8StringReference()
+    {
+        void* ptr = Unsafe.AsPointer(ref MemoryMarshal.GetReference("test"u8));
+        GC.Collect(GC.MaxGeneration);
+        ReadOnlySpan<byte> bytes = MemoryMarshal.CreateReadOnlySpanFromNullTerminated((byte*)ptr);
+        Console.WriteLine(System.Text.Encoding.UTF8.GetString(bytes));
+    }
 
     private readonly struct TestStruct
     {

src/Snap.Hutao/Snap.Hutao.Test/Snap.Hutao.Test.csproj

@@ -12,9 +12,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.4.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.4.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Snap.Hutao/Snap.Hutao/App.xaml

@@ -6,6 +6,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources/>
+                <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.SettingsControls/SettingsCard/SettingsCard.xaml"/>
                 <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.TokenizingTextBox/TokenizingTextBox.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Loading.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Image/CachedImage.xaml"/>

src/Snap.Hutao/Snap.Hutao/App.xaml.cs

@@ -8,10 +8,8 @@ using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Core.LifeCycle;
 using Snap.Hutao.Core.LifeCycle.InterProcess;
 using Snap.Hutao.Core.Logging;
-using Snap.Hutao.Core.Shell;
+using Snap.Hutao.Core.Windowing;
 using System.Diagnostics;
-using System.Text;
-using static Snap.Hutao.Core.Logging.ConsoleVirtualTerminalSequences;
 
 namespace Snap.Hutao;
 
@@ -41,7 +39,7 @@ public sealed partial class App : Application
         """;
 
     private readonly IServiceProvider serviceProvider;
-    private readonly IActivation activation;
+    private readonly IAppActivation activation;
     private readonly ILogger<App> logger;
 
     /// <summary>
@@ -52,13 +50,19 @@ public sealed partial class App : Application
     {
         // Load app resource
         InitializeComponent();
-        activation = serviceProvider.GetRequiredService<IActivation>();
+        activation = serviceProvider.GetRequiredService<IAppActivation>();
         logger = serviceProvider.GetRequiredService<ILogger<App>>();
         serviceProvider.GetRequiredService<ExceptionRecorder>().Record(this);
 
         this.serviceProvider = serviceProvider;
     }
 
+    public new void Exit()
+    {
+        XamlLifetime.ApplicationExiting = true;
+        base.Exit();
+    }
+
     /// <inheritdoc/>
     protected override void OnLaunched(LaunchActivatedEventArgs args)
     {
@@ -68,6 +72,7 @@ public sealed partial class App : Application
 
             if (serviceProvider.GetRequiredService<PrivateNamedPipeClient>().TryRedirectActivationTo(activatedEventArgs))
             {
+                logger.LogDebug("Application exiting on RedirectActivationTo");
                 Exit();
                 return;
             }
@@ -75,15 +80,20 @@ public sealed partial class App : Application
             logger.LogColorizedInformation((ConsoleBanner, ConsoleColor.DarkYellow));
             LogDiagnosticInformation();
 
-            // manually invoke
-            activation.Activate(HutaoActivationArguments.FromAppActivationArguments(activatedEventArgs));
-            activation.Initialize();
+            // Manually invoke
+            HutaoActivationArguments hutaoArgs = HutaoActivationArguments.FromAppActivationArguments(activatedEventArgs);
+            if (hutaoArgs.Kind is HutaoActivationKind.Toast)
+            {
+                Exit();
+                return;
+            }
 
-            serviceProvider.GetRequiredService<IJumpListInterop>().ConfigureAsync().SafeForget();
+            activation.Activate(hutaoArgs);
+            activation.PostInitialization();
         }
-        catch
+        catch (Exception ex)
         {
-            // AppInstance.GetCurrent() calls failed
+            logger.LogError(ex, "Application failed in App.OnLaunched");
             Process.GetCurrentProcess().Kill();
         }
     }

src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBaseBuilder.cs

@@ -0,0 +1,10 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Control.Builder.ButtonBase;
+
+internal class ButtonBaseBuilder<TButton> : IButtonBaseBuilder<TButton>
+    where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase, new()
+{
+    public TButton Button { get; } = new();
+}

src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBaseBuilderExtension.cs

@@ -0,0 +1,25 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Core.Abstraction.Extension;
+
+namespace Snap.Hutao.Control.Builder.ButtonBase;
+
+internal static class ButtonBaseBuilderExtension
+{
+    public static TBuilder SetContent<TBuilder, TButton>(this TBuilder builder, object? content)
+        where TBuilder : IButtonBaseBuilder<TButton>
+        where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase
+    {
+        builder.Configure(builder => builder.Button.Content = content);
+        return builder;
+    }
+
+    public static TBuilder SetCommand<TBuilder, TButton>(this TBuilder builder, ICommand command)
+        where TBuilder : IButtonBaseBuilder<TButton>
+        where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase
+    {
+        builder.Configure(builder => builder.Button.Command = command);
+        return builder;
+    }
+}

src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBuilder.cs

@@ -0,0 +1,8 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml.Controls;
+
+namespace Snap.Hutao.Control.Builder.ButtonBase;
+
+internal sealed class ButtonBuilder : ButtonBaseBuilder<Button>;

src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBuilderExtension.cs

@@ -0,0 +1,19 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml.Controls;
+
+namespace Snap.Hutao.Control.Builder.ButtonBase;
+
+internal static class ButtonBuilderExtension
+{
+    public static ButtonBuilder SetContent(this ButtonBuilder builder, object? content)
+    {
+        return builder.SetContent<ButtonBuilder, Button>(content);
+    }
+
+    public static ButtonBuilder SetCommand(this ButtonBuilder builder, ICommand command)
+    {
+        return builder.SetCommand<ButtonBuilder, Button>(command);
+    }
+}

src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/IButtonBaseBuilder.cs

@@ -0,0 +1,12 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Core.Abstraction;
+
+namespace Snap.Hutao.Control.Builder.ButtonBase;
+
+internal interface IButtonBaseBuilder<TButton> : IBuilder
+    where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase
+{
+    TButton Button { get; }
+}

src/Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/VectorChangedEventArgs.cs

@@ -7,7 +7,7 @@ namespace Snap.Hutao.Control.Collection.AdvancedCollectionView;
 
 internal sealed class VectorChangedEventArgs : IVectorChangedEventArgs
 {
-    public VectorChangedEventArgs(CollectionChange cc, int index = -1, object item = null!)
+    public VectorChangedEventArgs(CollectionChange cc, int index = -1, object item = default!)
     {
         CollectionChange = cc;
         Index = (uint)index;

src/Snap.Hutao/Snap.Hutao/Control/Collection/Alternating/AlternatingItemsControl.cs

@@ -1,39 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml.Controls;
-using Windows.Foundation.Collections;
-
-namespace Snap.Hutao.Control.Collection.Alternating;
-
-[Obsolete("Use SettingsCard instead")]
-[DependencyProperty("ItemAlternateBackground", typeof(Microsoft.UI.Xaml.Media.Brush))]
-internal sealed partial class AlternatingItemsControl : ItemsControl
-{
-    private readonly VectorChangedEventHandler<object> itemsVectorChangedEventHandler;
-
-    public AlternatingItemsControl()
-    {
-        itemsVectorChangedEventHandler = OnItemsVectorChanged;
-        Items.VectorChanged += itemsVectorChangedEventHandler;
-    }
-
-    private void OnItemsVectorChanged(IObservableVector<object> items, IVectorChangedEventArgs args)
-    {
-        if (args.CollectionChange is CollectionChange.Reset)
-        {
-            int index = (int)args.Index;
-            for (int i = index; i < items.Count; i++)
-            {
-                if (items[i] is IAlternatingItem item)
-                {
-                    item.Background = i % 2 is 0 ? default : ItemAlternateBackground;
-                }
-                else
-                {
-                    break;
-                }
-            }
-        }
-    }
-}

src/Snap.Hutao/Snap.Hutao/Control/Collection/Alternating/IAlternatingItem.cs

@@ -1,10 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Control.Collection.Alternating;
-
-[Obsolete("Use SettingsCard instead")]
-internal interface IAlternatingItem
-{
-    public Microsoft.UI.Xaml.Media.Brush? Background { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Control/DependencyValueConverter.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
+using Snap.Hutao.Core.ExceptionService;
 
 namespace Snap.Hutao.Control;
 
@@ -40,6 +41,6 @@ internal abstract class DependencyValueConverter<TFrom, TTo> : DependencyObject,
     /// <returns>源</returns>
     public virtual TFrom ConvertBack(TTo to)
     {
-        throw Must.NeverHappen();
+        throw HutaoException.NotSupported();
     }
 }

src/Snap.Hutao/Snap.Hutao/Control/Extension/FrameworkElementExtension.cs

@@ -28,4 +28,20 @@ internal static class FrameworkElementExtension
         frameworkElement.IsRightTapEnabled = false;
         frameworkElement.IsTabStop = false;
     }
+
+    public static void InitializeDataContext<TDataContext>(this FrameworkElement frameworkElement, IServiceProvider? serviceProvider = default)
+        where TDataContext : class
+    {
+        IServiceProvider service = serviceProvider ?? Ioc.Default;
+        try
+        {
+            frameworkElement.DataContext = service.GetRequiredService<TDataContext>();
+        }
+        catch (Exception ex)
+        {
+            ILogger? logger = service.GetRequiredService(typeof(ILogger<>).MakeGenericType([frameworkElement.GetType()])) as ILogger;
+            logger?.LogError(ex, "Failed to initialize DataContext");
+            throw;
+        }
+    }
 }

src/Snap.Hutao/Snap.Hutao/Control/Helper/FrameworkElementHelper.cs

@@ -7,6 +7,8 @@ namespace Snap.Hutao.Control.Helper;
 
 [SuppressMessage("", "SH001")]
 [DependencyProperty("SquareLength", typeof(double), 0D, nameof(OnSquareLengthChanged), IsAttached = true, AttachedType = typeof(FrameworkElement))]
+[DependencyProperty("IsActualThemeBindingEnabled", typeof(bool), false, nameof(OnIsActualThemeBindingEnabled), IsAttached = true, AttachedType = typeof(FrameworkElement))]
+[DependencyProperty("ActualTheme", typeof(ElementTheme), ElementTheme.Default, IsAttached = true, AttachedType = typeof(FrameworkElement))]
 public sealed partial class FrameworkElementHelper
 {
     private static void OnSquareLengthChanged(DependencyObject dp, DependencyPropertyChangedEventArgs e)
@@ -15,4 +17,22 @@ public sealed partial class FrameworkElementHelper
         element.Width = (double)e.NewValue;
         element.Height = (double)e.NewValue;
     }
+
+    private static void OnIsActualThemeBindingEnabled(DependencyObject dp, DependencyPropertyChangedEventArgs e)
+    {
+        FrameworkElement element = (FrameworkElement)dp;
+        if ((bool)e.NewValue)
+        {
+            element.ActualThemeChanged += OnActualThemeChanged;
+        }
+        else
+        {
+            element.ActualThemeChanged -= OnActualThemeChanged;
+        }
+
+        static void OnActualThemeChanged(FrameworkElement sender, object args)
+        {
+            SetActualTheme(sender, sender.ActualTheme);
+        }
+    }
 }

src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs

@@ -1,8 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Media.Imaging;
 using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core.Caching;
 using Snap.Hutao.Core.ExceptionService;
@@ -23,22 +21,19 @@ internal sealed class CachedImage : Implementation.ImageEx
     {
         DefaultStyleKey = typeof(CachedImage);
         DefaultStyleResourceUri = "ms-appx:///Control/Image/CachedImage.xaml".ToUri();
-
-        IsCacheEnabled = true;
-        EnableLazyLoading = false;
     }
 
     /// <inheritdoc/>
-    protected override async Task<ImageSource?> ProvideCachedResourceAsync(Uri imageUri, CancellationToken token)
+    protected override async Task<Uri?> ProvideCachedResourceAsync(Uri imageUri, CancellationToken token)
     {
         IImageCache imageCache = this.ServiceProvider().GetRequiredService<IImageCache>();
 
         try
         {
-            HutaoException.ThrowIf(string.IsNullOrEmpty(imageUri.Host), HutaoExceptionKind.ImageCacheInvalidUri, SH.ControlImageCachedImageInvalidResourceUri);
+            HutaoException.ThrowIf(string.IsNullOrEmpty(imageUri.Host), SH.ControlImageCachedImageInvalidResourceUri);
             string file = await imageCache.GetFileFromCacheAsync(imageUri).ConfigureAwait(true); // BitmapImage need to be created by main thread.
             token.ThrowIfCancellationRequested(); // check token state to determine whether the operation should be canceled.
-            return new BitmapImage(file.ToUri()); // BitmapImage initialize with a uri will increase image quality and loading speed.
+            return file.ToUri();
         }
         catch (COMException)
         {

src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.xaml

@@ -6,7 +6,6 @@
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}"/>
         <Setter Property="IsTabStop" Value="False"/>
-        <Setter Property="LazyLoadingThreshold" Value="256"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="shci:CachedImage">

src/Snap.Hutao/Snap.Hutao/Control/Image/Implementation/ImageExBase.cs

@@ -6,9 +6,6 @@ using Microsoft.UI.Composition;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
-using Snap.Hutao.Win32;
-using System.IO;
-using Windows.Foundation;
 
 namespace Snap.Hutao.Control.Image.Implementation;
 
@@ -21,12 +18,6 @@ namespace Snap.Hutao.Control.Image.Implementation;
 [TemplatePart(Name = PartImage, Type = typeof(object))]
 [TemplatePart(Name = PartPlaceholderImage, Type = typeof(object))]
 [DependencyProperty("Stretch", typeof(Stretch), Stretch.Uniform)]
-[DependencyProperty("DecodePixelHeight", typeof(int), 0)]
-[DependencyProperty("DecodePixelWidth", typeof(int), 0)]
-[DependencyProperty("DecodePixelType", typeof(DecodePixelType), DecodePixelType.Physical)]
-[DependencyProperty("IsCacheEnabled", typeof(bool), false)]
-[DependencyProperty("EnableLazyLoading", typeof(bool), false, nameof(EnableLazyLoadingChanged))]
-[DependencyProperty("LazyLoadingThreshold", typeof(double), default(double), nameof(LazyLoadingThresholdChanged))]
 [DependencyProperty("PlaceholderSource", typeof(object), default(object))]
 [DependencyProperty("PlaceholderStretch", typeof(Stretch), Stretch.Uniform)]
 [DependencyProperty("PlaceholderMargin", typeof(Thickness))]
@@ -42,8 +33,6 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
     protected const string FailedState = "Failed";
 
     private CancellationTokenSource? tokenSource;
-    private object? lazyLoadingSource;
-    private bool isInViewport;
 
     public bool IsInitialized { get; private set; }
 
@@ -58,10 +47,10 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
 
     public abstract CompositionBrush GetAlphaMask();
 
-    protected virtual Task<ImageSource?> ProvideCachedResourceAsync(Uri imageUri, CancellationToken token)
+    protected virtual Task<Uri?> ProvideCachedResourceAsync(Uri imageUri, CancellationToken token)
     {
         // By default we just use the built-in UWP image cache provided within the Image control.
-        return Task.FromResult<ImageSource?>(new BitmapImage(imageUri));
+        return Task.FromResult<Uri?>(imageUri);
     }
 
     protected virtual void OnImageOpened(object sender, RoutedEventArgs e)
@@ -80,19 +69,10 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
         RemoveImageFailed(OnImageFailed);
 
         Image = GetTemplateChild(PartImage);
-        PlaceholderImage = GetTemplateChild(PartPlaceholderImage);
 
         IsInitialized = true;
 
-        if (Source is null || !EnableLazyLoading || isInViewport)
-        {
-            lazyLoadingSource = null;
-            SetSource(Source);
-        }
-        else
-        {
-            lazyLoadingSource = Source;
-        }
+        SetSource(Source);
 
         AttachImageOpened(OnImageOpened);
         AttachImageFailed(OnImageFailed);
@@ -148,33 +128,6 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
         }
     }
 
-    private static void EnableLazyLoadingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        if (d is not ImageExBase control)
-        {
-            return;
-        }
-
-        bool value = (bool)e.NewValue;
-        if (value)
-        {
-            control.LayoutUpdated += control.OnImageExBaseLayoutUpdated;
-            control.InvalidateLazyLoading();
-        }
-        else
-        {
-            control.LayoutUpdated -= control.OnImageExBaseLayoutUpdated;
-        }
-    }
-
-    private static void LazyLoadingThresholdChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        if (d is ImageExBase { EnableLazyLoading: true } control)
-        {
-            control.InvalidateLazyLoading();
-        }
-    }
-
     private static void SourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
         if (d is not ImageExBase control)
@@ -187,15 +140,7 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
             return;
         }
 
-        if (e.NewValue is null || !control.EnableLazyLoading || control.isInViewport)
-        {
-            control.lazyLoadingSource = null;
-            control.SetSource(e.NewValue);
-        }
-        else
-        {
-            control.lazyLoadingSource = e.NewValue;
-        }
+        control.SetSource(e.NewValue);
     }
 
     private static bool IsHttpUri(Uri uri)
@@ -203,11 +148,8 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
         return uri.IsAbsoluteUri && (uri.Scheme == "http" || uri.Scheme == "https");
     }
 
-    private void AttachSource(ImageSource? source)
+    private void AttachSource(BitmapImage? source, Uri? uri)
     {
-        // Setting the source at this point should call ImageExOpened/VisualStateManager.GoToState
-        // as we register to both the ImageOpened/ImageFailed events of the underlying control.
-        // We only need to call those methods if we fail in other cases before we get here.
         if (Image is Microsoft.UI.Xaml.Controls.Image image)
         {
             image.Source = source;
@@ -221,13 +163,15 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
         {
             VisualStateManager.GoToState(this, UnloadedState, true);
         }
-        else if (source is BitmapSource { PixelHeight: > 0, PixelWidth: > 0 })
+        else
         {
+            // https://learn.microsoft.com/en-us/windows/uwp/debug-test-perf/optimize-animations-and-media#optimize-image-resources
+            source.UriSource = uri;
             VisualStateManager.GoToState(this, LoadedState, true);
         }
     }
 
-    private void AttachPlaceholderSource(ImageSource? source)
+    private void AttachPlaceholderSource(BitmapImage? source, Uri? uri)
     {
         if (PlaceholderImage is Microsoft.UI.Xaml.Controls.Image image)
         {
@@ -242,8 +186,10 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
         {
             VisualStateManager.GoToState(this, UnloadedState, true);
         }
-        else if (source is BitmapSource { PixelHeight: > 0, PixelWidth: > 0 })
+        else
         {
+            // https://learn.microsoft.com/en-us/windows/uwp/debug-test-perf/optimize-animations-and-media#optimize-image-resources
+            source.UriSource = uri;
             VisualStateManager.GoToState(this, LoadedState, true);
         }
     }
@@ -256,10 +202,9 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
         }
 
         tokenSource?.Cancel();
-
         tokenSource = new CancellationTokenSource();
 
-        AttachSource(null);
+        AttachSource(default, default);
 
         if (source is null)
         {
@@ -268,13 +213,6 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
 
         VisualStateManager.GoToState(this, LoadingState, true);
 
-        if (source as ImageSource is { } imageSource)
-        {
-            AttachSource(imageSource);
-
-            return;
-        }
-
         if (source as Uri is not { } uri)
         {
             string? url = source as string ?? source.ToString();
@@ -319,20 +257,13 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
         tokenSource?.Cancel();
         tokenSource = new();
 
-        AttachPlaceholderSource(null);
+        AttachPlaceholderSource(default, default);
 
         if (source is null)
         {
             return;
         }
 
-        if (source as ImageSource is { } imageSource)
-        {
-            AttachPlaceholderSource(imageSource);
-
-            return;
-        }
-
         if (source as Uri is not { } uri)
         {
             string? url = source as string ?? source.ToString();
@@ -354,13 +285,13 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
                 return;
             }
 
-            ImageSource? img = await ProvideCachedResourceAsync(uri, tokenSource.Token).ConfigureAwait(true);
+            Uri? actualUri = await ProvideCachedResourceAsync(uri, tokenSource.Token).ConfigureAwait(true);
 
             ArgumentNullException.ThrowIfNull(tokenSource);
             if (!tokenSource.IsCancellationRequested)
             {
                 // Only attach our image if we still have a valid request.
-                AttachPlaceholderSource(img);
+                AttachPlaceholderSource(new BitmapImage(), actualUri);
             }
         }
         catch (OperationCanceledException)
@@ -379,99 +310,13 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
             return;
         }
 
-        if (IsCacheEnabled)
+        Uri? actualUri = await ProvideCachedResourceAsync(imageUri, token).ConfigureAwait(true);
+
+        ArgumentNullException.ThrowIfNull(tokenSource);
+        if (!tokenSource.IsCancellationRequested)
         {
-            ImageSource? img = await ProvideCachedResourceAsync(imageUri, token).ConfigureAwait(true);
-
-            ArgumentNullException.ThrowIfNull(tokenSource);
-            if (!tokenSource.IsCancellationRequested)
-            {
-                // Only attach our image if we still have a valid request.
-                AttachSource(img);
-            }
-        }
-        else if (string.Equals(imageUri.Scheme, "data", StringComparison.OrdinalIgnoreCase))
-        {
-            string source = imageUri.OriginalString;
-            const string base64Head = "base64,";
-            int index = source.IndexOf(base64Head, StringComparison.Ordinal);
-            if (index >= 0)
-            {
-                byte[] bytes = Convert.FromBase64String(source[(index + base64Head.Length)..]);
-                BitmapImage bitmap = new();
-                await bitmap.SetSourceAsync(new MemoryStream(bytes).AsRandomAccessStream());
-
-                ArgumentNullException.ThrowIfNull(tokenSource);
-                if (!tokenSource.IsCancellationRequested)
-                {
-                    AttachSource(bitmap);
-                }
-            }
-        }
-        else
-        {
-            AttachSource(new BitmapImage(imageUri)
-            {
-                CreateOptions = BitmapCreateOptions.IgnoreImageCache,
-            });
-        }
-    }
-
-    private void OnImageExBaseLayoutUpdated(object? sender, object e)
-    {
-        InvalidateLazyLoading();
-    }
-
-    private void InvalidateLazyLoading()
-    {
-        if (!IsLoaded)
-        {
-            isInViewport = false;
-            return;
-        }
-
-        // Find the first ascendant ScrollViewer, if not found, use the root element.
-        FrameworkElement? hostElement = default;
-        IEnumerable<FrameworkElement> ascendants = this.FindAscendants().OfType<FrameworkElement>();
-        foreach (FrameworkElement ascendant in ascendants)
-        {
-            hostElement = ascendant;
-            if (hostElement is Microsoft.UI.Xaml.Controls.ScrollViewer)
-            {
-                break;
-            }
-        }
-
-        if (hostElement is null)
-        {
-            isInViewport = false;
-            return;
-        }
-
-        Rect controlRect = TransformToVisual(hostElement).TransformBounds(StructMarshal.Rect(ActualSize));
-        double lazyLoadingThreshold = LazyLoadingThreshold;
-
-        // Left/Top 1 Threshold, Right/Bottom 2 Threshold
-        Rect hostRect = new(
-            0 - lazyLoadingThreshold,
-            0 - lazyLoadingThreshold,
-            hostElement.ActualWidth + (2 * lazyLoadingThreshold),
-            hostElement.ActualHeight + (2 * lazyLoadingThreshold));
-
-        if (controlRect.IntersectsWith(hostRect))
-        {
-            isInViewport = true;
-
-            if (lazyLoadingSource is not null)
-            {
-                object source = lazyLoadingSource;
-                lazyLoadingSource = null;
-                SetSource(source);
-            }
-        }
-        else
-        {
-            isInViewport = false;
+            // Only attach our image if we still have a valid request.
+            AttachSource(new BitmapImage(), actualUri);
         }
     }
 }

src/Snap.Hutao/Snap.Hutao/Control/Layout/UniformStaggeredLayout.cs

@@ -4,7 +4,6 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System.Collections.Specialized;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Windows.Foundation;
 
@@ -64,12 +63,12 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
     /// <inheritdoc/>
     protected override Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize)
     {
-        if (context.ItemCount == 0)
+        if (context.ItemCount is 0)
         {
             return new Size(availableSize.Width, 0);
         }
 
-        if ((context.RealizationRect.Width == 0) && (context.RealizationRect.Height == 0))
+        if ((context.RealizationRect.Width is 0) && (context.RealizationRect.Height is 0))
         {
             return new Size(availableSize.Width, 0.0f);
         }

src/Snap.Hutao/Snap.Hutao/Control/Layout/WrapItem.cs

@@ -0,0 +1,25 @@
+// Licensed to the .NET Fou// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml;
+using Windows.Foundation;
+
+namespace Snap.Hutao.Control.Layout;
+
+internal sealed class WrapItem
+{
+    public WrapItem(int index)
+    {
+        Index = index;
+    }
+
+    public static Point EmptyPosition { get; } = new(float.NegativeInfinity, float.NegativeInfinity);
+
+    public int Index { get; }
+
+    public Size Size { get; set; } = Size.Empty;
+
+    public Point Position { get; set; } = EmptyPosition;
+
+    public UIElement? Element { get; set; }
+}

src/Snap.Hutao/Snap.Hutao/Control/Layout/WrapLayout.cs

@@ -0,0 +1,220 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using System.Collections.Specialized;
+using Windows.Foundation;
+
+namespace Snap.Hutao.Control.Layout;
+
+[DependencyProperty("HorizontalSpacing", typeof(double), 0D, nameof(LayoutPropertyChanged))]
+[DependencyProperty("VerticalSpacing", typeof(double), 0D, nameof(LayoutPropertyChanged))]
+internal sealed partial class WrapLayout : VirtualizingLayout
+{
+    protected override void InitializeForContextCore(VirtualizingLayoutContext context)
+    {
+        context.LayoutState = new WrapLayoutState(context);
+    }
+
+    protected override void UninitializeForContextCore(VirtualizingLayoutContext context)
+    {
+        context.LayoutState = default;
+    }
+
+    protected override void OnItemsChangedCore(VirtualizingLayoutContext context, object source, NotifyCollectionChangedEventArgs args)
+    {
+        WrapLayoutState state = (WrapLayoutState)context.LayoutState;
+
+        switch (args.Action)
+        {
+            case NotifyCollectionChangedAction.Add:
+                state.RemoveFromIndex(args.NewStartingIndex);
+                break;
+
+            case NotifyCollectionChangedAction.Move:
+                int minIndex = Math.Min(args.NewStartingIndex, args.OldStartingIndex);
+                state.RemoveFromIndex(minIndex);
+                state.RecycleElementAt(args.OldStartingIndex);
+                state.RecycleElementAt(args.NewStartingIndex);
+                break;
+
+            case NotifyCollectionChangedAction.Remove:
+                state.RemoveFromIndex(args.OldStartingIndex);
+                break;
+
+            case NotifyCollectionChangedAction.Replace:
+                state.RemoveFromIndex(args.NewStartingIndex);
+                state.RecycleElementAt(args.NewStartingIndex);
+                break;
+
+            case NotifyCollectionChangedAction.Reset:
+                state.Clear();
+                break;
+        }
+
+        base.OnItemsChangedCore(context, source, args);
+    }
+
+    protected override Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize)
+    {
+        if (context.ItemCount is 0)
+        {
+            return new Size(availableSize.Width, 0);
+        }
+
+        if ((context.RealizationRect.Width is 0) && (context.RealizationRect.Height is 0))
+        {
+            return new Size(availableSize.Width, 0.0f);
+        }
+
+        Size spacing = new(HorizontalSpacing, VerticalSpacing);
+
+        WrapLayoutState state = (WrapLayoutState)context.LayoutState;
+
+        if (spacing != state.Spacing || state.AvailableWidth != availableSize.Width)
+        {
+            state.ClearPositions();
+            state.Spacing = spacing;
+            state.AvailableWidth = availableSize.Width;
+        }
+
+        double currentHeight = 0;
+        Point itemPosition = default;
+        for (int i = 0; i < context.ItemCount; ++i)
+        {
+            bool itemMeasured = false;
+            WrapItem item = state.GetItemAt(i);
+            if (item.Size == Size.Empty)
+            {
+                item.Element = context.GetOrCreateElementAt(i);
+                item.Element.Measure(availableSize);
+                item.Size = item.Element.DesiredSize;
+                itemMeasured = true;
+            }
+
+            Size itemSize = item.Size;
+
+            if (item.Position == WrapItem.EmptyPosition)
+            {
+                if (availableSize.Width < itemPosition.X + itemSize.Width)
+                {
+                    // New Row
+                    itemPosition.X = 0;
+                    itemPosition.Y += currentHeight + spacing.Height;
+                    currentHeight = 0;
+                }
+
+                item.Position = itemPosition;
+            }
+
+            itemPosition = item.Position;
+
+            double bottom = itemPosition.Y + itemSize.Height;
+            if (bottom < context.RealizationRect.Top)
+            {
+                // Item is "above" the bounds
+                if (item.Element is not null)
+                {
+                    context.RecycleElement(item.Element);
+                    item.Element = default;
+                }
+
+                continue;
+            }
+            else if (itemPosition.Y > context.RealizationRect.Bottom)
+            {
+                // Item is "below" the bounds.
+                if (item.Element is not null)
+                {
+                    context.RecycleElement(item.Element);
+                    item.Element = default;
+                }
+
+                // We don't need to measure anything below the bounds
+                break;
+            }
+            else if (!itemMeasured)
+            {
+                // Always measure elements that are within the bounds
+                item.Element = context.GetOrCreateElementAt(i);
+                item.Element.Measure(availableSize);
+
+                itemSize = item.Element.DesiredSize;
+                if (itemSize != item.Size)
+                {
+                    // this item changed size; we need to recalculate layout for everything after this
+                    state.RemoveFromIndex(i + 1);
+                    item.Size = itemSize;
+
+                    // did the change make it go into the new row?
+                    if (availableSize.Width < itemPosition.X + itemSize.Width)
+                    {
+                        // New Row
+                        itemPosition.X = 0;
+                        itemPosition.Y += currentHeight + spacing.Height;
+                        currentHeight = 0;
+                    }
+
+                    item.Position = itemPosition;
+                }
+            }
+
+            itemPosition.X += itemSize.Width + spacing.Width;
+            currentHeight = Math.Max(itemSize.Height, currentHeight);
+        }
+
+        return new Size(double.IsInfinity(availableSize.Width) ? 0 : Math.Ceiling(availableSize.Width), state.GetHeight());
+    }
+
+    protected override Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize)
+    {
+        if (context.ItemCount > 0)
+        {
+            WrapLayoutState state = (WrapLayoutState)context.LayoutState;
+
+            for (int i = 0; i < context.ItemCount; ++i)
+            {
+                if (!ArrangeItem(context, state.GetItemAt(i)))
+                {
+                    break;
+                }
+            }
+        }
+
+        return finalSize;
+
+        static bool ArrangeItem(VirtualizingLayoutContext context, WrapItem item)
+        {
+            if (item.Size == Size.Empty || item.Position == WrapItem.EmptyPosition)
+            {
+                return false;
+            }
+
+            Size size = item.Size;
+            Point position = item.Position;
+
+            if (context.RealizationRect.Top <= position.Y + size.Height && position.Y <= context.RealizationRect.Bottom)
+            {
+                // place the item
+                UIElement child = context.GetOrCreateElementAt(item.Index);
+                child.Arrange(new Rect(position, size));
+            }
+            else if (position.Y > context.RealizationRect.Bottom)
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+
+    private static void LayoutPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is WrapLayout layout)
+        {
+            layout.InvalidateMeasure();
+            layout.InvalidateArrange();
+        }
+    }
+}

src/Snap.Hutao/Snap.Hutao/Control/Layout/WrapLayoutState.cs

@@ -0,0 +1,109 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml.Controls;
+using System.Runtime.InteropServices;
+using Windows.Foundation;
+
+namespace Snap.Hutao.Control.Layout;
+
+internal sealed class WrapLayoutState
+{
+    private readonly List<WrapItem> items = [];
+    private readonly VirtualizingLayoutContext context;
+
+    public WrapLayoutState(VirtualizingLayoutContext context)
+    {
+        this.context = context;
+    }
+
+    public Orientation Orientation { get; private set; }
+
+    public Size Spacing { get; set; }
+
+    public double AvailableWidth { get; set; }
+
+    public WrapItem GetItemAt(int index)
+    {
+        ArgumentOutOfRangeException.ThrowIfNegative(index);
+
+        if (index <= (items.Count - 1))
+        {
+            return items[index];
+        }
+        else
+        {
+            WrapItem item = new(index);
+            items.Add(item);
+            return item;
+        }
+    }
+
+    public void Clear()
+    {
+        for (int i = 0; i < items.Count; i++)
+        {
+            RecycleElementAt(i);
+        }
+
+        items.Clear();
+    }
+
+    public void RemoveFromIndex(int index)
+    {
+        if (index >= items.Count)
+        {
+            // Item was added/removed but we haven't realized that far yet
+            return;
+        }
+
+        int numToRemove = items.Count - index;
+        items.RemoveRange(index, numToRemove);
+    }
+
+    public void ClearPositions()
+    {
+        foreach (ref readonly WrapItem item in CollectionsMarshal.AsSpan(items))
+        {
+            item.Position = WrapItem.EmptyPosition;
+        }
+    }
+
+    public double GetHeight()
+    {
+        if (items.Count is 0)
+        {
+            return 0;
+        }
+
+        Point? lastPosition = default;
+        double maxHeight = 0;
+
+        Span<WrapItem> itemSpan = CollectionsMarshal.AsSpan(items);
+        for (int i = items.Count - 1; i >= 0; --i)
+        {
+            ref readonly WrapItem item = ref itemSpan[i];
+
+            if (item.Position == WrapItem.EmptyPosition || item.Size == Size.Empty)
+            {
+                continue;
+            }
+
+            if (lastPosition is not null && lastPosition.Value.Y > item.Position.Y)
+            {
+                // This is a row above the last item.
+                break;
+            }
+
+            lastPosition = item.Position;
+            maxHeight = Math.Max(maxHeight, item.Size.Height);
+        }
+
+        return lastPosition?.Y + maxHeight ?? 0;
+    }
+
+    public void RecycleElementAt(int index)
+    {
+        context.RecycleElement(context.GetOrCreateElementAt(index));
+    }
+}

src/Snap.Hutao/Snap.Hutao/Control/Media/Rgba32.cs

@@ -8,45 +8,19 @@ using Windows.UI;
 
 namespace Snap.Hutao.Control.Media;
 
-/// <summary>
-/// RGBA 颜色
-/// </summary>
 [HighQuality]
 internal struct Rgba32
 {
-    /// <summary>
-    /// R
-    /// </summary>
     public byte R;
-
-    /// <summary>
-    /// G
-    /// </summary>
     public byte G;
-
-    /// <summary>
-    /// B
-    /// </summary>
     public byte B;
-
-    /// <summary>
-    /// A
-    /// </summary>
     public byte A;
 
-    /// <summary>
-    /// 构造一个新的 RGBA8 颜色
-    /// </summary>
-    /// <param name="hex">色值字符串</param>
     public Rgba32(string hex)
         : this(hex.Length == 6 ? Convert.ToUInt32($"{hex}FF", 16) : Convert.ToUInt32(hex, 16))
     {
     }
 
-    /// <summary>
-    /// 使用 RGBA 代码初始化新的结构
-    /// </summary>
-    /// <param name="xrgbaCode">RGBA 代码</param>
     public unsafe Rgba32(uint xrgbaCode)
     {
         // uint layout: 0xRRGGBBAA is AABBGGRR
@@ -80,11 +54,6 @@ internal struct Rgba32
         return *(Color*)&rgba;
     }
 
-    /// <summary>
-    /// 从 HSL 颜色转换
-    /// </summary>
-    /// <param name="hsl">HSL 颜色</param>
-    /// <returns>RGBA8颜色</returns>
     public static Rgba32 FromHsl(Hsla32 hsl)
     {
         double chroma = (1 - Math.Abs((2 * hsl.L) - 1)) * hsl.S;
@@ -138,10 +107,6 @@ internal struct Rgba32
         return new(r, g, b, a);
     }
 
-    /// <summary>
-    /// 转换到 HSL 颜色
-    /// </summary>
-    /// <returns>HSL 颜色</returns>
     public readonly Hsla32 ToHsl()
     {
         const double toDouble = 1.0 / 255;

src/Snap.Hutao/Snap.Hutao/Control/Media/Rgba64.cs

@@ -0,0 +1,14 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+// Some part of this file came from:
+// https://github.com/xunkong/desktop/tree/main/src/Desktop/Desktop/Pages/CharacterInfoPage.xaml.cs
+
+namespace Snap.Hutao.Control.Media;
+
+internal struct Rgba64
+{
+    public Half R;
+    public Half G;
+    public Half B;
+    public Half A;
+}

src/Snap.Hutao/Snap.Hutao/Control/Panel/HorizontalEqualPanel.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
+using System.Runtime.InteropServices;
 using Windows.Foundation;
 
 namespace Snap.Hutao.Control.Panel;
@@ -18,13 +19,14 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
 
     protected override Size MeasureOverride(Size availableSize)
     {
-        foreach (UIElement child in Children)
+        List<UIElement> visibleChildren = Children.Where(child => child.Visibility is Visibility.Visible).ToList();
+        foreach (ref readonly UIElement visibleChild in CollectionsMarshal.AsSpan(visibleChildren))
         {
             // ScrollViewer will always return an Infinity Size, we should use ActualWidth for this situation.
             double availableWidth = double.IsInfinity(availableSize.Width) ? ActualWidth : availableSize.Width;
-            double childAvailableWidth = (availableWidth + Spacing) / Children.Count;
+            double childAvailableWidth = (availableWidth + Spacing) / visibleChildren.Count;
             double childMaxAvailableWidth = Math.Max(MinItemWidth, childAvailableWidth);
-            child.Measure(new(childMaxAvailableWidth - Spacing, ActualHeight));
+            visibleChild.Measure(new(childMaxAvailableWidth - Spacing, ActualHeight));
         }
 
         return base.MeasureOverride(availableSize);
@@ -32,14 +34,14 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
 
     protected override Size ArrangeOverride(Size finalSize)
     {
-        int itemCount = Children.Count;
-        double availableItemWidth = (finalSize.Width - (Spacing * (itemCount - 1))) / itemCount;
+        List<UIElement> visibleChildren = Children.Where(child => child.Visibility is Visibility.Visible).ToList();
+        double availableItemWidth = (finalSize.Width - (Spacing * (visibleChildren.Count - 1))) / visibleChildren.Count;
         double actualItemWidth = Math.Max(MinItemWidth, availableItemWidth);
 
         double offset = 0;
-        foreach (UIElement child in Children)
+        foreach (ref readonly UIElement visibleChild in CollectionsMarshal.AsSpan(visibleChildren))
         {
-            child.Arrange(new Rect(offset, 0, actualItemWidth, finalSize.Height));
+            visibleChild.Arrange(new Rect(offset, 0, actualItemWidth, finalSize.Height));
             offset += actualItemWidth + Spacing;
         }
 
@@ -49,7 +51,8 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
     private static void OnLoaded(object sender, RoutedEventArgs e)
     {
         HorizontalEqualPanel panel = (HorizontalEqualPanel)sender;
-        panel.MinWidth = (panel.MinItemWidth * panel.Children.Count) + (panel.Spacing * (panel.Children.Count - 1));
+        int vivibleChildrenCount = panel.Children.Count(child => child.Visibility is Visibility.Visible);
+        panel.MinWidth = (panel.MinItemWidth * vivibleChildrenCount) + (panel.Spacing * (vivibleChildrenCount - 1));
     }
 
     private static void OnSizeChanged(object sender, SizeChangedEventArgs e)

src/Snap.Hutao/Snap.Hutao/Control/Panel/UniformPanel.cs

@@ -2,8 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
 using Windows.Foundation;
 
 namespace Snap.Hutao.Control.Panel;

src/Snap.Hutao/Snap.Hutao/Control/ScopedPage.cs

@@ -3,8 +3,10 @@
 
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Markup;
 using Microsoft.UI.Xaml.Navigation;
 using Snap.Hutao.Service.Navigation;
+using Snap.Hutao.View.Helper;
 using Snap.Hutao.ViewModel.Abstraction;
 
 namespace Snap.Hutao.Control;
@@ -15,7 +17,7 @@ internal class ScopedPage : Page
 {
     private readonly RoutedEventHandler unloadEventHandler;
     private readonly CancellationTokenSource viewCancellationTokenSource = new();
-    private readonly IServiceScope currentScope;
+    private readonly IServiceScope pageScope;
 
     private bool inFrame = true;
 
@@ -23,7 +25,7 @@ internal class ScopedPage : Page
     {
         unloadEventHandler = OnUnloaded;
         Unloaded += unloadEventHandler;
-        currentScope = Ioc.Default.GetRequiredService<IScopedPageScopeReferenceTracker>().CreateScope();
+        pageScope = Ioc.Default.GetRequiredService<IScopedPageScopeReferenceTracker>().CreateScope();
     }
 
     public async ValueTask NotifyRecipientAsync(INavigationData extra)
@@ -36,6 +38,11 @@ internal class ScopedPage : Page
         extra.NotifyNavigationCompleted();
     }
 
+    public virtual void UnloadObjectOverride(DependencyObject unloadableObject)
+    {
+        XamlMarkupHelper.UnloadObject(unloadableObject);
+    }
+
     /// <summary>
     /// 初始化
     /// 应当在 InitializeComponent() 前调用
@@ -44,9 +51,18 @@ internal class ScopedPage : Page
     protected void InitializeWith<TViewModel>()
         where TViewModel : class, IViewModel
     {
-        IViewModel viewModel = currentScope.ServiceProvider.GetRequiredService<TViewModel>();
-        viewModel.CancellationToken = viewCancellationTokenSource.Token;
-        DataContext = viewModel;
+        try
+        {
+            IViewModel viewModel = pageScope.ServiceProvider.GetRequiredService<TViewModel>();
+            viewModel.CancellationToken = viewCancellationTokenSource.Token;
+            viewModel.DeferContentLoader = new DeferContentLoader(this);
+            DataContext = viewModel;
+        }
+        catch (Exception ex)
+        {
+            pageScope.ServiceProvider.GetRequiredService<ILogger<ScopedPage>>().LogError(ex, "Failed to initialize view model.");
+            throw;
+        }
     }
 
     /// <inheritdoc/>
@@ -95,7 +111,8 @@ internal class ScopedPage : Page
                 viewModel.IsViewDisposed = true;
 
                 // Dispose the scope
-                currentScope.Dispose();
+                pageScope.Dispose();
+                GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true);
             }
         }
     }

src/Snap.Hutao/Snap.Hutao/Control/ScopedPageScopeReferenceTracker.cs

@@ -22,7 +22,6 @@ internal sealed partial class ScopedPageScopeReferenceTracker : IScopedPageScope
 
     public IServiceScope CreateScope()
     {
-        GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true);
         IServiceScope currentScope = serviceProvider.CreateScope();
 
         // In case previous one is not disposed.

src/Snap.Hutao/Snap.Hutao/Control/Text/Syntax/MiHoYo/MiHoYoColorTextSyntax.cs

@@ -1,6 +1,8 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Core.ExceptionService;
+
 namespace Snap.Hutao.Control.Text.Syntax.MiHoYo;
 
 internal sealed class MiHoYoColorTextSyntax : MiHoYoXmlElementSyntax
@@ -27,7 +29,7 @@ internal sealed class MiHoYoColorTextSyntax : MiHoYoXmlElementSyntax
             {
                 MiHoYoColorKind.Rgba => new(Position.Start + 17, Position.End - 8),
                 MiHoYoColorKind.Rgb => new(Position.Start + 15, Position.End - 8),
-                _ => throw Must.NeverHappen(),
+                _ => throw HutaoException.NotSupported(),
             };
         }
     }
@@ -40,7 +42,7 @@ internal sealed class MiHoYoColorTextSyntax : MiHoYoXmlElementSyntax
             {
                 MiHoYoColorKind.Rgba => new(Position.Start + 8, Position.Start + 16),
                 MiHoYoColorKind.Rgb => new(Position.Start + 8, Position.Start + 14),
-                _ => throw Must.NeverHappen(),
+                _ => throw HutaoException.NotSupported(),
             };
         }
     }

src/Snap.Hutao/Snap.Hutao/Control/Text/Syntax/MiHoYo/MiHoYoSyntaxTree.cs

@@ -1,8 +1,11 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Core.ExceptionService;
+
 namespace Snap.Hutao.Control.Text.Syntax.MiHoYo;
 
+// TODO: Pooling syntax nodes to reduce memory allocation
 internal sealed class MiHoYoSyntaxTree
 {
     public MiHoYoSyntaxNode Root { get; set; } = default!;
@@ -75,7 +78,7 @@ internal sealed class MiHoYoSyntaxTree
                         {
                             17 => MiHoYoColorKind.Rgba,
                             15 => MiHoYoColorKind.Rgb,
-                            _ => throw Must.NeverHappen(),
+                            _ => throw HutaoException.NotSupported(),
                         };
 
                         TextPosition position = new(0, endOfXmlColorRightClosingAtUnprocessedContent);

src/Snap.Hutao/Snap.Hutao/Control/Theme/InfoBarOverride.xaml

@@ -52,6 +52,12 @@
     <Thickness x:Key="InfoBarIconMargin">19,16,19,16</Thickness>
     <Thickness x:Key="InfoBarContentRootPadding">0,0,0,0</Thickness>
     <x:Double x:Key="InfoBarIconFontSize">20</x:Double>
+
+    <Thickness x:Key="InfoBarTitleHorizontalOrientationMargin">0,0,0,0</Thickness>
+    <Thickness x:Key="InfoBarMessageHorizontalOrientationMargin">12,0,0,0</Thickness>
+    <Thickness x:Key="InfoBarTitleVerticalOrientationMargin">0,16,0,0</Thickness>
+    <Thickness x:Key="InfoBarMessageVerticalOrientationMargin">0,6,0,0</Thickness>
+
     <!--  TODO: When will DefaultInfoBarStyle added  -->
     <Style TargetType="InfoBar">
         <Setter Property="shch:InfoBarHelper.IsTextSelectionEnabled" Value="False"/>
@@ -128,6 +134,7 @@
                             <InfoBarPanel
                                 Grid.Column="1"
                                 Margin="{StaticResource InfoBarPanelMargin}"
+                                VerticalAlignment="Center"
                                 HorizontalOrientationPadding="{StaticResource InfoBarPanelHorizontalOrientationPadding}"
                                 VerticalOrientationPadding="{StaticResource InfoBarPanelVerticalOrientationPadding}">
                                 <TextBlock
@@ -173,6 +180,7 @@
                             <Button
                                 Name="CloseButton"
                                 Grid.Column="2"
+                                VerticalAlignment="Top"
                                 Command="{TemplateBinding CloseButtonCommand}"
                                 CommandParameter="{TemplateBinding CloseButtonCommandParameter}"
                                 Style="{TemplateBinding CloseButtonStyle}">
@@ -236,7 +244,14 @@
 
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="SeverityLevels">
-                                <VisualState x:Name="Informational"/>
+                                <VisualState x:Name="Informational">
+                                    <VisualState.Setters>
+                                        <Setter Target="ContentRoot.Background" Value="{ThemeResource InfoBarInformationalSeverityBackgroundBrush}"/>
+                                        <Setter Target="IconBackground.Foreground" Value="{ThemeResource InfoBarInformationalSeverityIconBackground}"/>
+                                        <Setter Target="StandardIcon.Text" Value="{StaticResource InfoBarInformationalIconGlyph}"/>
+                                        <Setter Target="StandardIcon.Foreground" Value="{ThemeResource InfoBarInformationalSeverityIconForeground}"/>
+                                    </VisualState.Setters>
+                                </VisualState>
                                 <VisualState x:Name="Error">
                                     <VisualState.Setters>
                                         <Setter Target="ContentRoot.Background" Value="{ThemeResource InfoBarErrorSeverityBackgroundBrush}"/>

src/Snap.Hutao/Snap.Hutao/Control/Theme/TransitionCollection.xaml

@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <TransitionCollection x:Key="ContentThemeTransitions">
         <ContentThemeTransition/>
     </TransitionCollection>
@@ -20,4 +20,4 @@
     <TransitionCollection x:Key="NavigationThemeTransitions">
         <NavigationThemeTransition/>
     </TransitionCollection>
-</ResourceDictionary>
+</ResourceDictionary>

src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml

@@ -17,8 +17,13 @@
     <x:String x:Key="UI_Icon_Intee_Explore_1">https://api.snapgenshin.com/static/raw/Bg/UI_Icon_Intee_Explore_1.png</x:String>
     <x:String x:Key="UI_ImgSign_ItemIcon">https://api.snapgenshin.com/static/raw/Bg/UI_ImgSign_ItemIcon.png</x:String>
     <x:String x:Key="UI_ItemIcon_None">https://api.snapgenshin.com/static/raw/Bg/UI_ItemIcon_None.png</x:String>
-    <x:String x:Key="UI_MarkQuest_Events_Proce">https://api.snapgenshin.com/static/raw/Bg/UI_MarkQuest_Events_Proce.png</x:String>
-    <x:String x:Key="UI_MarkTower">https://api.snapgenshin.com/static/raw/Bg/UI_MarkTower.png</x:String>
+
+    <!--  Mark  -->
+    <x:String x:Key="UI_MarkQuest_Events_Proce">https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Events_Proce.png</x:String>
+    <x:String x:Key="UI_MarkQuest_Events_Start">https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Events_Start.png</x:String>
+    <x:String x:Key="UI_MarkQuest_Main_Proce">https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Main_Proce.png</x:String>
+    <x:String x:Key="UI_MarkQuest_Main_Start">https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Main_Start.png</x:String>
+    <x:String x:Key="UI_MarkTower">https://api.snapgenshin.com/static/raw/Mark/UI_MarkTower.png</x:String>
 
     <!--  ItemIcon  -->
     <x:String x:Key="UI_ItemIcon_201">https://api.snapgenshin.com/static/raw/ItemIcon/UI_ItemIcon_201.png</x:String>

src/Snap.Hutao/Snap.Hutao/Control/ValueConverter.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Data;
+using Snap.Hutao.Core.ExceptionService;
 
 namespace Snap.Hutao.Control;
 
@@ -39,6 +40,6 @@ internal abstract class ValueConverter<TFrom, TTo> : IValueConverter
     /// <returns>源</returns>
     public virtual TFrom ConvertBack(TTo to)
     {
-        throw Must.NeverHappen();
+        throw HutaoException.NotSupported();
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/Abstraction/Extension/BuilderExtension.cs

@@ -1,10 +1,9 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Web.Request.Builder.Abstraction;
 using System.Diagnostics;
 
-namespace Snap.Hutao.Web.Request.Builder;
+namespace Snap.Hutao.Core.Abstraction.Extension;
 
 internal static class BuilderExtension
 {

src/Snap.Hutao/Snap.Hutao/Core/Abstraction/IBuilder.cs

@@ -1,6 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-namespace Snap.Hutao.Web.Request.Builder.Abstraction;
+namespace Snap.Hutao.Core.Abstraction;
 
 internal interface IBuilder;

src/Snap.Hutao/Snap.Hutao/Core/Caching/ImageCache.cs

@@ -1,10 +1,14 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Microsoft.Extensions.Caching.Memory;
 using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient;
 using Snap.Hutao.Core.IO;
 using Snap.Hutao.Core.IO.Hashing;
 using Snap.Hutao.Core.Logging;
+using Snap.Hutao.ViewModel.Guide;
+using Snap.Hutao.Web.Request.Builder;
+using Snap.Hutao.Web.Request.Builder.Abstraction;
 using System.Collections.Concurrent;
 using System.Collections.Frozen;
 using System.IO;
@@ -25,6 +29,7 @@ namespace Snap.Hutao.Core.Caching;
 internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOperation
 {
     private const string CacheFolderName = nameof(ImageCache);
+    private const string CacheFailedDownloadTasksName = $"{nameof(ImageCache)}.FailedDownloadTasks";
 
     private readonly FrozenDictionary<int, TimeSpan> retryCountToDelay = FrozenDictionary.ToFrozenDictionary(
     [
@@ -35,9 +40,11 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
 
     private readonly ConcurrentDictionary<string, Task> concurrentTasks = new();
 
+    private readonly IHttpRequestMessageBuilderFactory httpRequestMessageBuilderFactory;
     private readonly IHttpClientFactory httpClientFactory;
     private readonly IServiceProvider serviceProvider;
     private readonly ILogger<ImageCache> logger;
+    private readonly IMemoryCache memoryCache;
 
     private string? baseFolder;
     private string? cacheFolder;
@@ -169,40 +176,76 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
         HttpClient httpClient = httpClientFactory.CreateClient(nameof(ImageCache));
         while (retryCount < 3)
         {
-            using (HttpResponseMessage message = await httpClient.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false))
-            {
-                if (message.RequestMessage is { RequestUri: { } target } && target != uri)
-                {
-                    logger.LogDebug("The Request '{Source}' has been redirected to '{Target}'", uri, target);
-                }
+            HttpRequestMessageBuilder requestMessageBuilder = httpRequestMessageBuilderFactory
+                .Create()
+                .SetRequestUri(uri)
 
-                if (message.IsSuccessStatusCode)
+                // These headers are only available for our own api
+                .SetStaticResourceControlHeadersIf(uri.Host.Contains("api.snapgenshin.com", StringComparison.OrdinalIgnoreCase))
+                .Get();
+
+            using (HttpRequestMessage requestMessage = requestMessageBuilder.HttpRequestMessage)
+            {
+                using (HttpResponseMessage responseMessage = await httpClient.SendAsync(requestMessage, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false))
                 {
-                    using (Stream httpStream = await message.Content.ReadAsStreamAsync().ConfigureAwait(false))
+                    if (responseMessage.RequestMessage is { RequestUri: { } target } && target != uri)
                     {
-                        using (FileStream fileStream = File.Create(baseFile))
+                        logger.LogDebug("The Request '{Source}' has been redirected to '{Target}'", uri, target);
+                    }
+
+                    if (responseMessage.IsSuccessStatusCode)
+                    {
+                        if (responseMessage.Content.Headers.ContentType?.MediaType is "application/json")
                         {
-                            await httpStream.CopyToAsync(fileStream).ConfigureAwait(false);
+#if DEBUG
+                            DebugTrack(uri);
+#endif
+                            string raw = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false);
+                            logger.LogColorizedCritical("Failed to download '{Uri}' with unexpected body '{Raw}'", (uri, ConsoleColor.Red), (raw, ConsoleColor.DarkYellow));
                             return;
                         }
-                    }
-                }
 
-                switch (message.StatusCode)
-                {
-                    case HttpStatusCode.TooManyRequests:
+                        using (Stream httpStream = await responseMessage.Content.ReadAsStreamAsync().ConfigureAwait(false))
                         {
-                            retryCount++;
-                            TimeSpan delay = message.Headers.RetryAfter?.Delta ?? retryCountToDelay[retryCount];
-                            logger.LogInformation("Retry download '{Uri}' after {Delay}.", uri, delay);
-                            await Task.Delay(delay).ConfigureAwait(false);
-                            break;
+                            using (FileStream fileStream = File.Create(baseFile))
+                            {
+                                await httpStream.CopyToAsync(fileStream).ConfigureAwait(false);
+                                return;
+                            }
                         }
+                    }
 
-                    default:
-                        return;
+                    switch (responseMessage.StatusCode)
+                    {
+                        case HttpStatusCode.TooManyRequests:
+                            {
+                                retryCount++;
+                                TimeSpan delay = responseMessage.Headers.RetryAfter?.Delta ?? retryCountToDelay[retryCount];
+                                logger.LogInformation("Retry download '{Uri}' after {Delay}.", uri, delay);
+                                await Task.Delay(delay).ConfigureAwait(false);
+                                break;
+                            }
+
+                        default:
+#if DEBUG
+                            DebugTrack(uri);
+#endif
+                            logger.LogColorizedCritical("Failed to download '{Uri}' with status code '{StatusCode}'", (uri, ConsoleColor.Red), (responseMessage.StatusCode, ConsoleColor.DarkYellow));
+                            return;
+                    }
                 }
             }
         }
     }
-}
+}
+
+#if DEBUG
+internal partial class ImageCache
+{
+    private void DebugTrack(Uri uri)
+    {
+        HashSet<string>? set = memoryCache.GetOrCreate(CacheFailedDownloadTasksName, entry => entry.Value ??= new HashSet<string>()) as HashSet<string>;
+        set?.Add(uri.ToString());
+    }
+}
+#endif

src/Snap.Hutao/Snap.Hutao/Core/Collection/TwoEnumerbleEnumerator.cs

@@ -0,0 +1,32 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core.Collection;
+
+internal sealed class TwoEnumerbleEnumerator<TFirst, TSecond> : IDisposable
+{
+    private readonly IEnumerator<TFirst> firstEnumerator;
+    private readonly IEnumerator<TSecond> secondEnumerator;
+
+    public TwoEnumerbleEnumerator(IEnumerable<TFirst> firstEnumerable, IEnumerable<TSecond> secondEnumerable)
+    {
+        firstEnumerator = firstEnumerable.GetEnumerator();
+        secondEnumerator = secondEnumerable.GetEnumerator();
+    }
+
+    public (TFirst First, TSecond Second) Current { get => (firstEnumerator.Current, secondEnumerator.Current); }
+
+    public bool MoveNext(ref bool moveFirst, ref bool moveSecond)
+    {
+        moveFirst = moveFirst && firstEnumerator.MoveNext();
+        moveSecond = moveSecond && secondEnumerator.MoveNext();
+
+        return moveFirst || moveSecond;
+    }
+
+    public void Dispose()
+    {
+        firstEnumerator.Dispose();
+        secondEnumerator.Dispose();
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/Convert.cs

@@ -1,25 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using System.Security.Cryptography;
-using System.Text;
-
-namespace Snap.Hutao.Core;
-
-/// <summary>
-/// 支持Md5转换
-/// </summary>
-[HighQuality]
-internal static class Convert
-{
-    /// <summary>
-    /// 获取字符串的MD5计算结果
-    /// </summary>
-    /// <param name="source">源字符串</param>
-    /// <returns>计算的结果</returns>
-    public static string ToMd5HexString(string source)
-    {
-        byte[] hash = MD5.HashData(Encoding.UTF8.GetBytes(source));
-        return System.Convert.ToHexString(hash);
-    }
-}

src/Snap.Hutao/Snap.Hutao/Core/Database/DbSetExtension.cs

@@ -13,13 +13,6 @@ namespace Snap.Hutao.Core.Database;
 [HighQuality]
 internal static class DbSetExtension
 {
-    /// <summary>
-    /// 添加并保存
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <param name="dbSet">数据库集</param>
-    /// <param name="entity">实体</param>
-    /// <returns>影响条数</returns>
     public static int AddAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
         where TEntity : class
     {
@@ -27,27 +20,13 @@ internal static class DbSetExtension
         return dbSet.SaveChangesAndClearChangeTracker();
     }
 
-    /// <summary>
-    /// 异步添加并保存
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <param name="dbSet">数据库集</param>
-    /// <param name="entity">实体</param>
-    /// <returns>影响条数</returns>
-    public static ValueTask<int> AddAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
+    public static ValueTask<int> AddAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
         where TEntity : class
     {
         dbSet.Add(entity);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync();
+        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
     }
 
-    /// <summary>
-    /// 添加列表并保存
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <param name="dbSet">数据库集</param>
-    /// <param name="entities">实体</param>
-    /// <returns>影响条数</returns>
     public static int AddRangeAndSave<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities)
         where TEntity : class
     {
@@ -55,27 +34,13 @@ internal static class DbSetExtension
         return dbSet.SaveChangesAndClearChangeTracker();
     }
 
-    /// <summary>
-    /// 异步添加列表并保存
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <param name="dbSet">数据库集</param>
-    /// <param name="entities">实体</param>
-    /// <returns>影响条数</returns>
-    public static ValueTask<int> AddRangeAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities)
+    public static ValueTask<int> AddRangeAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities, CancellationToken token = default)
         where TEntity : class
     {
         dbSet.AddRange(entities);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync();
+        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
     }
 
-    /// <summary>
-    /// 移除并保存
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <param name="dbSet">数据库集</param>
-    /// <param name="entity">实体</param>
-    /// <returns>影响条数</returns>
     public static int RemoveAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
         where TEntity : class
     {
@@ -83,27 +48,13 @@ internal static class DbSetExtension
         return dbSet.SaveChangesAndClearChangeTracker();
     }
 
-    /// <summary>
-    /// 异步移除并保存
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <param name="dbSet">数据库集</param>
-    /// <param name="entity">实体</param>
-    /// <returns>影响条数</returns>
-    public static ValueTask<int> RemoveAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
+    public static ValueTask<int> RemoveAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
         where TEntity : class
     {
         dbSet.Remove(entity);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync();
+        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
     }
 
-    /// <summary>
-    /// 更新并保存
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <param name="dbSet">数据库集</param>
-    /// <param name="entity">实体</param>
-    /// <returns>影响条数</returns>
     public static int UpdateAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
         where TEntity : class
     {
@@ -111,18 +62,11 @@ internal static class DbSetExtension
         return dbSet.SaveChangesAndClearChangeTracker();
     }
 
-    /// <summary>
-    /// 异步更新并保存
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <param name="dbSet">数据库集</param>
-    /// <param name="entity">实体</param>
-    /// <returns>影响条数</returns>
-    public static ValueTask<int> UpdateAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
+    public static ValueTask<int> UpdateAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
         where TEntity : class
     {
         dbSet.Update(entity);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync();
+        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -136,11 +80,11 @@ internal static class DbSetExtension
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static async ValueTask<int> SaveChangesAndClearChangeTrackerAsync<TEntity>(this DbSet<TEntity> dbSet)
+    private static async ValueTask<int> SaveChangesAndClearChangeTrackerAsync<TEntity>(this DbSet<TEntity> dbSet, CancellationToken token = default)
         where TEntity : class
     {
         DbContext dbContext = dbSet.Context();
-        int count = await dbContext.SaveChangesAsync().ConfigureAwait(false);
+        int count = await dbContext.SaveChangesAsync(token).ConfigureAwait(false);
         dbContext.ChangeTracker.Clear();
         return count;
     }

src/Snap.Hutao/Snap.Hutao/Core/Database/ScopedDbCurrent.cs

@@ -38,7 +38,7 @@ internal sealed partial class ScopedDbCurrent<TEntity, TMessage>
                 return;
             }
 
-            if (serviceProvider.IsDisposedSlow())
+            if (serviceProvider.IsDisposed())
             {
                 return;
             }
@@ -96,7 +96,7 @@ internal sealed partial class ScopedDbCurrent<TEntityOnly, TEntity, TMessage>
                 return;
             }
 
-            if (serviceProvider.IsDisposedSlow())
+            if (serviceProvider.IsDisposed())
             {
                 return;
             }

src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/CastServiceExtension.cs

@@ -1,26 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Core.DependencyInjection.Abstraction;
-
-namespace Snap.Hutao.Core.DependencyInjection;
-
-/// <summary>
-/// 对象扩展
-/// </summary>
-[HighQuality]
-internal static class CastServiceExtension
-{
-    /// <summary>
-    /// <see langword="as"/> 的链式调用扩展
-    /// </summary>
-    /// <typeparam name="T">目标转换类型</typeparam>
-    /// <param name="service">对象</param>
-    /// <returns>转换类型后的对象</returns>
-    [Obsolete("Not useful anymore")]
-    public static T? As<T>(this ICastService service)
-        where T : class
-    {
-        return service as T;
-    }
-}

src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/DependencyInjection.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using CommunityToolkit.Mvvm.Messaging;
+using Quartz;
 using Snap.Hutao.Core.Logging;
 using Snap.Hutao.Service;
 using System.Globalization;
@@ -24,9 +25,18 @@ internal static class DependencyInjection
         ServiceProvider serviceProvider = new ServiceCollection()
 
             // Microsoft extension
-            .AddLogging(builder => builder.AddDebug().AddConsoleWindow())
+            .AddLogging(builder =>
+            {
+                builder
+                    .SetMinimumLevel(LogLevel.Trace)
+                    .AddDebug()
+                    .AddConsoleWindow();
+            })
             .AddMemoryCache()
 
+            // Quartz
+            .AddQuartz()
+
             // Hutao extensions
             .AddJsonOptions()
             .AddDatabase()

src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocConfiguration.cs

@@ -33,17 +33,17 @@ internal static class IocConfiguration
         return services
             .AddTransient(typeof(Database.ScopedDbCurrent<,>))
             .AddTransient(typeof(Database.ScopedDbCurrent<,,>))
-            .AddDbContext<AppDbContext>(AddDbContextCore);
+            .AddDbContextPool<AppDbContext>(AddDbContextCore);
     }
 
-    private static void AddDbContextCore(IServiceProvider provider, DbContextOptionsBuilder builder)
+    private static void AddDbContextCore(IServiceProvider serviceProvider, DbContextOptionsBuilder builder)
     {
-        RuntimeOptions runtimeOptions = provider.GetRequiredService<RuntimeOptions>();
+        RuntimeOptions runtimeOptions = serviceProvider.GetRequiredService<RuntimeOptions>();
         string dbFile = System.IO.Path.Combine(runtimeOptions.DataFolder, "Userdata.db");
         string sqlConnectionString = $"Data Source={dbFile}";
 
         // Temporarily create a context
-        using (AppDbContext context = AppDbContext.Create(sqlConnectionString))
+        using (AppDbContext context = AppDbContext.Create(serviceProvider, sqlConnectionString))
         {
             if (context.Database.GetPendingMigrations().Any())
             {

src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/ServiceProviderExtension.cs

@@ -18,13 +18,22 @@ internal static class ServiceProviderExtension
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static bool IsDisposedSlow(this IServiceProvider? serviceProvider)
+    public static bool IsDisposed(this IServiceProvider? serviceProvider)
     {
         if (serviceProvider is null)
         {
             return true;
         }
 
+        if (serviceProvider is ServiceProvider serviceProviderImpl)
+        {
+            return GetPrivateDisposed(serviceProviderImpl);
+        }
+
         return serviceProvider.GetType().GetField("_disposed")?.GetValue(serviceProvider) is true;
     }
+
+    // private bool _disposed;
+    [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_disposed")]
+    private static extern ref bool GetPrivateDisposed(ServiceProvider serviceProvider);
 }

src/Snap.Hutao/Snap.Hutao/Core/Diagnostics/MeasureExecutionToken.cs

@@ -1,5 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
+using Snap.Hutao.Core.Logging;
+
 namespace Snap.Hutao.Core.Diagnostics;
 
 internal readonly struct MeasureExecutionToken : IDisposable
@@ -17,6 +19,6 @@ internal readonly struct MeasureExecutionToken : IDisposable
 
     public void Dispose()
     {
-        logger.LogDebug("{Caller} toke {Time} ms", callerName, stopwatch.GetElapsedTime().TotalMilliseconds);
+        logger.LogColorizedDebug(("{Caller} toke {Time} ms", ConsoleColor.Gray), (callerName, ConsoleColor.Yellow), (stopwatch.GetElapsedTime().TotalMilliseconds, ConsoleColor.DarkGreen));
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/DatabaseCorruptedException.cs

@@ -1,22 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Core.ExceptionService;
-
-/// <summary>
-/// 数据库损坏异常
-/// </summary>
-[HighQuality]
-[Obsolete("Use HutaoException instead")]
-internal sealed class DatabaseCorruptedException : Exception
-{
-    /// <summary>
-    /// 构造一个新的用户数据损坏异常
-    /// </summary>
-    /// <param name="message">消息</param>
-    /// <param name="innerException">内部错误</param>
-    public DatabaseCorruptedException(string message, Exception? innerException)
-        : base(SH.FormatCoreExceptionServiceDatabaseCorruptedMessage($"{message}\n{innerException?.Message}"), innerException)
-    {
-    }
-}

src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/HutaoException.cs

@@ -1,54 +1,89 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using System.Runtime.CompilerServices;
+
 namespace Snap.Hutao.Core.ExceptionService;
 
 internal sealed class HutaoException : Exception
 {
-    public HutaoException(HutaoExceptionKind kind, string message, Exception? innerException)
-        : this(message, innerException)
-    {
-        Kind = kind;
-    }
-
-    private HutaoException(string message, Exception? innerException)
+    public HutaoException(string message, Exception? innerException)
         : base($"{message}\n{innerException?.Message}", innerException)
     {
     }
 
-    public HutaoExceptionKind Kind { get; private set; }
-
     [DoesNotReturn]
-    public static HutaoException Throw(HutaoExceptionKind kind, string message, Exception? innerException = default)
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static HutaoException Throw(string message, Exception? innerException = default)
     {
-        throw new HutaoException(kind, message, innerException);
+        throw new HutaoException(message, innerException);
     }
 
-    public static void ThrowIf(bool condition, HutaoExceptionKind kind, string message, Exception? innerException = default)
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static void ThrowIf([DoesNotReturnIf(true)] bool condition, string message, Exception? innerException = default)
     {
         if (condition)
         {
-            throw new HutaoException(kind, message, innerException);
+            throw new HutaoException(message, innerException);
         }
     }
 
-    public static void ThrowIfNot(bool condition, HutaoExceptionKind kind, string message, Exception? innerException = default)
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static void ThrowIfNot([DoesNotReturnIf(false)] bool condition, string message, Exception? innerException = default)
     {
         if (!condition)
         {
-            throw new HutaoException(kind, message, innerException);
+            throw new HutaoException(message, innerException);
         }
     }
 
-    public static HutaoException ServiceTypeCastFailed<TFrom, TTo>(string name, Exception? innerException = default)
+    [DoesNotReturn]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static ArgumentException Argument(string message, string? paramName)
     {
-        string message = $"This instance of '{typeof(TFrom).FullName}' '{name}' doesn't implement '{typeof(TTo).FullName}'";
-        throw new HutaoException(HutaoExceptionKind.ServiceTypeCastFailed, message, innerException);
+        throw new ArgumentException(message, paramName);
     }
 
+    [DoesNotReturn]
+    [MethodImpl(MethodImplOptions.NoInlining)]
     public static HutaoException GachaStatisticsInvalidItemId(uint id, Exception? innerException = default)
     {
-        string message = SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id);
-        throw new HutaoException(HutaoExceptionKind.GachaStatisticsInvalidItemId, message, innerException);
+        throw new HutaoException(SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id), innerException);
+    }
+
+    [DoesNotReturn]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static HutaoException UserdataCorrupted(string message, Exception? innerException = default)
+    {
+        throw new HutaoException(message, innerException);
+    }
+
+    [DoesNotReturn]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static InvalidCastException InvalidCast<TFrom, TTo>(string name, Exception? innerException = default)
+    {
+        string message = $"This instance of '{typeof(TFrom).FullName}' '{name}' doesn't implement '{typeof(TTo).FullName}'";
+        throw new InvalidCastException(message, innerException);
+    }
+
+    [DoesNotReturn]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static InvalidOperationException InvalidOperation(string message, Exception? innerException = default)
+    {
+        throw new InvalidOperationException(message, innerException);
+    }
+
+    [DoesNotReturn]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static NotSupportedException NotSupported(string? message = default, Exception? innerException = default)
+    {
+        throw new NotSupportedException(message, innerException);
+    }
+
+    [DoesNotReturn]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static OperationCanceledException OperationCanceled(string message, Exception? innerException = default)
+    {
+        throw new OperationCanceledException(message, innerException);
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/HutaoExceptionKind.cs

@@ -1,21 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Core.ExceptionService;
-
-internal enum HutaoExceptionKind
-{
-    None,
-
-    // Foundation
-    ServiceTypeCastFailed,
-    ImageCacheInvalidUri,
-
-    // IO
-    FileSystemCreateFileInsufficientPermissions,
-    PrivateNamedPipeContentHashIncorrect,
-
-    // Service
-    GachaStatisticsInvalidItemId,
-    GameFpsUnlockingFailed,
-}

src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/RuntimeEnvironmentException.cs

@@ -1,23 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Core.ExceptionService;
-
-/// <summary>
-/// 运行环境异常
-/// 用户的计算机中的某些设置不符合要求
-/// </summary>
-[HighQuality]
-[Obsolete("Use HutaoException instead")]
-internal sealed class RuntimeEnvironmentException : Exception
-{
-    /// <summary>
-    /// 构造一个新的运行环境异常
-    /// </summary>
-    /// <param name="message">消息</param>
-    /// <param name="innerException">内部错误</param>
-    public RuntimeEnvironmentException(string message, Exception? innerException)
-        : base($"{message}\n{innerException?.Message}", innerException)
-    {
-    }
-}

src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/ThrowHelper.cs

@@ -1,9 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Service.Game;
-using Snap.Hutao.Service.Game.Package;
-using System.IO;
 using System.Runtime.CompilerServices;
 
 namespace Snap.Hutao.Core.ExceptionService;
@@ -22,92 +19,4 @@ internal static class ThrowHelper
     {
         throw new ArgumentException(message, paramName);
     }
-
-    [DoesNotReturn]
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    public static DatabaseCorruptedException DatabaseCorrupted(string message, Exception? inner)
-    {
-        throw new DatabaseCorruptedException(message, inner);
-    }
-
-    [DoesNotReturn]
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    public static GameFileOperationException GameFileOperation(string message, Exception? inner)
-    {
-        throw new GameFileOperationException(message, inner);
-    }
-
-    [DoesNotReturn]
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    public static InvalidDataException InvalidData(string message, Exception? inner = default)
-    {
-        throw new InvalidDataException(message, inner);
-    }
-
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    public static void InvalidDataIf([DoesNotReturnIf(true)] bool condition, string message, Exception? inner = default)
-    {
-        if (condition)
-        {
-            throw new InvalidDataException(message, inner);
-        }
-    }
-
-    [DoesNotReturn]
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    public static InvalidOperationException InvalidOperation(string message, Exception? inner = default)
-    {
-        throw new InvalidOperationException(message, inner);
-    }
-
-    [DoesNotReturn]
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    public static NotSupportedException NotSupported()
-    {
-        throw new NotSupportedException();
-    }
-
-    [DoesNotReturn]
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    public static NotSupportedException NotSupported(string message)
-    {
-        throw new NotSupportedException(message);
-    }
-
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    public static void NotSupportedIf(bool condition, string message)
-    {
-        if (condition)
-        {
-            throw new NotSupportedException(message);
-        }
-    }
-
-    [DoesNotReturn]
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    public static OperationCanceledException OperationCanceled(string message, Exception? inner = default)
-    {
-        throw new OperationCanceledException(message, inner);
-    }
-
-    [DoesNotReturn]
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    public static PackageConvertException PackageConvert(string message, Exception? inner = default)
-    {
-        throw new PackageConvertException(message, inner);
-    }
-
-    [DoesNotReturn]
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    public static RuntimeEnvironmentException RuntimeEnvironment(string message, Exception? inner)
-    {
-        throw new RuntimeEnvironmentException(message, inner);
-    }
-
-    [DoesNotReturn]
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    public static UserdataCorruptedException UserdataCorrupted(string message, Exception? inner)
-    {
-        throw new UserdataCorruptedException(message, inner);
-    }
 }

src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/UserdataCorruptedException.cs

@@ -1,22 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Core.ExceptionService;
-
-/// <summary>
-/// 用户数据损坏异常
-/// </summary>
-[HighQuality]
-[Obsolete("Use HutaoException instead")]
-internal sealed class UserdataCorruptedException : Exception
-{
-    /// <summary>
-    /// 构造一个新的用户数据损坏异常
-    /// </summary>
-    /// <param name="message">消息</param>
-    /// <param name="innerException">内部错误</param>
-    public UserdataCorruptedException(string message, Exception? innerException)
-        : base(SH.FormatCoreExceptionServiceUserdataCorruptedMessage($"{message}\n{innerException?.Message}"), innerException)
-    {
-    }
-}

src/Snap.Hutao/Snap.Hutao/Core/IO/FileOperation.cs

@@ -1,7 +1,12 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Win32.System.Com;
+using Snap.Hutao.Win32.UI.Shell;
 using System.IO;
+using static Snap.Hutao.Win32.Macros;
+using static Snap.Hutao.Win32.Ole32;
+using static Snap.Hutao.Win32.Shell32;
 
 namespace Snap.Hutao.Core.IO;
 
@@ -39,4 +44,57 @@ internal static class FileOperation
         File.Move(sourceFileName, destFileName, false);
         return true;
     }
+
+    public static unsafe bool UnsafeMove(string sourceFileName, string destFileName)
+    {
+        bool result = false;
+
+        if (SUCCEEDED(CoCreateInstance(in Win32.UI.Shell.FileOperation.CLSID, default, CLSCTX.CLSCTX_INPROC_SERVER, in IFileOperation.IID, out IFileOperation* pFileOperation)))
+        {
+            if (SUCCEEDED(SHCreateItemFromParsingName(sourceFileName, default, in IShellItem.IID, out IShellItem* pSourceShellItem)))
+            {
+                if (SUCCEEDED(SHCreateItemFromParsingName(destFileName, default, in IShellItem.IID, out IShellItem* pDestShellItem)))
+                {
+                    pFileOperation->MoveItem(pSourceShellItem, pDestShellItem, default, default);
+
+                    if (SUCCEEDED(pFileOperation->PerformOperations()))
+                    {
+                        result = true;
+                    }
+
+                    IUnknownMarshal.Release(pDestShellItem);
+                }
+
+                IUnknownMarshal.Release(pSourceShellItem);
+            }
+
+            IUnknownMarshal.Release(pFileOperation);
+        }
+
+        return result;
+    }
+
+    public static unsafe bool UnsafeDelete(string path)
+    {
+        bool result = false;
+
+        if (SUCCEEDED(CoCreateInstance(in Win32.UI.Shell.FileOperation.CLSID, default, CLSCTX.CLSCTX_INPROC_SERVER, in IFileOperation.IID, out IFileOperation* pFileOperation)))
+        {
+            if (SUCCEEDED(SHCreateItemFromParsingName(path, default, in IShellItem.IID, out IShellItem* pShellItem)))
+            {
+                pFileOperation->DeleteItem(pShellItem, default);
+
+                if (SUCCEEDED(pFileOperation->PerformOperations()))
+                {
+                    result = true;
+                }
+
+                IUnknownMarshal.Release(pShellItem);
+            }
+
+            IUnknownMarshal.Release(pFileOperation);
+        }
+
+        return result;
+    }
 }

src/Snap.Hutao/Snap.Hutao/Core/IO/Hashing/Hash.cs

@@ -8,12 +8,17 @@ namespace Snap.Hutao.Core.IO.Hashing;
 
 internal static class Hash
 {
-    public static string SHA1HexString(string input)
+    public static unsafe string SHA1HexString(string input)
     {
-        return HashCore(BitConverter.ToString, SHA1.HashData, Encoding.UTF8.GetBytes, input);
+        return HashCore(Convert.ToHexString, SHA1.HashData, Encoding.UTF8.GetBytes, input);
     }
 
-    private static TResult HashCore<TInput, TResult>(Func<byte[], TResult> resultConverter, Func<byte[], byte[]> hashMethod, Func<TInput, byte[]> bytesConverter, TInput input)
+    public static unsafe string MD5HexString(string input)
+    {
+        return HashCore(Convert.ToHexString, System.Security.Cryptography.MD5.HashData, Encoding.UTF8.GetBytes, input);
+    }
+
+    private static unsafe TResult HashCore<TInput, TResult>(Func<byte[], TResult> resultConverter, Func<byte[], byte[]> hashMethod, Func<TInput, byte[]> bytesConverter, TInput input)
     {
         return resultConverter(hashMethod(bytesConverter(input)));
     }

src/Snap.Hutao/Snap.Hutao/Core/IO/Hashing/MD5.cs

@@ -34,6 +34,6 @@ internal static class MD5
     public static async ValueTask<string> HashAsync(Stream stream, CancellationToken token = default)
     {
         byte[] bytes = await System.Security.Cryptography.MD5.HashDataAsync(stream, token).ConfigureAwait(false);
-        return System.Convert.ToHexString(bytes);
+        return Convert.ToHexString(bytes);
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/IO/Hashing/SHA256.cs

@@ -18,6 +18,6 @@ internal static class SHA256
     public static async ValueTask<string> HashAsync(Stream stream, CancellationToken token = default)
     {
         byte[] bytes = await System.Security.Cryptography.SHA256.HashDataAsync(stream, token).ConfigureAwait(false);
-        return System.Convert.ToHexString(bytes);
+        return Convert.ToHexString(bytes);
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/IO/Http/Loopback/LoopbackManager.cs

@@ -7,7 +7,7 @@ using Snap.Hutao.Win32.NetworkManagement.WindowsFirewall;
 using Snap.Hutao.Win32.Security;
 using System.Runtime.InteropServices;
 using static Snap.Hutao.Win32.AdvApi32;
-using static Snap.Hutao.Win32.ApiMsWinNetIsolation;
+using static Snap.Hutao.Win32.FirewallApi;
 using static Snap.Hutao.Win32.Macros;
 
 namespace Snap.Hutao.Core.IO.Http.Loopback;

src/Snap.Hutao/Snap.Hutao/Core/IO/Http/Sharding/HttpShardCopyWorker.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.Win32.SafeHandles;
 using Snap.Hutao.Core.Diagnostics;
+using System.Buffers;
 using System.IO;
 using System.Net.Http;
 
@@ -77,34 +78,36 @@ internal sealed class HttpShardCopyWorker<TStatus> : IDisposable
                 using (HttpResponseMessage response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token).ConfigureAwait(false))
                 {
                     response.EnsureSuccessStatusCode();
-
-                    Memory<byte> buffer = new byte[bufferSize];
-                    using (Stream stream = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false))
+                    using (IMemoryOwner<byte> memoryOwner = MemoryPool<byte>.Shared.Rent(bufferSize))
                     {
-                        int totalBytesRead = 0;
-                        int bytesReadAfterPreviousReport = 0;
-                        do
+                        Memory<byte> buffer = memoryOwner.Memory;
+                        using (Stream stream = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false))
                         {
-                            int bytesRead = await stream.ReadAsync(buffer, token).ConfigureAwait(false);
-                            if (bytesRead <= 0)
+                            int totalBytesRead = 0;
+                            int bytesReadAfterPreviousReport = 0;
+                            do
                             {
-                                progress.Report(new(bytesReadAfterPreviousReport));
-                                bytesReadAfterPreviousReport = 0;
-                                break;
-                            }
+                                int bytesRead = await stream.ReadAsync(buffer, token).ConfigureAwait(false);
+                                if (bytesRead <= 0)
+                                {
+                                    progress.Report(new(bytesReadAfterPreviousReport));
+                                    bytesReadAfterPreviousReport = 0;
+                                    break;
+                                }
 
-                            await RandomAccess.WriteAsync(destFileHandle, buffer[..bytesRead], shard.StartOffset + totalBytesRead, token).ConfigureAwait(false);
+                                await RandomAccess.WriteAsync(destFileHandle, buffer[..bytesRead], shard.StartOffset + totalBytesRead, token).ConfigureAwait(false);
 
-                            totalBytesRead += bytesRead;
-                            bytesReadAfterPreviousReport += bytesRead;
-                            if (stopwatch.GetElapsedTime().TotalMilliseconds > 500)
-                            {
-                                progress.Report(new(bytesReadAfterPreviousReport));
-                                bytesReadAfterPreviousReport = 0;
-                                stopwatch = ValueStopwatch.StartNew();
+                                totalBytesRead += bytesRead;
+                                bytesReadAfterPreviousReport += bytesRead;
+                                if (stopwatch.GetElapsedTime().TotalMilliseconds > 500)
+                                {
+                                    progress.Report(new(bytesReadAfterPreviousReport));
+                                    bytesReadAfterPreviousReport = 0;
+                                    stopwatch = ValueStopwatch.StartNew();
+                                }
                             }
+                            while (true);
                         }
-                        while (true);
                     }
                 }
             }

src/Snap.Hutao/Snap.Hutao/Core/IO/StreamCopyWorker.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using Snap.Hutao.Core.Diagnostics;
+using System.Buffers;
 using System.IO;
 
 namespace Snap.Hutao.Core.IO;
@@ -51,26 +52,30 @@ internal class StreamCopyWorker<TStatus>
 
         long totalBytesRead = 0;
         int bytesRead;
-        Memory<byte> buffer = new byte[bufferSize];
 
-        do
+        using (IMemoryOwner<byte> memoryOwner = MemoryPool<byte>.Shared.Rent(bufferSize))
         {
-            bytesRead = await source.ReadAsync(buffer).ConfigureAwait(false);
-            if (bytesRead == 0)
-            {
-                progress.Report(statusFactory(totalBytesRead));
-                break;
-            }
+            Memory<byte> buffer = memoryOwner.Memory;
 
-            await destination.WriteAsync(buffer[..bytesRead]).ConfigureAwait(false);
-
-            totalBytesRead += bytesRead;
-            if (stopwatch.GetElapsedTime().TotalMilliseconds > 1000)
+            do
             {
-                progress.Report(statusFactory(totalBytesRead));
-                stopwatch = ValueStopwatch.StartNew();
+                bytesRead = await source.ReadAsync(buffer).ConfigureAwait(false);
+                if (bytesRead is 0)
+                {
+                    progress.Report(statusFactory(totalBytesRead));
+                    break;
+                }
+
+                await destination.WriteAsync(buffer[..bytesRead]).ConfigureAwait(false);
+
+                totalBytesRead += bytesRead;
+                if (stopwatch.GetElapsedTime().TotalMilliseconds > 1000)
+                {
+                    progress.Report(statusFactory(totalBytesRead));
+                    stopwatch = ValueStopwatch.StartNew();
+                }
             }
+            while (bytesRead > 0);
         }
-        while (bytesRead > 0);
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/IO/StreamReaderWriter.cs

@@ -0,0 +1,41 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using System.IO;
+
+namespace Snap.Hutao.Core.IO;
+
+internal sealed class StreamReaderWriter : IDisposable
+{
+    private readonly StreamReader reader;
+    private readonly StreamWriter writer;
+
+    public StreamReaderWriter(StreamReader reader, StreamWriter writer)
+    {
+        this.reader = reader;
+        this.writer = writer;
+    }
+
+    public StreamReader Reader { get => reader; }
+
+    public StreamWriter Writer { get => writer; }
+
+    /// <inheritdoc cref="StreamReader.ReadLineAsync(CancellationToken)"/>
+    public ValueTask<string?> ReadLineAsync(CancellationToken token)
+    {
+        return reader.ReadLineAsync(token);
+    }
+
+    /// <inheritdoc cref="StreamWriter.WriteAsync(string?)"/>
+    [SuppressMessage("", "SH003")]
+    public Task WriteAsync(string value)
+    {
+        return writer.WriteAsync(value);
+    }
+
+    public void Dispose()
+    {
+        writer.Dispose();
+        reader.Dispose();
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/IO/TempFile.cs

@@ -29,7 +29,7 @@ internal readonly struct TempFile : IDisposable
         }
         catch (UnauthorizedAccessException ex)
         {
-            HutaoException.Throw(HutaoExceptionKind.FileSystemCreateFileInsufficientPermissions, SH.CoreIOTempFileCreateFail, ex);
+            HutaoException.Throw(SH.CoreIOTempFileCreateFail, ex);
         }
 
         if (delete)

src/Snap.Hutao/Snap.Hutao/Core/Json/Converter/SeparatorCommaInt32EnumerableConverter.cs

@@ -22,7 +22,7 @@ internal sealed class SeparatorCommaInt32EnumerableConverter : JsonConverter<IEn
             return EnumerateNumbers(source);
         }
 
-        return Enumerable.Empty<int>();
+        return [];
     }
 
     /// <inheritdoc/>

src/Snap.Hutao/Snap.Hutao/Core/LazySlim.cs

@@ -0,0 +1,21 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core;
+
+internal sealed class LazySlim<T>
+{
+    private readonly Func<T> valueFactory;
+
+    [MaybeNull]
+    private T value;
+    private bool initialized;
+    private object? syncRoot;
+
+    public LazySlim(Func<T> valueFactory)
+    {
+        this.valueFactory = valueFactory;
+    }
+
+    public T Value { get => LazyInitializer.EnsureInitialized(ref value, ref initialized, ref syncRoot, valueFactory); }
+}

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppActivation.cs

@@ -3,11 +3,18 @@
 
 using CommunityToolkit.WinUI.Notifications;
 using Microsoft.Extensions.Caching.Memory;
+using Microsoft.UI.Xaml;
 using Snap.Hutao.Core.LifeCycle.InterProcess;
 using Snap.Hutao.Core.Setting;
+using Snap.Hutao.Core.Shell;
+using Snap.Hutao.Core.Windowing;
+using Snap.Hutao.Core.Windowing.HotKey;
+using Snap.Hutao.Core.Windowing.NotifyIcon;
+using Snap.Hutao.Service;
 using Snap.Hutao.Service.DailyNote;
 using Snap.Hutao.Service.Discord;
 using Snap.Hutao.Service.Hutao;
+using Snap.Hutao.Service.Job;
 using Snap.Hutao.Service.Metadata;
 using Snap.Hutao.Service.Navigation;
 using Snap.Hutao.ViewModel.Guide;
@@ -20,9 +27,9 @@ namespace Snap.Hutao.Core.LifeCycle;
 /// </summary>
 [HighQuality]
 [ConstructorGenerated]
-[Injection(InjectAs.Singleton, typeof(IActivation))]
+[Injection(InjectAs.Singleton, typeof(IAppActivation))]
 [SuppressMessage("", "CA1001")]
-internal sealed partial class Activation : IActivation
+internal sealed partial class AppActivation : IAppActivation, IAppActivationActionHandlersAccess, IDisposable
 {
     public const string Action = nameof(Action);
     public const string Uid = nameof(Uid);
@@ -35,26 +42,80 @@ internal sealed partial class Activation : IActivation
     private const string UrlActionRefresh = "/REFRESH";
 
     private readonly IServiceProvider serviceProvider;
-    private readonly ICurrentWindowReference currentWindowReference;
+    private readonly ICurrentXamlWindowReference currentWindowReference;
     private readonly ITaskContext taskContext;
+
     private readonly SemaphoreSlim activateSemaphore = new(1);
 
     /// <inheritdoc/>
     public void Activate(HutaoActivationArguments args)
     {
-        if (ToastNotificationManagerCompat.WasCurrentProcessToastActivated())
-        {
-            return;
-        }
-
         HandleActivationAsync(args).SafeForget();
     }
 
     /// <inheritdoc/>
-    public void Initialize()
+    public void PostInitialization()
     {
         serviceProvider.GetRequiredService<PrivateNamedPipeServer>().RunAsync().SafeForget();
         ToastNotificationManagerCompat.OnActivated += NotificationActivate;
+
+        using (activateSemaphore.Enter())
+        {
+            // TODO: Introduced in 1.10.2, remove in later version
+            serviceProvider.GetRequiredService<IJumpListInterop>().ClearAsync().SafeForget();
+            serviceProvider.GetRequiredService<IScheduleTaskInterop>().UnregisterAllTasks();
+
+            if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor10Revision0GuideState, GuideState.Language) < GuideState.Completed)
+            {
+                return;
+            }
+
+            serviceProvider.GetRequiredService<HotKeyOptions>().RegisterAll();
+
+            if (serviceProvider.GetRequiredService<AppOptions>().IsNotifyIconEnabled)
+            {
+                XamlLifetime.ApplicationLaunchedWithNotifyIcon = true;
+                serviceProvider.GetRequiredService<App>().DispatcherShutdownMode = DispatcherShutdownMode.OnExplicitShutdown;
+                _ = serviceProvider.GetRequiredService<NotifyIconController>();
+            }
+
+            serviceProvider.GetRequiredService<IQuartzService>().StartAsync(default).SafeForget();
+        }
+    }
+
+    public void Dispose()
+    {
+        activateSemaphore.Dispose();
+    }
+
+    public async ValueTask HandleLaunchGameActionAsync(string? uid = null)
+    {
+        serviceProvider
+            .GetRequiredService<IMemoryCache>()
+            .Set(ViewModel.Game.LaunchGameViewModel.DesiredUid, uid);
+
+        await taskContext.SwitchToMainThreadAsync();
+
+        if (currentWindowReference.Window is null)
+        {
+            currentWindowReference.Window = serviceProvider.GetRequiredService<LaunchGameWindow>();
+            return;
+        }
+
+        if (currentWindowReference.Window is MainWindow)
+        {
+            await serviceProvider
+                .GetRequiredService<INavigationService>()
+                .NavigateAsync<View.Page.LaunchGamePage>(INavigationAwaiter.Default, true)
+                .ConfigureAwait(false);
+
+            return;
+        }
+        else
+        {
+            // We have a non-Main Window, just exit current process anyway
+            Process.GetCurrentProcess().Kill();
+        }
     }
 
     private void NotificationActivate(ToastNotificationActivatedEventArgsCompat args)
@@ -94,57 +155,63 @@ internal sealed partial class Activation : IActivation
             ArgumentNullException.ThrowIfNull(args.LaunchActivatedArguments);
             switch (args.LaunchActivatedArguments)
             {
-                case LaunchGame:
-                    {
-                        await HandleLaunchGameActionAsync().ConfigureAwait(false);
-                        break;
-                    }
-
                 default:
                     {
-                        await HandleNormalLaunchActionAsync().ConfigureAwait(false);
+                        await HandleNormalLaunchActionAsync(args.IsRedirectTo).ConfigureAwait(false);
                         break;
                     }
             }
         }
     }
 
-    private async ValueTask HandleNormalLaunchActionAsync()
+    private async ValueTask HandleNormalLaunchActionAsync(bool isRedirectTo)
     {
-        // Increase launch times
-        LocalSetting.Update(SettingKeys.LaunchTimes, 0, x => x + 1);
-
-        // If it's the first time launch, we show the guide window anyway.
-        // Otherwise, we check if there's any unfulfilled resource category present.
-        if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor7Revision0GuideState, GuideState.Language) >= GuideState.StaticResourceBegin)
+        if (!isRedirectTo)
         {
-            if (StaticResource.IsAnyUnfulfilledCategoryPresent())
+            // Increase launch times
+            LocalSetting.Update(SettingKeys.LaunchTimes, 0, x => unchecked(x + 1));
+
+            // If the guide is completed, we check if there's any unfulfilled resource category present.
+            if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor10Revision0GuideState, GuideState.Language) >= GuideState.StaticResourceBegin)
             {
-                UnsafeLocalSetting.Set(SettingKeys.Major1Minor7Revision0GuideState, GuideState.StaticResourceBegin);
+                if (StaticResource.IsAnyUnfulfilledCategoryPresent())
+                {
+                    UnsafeLocalSetting.Set(SettingKeys.Major1Minor10Revision0GuideState, GuideState.StaticResourceBegin);
+                }
+            }
+
+            if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor10Revision0GuideState, GuideState.Language) < GuideState.Completed)
+            {
+                await taskContext.SwitchToMainThreadAsync();
+
+                GuideWindow guideWindow = serviceProvider.GetRequiredService<GuideWindow>();
+                currentWindowReference.Window = guideWindow;
+
+                guideWindow.SwitchTo();
+                guideWindow.BringToForeground();
+                return;
             }
         }
 
-        if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor7Revision0GuideState, GuideState.Language) < GuideState.Completed)
-        {
-            await taskContext.SwitchToMainThreadAsync();
-            serviceProvider.GetRequiredService<GuideWindow>();
-        }
-        else
-        {
-            await WaitMainWindowAsync().ConfigureAwait(false);
-        }
+        await WaitMainWindowOrCurrentAsync().ConfigureAwait(false);
     }
 
-    private async ValueTask WaitMainWindowAsync()
+    private async ValueTask WaitMainWindowOrCurrentAsync()
     {
-        if (currentWindowReference.Window is not null)
+        if (currentWindowReference.Window is { } window)
         {
+            window.SwitchTo();
+            window.BringToForeground();
             return;
         }
 
         await taskContext.SwitchToMainThreadAsync();
 
-        serviceProvider.GetRequiredService<MainWindow>();
+        MainWindow mainWindow = serviceProvider.GetRequiredService<MainWindow>();
+        currentWindowReference.Window = mainWindow;
+
+        mainWindow.SwitchTo();
+        mainWindow.BringToForeground();
 
         await taskContext.SwitchToBackgroundAsync();
 
@@ -158,10 +225,7 @@ internal sealed partial class Activation : IActivation
             hutaoUserServiceInitialization.InitializeInternalAsync().SafeForget();
         }
 
-        serviceProvider
-            .GetRequiredService<IDiscordService>()
-            .SetNormalActivityAsync()
-            .SafeForget();
+        serviceProvider.GetRequiredService<IDiscordService>().SetNormalActivityAsync().SafeForget();
     }
 
     private async ValueTask HandleUrlActivationAsync(Uri uri, bool isRedirectTo)
@@ -176,7 +240,7 @@ internal sealed partial class Activation : IActivation
         {
             case CategoryAchievement:
                 {
-                    await WaitMainWindowAsync().ConfigureAwait(false);
+                    await WaitMainWindowOrCurrentAsync().ConfigureAwait(false);
                     await HandleAchievementActionAsync(action, parameter, isRedirectTo).ConfigureAwait(false);
                     break;
                 }
@@ -189,7 +253,7 @@ internal sealed partial class Activation : IActivation
 
             default:
                 {
-                    await HandleNormalLaunchActionAsync().ConfigureAwait(false);
+                    await HandleNormalLaunchActionAsync(isRedirectTo).ConfigureAwait(false);
                     break;
                 }
         }
@@ -244,34 +308,4 @@ internal sealed partial class Activation : IActivation
                 }
         }
     }
-
-    private async ValueTask HandleLaunchGameActionAsync(string? uid = null)
-    {
-        serviceProvider
-            .GetRequiredService<IMemoryCache>()
-            .Set(ViewModel.Game.LaunchGameViewModel.DesiredUid, uid);
-
-        await taskContext.SwitchToMainThreadAsync();
-
-        if (currentWindowReference.Window is null)
-        {
-            serviceProvider.GetRequiredService<LaunchGameWindow>();
-            return;
-        }
-
-        if (currentWindowReference.Window is MainWindow)
-        {
-            await serviceProvider
-                .GetRequiredService<INavigationService>()
-                .NavigateAsync<View.Page.LaunchGamePage>(INavigationAwaiter.Default, true)
-                .ConfigureAwait(false);
-
-            return;
-        }
-        else
-        {
-            // We have a non-Main Window, just exit current process anyway
-            Process.GetCurrentProcess().Kill();
-        }
-    }
 }

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/CurrentWindowReferenceExtension.cs

@@ -1,24 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml;
-using Snap.Hutao.Core.Windowing;
-using Snap.Hutao.Win32.Foundation;
-using WinRT.Interop;
-
-namespace Snap.Hutao.Core.LifeCycle;
-
-internal static class CurrentWindowReferenceExtension
-{
-    public static XamlRoot GetXamlRoot(this ICurrentWindowReference reference)
-    {
-        return reference.Window.Content.XamlRoot;
-    }
-
-    public static HWND GetWindowHandle(this ICurrentWindowReference reference)
-    {
-        return reference.Window is IWindowOptionsSource optionsSource
-            ? optionsSource.WindowOptions.Hwnd
-            : WindowNative.GetWindowHandle(reference.Window);
-    }
-}

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/CurrentXamlWindowReference.cs

@@ -5,19 +5,19 @@ using Microsoft.UI.Xaml;
 
 namespace Snap.Hutao.Core.LifeCycle;
 
-[Injection(InjectAs.Singleton, typeof(ICurrentWindowReference))]
-internal sealed class CurrentWindowReference : ICurrentWindowReference
+[Injection(InjectAs.Singleton, typeof(ICurrentXamlWindowReference))]
+internal sealed class CurrentXamlWindowReference : ICurrentXamlWindowReference
 {
     private readonly WeakReference<Window> reference = new(default!);
 
     [SuppressMessage("", "SH007")]
-    public Window Window
+    public Window? Window
     {
         get
         {
             reference.TryGetTarget(out Window? window);
             return window!;
         }
-        set => reference.SetTarget(value);
+        set => reference.SetTarget(value!);
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/CurrentXamlWindowReferenceExtension.cs

@@ -0,0 +1,22 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml;
+using Snap.Hutao.Core.Windowing;
+using Snap.Hutao.Win32.Foundation;
+
+namespace Snap.Hutao.Core.LifeCycle;
+
+internal static class CurrentXamlWindowReferenceExtension
+{
+    public static XamlRoot GetXamlRoot(this ICurrentXamlWindowReference reference)
+    {
+        ArgumentNullException.ThrowIfNull(reference.Window);
+        return reference.Window.Content.XamlRoot;
+    }
+
+    public static HWND GetWindowHandle(this ICurrentXamlWindowReference reference)
+    {
+        return WindowExtension.GetWindowHandle(reference.Window);
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/HutaoActivationArguments.cs

@@ -1,6 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Microsoft.Extensions.Primitives;
 using Microsoft.Windows.AppLifecycle;
 
 namespace Snap.Hutao.Core.LifeCycle;
@@ -9,6 +10,8 @@ internal sealed class HutaoActivationArguments
 {
     public bool IsRedirectTo { get; set; }
 
+    public bool IsToastActivated { get; set; }
+
     public HutaoActivationKind Kind { get; set; }
 
     public Uri? ProtocolActivatedUri { get; set; }
@@ -30,6 +33,15 @@ internal sealed class HutaoActivationArguments
                     if (args.TryGetLaunchActivatedArguments(out string? arguments))
                     {
                         result.LaunchActivatedArguments = arguments;
+
+                        foreach (StringSegment segment in new StringTokenizer(arguments, [' ']))
+                        {
+                            if (segment.AsSpan().SequenceEqual("-ToastActivated"))
+                            {
+                                result.Kind = HutaoActivationKind.Toast;
+                                break;
+                            }
+                        }
                     }
 
                     break;

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/HutaoActivationKind.cs

@@ -7,5 +7,6 @@ internal enum HutaoActivationKind
 {
     None,
     Launch,
+    Toast,
     Protocol,
 }

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/IActivation.cs

@@ -1,14 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Core.LifeCycle;
-
-/// <summary>
-/// 激活
-/// </summary>
-internal interface IActivation
-{
-    void Activate(HutaoActivationArguments args);
-
-    void Initialize();
-}

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/IAppActivation.cs

@@ -0,0 +1,16 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core.LifeCycle;
+
+internal interface IAppActivation
+{
+    void Activate(HutaoActivationArguments args);
+
+    void PostInitialization();
+}
+
+internal interface IAppActivationActionHandlersAccess
+{
+    ValueTask HandleLaunchGameActionAsync(string? uid = null);
+}

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/ICurrentXamlWindowReference.cs

@@ -5,10 +5,10 @@ using Microsoft.UI.Xaml;
 
 namespace Snap.Hutao.Core.LifeCycle;
 
-internal interface ICurrentWindowReference
+internal interface ICurrentXamlWindowReference
 {
     /// <summary>
     /// Only set in WindowController
     /// </summary>
-    public Window Window { get; set; }
+    public Window? Window { get; set; }
 }

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/InterProcess/PipePacketCommand.cs

@@ -6,6 +6,9 @@ namespace Snap.Hutao.Core.LifeCycle.InterProcess;
 internal enum PipePacketCommand : byte
 {
     None = 0,
+    Connect = 1,
 
     RedirectActivation = 10,
+
+    Exit = 30,
 }

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/InterProcess/PipePacketType.cs

@@ -8,5 +8,5 @@ internal enum PipePacketType : byte
     None = 0,
     Request = 1,
     Response = 2,
-    Termination = 3,
+    SessionTermination = 3,
 }

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/InterProcess/PipeStreamExtension.cs

@@ -0,0 +1,28 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Core.ExceptionService;
+using System.IO.Hashing;
+using System.IO.Pipes;
+
+namespace Snap.Hutao.Core.LifeCycle.InterProcess;
+
+internal static class PipeStreamExtension
+{
+    public static unsafe byte[] GetValidatedContent(this PipeStream stream, PipePacketHeader* header)
+    {
+        byte[] content = new byte[header->ContentLength];
+        stream.ReadAtLeast(content, header->ContentLength, false);
+        HutaoException.ThrowIf(XxHash64.HashToUInt64(content) != header->Checksum, "PipePacket Content Hash incorrect");
+        return content;
+    }
+
+    public static unsafe void WritePacket(this PipeStream stream, PipePacketHeader* header, byte[] content)
+    {
+        header->ContentLength = content.Length;
+        header->Checksum = XxHash64.HashToUInt64(content);
+
+        stream.Write(new(header, sizeof(PipePacketHeader)));
+        stream.Write(content);
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/InterProcess/PrivateNamedPipeClient.cs

@@ -2,21 +2,59 @@
 // Licensed under the MIT license.
 
 using Microsoft.Windows.AppLifecycle;
-using System.IO.Hashing;
 using System.IO.Pipes;
 
 namespace Snap.Hutao.Core.LifeCycle.InterProcess;
 
 [Injection(InjectAs.Singleton)]
-internal sealed class PrivateNamedPipeClient : IDisposable
+[ConstructorGenerated]
+internal sealed partial class PrivateNamedPipeClient : IDisposable
 {
     private readonly NamedPipeClientStream clientStream = new(".", "Snap.Hutao.PrivateNamedPipe", PipeDirection.InOut, PipeOptions.Asynchronous | PipeOptions.WriteThrough);
+    private readonly RuntimeOptions runtimeOptions;
 
     public unsafe bool TryRedirectActivationTo(AppActivationArguments args)
     {
         if (clientStream.TryConnectOnce())
         {
+            bool serverElevated = false;
             {
+                // Connect
+                PipePacketHeader connectPacket = default;
+                connectPacket.Version = 1;
+                connectPacket.Type = PipePacketType.Request;
+                connectPacket.Command = PipePacketCommand.Connect;
+
+                clientStream.Write(new(&connectPacket, sizeof(PipePacketHeader)));
+            }
+
+            {
+                // Get previous instance elevated status
+                Span<byte> headerSpan = stackalloc byte[sizeof(PipePacketHeader)];
+                clientStream.ReadExactly(headerSpan);
+                fixed (byte* pHeader = headerSpan)
+                {
+                    PipePacketHeader* header = (PipePacketHeader*)pHeader;
+                    ReadOnlySpan<byte> content = clientStream.GetValidatedContent(header);
+                    serverElevated = JsonSerializer.Deserialize<bool>(content);
+                }
+            }
+
+            if (!serverElevated && runtimeOptions.IsElevated)
+            {
+                // Kill previous instance to use current elevated instance
+                PipePacketHeader killPacket = default;
+                killPacket.Version = 1;
+                killPacket.Type = PipePacketType.SessionTermination;
+                killPacket.Command = PipePacketCommand.Exit;
+
+                clientStream.Write(new(&killPacket, sizeof(PipePacketHeader)));
+                clientStream.Flush();
+                return false;
+            }
+
+            {
+                // Redirect to previous instance
                 PipePacketHeader redirectActivationPacket = default;
                 redirectActivationPacket.Version = 1;
                 redirectActivationPacket.Type = PipePacketType.Request;
@@ -26,17 +64,14 @@ internal sealed class PrivateNamedPipeClient : IDisposable
                 HutaoActivationArguments hutaoArgs = HutaoActivationArguments.FromAppActivationArguments(args, isRedirected: true);
                 byte[] jsonBytes = JsonSerializer.SerializeToUtf8Bytes(hutaoArgs);
 
-                redirectActivationPacket.ContentLength = jsonBytes.Length;
-                redirectActivationPacket.Checksum = XxHash64.HashToUInt64(jsonBytes);
-
-                clientStream.Write(new(&redirectActivationPacket, sizeof(PipePacketHeader)));
-                clientStream.Write(jsonBytes);
+                clientStream.WritePacket(&redirectActivationPacket, jsonBytes);
             }
 
             {
+                // Terminate session
                 PipePacketHeader terminationPacket = default;
                 terminationPacket.Version = 1;
-                terminationPacket.Type = PipePacketType.Termination;
+                terminationPacket.Type = PipePacketType.SessionTermination;
 
                 clientStream.Write(new(&terminationPacket, sizeof(PipePacketHeader)));
             }