Fix debug server hanging forever on a blocking peek() (#1698)

Co-authored-by: amylizzle <amylizzle@users.noreply.github.com>
OpenDreamProject · Mar 18, 2024 · 2263e77 · 2263e77
1 parent 6df7365
commit 2263e77
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/OpenDreamRuntime/Procs/DebugAdapter/DebugAdapterClient.cs b/OpenDreamRuntime/Procs/DebugAdapter/DebugAdapterClient.cs
@@ -34,19 +34,19 @@ public DebugAdapterClient(TcpClient client) {
     public void HandleMessages() {
         // `_netStream.DataAvailable` goes to false as soon as there is one Read call.
         // `_client` and `_netReader` each keep buffers and we have to loop until they are all drained.
-        while (_client.Connected && (_netStream.DataAvailable || _client.Available > 0 || _netReader.Peek() != -1)) {
-            ProtocolMessage? message = ReadRequest();
-            if (message == null)
-                continue;
-
-            _sawmill.Log(LogLevel.Verbose, $"Parsed {message}");
-            _seqCounter = message.Seq + 1;
-            switch (message) {
-                case Request req:
-                    OnRequest?.Invoke(this, req);
-                    break;
-            }
-        }
+        try {
+            _netReader.BaseStream.ReadTimeout = 1; //1ms is lowest possible value
+            if(_client.Connected && (_netStream.DataAvailable || _client.Available > 0)) //check for buffered messages only once per tick
+                while (ReadRequest() is { } message) { //then process each message sequentially until there are none left
+                    _sawmill.Log(LogLevel.Verbose, $"Parsed {message}");
+                    _seqCounter = message.Seq + 1;
+                    switch (message) {
+                        case Request req:
+                            OnRequest?.Invoke(this, req);
+                            break;
+                    }
+                }
+        } catch (IOException) {} //ignore timeouts
     }
 
     public void Close() {