Fixed websockets message corruption after cancellation (#7768)

ChilliCream · Nov 26, 2024 · 98c8879 · 98c8879
1 parent 5963739
commit 98c8879
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/StrawberryShake/Client/src/Transport.WebSockets/Messaging/SynchronizedMessageWriter.cs b/src/StrawberryShake/Client/src/Transport.WebSockets/Messaging/SynchronizedMessageWriter.cs
@@ -31,12 +31,12 @@ public async ValueTask CommitAsync(
         Action<SocketMessageWriter> action,
         CancellationToken cancellationToken)
     {
+        await _semaphore
+            .WaitAsync(cancellationToken)
+            .ConfigureAwait(false);
+
         try
         {
-            await _semaphore
-                .WaitAsync(cancellationToken)
-                .ConfigureAwait(false);
-
             _socketMessageWriter.Reset();
             action.Invoke(_socketMessageWriter);
 

diff --git a/...ryShake/Client/test/Transport.WebSocket.Tests/Messaging/SynchronizedMessageWriterTests.cs b/...ryShake/Client/test/Transport.WebSocket.Tests/Messaging/SynchronizedMessageWriterTests.cs
@@ -30,6 +30,14 @@ public async Task WriteObject_EmptyBuffer_ObjectParallel()
         await using var writer = new SynchronizedMessageWriter(socketClient);
 
         // act
+        var canceled = writer.CommitAsync(x =>
+            {
+                x.WriteStartObject();
+                x.WriteEndObject();
+            },
+            new(true));
+        Assert.True(canceled.IsCanceled);
+
         List<Task> tasks = [];
         for (var i = 0; i < 10; i++)
         {