improve DI capabilities of GraphQLLocalExecutionClient

Author: rose-a

src/GraphQL.Client.LocalExecution/GraphQL.Client.LocalExecution.csproj

@@ -8,8 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL" Version="4.6.0" />
+    <PackageReference Include="GraphQL.MicrosoftDI" Version="4.6.1" />
     <PackageReference Include="GraphQL.NewtonsoftJson" Version="4.6.0" />
+    <PackageReference Include="GraphQL.SystemReactive" Version="4.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 

src/GraphQL.Client.LocalExecution/GraphQLLocalExecutionClient.cs

@@ -21,7 +21,7 @@ namespace GraphQL.Client.LocalExecution
     public static class GraphQLLocalExecutionClient
     {
         public static GraphQLLocalExecutionClient<TSchema> New<TSchema>(TSchema schema, IGraphQLJsonSerializer serializer) where TSchema : ISchema
-            => new GraphQLLocalExecutionClient<TSchema>(schema, serializer);
+            => new GraphQLLocalExecutionClient<TSchema>(schema, serializer, new SubscriptionDocumentExecuter(), new DocumentWriter());
     }
 
     public class GraphQLLocalExecutionClient<TSchema> : IGraphQLClient where TSchema : ISchema
@@ -41,18 +41,18 @@ public class GraphQLLocalExecutionClient<TSchema> : IGraphQLClient where TSchema
 
         public IGraphQLJsonSerializer Serializer { get; }
 
-        private readonly DocumentExecuter _documentExecuter;
-        private readonly DocumentWriter _documentWriter;
+        private readonly IDocumentExecuter _documentExecuter;
+        private readonly IDocumentWriter _documentWriter;
 
-        public GraphQLLocalExecutionClient(TSchema schema, IGraphQLJsonSerializer serializer)
+        public GraphQLLocalExecutionClient(TSchema schema, IGraphQLJsonSerializer serializer, IDocumentExecuter documentExecuter, IDocumentWriter documentWriter)
         {
             Schema = schema ?? throw new ArgumentNullException(nameof(schema), "no schema configured");
             Serializer = serializer ?? throw new ArgumentNullException(nameof(serializer), "please configure the JSON serializer you want to use");
 
             if (!Schema.Initialized)
                 Schema.Initialize();
-            _documentExecuter = new DocumentExecuter();
-            _documentWriter = new DocumentWriter();
+            _documentExecuter = documentExecuter;
+            _documentWriter = documentWriter;
         }
 
         public void Dispose() { }
@@ -78,7 +78,7 @@ public IObservable<GraphQLResponse<TResponse>> CreateSubscriptionStream<TRespons
         private async Task<GraphQLResponse<TResponse>> ExecuteQueryAsync<TResponse>(GraphQLRequest request, CancellationToken cancellationToken)
         {
             var executionResult = await ExecuteAsync(request, cancellationToken);
-            return await ExecutionResultToGraphQLResponse<TResponse>(executionResult, cancellationToken);
+            return await ExecutionResultToGraphQLResponseAsync<TResponse>(executionResult, cancellationToken);
         }
         private async Task<IObservable<GraphQLResponse<TResponse>>> ExecuteSubscriptionAsync<TResponse>(GraphQLRequest request, CancellationToken cancellationToken = default)
         {
@@ -87,12 +87,12 @@ private async Task<IObservable<GraphQLResponse<TResponse>>> ExecuteSubscriptionA
 
             return stream == null
                 ? Observable.Throw<GraphQLResponse<TResponse>>(new InvalidOperationException("the GraphQL execution did not return an observable"))
-                : stream.SelectMany(executionResult => Observable.FromAsync(token => ExecutionResultToGraphQLResponse<TResponse>(executionResult, token)));
+                : stream.SelectMany(executionResult => Observable.FromAsync(token => ExecutionResultToGraphQLResponseAsync<TResponse>(executionResult, token)));
         }
 
         private async Task<ExecutionResult> ExecuteAsync(GraphQLRequest request, CancellationToken cancellationToken = default)
         {
-            var serializedRequest = Serializer.SerializeToString(request);
+            string serializedRequest = Serializer.SerializeToString(request);
 
             var deserializedRequest = JsonConvert.DeserializeObject<GraphQLRequest>(serializedRequest);
             var inputs = deserializedRequest.Variables != null
@@ -103,22 +103,21 @@ private async Task<ExecutionResult> ExecuteAsync(GraphQLRequest request, Cancell
             var result = await _documentExecuter.ExecuteAsync(options =>
             {
                 options.Schema = Schema;
-                options.OperationName = request.OperationName;
-                options.Query = request.Query;
+                options.OperationName = deserializedRequest?.OperationName;
+                options.Query = deserializedRequest?.Query;
                 options.Inputs = inputs;
                 options.CancellationToken = cancellationToken;
             });
 
             return result;
         }
 
-        private async Task<GraphQLResponse<TResponse>> ExecutionResultToGraphQLResponse<TResponse>(ExecutionResult executionResult, CancellationToken cancellationToken = default)
+        private async Task<GraphQLResponse<TResponse>> ExecutionResultToGraphQLResponseAsync<TResponse>(ExecutionResult executionResult, CancellationToken cancellationToken = default)
         {
-            string json = await _documentWriter.WriteToStringAsync(executionResult);
-            // serialize result into utf8 byte stream
-            var resultStream = new MemoryStream(Encoding.UTF8.GetBytes(json));
-            // deserialize using the provided serializer
-            return await Serializer.DeserializeFromUtf8StreamAsync<TResponse>(resultStream, cancellationToken);
+            using var stream = new MemoryStream();
+            await _documentWriter.WriteAsync(stream, executionResult, cancellationToken);
+            stream.Seek(0, SeekOrigin.Begin);
+            return await Serializer.DeserializeFromUtf8StreamAsync<TResponse>(stream, cancellationToken);
         }
 
         #endregion

src/GraphQL.Client.LocalExecution/ServiceCollectionExtensions.cs

@@ -0,0 +1,18 @@
+using GraphQL.Client.Abstractions;
+using GraphQL.DI;
+using GraphQL.MicrosoftDI;
+using GraphQL.Types;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace GraphQL.Client.LocalExecution
+{
+    public static class ServiceCollectionExtensions
+    {
+        public static IGraphQLBuilder AddGraphQLLocalExecutionClient<TSchema>(this IServiceCollection services) where TSchema : ISchema
+        {
+            services.AddSingleton<GraphQLLocalExecutionClient<TSchema>>();
+            services.AddSingleton<IGraphQLClient, GraphQLLocalExecutionClient<TSchema>>();
+            return services.AddGraphQL();
+        }
+    }
+}