Subscriptions always use websocket connection

Author: Maydayof

src/GraphQL.Client/GraphQLHttpClient.cs

@@ -15,7 +15,7 @@ namespace GraphQL.Client.Http
 {
     public class GraphQLHttpClient : IGraphQLClient
     {
-        private readonly GraphQLHttpWebSocket _graphQlHttpWebSocket = null;
+        private GraphQLHttpWebSocket _graphQlHttpWebSocket = null;
         private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
         private readonly ConcurrentDictionary<Tuple<GraphQLRequest, Type>, object> _subscriptionStreams = new ConcurrentDictionary<Tuple<GraphQLRequest, Type>, object>();
 
@@ -37,12 +37,12 @@ public class GraphQLHttpClient : IGraphQLClient
         /// <summary>
         /// Publishes all exceptions which occur inside the websocket receive stream (i.e. for logging purposes)
         /// </summary>
-        public IObservable<Exception> WebSocketReceiveErrors => _graphQlHttpWebSocket.ReceiveErrors;
+        public IObservable<Exception> WebSocketReceiveErrors => GetGraphQLHttpWebSocket().ReceiveErrors;
 
         /// <summary>
         /// the websocket connection state
         /// </summary>
-        public IObservable<GraphQLWebsocketConnectionState> WebsocketConnectionState => _graphQlHttpWebSocket.ConnectionState;
+        public IObservable<GraphQLWebsocketConnectionState> WebsocketConnectionState => GetGraphQLHttpWebSocket().ConnectionState;
 
         #region Constructors
 
@@ -75,7 +75,7 @@ public GraphQLHttpClient(GraphQLHttpClientOptions options, IGraphQLWebsocketJson
         public async Task<GraphQLResponse<TResponse>> SendQueryAsync<TResponse>(GraphQLRequest request, CancellationToken cancellationToken = default)
         {
             if (Options.UseWebSocketForQueriesAndMutations)
-                return await _graphQlHttpWebSocket.SendRequest<TResponse>(request, cancellationToken);
+                return await GetGraphQLHttpWebSocket().SendRequest<TResponse>(request, cancellationToken);
 
             return await SendHttpRequestAsync<TResponse>(request, cancellationToken);
         }
@@ -96,7 +96,7 @@ public IObservable<GraphQLResponse<TResponse>> CreateSubscriptionStream<TRespons
             if (_subscriptionStreams.ContainsKey(key))
                 return (IObservable<GraphQLResponse<TResponse>>)_subscriptionStreams[key];
 
-            var observable = _graphQlHttpWebSocket.CreateSubscriptionStream<TResponse>(request);
+            var observable = GetGraphQLHttpWebSocket().CreateSubscriptionStream<TResponse>(request);
 
             _subscriptionStreams.TryAdd(key, observable);
             return observable;
@@ -113,7 +113,7 @@ public IObservable<GraphQLResponse<TResponse>> CreateSubscriptionStream<TRespons
             if (_subscriptionStreams.ContainsKey(key))
                 return (IObservable<GraphQLResponse<TResponse>>)_subscriptionStreams[key];
 
-            var observable = _graphQlHttpWebSocket.CreateSubscriptionStream<TResponse>(request, exceptionHandler);
+            var observable = GetGraphQLHttpWebSocket().CreateSubscriptionStream<TResponse>(request, exceptionHandler);
             _subscriptionStreams.TryAdd(key, observable);
             return observable;
         }
@@ -124,7 +124,7 @@ public IObservable<GraphQLResponse<TResponse>> CreateSubscriptionStream<TRespons
         /// explicitly opens the websocket connection. Will be closed again on disposing the last subscription
         /// </summary>
         /// <returns></returns>
-        public Task InitializeWebsocketConnection() => _graphQlHttpWebSocket.InitializeWebSocket();
+        public Task InitializeWebsocketConnection() => GetGraphQLHttpWebSocket().InitializeWebSocket();
 
         #region Private Methods
 
@@ -158,6 +158,15 @@ private Uri GetWebSocketUri()
             return new Uri($"{webSocketSchema}://{Options.EndPoint.Host}:{Options.EndPoint.Port}{Options.EndPoint.AbsolutePath}");
         }
 
+        private GraphQLHttpWebSocket GetGraphQLHttpWebSocket()
+        {
+            //no instance
+            if (_graphQlHttpWebSocket == null)
+                _graphQlHttpWebSocket = new GraphQLHttpWebSocket(GetWebSocketUri(), this);
+
+            return _graphQlHttpWebSocket;
+        }
+
         #endregion
 
         #region IDisposable