加密功能初步可用。

Author: aaasoft

Quick.Protocol/QpChannel_Recv.cs

@@ -218,6 +218,10 @@ private async Task ReadRecvPipeAsync(PipeReader recvReader, CancellationToken to
                             packageTotalLength = PACKAGE_TOTAL_LENGTH_LENGTH;
 
                             //开始解密
+                            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)
@@ -240,7 +244,7 @@ private async Task ReadRecvPipeAsync(PipeReader recvReader, CancellationToken to
                                 var finnalInLength = 0;
                                 if (inLength == dec.InputBlockSize)
                                 {
-                                    encryptBuffer1[0] = (byte)enc.InputBlockSize;
+                                    decryptBuffer1[0] = (byte)dec.InputBlockSize;
                                     finnalInLength = 1;
                                 }
                                 var finalData = dec.TransformFinalBlock(decryptBuffer1, 0, finnalInLength);
@@ -253,11 +257,14 @@ private async Task ReadRecvPipeAsync(PipeReader recvReader, CancellationToken to
                             }
                             _ = decryptPipe.Writer.FlushAsync();                            
                             ret = await decryptPipe.Reader.ReadAtLeastAsync(packageTotalLength, token).ConfigureAwait(false);
+                            */
                             //解密完成，释放缓存
-                            currentReader.AdvanceTo(packageBuffer.End);
+                            currentReader?.AdvanceTo(packageBuffer.End);
 
-                            packageBuffer = ret.Buffer;
-                            currentReader = decryptPipe.Reader;
+                            //packageBuffer = ret.Buffer;
+                            packageBuffer = new ReadOnlySequence<byte>(new byte[PACKAGE_TOTAL_LENGTH_LENGTH].Concat(retBuffer).ToArray());
+
+                            currentReader = null;//decryptPipe.Reader;
                         }
 
                         //如果设置了压缩
@@ -292,7 +299,7 @@ private async Task ReadRecvPipeAsync(PipeReader recvReader, CancellationToken to
                             });
                             ret = await decompressPipe.Reader.ReadAtLeastAsync(packageTotalLength, token).ConfigureAwait(false);
                             //解压完成，释放缓存
-                            currentReader.AdvanceTo(packageBuffer.End);
+                            currentReader?.AdvanceTo(packageBuffer.End);
                             packageBuffer = ret.Buffer;
                             currentReader = decompressPipe.Reader;
                         }
@@ -312,7 +319,7 @@ private async Task ReadRecvPipeAsync(PipeReader recvReader, CancellationToken to
                             BitConverter.ToString(packageBuffer.ToArray())
                             : LogUtils.NOT_SHOW_CONTENT_MESSAGE);
                     HandlePackage(packageType, packageBuffer);
-                    currentReader.AdvanceTo(packageBuffer.End);
+                    currentReader?.AdvanceTo(packageBuffer.End);
                 }
             }
             catch (Exception ex)

Quick.Protocol/QpChannel_Send.cs

@@ -67,7 +67,8 @@ private async Task writePackageBuffer(PipeReader currentReader, QpPackageType pa
                         packageTotalLength = Convert.ToInt32(outStream.Length);
                         _ = writeCompressPipe.Writer.FlushAsync();
                     }
-                    currentReader.AdvanceTo(packageBodyBuffer.End);
+                    //压缩完成，释放资源
+                    currentReader?.AdvanceTo(packageBodyBuffer.End);
 
                     readRet = await writeCompressPipe.Reader.ReadAtLeastAsync(packageTotalLength).ConfigureAwait(false);
 
@@ -93,6 +94,7 @@ private async Task writePackageBuffer(PipeReader currentReader, QpPackageType pa
                             encryptBuffer2 = new byte[enc.OutputBlockSize];
                         }
                         //开始加密
+                        /*
                         var toEncryptedBuffer = packageBodyBuffer;
                         var inLength = 0;
                         while (toEncryptedBuffer.Length > 0)
@@ -129,15 +131,20 @@ private async Task writePackageBuffer(PipeReader currentReader, QpPackageType pa
                         _ = encryptPipe.Writer.FlushAsync();
 
                         readRet = await encryptPipe.Reader.ReadAtLeastAsync(packageTotalLength).ConfigureAwait(false);
-                        currentReader.AdvanceTo(packageBodyBuffer.End);
+                        */
+                        var ret = enc.TransformFinalBlock(packageBodyBuffer.ToArray(), 0, (int)packageBodyBuffer.Length);
+                        //加密完成，释放资源
+                        currentReader?.AdvanceTo(packageBodyBuffer.End);
+
+                        packageBodyBuffer = new ReadOnlySequence<byte>(ret);
+                        packageTotalLength = ret.Length;
 
-                        packageBodyBuffer = readRet.Buffer;
                         //包总长度
                         packageTotalLength += PACKAGE_TOTAL_LENGTH_LENGTH;
                         //准备包头
                         writePackageTotalLengthToBuffer(sendHeadBuffer, 0, packageTotalLength);
                         packageHeadMemory = new Memory<byte>(sendHeadBuffer, 0, PACKAGE_TOTAL_LENGTH_LENGTH);
-                        currentReader = encryptPipe.Reader;
+                        currentReader = null;
                     }
                     catch (Exception ex)
                     {
@@ -185,7 +192,7 @@ await writeTask
                     LogUtils.LogContent ?
                         BitConverter.ToString(packageHeadMemory.ToArray().Concat(packageBodyBuffer.ToArray()).ToArray())
                         : LogUtils.NOT_SHOW_CONTENT_MESSAGE);
-            currentReader.AdvanceTo(packageBodyBuffer.End);
+            currentReader?.AdvanceTo(packageBodyBuffer.End);
             await stream.FlushAsync().ConfigureAwait(false);
         }