Revert "Moving ConnectionMethod responsibility to ConnectionManager"

LPLafontaineB · LPLafontaineB · commit d32ff9a14c20 · 2023-01-31T14:24:55.000-05:00
This reverts commit d5095f3.
diff --git a/Assets/Scripts/ConnectionManagement/ConnectionManager.cs b/Assets/Scripts/ConnectionManagement/ConnectionManager.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Unity.BossRoom.UnityServices.Lobbies;
 using Unity.BossRoom.Utils;
 using Unity.Collections;
 using Unity.Netcode;
@@ -70,12 +69,6 @@ public class ConnectionManager : MonoBehaviour
 
         [Inject]
         IObjectResolver m_Resolver;
-        [Inject]
-        LobbyServiceFacade m_LobbyServiceFacade;
-        [Inject]
-        ProfileManager m_ProfileManager;
-        [Inject]
-        LocalLobby m_LocalLobby;
 
         public int MaxConnectedPlayers = 8;
 
@@ -86,9 +79,6 @@ 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);
@@ -159,26 +149,22 @@ void OnTransportFailure()
 
         public void StartClientLobby(string playerName)
         {
-            m_ConnectionMethod = new ConnectionMethodRelay(m_LobbyServiceFacade, m_LocalLobby, this, m_ProfileManager, playerName);
-            m_CurrentState.StartClient();
+            m_CurrentState.StartClientLobby(playerName);
         }
 
         public void StartClientIp(string playerName, string ipaddress, int port)
         {
-            m_ConnectionMethod = new ConnectionMethodIP(ipaddress, (ushort)port, this, m_ProfileManager, playerName);
-            m_CurrentState.StartClient();
+            m_CurrentState.StartClientIP(playerName, ipaddress, port);
         }
 
         public void StartHostLobby(string playerName)
         {
-            m_ConnectionMethod = new ConnectionMethodRelay(m_LobbyServiceFacade, m_LocalLobby, this, m_ProfileManager, playerName);
-            m_CurrentState.StartHost();
+            m_CurrentState.StartHostLobby(playerName);
         }
 
         public void StartHostIp(string playerName, string ipaddress, int port)
         {
-            m_ConnectionMethod = new ConnectionMethodIP(ipaddress, (ushort)port, this, m_ProfileManager, playerName);
-            m_CurrentState.StartHost();
+            m_CurrentState.StartHostIP(playerName, ipaddress, port);
         }
 
         public void RequestShutdown()
diff --git a/Assets/Scripts/ConnectionManagement/ConnectionState/ClientConnectingState.cs b/Assets/Scripts/ConnectionManagement/ConnectionState/ClientConnectingState.cs
@@ -11,6 +11,14 @@ 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
@@ -53,7 +61,7 @@ internal async Task ConnectClientAsync()
             try
             {
                 // Setup NGO with current connection method
-                await m_ConnectionManager.ConnectionMethod.SetupClientConnectionAsync();
+                await m_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_ConnectionManager.ConnectionMethod.SetupClientReconnectionAsync();
+            var reconnectingSetupTask = m_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,9 +26,13 @@ public virtual void OnClientDisconnect(ulong clientId) { }
 
         public virtual void OnServerStarted() { }
 
-        public virtual void StartClient() { }
+        public virtual void StartClientIP(string playerName, string ipaddress, int port) { }
 
-        public virtual void StartHost() { }
+        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 OnUserRequestedShutdown() { }
 
diff --git a/Assets/Scripts/ConnectionManagement/ConnectionState/OfflineState.cs b/Assets/Scripts/ConnectionManagement/ConnectionState/OfflineState.cs
@@ -1,6 +1,7 @@
 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;
@@ -16,6 +17,10 @@ class OfflineState : ConnectionState
     {
         [Inject]
         LobbyServiceFacade m_LobbyServiceFacade;
+        [Inject]
+        ProfileManager m_ProfileManager;
+        [Inject]
+        LocalLobby m_LocalLobby;
 
         const string k_MainMenuSceneName = "MainMenu";
 
@@ -31,14 +36,30 @@ public override void Enter()
 
         public override void Exit() { }
 
-        public override void StartClient()
+        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)
         {
-            m_ConnectionManager.ChangeState(m_ConnectionManager.m_ClientConnecting);
+            var connectionMethod = new ConnectionMethodIP(ipaddress, (ushort)port, m_ConnectionManager, m_ProfileManager, playerName);
+            m_ConnectionManager.ChangeState(m_ConnectionManager.m_StartingHost.Configure(connectionMethod));
         }
 
-        public override void StartHost()
+        public override void StartHostLobby(string playerName)
         {
-            m_ConnectionManager.ChangeState(m_ConnectionManager.m_StartingHost);
+            var connectionMethod = new ConnectionMethodRelay(m_LobbyServiceFacade, m_LocalLobby, m_ConnectionManager, m_ProfileManager, playerName);
+            m_ConnectionManager.ChangeState(m_ConnectionManager.m_StartingHost.Configure(connectionMethod));
         }
     }
 }
