simplifying LobbyServiceFacade delete, leaveLobby and reconnect method calls

Author: LPLafontaineB

Assets/Scripts/ConnectionManagement/ConnectionState/ClientConnectingState.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Threading.Tasks;
-using Unity.BossRoom.UnityServices.Lobbies;
 using Unity.Multiplayer.Samples.Utilities;
 using UnityEngine;
-using VContainer;
 
 namespace Unity.BossRoom.ConnectionManagement
 {
@@ -13,10 +11,6 @@ namespace Unity.BossRoom.ConnectionManagement
     /// </summary>
     class ClientConnectingState : OnlineState
     {
-        [Inject]
-        protected LobbyServiceFacade m_LobbyServiceFacade;
-        [Inject]
-        protected LocalLobby m_LocalLobby;
         ConnectionMethodBase m_ConnectionMethod;
 
         public ClientConnectingState Configure(ConnectionMethodBase baseConnectionMethod)

Assets/Scripts/ConnectionManagement/ConnectionState/ClientReconnectingState.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using Unity.BossRoom.Infrastructure;
+using Unity.BossRoom.UnityServices.Lobbies;
 using UnityEngine;
 using VContainer;
 
@@ -15,19 +16,19 @@ namespace Unity.BossRoom.ConnectionManagement
     /// </summary>
     class ClientReconnectingState : ClientConnectingState
     {
+        [Inject]
+        LobbyServiceFacade m_LobbyServiceFacade;
         [Inject]
         IPublisher<ReconnectMessage> m_ReconnectMessagePublisher;
 
         Coroutine m_ReconnectCoroutine;
-        string m_LobbyCode = "";
         int m_NbAttempts;
 
         const float k_TimeBetweenAttempts = 5;
 
         public override void Enter()
         {
             m_NbAttempts = 0;
-            m_LobbyCode = m_LobbyServiceFacade.CurrentUnityLobby != null ? m_LobbyServiceFacade.CurrentUnityLobby.LobbyCode : "";
             m_ReconnectCoroutine = m_ConnectionManager.StartCoroutine(ReconnectCoroutine());
         }
 
@@ -108,14 +109,14 @@ IEnumerator ReconnectCoroutine()
             Debug.Log($"Reconnecting attempt {m_NbAttempts + 1}/{m_ConnectionManager.NbReconnectAttempts}...");
             m_ReconnectMessagePublisher.Publish(new ReconnectMessage(m_NbAttempts, m_ConnectionManager.NbReconnectAttempts));
             m_NbAttempts++;
-            if (!string.IsNullOrEmpty(m_LobbyCode)) // Attempting to reconnect to lobby.
+            if (m_LobbyServiceFacade.CurrentUnityLobby != null) // Attempting to reconnect to lobby.
             {
                 // When using Lobby with Relay, if a user is disconnected from the Relay server, the server will notify
                 // the Lobby service and mark the user as disconnected, but will not remove them from the lobby. They
                 // then have some time to attempt to reconnect (defined by the "Disconnect removal time" parameter on
                 // the dashboard), after which they will be removed from the lobby completely.
                 // See https://docs.unity.com/lobby/reconnect-to-lobby.html
-                var reconnectingToLobby = m_LobbyServiceFacade.ReconnectToLobbyAsync(m_LocalLobby?.LobbyID);
+                var reconnectingToLobby = m_LobbyServiceFacade.ReconnectToLobbyAsync();
                 yield return new WaitUntil(() => reconnectingToLobby.IsCompleted);
 
                 // If succeeded, attempt to connect to Relay

Assets/Scripts/UnityServices/Lobbies/LobbyServiceFacade.cs

@@ -84,34 +84,31 @@ public void BeginTracking()
             }
         }
 
-        public Task EndTracking()
+        public async void EndTracking()
         {
-            var task = Task.CompletedTask;
             if (CurrentUnityLobby != null)
             {
-                var lobbyId = m_LocalLobby?.LobbyID;
-
-                if (!string.IsNullOrEmpty(lobbyId))
+                if (m_LocalUser.IsHost)
                 {
-                    if (m_LocalUser.IsHost)
-                    {
-                        task = DeleteLobbyAsync(lobbyId);
-                    }
-                    else
-                    {
-                        task = LeaveLobbyAsync(lobbyId);
-                    }
+                    await DeleteLobbyAsync();
                 }
+                else
+                {
+                    await LeaveLobbyAsync();
+                }
+            }
+
+            if (m_LobbyEvents != null)
+            {
+                await m_LobbyEvents.UnsubscribeAsync();
             }
 
-            m_LobbyEvents?.UnsubscribeAsync();
             if (m_IsTracking)
             {
                 m_IsTracking = false;
                 m_HeartbeatTime = 0;
                 m_JoinedLobbyContentHeartbeat.EndTracking();
             }
-            return task;
         }
 
         /// <summary>
@@ -225,7 +222,7 @@ void ResetLobby()
             // no need to disconnect Netcode, it should already be handled by Netcode's callback to disconnect
         }
 
-        async void OnLobbyChanges(ILobbyChanges changes)
+        void OnLobbyChanges(ILobbyChanges changes)
         {
             if (changes.LobbyDeleted)
             {
@@ -250,21 +247,20 @@ async void OnLobbyChanges(ILobbyChanges changes)
                     }
 
                     m_UnityServiceErrorMessagePub.Publish(new UnityServiceErrorMessage("Host left the lobby", "Disconnecting.", UnityServiceErrorMessage.Service.Lobby));
-                    await EndTracking();
-
+                    EndTracking();
                     // no need to disconnect Netcode, it should already be handled by Netcode's callback to disconnect
                 }
             }
         }
 
         void OnKickedFromLobby()
         {
-            throw new NotImplementedException();
+            Debug.Log("Kicked from Lobby");
+            ResetLobby();
         }
 
         void OnLobbyEventConnectionStateChanged(LobbyEventConnectionState lobbyEventConnectionState)
         {
-
             Debug.Log($"LobbyEventConnectionState changed to {lobbyEventConnectionState}");
         }
 
