De-async writting flatbuffer to socket

Author: VirxEC

RLBotCS/Server/FlatBuffersSession.cs

@@ -239,12 +239,12 @@ await _bridge.WriteAsync(
         return true;
     }
 
-    private async Task SendPayloadToClientAsync(TypedPayload payload)
+    private void SendPayloadToClient(TypedPayload payload)
     {
         try
         {
-            await _socketSpecWriter.WriteAsync(payload);
-            await _socketSpecWriter.SendAsync();
+            _socketSpecWriter.Write(payload);
+            _socketSpecWriter.Send();
         }
         catch (ObjectDisposedException)
         {
@@ -267,7 +267,7 @@ private async Task HandleIncomingMessages()
                     _messageBuilder.Clear();
                     _messageBuilder.Finish(FieldInfo.Pack(_messageBuilder, m.Info).Value);
 
-                    await SendPayloadToClientAsync(
+                    SendPayloadToClient(
                         TypedPayload.FromFlatBufferBuilder(DataType.FieldInfo, _messageBuilder)
                     );
                     break;
@@ -277,7 +277,7 @@ await SendPayloadToClientAsync(
                         MatchSettings.Pack(_messageBuilder, m.Settings).Value
                     );
 
-                    await SendPayloadToClientAsync(
+                    SendPayloadToClient(
                         TypedPayload.FromFlatBufferBuilder(
                             DataType.MatchSettings,
                             _messageBuilder
@@ -307,7 +307,7 @@ await SendPayloadToClientAsync(
                         ControllableTeamInfo.Pack(_messageBuilder, playerMappings).Value
                     );
 
-                    await SendPayloadToClientAsync(
+                    SendPayloadToClient(
                         TypedPayload.FromFlatBufferBuilder(
                             DataType.ControllableTeamInfo,
                             _messageBuilder
@@ -322,7 +322,7 @@ await SendPayloadToClientAsync(
                         BallPrediction.Pack(_messageBuilder, m.BallPrediction).Value
                     );
 
-                    await SendPayloadToClientAsync(
+                    SendPayloadToClient(
                         TypedPayload.FromFlatBufferBuilder(
                             DataType.BallPrediction,
                             _messageBuilder
@@ -335,7 +335,7 @@ await SendPayloadToClientAsync(
                         GamePacket.Pack(_messageBuilder, m.GameState).Value
                     );
 
-                    await SendPayloadToClientAsync(
+                    SendPayloadToClient(
                         TypedPayload.FromFlatBufferBuilder(
                             DataType.GamePacket,
                             _messageBuilder
@@ -359,7 +359,7 @@ await SendPayloadToClientAsync(
                     _messageBuilder.Clear();
                     _messageBuilder.Finish(MatchComm.Pack(_messageBuilder, m.Message).Value);
 
-                    await SendPayloadToClientAsync(
+                    SendPayloadToClient(
                         TypedPayload.FromFlatBufferBuilder(
                             DataType.MatchComms,
                             _messageBuilder
@@ -436,7 +436,7 @@ public void Cleanup()
                 Type = DataType.None,
                 Payload = new ArraySegment<byte>([1]),
             };
-            SendPayloadToClientAsync(msg).Wait();
+            SendPayloadToClient(msg);
         }
         catch (Exception) { }
         finally

RLBotCS/Server/SocketSpecStreamWriter.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using RLBotCS.ManagerTools;
 using RLBotCS.Types;
 
@@ -28,7 +28,7 @@ private static void WriteBigEndian(ushort value, byte[] buffer)
         buffer[1] = (byte)(value & 0xFF);
     }
 
-    internal async Task WriteAsync(TypedPayload message)
+    internal void Write(TypedPayload message)
     {
         if (message.Payload.Count > ushort.MaxValue)
         {
@@ -57,8 +57,9 @@ internal async Task WriteAsync(TypedPayload message)
             4,
             message.Payload.Count
         );
-        await stream.WriteAsync(_messageBuffer.AsMemory(0, 4 + message.Payload.Count));
+
+        stream.Write(_messageBuffer, 0, 4 + message.Payload.Count);
     }
 
-    internal async Task SendAsync() => await stream.FlushAsync();
+    internal void Send() => stream.Flush();
 }

RLBotCSTests/BallPrediction.cs

@@ -10,15 +10,15 @@ namespace RLBotCSTests;
 [TestClass]
 public class BallPrediction
 {
-    private TestContext testContextInstance;
+    private TestContext? testContextInstance;
 
     /// <summary>
     /// Gets or sets the test context which provides
     /// information about and functionality for the current test run.
     /// </summary>
     public TestContext TestContext
     {
-        get { return testContextInstance; }
+        get { return testContextInstance!; }
         set { testContextInstance = value; }
     }
 

RLBotCSTests/PlayerMappingTest.cs

@@ -6,7 +6,7 @@ namespace RLBotCSTests;
 [TestClass]
 public class PlayerMappingTest
 {
-    private PlayerMapping _playerMapping;
+    private PlayerMapping? _playerMapping;
 
     [TestInitialize]
     public void Init()
@@ -33,7 +33,7 @@ public void TestSpawnProcess()
         };
 
         // add pending spawn
-        _playerMapping.AddPendingSpawn(spawnTracker);
+        _playerMapping!.AddPendingSpawn(spawnTracker);
 
         // apply car spawn from known player
         var metadata = _playerMapping.ApplyCarSpawn(actorId, commandId);