Fixed errors when sending messages to disconnected clients

RiptideNetworking · Nov 30, 2021 · 12bca39 · 12bca39
1 parent e16d97d
commit 12bca39
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 23 deletions.
diff --git a/Assets/RiptideSteamTransport/Transport/SteamClient.cs b/Assets/RiptideSteamTransport/Transport/SteamClient.cs
@@ -3,6 +3,7 @@
 // Copyright (c) 2021 Tom Weiland
 // For additional information please see the included LICENSE.md file or view it on GitHub: https://github.com/tom-weiland/RiptideSteamTransport/blob/main/LICENSE.md
 
+using RiptideNetworking.Transports.Utils;
 using Steamworks;
 using System;
 using System.Collections.Generic;
@@ -38,21 +39,21 @@ public class SteamClient : SteamCommon, IClient
         public bool IsConnecting => connectionState == ConnectionState.connecting;
         /// <inheritdoc/>
         public bool IsConnected => connectionState == ConnectionState.connected;
-        /// <summary>The time (in milliseconds) after which to disconnect if there's no heartbeat from the server.</summary>
-        public ushort TimeoutTime { get; set; } = 5000; // TODO: make Steam's sockets time out after this time (assuming such functionality exists)
+        /// <summary>The time (in milliseconds) after which to give up on a connection attempt.</summary>
+        public ushort TimeoutTime { get; set; } = 5000;
 
         private Callback<SteamNetConnectionStatusChangedCallback_t> connectionStatusChanged = null;
         private CSteamID hostSteamId = CSteamID.Nil;
         private HSteamNetConnection hostConnection;
-        private List<Action> bufferedData;
         private ConnectionState connectionState;
         private SteamServer localServer;
+        private ActionQueue actionQueue;
 
         public SteamClient(SteamServer localServer = null, ushort timeoutTime = 5000, string logName = "Steam Client") : base(logName)
         {
             this.localServer = localServer;
             TimeoutTime = timeoutTime;
-            bufferedData = new List<Action>();
+            actionQueue = new ActionQueue();
         }
 
         public void ChangeLocalServer(SteamServer newLocalServer)
@@ -174,12 +175,7 @@ private void ConnectionStatusChangedToConnected()
         {
             connectionState = ConnectionState.connected;
 
-            if (bufferedData.Count > 0)
-            {
-                RiptideLogger.Log(LogName, $"{bufferedData.Count} received before connection was established. Processing now.");
-                foreach (Action a in bufferedData)
-                    a();
-            }
+            actionQueue.ExecuteAll();
         }
 
         /// <inheritdoc/>
@@ -203,7 +199,7 @@ private void HandleMessages()
                     else
                     {
                         Debug.Log("Ok this actually happens");
-                        bufferedData.Add(() => Handle(message, messageHeader));
+                        actionQueue.Add(() => Handle(message, messageHeader));
                     }
                 }
             }
@@ -242,12 +238,7 @@ public void FlushMessages()
         /// <inheritdoc/>
         public void Send(Message message, bool shouldRelease = true)
         {
-            EResult res = SteamSend(message, hostConnection);
-
-            if (res == EResult.k_EResultNoConnection || res == EResult.k_EResultInvalidParam)
-                OnDisconnected();
-            else if (res != EResult.k_EResultOK)
-                RiptideLogger.Log(LogName, $"Failed to send message: {res}");
+            SteamSend(message, hostConnection);
 
             if (shouldRelease)
                 message.Release();

diff --git a/Assets/RiptideSteamTransport/Transport/SteamServer.cs b/Assets/RiptideSteamTransport/Transport/SteamServer.cs
@@ -137,6 +137,7 @@ private void HandleMessages()
             {
                 IntPtr[] ptrs = new IntPtr[MaxMessages]; // TODO: remove allocation?
 
+                // TODO: consider using poll groups -> https://partner.steamgames.com/doc/api/ISteamNetworkingSockets#functions_poll_groups
                 int messageCount = SteamNetworkingSockets.ReceiveMessagesOnConnection(client.SteamNetConnection, ptrs, MaxMessages);
                 if (messageCount > 0)
                 {
@@ -181,12 +182,7 @@ public void Send(Message message, ushort toClientId, bool shouldRelease = true)
 
         internal void Send(Message message, SteamConnection client, bool shouldRelease = true)
         {
-            EResult res = SteamSend(message, client.SteamNetConnection);
-
-            if (res == EResult.k_EResultNoConnection || res == EResult.k_EResultInvalidParam)
-                LocalDisconnect(client, "Disconnected"); // TODO: LocalDisconnect removes the client from the dictionary, which is a problem if this was called from within a foreach loop, like in SendToAll
-            else if (res != EResult.k_EResultOK)
-                RiptideLogger.Log(LogName, $"Failed to send message: {res}");
+            SteamSend(message, client.SteamNetConnection);
 
             if (shouldRelease)
                 message.Release();