Fixed issue with Server/Client event subscribers not being invoked if…

… added after the Start/Connect call
RiptideNetworking · Dec 31, 2021 · 7b489c8 · 7b489c8
1 parent 27d56de
commit 7b489c8
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 13 deletions.
diff --git a/Demos/Unity/Client/Assets/Scripts/Multiplayer/RiptideNetworking.dll b/Demos/Unity/Client/Assets/Scripts/Multiplayer/RiptideNetworking.dll
diff --git a/Demos/Unity/Client/Assets/Scripts/Multiplayer/RiptideNetworking.xml b/Demos/Unity/Client/Assets/Scripts/Multiplayer/RiptideNetworking.xml
diff --git a/Demos/Unity/Server/Assets/Scripts/Multiplayer/RiptideNetworking.dll b/Demos/Unity/Server/Assets/Scripts/Multiplayer/RiptideNetworking.dll
diff --git a/Demos/Unity/Server/Assets/Scripts/Multiplayer/RiptideNetworking.xml b/Demos/Unity/Server/Assets/Scripts/Multiplayer/RiptideNetworking.xml
diff --git a/RiptideNetworking/RiptideNetworking/Client.cs b/RiptideNetworking/RiptideNetworking/Client.cs
@@ -82,12 +82,12 @@ public void Connect(string hostAddress, byte messageHandlerGroupId = 0)
 
             CreateMessageHandlersDictionary(Assembly.GetCallingAssembly(), messageHandlerGroupId);
 
-            client.Connected += Connected;
+            client.Connected += OnConnected;
             client.ConnectionFailed += OnConnectionFailed;
             client.MessageReceived += OnMessageReceived;
             client.Disconnected += OnDisconnected;
-            client.ClientConnected += ClientConnected;
-            client.ClientDisconnected += ClientDisconnected;
+            client.ClientConnected += OnClientConnected;
+            client.ClientDisconnected += OnClientDisconnected;
             client.Connect(hostAddress);
         }
 
@@ -149,14 +149,17 @@ public void Disconnect()
 
         private void LocalDisconnect()
         {
-            client.Connected -= Connected;
-            client.ConnectionFailed -= ConnectionFailed;
+            client.Connected -= OnConnected;
+            client.ConnectionFailed -= OnConnectionFailed;
             client.MessageReceived -= OnMessageReceived;
-            client.Disconnected -= Disconnected;
-            client.ClientConnected -= ClientConnected;
-            client.ClientDisconnected -= ClientDisconnected;
+            client.Disconnected -= OnDisconnected;
+            client.ClientConnected -= OnClientConnected;
+            client.ClientDisconnected -= OnClientDisconnected;
         }
 
+        /// <summary>Invokes the <see cref="Connected"/> event.</summary>
+        private void OnConnected(object s, EventArgs e) => Connected?.Invoke(this, e);
+
         /// <summary>Invokes the <see cref="ConnectionFailed"/> event.</summary>
         private void OnConnectionFailed(object s, EventArgs e)
         {
@@ -181,5 +184,11 @@ private void OnDisconnected(object s, EventArgs e)
             LocalDisconnect();
             Disconnected?.Invoke(this, e);
         }
+
+        /// <summary>Invokes the <see cref="ClientConnected"/> event.</summary>
+        private void OnClientConnected(object s, ClientConnectedEventArgs e) => ClientConnected?.Invoke(this, e);
+
+        /// <summary>Invokes the <see cref="ClientDisconnected"/> event.</summary>
+        private void OnClientDisconnected(object s, ClientDisconnectedEventArgs e) => ClientDisconnected?.Invoke(this, e);
     }
 }
diff --git a/RiptideNetworking/RiptideNetworking/Server.cs b/RiptideNetworking/RiptideNetworking/Server.cs
@@ -71,14 +71,14 @@ public void Start(ushort port, ushort maxClientCount, byte messageHandlerGroupId
 
             CreateMessageHandlersDictionary(Assembly.GetCallingAssembly(), messageHandlerGroupId);
 
-            server.ClientConnected += ClientConnected;
+            server.ClientConnected += OnClientConnected;
             server.MessageReceived += OnMessageReceived;
-            server.ClientDisconnected += ClientDisconnected;
+            server.ClientDisconnected += OnClientDisonnected;
             server.Start(port, maxClientCount);
 
             IsRunning = true;
         }
-
+        
         /// <inheritdoc/>
         protected override void CreateMessageHandlersDictionary(Assembly assembly, byte messageHandlerGroupId)
         {
@@ -141,13 +141,16 @@ public void Stop()
                 return;
 
             server.Shutdown();
-            server.ClientConnected -= ClientConnected;
+            server.ClientConnected -= OnClientConnected;
             server.MessageReceived -= OnMessageReceived;
-            server.ClientDisconnected -= ClientDisconnected;
+            server.ClientDisconnected -= OnClientDisonnected;
 
             IsRunning = false;
         }
 
+        /// <summary>Invokes the <see cref="ClientConnected"/> event.</summary>
+        private void OnClientConnected(object sender, ServerClientConnectedEventArgs e) => ClientConnected?.Invoke(this, e);
+
         /// <summary>Invokes the <see cref="MessageReceived"/> event and initiates handling of the received message.</summary>
         private void OnMessageReceived(object s, ServerMessageReceivedEventArgs e)
         {
@@ -158,5 +161,8 @@ private void OnMessageReceived(object s, ServerMessageReceivedEventArgs e)
             else
                 RiptideLogger.Log(LogType.warning, $"No server-side handler method found for message ID {e.MessageId}!");
         }
+
+        /// <summary>Invokes the <see cref="ClientDisconnected"/> event.</summary>
+        private void OnClientDisonnected(object sender, ClientDisconnectedEventArgs e) => ClientDisconnected?.Invoke(this, e);
     }
 }