- drpy2完善 (by okjack)

app/build.gradle

@@ -5,7 +5,7 @@ android {
 
     defaultConfig {
         applicationId 'com.github.tvbox.osc'
-        minSdkVersion 18
+        minSdkVersion 16
         targetSdkVersion 26
         versionCode 1
         versionName '1.0.0'
@@ -88,6 +88,7 @@ dependencies {
     implementation 'com.orhanobut:hawk:2.0.1'
 
     implementation project(":player")
+    implementation project(":quickjs")
 
     implementation('org.xwalk:xwalk_shared_library:23.53.589.4') {
         exclude group: 'com.android.support'
@@ -101,6 +102,4 @@ dependencies {
     implementation 'com.github.hedzr:android-file-chooser:v1.2.0-final'
     implementation 'commons-io:commons-io:2.11.0'
     implementation 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
-    implementation 'io.github.taoweiji.quickjs:quickjs-android:1.+'
-
 }

app/proguard-rules.pro

@@ -202,6 +202,6 @@
 # 迅雷下载模块
 -keep class com.xunlei.downloadlib.** {*;}
 # quickjs引擎
--keep class com.quickjs.** {*;}
+-keep class com.github.tvbox.quickjs.** {*;}
 # 支持影视的ali相关的jar
 -keep class com.google.gson.**{*;}

app/src/main/java/com/github/catvod/crawler/JsLoader.java

@@ -0,0 +1,24 @@
+package com.github.catvod.crawler;
+
+import com.github.tvbox.osc.base.App;
+import com.github.tvbox.osc.util.js.SpiderJS;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+public class JsLoader {
+    private ConcurrentHashMap<String, Spider> spiders = new ConcurrentHashMap<>();
+
+    public Spider getSpider(String key, String cls, String ext, String jar) {
+        if (spiders.containsKey(key))
+            return spiders.get(key);
+        try {
+            SpiderJS sp = new SpiderJS(key, cls, ext);
+            sp.init(App.getInstance(), ext);
+            spiders.put(key, sp);
+            return sp;
+        } catch (Throwable th) {
+            th.printStackTrace();
+        }
+        return new SpiderNull();
+    }
+}

app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java

@@ -6,14 +6,14 @@
 import android.util.Base64;
 
 import com.github.catvod.crawler.JarLoader;
+import com.github.catvod.crawler.JsLoader;
 import com.github.catvod.crawler.Spider;
 import com.github.tvbox.osc.base.App;
 import com.github.tvbox.osc.bean.LiveChannelGroup;
 import com.github.tvbox.osc.bean.IJKCode;
 import com.github.tvbox.osc.bean.LiveChannelItem;
 import com.github.tvbox.osc.bean.ParseBean;
 import com.github.tvbox.osc.bean.SourceBean;
-import com.github.tvbox.osc.js.JSEngine;
 import com.github.tvbox.osc.server.ControlManager;
 import com.github.tvbox.osc.util.AES;
 import com.github.tvbox.osc.util.AdBlocker;
@@ -65,6 +65,7 @@ public class ApiConfig {
     private SourceBean emptyHome = new SourceBean();
 
     private JarLoader jarLoader = new JarLoader();
+    private JsLoader jsLoader = new JsLoader();
 
     private String userAgent = "okhttp/3.15";
 
@@ -341,7 +342,6 @@ private void parseJson(String apiUrl, String jsonStr) {
             else
                 setSourceBean(sh);
         }
-        JSEngine.getInstance().clear();
         // 需要使用vip解析的flag
         vipParseFlags = DefaultConfig.safeJsonStringList(infoJson, "flags");
         // 解析地址
@@ -566,8 +566,8 @@ public String getSpider() {
     }
 
     public Spider getCSP(SourceBean sourceBean) {
-        boolean js = sourceBean.getApi().startsWith("js_") || sourceBean.getApi().endsWith(".js") || sourceBean.getApi().contains(".js?");
-        if (js) return JSEngine.getInstance().getSpider(sourceBean);
+        boolean js = sourceBean.getApi().endsWith(".js") || sourceBean.getApi().contains(".js?");
+        if (js) return jsLoader.getSpider(sourceBean.getKey(), sourceBean.getApi(), sourceBean.getExt(), sourceBean.getJar());
         return jarLoader.getSpider(sourceBean.getKey(), sourceBean.getApi(), sourceBean.getExt(), sourceBean.getJar());
     }
 
@@ -657,7 +657,7 @@ public IJKCode getIJKCodec(String name) {
         return ijkCodes.get(0);
     }
 
-    public String clanToAddress(String lanLink) {
+    String clanToAddress(String lanLink) {
         if (lanLink.startsWith("clan://localhost/")) {
             return lanLink.replace("clan://localhost/", ControlManager.get().getAddress(true) + "file/");
         } else {

app/src/main/java/com/github/tvbox/osc/base/App.java

@@ -7,13 +7,13 @@
 import com.github.tvbox.osc.callback.EmptyCallback;
 import com.github.tvbox.osc.callback.LoadingCallback;
 import com.github.tvbox.osc.data.AppDataManager;
-import com.github.tvbox.osc.js.JSEngine;
 import com.github.tvbox.osc.server.ControlManager;
 import com.github.tvbox.osc.util.AppManager;
 import com.github.tvbox.osc.util.EpgUtil;
 import com.github.tvbox.osc.util.HawkConfig;
 import com.github.tvbox.osc.util.OkGoHelper;
 import com.github.tvbox.osc.util.PlayerHelper;
+import com.github.tvbox.osc.util.js.JSEngine;
 import com.kingja.loadsir.core.LoadSir;
 import com.orhanobut.hawk.Hawk;
 
@@ -49,7 +49,7 @@ public void onCreate() {
                 .setSupportSP(false)
                 .setSupportSubunits(Subunits.MM);
         PlayerHelper.init();
-        JSEngine.getInstance().init();
+        JSEngine.getInstance().create();
     }
 
     private void initParams() {
@@ -68,7 +68,7 @@ public static App getInstance() {
     @Override
     public void onTerminate() {
         super.onTerminate();
-        JSEngine.getInstance().stopAll();
+        JSEngine.getInstance().destroy();
     }