Attempt to fix websocket controller disposing race condition

Author: LucHeart

Common/Websocket/WebsockBaseController.cs

@@ -90,6 +90,7 @@ public virtual async ValueTask DisposeAsync()
 
         Channel.Writer.TryComplete();
         await Close.CancelAsync();
+
         WebSocket?.Dispose();
         LinkedSource.Dispose();
 
@@ -150,13 +151,11 @@ await HttpContext.Response.WriteAsJsonAsync(response, jsonOptions.Value.Serializ
         await SendInitialData();
 
         await Logic();
-
-
-        if (_disposed) return;
-
+        // Logic ended
+        
         await UnregisterConnection();
-
-        await DisposeAsync();
+        
+        await Close.CancelAsync();
     }
 
     #region Send Loop

LiveControlGateway/Controllers/LiveControlController.cs

@@ -321,8 +321,6 @@ await WebSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "Normal close",
                 Logger.LogError(ex, "Exception while processing websocket request");
             }
         }
-
-        await Close.CancelAsync();
     }
 
     private Task ProcessResult(BaseRequest<LiveRequestType> request)
@@ -568,7 +566,7 @@ await QueueMessage(new LiveControlResponse<LiveResponseType>
     [NonAction]
     public async Task HubDisconnected()
     {
-        _unregistered = true;
+        _unregistered = true; // The hub lifetime has already unregistered us
 
         Logger.LogTrace("Hub disconnected, disposing controller");
 
@@ -590,8 +588,6 @@ await SendWebSocketMessage(new LiveControlResponse<LiveResponseType>
             // We don't really care if this fails
             Logger.LogDebug(e, "Error while sending disconnect message or closing websocket");
         }
-        
-        await DisposeAsync();
     }
 
     /// <inheritdoc />