Skip to content
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

Remove dependency on RecyclableMemoryStream #242

Merged
merged 1 commit into from
Jun 23, 2023
+17 −19
Merged

Remove dependency on RecyclableMemoryStream #242

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
23 changes: 13 additions & 10 deletions src/messaging/dotnet/src/Client/Client/WebSocket/WebSocketConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
using System.IO.Pipelines;
using System.Net.WebSockets;
using System.Threading.Channels;
using CommunityToolkit.HighPerformance.Buffers;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Extensions.Options;
using Microsoft.IO;
using MorganStanley.ComposeUI.Messaging.Client.Abstractions;
using MorganStanley.ComposeUI.Messaging.Exceptions;
using MorganStanley.ComposeUI.Messaging.Protocol.Json;
Expand Down Expand Up @@ -69,12 +69,11 @@ public async ValueTask SendAsync(Message message, CancellationToken cancellation
{
try
{
// TODO: Instead of a pooled buffer, we could have an IBufferWriter that writes directly to the websocket
await using var stream = new RecyclableMemoryStream(MemoryStreamManager);
JsonMessageSerializer.SerializeMessage(message, stream);
using var bufferWriter = new ArrayPoolBufferWriter<byte>(ArrayPool<byte>.Shared);
JsonMessageSerializer.SerializeMessage(message, bufferWriter);

await _webSocket.SendAsync(
new ArraySegment<byte>(stream.GetBuffer(), 0, (int)stream.Length),
bufferWriter.WrittenMemory,
WebSocketMessageType.Text,
WebSocketMessageFlags.EndOfMessage,
_stopTokenSource.Token);
Expand All @@ -85,7 +84,10 @@ await _webSocket.SendAsync(
}
catch (Exception e)
{
_logger.LogError(e, "Exception thrown while trying to send a message over the WebSocket: {ExceptionMessage}", e.Message);
_logger.LogError(
e,
"Exception thrown while trying to send a message over the WebSocket: {ExceptionMessage}",
e.Message);
}
}

Expand Down Expand Up @@ -167,7 +169,10 @@ private async Task ReceiveMessages()
}
catch (Exception e)
{
_logger.LogError(e, "Exception thrown while trying to read a message from the WebSocket: {ExceptionMessage}", e.Message);
_logger.LogError(
e,
"Exception thrown while trying to read a message from the WebSocket: {ExceptionMessage}",
e.Message);
_receiveChannel.Writer.TryComplete();
}
}
Expand All @@ -190,6 +195,4 @@ private static bool TryReadMessage(ref ReadOnlySequence<byte> buffer, [NotNullWh
return false;
}
}

private static readonly RecyclableMemoryStreamManager MemoryStreamManager = new();
}
}
1 change: 0 additions & 1 deletion src/messaging/dotnet/src/Core/MessageBufferJsonExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
// and limitations under the License.

using System.Text.Json;
using Microsoft.IO;

namespace MorganStanley.ComposeUI.Messaging;

Expand Down
1 change: 0 additions & 1 deletion src/messaging/dotnet/src/Core/MorganStanley.ComposeUI.Messaging.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

<ItemGroup>
<PackageReference Include="CommunityToolkit.HighPerformance" Version="8.0.0" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.1" />
<PackageReference Include="System.Reactive" Version="6.0.0" />
<PackageReference Include="System.Reactive.Async" Version="6.0.0-alpha.3" />
<PackageReference Include="System.Text.Json" Version="6.0.7" />
Expand Down
11 changes: 4 additions & 7 deletions src/messaging/dotnet/src/Server/Server/WebSocket/WebSocketConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
using System.IO.Pipelines;
using System.Net.WebSockets;
using System.Threading.Channels;
using CommunityToolkit.HighPerformance.Buffers;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.IO;
using MorganStanley.ComposeUI.Messaging.Exceptions;
using MorganStanley.ComposeUI.Messaging.Protocol.Json;
using MorganStanley.ComposeUI.Messaging.Protocol.Messages;
Expand Down Expand Up @@ -225,12 +225,11 @@ private async Task SendMessagesAsync(
if (webSocket.State != WebSocketState.Open || cancellationToken.IsCancellationRequested)
break;

// TODO: Instead of a pooled buffer, we could have an IBufferWriter that writes directly to the websocket
await using var stream = new RecyclableMemoryStream(MemoryStreamManager);
JsonMessageSerializer.SerializeMessage(message, stream);
using var bufferWriter = new ArrayPoolBufferWriter<byte>(ArrayPool<byte>.Shared);
JsonMessageSerializer.SerializeMessage(message, bufferWriter);

await webSocket.SendAsync(
new ArraySegment<byte>(stream.GetBuffer(), 0, (int)stream.Length),
bufferWriter.WrittenMemory,
WebSocketMessageType.Text,
WebSocketMessageFlags.EndOfMessage,
cancellationToken);
Expand Down Expand Up @@ -264,6 +263,4 @@ private bool TryReadMessage(ref ReadOnlySequence<byte> buffer, [NotNullWhen(true
return false;
}
}

private static readonly RecyclableMemoryStreamManager MemoryStreamManager = new();
}