mirror of
https://github.com/ppy/osu.git
synced 2024-11-16 10:17:36 +08:00
4126dcbe28
Closes https://github.com/ppy/osu/issues/26835. I must have not re-tested this correctly after all the refactors... Basically the issue is that the websocket connection would only come online when the API state changed to full `Online`. In particular the connector would not attempt to connect when the API state was `RequiresSecondFactorAuth`, giving the link-based flow no chance to actually work. The change in `WebSocketNotificationsClientConnector` is relevant in that queueing requests does nothing before the API state changes to full `Online`. It also cleans up things a bit code-wise so... win? And yes, this means that the _other_ `PersistentEndpointClientConnector` implementations (i.e. SignalR connectors) will also come online earlier after this. Based on previous discussions (https://github.com/ppy/osu/pull/25480#discussion_r1395566545) I think this is fine, but if it is _not_ fine, then it can be fixed by exposing a virtual that lets a connector to decide when to come alive, I guess.
58 lines
2.2 KiB
C#
58 lines
2.2 KiB
C#
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
// See the LICENCE file in the repository root for full licence text.
|
|
|
|
using System;
|
|
using System.Net;
|
|
using System.Net.WebSockets;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using osu.Game.Online.API;
|
|
using osu.Game.Online.API.Requests;
|
|
|
|
namespace osu.Game.Online.Notifications.WebSocket
|
|
{
|
|
/// <summary>
|
|
/// A connector for <see cref="WebSocketNotificationsClient"/>s that receive events via a websocket.
|
|
/// </summary>
|
|
public class WebSocketNotificationsClientConnector : PersistentEndpointClientConnector, INotificationsClient
|
|
{
|
|
public event Action<SocketMessage>? MessageReceived;
|
|
|
|
private readonly IAPIProvider api;
|
|
|
|
public WebSocketNotificationsClientConnector(IAPIProvider api)
|
|
: base(api)
|
|
{
|
|
this.api = api;
|
|
Start();
|
|
}
|
|
|
|
protected override async Task<PersistentEndpointClient> BuildConnectionAsync(CancellationToken cancellationToken)
|
|
{
|
|
var req = new GetNotificationsRequest();
|
|
// must use `PerformAsync()`, since we may not be fully online yet
|
|
// (see `APIState.RequiresSecondFactorAuth` - in this state queued requests will not execute).
|
|
await api.PerformAsync(req).ConfigureAwait(false);
|
|
string endpoint = req.Response!.Endpoint;
|
|
|
|
ClientWebSocket socket = new ClientWebSocket();
|
|
socket.Options.SetRequestHeader(@"Authorization", @$"Bearer {api.AccessToken}");
|
|
socket.Options.Proxy = WebRequest.DefaultWebProxy;
|
|
if (socket.Options.Proxy != null)
|
|
socket.Options.Proxy.Credentials = CredentialCache.DefaultCredentials;
|
|
|
|
var client = new WebSocketNotificationsClient(socket, endpoint);
|
|
client.MessageReceived += msg => MessageReceived?.Invoke(msg);
|
|
return client;
|
|
}
|
|
|
|
public Task SendAsync(SocketMessage message, CancellationToken? cancellationToken = default)
|
|
{
|
|
if (CurrentConnection is not WebSocketNotificationsClient webSocketClient)
|
|
return Task.CompletedTask;
|
|
|
|
return webSocketClient.SendAsync(message, cancellationToken);
|
|
}
|
|
}
|
|
}
|