Avoiding comms messing up at socket level

DCS-Skunkworks · Dec 3, 2023 · 8f41289 · 8f41289
1 parent 830604c
commit 8f41289
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/client/DCSInsight/Communication/TCPClientHandler.cs b/src/client/DCSInsight/Communication/TCPClientHandler.cs
@@ -29,6 +29,7 @@ internal class TCPClientHandler : IDisposable, ICommandListener
         private int _metaDataPollCounter;
         public bool LogJSON { get; set; }
         private string _currentMessage = "";
+        private volatile bool _responseReceived;
 
         public TCPClientHandler(string host, string port)
         {
@@ -48,6 +49,7 @@ public void Dispose()
         private async void ClientThread()
         {
             ICEventHandler.SendConnectionStatus(_isRunning);
+            _responseReceived = true;
             while (_isRunning)
             {
                 try
@@ -81,12 +83,13 @@ private async void ClientThread()
                         Thread.Sleep(1000);
                     }
 
-                    if (_asyncCommandsChannel.Reader.Count > 0)
+                    if (_asyncCommandsChannel.Reader.Count > 0 && _responseReceived)
                     {
                         var cts = new CancellationTokenSource(100);
                         var dcsApi = await _asyncCommandsChannel.Reader.ReadAsync(cts.Token);
                         if (LogJSON) Logger.Info(JsonConvert.SerializeObject(dcsApi, Formatting.Indented));
                         _tcpClient.GetStream().Write(Encoding.ASCII.GetBytes(JsonConvert.SerializeObject(dcsApi) + "\n"));
+                        _responseReceived = false;
                     }
 
                     if (_tcpClient.Available <= 0) continue;
@@ -125,6 +128,7 @@ private void HandleMessage(string str)
                     var dcsApi = JsonConvert.DeserializeObject<DCSAPI>(_currentMessage + str);
                     _currentMessage = "";
                     ICEventHandler.SendData(dcsApi);
+                    _responseReceived = true;
                 }
                 else
                 {
@@ -143,6 +147,7 @@ private void HandleAPIMessage(string str)
             {
                 var dcsAPIList = JsonConvert.DeserializeObject<List<DCSAPI>>(str);
                 ICEventHandler.SendData(dcsAPIList);
+                _responseReceived = true;
                 _apiListReceived = true;
             }
             catch (Exception ex)