DRV-47: Update C# driver to speak HTTP/2 (#137)

Author: parkhomenko

FaunaDB.Client/Client/DefaultClientIO.cs

@@ -27,25 +27,31 @@ class DefaultClientIO : IClientIO
         readonly AuthenticationHeaderValue authHeader;
 
         private LastSeen lastSeen;
+        private Version httpVersion;
 
         public const string StreamingPath = "stream";
         public const HttpMethodKind StreamingHttpMethod = HttpMethodKind.Post;
 
-        internal DefaultClientIO(HttpClient client, AuthenticationHeaderValue authHeader, LastSeen lastSeen, Uri endpoint, TimeSpan? timeout)
+        internal DefaultClientIO(HttpClient client, AuthenticationHeaderValue authHeader, LastSeen lastSeen, Uri endpoint, TimeSpan? timeout, Version httpVersion)
         {
             this.client = client;
             this.authHeader = authHeader;
             this.lastSeen = lastSeen;
             this.endpoint = endpoint;
             this.clientTimeout = timeout;
+#if NETSTANDARD2_1
+            this.httpVersion = httpVersion == null ? new Version(2, 0) : httpVersion;
+#else
+            this.httpVersion = httpVersion == null ? new Version(1, 1) : httpVersion;
+#endif
         }
 
-        public DefaultClientIO(string secret, Uri endpoint, TimeSpan? timeout = null, HttpClient httpClient = null)
-            : this(httpClient ?? CreateClient(), AuthHeader(secret), new LastSeen(), endpoint, timeout)
+        public DefaultClientIO(string secret, Uri endpoint, TimeSpan? timeout = null, HttpClient httpClient = null, Version httpVersion = null)
+            : this(httpClient ?? CreateClient(), AuthHeader(secret), new LastSeen(), endpoint, timeout, httpVersion)
         { }
 
         public IClientIO NewSessionClient(string secret) =>
-            new DefaultClientIO(client, AuthHeader(secret), lastSeen, endpoint, clientTimeout);
+            new DefaultClientIO(client, AuthHeader(secret), lastSeen, endpoint, clientTimeout, httpVersion);
 
         public Task<RequestResult> DoRequest(HttpMethodKind method, string path, string data, IReadOnlyDictionary<string, string> query = null, TimeSpan? queryTimeout = null) =>
             DoRequestAsync(method, path, data, query, queryTimeout);
@@ -69,6 +75,7 @@ async Task<RequestResult> DoRequestAsync(HttpMethodKind method, string path, str
             message.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
             message.Headers.Add("X-FaunaDB-API-Version", "4");
             message.Headers.Add("X-Driver-Env", RuntimeEnvironmentHeader.Construct(EnvironmentEditor.Create()));
+            message.Version = httpVersion;
 
             var last = lastSeen.Txn;
             if (last.HasValue)
@@ -119,6 +126,8 @@ async Task<StreamingRequestResult> DoStreamingRequestAsync(string data, IReadOnl
             message.Headers.Authorization = authHeader;
             message.Headers.Add("X-FaunaDB-API-Version", "4");
             message.Headers.Add("X-Driver-Env", RuntimeEnvironmentHeader.Construct(EnvironmentEditor.Create()));
+            message.Version = httpVersion;
+            message.SetTimeout(Timeout.InfiniteTimeSpan);
 
             var last = lastSeen.Txn;
             if (last.HasValue)
@@ -128,7 +137,7 @@ async Task<StreamingRequestResult> DoStreamingRequestAsync(string data, IReadOnl
 
             var httpResponse = await client.SendAsync(message, HttpCompletionOption.ResponseHeadersRead, CancellationToken.None).ConfigureAwait(false);
 
-            Stream response = await httpResponse.Content.ReadAsStreamAsync();
+            Stream response = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false);
 
             var endTime = DateTime.UtcNow;
 

FaunaDB.Client/Client/FaunaClient.cs

@@ -31,12 +31,14 @@ public class FaunaClient
         /// <param name="secret">Auth token for the FaunaDB server.</param>
         /// <param name="endpoint">URL for the FaunaDB server. Defaults to "https://db.fauna.com:443"</param>
         /// <param name="timeout">Timeout for I/O operations. Defaults to 1 minute.</param>
+        /// <param name="httpVersion">Version of http. Default value is HttpVersion.Version11, is you use .net core 3.0 and above you can enable http/2 support by passing HttpVersion.Version20</param>
         public FaunaClient(
             string secret,
             string endpoint = "https://db.fauna.com:443",
             TimeSpan? timeout = null,
-            HttpClient httpClient = null)
-            : this(CreateClient(secret, endpoint, timeout, httpClient))
+            HttpClient httpClient = null,
+            Version httpVersion = null)
+            : this(CreateClient(secret, endpoint, timeout, httpClient, httpVersion))
         { }
 
         /// <summary>
@@ -241,13 +243,15 @@ static IClientIO CreateClient(
             string secret,
             string endpoint,
             TimeSpan? timeout = null,
-            HttpClient httpClient = null)
+            HttpClient httpClient = null,
+            Version httpVersion = null)
         {
             return new DefaultClientIO(
                 secret: secret,
                 endpoint: new Uri(endpoint),
                 timeout: timeout,
-                httpClient: httpClient
+                httpClient: httpClient,
+                httpVersion: httpVersion
             );
         }
     }

FaunaDB.Client/FaunaDB.Client.csproj

@@ -35,6 +35,6 @@ See https://fauna.com for more information.</Description>
   </Choose>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 </Project>

README.md

@@ -146,6 +146,19 @@ http.Timeout = TimeSpan.FromSeconds(15);
 var client = new FaunaClient("secret", "http://localhost:9090/", httpClient: http);
 ```
 
+#### HTTP 2.0 support
+Starting from version 4.0.0 of this driver (faunadb-csharp), HTTP/2 support is enabled by default for .NET standards 2.1 and above.
+This means that if you use .NET core 3.1 and above (which support that standard), you'll be sending requests to Fauna on HTTP/2. 
+.NET standards lower than 2.1 and .NET frameworks 4.5-4.8 have HTTP/1.1 enabled as the default protocol version, since they lack of support for HTTP/2.
+We've also added an optional parameter if you want to specify the version of the protocol directly:
+```csharp
+var adminClient = new FaunaClient(
+    endpoint: endpoint,
+    secret: secret,
+    httpVersion: HttpVersion.Version11
+);
+```
+
 #### How to execute a query
 
 ```csharp