Fun/Snap.Hutao
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.git synced 2025-11-19 21:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use seperated js interface for hoyolab check-in

Browse Source
This commit is contained in:
Xhichn
2023-04-19 18:23:45 +08:00
parent a5fcfca609
commit b5371a9656
7 changed files with 65 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Snap.Hutao/Snap.Hutao/View/Dialog/AdoptCalculatorDialog.xaml.cs
View File

@@ -49,7 +49,7 @@ internal sealed partial class AdoptCalculatorDialog : ContentDialog
}
coreWebView2.SetCookie(user.CookieToken, user.LToken, null).SetMobileUserAgent();
jsInterface = new(coreWebView2, scope.ServiceProvider, false);
jsInterface = new(coreWebView2, scope.ServiceProvider);
jsInterface.ClosePageRequested += OnClosePageRequested;
coreWebView2.Navigate($"http://webstatic.mihoyo.com/ys/event/e20200923adopt_calculator/index.html?bbs_presentation_style=fullscreen&bbs_auth_required=true&&utm_source=bbs&utm_medium=mys&utm_campaign=GameRecord");

2
src/Snap.Hutao/Snap.Hutao/View/Dialog/CommunityGameRecordDialog.xaml.cs
View File

@@ -47,7 +47,7 @@ internal sealed partial class CommunityGameRecordDialog : ContentDialog
}
coreWebView2.SetCookie(user.CookieToken, user.LToken, null).SetMobileUserAgent();
jsInterface = new(coreWebView2, scope.ServiceProvider, false);
jsInterface = new(coreWebView2, scope.ServiceProvider);
jsInterface.ClosePageRequested += OnClosePageRequested;
coreWebView2.Navigate("https://webstatic.mihoyo.com/app/community-game-records/index.html");

2
src/Snap.Hutao/Snap.Hutao/View/Dialog/DailyNoteVerificationDialog.xaml.cs
View File

@@ -45,7 +45,7 @@ internal sealed partial class DailyNoteVerificationDialog : ContentDialog
Model.Entity.User user = userAndUid.User;
coreWebView2.SetCookie(user.CookieToken, user.LToken, null).SetMobileUserAgent();
jsInterface = new(coreWebView2, scope.ServiceProvider, false);
jsInterface = new(coreWebView2, scope.ServiceProvider);
jsInterface.ClosePageRequested += OnClosePageRequested;
string query = $"?role_id={userAndUid.Uid.Value}&server={userAndUid.Uid.Region}";

6
src/Snap.Hutao/Snap.Hutao/View/Dialog/SignInWebViewDialog.xaml.cs
View File

@@ -17,7 +17,7 @@ internal sealed partial class SignInWebViewDialog : ContentDialog
{
private readonly IServiceScope scope;
[SuppressMessage("", "IDE0052")]
private SignInJsInterface? signInJsInterface;
private MiHoYoJSInterface? signInJsInterface;
/// <summary>
/// 构造一个新的签到网页视图对话框
@@ -49,13 +49,13 @@ internal sealed partial class SignInWebViewDialog : ContentDialog
if (user.Entity.IsOversea)
{
coreWebView2.SetCookie(user.CookieToken, user.LToken, null, true).SetMobileOverseaUserAgent();
signInJsInterface = new(coreWebView2, scope.ServiceProvider, true);
signInJsInterface = new SignInJSInterfaceOversea(coreWebView2, scope.ServiceProvider);
coreWebView2.Navigate("https://act.hoyolab.com/ys/event/signin-sea-v3/index.html?act_id=e202102251931481");
}
else
{
coreWebView2.SetCookie(user.CookieToken, user.LToken, null, false).SetMobileUserAgent();
signInJsInterface = new(coreWebView2, scope.ServiceProvider, false);
signInJsInterface = new SignInJsInterface(coreWebView2, scope.ServiceProvider);
coreWebView2.Navigate("https://webstatic.mihoyo.com/bbs/event/signin-ys/index.html?act_id=e202009291139501");
}
}

