reorganized DI so that only states get injected in

LPLafontaineB · LPLafontaineB · commit 6b3ac0f6ca32 · 2022-06-02T14:44:00.000-04:00
(cherry picked from commit 0e07a94)
diff --git a/Assets/Scripts/Gameplay/ConnectionManagement/ConnectionManager.cs b/Assets/Scripts/Gameplay/ConnectionManagement/ConnectionManager.cs
@@ -2,11 +2,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Unity.Collections;
-using Unity.Multiplayer.Samples.BossRoom.ApplicationLifecycle.Messages;
 using Unity.Multiplayer.Samples.BossRoom.Client;
-using Unity.Multiplayer.Samples.BossRoom.Shared;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
-using Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Lobbies;
 using Unity.Netcode;
 using UnityEngine;
 
@@ -39,31 +36,9 @@ public class ConnectionManager : MonoBehaviour
         NetworkObject m_GameState;
         public NetworkObject GameState => m_GameState;
 
-        ProfileManager m_ProfileManager;
-        LobbyServiceFacade m_LobbyServiceFacade;
-        LocalLobby m_LocalLobby;
-        IPublisher<ConnectionEventMessage> m_ConnectionEventPublisher;
-        IPublisher<QuitGameSessionMessage> m_QuitGameSessionPublisher;
-        IPublisher<ConnectStatus> m_ConnectStatusPublisher;
-        IPublisher<ReconnectMessage> m_ReconnectMessagePublisher;
-
         DisconnectReason m_DisconnectReason = new DisconnectReason();
         public DisconnectReason DisconnectReason => m_DisconnectReason;
 
