优化连接断开时等待断开时间可能过长的问题

Author: aaasoft

Quick.Protocol.SerialPort/QpSerialPortClient.cs

@@ -13,6 +13,7 @@ public class QpSerialPortClient : QpClient
     {
         private QpSerialPortClientOptions options;
         private System.IO.Ports.SerialPort serialPort;
+        protected override bool ReadFromStreamReturnZeroMeansFault => false;
         public QpSerialPortClient(QpSerialPortClientOptions options) : base(options)
         {
             this.options = options;

Quick.Protocol.SerialPort/QpSerialPortServer.cs

@@ -66,7 +66,7 @@ protected override Task InnerAcceptAsync(CancellationToken token)
                         return;
                     if (task.IsFaulted)
                         return;
-                    OnNewChannelConnected(serialPort.BaseStream, $"SerialPort:{options.PortName}", token);
+                    OnNewChannelConnected(serialPort.BaseStream, $"SerialPort:{options.PortName}", token, false);
                 });
         }
     }

Quick.Protocol/QpChannel_Recv.cs

@@ -16,6 +16,10 @@ namespace Quick.Protocol
 {
     public abstract partial class QpChannel
     {
+        /// <summary>
+        /// 从流中读取返回0是否代表错误
+        /// </summary>
+        protected virtual bool ReadFromStreamReturnZeroMeansFault { get; } = true;
         private DateTime lastReadDataTime;
         /// <summary>
         /// 当读取出错时
@@ -184,8 +188,12 @@ private async Task FillRecvPipeAsync(Stream stream, PipeWriter writer, Cancellat
             while (!token.IsCancellationRequested)
             {
                 int bytesRead = await stream.ReadAsync(readBufferMemory, token);
+                if (bytesRead < 0)
+                    throw new EndOfStreamException();
                 if (bytesRead == 0)
                 {
+                    if (ReadFromStreamReturnZeroMeansFault)
+                        throw new EndOfStreamException();
                     await Task.Delay(100, token);
                     continue;
                 }

Quick.Protocol/QpServer.cs

@@ -61,9 +61,9 @@ internal void RemoveChannel(QpServerChannel channel)
                 }
         }
 
-        protected void OnNewChannelConnected(Stream stream, string channelName, CancellationToken token)
+        protected void OnNewChannelConnected(Stream stream, string channelName, CancellationToken token, bool readFromStreamReturnZeroMeansFault = true)
         {
-            var channel = new QpServerChannel(stream, channelName, token, options.Clone());
+            var channel = new QpServerChannel(stream, channelName, token, options.Clone(), readFromStreamReturnZeroMeansFault);
 
             //认证超时
             channel.AuchenticateTimeout += (sender, e) =>

Quick.Protocol/QpServerChannel.cs

@@ -31,15 +31,17 @@ public class QpServerChannel : QpChannel
         /// 认证超时
         /// </summary>
         public event EventHandler AuchenticateTimeout;
+        protected override bool ReadFromStreamReturnZeroMeansFault { get; }
 
-        public QpServerChannel(Stream stream, string channelName, CancellationToken cancellationToken, QpServerOptions options) : base(options)
+        public QpServerChannel(Stream stream, string channelName, CancellationToken cancellationToken, QpServerOptions options, bool readFromStreamReturnZeroMeansFault = true) : base(options)
         {
             this.stream = stream;
             this.channelName = channelName;
             this.options = options;
             this.authedCommandExecuterManagerList = options.CommandExecuterManagerList;
             this.authedNoticeHandlerManagerList = options.NoticeHandlerManagerList;
             serverCancellationToken = cancellationToken;
+            ReadFromStreamReturnZeroMeansFault = readFromStreamReturnZeroMeansFault;
 
             cts = new CancellationTokenSource();
 

Quick.Protocol/Streams/QpStreamClient.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
+using System.IO;
 using System.Threading.Tasks;
 
 namespace Quick.Protocol.Streams

Quick.Protocol/Streams/QpStreamServerChannel.cs

@@ -1,16 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Threading;
+namespace Quick.Protocol.Streams;
 
-namespace Quick.Protocol.Streams
+public class QpStreamServerChannel : QpServerChannel
 {
-    public class QpStreamServerChannel : QpServerChannel
+    public QpStreamServerChannel(QpStreamServerOptions options)
+        : base(options.BaseStream, options.ChannelName, options.CancellationToken, options)
     {
-        public QpStreamServerChannel(QpStreamServerOptions options)
-            : base(options.BaseStream, options.ChannelName, options.CancellationToken, options)
-        {
-        }
     }
 }
+