47
src/Snap.Hutao/Snap.Hutao/Web/Bridge/MiHoYoJSInterface.cs
View File

@@ -36,11 +36,6 @@ internal class MiHoYoJSInterface
document.querySelector('body').appendChild(st);
""";
private const string RemoveRotationWarningScript = """
let landscape = document.getElementById('mihoyo_landscape');
landscape.remove();
""";
private readonly CoreWebView2 webView;
private readonly IServiceProvider serviceProvider;
private readonly ILogger<MiHoYoJSInterface> logger;
@@ -51,12 +46,10 @@ internal class MiHoYoJSInterface
/// </summary>
/// <param name="webView">webview2</param>
/// <param name="serviceProvider">服务提供器</param>
/// <param name="isOversea">是否为 HoYoVerse 账号</param>
public MiHoYoJSInterface(CoreWebView2 webView, IServiceProvider serviceProvider, bool isOversea)
public MiHoYoJSInterface(CoreWebView2 webView, IServiceProvider serviceProvider)
{
this.webView = webView;
this.serviceProvider = serviceProvider;
IsOversea = isOversea;
logger = serviceProvider.GetRequiredService<ILogger<MiHoYoJSInterface>>();
@@ -65,14 +58,8 @@ internal class MiHoYoJSInterface
webView.NavigationStarting += OnNavigationStarting;
}
public event Action? ClosePageRequested;
/// <summary>
/// 是否为 HoYoVerse 账号
/// </summary>
public bool IsOversea { get; private set; }
/// <summary>
/// 获取ActionTicket
/// </summary>
@@ -81,20 +68,10 @@ internal class MiHoYoJSInterface
public virtual async Task<IJsResult?> GetActionTicketAsync(JsParam<ActionTypePayload> jsParam)
{
User user = serviceProvider.GetRequiredService<IUserService>().Current!;
if (IsOversea)
{
// TODO: ActionTicket for hoyolab account
return null;
}
else
{
return await serviceProvider
.GetRequiredService<AuthClient>()
.GetActionTicketBySTokenAsync(jsParam.Payload!.ActionType, user.Entity)
.ConfigureAwait(false);
}
return await serviceProvider
.GetRequiredService<AuthClient>()
.GetActionTicketBySTokenAsync(jsParam.Payload!.ActionType, user.Entity)
.ConfigureAwait(false);
}
/// <summary>
@@ -110,7 +87,7 @@ internal class MiHoYoJSInterface
{
{ "x-rpc-client_type", "5" },
{ "x-rpc-device_id", Core.CoreEnvironment.HoyolabDeviceId },
{ "x-rpc-app_version", IsOversea ? Core.CoreEnvironment.HoyolabOsXrpcVersion : Core.CoreEnvironment.HoyolabXrpcVersion },
{ "x-rpc-app_version", Core.CoreEnvironment.HoyolabXrpcVersion },
},
};
}
@@ -285,11 +262,12 @@ internal class MiHoYoJSInterface
/// <returns>语言与时区</returns>
public virtual JsResult<Dictionary<string, string>> GetCurrentLocale(JsParam<PushPagePayload> param)
{
string cultureName = CultureInfo.CurrentCulture.Name;
return new()
{
Data = new()
{
["language"] = CultureInfo.CurrentUICulture.Name,
["language"] = cultureName.ToLowerInvariant(),
["timeZone"] = "GMT+8",
},
};
@@ -434,17 +412,12 @@ internal class MiHoYoJSInterface
private void OnDOMContentLoaded(CoreWebView2 coreWebView2, CoreWebView2DOMContentLoadedEventArgs args)
{
coreWebView2.ExecuteScriptAsync(HideScrollBarScript).AsTask().SafeForget(logger);
// 移除“请旋转手机”提示所在的HTML元素
if (IsOversea)
{
coreWebView2.ExecuteScriptAsync(RemoveRotationWarningScript).AsTask().SafeForget(logger);
}
}
private void OnNavigationStarting(CoreWebView2 coreWebView2, CoreWebView2NavigationStartingEventArgs args)
{
if (new Uri(args.Uri).Host.EndsWith(IsOversea ? "hoyolab.com" : "mihoyo.com"))
string uriHost = new Uri(args.Uri).Host;
if (uriHost.EndsWith("mihoyo.com") || uriHost.EndsWith("hoyolab.com"))
{
// Execute this solve issue: When open same site second time,there might be no bridge init.
coreWebView2.AddScriptToExecuteOnDocumentCreatedAsync(InitializeJsInterfaceScript2).AsTask().SafeForget(logger);

46
src/Snap.Hutao/Snap.Hutao/Web/Bridge/SignInJSInterfaceOversea.cs Normal file
View File

@@ -0,0 +1,46 @@
using Microsoft.Web.WebView2.Core;
using Snap.Hutao.Web.Bridge.Model;
namespace Snap.Hutao.Web.Bridge;
/// <summary>
/// HoYoLAB 签到页面JS桥
/// </summary>
[HighQuality]
internal sealed class SignInJSInterfaceOversea : MiHoYoJSInterface
{
private const string RemoveRotationWarningScript = """
let landscape = document.getElementById('mihoyo_landscape');
landscape.remove();
""";
private readonly ILogger<MiHoYoJSInterface> logger;
/// <inheritdoc cref="MiHoYoJSInterface(CoreWebView2, IServiceProvider)"/>
public SignInJSInterfaceOversea(CoreWebView2 webView, IServiceProvider serviceProvider)
: base(webView, serviceProvider)
{
logger = serviceProvider.GetRequiredService<ILogger<MiHoYoJSInterface>>();
webView.DOMContentLoaded += OnDOMContentLoaded;
}
/// <inheritdoc/>
public override JsResult<Dictionary<string, string>> GetHttpRequestHeader(JsParam param)
{
return new()
{
Data = new Dictionary<string, string>()
{
{ "x-rpc-client_type", "2" },
{ "x-rpc-device_id", Core.CoreEnvironment.HoyolabDeviceId },
{ "x-rpc-app_version", Core.CoreEnvironment.HoyolabOsXrpcVersion },
},
};
}
private void OnDOMContentLoaded(CoreWebView2 coreWebView2, CoreWebView2DOMContentLoadedEventArgs args)
{
// 移除“请旋转手机”提示所在的HTML元素
coreWebView2.ExecuteScriptAsync(RemoveRotationWarningScript).AsTask().SafeForget(logger);
}
}

6
src/Snap.Hutao/Snap.Hutao/Web/Bridge/SignInJsInterface.cs
View File

@@ -13,8 +13,8 @@ namespace Snap.Hutao.Web.Bridge;
internal sealed class SignInJsInterface : MiHoYoJSInterface
{
/// <inheritdoc cref="MiHoYoJSInterface(CoreWebView2, IServiceProvider)"/>
public SignInJsInterface(CoreWebView2 webView, IServiceProvider serviceProvider, bool isOversea)
: base(webView, serviceProvider, isOversea)
public SignInJsInterface(CoreWebView2 webView, IServiceProvider serviceProvider)
: base(webView, serviceProvider)
{
}
@@ -27,7 +27,7 @@ internal sealed class SignInJsInterface : MiHoYoJSInterface
{
{ "x-rpc-client_type", "2" },
{ "x-rpc-device_id", Core.CoreEnvironment.HoyolabDeviceId },
{ "x-rpc-app_version", IsOversea ? Core.CoreEnvironment.HoyolabOsXrpcVersion : Core.CoreEnvironment.HoyolabXrpcVersion },
{ "x-rpc-app_version", Core.CoreEnvironment.HoyolabXrpcVersion },
},
};
}