Merge pull request #277 from graphql-dotnet/handle-websocket-url-scheme

handle WebSocket url scheme

Author: rose-a

src/GraphQL.Client/GraphQLHttpClient.cs

@@ -55,7 +55,7 @@ public GraphQLHttpClient(Uri endPoint, IGraphQLWebsocketJsonSerializer serialize
         public GraphQLHttpClient(Action<GraphQLHttpClientOptions> configure, IGraphQLWebsocketJsonSerializer serializer) : this(configure.New(), serializer) { }
 
         public GraphQLHttpClient(GraphQLHttpClientOptions options, IGraphQLWebsocketJsonSerializer serializer) : this(options, serializer, new HttpClient(options.HttpMessageHandler)) { }
-        
+
         public GraphQLHttpClient(GraphQLHttpClientOptions options, IGraphQLWebsocketJsonSerializer serializer, HttpClient httpClient)
         {
             Options = options ?? throw new ArgumentNullException(nameof(options));
@@ -65,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()));
 
-            _lazyHttpWebSocket = new Lazy<GraphQLHttpWebSocket>(() => new GraphQLHttpWebSocket(GetWebSocketUri(), this));
+            _lazyHttpWebSocket = new Lazy<GraphQLHttpWebSocket>(() => new GraphQLHttpWebSocket(Options.EndPoint.GetWebSocketUri(), this));
         }
 
         #endregion
@@ -75,7 +75,7 @@ public GraphQLHttpClient(GraphQLHttpClientOptions options, IGraphQLWebsocketJson
         /// <inheritdoc />
         public async Task<GraphQLResponse<TResponse>> SendQueryAsync<TResponse>(GraphQLRequest request, CancellationToken cancellationToken = default)
         {
-            if (Options.UseWebSocketForQueriesAndMutations)
+            if (Options.UseWebSocketForQueriesAndMutations || Options.EndPoint.HasWebSocketScheme())
                 return await _graphQlHttpWebSocket.SendRequest<TResponse>(request, cancellationToken);
 
             return await SendHttpRequestAsync<TResponse>(request, cancellationToken);
@@ -132,7 +132,7 @@ public IObservable<GraphQLResponse<TResponse>> CreateSubscriptionStream<TRespons
         private async Task<GraphQLHttpResponse<TResponse>> SendHttpRequestAsync<TResponse>(GraphQLRequest request, CancellationToken cancellationToken = default)
         {
             var preprocessedRequest = await Options.PreprocessRequest(request, this);
-            
+
             using var httpRequestMessage = preprocessedRequest.ToHttpRequestMessage(Options, JsonSerializer);
             using var httpResponseMessage = await HttpClient.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
 
@@ -152,13 +152,6 @@ private async Task<GraphQLHttpResponse<TResponse>> SendHttpRequestAsync<TRespons
 
             throw new GraphQLHttpRequestException(httpResponseMessage.StatusCode, httpResponseMessage.Headers, content);
         }
-
-        private Uri GetWebSocketUri()
-        {
-            string webSocketSchema = Options.EndPoint.Scheme == "https" ? "wss" : "ws";
-            return new Uri($"{webSocketSchema}://{Options.EndPoint.Host}:{Options.EndPoint.Port}{Options.EndPoint.AbsolutePath}");
-        }
-
         #endregion
 
         #region IDisposable

src/GraphQL.Client/UriExtensions.cs

@@ -0,0 +1,28 @@
+using System;
+
+namespace GraphQL.Client.Http
+{
+    public static class UriExtensions
+    {
+        /// <summary>
+        /// Returns true if <see cref="Uri.Scheme"/> equals "wss" or "ws"
+        /// </summary>
+        /// <param name="uri"></param>
+        /// <returns></returns>
+        public static bool HasWebSocketScheme(this Uri uri) => uri.Scheme.Equals("wss") || uri.Scheme.Equals("ws");
+
+        /// <summary>
+        /// Infers the websocket uri from <paramref name="uri"/>.
+        /// </summary>
+        /// <param name="uri"></param>
+        /// <returns></returns>
+        public static Uri GetWebSocketUri(this Uri uri)
+        {
+            if (uri.HasWebSocketScheme())
+                return uri;
+
+            string webSocketScheme = uri.Scheme == "https" ? "wss" : "ws";
+            return new Uri($"{webSocketScheme}://{uri.Host}:{uri.Port}{uri.PathAndQuery}");
+        }
+    }
+}

tests/GraphQL.Integration.Tests/WebsocketTests/Base.cs

@@ -70,6 +70,16 @@ public async void CanSendRequestViaWebsocket()
             response.Data.AddMessage.Content.Should().Be(message);
         }
 
+        [Fact]
+        public async void CanUseWebSocketScheme()
+        {
+            ChatClient.Options.EndPoint = ChatClient.Options.EndPoint.GetWebSocketUri();
+            await ChatClient.InitializeWebsocketConnection();
+            const string message = "some random testing message";
+            var response = await ChatClient.AddMessageAsync(message);
+            response.Data.AddMessage.Content.Should().Be(message);
+        }
+
         [Fact]
         public async void WebsocketRequestCanBeCancelled()
         {