Make sure client returns error when network is lost (#144)

net-daemon · Jan 21, 2022 · f32d105 · f32d105
1 parent 783a3fc
commit f32d105
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/console/HassClient.Performance.Tests/Properties/launchSettings.json b/console/HassClient.Performance.Tests/Properties/launchSettings.json
@@ -2,7 +2,10 @@
   "profiles": {
     "HassClient.Performance.Tests": {
       "commandName": "Project",
-      "commandLineArgs": "-c --ip 192.168.1.7 --port 8123 --events true --token \"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiIzY2U4ZDdmMjg5NTc0MDY4YjA5Nzk2ZGMyZmNjYWI3NCIsImlhdCI6MTU3OTY3MTA2MywiZXhwIjoxODk1MDMxMDYzfQ.MuQTEYy9HDkV62GzY6fX9ECn_U8vFd5ffashw3sz_3M\""
+      "commandLineArgs": "-c --ip 192.168.1.7 --port 8123 --events true --token \"token\"",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT":"Development"
+      },
     }
   }
 }
diff --git a/src/HassClient/Client/HassClient.cs b/src/HassClient/Client/HassClient.cs
@@ -798,10 +798,11 @@ public async Task<IReadOnlyCollection<HassEntity>> GetEntities()
         /// </remarks>
         internal virtual async Task ProcessNextMessage()
         {
-            if (_messagePipeline is null)
+            if (_messagePipeline is null || !_messagePipeline.IsValid)
             {
-                _logger.LogWarning("Processing message with no {Pipeline} set! returning.", nameof(_messagePipeline));
-                return;
+                if (!CancelSource.IsCancellationRequested)
+                    CancelSource.Cancel();  // Cancels all operations on a faulty pipeline
+                throw new InvalidOperationException($"Processing message fail.");
             }
 
             try

diff --git a/src/HassClient/Client/internal/WebSocketMessagePipeline.cs b/src/HassClient/Client/internal/WebSocketMessagePipeline.cs
@@ -232,6 +232,24 @@ private async Task ReadMessagePump()
                     // Canceled the thread just leave
                     break;
                 }
+                catch (Exception e)
+                {
+                    _logger.LogTrace(e, "Websocket error");
+                    try
+                    {
+                        await _ws.CloseAsync(WebSocketCloseStatus.EndpointUnavailable, "Remote disconnected",
+                            _internalCancelToken).ConfigureAwait(false);
+                    }
+                    catch
+                    {
+                        // Suppress any error 
+                    }
+                    finally
+                    {
+                        _internalCancellationSource.Cancel();
+                    }
+                    break;
+                }
                 finally
                 {
                     // Always make sure the pipe is reset and ready to use next process message
@@ -326,7 +344,8 @@ async Task ReadFromClientSocket()
                             await SendCloseFrameToWebSocket().ConfigureAwait(false);
 
                             // Cancel so the write thread is canceled before pipe is complete
-                            _internalCancellationSource.Cancel();
+                            if (!_internalCancellationSource.IsCancellationRequested)
+                                _internalCancellationSource.Cancel();
                         }
 
                         // Continue reading next part of websocket message