handle some bugs

Author: psygames

UnityWebSocket/Assets/Scripts/Plugins/UnityWebSocket/Example/Examlple.unity

@@ -156,43 +156,43 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   url: ws://echo.websocket.org
---- !u!1 &729950553
+--- !u!1 &902376145
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 729950556}
-  - component: {fileID: 729950555}
-  - component: {fileID: 729950554}
+  - component: {fileID: 902376148}
+  - component: {fileID: 902376147}
+  - component: {fileID: 902376146}
   m_Layer: 0
   m_Name: Camera
-  m_TagString: MainCamera
+  m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!81 &729950554
+--- !u!81 &902376146
 AudioListener:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 729950553}
+  m_GameObject: {fileID: 902376145}
   m_Enabled: 1
---- !u!20 &729950555
+--- !u!20 &902376147
 Camera:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 729950553}
+  m_GameObject: {fileID: 902376145}
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 2
-  m_BackGroundColor: {r: 0.3018868, g: 0.3018868, b: 0.3018868, a: 0}
+  m_BackGroundColor: {r: 0.3301887, g: 0.3301887, b: 0.3301887, a: 0}
   m_projectionMatrixMode: 1
   m_SensorSize: {x: 36, y: 24}
   m_LensShift: {x: 0, y: 0}
@@ -209,7 +209,7 @@ Camera:
   field of view: 60
   orthographic: 0
   orthographic size: 5
-  m_Depth: -1
+  m_Depth: 0
   m_CullingMask:
     serializedVersion: 2
     m_Bits: 4294967295
@@ -224,15 +224,15 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
---- !u!4 &729950556
+--- !u!4 &902376148
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 729950553}
+  m_GameObject: {fileID: 902376145}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: -10}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}

UnityWebSocket/Assets/Scripts/Plugins/UnityWebSocket/Example/TestWebSocket.cs

@@ -39,16 +39,17 @@ private void Socket_OnError(object sender, ErrorEventArgs e)
     string sendText = "";
     string message = "";
     int messageCount;
+    Vector2 scrollPos;
 
     private void OnGUI()
     {
         var scale = Screen.width / 800f;
-        GUI.matrix = Matrix4x4.TRS(new Vector3(200 * scale, 10, 0), Quaternion.identity, new Vector3(scale, scale, 1));
+        GUI.matrix = Matrix4x4.TRS(new Vector3(0, 0, 0), Quaternion.identity, new Vector3(scale, scale, 1));
+        var width = GUILayout.Width(Screen.width / scale - 10);
 
-        GUILayout.Label(string.Format("State: {0}", socket.ReadyState));
-
-        GUILayout.Label("URL:                                                   ");
-        url = GUILayout.TextField(url);
+        GUILayout.Label(string.Format("State: {0}", socket.ReadyState), width);
+        GUILayout.Label("URL: ", width);
+        url = GUILayout.TextField(url, width);
 
         GUILayout.BeginHorizontal();
         GUI.enabled = socket.ReadyState == WebSocketState.Closed;
@@ -65,7 +66,7 @@ private void OnGUI()
         GUILayout.EndHorizontal();
 
         GUILayout.Label("Text: ");
-        sendText = GUILayout.TextArea(sendText);
+        sendText = GUILayout.TextArea(sendText, GUILayout.MinHeight(50), width);
 
         if (GUILayout.Button("Send"))
         {
@@ -79,7 +80,10 @@ private void OnGUI()
             message = "";
             messageCount = 0;
         }
+
+        scrollPos = GUILayout.BeginScrollView(scrollPos, GUILayout.MaxHeight(Screen.height / scale - 250), width);
         GUILayout.Label(message);
+        GUILayout.EndScrollView();
 
     }
 }

UnityWebSocket/Assets/Scripts/Plugins/UnityWebSocket/Implementation/Common/WebSocket.cs

@@ -9,6 +9,16 @@
 
 namespace UnityWebSocket.Common
 {
+    /// <summary>
+    /// <para>WebSocket indicate a network connection.</para>
+    /// <para>It can be connecting, connected, closing or closed state. </para>
+    /// <para>You can send and receive messages by using it.</para>
+    /// <para>Register receive callback for handling received messages.</para>
+    /// <para>WebSocket 表示一个网络连接，</para>
+    /// <para>它可以是 connecting connected closing closed 状态，</para>
+    /// <para>可以发送和接收消息，</para>
+    /// <para>接收消息处理的地方注册消息回调即可。</para>
+    /// </summary>
     public class WebSocket : IWebSocket
     {
         public string Address { get; private set; }
@@ -52,6 +62,11 @@ private void TaskNew(Func<Task> function)
 
         public void ConnectAsync(string address)
         {
+            if (cts != null || socket != null)
+            {
+                HandleOnError("socket is busy.");
+                return;
+            }
             this.Address = address;
             var uri = new Uri(Address);
             cts = new CancellationTokenSource();
@@ -173,23 +188,40 @@ private async Task SendThread()
         private async Task ReceiveThread()
         {
             isReceiveThreadRunning = true;
-            var buffer = new ArraySegment<byte>(new byte[1024 * 1024]);
+
+            var buffer = new byte[1024 * 1024];
+            var bufferCount = 0;
+            var segment = new ArraySegment<byte>(buffer, 0, buffer.Length);
             while (!cts.IsCancellationRequested)
             {
-                WebSocketReceiveResult result = await socket.ReceiveAsync(buffer, cts.Token);
-                byte[] data = new byte[result.Count];
-                for (int i = 0; i < result.Count; i++)
+                WebSocketReceiveResult result = await socket.ReceiveAsync(segment, cts.Token);
+                bufferCount += result.Count;
+                segment = new ArraySegment<byte>(buffer, bufferCount, buffer.Length - bufferCount);
+
+                if (!result.EndOfMessage)
+                    continue;
+
+                byte[] data = new byte[bufferCount];
+                for (int i = 0; i < bufferCount; i++)
                 {
-                    data[i] = buffer.Array[buffer.Offset + i];
+                    data[i] = buffer[i];
                 }
+
+                bufferCount = 0;
+                segment = new ArraySegment<byte>(buffer, 0, buffer.Length);
+
                 if (result.MessageType == WebSocketMessageType.Binary)
+                {
                     HandleOnMessage(Opcode.Binary, data);
+                }
                 else if (result.MessageType == WebSocketMessageType.Text)
+                {
                     HandleOnMessage(Opcode.Text, data);
+                }
                 else
                 {
                     cts.Cancel();
-                    HandleOnClose((ushort)result.CloseStatus, result.CloseStatusDescription, result.EndOfMessage);
+                    HandleOnClose((ushort)result.CloseStatus, result.CloseStatusDescription, true);
                 }
             }
 

UnityWebSocket/Assets/Scripts/Plugins/UnityWebSocket/Implementation/Uniform/WebSocket.cs

@@ -3,7 +3,14 @@
 namespace UnityWebSocket
 {
     /// <summary>
-    /// For All Platform
+    /// <para>WebSocket indicate a network connection.</para>
+    /// <para>It can be connecting, connected, closing or closed state. </para>
+    /// <para>You can send and receive messages by using it.</para>
+    /// <para>Register receive callback for handling received messages.</para>
+    /// <para>WebSocket 表示一个网络连接，</para>
+    /// <para>它可以是 connecting connected closing closed 状态，</para>
+    /// <para>可以发送和接收消息，</para>
+    /// <para>接收消息处理的地方注册消息回调即可。</para>
     /// </summary>
     public class WebSocket : IWebSocket
     {