Handle cancellation

Author: tmat

src/Dotnet.Watch/AspireService/AspireServerService.cs

@@ -394,34 +394,31 @@ private async ValueTask<bool> SendMessageAsync(string dcpId, byte[] messageBytes
             return false;
         }
 
-        var success = false;
+        using var cancelTokenSource = CancellationTokenSource.CreateLinkedTokenSource(
+            cancellationToken, _shutdownCancellationSource.Token, connection.HttpRequestAborted);
+
         var lockAcquired = false;
         try
         {
-            using var cancelTokenSource = CancellationTokenSource.CreateLinkedTokenSource(
-                cancellationToken, _shutdownCancellationSource.Token, connection.HttpRequestAborted);
-
             await _webSocketAccess.WaitAsync(cancelTokenSource.Token);
             lockAcquired = true;
 
             await connection.Socket.SendAsync(new ArraySegment<byte>(messageBytes), WebSocketMessageType.Text, endOfMessage: true, cancelTokenSource.Token);
-            success = true;
+            return true;
+        }
+        catch (Exception e) when (e is not OperationCanceledException)
+        {
+            // If the connection throws it almost certainly means the client has gone away, so clean up that connection
+            _socketConnectionManager.RemoveSocketConnection(connection);
+            return false;
         }
         finally
         {
-            if (!success)
-            {
-                // If the connection throws it almost certainly means the client has gone away, so clean up that connection
-                _socketConnectionManager.RemoveSocketConnection(connection);
-            }
-
             if (lockAcquired)
             {
                 _webSocketAccess.Release();
             }
         }
-
-        return success;
     }
 
     private async Task HandleStopSessionRequestAsync(HttpContext context, string sessionId)