fix

Author: Wiki

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

@@ -22,9 +22,9 @@ public void setUp() throws Exception {
 
  @After
  public void tearDown() throws Exception {
-// array.close();
-// context.close();
-// quickJS.close();
+ array.close();
+ context.close();
+ quickJS.close();
  }
 
  @Test
@@ -80,7 +80,8 @@ public void getObject() {
  JSObject user = new JSObject(context);
  user.set("name", "Wiki");
  array.push(user);
- assertEquals("Wiki", array.getObject(0).getString("name"));
+ String result = array.getObject(0).getString("name");
+ assertEquals("Wiki", result);
  user.close();
  }
 

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

@@ -1,5 +1,6 @@
 package com.quickjs.android;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -17,12 +18,18 @@ public void setUp() throws Exception {
  context = quickJS.createContext();
  }
 
+ @After
+ public void tearDown() throws Exception {
+// context.close();
+// quickJS.close();
+ }
+
  @Test
  public void testJavaCallback() {
- context.set("intFunction", new JSFunction(context, jsArray -> Integer.MAX_VALUE));
- context.set("doubleFunction", new JSFunction(context, jsArray -> Double.MAX_VALUE));
- context.set("boolFunction", new JSFunction(context, jsArray -> true));
- context.set("stringFunction", new JSFunction(context, jsArray -> "Hello"));
+ context.set("intFunction", new JSFunction(context, (receiver, args) -> Integer.MAX_VALUE));
+ context.set("doubleFunction", new JSFunction(context, (receiver, args) -> Double.MAX_VALUE));
+ context.set("boolFunction", new JSFunction(context, (receiver, args) -> true));
+ context.set("stringFunction", new JSFunction(context, (receiver, args) -> "Hello"));
  assertEquals(Integer.MAX_VALUE, context.executeIntegerFunction("intFunction", null));
  assertEquals(Double.MAX_VALUE, context.executeDoubleFunction("doubleFunction", null), 1);
  assertTrue(context.executeBooleanFunction("boolFunction", null));
@@ -32,11 +39,11 @@ public void testJavaCallback() {
 
  @Test
  public void testJavaVoidCallback() {
- context.set("test", new JSFunction(context, array -> {
- assertEquals(1, array.getInteger(0));
- assertEquals(3.14, array.getDouble(1), 0);
- assertTrue(array.getBoolean(2));
- assertEquals("Hello", array.getString(3));
+ context.set("test", new JSFunction(context, (receiver, args) -> {
+ assertEquals(1, args.getInteger(0));
+ assertEquals(3.14, args.getDouble(1), 0);
+ assertTrue(args.getBoolean(2));
+ assertEquals("Hello", args.getString(3));
  }));
  context.executeVoidScript("test(1, 3.14, true, 'Hello')", "file.js");
  }
@@ -53,7 +60,7 @@ public void call() {
  public void call2() {
  context.registerJavaMethod(new JavaVoidCallback() {
  @Override
- public void invoke(JSArray array) {
+ public void invoke(JSObject receiver, JSArray array) {
  assertEquals("Hello", array.getString(0));
  }
  }, "test");
@@ -68,7 +75,7 @@ public void invoke(JSArray array) {
  public void call3() {
  context.registerJavaMethod(new JavaCallback() {
  @Override
- public Object invoke(JSArray array) {
+ public Object invoke(JSObject receiver, JSArray array) {
  return array.getDouble(1);
  }
  }, "test");

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

@@ -83,31 +83,26 @@ public void getObject() {
 
  @Test
  public void call2() {
- context.registerJavaMethod(new JavaVoidCallback() {
- @Override
- public void invoke(JSArray array) {
- assertEquals("Hello", array.getString(0));
- }
+ context.registerJavaMethod((receiver, array) -> {
+ assertEquals("Hello", array.getString(0));
  }, "test");
  JSArray args = new JSArray(context);
  args.push("Hello");
  args.push(3.14);
  context.executeVoidFunction("test", args);
+ args.close();
  }
 
  @Test
  public void call3() {
- context.registerJavaMethod(new JavaCallback() {
- @Override
- public Object invoke(JSArray array) {
- return array.getString(0);
- }
+ context.registerJavaMethod((receiver, args) -> {
+ return args.getString(0);
  }, "test");
  JSArray args = new JSArray(context);
  args.push("Hello");
  args.push(3.14);
- String result = context.executeStringFunction("test", args);
- assertEquals("Hello", result);
+ assertEquals("Hello", context.executeStringFunction("test", args));
+ args.close();
  }
 
  @Test
@@ -130,9 +125,8 @@ public void executeDoubleFunction() {
  context.executeVoidScript("function test(data){ return data}", "file.js");
  JSArray array = new JSArray(context);
  array.push(3.14);
- double result = context.executeDoubleFunction("test", array);
+ assertEquals(3.14, context.executeDoubleFunction("test", array), 0);
  array.close();
- assertEquals(3.14, result, 0);
  }
 
  @Test
@@ -224,8 +218,8 @@ public void executeFunction2() {
  @Test
  public void console() {
  JSObject console = new JSObject(context);
- console.registerJavaMethod(array -> {
- assertEquals("Hello", array.getString(0));
+ console.registerJavaMethod((receiver, args) -> {
+ assertEquals("Hello", args.getString(0));
  }, "log");
  context.set("console", console);
  context.executeVoidScript("console.log('Hello')", "file.js");

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

@@ -398,8 +398,13 @@ JNIEXPORT jobject JNICALL
 Java_com_quickjs_android_QuickJS__1executeFunction(JNIEnv *env, jclass clazz, jlong context_ptr,
  jint expected_type, jobject object_handle,
  jstring name, jobject parameters_handle) {
+ auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
  JSValue result = executeJSFunction(env, context_ptr, object_handle, name, parameters_handle);
- return To_JObject(env, context_ptr, expected_type, result);
+ jobject jResult = To_JObject(env, context_ptr, expected_type, result);
+ if (!env->IsInstanceOf(jResult, jsValueCls)) {
+ JS_FreeValue(ctx, result);
+ }
+ return jResult;
 }
 
 JSValue

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

@@ -71,13 +71,13 @@ void registerCallback(JavaVoidCallback callback, JSValue objectHandle, String js
  }
 
  void registerCallback(JavaCallback callback, JSFunction functionHandle) {
- MethodDescriptor methodDescriptor = new MethodDescriptor();
+ QuickJS.MethodDescriptor methodDescriptor = new QuickJS.MethodDescriptor();
  methodDescriptor.callback = callback;
  QuickJS.functionRegistry.put(functionHandle.tag, methodDescriptor);
  }
 
  void registerCallback(JavaVoidCallback callback, JSFunction functionHandle) {
- MethodDescriptor methodDescriptor = new MethodDescriptor();
+ QuickJS.MethodDescriptor methodDescriptor = new QuickJS.MethodDescriptor();
  methodDescriptor.voidCallback = callback;
  QuickJS.functionRegistry.put(functionHandle.tag, methodDescriptor);
  }

quickjs-android/src/main/java/com/quickjs/android/JSContext.java

@@ -188,6 +188,6 @@ public String[] getKeys() {
 
 
  Object executeFunction(int expectedType, String name, JSArray parameters) {
- return QuickJS.executeFunction(context, expectedType, this, name, parameters);
+ return QuickJS._executeFunction(context.getContextPtr(), expectedType, this, name, parameters);
  }
 }

quickjs-android/src/main/java/com/quickjs/android/JSObject.java

@@ -25,7 +25,6 @@ public class JSValue {
  public static final int UNDEFINED = 99;
 
  protected JSContext context;
-// protected long objectHandle;
 // protected boolean released;
 
  long tag;
@@ -49,36 +48,10 @@ public class JSValue {
  this.u_ptr = value.u_ptr;
  }
 
- // typedef union JSValueUnion {
-// int32_t int32;
-// double float64;
-// void *ptr;
-// } JSValueUnion;
-//
-// typedef struct JSValue {
-// JSValueUnion u;
-// int64_t tag;
-// } JSValue;
-
-// protected void initialize(long contextPtr, Object data) {
-// long objectHandle = this.context.initNewJSObject(contextPtr);
-// this.released = false;
-// this.addObjectReference(objectHandle);
-// }
-
-// protected void addObjectReference(long objectHandle) {
-// this.objectHandle = objectHandle;
-// // TODO 考虑自动管理
-// }
-
  long getContextPtr() {
  return context.getContextPtr();
  }
 
-// long getHandle() {
-// return this.objectHandle;
-// }
-
  public void close() {
  QuickJS._release(getContextPtr(), this);
  }

quickjs-android/src/main/java/com/quickjs/android/JSValue.java

@@ -1,5 +1,5 @@
 package com.quickjs.android;
 
 public interface JavaCallback {
- Object invoke(JSArray array);
+ Object invoke(JSObject receiver,JSArray array);
 }

quickjs-android/src/main/java/com/quickjs/android/JavaCallback.java

@@ -1,5 +1,5 @@
 package com.quickjs.android;
 
 public interface JavaVoidCallback {
- void invoke(JSArray array);
+ void invoke(JSObject receiver, JSArray args);
 }