From da7edd5d49bf25bc13fa6e722bebc436768b6603 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 17 Jul 2022 04:35:41 +0900
Subject: [PATCH] Perform actions after server reconnection

---
 osu.Game/Online/HubClientConnector.cs                | 12 ++++++------
 osu.Game/Online/IHubClientConnector.cs               |  3 ++-
 .../Online/Multiplayer/OnlineMultiplayerClient.cs    |  8 +++++++-
 osu.Game/Online/Spectator/OnlineSpectatorClient.cs   |  9 ++++++++-
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index 01f0f3a902..6bfe09e911 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -64,26 +64,26 @@ namespace osu.Game.Online
             this.preferMessagePack = preferMessagePack;
 
             apiState.BindTo(api.State);
-            apiState.BindValueChanged(_ => connectIfPossible(), true);
+            apiState.BindValueChanged(_ => Task.Run(connectIfPossible), true);
         }
 
-        public void Reconnect()
+        public Task Reconnect()
         {
             Logger.Log($"{clientName} reconnecting...", LoggingTarget.Network);
-            Task.Run(connectIfPossible);
+            return Task.Run(connectIfPossible);
         }
 
-        private void connectIfPossible()
+        private async Task connectIfPossible()
         {
             switch (apiState.Value)
             {
                 case APIState.Failing:
                 case APIState.Offline:
-                    Task.Run(() => disconnect(true));
+                    await disconnect(true);
                     break;
 
                 case APIState.Online:
-                    Task.Run(connect);
+                    await connect();
                     break;
             }
         }
diff --git a/osu.Game/Online/IHubClientConnector.cs b/osu.Game/Online/IHubClientConnector.cs
index 2afab9091b..53c4897e73 100644
--- a/osu.Game/Online/IHubClientConnector.cs
+++ b/osu.Game/Online/IHubClientConnector.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
 using osu.Framework.Bindables;
 using osu.Game.Online.API;
@@ -32,6 +33,6 @@ namespace osu.Game.Online
         /// <summary>
         /// Reconnect if already connected.
         /// </summary>
-        void Reconnect();
+        Task Reconnect();
     }
 }
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
index 4e6ea997c1..6425e3c155 100644
--- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -86,7 +86,13 @@ namespace osu.Game.Online.Multiplayer
             catch (HubException exception)
             {
                 if (exception.GetHubExceptionMessage() == HubClientConnector.SERVER_SHUTDOWN_MESSAGE)
-                    connector?.Reconnect();
+                {
+                    Debug.Assert(connector != null);
+
+                    await connector.Reconnect();
+                    return await JoinRoom(roomId, password);
+                }
+
                 throw;
             }
         }
diff --git a/osu.Game/Online/Spectator/OnlineSpectatorClient.cs b/osu.Game/Online/Spectator/OnlineSpectatorClient.cs
index 1ed7819b05..4f9e62d0a0 100644
--- a/osu.Game/Online/Spectator/OnlineSpectatorClient.cs
+++ b/osu.Game/Online/Spectator/OnlineSpectatorClient.cs
@@ -62,7 +62,14 @@ namespace osu.Game.Online.Spectator
             catch (HubException exception)
             {
                 if (exception.GetHubExceptionMessage() == HubClientConnector.SERVER_SHUTDOWN_MESSAGE)
-                    connector?.Reconnect();
+                {
+                    Debug.Assert(connector != null);
+
+                    await connector.Reconnect();
+                    await BeginPlayingInternal(state);
+                    return;
+                }
+
                 throw;
             }
         }