v2.8.6

## Changes
- [BUGFIX] #41 未关闭 WebSocket 的条件下调用 Application.Quit() 会导致 Unity 应用程序未响应
- 支持 Unity 6000， WebAssembly 2023

Author: psygames

Assets/UnityWebSocket/Demo/UnityWebSocketDemo.cs

@@ -174,14 +174,6 @@ private void Socket_OnError(object sender, ErrorEventArgs e)
             AddLog(string.Format("Error: {0}", e.Message));
         }
 
-        private void OnApplicationQuit()
-        {
-            if (socket != null && socket.ReadyState != WebSocketState.Closed)
-            {
-                socket.CloseAsync();
-            }
-        }
-
         private int frame = 0;
         private float time = 0;
         private float fps = 0;

Assets/UnityWebSocket/Plugins/WebGL/WebSocket.jslib

@@ -22,7 +22,19 @@ var WebSocketLibrary =
         onMessage: null,
         onMessageStr: null,
         onError: null,
-        onClose: null
+        onClose: null,
+
+        /* Support Unity 6000 */
+        support6000: false
+    },
+
+    /**
+     * Support Unity 6000
+     *
+     */
+    WebSocketSetSupport6000: function()
+    {
+        webSocketManager.support6000 = true;
     },
 
     /**
@@ -154,7 +166,14 @@ var WebSocketLibrary =
 
         instance.ws.onopen = function()
         {
-            {{{ makeDynCall('vi', 'webSocketManager.onOpen') }}}(instanceId);
+            if (webSocketManager.support6000)
+            {
+                {{{ makeDynCall('vi', 'webSocketManager.onOpen') }}}(instanceId);
+            }
+            else
+            {
+                Module.dynCall_vi(webSocketManager.onOpen, instanceId);
+            }
         };
 
         instance.ws.onmessage = function(ev)
@@ -166,7 +185,14 @@ var WebSocketLibrary =
                 writeArrayToMemory(array, buffer);
                 try
                 {
-                    {{{ makeDynCall('viii', 'webSocketManager.onMessage') }}}(instanceId, buffer, array.length);
+                    if (webSocketManager.support6000)
+                    {
+                        {{{ makeDynCall('viii', 'webSocketManager.onMessage') }}}(instanceId, buffer, array.length);
+                    }
+                    else
+                    {
+                        Module.dynCall_viii(webSocketManager.onMessage, instanceId, buffer, array.length);
+                    }
                 }
                 finally
                 {
@@ -180,7 +206,14 @@ var WebSocketLibrary =
                 stringToUTF8(ev.data, buffer, length);
                 try
                 {
-                    {{{ makeDynCall('vii', 'webSocketManager.onMessageStr') }}}(instanceId, buffer);
+                    if (webSocketManager.support6000)
+                    {
+                        {{{ makeDynCall('vii', 'webSocketManager.onMessageStr') }}}(instanceId, buffer);
+                    }
+                    else
+                    {
+                        Module.dynCall_vii(webSocketManager.onMessageStr, instanceId, buffer);
+                    }
                 }
                 finally
                 {
@@ -197,7 +230,14 @@ var WebSocketLibrary =
                     writeArrayToMemory(array, buffer);
                     try
                     {
-                        {{{ makeDynCall('viii', 'webSocketManager.onMessage') }}}(instanceId, buffer, array.length);
+                        if (webSocketManager.support6000)
+                        {
+                            {{{ makeDynCall('viii', 'webSocketManager.onMessage') }}}(instanceId, buffer, array.length);
+                        }
+                        else
+                        {
+                            Module.dynCall_viii(webSocketManager.onMessage, instanceId, buffer, array.length);
+                        }
                     }
                     finally
                     {
@@ -221,7 +261,14 @@ var WebSocketLibrary =
             stringToUTF8(msg, buffer, length);
             try
             {
-                {{{ makeDynCall('vii', 'webSocketManager.onError') }}}(instanceId, buffer);
+                if (webSocketManager.support6000)
+                {
+                    {{{ makeDynCall('vii', 'webSocketManager.onError') }}}(instanceId, buffer);
+                }
+                else
+                {
+                    Module.dynCall_vii(webSocketManager.onError, instanceId, buffer);
+                }
             }
             finally
             {
@@ -237,7 +284,14 @@ var WebSocketLibrary =
             stringToUTF8(msg, buffer, length);
             try
             {
-                {{{ makeDynCall('viii', 'webSocketManager.onClose') }}}(instanceId, ev.code, buffer);
+                if (webSocketManager.support6000)
+                {
+                    {{{ makeDynCall('viii', 'webSocketManager.onClose') }}}(instanceId, ev.code, buffer);
+                }
+                else
+                {
+                    Module.dynCall_viii(webSocketManager.onClose, instanceId, ev.code, buffer);
+                }
             }
             finally
             {

Assets/UnityWebSocket/Scripts/Runtime/Core/Settings.cs

@@ -7,6 +7,6 @@ public static class Settings
         public const string QQ_GROUP_LINK = "https://qm.qq.com/cgi-bin/qm/qr?k=KcexYJ9aYwogFXbj2aN0XHH5b2G7ICmd";
         public const string EMAIL = "799329256@qq.com";
         public const string AUHTOR = "psygames";
-        public const string VERSION = "2.8.5";
+        public const string VERSION = "2.8.6";
     }
 }

Assets/UnityWebSocket/Scripts/Runtime/Implementation/NoWebGL/WebSocketManager.cs

@@ -55,7 +55,6 @@ private void Update()
             }
         }
 
-#if UNITY_EDITOR
         private void OnDisable()
         {
             SocketAbort();
@@ -68,7 +67,6 @@ private void SocketAbort()
                 sockets[i].Abort();
             }
         }
-#endif
     }
 }
 #endif

Assets/UnityWebSocket/Scripts/Runtime/Implementation/WebGL/WebSocketManager.cs

@@ -61,6 +61,9 @@ internal static class WebSocketManager
 
         [DllImport("__Internal")]
         public static extern void WebSocketSetOnClose(OnCloseCallback callback);
+        
+        [DllImport("__Internal")]
+        public static extern void WebSocketSetSupport6000();
 
         /* If callbacks was initialized and set */
         private static bool isInitialized = false;
@@ -73,6 +76,9 @@ private static void Initialize()
             WebSocketSetOnMessageStr(DelegateOnMessageStrEvent);
             WebSocketSetOnError(DelegateOnErrorEvent);
             WebSocketSetOnClose(DelegateOnCloseEvent);
+#if UNITY_6000_0_OR_NEWER
+            WebSocketSetSupport6000();
+#endif
 
             isInitialized = true;
         }