Skip to content

Change FlushAsync to SendEndOfMessageAsync #1199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2025
Merged

Change FlushAsync to SendEndOfMessageAsync #1199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Transports.AspNetCore/WebSockets/WebSocketConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ protected virtual Task OnDispatchMessageAsync(IOperationMessageProcessor operati
protected virtual async Task OnSendMessageAsync(OperationMessage message)
{
await _serializer.WriteAsync(_stream, message, RequestAborted);
await _stream.FlushAsync(RequestAborted);
await _stream.SendEndOfMessageAsync(RequestAborted);
}

/// <summary>
Expand Down
8 changes: 5 additions & 3 deletions src/Transports.AspNetCore/WebSockets/WebSocketWriterStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ public override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationTo

public override void Write(byte[] buffer, int offset, int count) => WriteAsync(buffer, offset, count).GetAwaiter().GetResult();

public override Task FlushAsync(CancellationToken cancellationToken)
=> _webSocket.SendAsync(new ArraySegment<byte>(Array.Empty<byte>()), WebSocketMessageType.Text, true, cancellationToken);
public override Task FlushAsync(CancellationToken cancellationToken) => Task.CompletedTask;

public override void Flush() { }

public override void Flush() => FlushAsync().GetAwaiter().GetResult();
public Task SendEndOfMessageAsync(CancellationToken cancellationToken)
=> _webSocket.SendAsync(new ArraySegment<byte>(Array.Empty<byte>()), WebSocketMessageType.Text, true, cancellationToken);

public override int Read(byte[] buffer, int offset, int count) => throw new NotSupportedException();

Expand Down
12 changes: 9 additions & 3 deletions tests/Transports.AspNetCore.Tests/WebSockets/WebSocketWriterStreamTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,18 @@ public void Write()
}

[Fact]
public async Task FlushAsync()
public async Task SendEndOfMessageAsync()
{
_mockWebSocket.Setup(x => x.SendAsync(new ArraySegment<byte>(Array.Empty<byte>(), 0, 0), WebSocketMessageType.Text, true, default))
.Returns(Task.CompletedTask).Verifiable();
await _stream.SendEndOfMessageAsync(default);
_mockWebSocket.Verify();
_mockWebSocket.VerifyNoOtherCalls();
}

[Fact]
public async Task FlushAsync()
{
await _stream.FlushAsync();
_mockWebSocket.Verify();
_mockWebSocket.VerifyNoOtherCalls();
Expand All @@ -69,8 +77,6 @@ public async Task FlushAsync()
[Fact]
public void Flush()
{
_mockWebSocket.Setup(x => x.SendAsync(new ArraySegment<byte>(Array.Empty<byte>(), 0, 0), WebSocketMessageType.Text, true, default))
.Returns(Task.CompletedTask).Verifiable();
_stream.Flush();
_mockWebSocket.Verify();
_mockWebSocket.VerifyNoOtherCalls();
Expand Down
Loading