Skip to content

Dispose of WebSocket when done with it #671

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 3 commits into from
Dec 20, 2021
Merged

Dispose of WebSocket when done with it #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a783e4
Dispose of websocket when done with it
Shane32 Dec 20, 2021
9d8bcf6
Update approvals
Shane32 Dec 20, 2021
bc0a3ea
Merge branch 'master' into dispose_websocket
Shane32 Dec 20, 2021
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
13 changes: 10 additions & 3 deletions src/Transports.Subscriptions.WebSockets/WebSocketConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,16 @@ public WebSocketConnection(

public async Task Connect()
{
await _server.OnConnect();
await _server.OnDisconnect();
await _transport.CloseAsync();
try
{
await _server.OnConnect();
await _server.OnDisconnect();
await _transport.CloseAsync();
}
finally
{
_transport.Dispose();
}
}
}
}
8 changes: 7 additions & 1 deletion src/Transports.Subscriptions.WebSockets/WebSocketTransport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System;
using System.Net.WebSockets;
using System.Threading;
using System.Threading.Tasks;
Expand All @@ -7,7 +8,7 @@

namespace GraphQL.Server.Transports.WebSockets
{
public class WebSocketTransport : IMessageTransport
public class WebSocketTransport : IMessageTransport, IDisposable
{
private readonly WebSocket _socket;

Expand Down Expand Up @@ -47,5 +48,10 @@ private Task AbortAsync()
_socket.Abort();
return Task.CompletedTask;
}

public void Dispose()
{
_socket.Dispose();
}
}
}
3 changes: 2 additions & 1 deletion tests/ApiApprovalTests/GraphQL.Server.Transports.Subscriptions.WebSockets.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,14 @@ namespace GraphQL.Server.Transports.WebSockets
protected System.Threading.Tasks.Dataflow.IPropagatorBlock<string, GraphQL.Server.Transports.Subscriptions.Abstractions.OperationMessage> CreateReaderJsonTransformer() { }
public void LinkTo(System.Threading.Tasks.Dataflow.ITargetBlock<GraphQL.Server.Transports.Subscriptions.Abstractions.OperationMessage> target) { }
}
public class WebSocketTransport : GraphQL.Server.Transports.Subscriptions.Abstractions.IMessageTransport
public class WebSocketTransport : GraphQL.Server.Transports.Subscriptions.Abstractions.IMessageTransport, System.IDisposable
{
public WebSocketTransport(System.Net.WebSockets.WebSocket socket, GraphQL.IDocumentWriter documentWriter) { }
public System.Net.WebSockets.WebSocketCloseStatus? CloseStatus { get; }
public GraphQL.Server.Transports.Subscriptions.Abstractions.IReaderPipeline Reader { get; }
public GraphQL.Server.Transports.Subscriptions.Abstractions.IWriterPipeline Writer { get; }
public System.Threading.Tasks.Task CloseAsync() { }
public void Dispose() { }
}
public class WebSocketWriterPipeline : GraphQL.Server.Transports.Subscriptions.Abstractions.IWriterPipeline
{
Expand Down