Use Task.WaitAsync() to replace TaskUtils.TaskWait()

Author: aaasoft

Quick.Protocol.Tcp/QpTcpClient.cs

@@ -36,7 +36,8 @@ protected override async Task<Stream> InnerConnectAsync()
             var connectTask = tcpClient.ConnectAsync(Dns.GetHostAddresses(options.Host), options.Port, cts.Token).AsTask();
             try
             {
-                await TaskUtils.TaskWait(connectTask, options.ConnectionTimeout)
+                await connectTask
+                    .WaitAsync(TimeSpan.FromMilliseconds(options.ConnectionTimeout))
                     .ConfigureAwait(false);
             }
             catch

Quick.Protocol.Udp/QpUdpClient.cs

@@ -31,7 +31,9 @@ protected override async Task<Stream> InnerConnectAsync()
                 udpAsTcpClient = new UdpAsTcpClient();
             else
                 udpAsTcpClient = new UdpAsTcpClient(new IPEndPoint(IPAddress.Parse(options.LocalHost), options.LocalPort));
-            await TaskUtils.TaskWait(Task.Run(() => udpAsTcpClient.Connect(options.Host, options.Port)), options.ConnectionTimeout).ConfigureAwait(false);
+            await Task.Run(() => udpAsTcpClient.Connect(options.Host, options.Port))
+                .WaitAsync(TimeSpan.FromMilliseconds(options.ConnectionTimeout))
+                .ConfigureAwait(false);
 
             if (!udpAsTcpClient.Connected)
                 throw new IOException($"Failed to connect to {options.Host}:{options.Port}.");

Quick.Protocol/QpChannel.cs

@@ -335,7 +335,9 @@ await gzStream.WriteAsync(packageBuffer.Array, packageBuffer.Offset + PACKAGE_TO
 
             //发送包内容
             var writeTask = stream.WriteAsync(packageBuffer.Array, packageBuffer.Offset, packageBuffer.Count);
-            await await TaskUtils.TaskWait(writeTask, options.InternalTransportTimeout).ConfigureAwait(false);
+            await writeTask
+                .WaitAsync(TimeSpan.FromMilliseconds(options.InternalTransportTimeout))
+                .ConfigureAwait(false);
 
             if (writeTask.IsCanceled)
                 return;
@@ -645,7 +647,10 @@ private async Task<int> readData(Stream stream, byte[] buffer, int startIndex, i
                 if (cancellationToken.IsCancellationRequested)
                     break;
                 var readTask = stream.ReadAsync(buffer, count + startIndex, totalCount - count, cancellationToken);
-                ret = await await TaskUtils.TaskWait(readTask, options.InternalTransportTimeout).ConfigureAwait(false);
+                ret = await readTask
+                    .WaitAsync(TimeSpan.FromMilliseconds(options.InternalTransportTimeout))
+                    .ConfigureAwait(false);
+
                 if (readTask.IsCanceled || ret == 0)
                     break;
                 if (ret < 0)
@@ -1127,7 +1132,9 @@ public async Task<CommandResponseTypeNameAndContent> SendCommand(string requestT
             {
                 try
                 {
-                    await TaskUtils.TaskWait(Task.Run(() => SendCommandRequestPackage(commandContext.Id, requestTypeName, requestContent, afterSendHandler)), timeout).ConfigureAwait(false);
+                    await Task.Run(() => SendCommandRequestPackage(commandContext.Id, requestTypeName, requestContent, afterSendHandler))
+                        .WaitAsync(TimeSpan.FromMilliseconds(timeout))
+                        .ConfigureAwait(false);
                 }
                 catch
                 {
@@ -1140,7 +1147,9 @@ public async Task<CommandResponseTypeNameAndContent> SendCommand(string requestT
                         commandDict.TryRemove(commandContext.Id, out _);
                     }
                 }
-                return await await TaskUtils.TaskWait(commandContext.ResponseTask, timeout).ConfigureAwait(false);
+                return await commandContext.ResponseTask
+                    .WaitAsync(TimeSpan.FromMilliseconds(timeout))
+                    .ConfigureAwait(false);
             }
         }
 
@@ -1164,7 +1173,9 @@ public async Task<TCmdResponse> SendCommand<TCmdResponse>(IQpCommandRequest<TCmd
             {
                 try
                 {
-                    await TaskUtils.TaskWait(Task.Run(() => SendCommandRequestPackage(commandContext.Id, typeName, requestContent, afterSendHandler)), timeout).ConfigureAwait(false);
+                    await Task.Run(() => SendCommandRequestPackage(commandContext.Id, typeName, requestContent, afterSendHandler))
+                        .WaitAsync(TimeSpan.FromMilliseconds(timeout))
+                        .ConfigureAwait(false);
                 }
                 catch
                 {
@@ -1177,7 +1188,9 @@ public async Task<TCmdResponse> SendCommand<TCmdResponse>(IQpCommandRequest<TCmd
                         commandDict.TryRemove(commandContext.Id, out _);
                     }
                 }
-                ret = await await TaskUtils.TaskWait(commandContext.ResponseTask, timeout).ConfigureAwait(false);
+                ret = await commandContext.ResponseTask
+                    .WaitAsync(TimeSpan.FromMilliseconds(timeout))
+                    .ConfigureAwait(false);
             }
             return JsonConvert.DeserializeObject<TCmdResponse>(ret.Content);
         }