Manual cherry-pick to match main changes + bump version

Author: neon-nyan

CollapseLauncher/Classes/CachesManagement/Honkai/Fetch.cs

@@ -42,7 +42,7 @@ private async Task<List<CacheAsset>> Fetch(CancellationToken token)
             DownloadClient downloadClient = DownloadClient.CreateInstance(httpClientNew);
 
             // Build _gameRepoURL from loading Dispatcher and Gateway
-            await BuildGameRepoURL(downloadClient, token);
+            await BuildGameRepoURL(downloadClient.GetHttpClient(), token);
 
             // Iterate type and do fetch
             await Parallel.ForEachAsync(
@@ -83,7 +83,7 @@ await Parallel.ForEachAsync(
             return returnAsset;
         }
 
-        private async Task BuildGameRepoURL(DownloadClient downloadClient, CancellationToken token)
+        private async Task BuildGameRepoURL(HttpClient downloadClient, CancellationToken token)
         {
             KianaDispatch dispatch = null;
             Exception lastException = null;
@@ -354,7 +354,7 @@ private static bool IsValidRegionFile(string input, string lang)
             List<CacheAsset> returnAsset = [];
 
             // Build _gameRepoURL from loading Dispatcher and Gateway
-            await BuildGameRepoURL(downloadClient, token);
+            await BuildGameRepoURL(downloadClient.GetHttpClient(), token);
 
             // Fetch the progress
             _ = await FetchByType(type, downloadClient, returnAsset, token);

CollapseLauncher/Classes/GamePresetProperty.cs

@@ -10,6 +10,7 @@
 using CollapseLauncher.InstallManager.StarRail;
 using CollapseLauncher.InstallManager.Zenless;
 using CollapseLauncher.Interfaces;
+using Hi3Helper;
 using Hi3Helper.SentryHelper;
 using Hi3Helper.Win32.ManagedTools;
 using Hi3Helper.Win32.Native.Enums;

CollapseLauncher/Classes/Helper/Image/ImageLoaderHelper.cs

@@ -7,6 +7,7 @@
 using CommunityToolkit.WinUI.Media;
 using Hi3Helper;
 using Hi3Helper.Data;
+using Hi3Helper.EncTool;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;

CollapseLauncher/Classes/Helper/Metadata/LauncherMetadataHelper.cs

@@ -5,6 +5,7 @@
 using CollapseLauncher.Statics;
 using Hi3Helper;
 using Hi3Helper.Data;
+using Hi3Helper.EncTool;
 using Hi3Helper.SentryHelper;
 using Hi3Helper.Shared.Region;
 using System;

CollapseLauncher/Classes/Helper/Update/LauncherUpdateHelper.cs

@@ -1,6 +1,7 @@
 using CollapseLauncher.Extension;
 using Hi3Helper;
 using Hi3Helper.Data;
+using Hi3Helper.EncTool;
 using Hi3Helper.SentryHelper;
 using Hi3Helper.Shared.Region;
 using System;

CollapseLauncher/Classes/Interfaces/Class/ProgressBase.cs

@@ -6,6 +6,7 @@
 using CommunityToolkit.WinUI;
 using Hi3Helper;
 using Hi3Helper.Data;
+using Hi3Helper.EncTool;
 using Hi3Helper.Http;
 using Hi3Helper.Preset;
 using Hi3Helper.SentryHelper;

CollapseLauncher/Classes/RegionManagement/FallbackCDNUtil.cs

@@ -2,6 +2,7 @@
 using CollapseLauncher.Helper;
 using Hi3Helper;
 using Hi3Helper.Data;
+using Hi3Helper.EncTool;
 using Hi3Helper.Http;
 using Hi3Helper.Http.Legacy;
 using Hi3Helper.SentryHelper;

CollapseLauncher/Classes/RepairManagement/Genshin/Fetch.Persistent.cs

@@ -1,6 +1,7 @@
 using CollapseLauncher.Helper.StreamUtility;
 using Hi3Helper;
 using Hi3Helper.Data;
+using Hi3Helper.EncTool;
 using Hi3Helper.EncTool.Parser.AssetIndex;
 using Hi3Helper.EncTool.Parser.YSDispatchHelper;
 using Hi3Helper.Http;

CollapseLauncher/Classes/RepairManagement/Honkai/Fetch.cs

@@ -883,7 +883,8 @@ private async ValueTask<bool> IsAudioFileAvailable(ManifestAssetInfo audioInfo,
         // ReSharper disable once UnusedParameter.Local
         private async Task<KianaAudioManifest> TryGetAudioManifest(HttpClient client, SenadinaFileIdentifier senadinaFileIdentifier, string manifestLocal, string manifestRemote, CancellationToken token)
         {
-            await using Stream?    originalFile = await senadinaFileIdentifier.GetOriginalFileStream(client, token);
+            string originalUrl = senadinaFileIdentifier.GetOriginalFileUrl();
+            await using Stream?    originalFile = await client.GetStreamAsync(originalUrl, token);
             await using FileStream localFile    = new FileStream(EnsureCreationOfDirectory(manifestLocal), FileMode.Create, FileAccess.Write, FileShare.ReadWrite);
 
             // Start downloading manifest.m
@@ -987,7 +988,7 @@ private async Task FetchXMFFile(HttpClient _httpClient,
             using MemoryStream tempXMFMetaStream = new();
 
             await using Stream? metaBaseXMFStream = !IsOnlyRecoverMain && isPlatformXMFStreamExist ?
-                await xmfPlatformIdentifier!.GetOriginalFileStream(_httpClient, token) :
+                await _httpClient.GetStreamAsync(xmfPlatformIdentifier!.GetOriginalFileUrl(), token) :
                 null;
             if (xmfPlatformIdentifier != null)
             {
@@ -998,8 +999,8 @@ private async Task FetchXMFFile(HttpClient _httpClient,
                 if (isEitherXMFExist)
                 {
                     await using Stream? baseXMFStream = !IsOnlyRecoverMain && isSecondaryXMFStreamExist ?
-                        await xmfCurrentIdentifier!.GetOriginalFileStream(_httpClient, token) :
-                        await xmfBaseIdentifier!.GetOriginalFileStream(_httpClient, token);
+                        await _httpClient.GetStreamAsync(xmfCurrentIdentifier!.GetOriginalFileUrl(), token) :
+                        await _httpClient.GetStreamAsync(xmfBaseIdentifier!.GetOriginalFileUrl(), token);
                     if (xmfCurrentIdentifier != null)
                     {
                         await using Stream? dataXMFStream = !IsOnlyRecoverMain ? xmfCurrentIdentifier.fileStream : xmfBaseIdentifier?.fileStream;

CollapseLauncher/Classes/RepairManagement/StarRail/Fetch.cs

@@ -2,6 +2,7 @@
 using CollapseLauncher.Helper.Metadata;
 using Hi3Helper;
 using Hi3Helper.Data;
+using Hi3Helper.EncTool;
 using Hi3Helper.EncTool.Parser.AssetIndex;
 using Hi3Helper.EncTool.Parser.AssetMetadata.SRMetadataAsset;
 using Hi3Helper.Http;