Merge pull request #92 from HarlonWang/feature/2.5.0

Feature/2.4.3

Author: HarlonWang

native/cpp/quickjs_context_jni.cpp

@@ -279,4 +279,15 @@ Java_com_whl_quickjs_wrapper_QuickJSContext_getMemoryUsedSize(JNIEnv *env, jobje
     JSMemoryUsage usage;
     JS_ComputeMemoryUsage(rt, &usage);
     return (jlong)usage.memory_used_size;
+}
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_whl_quickjs_wrapper_QuickJSContext_setGCThreshold(JNIEnv *env, jobject thiz, jlong runtime,
+                                                           jint size) {
+    auto *rt = reinterpret_cast<JSRuntime*>(runtime);
+    // use -1 to disable automatic GC
+    if (size < 0) {
+        size = -1;
+    }
+    JS_SetGCThreshold(rt, size);
 }

wrapper-android/src/androidTest/java/com/whl/quickjs/wrapper/QuickJSTest.java

@@ -24,7 +24,9 @@
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -1017,11 +1019,11 @@ public void testJSCallFunctionReleased() {
             JSObject jsObject = jsContext.createNewJSObject();
             JSCallFunction function = args -> null;
             jsObject.setProperty("test", function);
-            // jsObject.release();
+            jsObject.release();
         }
 
         // QuickJSLoader.initConsoleLog 方法里有调用过一次 setProperty，总数还剩1个
-        // assertEquals(1, jsContext.getCallFunctionMapSize());
+        assertEquals(1, jsContext.getCallFunctionMapSize());
         jsContext.releaseObjectRecords();
         jsContext.releaseObjectRecords();
         jsContext.destroy();
@@ -1213,6 +1215,27 @@ public void testObjectToMapFilter() {
         }
     }
 
