Merge a8debbd into 45672e0

statianzo · Jun 6, 2021 · ba7ddb6 · ba7ddb6
2 parents 45672e0 + a8debbd
commit ba7ddb6
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 2 deletions.
diff --git a/src/Fleck/Handlers/ComposableHandler.cs b/src/Fleck/Handlers/ComposableHandler.cs
@@ -8,6 +8,7 @@ public class ComposableHandler : IHandler
         public Func<string, byte[]> Handshake = s => new byte[0];
         public Func<string, byte[]> TextFrame = x => new byte[0];
         public Func<byte[], byte[]> BinaryFrame = x => new byte[0];
+        public Func<ArraySegment<byte>, byte[]> BinarySegmentFrame = x => new byte[0];
         public Action<List<byte>> ReceiveData = delegate { };
         public Func<byte[], byte[]> PingFrame = i => new byte[0];
         public Func<byte[], byte[]> PongFrame = i => new byte[0];
@@ -36,7 +37,12 @@ public byte[] FrameBinary(byte[] bytes)
         {
             return BinaryFrame(bytes);
         }
-
+
+        public byte[] FrameBinary(ArraySegment<byte> bytes)
+        {
+            return BinarySegmentFrame(bytes);
+        }
+
         public byte[] FramePing(byte[] bytes)
         {
             return PingFrame(bytes);

diff --git a/src/Fleck/Handlers/Hybi13Handler.cs b/src/Fleck/Handlers/Hybi13Handler.cs
@@ -17,6 +17,7 @@ public static IHandler Create(WebSocketHttpRequest request, Action<string> onMes
                 Handshake = sub => Hybi13Handler.BuildHandshake(request, sub),
                 TextFrame = s => Hybi13Handler.FrameData(Encoding.UTF8.GetBytes(s), FrameType.Text),
                 BinaryFrame = s => Hybi13Handler.FrameData(s, FrameType.Binary),
+                BinarySegmentFrame = s => Hybi13Handler.FrameData(s, FrameType.Binary),
                 PingFrame = s => Hybi13Handler.FrameData(s, FrameType.Ping),
                 PongFrame = s => Hybi13Handler.FrameData(s, FrameType.Pong),
                 CloseFrame = i => Hybi13Handler.FrameData(i.ToBigEndianBytes<ushort>(), FrameType.Close),
@@ -47,7 +48,36 @@ public static byte[] FrameData(byte[] payload, FrameType frameType)
 
             return memoryStream.ToArray();
         }
-
+
+        public static byte[] FrameData(ArraySegment<byte> payload, FrameType frameType)
+        {
+            var memoryStream = new MemoryStream();
+            byte op = (byte)((byte)frameType + 128);
+
+            memoryStream.WriteByte(op);
+
+            if (payload.Count > UInt16.MaxValue)
+            {
+                memoryStream.WriteByte(127);
+                var lengthBytes = payload.Count.ToBigEndianBytes<ulong>();
+                memoryStream.Write(lengthBytes, 0, lengthBytes.Length);
+            }
+            else if (payload.Count > 125)
+            {
+                memoryStream.WriteByte(126);
+                var lengthBytes = payload.Count.ToBigEndianBytes<ushort>();
+                memoryStream.Write(lengthBytes, 0, lengthBytes.Length);
+            }
+            else
+            {
+                memoryStream.WriteByte((byte)payload.Count);
+            }
+
+            memoryStream.Write(payload.Array, 0, payload.Count);
+
+            return memoryStream.ToArray();
+        }
+
         public static void ReceiveData(List<byte> data, ReadState readState, Action<FrameType, byte[]> processFrame)
         {
 

diff --git a/src/Fleck/Interfaces/IHandler.cs b/src/Fleck/Interfaces/IHandler.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System;
 
 namespace Fleck
 {
@@ -8,6 +9,7 @@ public interface IHandler
         void Receive(IEnumerable<byte> data);
         byte[] FrameText(string text);
         byte[] FrameBinary(byte[] bytes);
+        byte[] FrameBinary(ArraySegment<byte> bytes);
         byte[] FramePing(byte[] bytes);
         byte[] FramePong(byte[] bytes);
         byte[] FrameClose(int code);

diff --git a/src/Fleck/WebSocketConnection.cs b/src/Fleck/WebSocketConnection.cs
@@ -67,6 +67,11 @@ public Task Send(byte[] message)
         return Send(message, Handler.FrameBinary);
     }
 
+    public Task Send(ArraySegment<byte> message)
+    {
+        return Send(message, Handler.FrameBinary);
+    }
+
     public Task SendPing(byte[] message)
     {
         return Send(message, Handler.FramePing);