Additional disconnection handling

2025-04-08 11:49:43 +03:00
parent 3a4456e362
commit 95dbf63511
2 changed files with 8 additions and 5 deletions
@@ -80,7 +80,10 @@ namespace mROA.Implementation.Frontend
                        var eventRequest =
                            _representationModule!.GetMessageAsync<DefaultCallRequest>(
                                messageType: EMessageType.EventRequest, token: token);
-                        Task.WaitAny(defaultRequest, cancelRequest, eventRequest);
+                        var disconnectRequest =
+                            _representationModule!.GetMessageAsync<ClientDisconnect>(
+                                messageType: EMessageType.ClientDisconnect, token:token);
+                        Task.WaitAny(defaultRequest, cancelRequest, eventRequest, disconnectRequest);
 #if TRACE
                        Console.WriteLine("Request received");
                        sw.Restart();
@@ -96,9 +99,12 @@ namespace mROA.Implementation.Frontend
                        {
                            HandleCallRequest(tokenSource, defaultRequest.Result);
                        }
-                        else
+                        else if(eventRequest.IsCompleted)
                        {
                            HandleEventRequest(tokenSource, eventRequest.Result);
+                        }else if (disconnectRequest.IsCompleted)
+                        {
+                            break;
                        }
                    }
                }