+    @Test
+    public void testObjectToCustomMap() {
+        try (QuickJSContext context = createContext()) {
+            StringBuilder expected = new StringBuilder("{");
+            JSObject object = context.createNewJSObject();
+            for (int i = 0; i < 100; i++) {
+                object.setProperty(Integer.toString(i), i);
+                expected.append(i).append("=").append(i);
+                if (i != 99) {
+                    expected.append(", ");
+                }
+            }
+            expected.append("}");
+            Map<String, Object> linkedMap = object.toMap(null, null, LinkedHashMap::new);
+            HashMap<String, Object> hashMap = object.toMap();
+            assertEquals(expected.toString(), linkedMap.toString());
+            assertNotEquals(expected.toString(), hashMap.toString());
+            object.release();
+        }
+    }
+
     @Test
     public void testObjectLeakDetection() {
         try (QuickJSContext context = createContext()) {

wrapper-java/src/main/java/com/whl/quickjs/wrapper/JSObject.java

@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Map;
 
 public interface JSObject {
 
@@ -63,6 +64,6 @@ public interface JSObject {
 
     HashMap<String, Object> toMap(MapFilter filter);
     ArrayList<Object> toArray(MapFilter filter);
-    HashMap<String, Object> toMap(MapFilter filter, Object extra);
-    ArrayList<Object> toArray(MapFilter filter, Object extra);
+    Map<String, Object> toMap(MapFilter filter, Object extra, MapCreator mapCreator);
+    ArrayList<Object> toArray(MapFilter filter, Object extra, MapCreator mapCreator);
 }

wrapper-java/src/main/java/com/whl/quickjs/wrapper/MapCreator.java

@@ -0,0 +1,10 @@
+package com.whl.quickjs.wrapper;
+
+import java.util.Map;
+
+/**
+ * Created by Harlon Wang on 2025/1/21.
+ */
+public interface MapCreator {
+    Map<String, Object> get();
+}

wrapper-java/src/main/java/com/whl/quickjs/wrapper/QuickJSArray.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 
 /**
  * Created by Harlon Wang on 2024/2/13.
@@ -38,7 +39,7 @@ public HashMap<String, Object> toMap() {
 
     @Override
     public HashMap<String, Object> toMap(MapFilter filter) {
-        return toMap(filter, null);
+        return (HashMap<String, Object>) toMap(filter, null, null);
     }
 
     @Override
@@ -48,20 +49,20 @@ public ArrayList<Object> toArray() {
 
     @Override
     public ArrayList<Object> toArray(MapFilter filter) {
-        return toArray(filter, null);
+        return toArray(filter, null, HashMap::new);
     }
 
     @Override
-    public ArrayList<Object> toArray(MapFilter filter, Object extra) {
+    public ArrayList<Object> toArray(MapFilter filter, Object extra, MapCreator creator) {
         ArrayList<Object> arrayList = new ArrayList<>(length());
         HashSet<Long> circulars = new HashSet<>();
-        convertToMap(this, arrayList, circulars, filter, extra);
+        convertToMap(this, arrayList, circulars, filter, extra, creator);
         circulars.clear();
         return arrayList;
     }
 
     @Override
-    public HashMap<String, Object> toMap(MapFilter filter, Object extra) {
+    public Map<String, Object> toMap(MapFilter filter, Object extra, MapCreator mapCreator) {
         throw new UnsupportedOperationException("Array types are not yet supported for conversion to map. You should use toArray.");
     }
 }

wrapper-java/src/main/java/com/whl/quickjs/wrapper/QuickJSContext.java

@@ -117,6 +117,10 @@ public void setMaxStackSize(int maxStackSize) {
         setMaxStackSize(runtime, maxStackSize);
     }
 
+    public void setGCThreshold(int thresholdSize) {
+        setGCThreshold(runtime, thresholdSize);
+    }
+
     public void runGC() {
         runGC(runtime);
     }
@@ -588,6 +592,7 @@ public Object getOwnPropertyNames(JSObject object) {
     private native void dumpMemoryUsage(long runtime, String fileName);
     private native void dumpObjects(long runtime, String fileName);
     private native long getMemoryUsedSize(long runtime);
+    private native void setGCThreshold(long runtime, int size);
 
     // context
     private native long createContext(long runtime);

wrapper-java/src/main/java/com/whl/quickjs/wrapper/QuickJSObject.java

@@ -6,6 +6,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 
 /**
  * Created by Harlon Wang on 2024/2/12.
@@ -265,33 +266,33 @@ public ArrayList<Object> toArray() {
 
     @Override
     public HashMap<String, Object> toMap(MapFilter filter) {
-        return toMap(filter, null);
+        return (HashMap<String, Object>) toMap(filter, null, HashMap::new);
     }
 
     @Override
-    public HashMap<String, Object> toMap(MapFilter filter, Object extra) {
-        HashMap<String, Object> objectMap = new HashMap<>();
+    public Map<String, Object> toMap(MapFilter filter, Object extra, MapCreator mapCreator) {
+        Map<String, Object> objectMap = mapCreator.get();
         HashSet<Long> circulars = new HashSet<>();
-        convertToMap(this, objectMap, circulars, filter, extra);
+        convertToMap(this, objectMap, circulars, filter, extra, mapCreator);
         circulars.clear();
         return objectMap;
     }
 
     @Override
-    public ArrayList<Object> toArray(MapFilter filter, Object extra) {
+    public ArrayList<Object> toArray(MapFilter filter, Object extra, MapCreator mapCreator) {
         throw new UnsupportedOperationException("Object types are not yet supported for conversion to array. You should use toMap.");
 
     }
 
     @Override
     public ArrayList<Object> toArray(MapFilter filter) {
-        return toArray(filter, null);
+        return toArray(filter, null, null);
     }
 
     /**
      * 注意点：循环引用的对象会被过滤掉
      */
-    protected void convertToMap(Object target, Object map, HashSet<Long> circulars, MapFilter filter, Object extra) {
+    protected void convertToMap(Object target, Object map, HashSet<Long> circulars, MapFilter filter, Object extra, MapCreator mapCreator) {
         circulars.add(((JSObject) target).getPointer());
 
         boolean isArray = target instanceof JSArray;
@@ -326,9 +327,9 @@ protected void convertToMap(Object target, Object map, HashSet<Long> circulars,
 
             if (value instanceof JSArray) {
                 ArrayList<Object> list = new ArrayList<>(((JSArray) value).length());
-                convertToMap(value, list, circulars, filter, extra);
-                if (map instanceof HashMap) {
-                    ((HashMap<String, Object>) map).put(key, list);
+                convertToMap(value, list, circulars, filter, extra, mapCreator);
+                if (map instanceof Map) {
+                    ((Map<String, Object>) map).put(key, list);
                 } else if (map instanceof ArrayList){
                     ((ArrayList<Object>) map).add(list);
                 }
@@ -337,10 +338,10 @@ protected void convertToMap(Object target, Object map, HashSet<Long> circulars,
             }
 
             if (value instanceof JSObject) {
-                HashMap<String, Object> valueMap = new HashMap<>();
-                convertToMap(value, valueMap, circulars, filter, extra);
-                if (map instanceof HashMap) {
-                    ((HashMap<String, Object>) map).put(key, valueMap);
+                Map<String, Object> valueMap = mapCreator.get();
+                convertToMap(value, valueMap, circulars, filter, extra, mapCreator);
+                if (map instanceof Map) {
+                    ((Map<String, Object>) map).put(key, valueMap);
                 } else if (map instanceof ArrayList){
                     ((ArrayList<Object>) map).add(valueMap);
                 }
@@ -349,8 +350,8 @@ protected void convertToMap(Object target, Object map, HashSet<Long> circulars,
             }
 
             // Primitive types.
-            if (map instanceof HashMap) {
-                ((HashMap<String, Object>) map).put(key, value);
+            if (map instanceof Map) {
+                ((Map<String, Object>) map).put(key, value);
             } else if (map instanceof ArrayList){
                 ((ArrayList<Object>) map).add(value);
             }