Skip to content

[C#] [Unity 6] Added logic to use either getWasmTableEntry or dynCall for C# WebGL #4961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rekhoff wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −6
Open

[C#] [Unity 6] Added logic to use either getWasmTableEntry or dynCall for C# WebGL #4961

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions sdks/csharp/src/Plugins/WebSocket.jslib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
mergeInto(LibraryManager.library, {
$WebSocketDynCall: function(sig, ptr, args) {
if (typeof getWasmTableEntry !== 'undefined') {
getWasmTableEntry(ptr).apply(null, args);
} else {
dynCall(sig, ptr, args);
}
},

WebSocket_Init__deps: ['$WebSocketDynCall'],
WebSocket_Init: function(openCallback, messageCallback, closeCallback, errorCallback) {
this._webSocketManager = {
instances: {},
Expand Down Expand Up @@ -54,15 +63,15 @@ mergeInto(LibraryManager.library, {

socket.onopen = function() {
if (manager.callbacks.open) {
dynCall('vi', manager.callbacks.open, [socketId]);
WebSocketDynCall('vi', manager.callbacks.open, [socketId]);
}
};

socket.onmessage = function(event) {
if (manager.callbacks.message && event.data instanceof ArrayBuffer) {
var buffer = _malloc(event.data.byteLength);
HEAPU8.set(new Uint8Array(event.data), buffer);
dynCall('viii', manager.callbacks.message, [socketId, buffer, event.data.byteLength]);
WebSocketDynCall('viii', manager.callbacks.message, [socketId, buffer, event.data.byteLength]);
_free(buffer);
}
};
Expand All @@ -72,22 +81,22 @@ mergeInto(LibraryManager.library, {
var reasonArray = intArrayFromString(reasonStr);
var reasonPtr = _malloc(reasonArray.length);
HEAP8.set(reasonArray, reasonPtr);
dynCall('viii', manager.callbacks.close, [socketId, event.code, reasonPtr]);
WebSocketDynCall('viii', manager.callbacks.close, [socketId, event.code, reasonPtr]);
_free(reasonPtr);
}
delete manager.instances[socketId];
};

socket.onerror = function(error) {
if (manager.callbacks.error) {
dynCall('vi', manager.callbacks.error, [socketId]);
WebSocketDynCall('vi', manager.callbacks.error, [socketId]);
}
};

dynCall('vi', callbackPtr, [socketId]);
WebSocketDynCall('vi', callbackPtr, [socketId]);
} catch (e) {
console.error("WebSocket connection error:", e);
dynCall('vi', callbackPtr, [-1]);
WebSocketDynCall('vi', callbackPtr, [-1]);
}
},

Expand Down
Loading