HttpContext.CompletionOption变更为可空类型

Author: xljiulang

App/Clients/IUserApi.cs

@@ -39,8 +39,7 @@ public interface IUserApi : IHttpApi
         [HttpGet("api/users/{account}")]
         ITask<byte[]> GetAsByteArrayAsync([Required] string account, CancellationToken token = default);
 
-        [HttpGet("api/users/{account}")]
-        [HttpCompletionOption(HttpCompletionOption.ResponseHeadersRead)]
+        [HttpGet("api/users/{account}")] 
         ITask<Stream> GetAsStreamAsync([Required] string account, CancellationToken token = default);
 
         [HttpGet("api/users/{account}")]

WebApiClientCore/ApiRequestContext.cs

@@ -1,4 +1,6 @@
-namespace WebApiClientCore
+using System.Net.Http;
+
+namespace WebApiClientCore
 {
     /// <summary>
     /// 表示Api请求的上下文
@@ -50,5 +52,22 @@ protected ApiRequestContext(HttpContext httpContext, ApiActionDescriptor apiActi
             this.Arguments = arguments;
             this.Properties = properties;
         }
+
+        /// <summary>
+        /// 返回请求使用的HttpCompletionOption
+        /// </summary> 
+        /// <returns></returns>
+        public HttpCompletionOption GetCompletionOption()
+        {
+            if (this.HttpContext.CompletionOption != null)
+            {
+                return this.HttpContext.CompletionOption.Value;
+            }
+
+            var dataType = this.ApiAction.Return.DataType;
+            return dataType.IsRawHttpResponseMessage || dataType.IsRawStream
+                ? HttpCompletionOption.ResponseHeadersRead
+                : HttpCompletionOption.ResponseContentRead;
+        }
     }
 }

WebApiClientCore/Attributes/ActionAttributes/HttpCompletionOptionAttribute.cs

@@ -6,6 +6,7 @@ namespace WebApiClientCore.Attributes
 {
     /// <summary>
     /// 指示请求完成选项的特性
+    /// 缺省的情况下，当声明返回类型为Stream或HttpResponseMessage时使用ResponseHeadersRead
     /// </summary>
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
     public class HttpCompletionOptionAttribute : ApiActionAttribute

WebApiClientCore/Attributes/FilterAttributes/LoggingFilterAttribute.cs

@@ -121,8 +121,7 @@ public sealed async override Task OnResponseAsync(ApiResponseContext context)
                 return null;
             }
 
-            if (content.IsBuffered() == true ||
-                context.HttpContext.CompletionOption == HttpCompletionOption.ResponseContentRead)
+            if (content.IsBuffered() == true || context.GetCompletionOption() == HttpCompletionOption.ResponseContentRead)
             {
                 return await content.ReadAsStringAsync().ConfigureAwait(false);
             }

WebApiClientCore/BuildInProxies/Invokers/HttpRequest.cs

@@ -37,7 +37,8 @@ public static async Task<ApiResponseContext> SendAsync(ApiRequestContext context
             {
                 var client = context.HttpContext.HttpClient;
                 var request = context.HttpContext.RequestMessage;
-                var completionOption = context.HttpContext.CompletionOption;
+                var completionOption = context.GetCompletionOption();
+
                 using var tokenLinker = new CancellationTokenLinker(context.HttpContext.CancellationTokens);
                 var response = await client.SendAsync(request, completionOption, tokenLinker.Token).ConfigureAwait(false);
 

WebApiClientCore/HttpContext.cs

@@ -13,7 +13,7 @@ public class HttpContext : HttpClientContext, IDisposable
         /// <summary>
         /// 获取或设置指示请求完成选项
         /// </summary>
-        public HttpCompletionOption CompletionOption { get; set; }
+        public HttpCompletionOption? CompletionOption { get; set; }
 
         /// <summary>
         /// 获取请求取消令牌集合