summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Buchanan <jonathan.russ.buchanan@gmail.com>2021-07-07 19:29:08 -0400
committerJonathan Buchanan <jonathan.russ.buchanan@gmail.com>2021-07-07 19:29:08 -0400
commit52d468141e3478523c1373f3bc81fd3a4fbfea72 (patch)
tree10154964b0fbb512c1dbef3d8205e462782f108a
parentb11af2e990dafe640dda9b94739e0f753e685b87 (diff)
downloadakono-52d468141e3478523c1373f3bc81fd3a4fbfea72.tar.gz
akono-52d468141e3478523c1373f3bc81fd3a4fbfea72.tar.bz2
akono-52d468141e3478523c1373f3bc81fd3a4fbfea72.zip
rename functions exposed to js to be platform-independent
-rw-r--r--akono/src/main/cpp/akono-jni.cpp10
-rw-r--r--akono/src/main/java/akono/AkonoJni.kt8
2 files changed, 9 insertions, 9 deletions
diff --git a/akono/src/main/cpp/akono-jni.cpp b/akono/src/main/cpp/akono-jni.cpp
index f95a65cb..bbea76e6 100644
--- a/akono/src/main/cpp/akono-jni.cpp
+++ b/akono/src/main/cpp/akono-jni.cpp
@@ -137,13 +137,13 @@ void notifyCb(uv_async_t *async);
static void sendMessageCallback(const v8::FunctionCallbackInfo<v8::Value> &args);
-static const char *main_code = "global.__akono_run = (x) => {"
+static const char *main_code = "global.__native_run = (x) => {"
" 0 && console.log('running code', x);"
" global.eval(x);"
"};"
""
- "global.__akono_onMessage = (x) => {"
- " 0 && console.log('got __akono_onMessage', x);"
+ "global.__native_onMessage = (x) => {"
+ " 0 && console.log('got __native_onMessage', x);"
"};";
@@ -232,7 +232,7 @@ public:
v8::Local<v8::Object> global = context->Global();
- global->Set(context, v8::String::NewFromUtf8(isolate, "__akono_sendMessage",
+ global->Set(context, v8::String::NewFromUtf8(isolate, "__native_sendMessage",
v8::NewStringType::kNormal).ToLocalChecked(),
sendMessageFunction).Check();
@@ -275,7 +275,7 @@ public:
v8::String::NewFromUtf8(isolate, code,
v8::NewStringType::kNormal).ToLocalChecked()
};
- node::MakeCallback(isolate, global, "__akono_run", 1, argv, {0, 0});
+ node::MakeCallback(isolate, global, "__native_run", 1, argv, {0, 0});
}
~NativeAkonoInstance() {
diff --git a/akono/src/main/java/akono/AkonoJni.kt b/akono/src/main/java/akono/AkonoJni.kt
index 148de1d7..85ceefa8 100644
--- a/akono/src/main/java/akono/AkonoJni.kt
+++ b/akono/src/main/java/akono/AkonoJni.kt
@@ -82,11 +82,11 @@ class AkonoJni(vararg nodeArgv: String) {
fun sendMessage(message: String) {
val encoded = Base64.encodeToString(message.toByteArray(), Base64.NO_WRAP)
val source = """
- if (global.__akono_onMessage) {
+ if (global.__native_onMessage) {
const msg = (new Buffer('$encoded', 'base64')).toString('ascii');
- global.__akono_onMessage(msg);
+ global.__native_onMessage(msg);
} else {
- console.log("WARN: no __akono_onMessage defined");
+ console.log("WARN: no __native_onMessage defined");
}
""".trimIndent()
evalNodeCode(source)
@@ -108,7 +108,7 @@ class AkonoJni(vararg nodeArgv: String) {
/**
* Register a message handler that is called when the JavaScript code
- * running in [runNodeJs] calls __akono_sendMessage
+ * running in [runNodeJs] calls __native_sendMessage
*
* Does not block.
*/