-        [Inject]
-        void InjectDependencies(ProfileManager profileManager, LobbyServiceFacade lobbyServiceFacade, LocalLobby localLobby,
-            IPublisher<ConnectionEventMessage> connectionEventPublisher, IPublisher<QuitGameSessionMessage> quitGameSessionPublisher,
-            IPublisher<ConnectStatus> connectStatusPublisher, IPublisher<ReconnectMessage> reconnectMessagePublisher)
-        {
-            m_ProfileManager = profileManager;
-            m_LobbyServiceFacade = lobbyServiceFacade;
-            m_LocalLobby = localLobby;
-            m_ConnectionEventPublisher = connectionEventPublisher;
-            m_QuitGameSessionPublisher = quitGameSessionPublisher;
-            m_ConnectStatusPublisher = connectStatusPublisher;
-            m_ReconnectMessagePublisher = reconnectMessagePublisher;
-        }
-
         void Awake()
         {
             DontDestroyOnLoad(gameObject);
@@ -73,14 +48,20 @@ void Start()
         {
             m_Logics = new Dictionary<ConnectionStateType, ConnectionState>()
             {
-                [ConnectionStateType.Offline] = new OfflineConnectionState(this, m_LobbyServiceFacade, m_LocalLobby, m_ProfileManager),
-                [ConnectionStateType.Connecting] = new ConnectingConnectionState(this, m_QuitGameSessionPublisher, m_ConnectStatusPublisher),
-                [ConnectionStateType.Connected] = new ConnectedConnectionState(this, m_QuitGameSessionPublisher, m_ConnectStatusPublisher),
-                [ConnectionStateType.Reconnecting] = new ReconnectingConnectionState(this, m_LobbyServiceFacade, m_LocalLobby, m_ReconnectMessagePublisher, m_ProfileManager),
-                [ConnectionStateType.Hosting] = new HostingConnectionState(this, m_LobbyServiceFacade, m_ConnectionEventPublisher)
+                [ConnectionStateType.Offline] = new OfflineConnectionState(this),
+                [ConnectionStateType.Connecting] = new ConnectingConnectionState(this),
+                [ConnectionStateType.Connected] = new ConnectedConnectionState(this),
+                [ConnectionStateType.Reconnecting] = new ReconnectingConnectionState(this),
+                [ConnectionStateType.Hosting] = new HostingConnectionState(this)
             };
             m_CurrentState = ConnectionStateType.Offline;
 
+            var scope = DIScope.RootScope;
+            foreach (var connectionState in m_Logics.Values)
+            {
+                scope.InjectIn(connectionState);
+            }
+
             NetworkManager.OnClientConnectedCallback += OnClientConnectedCallback;
             NetworkManager.OnClientDisconnectCallback += OnClientDisconnectCallback;
             NetworkManager.ConnectionApprovalCallback += ApprovalCheck;
@@ -95,7 +76,7 @@ void OnDestroy()
 
         public void ChangeState(ConnectionStateType newState)
         {
-            Debug.Log(newState);
+            Debug.Log($"Changed connection sate from {m_CurrentState} to {newState}.");
             m_Logics[m_CurrentState].Exit();
             m_CurrentState = newState;
             m_Logics[m_CurrentState].Enter();
diff --git a/Assets/Scripts/Gameplay/ConnectionManagement/ConnectionState/ConnectedConnectionState.cs b/Assets/Scripts/Gameplay/ConnectionManagement/ConnectionState/ConnectedConnectionState.cs
@@ -10,9 +10,12 @@ public class ConnectedConnectionState : ConnectionState
         IPublisher<QuitGameSessionMessage> m_QuitGameSessionPublisher;
         IPublisher<ConnectStatus> m_ConnectStatusPublisher;
 
-        public ConnectedConnectionState(ConnectionManager connectionManager, IPublisher<QuitGameSessionMessage> quitGameSessionPublisher,
+        public ConnectedConnectionState(ConnectionManager connectionManager)
+            : base(connectionManager) { }
+
+        [Inject]
+        void InjectDependencies(IPublisher<QuitGameSessionMessage> quitGameSessionPublisher,
             IPublisher<ConnectStatus> connectStatusPublisher)
-            : base(connectionManager)
         {
             m_QuitGameSessionPublisher = quitGameSessionPublisher;
             m_ConnectStatusPublisher = connectStatusPublisher;
diff --git a/Assets/Scripts/Gameplay/ConnectionManagement/ConnectionState/ConnectingConnectionState.cs b/Assets/Scripts/Gameplay/ConnectionManagement/ConnectionState/ConnectingConnectionState.cs
@@ -10,9 +10,11 @@ public class ConnectingConnectionState : ConnectionState
         IPublisher<QuitGameSessionMessage> m_QuitGameSessionPublisher;
         IPublisher<ConnectStatus> m_ConnectStatusPublisher;
 
-        public ConnectingConnectionState(ConnectionManager connectionManager, IPublisher<QuitGameSessionMessage> quitGameSessionPublisher,
-            IPublisher<ConnectStatus> connectStatusPublisher)
-            : base(connectionManager)
+        public ConnectingConnectionState(ConnectionManager connectionManager)
+            : base(connectionManager) { }
+
+        [Inject]
+        void InjectDependencies(IPublisher<QuitGameSessionMessage> quitGameSessionPublisher, IPublisher<ConnectStatus> connectStatusPublisher)
         {
             m_QuitGameSessionPublisher = quitGameSessionPublisher;
             m_ConnectStatusPublisher = connectStatusPublisher;
diff --git a/Assets/Scripts/Gameplay/ConnectionManagement/ConnectionState/ConnectionState.cs b/Assets/Scripts/Gameplay/ConnectionManagement/ConnectionState/ConnectionState.cs
@@ -8,7 +8,7 @@ public abstract class ConnectionState
     {
         protected ConnectionManager m_ConnectionManager;
 
-        public ConnectionState(ConnectionManager connectionManager)
+        protected ConnectionState(ConnectionManager connectionManager)
         {
             m_ConnectionManager = connectionManager;
         }
diff --git a/Assets/Scripts/Gameplay/ConnectionManagement/ConnectionState/HostingConnectionState.cs b/Assets/Scripts/Gameplay/ConnectionManagement/ConnectionState/HostingConnectionState.cs
@@ -17,8 +17,12 @@ public class HostingConnectionState : ConnectionState
         // used in ApprovalCheck. This is intended as a bit of light protection against DOS attacks that rely on sending silly big buffers of garbage.
         const int k_MaxConnectPayload = 1024;
 
-        public HostingConnectionState(ConnectionManager connectionManager, LobbyServiceFacade lobbyServiceFacade, IPublisher<ConnectionEventMessage> connectionEventPublisher)
-            : base(connectionManager)
+        public HostingConnectionState(ConnectionManager connectionManager)
+            : base(connectionManager) { }
+
+        [Inject]
+        void InjectDependencies(LobbyServiceFacade lobbyServiceFacade,
+            IPublisher<ConnectionEventMessage> connectionEventPublisher)
         {
             m_LobbyServiceFacade = lobbyServiceFacade;
             m_ConnectionEventPublisher = connectionEventPublisher;
diff --git a/Assets/Scripts/Gameplay/ConnectionManagement/ConnectionState/OfflineConnectionState.cs b/Assets/Scripts/Gameplay/ConnectionManagement/ConnectionState/OfflineConnectionState.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Unity.Multiplayer.Samples.BossRoom.Client;
 using Unity.Multiplayer.Samples.BossRoom.Shared;
+using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Lobbies;
 using Unity.Netcode;
 using Unity.Netcode.Transports.UTP;
@@ -22,13 +23,15 @@ public class OfflineConnectionState : ConnectionState
         /// </summary>
         private const int k_MaxUnityRelayConnections = 8;
 
-        public OfflineConnectionState(ConnectionManager connectionManager, LobbyServiceFacade lobbyServiceFacade,
-            LocalLobby localLobby, ProfileManager profileManager)
-            : base(connectionManager)
+        public OfflineConnectionState(ConnectionManager connectionManager)
+            : base(connectionManager) { }
+
+        [Inject]
+        protected void InjectDependencies(ProfileManager profileManager, LobbyServiceFacade lobbyServiceFacade, LocalLobby localLobby)
         {
+            m_ProfileManager = profileManager;
             m_LobbyServiceFacade = lobbyServiceFacade;
             m_LocalLobby = localLobby;
-            m_ProfileManager = profileManager;
         }
 
         public override void Enter() { }
diff --git a/Assets/Scripts/Gameplay/ConnectionManagement/ConnectionState/ReconnectingConnectionState.cs b/Assets/Scripts/Gameplay/ConnectionManagement/ConnectionState/ReconnectingConnectionState.cs
@@ -1,13 +1,11 @@
 using System;
 using System.Collections;
 using System.Threading.Tasks;
-using Unity.Multiplayer.Samples.BossRoom.ApplicationLifecycle.Messages;
 using Unity.Multiplayer.Samples.BossRoom.Shared;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Lobbies;
 using Unity.Multiplayer.Samples.Utilities;
 using Unity.Netcode;
-using Unity.Netcode.Transports.UTP;
 using UnityEngine;
 
 namespace Unity.Multiplayer.Samples.BossRoom
@@ -22,11 +20,14 @@ public class ReconnectingConnectionState : OfflineConnectionState
         string m_LobbyCode = "";
         int m_NbAttempts;
 
-        public ReconnectingConnectionState(ConnectionManager connectionManager, LobbyServiceFacade lobbyServiceFacade,
-            LocalLobby localLobby, IPublisher<ReconnectMessage> reconnectMessagePublisher, ProfileManager profileManager)
-            : base(connectionManager, lobbyServiceFacade, localLobby, profileManager)
+        public ReconnectingConnectionState(ConnectionManager connectionManager)
+            : base(connectionManager) { }
+
+        [Inject]
+        void InjectDependencies(ProfileManager profileManager, LobbyServiceFacade lobbyServiceFacade, LocalLobby localLobby, IPublisher<ReconnectMessage> reconnectMessagePublisher)
         {
             m_ReconnectMessagePublisher = reconnectMessagePublisher;
+            base.InjectDependencies(profileManager, lobbyServiceFacade, localLobby);
         }
 
         public override void Enter()
@@ -75,6 +76,7 @@ public override void OnClientDisconnect(ulong clientId)
 
         public override void OnUserRequestedShutdown()
         {
+            m_ConnectionManager.NetworkManager.Shutdown();
             m_ConnectionManager.ChangeState(ConnectionStateType.Offline);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public abstract class ConnectionState`
`8`	`8`	`{`
`9`	`9`	`protected ConnectionManager m_ConnectionManager;`
`10`	`10`
`11`		`- public ConnectionState(ConnectionManager connectionManager)`
	`11`	`+ protected ConnectionState(ConnectionManager connectionManager)`
`12`	`12`	`{`
`13`	`13`	`m_ConnectionManager = connectionManager;`
`14`	`14`	`}`