Async request stream deserialization with System.Text.Json

Directory.Build.props

@@ -12,38 +12,45 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <IsNetCore30OnwardsTarget>$(TargetFramework.Equals('netcoreapp3.0'))</IsNetCore30OnwardsTarget>
+    <IsNetCore3OnwardsTarget>$(TargetFramework.StartsWith('netcoreapp3.'))</IsNetCore3OnwardsTarget>
   </PropertyGroup>
 
-  <PropertyGroup Label="Net Core 3.0" Condition="'$(IsNetCore30OnwardsTarget)' == 'True'">
+  <PropertyGroup Label="Net Core 3.1" Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <MicrosoftAspNetCoreTestHostVersion>3.1.0</MicrosoftAspNetCoreTestHostVersion>
+    <MicrosoftExtensionsLoggingVersion>3.1.0</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsOptionsVersion>3.1.0</MicrosoftExtensionsOptionsVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>3.1.0</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>3.1.0</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Net Core 3.0" Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
     <MicrosoftAspNetCoreTestHostVersion>3.0.0</MicrosoftAspNetCoreTestHostVersion>
     <MicrosoftExtensionsLoggingVersion>3.0.0</MicrosoftExtensionsLoggingVersion>
     <MicrosoftExtensionsOptionsVersion>3.0.0</MicrosoftExtensionsOptionsVersion>
     <MicrosoftExtensionsDependencyInjectionVersion>3.0.0</MicrosoftExtensionsDependencyInjectionVersion>
     <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>3.0.0</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
   </PropertyGroup>
 
-  <PropertyGroup Label="Net Core 2.2" Condition="'$(IsNetCore30OnwardsTarget)' == 'False'">
+  <PropertyGroup Label="Net Core 2.2" Condition="'$(IsNetCore3OnwardsTarget)' == 'False'">
+    <MicrosoftAspNetCoreVersion>2.2.0</MicrosoftAspNetCoreVersion>
+    <MicrosoftAspNetCoreAuthorizationVersion>2.2.0</MicrosoftAspNetCoreAuthorizationVersion>
+    <MicrosoftAspNetCoreHostingAbstractionsVersion>2.2.0</MicrosoftAspNetCoreHostingAbstractionsVersion>
+    <MicrosoftAspNetCoreHttpAbstractionsVersion>2.2.0</MicrosoftAspNetCoreHttpAbstractionsVersion>
+    <MicrosoftAspNetCoreHttpVersion>2.2.2</MicrosoftAspNetCoreHttpVersion>
     <MicrosoftAspNetCoreTestHostVersion>2.2.0</MicrosoftAspNetCoreTestHostVersion>
+    <MicrosoftAspNetCoreWebSocketsVersion>2.2.1</MicrosoftAspNetCoreWebSocketsVersion>    
     <MicrosoftExtensionsLoggingVersion>2.2.0</MicrosoftExtensionsLoggingVersion>
     <MicrosoftExtensionsOptionsVersion>2.2.0</MicrosoftExtensionsOptionsVersion>
     <MicrosoftExtensionsDependencyInjectionVersion>2.2.0</MicrosoftExtensionsDependencyInjectionVersion>
     <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>2.2.0</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="Package dependency versions">
-    <MicrosoftAspNetCoreVersion>2.2.0</MicrosoftAspNetCoreVersion>
-    <MicrosoftAspNetCoreHttpAbstractionsVersion>2.2.0</MicrosoftAspNetCoreHttpAbstractionsVersion>
-    <MicrosoftAspNetCoreHttpVersion>2.2.2</MicrosoftAspNetCoreHttpVersion>
-    <MicrosoftAspNetCoreWebSocketsVersion>2.2.1</MicrosoftAspNetCoreWebSocketsVersion>
-    <MicrosoftAspNetCoreAuthorizationVersion>2.2.0</MicrosoftAspNetCoreAuthorizationVersion>
-    <MicrosoftAspNetCoreHostingAbstractionsVersion>2.2.0</MicrosoftAspNetCoreHostingAbstractionsVersion>
-
     <MicrosoftNETTestSdkVersion>16.3.0</MicrosoftNETTestSdkVersion>
     <CastleCoreVersion>4.4.0</CastleCoreVersion>
     <NSubstituteVersion>3.1.0</NSubstituteVersion>
