WebSocket fix

Author: honfika

examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs

@@ -430,4 +430,3 @@ private async Task writeToConsole(string message, ConsoleColor? consoleColor = n
         //}
     }
 }
-

src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs

@@ -25,7 +25,9 @@ public class SessionEventArgs : SessionEventArgsBase
         /// </summary>
         private bool reRequest;
 
-        private WebSocketDecoder? webSocketDecoder;
+        private WebSocketDecoder? webSocketDecoderSend;
+        
+        private WebSocketDecoder? webSocketDecoderReceive;
 
         /// <summary>
         ///     Is this session a HTTP/2 promise?
@@ -59,7 +61,12 @@ public bool ReRequest
             }
         }
 
-        public WebSocketDecoder WebSocketDecoder => webSocketDecoder ??= new WebSocketDecoder(BufferPool);
+        [Obsolete("Use [WebSocketDecoderReceive] instead")]
+        public WebSocketDecoder WebSocketDecoder => WebSocketDecoderReceive;
+
+        public WebSocketDecoder WebSocketDecoderSend => webSocketDecoderSend ??= new WebSocketDecoder(BufferPool);
+        
+        public WebSocketDecoder WebSocketDecoderReceive => webSocketDecoderReceive ??= new WebSocketDecoder(BufferPool);
 
         /// <summary>
         /// Occurs when multipart request part sent.

src/Titanium.Web.Proxy/WebSocket/WebSocketDecoder.cs

@@ -100,7 +100,6 @@ public IEnumerable<WebSocketFrame> Decode(byte[] data, int offset, int count)
                         {
                             data1[pos + 2] ^= (byte)(mask >> 16);
                         }
-;
                     }
                 }
 
@@ -115,6 +114,19 @@ public IEnumerable<WebSocketFrame> Decode(byte[] data, int offset, int count)
             {
                 copyToBuffer(buffer);
             }
+
+            if (copied)
+            {
+                if (buffer.Length == 0)
+                {
+                    bufferLength = 0;
+                }
+                else
+                {
+                    buffer.CopyTo(this.buffer);
+                    bufferLength = buffer.Length;
+                }
+            }
         }
 
         private Memory<byte> copyToBuffer(ReadOnlyMemory<byte> data)