Merge pull request taoweiji#3 from taoweiji/develop

Develop

Author: taoweiji

README.md

@@ -9,7 +9,7 @@ quickjs-android 是 QuickJS JavaScript 引擎的 Andoroid 接口框架，实现
 ##### 引入依赖
 
 ```groovy
-implementation 'io.github.taoweiji.quickjs:quickjs-android:1.1.2'
+implementation 'io.github.taoweiji.quickjs:quickjs-android:1.1.3'
 ```
 
 ##### 简单示例

example/src/main/java/com/quickjs/android/example/MainActivity.java

@@ -1,12 +1,15 @@
 package com.quickjs.android.example;
 
 import android.os.Bundle;
+import android.util.Log;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.eclipsesource.v8.V8;
 import com.quickjs.JSArray;
 import com.quickjs.JSContext;
 import com.quickjs.JSObject;
+import com.quickjs.JSValue;
 import com.quickjs.QuickJS;
 
 public class MainActivity extends AppCompatActivity {
@@ -21,12 +24,18 @@ protected void onCreate(Bundle savedInstanceState) {
  jsContext = quickJS.createContext();
  jsContext = quickJS.createContext();
  test();
+ testV8();
  }
 
  void test() {
- jsContext.executeVoidScript("function test(data){ return data}", "file.js");
- new JSArray(jsContext);
- new JSObject(jsContext);
+ JSValue result = jsContext.executeObjectScript2("a.a", "file.js");
+// JSValue.TYPE type = result.getType();
+ Log.e("QuickJS", result.getClass().getName());
+ }
+
+ void testV8() {
+// V8 v8 = V8.createV8Runtime();
+// v8.executeVoidScript("a.a");
  }
 
  @Override

note.md

@@ -0,0 +1,3 @@
+- JS_SetProperty 必须增加JS_DupValue
+- new_XX，由于绑定了Java对象，所以不需要JS_DupValue
+- JS_GetProperty 绑定了java对象，所以也不需要JS_DupValue

quickjs-android/src/androidTest/java/com/quickjs/JSContextTest.java

@@ -1,5 +1,7 @@
 package com.quickjs;
 
+import android.util.Log;
+
 import com.quickjs.JSArray;
 import com.quickjs.JSContext;
 import com.quickjs.JSFunction;
@@ -10,6 +12,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.Arrays;
+
 import static org.junit.Assert.*;
 
 public class JSContextTest {
@@ -90,4 +94,24 @@ public void executeObjectScript() {
  Object result7 = context.executeScript("function test(data){return data};test", "file.js");
  assertEquals(JSFunction.class, result7.getClass());
  }
+
+
+ @Test
+ public void executeObjectScriptException() {
+ try {
+ context.executeVoidScript("function test1(params) {\n" +
+ " params.say();\n" +
+ "}\n" +
+ "function test2(params) {\n" +
+ " test1(params);\n" +
+ "}\n" +
+ "function test3(params) {\n" +
+ " test2(params);\n" +
+ "}\n" +
+ "test3(\"\");", "file.js");
+ throw new Exception();
+ } catch (Exception e) {
+ assertEquals(QuickJSException.class, e.getClass());
+ }
+ }
 }

quickjs-android/src/androidTest/java/com/quickjs/JSFunctionTest.java

@@ -101,7 +101,7 @@ public void testJavaCallback3() {
  context.set("boolFunction", new JSFunction(context, (JavaCallback) (receiver, args) -> true));
  context.set("stringFunction", new JSFunction(context, (JavaCallback) (receiver, args) -> "Hello"));
 
- context.executeVoidFunction("intFunction", null);
+ context.executeVoidFunction("intFunction", new JSArray(context).push(new JSArray(context)));
  JSFunction function = (JSFunction) context.getObject("intFunction");
  function.call(JSValue.TYPE.INTEGER, null, null);
 

quickjs-android/src/main/cpp/quickjs-jni.cpp

@@ -259,8 +259,8 @@ Java_com_quickjs_QuickJS__1releaseContext(JNIEnv *env, jclass clazz, jlong conte
 extern "C"
 JNIEXPORT jobject JNICALL
 Java_com_quickjs_QuickJS__1executeScript(JNIEnv *env, jclass clazz, jlong context_ptr,
-  jint expected_type,
-  jstring source, jstring file_name) {
+ jint expected_type,
+ jstring source, jstring file_name) {
  if (source == nullptr) {
  return nullptr;
  }
@@ -304,7 +304,7 @@ Java_com_quickjs_QuickJS__1initNewJSArray(JNIEnv *env, jclass clazz, jlong conte
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_quickjs_QuickJS__1release(JNIEnv *env, jclass clazz, jlong context_ptr,
-  jobject object_handle) {
+ jobject object_handle) {
  auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
  JSValue this_obj = TO_JS_VALUE(env, object_handle);
  JS_FreeValue(ctx, this_obj);
@@ -313,8 +313,8 @@ Java_com_quickjs_QuickJS__1release(JNIEnv *env, jclass clazz, jlong context_ptr,
 extern "C"
 JNIEXPORT jobject JNICALL
 Java_com_quickjs_QuickJS__1get(JNIEnv *env, jclass clazz, jlong context_ptr,
-  int expected_type,
-  jobject object_handle, jstring key) {
+ int expected_type,
+ jobject object_handle, jstring key) {
  const char *key_ = env->GetStringUTFChars(key, nullptr);
  auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
  JSValue this_obj = TO_JS_VALUE(env, object_handle);
@@ -326,7 +326,7 @@ Java_com_quickjs_QuickJS__1get(JNIEnv *env, jclass clazz, jlong context_ptr,
 extern "C"
 JNIEXPORT jobject JNICALL
 Java_com_quickjs_QuickJS__1getValue(JNIEnv *env, jclass clazz, jlong context_ptr,
-  jobject object_handle, jstring key) {
+ jobject object_handle, jstring key) {
  const char *key_ = env->GetStringUTFChars(key, nullptr);
  auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
  JSValue this_obj = TO_JS_VALUE(env, object_handle);
@@ -339,8 +339,8 @@ Java_com_quickjs_QuickJS__1getValue(JNIEnv *env, jclass clazz, jlong context_ptr
 extern "C"
 JNIEXPORT jobject JNICALL
 Java_com_quickjs_QuickJS__1arrayGet(JNIEnv *env, jclass clazz, jlong context_ptr,
-  int expected_type,
-  jobject object_handle, jint index) {
+ int expected_type,
+ jobject object_handle, jint index) {
  auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
  JSValue this_obj = TO_JS_VALUE(env, object_handle);
  JSValue result = JS_GetPropertyUint32(ctx, this_obj, index);
@@ -352,7 +352,7 @@ Java_com_quickjs_QuickJS__1arrayGet(JNIEnv *env, jclass clazz, jlong context_ptr
 extern "C"
 JNIEXPORT jobject JNICALL
 Java_com_quickjs_QuickJS__1arrayGetValue(JNIEnv *env, jclass clazz, jlong context_ptr,
-  jobject object_handle, jint index) {
+ jobject object_handle, jint index) {
  auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
  JSValue this_obj = TO_JS_VALUE(env, object_handle);
  JSValue result = JS_GetPropertyUint32(ctx, this_obj, index);
@@ -362,7 +362,7 @@ Java_com_quickjs_QuickJS__1arrayGetValue(JNIEnv *env, jclass clazz, jlong contex
 extern "C"
 JNIEXPORT jboolean JNICALL
 Java_com_quickjs_QuickJS__1contains(JNIEnv *env, jclass clazz, jlong context_ptr,
-  jobject object_handle, jstring key) {
+ jobject object_handle, jstring key) {
  auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
  JSValue this_obj = TO_JS_VALUE(env, object_handle);
  const char *key_ = env->GetStringUTFChars(key, nullptr);
@@ -373,7 +373,7 @@ Java_com_quickjs_QuickJS__1contains(JNIEnv *env, jclass clazz, jlong context_ptr
 }extern "C"
 JNIEXPORT jobjectArray JNICALL
 Java_com_quickjs_QuickJS__1getKeys(JNIEnv *env, jclass clazz, jlong context_ptr,
-  jobject object_handle) {
+ jobject object_handle) {
  auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
  JSValue this_obj = TO_JS_VALUE(env, object_handle);
  JSPropertyEnum *tab;
@@ -403,7 +403,6 @@ JSValue executeFunction(JNIEnv *env, jlong context_ptr, jobject object_handle, J
  argv[i] = JS_DupValue(ctx, JS_GetPropertyUint32(ctx, argArray, i));
  }
  }
-// JS_DupValue(ctx, this_obj);
  JSValue global = JS_GetGlobalObject(ctx);
 
  if (JS_Equals(this_obj, global)) {
@@ -425,9 +424,9 @@ JSValue executeFunction(JNIEnv *env, jlong context_ptr, jobject object_handle, J
 extern "C"
 JNIEXPORT jobject JNICALL
 Java_com_quickjs_QuickJS__1executeFunction2(JNIEnv *env, jclass clazz, jlong context_ptr,
-  jint expected_type, jobject object_handle,
-  jobject functionHandle,
-  jobject parameters_handle) {
+ jint expected_type, jobject object_handle,
+ jobject functionHandle,
+ jobject parameters_handle) {
  auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
  JSValue func_obj = TO_JS_VALUE(env, functionHandle);
  JS_DupValue(ctx, func_obj);
@@ -440,8 +439,8 @@ Java_com_quickjs_QuickJS__1executeFunction2(JNIEnv *env, jclass clazz, jlong con
 extern "C"
 JNIEXPORT jobject JNICALL
 Java_com_quickjs_QuickJS__1executeFunction(JNIEnv *env, jclass clazz, jlong context_ptr,
-  jint expected_type, jobject object_handle,
-  jstring name, jobject parameters_handle) {
+ jint expected_type, jobject object_handle,
+ jstring name, jobject parameters_handle) {
  auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
  JSValue this_obj = TO_JS_VALUE(env, object_handle);
  JSValue func_obj = JS_GetPropertyStr(ctx, this_obj, env->GetStringUTFChars(name, nullptr));
@@ -473,7 +472,6 @@ callJavaCallback(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *
  JS_DupValue(ctx, this_val);
  }
  JS_FreeValue(ctx, global);
-// JS_DupValue(ctx,args);
  jobject result = env->CallStaticObjectMethod(quickJSCls, callJavaCallbackMethodID,
  context_ptr,
  callbackId,
@@ -509,20 +507,20 @@ JSValue newFunction(jlong context_ptr, jboolean void_method, int callbackId) {
 extern "C"
 JNIEXPORT jobject JNICALL
 Java_com_quickjs_QuickJS__1initNewJSFunction(JNIEnv *env,
-  jclass clazz,
-  jlong context_ptr,
-  jint callbackId,
-  jboolean void_method) {
+ jclass clazz,
+ jlong context_ptr,
+ jint callbackId,
+ jboolean void_method) {
  auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
  JSValue func = newFunction(context_ptr, void_method, callbackId);
  return TO_JAVA_OBJECT(env, ctx, func);
 }
 extern "C"
 JNIEXPORT jobject JNICALL
 Java_com_quickjs_QuickJS__1registerJavaMethod(JNIEnv *env, jclass clazz, jlong context_ptr,
-  jobject object_handle, jstring function_name,
-  jint callbackId,
-  jboolean void_method) {
+ jobject object_handle, jstring function_name,
+ jint callbackId,
+ jboolean void_method) {
  const char *name_ = env->GetStringUTFChars(function_name, nullptr);
  auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
  JSValue func = newFunction(context_ptr, void_method, callbackId);
@@ -535,15 +533,15 @@ Java_com_quickjs_QuickJS__1registerJavaMethod(JNIEnv *env, jclass clazz, jlong c
 extern "C"
 JNIEXPORT jint JNICALL
 Java_com_quickjs_QuickJS__1getObjectType(JNIEnv *env, jclass clazz, jlong context_ptr,
-  jobject object_handle) {
+ jobject object_handle) {
  auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
  JSValue value = TO_JS_VALUE(env, object_handle);
  return GetObjectType(ctx, value);
 }
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_quickjs_QuickJS__1set(JNIEnv *env, jclass clazz, jlong context_ptr,
-  jobject object_handle, jstring key, jobject value) {
+ jobject object_handle, jstring key, jobject value) {
  const char *key_ = env->GetStringUTFChars(key, nullptr);
  auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
  JSValue this_obj = TO_JS_VALUE(env, object_handle);
@@ -565,7 +563,6 @@ Java_com_quickjs_QuickJS__1set(JNIEnv *env, jclass clazz, jlong context_ptr,
  const char *value_ = env->GetStringUTFChars((jstring) value, nullptr);
  JS_SetPropertyStr(ctx, this_obj, key_, JS_NewString(ctx, value_));
  } else if (env->IsInstanceOf(value, jsValueCls)) {
- // TODO 导致内存泄漏
  JSValue tmp = JS_DupValue(ctx, TO_JS_VALUE(env, value));
  JS_SetPropertyStr(ctx, this_obj, key_, tmp);
  }
@@ -574,7 +571,7 @@ Java_com_quickjs_QuickJS__1set(JNIEnv *env, jclass clazz, jlong context_ptr,
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_quickjs_QuickJS__1arrayAdd(JNIEnv *env, jclass clazz, jlong context_ptr,
-  jobject object_handle, jobject value) {
+ jobject object_handle, jobject value) {
  auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
  JSValue this_obj = TO_JS_VALUE(env, object_handle);
  int len = GetArrayLength(ctx, this_obj);
@@ -596,20 +593,52 @@ Java_com_quickjs_QuickJS__1arrayAdd(JNIEnv *env, jclass clazz, jlong context_ptr
  const char *value_ = env->GetStringUTFChars((jstring) value, nullptr);
  JS_SetPropertyUint32(ctx, this_obj, len, JS_NewString(ctx, value_));
  } else if (env->IsInstanceOf(value, jsValueCls)) {
- // TODO 导致内存泄漏
  JSValue tmp = JS_DupValue(ctx, TO_JS_VALUE(env, value));
  JS_SetPropertyUint32(ctx, this_obj, len, tmp);
  }
 }
 extern "C"
 JNIEXPORT jboolean JNICALL
 Java_com_quickjs_QuickJS__1isUndefined(JNIEnv *env, jclass clazz, jlong context_ptr,
-  jobject js_value) {
+ jobject js_value) {
  JSValue value = TO_JS_VALUE(env, js_value);
  return JS_IsUndefined(value);
 }extern "C"
 JNIEXPORT jobject JNICALL
 Java_com_quickjs_QuickJS__1Undefined(JNIEnv *env, jclass clazz, jlong context_ptr) {
  auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
  return TO_JAVA_OBJECT(env, ctx, JS_UNDEFINED);
+}
+
+extern "C"
+JNIEXPORT jobjectArray JNICALL
+Java_com_quickjs_QuickJS__1getException(JNIEnv *env, jclass clazz, jlong context_ptr) {
+ auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
+ JSValue exc = JS_GetException(ctx);
+ if (!JS_IsError(ctx, exc)) {
+ return nullptr;
+ }
+
+ JSValue func = JS_GetPropertyStr(ctx, exc, "toString");
+ JSValue nameValue = JS_GetPropertyStr(ctx, exc, "name");
+ JSValue stackValue = JS_GetPropertyStr(ctx, exc, "stack");
+ JSValue titleValue = JS_Call(ctx, func, exc, 0, nullptr);
+ JS_FreeValue(ctx, func);
+
+ std::vector<const char *> messages;
+ messages.push_back(JS_ToCString(ctx, nameValue));
+ messages.push_back(JS_ToCString(ctx, titleValue));
+ while (!JS_IsUndefined(stackValue)) {
+ messages.push_back(JS_ToCString(ctx, stackValue));
+ JS_FreeValue(ctx, stackValue);
+ stackValue = JS_GetPropertyStr(ctx, stackValue, "stack");
+ }
+ JS_FreeValue(ctx, exc);
+
+ jobjectArray stringArray = env->NewObjectArray(messages.size(), stringCls, nullptr);
+ for (int i = 0; i < messages.size(); ++i) {
+ jstring str = env->NewStringUTF(messages[i]);
+ env->SetObjectArrayElement(stringArray, i, str);
+ }
+ return stringArray;
 }