flow for client hosted works

Author: SamuelBellomo

Assets/Scripts/ConnectionManagement/ConnectionManager.cs

@@ -54,6 +54,13 @@ public class ConnectionPayload
     /// </summary>
     public class ConnectionManager : MonoBehaviour
     {
+        public enum ServerType : byte
+        {
+            Undefined = 0,
+            DedicatedServer,
+            ClientHostedServer
+        }
+
         ConnectionState m_CurrentState;
 
         [SerializeField]
@@ -79,7 +86,7 @@ public class ConnectionManager : MonoBehaviour
         internal readonly StartingHostState m_StartingHost = new StartingHostState();
         internal readonly HostingState m_Hosting = new HostingState();
 
-        public bool IsConnectedToHost { get; private set; }
+        public ServerType IsConnectedToHost { get; set; }
 
         void Awake()
         {
@@ -88,7 +95,7 @@ void Awake()
 
         void Start()
         {
-            List<ConnectionState> states = new() { m_Offline, m_ClientConnecting, m_ClientConnected, m_ClientReconnecting, m_DisconnectingWithReason, m_StartingHost, m_Hosting };
+            List<ConnectionState> states = new() { m_Offline, m_ClientConnecting, m_ClientConnected, m_ClientReconnecting, m_DisconnectingWithReason, m_StartingHost, m_Hosting, m_ServerListening, m_ServerStarting };
             foreach (var connectionState in states)
             {
                 m_Resolver.Inject(connectionState);
@@ -114,8 +121,6 @@ internal void ChangeState(ConnectionState nextState)
         {
             Debug.Log($"Changed connection state from {m_CurrentState.GetType().Name} to {nextState.GetType().Name}.");
 
-            IsConnectedToHost = false;
-
             if (m_CurrentState != null)
             {
                 m_CurrentState.Exit();
@@ -215,13 +220,13 @@ public static void SendServerToClientSetDisconnectReason(ulong clientID, Connect
             NetworkManager.Singleton.CustomMessagingManager.SendNamedMessage(nameof(ReceiveServerToClientSetDisconnectReason_CustomMessage), clientID, writer);
         }
 
-        public void ReceiveServertoClientSuccessPayload_CustomMessage(ulong clientID, FastBufferReader reader)
+        internal void ReceiveServertoClientSuccessPayload_CustomMessage(ulong clientID, FastBufferReader reader)
         {
-            reader.ReadValueSafe(out bool isHost);
+            reader.ReadValueSafe(out ServerType isHost);
             IsConnectedToHost = isHost;
         }
 
-        public static void SendServertoClientSuccessPayload(ulong clientID, bool isHost)
+        internal static void SendServertoClientSuccessPayload(ulong clientID, ServerType isHost)
         {
             var writer = new FastBufferWriter(sizeof(bool), Allocator.Temp);
             writer.WriteValueSafe(isHost);

Assets/Scripts/ConnectionManagement/ConnectionState/ClientConnectedState.cs

@@ -10,7 +10,10 @@ class ClientConnectedState : ConnectionState
     {
         public override void Enter() { }
 
-        public override void Exit() { }
+        public override void Exit()
+        {
+            m_ConnectionManager.IsConnectedToHost = ConnectionManager.ServerType.Undefined;
+        }
 
         public override void OnClientDisconnect(ulong _)
         {

Assets/Scripts/ConnectionManagement/ConnectionState/ServerListeningState.cs

@@ -11,10 +11,11 @@ namespace Unity.Multiplayer.Samples.BossRoom
 {
     class ServerListeningState : ConnectionState
     {
-      [Inject]
-        LobbyServiceFacade m_LobbyServiceFacade;
         [Inject]
-        IPublisher<ConnectionEventMessage> m_ConnectionEventPublisher;
+        protected LobbyServiceFacade m_LobbyServiceFacade;
+
+        [Inject]
+        protected IPublisher<ConnectionEventMessage> m_ConnectionEventPublisher;
 
         // 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;
@@ -101,7 +102,7 @@ public override void ApprovalCheck(NetworkManager.ConnectionApprovalRequest requ
                 response.Position = Vector3.zero;
                 response.Rotation = Quaternion.identity;
 
-                ConnectionManager.SendServertoClientSuccessPayload(clientId, NetworkManager.Singleton.IsHost);
+                ConnectionManager.SendServertoClientSuccessPayload(clientId, NetworkManager.Singleton.IsHost ? ConnectionManager.ServerType.ClientHostedServer : ConnectionManager.ServerType.DedicatedServer);
 
                 return;
             }

Assets/Scripts/Gameplay/UI/PostGameUI.cs

@@ -5,6 +5,7 @@
 using Unity.Multiplayer.Samples.Utilities;
 using Unity.Netcode;
 using VContainer;
+using static Unity.Multiplayer.Samples.BossRoom.ConnectionManager.ServerType;
 
 namespace Unity.Multiplayer.Samples.BossRoom.Visual
 {
@@ -63,7 +64,7 @@ void Start()
                 SetPostGameUI(networkGameState.NetworkWinState.winState.Value);
             }
 
-            if (!m_ConnectionManager.IsConnectedToHost && !NetworkManager.Singleton.IsServer)
+            if (m_ConnectionManager.IsConnectedToHost == DedicatedServer && !NetworkManager.Singleton.IsServer)
             {
                 IEnumerator CountdownToNextGame()
                 {