support web builds on Unity 6 #103

Author: endel

NativeWebSocket/Assets/WebSocket/WebSocket.jspre

@@ -0,0 +1,36 @@
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+// Authored originally by Stephen Hodgson
+(function () { // wrap the method insertion in a function to avoid polluting global scope
+  /**
+   * Initializes the dynCall_* function table lookups.
+   * Thanks to @De-Panther for the following code snippet.
+   * Checks if specific dynCall functions exist,
+   * if not, it will create them using the getWasmTableEntry function.
+   * @see https://discussions.unity.com/t/makedyncall-replacing-dyncall-in-unity-6/1543088
+  */
+  if (Module["ENVIRONMENT_IS_PTHREAD"]) {
+    // If we are in a pthread, we need to initialize the dynCalls immediately
+    initDynCalls();
+  } else {
+    Module['preRun'].push(function () {
+      initDynCalls();
+    });
+  }
+
+  function initDynCalls() {
+    if (typeof getWasmTableEntry !== "undefined") {
+      Module.dynCall_vi = Module.dynCall_vi || function (cb, arg1) {
+        return getWasmTableEntry(cb)(arg1);
+      }
+      Module.dynCall_vii = Module.dynCall_vii || function (cb, arg1, arg2) {
+        return getWasmTableEntry(cb)(arg1, arg2);
+      }
+      Module.dynCall_viii = Module.dynCall_viii || function (cb, arg1, arg2, arg3) {
+        return getWasmTableEntry(cb)(arg1, arg2, arg3);
+      }
+      Module.dynCall_viiii = Module.dynCall_viiii || function (cb, arg1, arg2, arg3, arg4) {
+        return getWasmTableEntry(cb)(arg1, arg2, arg3, arg4);
+      }
+    }
+  }
+})();

NativeWebSocket/Assets/WebSocket/WebSocket.jspre.meta

@@ -1,6 +1,6 @@
 {
   "name": "com.endel.nativewebsocket",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "WebSocket client for Unity - with no external dependencies (WebGL, Native, Android, iOS, UWP).",
   "license": "Apache 2.0",
   "repository": {

NativeWebSocket/Assets/package.json

@@ -1,14 +1,17 @@
 {
   "dependencies": {
-    "com.unity.collab-proxy": "1.15.7",
-    "com.unity.ext.nunit": "1.0.6",
-    "com.unity.ide.rider": "3.0.9",
-    "com.unity.ide.visualstudio": "2.0.14",
+    "com.unity.ai.navigation": "2.0.9",
+    "com.unity.collab-proxy": "2.11.2",
+    "com.unity.ext.nunit": "2.0.5",
+    "com.unity.ide.rider": "3.0.38",
+    "com.unity.ide.visualstudio": "2.0.26",
     "com.unity.ide.vscode": "1.2.4",
-    "com.unity.test-framework": "1.1.29",
-    "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.6.3",
-    "com.unity.ugui": "1.0.0",
+    "com.unity.multiplayer.center": "1.0.1",
+    "com.unity.test-framework": "1.6.0",
+    "com.unity.timeline": "1.8.10",
+    "com.unity.ugui": "2.0.0",
+    "com.unity.modules.accessibility": "1.0.0",
+    "com.unity.modules.adaptiveperformance": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
@@ -35,6 +38,7 @@
     "com.unity.modules.unitywebrequestaudio": "1.0.0",
     "com.unity.modules.unitywebrequesttexture": "1.0.0",
     "com.unity.modules.unitywebrequestwww": "1.0.0",
+    "com.unity.modules.vectorgraphics": "1.0.0",
     "com.unity.modules.vehicles": "1.0.0",
     "com.unity.modules.video": "1.0.0",
     "com.unity.modules.vr": "1.0.0",

NativeWebSocket/Packages/manifest.json

@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.2.11f1
-m_EditorVersionWithRevision: 2021.2.11f1 (e50cafbb4399)
+m_EditorVersion: 6000.3.6f1
+m_EditorVersionWithRevision: 6000.3.6f1 (bbb010bdb8a3)