初步完成全部功能重构。

Author: aaasoft

Quick.Protocol/QpChannel_Recv.cs

@@ -219,52 +219,20 @@ private async Task ReadRecvPipeAsync(PipeReader recvReader, CancellationToken to
 
                             //开始解密
                             var encryptedBuffer = packageBuffer.Slice(PACKAGE_TOTAL_LENGTH_LENGTH).ToArray();
-                            var retBuffer = dec.TransformFinalBlock(encryptedBuffer, 0, encryptedBuffer.Length);
-                            packageTotalLength += retBuffer.Length;
-                            /*
-                            var encryptedBuffer = packageBuffer.Slice(PACKAGE_TOTAL_LENGTH_LENGTH);
-                            var inLength = 0;
-                            while (encryptedBuffer.Length > 0)
-                            {
-                                inLength = Math.Min(decryptBuffer1.Length, (int)encryptedBuffer.Length);
-                                encryptedBuffer.Slice(0, inLength).CopyTo(decryptBuffer1);
-                                encryptedBuffer = encryptedBuffer.Slice(inLength);
-                                if (inLength < dec.InputBlockSize)
-                                {
-                                    var v = dec.InputBlockSize - inLength;
-                                    Array.Fill(decryptBuffer1, (byte)v, inLength, v);
-                                }
-                                var outLength = dec.TransformBlock(decryptBuffer1, 0, inLength, decryptBuffer2, 0);
-                                decryptBuffer2.CopyTo(decryptPipe.Writer.GetMemory(outLength));
-                                decryptPipe.Writer.Advance(outLength);
+                            var decryptBuffer = dec.TransformFinalBlock(encryptedBuffer, 0, encryptedBuffer.Length);
+                            packageTotalLength += decryptBuffer.Length;
 
-                                packageTotalLength += outLength;
-                            }
-                            {
-                                var finnalInLength = 0;
-                                if (inLength == dec.InputBlockSize)
-                                {
-                                    decryptBuffer1[0] = (byte)dec.InputBlockSize;
-                                    finnalInLength = 1;
-                                }
-                                var finalData = dec.TransformFinalBlock(decryptBuffer1, 0, finnalInLength);
-                                if (finalData.Length > 0)
-                                {
-                                    finalData.CopyTo(decryptPipe.Writer.GetMemory(finalData.Length));
-                                    decryptPipe.Writer.Advance(finalData.Length);
-                                    packageTotalLength += finalData.Length;
-                                }
-                            }
-                            _ = decryptPipe.Writer.FlushAsync();                            
+                            decryptBuffer.CopyTo(decryptPipe.Writer.GetMemory(decryptBuffer.Length));
+                            decryptPipe.Writer.Advance(decryptBuffer.Length);
+
+                            _ = decryptPipe.Writer.FlushAsync();
                             ret = await decryptPipe.Reader.ReadAtLeastAsync(packageTotalLength, token).ConfigureAwait(false);
-                            */
+
                             //解密完成，释放缓存
                             currentReader?.AdvanceTo(packageBuffer.End);
 
-                            //packageBuffer = ret.Buffer;
-                            packageBuffer = new ReadOnlySequence<byte>(new byte[PACKAGE_TOTAL_LENGTH_LENGTH].Concat(retBuffer).ToArray());
-
-                            currentReader = null;//decryptPipe.Reader;
+                            packageBuffer = ret.Buffer;
+                            currentReader = decryptPipe.Reader;
                         }
 
                         //如果设置了压缩

Quick.Protocol/QpChannel_Send.cs

@@ -32,11 +32,7 @@ protected virtual void OnWriteError(Exception exception)
 
         //压缩相关变量
         private Pipe writeCompressPipe = null;
-        //加密相关变量
-        Pipe encryptPipe = null;
-        byte[] encryptBuffer1 = null;
-        byte[] encryptBuffer2 = null;
-
+        
         private async Task writePackageBuffer(PipeReader currentReader, QpPackageType packageType, int packageBodyLength, bool ignoreCompressAndEncrypt = false)
         {
             var stream = QpPackageHandler_Stream;
@@ -86,52 +82,7 @@ private async Task writePackageBuffer(PipeReader currentReader, QpPackageType pa
                 {
                     try
                     {
-                        //准备管道
-                        if (encryptPipe == null)
-                        {
-                            encryptPipe = new Pipe();
-                            encryptBuffer1 = new byte[enc.InputBlockSize];
-                            encryptBuffer2 = new byte[enc.OutputBlockSize];
-                        }
                         //开始加密
-                        /*
-                        var toEncryptedBuffer = packageBodyBuffer;
-                        var inLength = 0;
-                        while (toEncryptedBuffer.Length > 0)
-                        {
-                            inLength = Math.Min(encryptBuffer1.Length, (int)toEncryptedBuffer.Length);
-                            toEncryptedBuffer.Slice(0, inLength).CopyTo(encryptBuffer1);
-                            toEncryptedBuffer = toEncryptedBuffer.Slice(inLength);
-                            if (inLength < enc.InputBlockSize)
-                            {
-                                var v = enc.InputBlockSize - inLength;
-                                Array.Fill(encryptBuffer1, (byte)v, inLength, v);
-                            }
-                            var outLength = enc.TransformBlock(encryptBuffer1, 0, Math.Max(inLength, enc.InputBlockSize), encryptBuffer2, 0);
-                            encryptBuffer2.CopyTo(encryptPipe.Writer.GetMemory(outLength));
-                            encryptPipe.Writer.Advance(outLength);
-
-                            packageTotalLength += outLength;
-                        }
-                        {
-                            var finnalInLength = 0;
-                            if (inLength == enc.InputBlockSize)
-                            {
-                                encryptBuffer1[0] = (byte)enc.InputBlockSize;
-                                finnalInLength = 1;
-                            }
-                            var finalData = enc.TransformFinalBlock(encryptBuffer1, 0, finnalInLength);
-                            if (finalData.Length > 0)
-                            {
-                                finalData.CopyTo(encryptPipe.Writer.GetMemory(finalData.Length));
-                                encryptPipe.Writer.Advance(finalData.Length);
-                                packageTotalLength += finalData.Length;
-                            }
-                        }
-                        _ = encryptPipe.Writer.FlushAsync();
-
-                        readRet = await encryptPipe.Reader.ReadAtLeastAsync(packageTotalLength).ConfigureAwait(false);
-                        */
                         var ret = enc.TransformFinalBlock(packageBodyBuffer.ToArray(), 0, (int)packageBodyBuffer.Length);
                         //加密完成，释放资源
                         currentReader?.AdvanceTo(packageBodyBuffer.End);