QpChannel remove send queue, send package immediately now.

Author: aaasoft

QpTestClient/Controls/ConnectionInfoControl.cs

@@ -41,7 +41,7 @@ private void timerNetstat_Tick(object sender, EventArgs e)
             showNetStat(@$"发送的字节数：{channel.BytesSent.ToString("N0")}
 接收的字节数：{channel.BytesReceived.ToString("N0")}
 每秒发送字节数：{channel.BytesSentPerSec.ToString("N0")}
-每秒接收字节数：{channel.BytesSentPerSec.ToString("N0")}
+每秒接收字节数：{channel.BytesReceivedPerSec.ToString("N0")}
 包发送队列数量：{channel.PackageSendQueueCount}");
         }
 

QpTestClient/Forms/CommandTestForm.cs

@@ -33,15 +33,20 @@ public CommandTestForm(ConnectionContext connectionContext, QpCommandInfo qpComm
 
         private async void btnSend_Click(object sender, EventArgs e)
         {
+            txtTestRequest.Focus();
+            txtTestResponse.Clear();
+
             var commandRequestTypeName = txtCommandRequestTypeName.Text.Trim();
             if (string.IsNullOrEmpty(commandRequestTypeName))
             {
-                txtCommandRequestTypeName.Focus();
+                txtTestResponse.AppendText($"{DateTime.Now.ToLongTimeString()}: 请输入命令请求类型！");
+                txtCommandRequestTypeName.Focus();                
                 return;
             }
             var requestContent = txtTestRequest.Text.Trim();
             if (string.IsNullOrEmpty(requestContent))
             {
+                txtTestResponse.AppendText($"{DateTime.Now.ToLongTimeString()}: 请输入请求内容！");
                 txtTestRequest.Focus();
                 return;
             }
@@ -54,8 +59,6 @@ private async void btnSend_Click(object sender, EventArgs e)
             }
 
             btnSend.Enabled = false;
-            txtTestRequest.Focus();
-            txtTestResponse.Clear();
             txtTestResponse.AppendText($"{DateTime.Now.ToLongTimeString()}: 开始执行...{Environment.NewLine}");
             try
             {

QpTestClient/QpTestClient.csproj

@@ -11,8 +11,7 @@
 		<Version>2.2.3</Version>
 		<ApplicationIcon>logo.ico</ApplicationIcon>
 		<Description>用于测试连接到[QuickProtocol]服务端的客户端。
-项目地址：https://github.com/QuickProtocol
-		</Description>
+项目地址：https://github.com/QuickProtocol</Description>
 		<Copyright>Apache License</Copyright>
 		<PackageProjectUrl>https://github.com/QuickProtocol</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/QuickProtocol/QuickProtocol_CSharp</RepositoryUrl>

Quick.Protocol/QpChannel.cs

@@ -49,7 +49,10 @@ public abstract class QpChannel
         private ICryptoTransform enc;
         private ICryptoTransform dec;
         private Encoding encoding = Encoding.UTF8;
-        
+
+        private Task sendPackageTask = Task.CompletedTask;
+        //发送包锁对象
+        private object SEND_PACKAGE_LOCK_OBJ = new object();
         //断开连接锁对象
         private object DISCONNECT_LOCK_OBJ = new object();
 
@@ -103,13 +106,9 @@ protected set
         /// </summary>
         public long BytesSentPerSec { get; private set; }
         /// <summary>
-        /// 包发送队列
-        /// </summary>
-        private ConcurrentQueue<QpPackageSendQueueItem> packageSendQueue = new ConcurrentQueue<QpPackageSendQueueItem>();
-        /// <summary>
         /// 包发送队列数量
         /// </summary>
-        public int PackageSendQueueCount => packageSendQueue.Count;
+        public int PackageSendQueueCount = 0;
 
         /// <summary>
         /// 最后一次连接的时间
@@ -129,16 +128,18 @@ protected set
         /// </summary>
         public virtual void Disconnect()
         {
+            var shouldRaiseDisconnectedEvent = false;
             lock (DISCONNECT_LOCK_OBJ)
             {
-                packageSendQueue.Clear();
                 if (IsConnected)
                 {
-                    IsConnected = false;                    
-                    Disconnected?.Invoke(this, QpEventArgs.Empty);
+                    IsConnected = false;
+                    shouldRaiseDisconnectedEvent = true;
                 }
             }
             InitQpPackageHandler_Stream(null);
+            if (shouldRaiseDisconnectedEvent)
+                Disconnected?.Invoke(this, EventArgs.Empty);
         }
 
         /// <summary>
@@ -366,9 +367,19 @@ private void writePackageTotalLengthToBuffer(byte[] buffer, int offset, int pack
 
         private Task writePackageAsync(Func<byte[], ArraySegment<byte>> getPackagePayloadFunc, Action afterSendHandler)
         {
-            var item = new QpPackageSendQueueItem(getPackagePayloadFunc, afterSendHandler);
-            packageSendQueue.Enqueue(item);
-            return item.SendTask;
+            Interlocked.Increment(ref PackageSendQueueCount);
+            lock (SEND_PACKAGE_LOCK_OBJ)
+            {
+                sendPackageTask = sendPackageTask.ContinueWith(t =>
+                {
+                    var stream = QpPackageHandler_Stream;
+                    if (stream == null)
+                        throw new IOException("Connection is disconnected.");
+                    writePackage(getPackagePayloadFunc, afterSendHandler).Wait();
+                });
+                sendPackageTask.ContinueWith(t => Interlocked.Decrement(ref PackageSendQueueCount));
+                return sendPackageTask;
+            }            
         }
 
         private async Task writePackage(Func<byte[], ArraySegment<byte>> getPackagePayloadFunc, Action afterSendHandler)
@@ -782,37 +793,6 @@ protected async Task<ArraySegment<byte>> ReadPackageAsync(CancellationToken toke
                     finalPackageBuffer.Count);
         }
 
-        protected void BeginSendPackage(CancellationToken cancellationToken)
-        {
-            Task.Delay(options.CheckSendQueueInterval, cancellationToken).ContinueWith(async t =>
-            {
-                if (t.IsCanceled)
-                    return;
-                //开始发送数据包
-                QpPackageSendQueueItem item = null;
-                while (packageSendQueue.Count > 0)
-                {
-                    if (cancellationToken.IsCancellationRequested)
-                        return;
-                    var stream = QpPackageHandler_Stream;
-                    if (stream == null)
-                        return;
-                    if (!packageSendQueue.TryDequeue(out item))
-                        continue;
-                    try
-                    {
-                        await writePackage(item.GetPackagePayloadFunc, item.AfterSendHandler);
-                        item.SetResult(null);
-                    }
-                    catch (Exception ex)
-                    {
-                        item.SetResult(ex);
-                    }
-                }
-                BeginSendPackage(cancellationToken);
-            });
-        }
-
         protected void BeginHeartBeat(CancellationToken cancellationToken)
         {
             if (options.HeartBeatInterval > 0)

Quick.Protocol/QpChannelOptions.cs

@@ -29,13 +29,6 @@ public abstract class QpChannelOptions
         [DisplayName("心跳间隔")]
         public int HeartBeatInterval => InternalTransportTimeout / 3;
 
-        /// <summary>
-        /// 检查发送队列间隔
-        /// </summary>
-        [Category("高级")]
-        [DisplayName("检查发送队列间隔")]
-        public int CheckSendQueueInterval => 100;
-
         /// <summary>
         /// 密码
         /// </summary>

Quick.Protocol/QpClient.cs

@@ -39,8 +39,6 @@ public async Task ConnectAsync()
 
             //开始读取其他数据包
             BeginReadPackage(token);
-            //开始发送数据包
-            BeginSendPackage(token);
             //开始统计网络数据
             BeginNetstat(token);
 

Quick.Protocol/QpPackageSendQueueItem.cs

@@ -59,8 +59,6 @@ public QpServerChannel(Stream stream, string channelName, CancellationToken canc
             var token = cts.Token;
             //开始读取其他数据包
             BeginReadPackage(token);
-            //开始发送数据包
-            BeginSendPackage(token);
             //开始统计网络数据
             BeginNetstat(token);
 

Quick.Protocol/QpServerChannel.cs

@@ -75,11 +75,15 @@ private static void Server_ChannelConnected(object sender, QpServerChannel e)
                 while (true)
                 {
                     Thread.Sleep(1000);
-                    e.SendNoticePackage(new Quick.Protocol.Notices.PrivateNotice()
+                    try
                     {
-                        Action = "NowTime",
-                        Content = DateTime.Now.ToString()
-                    });
+                        e.SendNoticePackage(new Quick.Protocol.Notices.PrivateNotice()
+                        {
+                            Action = "NowTime",
+                            Content = DateTime.Now.ToString()
+                        }).Wait();
+                    }
+                    catch { break; }
                 }
             });
         }