diff --git a/Assets/Scripts/ConnectionManagement/ConnectionState/StartingHostState.cs b/Assets/Scripts/ConnectionManagement/ConnectionState/StartingHostState.cs
@@ -18,6 +18,13 @@ 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()
         {
@@ -69,7 +76,7 @@ async void StartHost()
         {
             try
             {
-                await m_ConnectionManager.ConnectionMethod.SetupHostConnectionAsync();
+                await m_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,6 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using Unity.BossRoom.UnityServices.Lobbies;`
`4`	`3`	`using Unity.BossRoom.Utils;`
`5`	`4`	`using Unity.Collections;`
`6`	`5`	`using Unity.Netcode;`
`@@ -70,12 +69,6 @@ public class ConnectionManager : MonoBehaviour`
`70`	`69`
`71`	`70`	`[Inject]`
`72`	`71`	`IObjectResolver m_Resolver;`
`73`		`- [Inject]`
`74`		`- LobbyServiceFacade m_LobbyServiceFacade;`
`75`		`- [Inject]`
`76`		`- ProfileManager m_ProfileManager;`
`77`		`- [Inject]`
`78`		`- LocalLobby m_LocalLobby;`
`79`	`72`
`80`	`73`	`public int MaxConnectedPlayers = 8;`
`81`	`74`
`@@ -86,9 +79,6 @@ public class ConnectionManager : MonoBehaviour`
`86`	`79`	`internal readonly StartingHostState m_StartingHost = new StartingHostState();`
`87`	`80`	`internal readonly HostingState m_Hosting = new HostingState();`
`88`	`81`
`89`		`- ConnectionMethodBase m_ConnectionMethod;`
`90`		`- public ConnectionMethodBase ConnectionMethod => m_ConnectionMethod;`
`91`		`-`
`92`	`82`	`void Awake()`
`93`	`83`	`{`
`94`	`84`	`DontDestroyOnLoad(gameObject);`
`@@ -159,26 +149,22 @@ void OnTransportFailure()`
`159`	`149`
`160`	`150`	`public void StartClientLobby(string playerName)`
`161`	`151`	`{`
`162`		`- m_ConnectionMethod = new ConnectionMethodRelay(m_LobbyServiceFacade, m_LocalLobby, this, m_ProfileManager, playerName);`
`163`		`- m_CurrentState.StartClient();`
	`152`	`+ m_CurrentState.StartClientLobby(playerName);`
`164`	`153`	`}`
`165`	`154`
`166`	`155`	`public void StartClientIp(string playerName, string ipaddress, int port)`
`167`	`156`	`{`
`168`		`- m_ConnectionMethod = new ConnectionMethodIP(ipaddress, (ushort)port, this, m_ProfileManager, playerName);`
`169`		`- m_CurrentState.StartClient();`
	`157`	`+ m_CurrentState.StartClientIP(playerName, ipaddress, port);`
`170`	`158`	`}`
`171`	`159`
`172`	`160`	`public void StartHostLobby(string playerName)`
`173`	`161`	`{`
`174`		`- m_ConnectionMethod = new ConnectionMethodRelay(m_LobbyServiceFacade, m_LocalLobby, this, m_ProfileManager, playerName);`
`175`		`- m_CurrentState.StartHost();`
	`162`	`+ m_CurrentState.StartHostLobby(playerName);`
`176`	`163`	`}`
`177`	`164`
`178`	`165`	`public void StartHostIp(string playerName, string ipaddress, int port)`
`179`	`166`	`{`
`180`		`- m_ConnectionMethod = new ConnectionMethodIP(ipaddress, (ushort)port, this, m_ProfileManager, playerName);`
`181`		`- m_CurrentState.StartHost();`
	`167`	`+ m_CurrentState.StartHostIP(playerName, ipaddress, port);`
`182`	`168`	`}`
`183`	`169`
`184`	`170`	`public void RequestShutdown()`