Merge pull request #3 from yoshd/feature/binary_only

Fix to always send messages as binary type

Author: yoshd

Assets/Runtime/Internal/IWebSocketClient.cs

@@ -9,11 +9,9 @@ internal interface IWebSocketClient : IDisposable
     {
         UniTask ConnectAsync(Uri uri, CancellationToken cancellationToken);
 
-        UniTask SendAsync(ReadOnlyMemory<byte> buffer, WebSocketMessageType messageType, bool endOfMessage,
-            CancellationToken cancellationToken);
+        UniTask SendAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken);
 
-        UniTask SendAsync(ArraySegment<byte> buffer, WebSocketMessageType messageType, bool endOfMessage,
-            CancellationToken cancellationToken);
+        UniTask SendAsync(ArraySegment<byte> buffer, CancellationToken cancellationToken);
 
         UniTask<ValueWebSocketReceiveResult> ReceiveAsync(Memory<byte> buffer, CancellationToken cancellationToken);
 

Assets/Runtime/Internal/WebSocketClientNonWebGL.cs

@@ -14,16 +14,14 @@ public async UniTask ConnectAsync(Uri uri, CancellationToken cancellationToken)
             await _client.ConnectAsync(uri, cancellationToken).ConfigureAwait(false);
         }
 
-        public async UniTask SendAsync(ReadOnlyMemory<byte> buffer, WebSocketMessageType messageType, bool endOfMessage,
-            CancellationToken cancellationToken)
+        public async UniTask SendAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken)
         {
-            await _client.SendAsync(buffer, messageType, endOfMessage, cancellationToken).ConfigureAwait(false);
+            await _client.SendAsync(buffer, WebSocketMessageType.Binary, true, cancellationToken).ConfigureAwait(false);
         }
 
-        public async UniTask SendAsync(ArraySegment<byte> buffer, WebSocketMessageType messageType, bool endOfMessage,
-            CancellationToken cancellationToken)
+        public async UniTask SendAsync(ArraySegment<byte> buffer, CancellationToken cancellationToken)
         {
-            await _client.SendAsync(buffer, messageType, endOfMessage, cancellationToken).ConfigureAwait(false);
+            await _client.SendAsync(buffer, WebSocketMessageType.Binary, true, cancellationToken).ConfigureAwait(false);
         }
 
         public async UniTask<ValueWebSocketReceiveResult> ReceiveAsync(Memory<byte> buffer,

Assets/Runtime/Internal/WebSocketClientWebGL.cs

@@ -43,8 +43,7 @@ public async UniTask ConnectAsync(Uri uri, CancellationToken cancellationToken)
             } while (State is WebSocketState.Connecting);
         }
 
-        public UniTask SendAsync(ReadOnlyMemory<byte> buffer, WebSocketMessageType messageType, bool endOfMessage,
-            CancellationToken cancellationToken)
+        public UniTask SendAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken)
         {
             unsafe
             {
@@ -57,10 +56,9 @@ public UniTask SendAsync(ReadOnlyMemory<byte> buffer, WebSocketMessageType messa
             return UniTask.CompletedTask;
         }
 
-        public UniTask SendAsync(ArraySegment<byte> buffer, WebSocketMessageType messageType, bool endOfMessage,
-            CancellationToken cancellationToken)
+        public UniTask SendAsync(ArraySegment<byte> buffer, CancellationToken cancellationToken)
         {
-            return SendAsync(buffer.AsMemory(), messageType, endOfMessage, cancellationToken);
+            return SendAsync(buffer.AsMemory(), cancellationToken);
         }
 
         public async UniTask<ValueWebSocketReceiveResult> ReceiveAsync(Memory<byte> buffer,

Assets/Runtime/WebSocketClient.cs

@@ -7,7 +7,7 @@ namespace UnityWebSocket
 {
     public class WebSocketClient : IDisposable
     {
-        private IWebSocketClient _client;
+        private readonly IWebSocketClient _client;
 
         public WebSocketClient()
         {
@@ -23,16 +23,15 @@ public async UniTask ConnectAsync(Uri uri, CancellationToken cancellationToken)
             await _client.ConnectAsync(uri, cancellationToken);
         }
 
-        public async UniTask SendAsync(ReadOnlyMemory<byte> buffer, WebSocketMessageType messageType, bool endOfMessage,
-            CancellationToken cancellationToken)
+        public async UniTask SendAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken)
         {
-            await _client.SendAsync(buffer, messageType, endOfMessage, cancellationToken);
+            await _client.SendAsync(buffer, cancellationToken);
         }
 
         public async UniTask SendAsync(ArraySegment<byte> buffer, WebSocketMessageType messageType, bool endOfMessage,
             CancellationToken cancellationToken)
         {
-            await _client.SendAsync(buffer, messageType, endOfMessage, cancellationToken);
+            await _client.SendAsync(buffer, cancellationToken);
         }
 
         public async UniTask<ValueWebSocketReceiveResult> ReceiveAsync(Memory<byte> buffer,

README.md

@@ -13,14 +13,16 @@ Unity WebGL has the limitation that the browser cannot handle the socket API dir
 
 You can add `"com.yoshd.unitywebsocket": "https://github.com/yoshd/UnityWebSocket.git"` to your `manifest.json` .
 
+Messages are always sent in binary type.
+
 ```cs
 using UnityWebSocket;
 
 async UniTask SampleAsync()
 {
     var client = new WebSocketClient();
     var msg = System.Text.Encoding.UTF8.GetBytes("Hello!");
-    await client.SendAsync(msg.AsMemory(), WebSocketMessageType.Binary, true, CancellationToken.None);
+    await client.SendAsync(msg.AsMemory(), CancellationToken.None);
     var buf = new Memory<byte>(new byte[1024]);
     var r = await client.ReceiveAsync(buf, CancellationToken.None);
     await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "close", CancellationToken.None);