Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class WebSocketTransport(Uri _uri) : ITransport, IDisposable
private readonly ArraySegment<byte> _receiveBuffer = new(new byte[1024 * 8]);

private readonly SemaphoreSlim _socketSendSemaphoreSlim = new(1, 1);
private readonly MemoryStream _sharedMemoryStream = new();

public async Task ConnectAsync(CancellationToken cancellationToken)
{
Expand All @@ -43,21 +44,19 @@ public async Task ConnectAsync(CancellationToken cancellationToken)

public async Task<byte[]> ReceiveAsync(CancellationToken cancellationToken)
{
using var ms = new MemoryStream();
_sharedMemoryStream.SetLength(0);

WebSocketReceiveResult result;

do
{
result = await _webSocket.ReceiveAsync(_receiveBuffer, cancellationToken).ConfigureAwait(false);

await ms.WriteAsync(_receiveBuffer.Array!, _receiveBuffer.Offset, result.Count, cancellationToken).ConfigureAwait(false);
await _sharedMemoryStream.WriteAsync(_receiveBuffer.Array!, _receiveBuffer.Offset, result.Count, cancellationToken).ConfigureAwait(false);
}
while (!result.EndOfMessage);

ms.Seek(0, SeekOrigin.Begin);

byte[] data = ms.ToArray();
byte[] data = _sharedMemoryStream.ToArray();

if (_logger.IsEnabled(LogEventLevel.Trace))
{
Expand All @@ -69,10 +68,12 @@ public async Task<byte[]> ReceiveAsync(CancellationToken cancellationToken)

public async Task SendAsync(byte[] data, CancellationToken cancellationToken)
{
await _socketSendSemaphoreSlim.WaitAsync(cancellationToken);
var semaphoreTask = _socketSendSemaphoreSlim.WaitAsync(cancellationToken);

try
{
await semaphoreTask.ConfigureAwait(false);

if (_logger.IsEnabled(LogEventLevel.Trace))
{
_logger.Trace($"BiDi SND --> {Encoding.UTF8.GetString(data)}");
Expand All @@ -89,5 +90,7 @@ public async Task SendAsync(byte[] data, CancellationToken cancellationToken)
public void Dispose()
{
_webSocket.Dispose();
_sharedMemoryStream.Dispose();
_socketSendSemaphoreSlim.Dispose();
}
}
Loading