-    <NewtonsoftJsonVersion>12.0.2</NewtonsoftJsonVersion>
-    <GraphQLVersion>3.0.0-preview-1430</GraphQLVersion>
+    <NewtonsoftJsonVersion>12.0.3</NewtonsoftJsonVersion>
+    <GraphQLVersion>3.0.0-preview-1470</GraphQLVersion>
     <MoqVersion>4.13.1</MoqVersion>
     <ShouldlyVersion>3.0.2</ShouldlyVersion>
 

GraphQL.Server.sln

@@ -55,6 +55,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{5C07
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ui.Altair", "src\Ui.Altair\Ui.Altair.csproj", "{008CFAAB-64B6-4948-99FA-E8735CA7E81A}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Transports.AspNetCore.NewtonsoftJson", "src\Transports.AspNetCore.NewtonsoftJson\Transports.AspNetCore.NewtonsoftJson.csproj", "{24975BA5-46B0-4E3A-8703-9599483138B8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Transports.AspNetCore.SystemTextJson", "src\Transports.AspNetCore.SystemTextJson\Transports.AspNetCore.SystemTextJson.csproj", "{5CEB56EE-C58D-4EF8-90E3-5B53D9354C47}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -121,6 +125,14 @@ Global
 		{008CFAAB-64B6-4948-99FA-E8735CA7E81A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{008CFAAB-64B6-4948-99FA-E8735CA7E81A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{008CFAAB-64B6-4948-99FA-E8735CA7E81A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{24975BA5-46B0-4E3A-8703-9599483138B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{24975BA5-46B0-4E3A-8703-9599483138B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{24975BA5-46B0-4E3A-8703-9599483138B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{24975BA5-46B0-4E3A-8703-9599483138B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5CEB56EE-C58D-4EF8-90E3-5B53D9354C47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5CEB56EE-C58D-4EF8-90E3-5B53D9354C47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5CEB56EE-C58D-4EF8-90E3-5B53D9354C47}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5CEB56EE-C58D-4EF8-90E3-5B53D9354C47}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

README.md

@@ -1,9 +1,6 @@
 GraphQL for .NET - Subscription Transport WebSockets
 ====================================================
 
->WARNING: not tested in heavy production use! That said if you are using this in production
->drop me a line to tell me how's it working for you. Maybe I can take this disclaimer off.
-
 [![Build status](https://ci.appveyor.com/api/projects/status/x0nf67vfao60wf7e/branch/master?svg=true)](https://ci.appveyor.com/project/graphql-dotnet-ci/server/branch/master)
 
 Provides the following packages:
@@ -12,11 +9,13 @@ Provides the following packages:
 |---------|-----------|
 | GraphQL.Server.Core | [![Nuget](https://img.shields.io/nuget/dt/GraphQL.Server.Core)](https://www.nuget.org/packages/GraphQL.Server.Core/) |
 | GraphQL.Server.Transports.AspNetCore | [![Nuget](https://img.shields.io/nuget/dt/GraphQL.Server.Transports.AspNetCore)](https://www.nuget.org/packages/GraphQL.Server.Transports.AspNetCore/) |
+| GraphQL.Server.Transports.AspNetCore.NewtonsoftJson | [![Nuget](https://img.shields.io/nuget/dt/GraphQL.Server.Transports.AspNetCore.NewtonsoftJson)](https://www.nuget.org/packages/GraphQL.Server.Transports.AspNetCore.NewtonsoftJson/) |
+| GraphQL.Server.Transports.AspNetCore.SystemTextJson | [![Nuget](https://img.shields.io/nuget/dt/GraphQL.Server.Transports.AspNetCore.SystemTextJson)](https://www.nuget.org/packages/GraphQL.Server.Transports.AspNetCore.SystemTextJson/) |
 | GraphQL.Server.Transports.Subscriptions.Abstractions | [![Nuget](https://img.shields.io/nuget/dt/GraphQL.Server.Transports.Subscriptions.Abstractions)](https://www.nuget.org/packages/GraphQL.Server.Transports.Subscriptions.Abstractions/) |
 | GraphQL.Server.Transports.WebSockets | [![Nuget](https://img.shields.io/nuget/dt/GraphQL.Server.Transports.WebSockets)](https://www.nuget.org/packages/GraphQL.Server.Transports.WebSockets/) |
+| GraphQL.Server.Ui.Altair | [![Nuget](https://img.shields.io/nuget/dt/GraphQL.Server.Ui.Altair)](https://www.nuget.org/packages/GraphQL.Server.Ui.Altair/) |
 | GraphQL.Server.Ui.Playground | [![Nuget](https://img.shields.io/nuget/dt/GraphQL.Server.Ui.Playground)](https://www.nuget.org/packages/GraphQL.Server.Ui.Playground/) |
 | GraphQL.Server.Ui.GraphiQL | [![Nuget](https://img.shields.io/nuget/dt/GraphQL.Server.Ui.GraphiQL)](https://www.nuget.org/packages/GraphQL.Server.Ui.GraphiQL/) |
-| GraphQL.Server.Ui.Altair | [![Nuget](https://img.shields.io/nuget/dt/GraphQL.Server.Ui.Altair)](https://www.nuget.org/packages/GraphQL.Server.Ui.Altair/) |
 | GraphQL.Server.Ui.Voyager | [![Nuget](https://img.shields.io/nuget/dt/GraphQL.Server.Ui.Voyager)](https://www.nuget.org/packages/GraphQL.Server.Ui.Voyager/) |
 | GraphQL.Server.Authorization.AspNetCore | [![Nuget](https://img.shields.io/nuget/dt/GraphQL.Server.Authorization.AspNetCore)](https://www.nuget.org/packages/GraphQL.Server.Authorization.AspNetCore/) |
 
@@ -27,34 +26,48 @@ Transport compatible with [Apollo](https://github.com/apollographql/subscription
 For just the HTTP middleware:
 >`dotnet add package GraphQL.Server.Transports.AspNetCore`
 
+The HTTP middleware needs an `IGraphQLRequestDeserializer` implementation:
+> .NET Core 3+:  
+> `dotnet add package GraphQL.Server.Serialization.SystemTextJson`  
+> Legacy (prior to .NET Core 3):  
+> `dotnet add package GraphQL.Server.Serialization.NewtonsoftJson`  
+> (or your own)
+
 For the WebSocket subscription protocol (depends on above) middleware:
 >`dotnet add package GraphQL.Server.Transports.WebSockets`
 
 For the UI middleware/s:
+>`dotnet add package GraphQL.Server.Ui.Altair`  
 >`dotnet add package GraphQL.Server.Ui.GraphiQL`  
 >`dotnet add package GraphQL.Server.Ui.Playground`  
->`dotnet add package GraphQL.Server.Ui.Altair`  
 >`dotnet add package GraphQL.Server.Ui.Voyager`  
 
-
 ### Configure
 
+See the sample project's Startup.cs for full details.
+
 ``` csharp
 public void ConfigureServices(IServiceCollection services)
 {
-    services.AddSingleton<ChatSchema>();
-
     // Add GraphQL services and configure options
-    services.AddGraphQL(options =>
-    {
-        options.EnableMetrics = true;
-        options.ExposeExceptions = this.Environment.IsDevelopment();
-    })
-    .AddWebSockets() // Add required services for web socket support
-    .AddDataLoader(); // Add required services for DataLoader support
+    services
+        .AddSingleton<IChat, Chat>()
+        .AddSingleton<ChatSchema>()
+        .AddGraphQL(options =>
+        {
+            options.EnableMetrics = Environment.IsDevelopment();
+            options.ExposeExceptions = Environment.IsDevelopment();
+            options.UnhandledExceptionDelegate = ctx => { Console.WriteLine(ctx.OriginalException) };
+        })
+        // Add required services for de/serialization
+        .AddSystemTextJson(deserializerSettings => { }, serializerSettings => { }) // For .NET Core 3+
+        .AddNewtonsoftJson(deserializerSettings => { }, serializerSettings => { }) // For everything else
+        .AddWebSockets() // Add required services for web socket support
+        .AddDataLoader() // Add required services for DataLoader support
+        .AddGraphTypes(typeof(ChatSchema)) // Add all IGraphType implementors in assembly which ChatSchema exists 
 }
 
-public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+public void Configure(IApplicationBuilder app)
 {
     // this is required for websockets support
     app.UseWebSockets();
@@ -91,10 +104,11 @@ access the properties including your actual `UserContext` by using the
 
 ## Sample
 
-Samples.Server shows a simple Chat style example of how subscription transport is used
-with GraphiQL integration. An example works for `netcoreapp2.2` and `netcoreapp3.0` platforms.
+Samples.Server shows a simple Chat example demonstrating the subscription transport.
+It can be run as `netcoreapp2.2`, `netcoreapp3.0` or `netcoreapp3.1`, and supports
+various GraphQL client IDEs (by default opening GraphQL Playground).
 
-Here are example queries to get started. Use three browser tabs or better yet windows 
+Here are some example queries to get started. Use three browser tabs or better yet windows 
 to view the changes.
 
 ### Subscription 1

appveyor.yml

@@ -17,7 +17,7 @@ test: off
 skip_branch_with_pr: false
 
 install:
-  - ps: choco install dotnetcore-sdk --no-progress --confirm --version 3.0.100
+  - ps: choco install dotnetcore-sdk --no-progress --confirm --version 3.1.101
   - dotnet --version
 
 on_failure:

build.cake

@@ -5,10 +5,11 @@ var configuration = Argument<string>("configuration", "Release");
 var artifactsDir = Directory(Argument<string>("artifactsDir", "./artifacts"));
 var publishDir = Directory(Argument<string>("publishDir", "./publish"));
 var runtime = Argument<string>("runtime", "win-x64");
-var sln = "./GraphQL.Server.Transports.sln";
 var projectFiles = new [] {
   "./src/Core/Core.csproj",
   "./src/Transports.AspNetCore/Transports.AspNetCore.csproj",
+  "./src/Transports.AspNetCore.NewtonsoftJson/Transports.AspNetCore.NewtonsoftJson.csproj",
+  "./src/Transports.AspNetCore.SystemTextJson/Transports.AspNetCore.SystemTextJson.csproj",
   "./src/Transports.Subscriptions.Abstractions/Transports.Subscriptions.Abstractions.csproj",
   "./src/Transports.Subscriptions.WebSockets/Transports.Subscriptions.WebSockets.csproj",
   "./src/Ui.Playground/Ui.Playground.csproj",
@@ -113,8 +114,8 @@ Task("SetVersion")
 Task("Test")
   .Does(()=> 
   {
-      var projectFiles = GetFiles("./tests/**/*.csproj");
-      foreach (var file in projectFiles)
+      var testProjectFiles = GetFiles("./tests/**/*.csproj");
+      foreach (var file in testProjectFiles)
       {
           DotNetCoreTest(file.FullPath);
       }

samples/Samples.Schemas.Chat/Samples.Schemas.Chat.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="GraphQL" Version="$(GraphQLVersion)" />
+    <PackageReference Include="GraphQL.NewtonsoftJson" Version="$(GraphQLVersion)" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Transports.Subscriptions.Abstractions\Transports.Subscriptions.Abstractions.csproj" />

samples/Samples.Server/GraphQLHttpMiddlewareWithLogs.cs

@@ -1,9 +1,9 @@
-using GraphQL.Server.Transports.AspNetCore;
+using GraphQL.Server.Common;
+using GraphQL.Server.Transports.AspNetCore;
 using GraphQL.Server.Transports.AspNetCore.Common;
 using GraphQL.Types;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -16,8 +16,12 @@ public class GraphQLHttpMiddlewareWithLogs<TSchema> : GraphQLHttpMiddleware<TSch
     {
         private readonly ILogger _logger;
 
-        public GraphQLHttpMiddlewareWithLogs(ILogger<GraphQLHttpMiddleware<TSchema>> logger, RequestDelegate next, PathString path, Action<JsonSerializerSettings> configure)
-            : base(next, path, configure)
+        public GraphQLHttpMiddlewareWithLogs(
+            ILogger<GraphQLHttpMiddleware<TSchema>> logger,
+            RequestDelegate next,
+            PathString path,
+            IGraphQLRequestDeserializer requestDeserializer)
+            : base(next, path, requestDeserializer)
         {
             _logger = logger;
         }

samples/Samples.Server/Samples.Server.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;netcoreapp2.2</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp3.0;netcoreapp2.2</TargetFrameworks>
     <AssemblyName>GraphQL.Samples.Server</AssemblyName>
     <RootNamespace>GraphQL.Samples.Server</RootNamespace>
   </PropertyGroup>
@@ -11,14 +11,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL" Version="$(GraphQLVersion)" />
+
     <PackageReference Include="Serilog" Version="$(SerilogVersion)" />
     <PackageReference Include="Serilog.AspNetCore" Version="$(SerilogAspNetCoreVersion)" />
     <PackageReference Include="Serilog.Sinks.Console" Version="$(SerilogSinksConsoleVersion)" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Transports.AspNetCore\Transports.AspNetCore.csproj" />
     <ProjectReference Include="..\..\src\Transports.Subscriptions.WebSockets\Transports.Subscriptions.WebSockets.csproj" />
     <ProjectReference Include="..\..\src\Ui.GraphiQL\Ui.GraphiQL.csproj" />
     <ProjectReference Include="..\..\src\Ui.Playground\Ui.Playground.csproj" />
@@ -27,9 +26,14 @@
     <ProjectReference Include="..\Samples.Schemas.Chat\Samples.Schemas.Chat.csproj" />
   </ItemGroup>
 
-  <ItemGroup Label="References for .NET Core 2.2" Condition="'$(IsNetCore30OnwardsTarget)' == 'False'">
+  <ItemGroup Label="References for .NET Core 3.0+" Condition="'$(IsNetCore3OnwardsTarget)' == 'True'">
+    <ProjectReference Include="..\..\src\Transports.AspNetCore.SystemTextJson\Transports.AspNetCore.SystemTextJson.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Label="References for .NET Core 2.2" Condition="'$(IsNetCore3OnwardsTarget)' == 'False'">
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="$(MicrosoftAspNetCoreWebSocketsVersion)" />
+    <ProjectReference Include="..\..\src\Transports.AspNetCore.NewtonsoftJson\Transports.AspNetCore.NewtonsoftJson.csproj" />
   </ItemGroup>
 
 </Project>

samples/Samples.Server/Startup.cs

@@ -12,7 +12,6 @@
 using System.Collections.Generic;
 
 #if !NETCOREAPP2_2
-using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.Extensions.Hosting;
 #endif
 
@@ -41,32 +40,23 @@ public Startup(IConfiguration configuration, IWebHostEnvironment environment)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-#if NETCOREAPP3_0
-            // Workaround until GraphQL can swap off Newtonsoft.Json and onto the new MS one.
-            // Depending on whether you're using IIS or Kestrel, the code required is different
-            // See: https://github.com/graphql-dotnet/graphql-dotnet/issues/1116
-            services.Configure<KestrelServerOptions>(options =>
-            {
-                options.AllowSynchronousIO = true;
-            });
-            services.Configure<IISServerOptions>(options =>
-            {
-                options.AllowSynchronousIO = true;
-            });
-#endif
-
             services
                 .AddSingleton<IChat, Chat>()
                 .AddSingleton<ChatSchema>()
                 .AddGraphQL(options =>
                 {
-                    options.EnableMetrics = true;
+                    options.EnableMetrics = Environment.IsDevelopment();
                     options.ExposeExceptions = Environment.IsDevelopment();
                     options.UnhandledExceptionDelegate = ctx =>
                     {
                         Console.WriteLine("error: " + ctx.OriginalException.Message);
                     };
                 })
+#if NETCOREAPP2_2
+                .AddNewtonsoftJson(deserializerSettings => { }, serializerSettings => { })
+#else
+                .AddSystemTextJson(deserializerSettings => { }, serializerSettings => { })
+#endif
                 .AddWebSockets()
                 .AddDataLoader()
                 .AddGraphTypes(typeof(ChatSchema));