RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add retry/error handling logic

This commit is contained in:
Dean Herbert 2020-10-22 15:27:04 +09:00
parent 96049c39c9
commit 2021945a8c
1 changed files with 59 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
osu.Game/Online/Spectator/SpectatorStreamingClient.cs
View File

@ -22,6 +22,8 @@ public class SpectatorStreamingClient : Component, ISpectatorClient
private readonly IBindable<APIState> apiState = new Bindable<APIState>();
private bool isConnected;
[Resolved]
private IAPIProvider api { get; set; }
@ -46,7 +48,7 @@ private void apiStateChanged(ValueChangedEvent<APIState> state)
break;
case APIState.Online:
connect();
Task.Run(connect);
break;
}
}
@ -57,8 +59,11 @@ private void apiStateChanged(ValueChangedEvent<APIState> state)
private const string endpoint = "https://spectator.ppy.sh/spectator";
#endif
private void connect()
private async Task connect()
{
if (connection != null)
return;
connection = new HubConnectionBuilder()
.WithUrl(endpoint, options =>
{
@ -72,7 +77,33 @@ private void connect()
connection.On<string, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
connection.On<string, int>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
connection.StartAsync();
connection.Closed += async ex =>
{
isConnected = false;
if (ex != null) await tryUntilConnected();
};
await tryUntilConnected();
async Task tryUntilConnected()
{
while (api.State.Value == APIState.Online)
{
try
{
// reconnect on any failure
await connection.StartAsync();
// success
isConnected = true;
break;
}
catch
{
await Task.Delay(5000);
}
}
}
}
Task ISpectatorClient.UserBeganPlaying(string userId, int beatmapId)
@ -106,17 +137,37 @@ Task ISpectatorClient.UserFinishedPlaying(string userId, int beatmapId)
Task ISpectatorClient.UserSentFrames(string userId, FrameDataBundle data)
{
Console.WriteLine($"{connection.ConnectionId} Received frames from {userId}: {data.Frames.First().ToString()}");
Console.WriteLine($"{connection.ConnectionId} Received frames from {userId}: {data.Frames.First()}");
return Task.CompletedTask;
}
public Task BeginPlaying(int beatmapId) => connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), beatmapId);
public void BeginPlaying(int beatmapId)
{
if (!isConnected) return;
public Task SendFrames(FrameDataBundle data) => connection.SendAsync(nameof(ISpectatorServer.SendFrameData), data);
connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), beatmapId);
}
public Task EndPlaying(int beatmapId) => connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), beatmapId);
public void SendFrames(FrameDataBundle data)
{
if (!isConnected) return;
private Task WatchUser(string userId) => connection.SendAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
connection.SendAsync(nameof(ISpectatorServer.SendFrameData), data);
}
public void EndPlaying(int beatmapId)
{
if (!isConnected) return;
connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), beatmapId);
}
public void WatchUser(string userId)
{
if (!isConnected) return;
connection.SendAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
}
public void HandleFrame(ReplayFrame frame)
{