直接反序列化json响应流

Author: xljiulang

WebApiClientCore/ApiResponseContext.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Http;
+using System.Text;
 using System.Threading.Tasks;
 
 namespace WebApiClientCore
@@ -71,10 +72,27 @@ public ApiResponseContext(ApiRequestContext context)
                 return objType.DefaultValue();
             }
 
-            var serializer = this.HttpContext.ServiceProvider.GetJsonSerializer();
-            var utf8Json = await this.HttpContext.ResponseMessage.Content.ReadAsUtf8ByteArrayAsync().ConfigureAwait(false);
+            var content = this.HttpContext.ResponseMessage.Content;
+            if (content == null)
+            {
+                return objType.DefaultValue();
+            }
+
+            var encoding = content.GetEncoding();
             var options = this.HttpContext.HttpApiOptions.JsonDeserializeOptions;
-            return serializer.Deserialize(utf8Json, objType, options);
+            var serializer = this.HttpContext.ServiceProvider.GetJsonSerializer();
+
+            if (Encoding.UTF8.Equals(encoding) == true)
+            {
+                var utf8Json = await content.ReadAsStreamAsync().ConfigureAwait(false);
+                return await serializer.DeserializeAsync(utf8Json, objType, options).ConfigureAwait(false);
+            }
+            else
+            {
+                var byteArray = await content.ReadAsByteArrayAsync().ConfigureAwait(false);
+                var utf8Json = Encoding.Convert(encoding, Encoding.UTF8, byteArray);
+                return serializer.Deserialize(utf8Json, objType, options);
+            }
         }
 
         /// <summary>

WebApiClientCore/HttpContents/BufferContent.cs

@@ -90,10 +90,10 @@ protected override Task<Stream> CreateContentReadStreamAsync()
         /// <param name="stream"></param>
         /// <param name="context"></param>
         /// <returns></returns>
-        protected override async Task SerializeToStreamAsync(Stream stream, TransportContext context)
+        protected override Task SerializeToStreamAsync(Stream stream, TransportContext context)
         {
             var memory = this.bufferWriter.GetWrittenMemory();
-            await stream.WriteAsync(memory).ConfigureAwait(false);
+            return stream.WriteAsync(memory).AsTask();
         }
 
         /// <summary>

WebApiClientCore/HttpContents/FormContent.cs

@@ -151,10 +151,10 @@ protected override Task<Stream> CreateContentReadStreamAsync()
         /// <param name="stream">目标流</param>
         /// <param name="context">上下文</param>
         /// <returns></returns>
-        protected override async Task SerializeToStreamAsync(Stream stream, TransportContext context)
+        protected override Task SerializeToStreamAsync(Stream stream, TransportContext context)
         {
             var memory = this.bufferWriter.GetWrittenMemory();
-            await stream.WriteAsync(memory).ConfigureAwait(false);
+            return stream.WriteAsync(memory).AsTask();
         }
 
         /// <summary>

WebApiClientCore/Serialization/IJsonSerializer.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Buffers;
+using System.IO;
 using System.Text.Json;
+using System.Threading.Tasks;
 
 namespace WebApiClientCore.Serialization
 {
@@ -25,5 +27,14 @@ public interface IJsonSerializer
         /// <param name="options">选项</param>
         /// <returns></returns>
         object? Deserialize(Span<byte> utf8Json, Type objType, JsonSerializerOptions? options);
+
+        /// <summary>
+        /// 将utf8编码的Json流反序列化对象
+        /// </summary>
+        /// <param name="utf8Json">utf8编码的Json流</param>
+        /// <param name="objType">对象类型</param>
+        /// <param name="options">选项</param>
+        /// <returns></returns>
+        Task<object> DeserializeAsync(Stream utf8Json, Type objType, JsonSerializerOptions? options);
     }
 }

WebApiClientCore/Serialization/JsonSerializer.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Buffers;
+using System.IO;
 using System.Text.Json;
+using System.Threading.Tasks;
 
 namespace WebApiClientCore.Serialization
 {
@@ -52,5 +54,17 @@ public void Serialize(IBufferWriter<byte> bufferWriter, object? obj, JsonSeriali
                 ? objType.DefaultValue()
                 : System.Text.Json.JsonSerializer.Deserialize(utf8Json, objType, options);
         }
+
+        /// <summary>
+        /// 将utf8编码的Json流反序列化对象
+        /// </summary>
+        /// <param name="utf8Json">utf8编码的Json流</param>
+        /// <param name="objType">对象类型</param>
+        /// <param name="options">选项</param>
+        /// <returns></returns>
+        public Task<object> DeserializeAsync(Stream utf8Json, Type objType, JsonSerializerOptions? options)
+        {
+            return System.Text.Json.JsonSerializer.DeserializeAsync(utf8Json, objType, options).AsTask();
+        }
     }
 }

WebApiClientCore/System.Net.Http/HttpContentExtensions.cs

@@ -28,13 +28,23 @@ public static Task<byte[]> ReadAsUtf8ByteArrayAsync(this HttpContent httpContent
         /// <returns></returns>
         public static async Task<byte[]> ReadAsByteArrayAsync(this HttpContent httpContent, Encoding dstEncoding)
         {
+            var encoding = httpContent.GetEncoding();
             var byteArray = await httpContent.ReadAsByteArrayAsync().ConfigureAwait(false);
-            var charSet = httpContent.Headers.ContentType?.CharSet;
-            var encoding = string.IsNullOrEmpty(charSet) ? Encoding.UTF8 : Encoding.GetEncoding(charSet);
 
             return encoding.Equals(dstEncoding)
                 ? byteArray
                 : Encoding.Convert(encoding, dstEncoding, byteArray);
         }
+
+        /// <summary>
+        /// 获取编码信息
+        /// </summary>
+        /// <param name="httpContent"></param>
+        /// <returns></returns>
+        public static Encoding GetEncoding(this HttpContent httpContent)
+        {
+            var charSet = httpContent.Headers.ContentType?.CharSet;
+            return string.IsNullOrEmpty(charSet) ? Encoding.UTF8 : Encoding.GetEncoding(charSet);
+        }
     }
 }