Merge pull request #31 from softlgl/dev

处理Task和ValueTask无返回值的情况

Author: softlgl

demo/Test.Client/Program.cs

@@ -171,6 +171,9 @@ static async Task Main(string[] args)
             Console.WriteLine($"获取添加Product2,id=2000,person=[{product.ToJson()}]");
             var products = await productService.GetProducts();
             Console.WriteLine($"products=[{products.ToJson()}]");
+            Task editTask = productService.Edit(1);
+            await editTask;
+            Console.WriteLine($"修改Product,id=1完成");
 
             //BenchmarkRunner.Run<RpcClientBenchTest>();
 

src/DotNetCoreRpc.Client/HttpRequestInterceptor.cs

@@ -36,7 +36,7 @@ public void Intercept(IInvocation invocation)
 
             if (methodReturnType.IsTask() || methodReturnType.IsValueTask())
             {
-                invocation.ReturnValue = Task.CompletedTask;
+                invocation.ReturnValue = _requestHandler.TaskValueTaskWithoutResultHandle(invocation.Method, invocation.Arguments);
                 return;
             }
 

src/DotNetCoreRpc.Client/RequestHandler.cs

@@ -31,6 +31,11 @@ public object SyncResultHandle(MethodInfo methodInfo, params object[] arguments)
             return TaskResultHandle<object>(methodInfo, arguments).GetAwaiter().GetResult();
         }
 
+        public Task TaskValueTaskWithoutResultHandle(MethodInfo methodInfo, params object[] arguments)
+        {
+            return TaskResultHandle<object>(methodInfo, arguments);
+        }
+
         public Func<MethodInfo, object[], object> GetTaskResultHandleFunc(TypeInfo methodReturnType)
         {
             return _taskFuncCache.GetOrAdd(methodReturnType, type => {
@@ -70,7 +75,7 @@ private async Task<T> TaskResultHandle<T>(MethodInfo methodInfo, params object[]
                 }
 
                 TypeInfo methodReturnType = methodInfo.ReturnType.GetTypeInfo();
-                if (methodReturnType.IsAsync())
+                if (methodReturnType.IsAsync() && !methodReturnType.IsTask() && !methodReturnType.IsValueTask())
                 {
                     methodReturnType = methodReturnType.GetGenericArguments()[0].GetTypeInfo();
                 }