Bug fix.

aaasoft · aaasoft · commit 405a191d8314 · 2021-12-19T17:53:04.000+08:00
diff --git a/Quick.Protocol.SerialPort/QpSerialPortClient.cs b/Quick.Protocol.SerialPort/QpSerialPortClient.cs
@@ -21,15 +21,15 @@ public QpSerialPortClient(QpSerialPortClientOptions options) : base(options)
         protected override async Task<Stream> InnerConnectAsync()
         {
             if (LogUtils.LogConnection)
-                Console.WriteLine($"Opening SerialPort[{options.PortName}]...");
+                LogUtils.Log($"Opening SerialPort[{options.PortName}]...");
             serialPort = new System.IO.Ports.SerialPort(options.PortName,
                                                             options.BaudRate,
                                                             options.Parity,
                                                             options.DataBits,
                                                             options.StopBits);
             await Task.Run(() => serialPort.Open());
             if (LogUtils.LogConnection)
-                Console.WriteLine($"SerialPort[{options.PortName}] open success.");
+                LogUtils.Log($"SerialPort[{options.PortName}] open success.");
             serialPort.WriteTimeout = options.TransportTimeout;
             serialPort.WriteLine(QpConsts.QuickProtocolNameAndVersion);
             return serialPort.BaseStream;
diff --git a/Quick.Protocol.SerialPort/QpSerialPortServer.cs b/Quick.Protocol.SerialPort/QpSerialPortServer.cs
@@ -23,15 +23,15 @@ public override void Start()
         {
             this.ChannelDisconnected += QpSerialPortServer_ChannelDisconnected;
             if (LogUtils.LogConnection)
-                Console.WriteLine($"Opening SerialPort[{options.PortName}]...");
+                LogUtils.Log($"Opening SerialPort[{options.PortName}]...");
             serialPort = new System.IO.Ports.SerialPort(options.PortName,
                                                 options.BaudRate,
                                                 options.Parity,
                                                 options.DataBits,
                                                 options.StopBits);
             serialPort.Open();
             if (LogUtils.LogConnection)
-                Console.WriteLine($"SerialPort[{options.PortName}] open success.");
+                LogUtils.Log($"SerialPort[{options.PortName}] open success.");
             isAccepted = false;
             base.Start();
         }
diff --git a/Quick.Protocol.Tcp/QpTcpServer.cs b/Quick.Protocol.Tcp/QpTcpServer.cs
@@ -45,13 +45,13 @@ protected override Task InnerAcceptAsync(CancellationToken token)
                 {
                     var remoteEndPointStr = "TCP:" + tcpClient.Client.RemoteEndPoint.ToString();
                     if (LogUtils.LogConnection)
-                        Console.WriteLine("[Connection]{0} connected.", remoteEndPointStr);
+                        LogUtils.Log("[Connection]{0} connected.", remoteEndPointStr);
                     OnNewChannelConnected(tcpClient.GetStream(), remoteEndPointStr, token);
                 }
                 catch (Exception ex)
                 {
                     if (LogUtils.LogConnection)
-                        Console.WriteLine("[Connection]Init&Start Channel error,reason:{0}", ex.ToString());
+                        LogUtils.Log("[Connection]Init&Start Channel error,reason:{0}", ex.ToString());
                     try { tcpClient.Close(); }
                     catch { }
                 }
diff --git a/Quick.Protocol.WebSocket.Server.AspNetCore/QpWebSocketServer.cs b/Quick.Protocol.WebSocket.Server.AspNetCore/QpWebSocketServer.cs
@@ -54,7 +54,7 @@ public Task OnNewConnection(System.Net.WebSockets.WebSocket webSocket, Connectio
             return Task.Delay(-1, cts.Token).ContinueWith(t =>
              {
                  if (LogUtils.LogConnection)
-                     Console.WriteLine("[Connection]{0} disconnected.", connectionInfoStr);
+                     LogUtils.Log("[Connection]{0} disconnected.", connectionInfoStr);
              });
         }
 
@@ -85,13 +85,13 @@ protected override async Task InnerAcceptAsync(CancellationToken token)
                 try
                 {
                     if (LogUtils.LogConnection)
-                        Console.WriteLine("[Connection]{0} connected.", context.ConnectionInfo);
+                        LogUtils.Log("[Connection]{0} connected.", context.ConnectionInfo);
                     OnNewChannelConnected(new WebSocketServerStream(context.WebSocket, context.Cts), context.ConnectionInfo, token);
                 }
                 catch (Exception ex)
                 {
                     if (LogUtils.LogConnection)
-                        Console.WriteLine("[Connection]Init&Start Channel error,reason:{0}", ex.ToString());
+                        LogUtils.Log("[Connection]Init&Start Channel error,reason:{0}", ex.ToString());
                     try { await context.WebSocket.CloseAsync(System.Net.WebSockets.WebSocketCloseStatus.InternalServerError, ex.Message, CancellationToken.None); }
                     catch { }
                 }
diff --git a/Quick.Protocol/QpServer.cs b/Quick.Protocol/QpServer.cs
@@ -70,7 +70,7 @@ protected void OnNewChannelConnected(Stream stream, string channelName, Cancella
             channel.AuchenticateTimeout += (sender, e) =>
             {
                 if (LogUtils.LogConnection)
-                    LogUtils.Log("[Connection]{0} auchenticate timeout.", channelName);
+                    LogUtils.Log("[Connection]{0} Auchenticate timeout.", channelName);
                 ChannelAuchenticateTimeout?.Invoke(this, channel);
             };
 
diff --git a/Quick.Protocol/QpServerChannel.cs b/Quick.Protocol/QpServerChannel.cs
@@ -59,8 +59,13 @@ public QpServerChannel(QpServer server, Stream stream, string channelName, Cance
             if (options.AuthenticateTimeout>0)
                 Task.Delay(options.AuthenticateTimeout, cts.Token).ContinueWith(t =>
                 {
-                    if (t.IsCanceled)
+                    //如果已经取消或者已经连接
+                    if (t.IsCanceled
+                    || IsConnected)
                         return;
+                    if (LogUtils.LogConnection)
+                        LogUtils.Log("[Connection]{0} Authenticate timeout.", channelName);
+
                     if (stream!=null)
                     {
                         try
@@ -102,7 +107,7 @@ private Commands.Authenticate.Response authenticate(QpChannel handler, Commands.
                 {
                     Stop();
                 });
-                throw new CommandException(1, "认证失败！");
+                throw new CommandException(1, "Authenticate failed.");
             }
             IsConnected=true;
             Auchenticated?.Invoke(this, EventArgs.Empty);
diff --git a/Test/WebSocket/WebApplication1/Core/QpTestContext.cs b/Test/WebSocket/WebApplication1/Core/QpTestContext.cs
@@ -13,8 +13,11 @@ public class QpTestContext
 
         public QpTestContext(IApplicationBuilder app)
         {
+            //Quick.Protocol.Utils.LogUtils.SetConsoleLogHandler();
+            Quick.Protocol.Utils.LogUtils.LogPackage=true;
+            Quick.Protocol.Utils.LogUtils.LogContent=true;
             Quick.Protocol.Utils.LogUtils.LogConnection = true;
-            Quick.Protocol.Utils.LogUtils.LogHeartbeat = false;
+            Quick.Protocol.Utils.LogUtils.LogHeartbeat = true;
             
             app.UseQuickProtocol(new Quick.Protocol.WebSocket.Server.AspNetCore.QpWebSocketServerOptions()
             {

Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,13 @@ protected override Task InnerAcceptAsync(CancellationToken token)`
`45`	`45`	`{`
`46`	`46`	`var remoteEndPointStr = "TCP:" + tcpClient.Client.RemoteEndPoint.ToString();`
`47`	`47`	`if (LogUtils.LogConnection)`
`48`		`- Console.WriteLine("[Connection]{0} connected.", remoteEndPointStr);`
	`48`	`+ LogUtils.Log("[Connection]{0} connected.", remoteEndPointStr);`
`49`	`49`	`OnNewChannelConnected(tcpClient.GetStream(), remoteEndPointStr, token);`
`50`	`50`	`}`
`51`	`51`	`catch (Exception ex)`
`52`	`52`	`{`
`53`	`53`	`if (LogUtils.LogConnection)`
`54`		`- Console.WriteLine("[Connection]Init&Start Channel error,reason:{0}", ex.ToString());`
	`54`	`+ LogUtils.Log("[Connection]Init&Start Channel error,reason:{0}", ex.ToString());`
`55`	`55`	`try { tcpClient.Close(); }`
`56`	`56`	`catch { }`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public Task OnNewConnection(System.Net.WebSockets.WebSocket webSocket, Connectio`
`54`	`54`	`return Task.Delay(-1, cts.Token).ContinueWith(t =>`
`55`	`55`	`{`
`56`	`56`	`if (LogUtils.LogConnection)`
`57`		`- Console.WriteLine("[Connection]{0} disconnected.", connectionInfoStr);`
	`57`	`+ LogUtils.Log("[Connection]{0} disconnected.", connectionInfoStr);`
`58`	`58`	`});`
`59`	`59`	`}`
`60`	`60`
`@@ -85,13 +85,13 @@ protected override async Task InnerAcceptAsync(CancellationToken token)`
`85`	`85`	`try`
`86`	`86`	`{`
`87`	`87`	`if (LogUtils.LogConnection)`
`88`		`- Console.WriteLine("[Connection]{0} connected.", context.ConnectionInfo);`
	`88`	`+ LogUtils.Log("[Connection]{0} connected.", context.ConnectionInfo);`
`89`	`89`	`OnNewChannelConnected(new WebSocketServerStream(context.WebSocket, context.Cts), context.ConnectionInfo, token);`
`90`	`90`	`}`
`91`	`91`	`catch (Exception ex)`
`92`	`92`	`{`
`93`	`93`	`if (LogUtils.LogConnection)`
`94`		`- Console.WriteLine("[Connection]Init&Start Channel error,reason:{0}", ex.ToString());`
	`94`	`+ LogUtils.Log("[Connection]Init&Start Channel error,reason:{0}", ex.ToString());`
`95`	`95`	`try { await context.WebSocket.CloseAsync(System.Net.WebSockets.WebSocketCloseStatus.InternalServerError, ex.Message, CancellationToken.None); }`
`96`	`96`	`catch { }`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ protected void OnNewChannelConnected(Stream stream, string channelName, Cancella`
`70`	`70`	`channel.AuchenticateTimeout += (sender, e) =>`
`71`	`71`	`{`
`72`	`72`	`if (LogUtils.LogConnection)`
`73`		`- LogUtils.Log("[Connection]{0} auchenticate timeout.", channelName);`
	`73`	`+ LogUtils.Log("[Connection]{0} Auchenticate timeout.", channelName);`
`74`	`74`	`ChannelAuchenticateTimeout?.Invoke(this, channel);`
`75`	`75`	`};`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,13 @@ public QpServerChannel(QpServer server, Stream stream, string channelName, Cance`
`59`	`59`	`if (options.AuthenticateTimeout>0)`
`60`	`60`	`Task.Delay(options.AuthenticateTimeout, cts.Token).ContinueWith(t =>`
`61`	`61`	`{`
`62`		`- if (t.IsCanceled)`
	`62`	`+ //如果已经取消或者已经连接`
	`63`	`+ if (t.IsCanceled`
	`64`	`+ \|\| IsConnected)`
`63`	`65`	`return;`
	`66`	`+ if (LogUtils.LogConnection)`
	`67`	`+ LogUtils.Log("[Connection]{0} Authenticate timeout.", channelName);`
	`68`	`+`
`64`	`69`	`if (stream!=null)`
`65`	`70`	`{`
`66`	`71`	`try`
`@@ -102,7 +107,7 @@ private Commands.Authenticate.Response authenticate(QpChannel handler, Commands.`
`102`	`107`	`{`
`103`	`108`	`Stop();`
`104`	`109`	`});`
`105`		`- throw new CommandException(1, "认证失败！");`
	`110`	`+ throw new CommandException(1, "Authenticate failed.");`
`106`	`111`	`}`
`107`	`112`	`IsConnected=true;`
`108`	`113`	`Auchenticated?.Invoke(this, EventArgs.Empty);`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,11 @@ public class QpTestContext`
`13`	`13`
`14`	`14`	`public QpTestContext(IApplicationBuilder app)`
`15`	`15`	`{`
	`16`	`+ //Quick.Protocol.Utils.LogUtils.SetConsoleLogHandler();`
	`17`	`+ Quick.Protocol.Utils.LogUtils.LogPackage=true;`
	`18`	`+ Quick.Protocol.Utils.LogUtils.LogContent=true;`
`16`	`19`	`Quick.Protocol.Utils.LogUtils.LogConnection = true;`
`17`		`- Quick.Protocol.Utils.LogUtils.LogHeartbeat = false;`
	`20`	`+ Quick.Protocol.Utils.LogUtils.LogHeartbeat = true;`
`18`	`21`
`19`	`22`	`app.UseQuickProtocol(new Quick.Protocol.WebSocket.Server.AspNetCore.QpWebSocketServerOptions()`
`20`	`23`	`{`