@@ -307,11 +303,11 @@ public async Task RetrieveAndPublishLobbyListAsync()
             }
         }
 
-        public async Task<Lobby> ReconnectToLobbyAsync(string lobbyId)
+        public async Task<Lobby> ReconnectToLobbyAsync()
         {
             try
             {
-                return await m_LobbyApiInterface.ReconnectToLobby(lobbyId);
+                return await m_LobbyApiInterface.ReconnectToLobby(m_LocalLobby.LobbyID);
             }
             catch (LobbyServiceException e)
             {
@@ -328,12 +324,12 @@ public async Task<Lobby> ReconnectToLobbyAsync(string lobbyId)
         /// <summary>
         /// Attempt to leave a lobby
         /// </summary>
-        public async Task LeaveLobbyAsync(string lobbyId)
+        public async Task LeaveLobbyAsync()
         {
             string uasId = AuthenticationService.Instance.PlayerId;
             try
             {
-                await m_LobbyApiInterface.RemovePlayerFromLobby(uasId, lobbyId);
+                await m_LobbyApiInterface.RemovePlayerFromLobby(uasId, m_LocalLobby.LobbyID);
                 ResetLobby();
             }
             catch (LobbyServiceException e)
@@ -366,13 +362,13 @@ public async void RemovePlayerFromLobbyAsync(string uasId, string lobbyId)
             }
         }
 
-        public async Task DeleteLobbyAsync(string lobbyId)
+        public async Task DeleteLobbyAsync()
         {
             if (m_LocalUser.IsHost)
             {
                 try
                 {
-                    await m_LobbyApiInterface.DeleteLobby(lobbyId);
+                    await m_LobbyApiInterface.DeleteLobby(m_LocalLobby.LobbyID);
                     ResetLobby();
                 }
                 catch (LobbyServiceException e)