Skip to content

Create new GraphQLHttpWebSocket instance if needed #252

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 6 commits into from
Jun 22, 2020
Merged

Create new GraphQLHttpWebSocket instance if needed #252

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87dbf3e
Create new GraphQLHttpWebSocket instance if needed
Maydayof Jun 17, 2020
5dd4bfc
Subscriptions always use websocket connection
Maydayof Jun 17, 2020
3106d0e
Use Lazy<GraphQLHttpWebSocket> instead of singleton pattern
Maydayof Jun 22, 2020
d644f03
Update src/GraphQL.Client/GraphQLHttpClient.cs
Maydayof Jun 22, 2020
1de5766
Dispose HttpWebSocket if created
Maydayof Jun 22, 2020
e11d067
_lazyHttpWebSocket is not null
Maydayof Jun 22, 2020
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
9 changes: 6 additions & 3 deletions src/GraphQL.Client/GraphQLHttpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ namespace GraphQL.Client.Http
{
public class GraphQLHttpClient : IGraphQLClient
{
private readonly GraphQLHttpWebSocket _graphQlHttpWebSocket;
private readonly Lazy<GraphQLHttpWebSocket> _lazyHttpWebSocket;
private GraphQLHttpWebSocket _graphQlHttpWebSocket => _lazyHttpWebSocket.Value;

private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
private readonly ConcurrentDictionary<Tuple<GraphQLRequest, Type>, object> _subscriptionStreams = new ConcurrentDictionary<Tuple<GraphQLRequest, Type>, object>();

Expand Down Expand Up @@ -63,7 +65,7 @@ public GraphQLHttpClient(GraphQLHttpClientOptions options, IGraphQLWebsocketJson
if (!HttpClient.DefaultRequestHeaders.UserAgent.Any())
HttpClient.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version.ToString()));

_graphQlHttpWebSocket = new GraphQLHttpWebSocket(GetWebSocketUri(), this);
_lazyHttpWebSocket = new Lazy<GraphQLHttpWebSocket>(() => new GraphQLHttpWebSocket(GetWebSocketUri(), this));
}

#endregion
Expand Down Expand Up @@ -186,7 +188,8 @@ protected virtual void Dispose(bool disposing)
Debug.WriteLine($"Disposing GraphQLHttpClient on endpoint {Options.EndPoint}");
_cancellationTokenSource.Cancel();
HttpClient.Dispose();
_graphQlHttpWebSocket.Dispose();
if ( _lazyHttpWebSocket.IsValueCreated )
_lazyHttpWebSocket.Value.Dispose();
_cancellationTokenSource.Dispose();
}
}
Expand Down