Merge remote-tracking branch 'origin/dev' into dev

app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java

@@ -36,7 +36,7 @@ public class JarLoader {
     }
 
     public void clear() {
-        for (Spider spider : spiders.values()) spider.destroy();
+        for (Spider spider : spiders.values()) App.execute(spider::destroy);
         loaders.clear();
         methods.clear();
         spiders.clear();

app/src/main/java/com/fongmi/android/tv/api/loader/JsLoader.java

@@ -23,7 +23,7 @@ public class JsLoader {
     }
 
     public void clear() {
-        for (Spider spider : spiders.values()) spider.destroy();
+        for (Spider spider : spiders.values()) App.execute(spider::destroy);
         jarLoader.clear();
         spiders.clear();
     }

app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java

@@ -24,7 +24,7 @@ public class PyLoader {
     }
 
     public void clear() {
-        for (Spider spider : spiders.values()) spider.destroy();
+        for (Spider spider : spiders.values()) App.execute(spider::destroy);
         spiders.clear();
     }
 

pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java

@@ -93,6 +93,11 @@ public class Spider extends com.github.catvod.crawler.Spider {
         return result;
     }
 
+    @Override
+    public void destroy() {
+        app.callAttr("destroy", obj);
+    }
+
     private ByteArrayInputStream getStream(PyObject o, boolean base64) {
         if (o.type().toString().contains("bytes")) {
             return new ByteArrayInputStream(o.toJava(byte[].class));

quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java

@@ -126,6 +126,11 @@ public class Spider extends com.github.catvod.crawler.Spider {
 
     @Override
     public void destroy() {
+        try {
+            call("destroy");
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
         submit(() -> {
             executor.shutdownNow();
             ctx.destroy();