Added connection to relay server on reconnect when using relay

Author: LPLafontaineB

Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/ClientGameNetPortal.cs

@@ -18,6 +18,8 @@ public class ClientGameNetPortal : MonoBehaviour
         public static ClientGameNetPortal Instance;
         private GameNetPortal m_Portal;
         Coroutine m_TryToReconnectCoroutine;
+        string m_JoinCode;
+        OnlineMode m_OnlineMode;
 
         /// <summary>
         /// If a disconnect occurred this will be populated with any contextual information that was available to explain why.
@@ -173,7 +175,7 @@ private IEnumerator TryToReconnect()
                 NetworkManager.Singleton.Shutdown();
                 yield return new WaitWhile(() => NetworkManager.Singleton.ShutdownInProgress); // wait until NetworkManager completes shutting down
                 Debug.Log($"Reconnecting attempt {nbTries + 1}/3...");
-                ConnectClient();
+                ConnectClient(null);
                 yield return new WaitForSeconds(1.1f * k_TimeoutDuration); // wait a bit longer than the timeout duration to make sure we have enough time to stop this coroutine if successful
                 nbTries++;
             }
@@ -200,11 +202,11 @@ private IEnumerator TryToReconnect()
         /// This method must be static because, when it is invoked, the client still doesn't know it's a client yet, and in particular, GameNetPortal hasn't
         /// yet initialized its client and server GNP-Logic objects yet (which it does in OnNetworkSpawn, based on the role that the current player is performing).
         /// </remarks>
-        /// <param name="portal"> </param>
         /// <param name="ipaddress">the IP address of the host to connect to. (currently IPV4 only)</param>
         /// <param name="port">The port of the host to connect to. </param>
         public void StartClient(string ipaddress, int port)
         {
+            m_OnlineMode = OnlineMode.IpHost;
             var chosenTransport = NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().IpHostTransport;
             NetworkManager.Singleton.NetworkConfig.NetworkTransport = chosenTransport;
 
@@ -222,36 +224,42 @@ public void StartClient(string ipaddress, int port)
                     throw new ArgumentOutOfRangeException(nameof(chosenTransport));
             }
 
-            ConnectClient();
+            ConnectClient(null);
         }
 
-        public async void StartClientUnityRelayModeAsync(string joinCode, Action<string> onFailure)
+        public void StartClientUnityRelayModeAsync(string joinCode, Action<string> onFailure)
         {
-            var utp = (UnityTransport)NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().UnityRelayTransport;
+            m_OnlineMode = OnlineMode.UnityRelay;
+            m_JoinCode = joinCode;
+            var utp = NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().UnityRelayTransport;
             NetworkManager.Singleton.NetworkConfig.NetworkTransport = utp;
 
             Debug.Log($"Setting Unity Relay client with join code {joinCode}");
 
-            try
-            {
-                var clientRelayUtilityTask =  UnityRelayUtilities.JoinRelayServerFromJoinCode(joinCode);
-                await clientRelayUtilityTask;
-                var (ipv4Address, port, allocationIdBytes, connectionData, hostConnectionData, key) = clientRelayUtilityTask.Result;
+            ConnectClient(onFailure);
+        }
 
-                m_LobbyServiceFacade.UpdatePlayerRelayInfoAsync(allocationIdBytes.ToString(), joinCode, null, null);
-                utp.SetRelayServerData(ipv4Address, port, allocationIdBytes, key, connectionData, hostConnectionData);
-            }
-            catch (Exception e)
+        async void ConnectClient(Action<string> onFailure)
+        {
+            if (m_OnlineMode == OnlineMode.UnityRelay)
             {
-                onFailure?.Invoke(e.Message);
-                return;//not re-throwing, but still not allowing to connect
-            }
+                try
+                {
+                    var clientRelayUtilityTask =  UnityRelayUtilities.JoinRelayServerFromJoinCode(m_JoinCode);
+                    await clientRelayUtilityTask;
+                    var (ipv4Address, port, allocationIdBytes, connectionData, hostConnectionData, key) = clientRelayUtilityTask.Result;
 
-            ConnectClient();
-        }
+                    m_LobbyServiceFacade.UpdatePlayerRelayInfoAsync(allocationIdBytes.ToString(), m_JoinCode, null, null);
+                    var utp = (UnityTransport)NetworkManager.Singleton.NetworkConfig.NetworkTransport;
+                    utp.SetRelayServerData(ipv4Address, port, allocationIdBytes, key, connectionData, hostConnectionData);
+                }
+                catch (Exception e)
+                {
+                    onFailure?.Invoke(e.Message);
+                    return;//not re-throwing, but still not allowing to connect
+                }
+            }
 
-        private void ConnectClient()
-        {
             var clientGuid = ClientPrefs.GetGuid();
             var payload = JsonUtility.ToJson(new ConnectionPayload()
             {