Merge pull request #1 from Iblis/pull-receive-methods-to-iwebsocket

pulled Receive and Send-Methods to IWebSocket interface for easier use

Author: Iblis

Runtime/IWebSocket.cs

@@ -12,5 +12,11 @@ public interface IWebSocket : IDisposable
         UniTask ConnectAsync(string uri, CancellationToken cancellationToken);
 
         UniTask CloseAsync(WebSocketCloseStatus closeCode, string reason, CancellationToken cancellationToken);
+
+        UniTask<WebSocketReceiveResult> ReceiveAsync(ArraySegment<byte> buffer, CancellationToken cancellationToken);
+
+        UniTask SendAsync(ArraySegment<byte> buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken token);
+
+        UniTask SendText(string message, CancellationToken token);
     }
 }

Runtime/WebGLWebSocket.cs

@@ -69,7 +69,7 @@ public UniTask SendAsync(ArraySegment<byte> buffer, WebSocketMessageType message
         {
             if (messageType == WebSocketMessageType.Text)
             {
-                SendText(System.Text.Encoding.UTF8.GetString(buffer.Array));
+                SendText(System.Text.Encoding.UTF8.GetString(buffer.Array), token);
             }
             else
             {
@@ -80,7 +80,7 @@ public UniTask SendAsync(ArraySegment<byte> buffer, WebSocketMessageType message
             return UniTask.CompletedTask;
         }
 
-        public UniTask SendText(string message)
+        public UniTask SendText(string message, CancellationToken token)
         {
             int ret = WebSocketSendText(instanceId, message);
 
@@ -103,21 +103,10 @@ public async UniTask<WebSocketReceiveResult> ReceiveAsync(Memory<byte> buffer, C
             }
         }
 
-        // TODO: allow using modern data types if runtime allows it
-        /*public async UniTask<WebSocketReceiveResult> ReceiveAsync(ArraySegment<byte> buffer, CancellationToken token)
+        public async UniTask<WebSocketReceiveResult> ReceiveAsync(ArraySegment<byte> buffer, CancellationToken cancellationToken)
         {
-            try
-            {
-                WebSocketMessage message = await receivedQueue.Reader.ReadAsync();
-                Debug.Log($"Message Received with bytes: {message.Result.Count}");
-                message.MoveDataTo(buffer.AsMemory());
-                return message.Result;
-            }
-            catch (ChannelClosedException)
-            {
-                throw new EndOfStreamException();
-            }
-        }*/
+            return await ReceiveAsync(buffer.AsMemory(), cancellationToken);
+        }
 
         readonly int instanceId;
         readonly Channel<WebSocketMessage> receivedQueue = Channel.CreateSingleConsumerUnbounded<WebSocketMessage>();

Runtime/WebSocketWrapper.cs

@@ -1,6 +1,7 @@
 using Cysharp.Threading.Tasks;
 using System;
 using System.Net.WebSockets;
+using System.Text;
 using System.Threading;
 
 namespace UniTaskWebSocket
@@ -30,7 +31,23 @@ public async UniTask CloseAsync(WebSocketCloseStatus closeCode, string reason, C
                 return;
             }
             await Socket.CloseAsync(closeCode, reason, cancellationToken);
-        }        
+        }
+        
+        public async UniTask<WebSocketReceiveResult> ReceiveAsync(ArraySegment<byte> buffer, CancellationToken cancellationToken)
+        {
+            return await Socket.ReceiveAsync(buffer, cancellationToken);
+        }
+
+        public async UniTask SendAsync(ArraySegment<byte> buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken token)
+        {
+            await Socket.SendAsync(buffer, messageType, endOfMessage, token);
+        }
+
+        public async UniTask SendText(string message, CancellationToken token)
+        {
+            var dataToSend = new ArraySegment<byte>(Encoding.UTF8.GetBytes(message));
+            await Socket.SendAsync(dataToSend, WebSocketMessageType.Text, true, token);
+        }
 
         public void Dispose()
         {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.pwalser.unitaskwebsocket",
   "displayName": "UniTaskWebSocket",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "unity": "2021.2",
   "description": "Wraps a WebSocket (System.Net.WebSockets and jslib-bridged WebSocket) in an Interface that returns UniTask, allows async/await WebSocket operations in Unity",
   "keywords": [