refs

app/src/main/java/com/futo/platformplayer/engine/packages/PackageBrowser.kt

@@ -9,6 +9,7 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.collection.emptyLongSet
 import com.caoccao.javet.annotations.V8Function
+import com.caoccao.javet.utils.JavetResourceUtils
 import com.caoccao.javet.values.reference.V8ValueFunction
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
@@ -89,7 +90,9 @@ class PackageBrowser: V8Package {
     }
     @V8Function
     fun deinitialize() {
-        _browser?.destroy();
+        StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
+            _browser?.destroy();
+        }
         _browser = null;
     }
 
@@ -140,7 +143,11 @@ class PackageBrowser: V8Package {
         if(callbackId != null && callback != null) {
             synchronized(_callbacks) {
                 _callbacks.put(callbackId, {
-                    funcClone?.callVoid(null, arrayOf(it));
+                    _plugin.busy {
+                        funcClone?.callVoid(null, arrayOf(it));
+                    }
+                    if (!_plugin.isStopped)
+                        JavetResourceUtils.safeClose(funcClone);
                 });
             }
         }
@@ -168,7 +175,14 @@ class PackageBrowser: V8Package {
                 browser.evaluateJavascript(js, object : ValueCallback<String> {
                     override fun onReceiveValue(value: String?) {
                         Logger.i("PackageBrowser", "Browser run returned: " + (value ?: ""));
-                        funcClone?.callVoid(null, arrayOf(value));
+                        StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+                            Logger.i("PackageBrowser", "Invoking V8 with result (${funcClone != null})");
+                            _plugin.busy {
+                                funcClone?.callVoid(null, arrayOf(value));
+                            }
+                            if (!_plugin.isStopped)
+                                JavetResourceUtils.safeClose(funcClone);
+                        }
                     }
                 })
             }
@@ -184,8 +198,11 @@ class PackageBrowser: V8Package {
         fun callback(id: String, result: String) {
             Logger.i("PackageBrowser", "Browser Callback [${id}]: ${result}");
             val callback = synchronized(pack._callbacks) { pack._callbacks.remove(id); };
-            if(callback != null)
-                callback.invoke(result);
+            if(callback != null) {
+                StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+                    callback.invoke(result);
+                }
+            }
         }
 
         @JavascriptInterface