fix(android): clear quickjs weak refs before gc

Ports the iOS QuickJS WeakRef keepalive clearing path to both Android QuickJS backends and clears those keepalives before explicit GC and JS exit.

Author: DjDeveloperr

NativeScript/napi/android/quickjs/quickjs-api.c

@@ -308,6 +308,7 @@ static inline void js_enter(napi_env env) {
 
 static inline void js_exit(napi_env env) {
     if (--env->js_enter_state <= 0) {
+        JS_ClearWeakRefKeepAlives(JS_GetRuntime(env->context));
         qjs_execute_pending_jobs(env);
     }
 }
@@ -4112,7 +4113,9 @@ static JSValue JSRunGCCallback(JSContext *ctx, JSValue
 this_val,
                                int argc, JSValue
                                *argv) {
-    JS_RunGC(JS_GetRuntime(ctx));
+    JSRuntime *rt = JS_GetRuntime(ctx);
+    JS_ClearWeakRefKeepAlives(rt);
+    JS_RunGC(rt);
     return JS_TRUE;
 }
 

NativeScript/napi/android/quickjs/source/quickjs.c

@@ -261,6 +261,7 @@ struct JSRuntime {
     JSGCPhaseEnum gc_phase : 8;
     size_t malloc_gc_threshold;
     struct list_head weakref_list; /* list of JSWeakRefHeader.link */
+    struct list_head weakref_keepalive_list; /* strong refs kept until the current host job completes */
 #ifdef DUMP_LEAKS
     struct list_head string_list; /* list of JSString.link */
 #endif
@@ -339,6 +340,11 @@ typedef struct JSStackFrame {
     JSValue *cur_sp;
 } JSStackFrame;
 
+typedef struct JSWeakRefKeepAliveEntry {
+    struct list_head link;
+    JSValue value;
+} JSWeakRefKeepAliveEntry;
+
 typedef enum {
     JS_GC_OBJ_TYPE_JS_OBJECT,
     JS_GC_OBJ_TYPE_FUNCTION_BYTECODE,
@@ -1669,6 +1675,7 @@ JSRuntime *JS_NewRuntime2(const JSMallocFunctions *mf, void *opaque)
     init_list_head(&rt->gc_zero_ref_count_list);
     rt->gc_phase = JS_GC_PHASE_NONE;
     init_list_head(&rt->weakref_list);
+    init_list_head(&rt->weakref_keepalive_list);
 
 #ifdef DUMP_LEAKS
     init_list_head(&rt->string_list);
@@ -1990,6 +1997,7 @@ void JS_FreeRuntime(JSRuntime *rt)
         js_free_rt(rt, e);
     }
     init_list_head(&rt->job_list);
+    JS_ClearWeakRefKeepAlives(rt);
 
     /* don't remove the weak objects to avoid create new jobs with
        FinalizationRegistry */
@@ -59255,6 +59263,7 @@ static JSValue js_weakref_constructor(JSContext *ctx, JSValueConst new_target,
     wrd->target = js_weakref_new(ctx, arg);
     wrd->weakref_header.weakref_type = JS_WEAKREF_TYPE_WEAKREF;
     list_add_tail(&wrd->weakref_header.link, &ctx->rt->weakref_list);
+    JS_KeepWeakRefTargetAlive(ctx, arg);
     JS_SetOpaque(obj, wrd);
     return obj;
 }
@@ -59524,6 +59533,35 @@ JSValue JS_WeakRef_Deref(JSContext *ctx, JSValueConst this_val) {
     return js_weakref_deref(ctx, this_val, 0, NULL);
 }
 
+void JS_KeepWeakRefTargetAlive(JSContext *ctx, JSValueConst value)
+{
+    JSRuntime *rt;
+    JSWeakRefKeepAliveEntry *entry;
+
+    if (!js_weakref_is_target(value))
+        return;
+
+    rt = JS_GetRuntime(ctx);
+    entry = js_malloc(ctx, sizeof(*entry));
+    if (!entry)
+        return;
+
+    entry->value = JS_DupValue(ctx, value);
+    list_add_tail(&entry->link, &rt->weakref_keepalive_list);
+}
+
+void JS_ClearWeakRefKeepAlives(JSRuntime *rt)
+{
+    struct list_head *el, *el1;
+
+    list_for_each_safe(el, el1, &rt->weakref_keepalive_list) {
+        JSWeakRefKeepAliveEntry *entry = list_entry(el, JSWeakRefKeepAliveEntry, link);
+        list_del(&entry->link);
+        JS_FreeValueRT(rt, entry->value);
+        js_free_rt(rt, entry);
+    }
+}
+
 int JS_GetLength(JSContext *ctx, JSValueConst obj, int64_t *pres) {
     return js_get_length64(ctx, pres, obj);
 }
@@ -59577,4 +59615,3 @@ int JS_FreezeObject(JSContext *ctx, JSValueConst obj)
 size_t JS_GetGCThreshold(JSRuntime *rt) {
     return rt->malloc_gc_threshold;
 }
-

NativeScript/napi/android/quickjs/source/quickjs.h

@@ -406,6 +406,8 @@ int JS_AddIntrinsicMapSet(JSContext *ctx);
 int JS_AddIntrinsicTypedArrays(JSContext *ctx);
 int JS_AddIntrinsicPromise(JSContext *ctx);
 int JS_AddIntrinsicWeakRef(JSContext *ctx);
+void JS_KeepWeakRefTargetAlive(JSContext *ctx, JSValueConst value);
+void JS_ClearWeakRefKeepAlives(JSRuntime *rt);
 
 JSValue js_string_codePointRange(JSContext *ctx, JSValueConst this_val,
                                  int argc, JSValueConst *argv);

NativeScript/napi/android/quickjs/source_ng/quickjs.c

@@ -304,6 +304,7 @@ struct JSRuntime {
     void *host_promise_rejection_tracker_opaque;
 
     struct list_head job_list; /* list of JSJobEntry.link */
+    struct list_head weakref_keepalive_list; /* strong refs kept until the current host job completes */
 
     JSModuleNormalizeFunc *module_normalize_func;
     JSModuleLoaderFunc *module_loader_func;
@@ -352,6 +353,11 @@ typedef struct JSStackFrame {
     JSValue *cur_sp;
 } JSStackFrame;
 
+typedef struct JSWeakRefKeepAliveEntry {
+    struct list_head link;
+    JSValue value;
+} JSWeakRefKeepAliveEntry;
+
 typedef enum {
     JS_GC_OBJ_TYPE_JS_OBJECT,
     JS_GC_OBJ_TYPE_FUNCTION_BYTECODE,
@@ -1856,6 +1862,7 @@ JSRuntime *JS_NewRuntime2(const JSMallocFunctions *mf, void *opaque)
     init_list_head(&rt->string_list);
 #endif
     init_list_head(&rt->job_list);
+    init_list_head(&rt->weakref_keepalive_list);
 
     if (JS_InitAtoms(rt))
         goto fail;
@@ -2151,6 +2158,7 @@ void JS_FreeRuntime(JSRuntime *rt)
         js_free_rt(rt, e);
     }
     init_list_head(&rt->job_list);
+    JS_ClearWeakRefKeepAlives(rt);
 
     JS_RunGC(rt);
 
@@ -57510,6 +57518,7 @@ static JSValue js_weakref_constructor(JSContext *ctx, JSValueConst new_target,
     wr->kind = JS_WEAK_REF_KIND_WEAK_REF;
     wr->u.weak_ref_data = wrd;
     insert_weakref_record(arg, wr);
+    JS_KeepWeakRefTargetAlive(ctx, arg);
 
     JS_SetOpaqueInternal(obj, wrd);
     return obj;
@@ -57840,6 +57849,35 @@ static void insert_weakref_record(JSValueConst target,
     *pwr = wr;
 }
 
+void JS_KeepWeakRefTargetAlive(JSContext *ctx, JSValueConst value)
+{
+    JSRuntime *rt;
+    JSWeakRefKeepAliveEntry *entry;
+
+    if (!JS_IsObject(value) && !JS_IsSymbol(value))
+        return;
+
+    rt = JS_GetRuntime(ctx);
+    entry = js_malloc(ctx, sizeof(*entry));
+    if (!entry)
+        return;
+
+    entry->value = JS_DupValue(ctx, value);
+    list_add_tail(&entry->link, &rt->weakref_keepalive_list);
+}
+
+void JS_ClearWeakRefKeepAlives(JSRuntime *rt)
+{
+    struct list_head *el, *el1;
+
+    list_for_each_safe(el, el1, &rt->weakref_keepalive_list) {
+        JSWeakRefKeepAliveEntry *entry = list_entry(el, JSWeakRefKeepAliveEntry, link);
+        list_del(&entry->link);
+        JS_FreeValueRT(rt, entry->value);
+        js_free_rt(rt, entry);
+    }
+}
+
 /* CallSite */
 
 static void js_callsite_finalizer(JSRuntime *rt, JSValueConst val)

NativeScript/napi/android/quickjs/source_ng/quickjs.h

@@ -484,6 +484,8 @@ JS_EXTERN void JS_AddIntrinsicTypedArrays(JSContext *ctx);
 JS_EXTERN void JS_AddIntrinsicPromise(JSContext *ctx);
 JS_EXTERN void JS_AddIntrinsicBigInt(JSContext *ctx);
 JS_EXTERN void JS_AddIntrinsicWeakRef(JSContext *ctx);
+JS_EXTERN void JS_KeepWeakRefTargetAlive(JSContext *ctx, JSValueConst value);
+JS_EXTERN void JS_ClearWeakRefKeepAlives(JSRuntime *rt);
 JS_EXTERN void JS_AddPerformance(JSContext *ctx);
 JS_EXTERN void JS_AddIntrinsicDOMException(JSContext *ctx);