Skip to content
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

Replace API according to new Emscripten version. #10

Merged
merged 1 commit into from
Apr 10, 2024
Merged

Replace API according to new Emscripten version. #10

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
19 changes: 9 additions & 10 deletions jstodef/lib/web/lib_jstodef.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var LibJsToDef = {
console.warn("You need to send message_id");
return;
}
var msg_id = allocate(intArrayFromString(message_id), ALLOC_NORMAL);
var msg_id = stringToNewUTF8(message_id);
switch (typeof message) {
case 'undefined':
{{{ makeDynCall("vi", "JsToDef._callback_empty")}}}(msg_id);
Expand All @@ -23,23 +23,22 @@ var LibJsToDef = {
{{{ makeDynCall("vif", "JsToDef._callback_number")}}}(msg_id, message);
break;
case 'string':
var msg_arr = intArrayFromString(message, true);
var msg = allocate(msg_arr, ALLOC_NORMAL);
{{{ makeDynCall("viii", "JsToDef._callback_string")}}}(msg_id, msg, msg_arr.length);
var msg = stringToNewUTF8(message);
{{{ makeDynCall("viii", "JsToDef._callback_string")}}}(msg_id, msg, lengthBytesUTF8(message));
Module._free(msg);
break;
case 'object':
if (message instanceof ArrayBuffer || ArrayBuffer.isView(message)) {
var msg_arr = new Uint8Array(ArrayBuffer.isView(message) ? message.buffer : message);
var msg = allocate(msg_arr, ALLOC_NORMAL);
var msg = _malloc(msg_arr.length * msg_arr.BYTES_PER_ELEMENT);
HEAPU8.set(msg_arr, msg);
{{{ makeDynCall("viii", "JsToDef._callback_string")}}}(msg_id, msg, msg_arr.length);
Module._free(msg);
} else {
var msg = JSON.stringify(message);
var msg_arr = intArrayFromString(msg, false); //zero-terminated
msg = allocate(msg_arr, ALLOC_NORMAL);
{{{ makeDynCall("viii", "JsToDef._callback_object")}}}(msg_id, msg, msg_arr.length);
Module._free(msg);
var serialized_msg = stringToNewUTF8(msg);
{{{ makeDynCall("viii", "JsToDef._callback_object")}}}(msg_id, serialized_msg, lengthBytesUTF8(msg));
Module._free(serialized_msg);
}
break;
case 'boolean':
Expand Down Expand Up @@ -75,4 +74,4 @@ var LibJsToDef = {
}

autoAddDeps(LibJsToDef, '$JsToDef');
mergeInto(LibraryManager.library, LibJsToDef);
addToLibrary(LibJsToDef);
Loading