diff --git a/src/Snap.Hutao/Snap.Hutao.SourceGeneration/DedendencyInjection/HttpClientGenerator.cs b/src/Snap.Hutao/Snap.Hutao.SourceGeneration/DedendencyInjection/HttpClientGenerator.cs index 4c104834..a83e2136 100644 --- a/src/Snap.Hutao/Snap.Hutao.SourceGeneration/DedendencyInjection/HttpClientGenerator.cs +++ b/src/Snap.Hutao/Snap.Hutao.SourceGeneration/DedendencyInjection/HttpClientGenerator.cs @@ -24,6 +24,7 @@ public class HttpClientGenerator : ISourceGenerator private const string DefaultName = "Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient.HttpClientConfigration.Default"; private const string XRpcName = "Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient.HttpClientConfigration.XRpc"; private const string XRpc2Name = "Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient.HttpClientConfigration.XRpc2"; + private const string XRpc3Name = "Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient.HttpClientConfigration.XRpc3"; private const string PrimaryHttpMessageHandlerAttributeName = "Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient.PrimaryHttpMessageHandlerAttribute"; private const string DynamicSecretAttributeName = "Snap.Hutao.Web.Hoyolab.DynamicSecret.UseDynamicSecretAttribute"; @@ -105,6 +106,9 @@ internal static partial class IocHttpClientConfiguration case XRpc2Name: lineBuilder.Append("XRpc2Configuration)"); break; + case XRpc3Name: + lineBuilder.Append("XRpc3Configuration)"); + break; default: throw new InvalidOperationException($"非法的HttpClientConfigration值: [{injectAsName}]"); } diff --git a/src/Snap.Hutao/Snap.Hutao/Core/CoreEnvironment.cs b/src/Snap.Hutao/Snap.Hutao/Core/CoreEnvironment.cs index bfc9ad0a..1781289c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/CoreEnvironment.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/CoreEnvironment.cs @@ -45,6 +45,7 @@ internal static class CoreEnvironment [SaltType.X4] = "xV8v4Qu54lUKrEYFZkJhB8cuOh9Asafs", [SaltType.X6] = "t0qEgfub6cvueAPgR5m9aQWWVciEer7v", [SaltType.PROD] = "JwYDpKvLj6MrMqqYU6jTKF17KNO2PXoS", + [SaltType.OS] = "6cqshh5dhw73bzxn20oexa9k516chk7s", }.ToImmutableDictionary(); /// diff --git a/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/Annotation/HttpClient/HttpClientConfigration.cs b/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/Annotation/HttpClient/HttpClientConfigration.cs index 4d12e220..6bc5419c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/Annotation/HttpClient/HttpClientConfigration.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/Annotation/HttpClient/HttpClientConfigration.cs @@ -23,4 +23,9 @@ internal enum HttpClientConfigration /// 米游社登录请求配置 /// XRpc2, + + /// + /// 国际服Hoyolab请求配置 + /// + XRpc3, } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocHttpClientConfiguration.cs b/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocHttpClientConfiguration.cs index 1a532ad2..dc6de29b 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocHttpClientConfiguration.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocHttpClientConfiguration.cs @@ -60,4 +60,18 @@ internal static partial class IocHttpClientConfiguration client.DefaultRequestHeaders.Add("x-rpc-game_biz", "bbs_cn"); client.DefaultRequestHeaders.Add("x-rpc-sdk_version", "1.3.1.2"); } + + /// + /// 对于需要添加动态密钥的客户端使用此配置 + /// 国际服 API 测试 + /// + /// 配置后的客户端 + private static void XRpc3Configuration(HttpClient client) + { + client.Timeout = Timeout.InfiniteTimeSpan; + client.DefaultRequestHeaders.UserAgent.ParseAdd("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 Safari/537.36"); + client.DefaultRequestHeaders.Accept.ParseAdd("application/json"); + client.DefaultRequestHeaders.Add("x-rpc-app_version", "1.5.0"); + client.DefaultRequestHeaders.Add("x-rpc-client_type", "4"); + } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Binding/User/User.cs b/src/Snap.Hutao/Snap.Hutao/Model/Binding/User/User.cs index e7427697..274137ec 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Binding/User/User.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Binding/User/User.cs @@ -4,6 +4,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Messaging; using Microsoft.Extensions.DependencyInjection; +using Snap.Hutao.Migrations; using Snap.Hutao.Web.Hoyolab; using Snap.Hutao.Web.Hoyolab.Bbs.User; using Snap.Hutao.Web.Hoyolab.Passport; @@ -103,7 +104,17 @@ internal sealed class User : ObservableObject internal static async Task ResumeAsync(EntityUser inner, CancellationToken token = default) { User user = new(inner); - bool isOk = await user.InitializeCoreAsync(token).ConfigureAwait(false); + bool isOk = false; + + // TODO: 这里暂时使用是否存在 stoken 来判断是否为国际服，需要改进 + if (user.Entity.Stoken != null) + { + isOk = await user.InitializeCoreAsync(token).ConfigureAwait(false); + } + else + { + isOk = await user.InitializeCoreOsAsync(token).ConfigureAwait(false); + } if (!isOk) { @@ -141,6 +152,34 @@ internal sealed class User : ObservableObject } } + /// + /// 创建并初始化国际服用户（临时） + /// + /// cookie + /// 取消令牌 + /// 用户 + internal static async Task CreateOsUserAsync(Cookie cookie, CancellationToken token = default) + { + // 这里只负责创建实体用户，稍后在用户服务中保存到数据库 + EntityUser entity = EntityUser.CreateOs(cookie); + + // 临时使用 ltuid 代替 aid 与 mid + entity.Aid = cookie.GetValueOrDefault(Cookie.LTUID); + entity.Mid = cookie.GetValueOrDefault(Cookie.LTUID); + + if (entity.Aid != null && entity.Mid != null) + { + User user = new(entity); + bool initialized = await user.InitializeCoreOsAsync(token).ConfigureAwait(false); + + return initialized ? user : null; + } + else + { + return null; + } + } + private async Task InitializeCoreAsync(CancellationToken token = default) { if (isInitialized) @@ -234,4 +273,49 @@ internal sealed class User : ObservableObject return UserInfo != null && UserGameRoles.Any(); } + + private async Task InitializeCoreOsAsync(CancellationToken token = default) + { + if (isInitialized) + { + return true; + } + + using (IServiceScope scope = Ioc.Default.CreateScope()) + { + // 获取账户信息 + Response response = await scope.ServiceProvider + .GetRequiredService() + .GetOsUserFullInfoAsync(Entity, token) + .ConfigureAwait(false); + UserInfo = response.Data?.UserInfo; + + // Ltoken 和 cookieToken 直接从网页或者输入获取 + if (Ltoken == null || CookieToken == null) + { + return false; + } + + // 获取游戏角色 + Response> userGameRolesResponse = await scope.ServiceProvider + .GetRequiredService() + .GetOsUserGameRolesByCookieAsync(Entity, token) + .ConfigureAwait(false); + + if (userGameRolesResponse.IsOk()) + { + UserGameRoles = userGameRolesResponse.Data.List; + } + else + { + return false; + } + } + + SelectedUserGameRole = UserGameRoles.FirstOrFirstOrDefault(role => role.IsChosen); + + isInitialized = true; + + return UserInfo != null && UserGameRoles.Any(); + } } diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Entity/User.cs b/src/Snap.Hutao/Snap.Hutao/Model/Entity/User.cs index 71d614a1..038fc354 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/User.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/User.cs @@ -3,6 +3,7 @@ using Snap.Hutao.Core.Database; using Snap.Hutao.Web.Hoyolab; +using System; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; @@ -65,4 +66,18 @@ internal sealed class User : ISelectable return new() { Stoken = stoken, Ltoken = ltoken, CookieToken = cookieToken }; } + + /// + /// 创建一个国际服用户 + /// + /// cookie + /// 新创建的用户 + public static User CreateOs(Cookie cookie) + { + // 不需要 Stoken + _ = cookie.TryGetAsLtoken(out Cookie? ltoken); + _ = cookie.TryGetAsCookieToken(out Cookie? cookieToken); + + return new() { Ltoken = ltoken, CookieToken = cookieToken }; + } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbOperation.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbOperation.cs index 68b036a9..0a47f975 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbOperation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbOperation.cs @@ -90,48 +90,72 @@ internal sealed class AvatarInfoDbOperation .ToList(); EnsureItemsAvatarIdDistinct(ref dbInfos, uid); - GameRecordClient gameRecordClient = Ioc.Default.GetRequiredService(); - Response playerInfoResponse = await gameRecordClient - .GetPlayerInfoAsync(userAndUid, token) - .ConfigureAwait(false); + Response playerInfoResponse; + Response charactersResponse; + + if (userAndUid.Uid.Region == "cn_gf01" || userAndUid.Uid.Region == "cn_qd01") + { + GameRecordClient gameRecordClient = Ioc.Default.GetRequiredService(); + playerInfoResponse = await gameRecordClient + .GetPlayerInfoAsync(userAndUid, token) + .ConfigureAwait(false); + + if (!playerInfoResponse.IsOk()) + { + return GetDbAvatarInfos(uid); + } + + charactersResponse = await gameRecordClient + .GetCharactersAsync(userAndUid, playerInfoResponse.Data, token) + .ConfigureAwait(false); + } + else + { + GameRecordClientOs gameRecordClientOs = Ioc.Default.GetRequiredService(); + playerInfoResponse = await gameRecordClientOs + .GetPlayerInfoAsync(userAndUid, token) + .ConfigureAwait(false); + + if (!playerInfoResponse.IsOk()) + { + return GetDbAvatarInfos(uid); + } + + charactersResponse = await gameRecordClientOs + .GetCharactersAsync(userAndUid, playerInfoResponse.Data, token) + .ConfigureAwait(false); + } token.ThrowIfCancellationRequested(); - if (playerInfoResponse.IsOk()) + if (charactersResponse.IsOk()) { - Response charactersResponse = await gameRecordClient - .GetCharactersAsync(userAndUid, playerInfoResponse.Data, token) - .ConfigureAwait(false); + List characters = charactersResponse.Data.Avatars; - if (charactersResponse.IsOk()) + GameRecordCharacterAvatarInfoComposer composer = Ioc.Default.GetRequiredService(); + + foreach (RecordCharacter character in characters) { - List characters = charactersResponse.Data.Avatars; - - GameRecordCharacterAvatarInfoComposer composer = Ioc.Default.GetRequiredService(); - - foreach (RecordCharacter character in characters) + if (AvatarIds.IsPlayer(character.Id)) { - if (AvatarIds.IsPlayer(character.Id)) - { - continue; - } + continue; + } - token.ThrowIfCancellationRequested(); + token.ThrowIfCancellationRequested(); - ModelAvatarInfo? entity = dbInfos.SingleOrDefault(i => i.Info.AvatarId == character.Id); + ModelAvatarInfo? entity = dbInfos.SingleOrDefault(i => i.Info.AvatarId == character.Id); - if (entity == null) - { - EnkaAvatarInfo avatarInfo = new() { AvatarId = character.Id }; - avatarInfo = await composer.ComposeAsync(avatarInfo, character).ConfigureAwait(false); - entity = ModelAvatarInfo.Create(uid, avatarInfo); - appDbContext.AvatarInfos.AddAndSave(entity); - } - else - { - entity.Info = await composer.ComposeAsync(entity.Info, character).ConfigureAwait(false); - appDbContext.AvatarInfos.UpdateAndSave(entity); - } + if (entity == null) + { + EnkaAvatarInfo avatarInfo = new() { AvatarId = character.Id }; + avatarInfo = await composer.ComposeAsync(avatarInfo, character).ConfigureAwait(false); + entity = ModelAvatarInfo.Create(uid, avatarInfo); + appDbContext.AvatarInfos.AddAndSave(entity); + } + else + { + entity.Info = await composer.ComposeAsync(entity.Info, character).ConfigureAwait(false); + appDbContext.AvatarInfos.UpdateAndSave(entity); } } } diff --git a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs index 3add8387..37fca642 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs @@ -12,6 +12,7 @@ using Snap.Hutao.Model.Entity.Database; using Snap.Hutao.Service.Abstraction; using Snap.Hutao.Service.Game; using Snap.Hutao.Service.User; +using Snap.Hutao.Web.Hoyolab; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord; using System.Collections.ObjectModel; using WebDailyNote = Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.DailyNote.DailyNote; @@ -61,14 +62,27 @@ internal sealed class DailyNoteService : IDailyNoteService, IRecipient(); GameRecordClient gameRecordClient = scope.ServiceProvider.GetRequiredService(); + GameRecordClientOs gameRecordClientOs = scope.ServiceProvider.GetRequiredService(); if (!appDbContext.DailyNotes.Any(n => n.Uid == roleUid)) { DailyNoteEntry newEntry = DailyNoteEntry.Create(role); - Web.Response.Response dailyNoteResponse = await gameRecordClient + // 根据 Uid 的地区选择不同的 API + Web.Response.Response dailyNoteResponse; + PlayerUid playerUid = new(roleUid); + if (playerUid.Region == "cn_gf01" || playerUid.Region == "cn_qd01") + { + dailyNoteResponse = await gameRecordClient .GetDailyNoteAsync(role) .ConfigureAwait(false); + } + else + { + dailyNoteResponse = await gameRecordClientOs + .GetDailyNoteAsync(role) + .ConfigureAwait(false); + } if (dailyNoteResponse.IsOk()) { @@ -110,11 +124,13 @@ internal sealed class DailyNoteService : IDailyNoteService, IRecipient(); GameRecordClient gameRecordClient = scope.ServiceProvider.GetRequiredService(); + GameRecordClientOs gameRecordClientOs = scope.ServiceProvider.GetRequiredService(); bool isSilentMode = appDbContext.Settings .SingleOrAdd(SettingEntry.DailyNoteSilentWhenPlayingGame, Core.StringLiterals.False) .GetBoolean(); bool isGameRunning = scope.ServiceProvider.GetRequiredService().IsGameRunning(); + if (isSilentMode && isGameRunning) { // Prevent notify when we are in game && silent mode. @@ -123,9 +139,20 @@ internal sealed class DailyNoteService : IDailyNoteService, IRecipient n.User)) { - Web.Response.Response dailyNoteResponse = await gameRecordClient + Web.Response.Response dailyNoteResponse; + PlayerUid playerUid = new(entry.Uid); + if (playerUid.Region == "cn_gf01" || playerUid.Region == "cn_qd01") + { + dailyNoteResponse = await gameRecordClient .GetDailyNoteAsync(new(entry.User, entry.Uid)) .ConfigureAwait(false); + } + else + { + dailyNoteResponse = await gameRecordClientOs + .GetDailyNoteAsync(new(entry.User, entry.Uid)) + .ConfigureAwait(false); + } if (dailyNoteResponse.ReturnCode == 0) { diff --git a/src/Snap.Hutao/Snap.Hutao/Service/SpiralAbyss/SpiralAbyssRecordService.cs b/src/Snap.Hutao/Snap.Hutao/Service/SpiralAbyss/SpiralAbyssRecordService.cs index 45365467..f2fd9c83 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/SpiralAbyss/SpiralAbyssRecordService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/SpiralAbyss/SpiralAbyssRecordService.cs @@ -21,6 +21,7 @@ internal class SpiralAbyssRecordService : ISpiralAbyssRecordService { private readonly AppDbContext appDbContext; private readonly GameRecordClient gameRecordClient; + private readonly GameRecordClientOs gameRecordClientOs; private string? uid; private ObservableCollection? spiralAbysses; @@ -30,10 +31,11 @@ internal class SpiralAbyssRecordService : ISpiralAbyssRecordService /// /// 数据库上下文 /// 游戏记录客户端 - public SpiralAbyssRecordService(AppDbContext appDbContext, GameRecordClient gameRecordClient) + public SpiralAbyssRecordService(AppDbContext appDbContext, GameRecordClient gameRecordClient, GameRecordClientOs gameRecordClientOs) { this.appDbContext = appDbContext; this.gameRecordClient = gameRecordClient; + this.gameRecordClientOs = gameRecordClientOs; } /// @@ -70,9 +72,21 @@ internal class SpiralAbyssRecordService : ISpiralAbyssRecordService private async Task RefreshSpiralAbyssCoreAsync(UserAndUid userAndUid, SpiralAbyssSchedule schedule) { - Response response = await gameRecordClient + Response response; + + // server determination + if (userAndUid.Uid.Region == "cn_gf01" || userAndUid.Uid.Region == "cn_qd01") + { + response = await gameRecordClient .GetSpiralAbyssAsync(userAndUid, schedule) .ConfigureAwait(false); + } + else + { + response = await gameRecordClientOs + .GetSpiralAbyssAsync(userAndUid, schedule) + .ConfigureAwait(false); + } if (response.IsOk()) { diff --git a/src/Snap.Hutao/Snap.Hutao/Service/User/IUserService.cs b/src/Snap.Hutao/Snap.Hutao/Service/User/IUserService.cs index 8546d4a8..e24c9d5a 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/User/IUserService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/User/IUserService.cs @@ -48,6 +48,13 @@ internal interface IUserService /// 处理的结果 Task> ProcessInputCookieAsync(Cookie cookie); + /// + /// 尝试异步处理国际服 Cookie + /// + /// 来自网页 www.hoyolab.com 的 Cookie，需包含 ltuid, ltoken 和 cookie_token 字段 + /// 处理的结果 + Task> ProcessInputOsCookieAsync(Cookie cookie); + /// /// 异步刷新 Cookie 的 CookieToken /// diff --git a/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs b/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs index 8d2ebc24..4c08593e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs @@ -225,7 +225,46 @@ internal class UserService : IUserService } else { - return await TryCreateUserAndAddAsync(cookie).ConfigureAwait(false); + return await TryCreateUserAndAddAsync(cookie, false).ConfigureAwait(false); + } + } + + /// + public async Task> ProcessInputOsCookieAsync(Cookie cookie) + { + await ThreadHelper.SwitchToBackgroundAsync(); + string? ltuid = cookie.GetValueOrDefault(Cookie.LTUID); + + if (ltuid == null) + { + return new(UserOptionResult.Invalid, SH.ServiceUserProcessCookieNoMid); + } + + // 检查 ltuid 对应用户是否存在 + if (TryGetUser(userCollection!, ltuid, out BindingUser? user)) + { + using (IServiceScope scope = scopeFactory.CreateScope()) + { + AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService(); + + if (cookie.TryGetAsLtoken(out Cookie? ltoken)) + { + user.Stoken = null; + user.Ltoken = user.Ltoken; + user.CookieToken = cookie.TryGetAsCookieToken(out Cookie? cookieToken) ? cookieToken : user.CookieToken; + + await appDbContext.Users.UpdateAndSaveAsync(user.Entity).ConfigureAwait(false); + return new(UserOptionResult.Updated, ltuid); + } + else + { + return new(UserOptionResult.Invalid, SH.ServiceUserProcessCookieNoStoken); + } + } + } + else + { + return await TryCreateUserAndAddAsync(cookie, true).ConfigureAwait(false); } } @@ -265,14 +304,24 @@ internal class UserService : IUserService return user != null; } - private async Task> TryCreateUserAndAddAsync(Cookie cookie) + private async Task> TryCreateUserAndAddAsync(Cookie cookie, bool isOversea) { await ThreadHelper.SwitchToBackgroundAsync(); using (IServiceScope scope = scopeFactory.CreateScope()) { AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService(); + BindingUser? newUser; + + // 判断是否为国际服 + if (isOversea) + { + newUser = await BindingUser.CreateOsUserAsync(cookie).ConfigureAwait(false); + } + else + { + newUser = await BindingUser.CreateAsync(cookie).ConfigureAwait(false); + } - BindingUser? newUser = await BindingUser.CreateAsync(cookie).ConfigureAwait(false); if (newUser != null) { // Sync cache diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml new file mode 100644 index 00000000..a6031a73 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml @@ -0,0 +1,31 @@ + + + + + + + + +