sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-multiplayer-client-connection-reliability

Browse Source
This commit is contained in:
Dean Herbert
2021-02-05 14:04:57 +09:00
parent 4d4d97661e daece0104c
commit cd67fe1091
116 changed files with 2708 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game/Online/Multiplayer/MultiplayerClient.cs
View File

@ -9,10 +9,10 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.SignalR.Client;
using Microsoft.Extensions.DependencyInjection;
using Newtonsoft.Json;
using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Logging;
using osu.Game.Extensions;
using osu.Game.Online.API;
using osu.Game.Online.Rooms;
@ -54,11 +54,11 @@ namespace osu.Game.Online.Multiplayer
{
case APIState.Failing:
case APIState.Offline:
Task.Run(() => disconnect(true)).CatchUnobservedExceptions();
Task.Run(() => disconnect(true));
break;
case APIState.Online:
Task.Run(connect).CatchUnobservedExceptions();
Task.Run(connect);
break;
}
}
@ -69,6 +69,20 @@ namespace osu.Game.Online.Multiplayer
await connectionLock.WaitAsync(10000);
var builder = new HubConnectionBuilder()
.WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
if (RuntimeInfo.SupportsJIT)
builder.AddMessagePackProtocol();
else
{
// eventually we will precompile resolvers for messagepack, but this isn't working currently
// see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
}
connection = builder.Build();
try
{
while (api.State.Value == APIState.Online)
@ -233,7 +247,7 @@ namespace osu.Game.Online.Multiplayer
// make sure a disconnect wasn't triggered (and this is still the active connection).
if (!cancellationToken.IsCancellationRequested)
Task.Run(connect, default).CatchUnobservedExceptions();
Task.Run(connect, default);
return Task.CompletedTask;
};