Improve code

Author: aaasoft

Quick.Protocol.Pipeline/QpPipelineClient.cs

@@ -22,7 +22,15 @@ public QpPipelineClient(QpPipelineClientOptions options) : base(options)
         protected override async Task<Stream> InnerConnectAsync()
         {
             pipeClientStream = new NamedPipeClientStream(options.ServerName, options.PipeName, PipeDirection.InOut, PipeOptions.Asynchronous);
-            await pipeClientStream.ConnectAsync(options.ConnectionTimeout).ConfigureAwait(false);
+            try
+            {
+                await pipeClientStream.ConnectAsync(options.ConnectionTimeout).ConfigureAwait(false);
+            }
+            catch
+            {
+                pipeClientStream.Dispose();
+                throw;
+            }
             pipeClientStream.ReadMode = PipeTransmissionMode.Byte;
             return pipeClientStream;
         }

Quick.Protocol.SerialPort/QpSerialPortClient.cs

@@ -27,7 +27,15 @@ protected override async Task<Stream> InnerConnectAsync()
                                                             options.Parity,
                                                             options.DataBits,
                                                             options.StopBits);
-            await Task.Run(() => serialPort.Open()).ConfigureAwait(false);
+            try
+            {
+                await Task.Run(() => serialPort.Open()).ConfigureAwait(false);
+            }
+            catch
+            {
+                serialPort.Dispose();
+                throw;
+            }
             if (LogUtils.LogConnection)
                 LogUtils.Log($"SerialPort[{options.PortName}] open success.");
             serialPort.WriteTimeout = options.TransportTimeout;

Quick.Protocol.Tcp/QpTcpClient.cs

@@ -6,6 +6,7 @@
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Quick.Protocol.Tcp
@@ -30,8 +31,22 @@ protected override async Task<Stream> InnerConnectAsync()
                 tcpClient = new TcpClient();
             else
                 tcpClient = new TcpClient(new IPEndPoint(IPAddress.Parse(options.LocalHost), options.LocalPort));
-            await TaskUtils.TaskWait(tcpClient.ConnectAsync(options.Host, options.Port), options.ConnectionTimeout).ConfigureAwait(false);
 
+            CancellationTokenSource cts = new CancellationTokenSource();
+            var connectTask = tcpClient.ConnectAsync(Dns.GetHostAddresses(options.Host), options.Port, cts.Token).AsTask();
+            try
+            {
+                await TaskUtils.TaskWait(connectTask, options.ConnectionTimeout)
+                    .ConfigureAwait(false);
+            }
+            catch
+            {
+                cts.Cancel();
+                tcpClient.Dispose();
+                throw;
+            }
+            if (connectTask.IsFaulted)
+                throw new IOException($"Failed to connect to {options.Host}:{options.Port}.", connectTask.Exception.InnerException);
             if (!tcpClient.Connected)
                 throw new IOException($"Failed to connect to {options.Host}:{options.Port}.");
             return tcpClient.GetStream();

Quick.Protocol.WebSocket.Client/QpWebSocketClient.cs

@@ -25,7 +25,17 @@ protected override async Task<Stream> InnerConnectAsync()
             var url = options.Url;
             if (url.StartsWith("qp."))
                 url = url.Substring(3);
-            await client.ConnectAsync(new Uri(url), CancellationToken.None).ConfigureAwait(false);
+            var cts = new CancellationTokenSource();
+            try
+            {
+                await client.ConnectAsync(new Uri(url), cts.Token).ConfigureAwait(false);
+            }
+            catch
+            {
+                cts.Cancel();
+                client.Dispose();
+                throw;
+            }            
             return new WebSocketClientStream(client);
         }
     }