Moving ConnectionMethod responsibility to ConnectionManager

LPLafontaineB · LPLafontaineB · commit d5095f3834f7 · 2023-01-31T14:20:11.000-05:00
diff --git a/Assets/Scripts/ConnectionManagement/ConnectionManager.cs b/Assets/Scripts/ConnectionManagement/ConnectionManager.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Unity.BossRoom.UnityServices.Lobbies;
 using Unity.BossRoom.Utils;
 using Unity.Collections;
 using Unity.Netcode;
@@ -69,6 +70,12 @@ public class ConnectionManager : MonoBehaviour
 
         [Inject]
         IObjectResolver m_Resolver;
+        [Inject]
+        LobbyServiceFacade m_LobbyServiceFacade;
+        [Inject]
+        ProfileManager m_ProfileManager;
+        [Inject]
+        LocalLobby m_LocalLobby;
 
         public int MaxConnectedPlayers = 8;
 
@@ -79,6 +86,9 @@ public class ConnectionManager : MonoBehaviour
         internal readonly StartingHostState m_StartingHost = new StartingHostState();
         internal readonly HostingState m_Hosting = new HostingState();
 
+        ConnectionMethodBase m_ConnectionMethod;
+        public ConnectionMethodBase ConnectionMethod => m_ConnectionMethod;
+
         void Awake()
         {
             DontDestroyOnLoad(gameObject);
@@ -149,22 +159,26 @@ void OnTransportFailure()
 
         public void StartClientLobby(string playerName)
         {
-            m_CurrentState.StartClientLobby(playerName);
+            m_ConnectionMethod = new ConnectionMethodRelay(m_LobbyServiceFacade, m_LocalLobby, this, m_ProfileManager, playerName);
+            m_CurrentState.StartClient();
         }
 
         public void StartClientIp(string playerName, string ipaddress, int port)
         {
-            m_CurrentState.StartClientIP(playerName, ipaddress, port);
+            m_ConnectionMethod = new ConnectionMethodIP(ipaddress, (ushort)port, this, m_ProfileManager, playerName);
+            m_CurrentState.StartClient();
         }
 
         public void StartHostLobby(string playerName)
         {
-            m_CurrentState.StartHostLobby(playerName);
+            m_ConnectionMethod = new ConnectionMethodRelay(m_LobbyServiceFacade, m_LocalLobby, this, m_ProfileManager, playerName);
+            m_CurrentState.StartHost();
         }
 
         public void StartHostIp(string playerName, string ipaddress, int port)
         {
-            m_CurrentState.StartHostIP(playerName, ipaddress, port);
+            m_ConnectionMethod = new ConnectionMethodIP(ipaddress, (ushort)port, this, m_ProfileManager, playerName);
+            m_CurrentState.StartHost();
         }
 
         public void RequestShutdown()
diff --git a/Assets/Scripts/ConnectionManagement/ConnectionState/ClientConnectingState.cs b/Assets/Scripts/ConnectionManagement/ConnectionState/ClientConnectingState.cs
@@ -11,14 +11,6 @@ namespace Unity.BossRoom.ConnectionManagement
     /// </summary>
     class ClientConnectingState : OnlineState
     {
-        protected ConnectionMethodBase m_ConnectionMethod;
-
-        public ClientConnectingState Configure(ConnectionMethodBase baseConnectionMethod)
-        {
-            m_ConnectionMethod = baseConnectionMethod;
-            return this;
-        }
-
         public override void Enter()
         {
 #pragma warning disable 4014
@@ -61,7 +53,7 @@ internal async Task ConnectClientAsync()
             try
             {
                 // Setup NGO with current connection method
-                await m_ConnectionMethod.SetupClientConnectionAsync();
+                await m_ConnectionManager.ConnectionMethod.SetupClientConnectionAsync();
 
                 // NGO's StartClient launches everything
                 if (!m_ConnectionManager.NetworkManager.StartClient())
diff --git a/Assets/Scripts/ConnectionManagement/ConnectionState/ClientReconnectingState.cs b/Assets/Scripts/ConnectionManagement/ConnectionState/ClientReconnectingState.cs
@@ -106,7 +106,7 @@ IEnumerator ReconnectCoroutine()
             Debug.Log($"Reconnecting attempt {m_NbAttempts + 1}/{m_ConnectionManager.NbReconnectAttempts}...");
             m_ReconnectMessagePublisher.Publish(new ReconnectMessage(m_NbAttempts, m_ConnectionManager.NbReconnectAttempts));
             m_NbAttempts++;
-            var reconnectingSetupTask = m_ConnectionMethod.SetupClientReconnectionAsync();
+            var reconnectingSetupTask = m_ConnectionManager.ConnectionMethod.SetupClientReconnectionAsync();
             yield return new WaitUntil(() => reconnectingSetupTask.IsCompleted);
 
             if (!reconnectingSetupTask.IsFaulted && reconnectingSetupTask.Result.success)
diff --git a/Assets/Scripts/ConnectionManagement/ConnectionState/ConnectionState.cs b/Assets/Scripts/ConnectionManagement/ConnectionState/ConnectionState.cs
@@ -26,13 +26,9 @@ public virtual void OnClientDisconnect(ulong clientId) { }
 
         public virtual void OnServerStarted() { }
 
-        public virtual void StartClientIP(string playerName, string ipaddress, int port) { }
+        public virtual void StartClient() { }
 
-        public virtual void StartClientLobby(string playerName) { }
-
-        public virtual void StartHostIP(string playerName, string ipaddress, int port) { }
-
-        public virtual void StartHostLobby(string playerName) { }
+        public virtual void StartHost() { }
 
         public virtual void OnUserRequestedShutdown() { }
 
diff --git a/Assets/Scripts/ConnectionManagement/ConnectionState/OfflineState.cs b/Assets/Scripts/ConnectionManagement/ConnectionState/OfflineState.cs
@@ -1,7 +1,6 @@
 using System;
 using Unity.BossRoom.ConnectionManagement;
 using Unity.BossRoom.UnityServices.Lobbies;
-using Unity.BossRoom.Utils;
 using Unity.Multiplayer.Samples.Utilities;
 using UnityEngine;
 using UnityEngine.SceneManagement;
@@ -17,10 +16,6 @@ class OfflineState : ConnectionState
     {
         [Inject]
         LobbyServiceFacade m_LobbyServiceFacade;
-        [Inject]
-        ProfileManager m_ProfileManager;
-        [Inject]
-        LocalLobby m_LocalLobby;
 
         const string k_MainMenuSceneName = "MainMenu";
 
@@ -36,30 +31,14 @@ public override void Enter()
 
         public override void Exit() { }
 
-        public override void StartClientIP(string playerName, string ipaddress, int port)
-        {
-            var connectionMethod = new ConnectionMethodIP(ipaddress, (ushort)port, m_ConnectionManager, m_ProfileManager, playerName);
-            m_ConnectionManager.m_ClientReconnecting.Configure(connectionMethod);
-            m_ConnectionManager.ChangeState(m_ConnectionManager.m_ClientConnecting.Configure(connectionMethod));
-        }
-
-        public override void StartClientLobby(string playerName)
-        {
-            var connectionMethod = new ConnectionMethodRelay(m_LobbyServiceFacade, m_LocalLobby, m_ConnectionManager, m_ProfileManager, playerName);
-            m_ConnectionManager.m_ClientReconnecting.Configure(connectionMethod);
-            m_ConnectionManager.ChangeState(m_ConnectionManager.m_ClientConnecting.Configure(connectionMethod));
-        }
-
-        public override void StartHostIP(string playerName, string ipaddress, int port)
+        public override void StartClient()
         {
-            var connectionMethod = new ConnectionMethodIP(ipaddress, (ushort)port, m_ConnectionManager, m_ProfileManager, playerName);
-            m_ConnectionManager.ChangeState(m_ConnectionManager.m_StartingHost.Configure(connectionMethod));
+            m_ConnectionManager.ChangeState(m_ConnectionManager.m_ClientConnecting);
         }
 
-        public override void StartHostLobby(string playerName)
+        public override void StartHost()
         {
-            var connectionMethod = new ConnectionMethodRelay(m_LobbyServiceFacade, m_LocalLobby, m_ConnectionManager, m_ProfileManager, playerName);
-            m_ConnectionManager.ChangeState(m_ConnectionManager.m_StartingHost.Configure(connectionMethod));
+            m_ConnectionManager.ChangeState(m_ConnectionManager.m_StartingHost);
         }
     }
 }
diff --git a/Assets/Scripts/ConnectionManagement/ConnectionState/StartingHostState.cs b/Assets/Scripts/ConnectionManagement/ConnectionState/StartingHostState.cs
@@ -18,13 +18,6 @@ class StartingHostState : OnlineState
         LobbyServiceFacade m_LobbyServiceFacade;
         [Inject]
         LocalLobby m_LocalLobby;
-        ConnectionMethodBase m_ConnectionMethod;
-
-        public StartingHostState Configure(ConnectionMethodBase baseConnectionMethod)
-        {
-            m_ConnectionMethod = baseConnectionMethod;
-            return this;
-        }
 
         public override void Enter()
         {
@@ -76,7 +69,7 @@ async void StartHost()
         {
             try
             {
-                await m_ConnectionMethod.SetupHostConnectionAsync();
+                await m_ConnectionManager.ConnectionMethod.SetupHostConnectionAsync();
                 Debug.Log($"Created relay allocation with join code {m_LocalLobby.RelayJoinCode}");
 
                 // NGO's StartHost launches everything

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using Unity.BossRoom.UnityServices.Lobbies;`
`3`	`4`	`using Unity.BossRoom.Utils;`
`4`	`5`	`using Unity.Collections;`
`5`	`6`	`using Unity.Netcode;`
`@@ -69,6 +70,12 @@ public class ConnectionManager : MonoBehaviour`
`69`	`70`
`70`	`71`	`[Inject]`
`71`	`72`	`IObjectResolver m_Resolver;`
	`73`	`+ [Inject]`
	`74`	`+ LobbyServiceFacade m_LobbyServiceFacade;`
	`75`	`+ [Inject]`
	`76`	`+ ProfileManager m_ProfileManager;`
	`77`	`+ [Inject]`
	`78`	`+ LocalLobby m_LocalLobby;`
`72`	`79`
`73`	`80`	`public int MaxConnectedPlayers = 8;`
`74`	`81`
`@@ -79,6 +86,9 @@ public class ConnectionManager : MonoBehaviour`
`79`	`86`	`internal readonly StartingHostState m_StartingHost = new StartingHostState();`
`80`	`87`	`internal readonly HostingState m_Hosting = new HostingState();`
`81`	`88`
	`89`	`+ ConnectionMethodBase m_ConnectionMethod;`
	`90`	`+ public ConnectionMethodBase ConnectionMethod => m_ConnectionMethod;`
	`91`	`+`
`82`	`92`	`void Awake()`
`83`	`93`	`{`
`84`	`94`	`DontDestroyOnLoad(gameObject);`
`@@ -149,22 +159,26 @@ void OnTransportFailure()`
`149`	`159`
`150`	`160`	`public void StartClientLobby(string playerName)`
`151`	`161`	`{`
`152`		`- m_CurrentState.StartClientLobby(playerName);`
	`162`	`+ m_ConnectionMethod = new ConnectionMethodRelay(m_LobbyServiceFacade, m_LocalLobby, this, m_ProfileManager, playerName);`
	`163`	`+ m_CurrentState.StartClient();`
`153`	`164`	`}`
`154`	`165`
`155`	`166`	`public void StartClientIp(string playerName, string ipaddress, int port)`
`156`	`167`	`{`
`157`		`- m_CurrentState.StartClientIP(playerName, ipaddress, port);`
	`168`	`+ m_ConnectionMethod = new ConnectionMethodIP(ipaddress, (ushort)port, this, m_ProfileManager, playerName);`
	`169`	`+ m_CurrentState.StartClient();`
`158`	`170`	`}`
`159`	`171`
`160`	`172`	`public void StartHostLobby(string playerName)`
`161`	`173`	`{`
`162`		`- m_CurrentState.StartHostLobby(playerName);`
	`174`	`+ m_ConnectionMethod = new ConnectionMethodRelay(m_LobbyServiceFacade, m_LocalLobby, this, m_ProfileManager, playerName);`
	`175`	`+ m_CurrentState.StartHost();`
`163`	`176`	`}`
`164`	`177`
`165`	`178`	`public void StartHostIp(string playerName, string ipaddress, int port)`
`166`	`179`	`{`
`167`		`- m_CurrentState.StartHostIP(playerName, ipaddress, port);`
	`180`	`+ m_ConnectionMethod = new ConnectionMethodIP(ipaddress, (ushort)port, this, m_ProfileManager, playerName);`
	`181`	`+ m_CurrentState.StartHost();`
`168`	`182`	`}`
`169`	`183`
`170`	`184`	`public void RequestShutdown()`