From 0f59fa2c9a5500b0d415f83e1ac9fe4c84f9c893 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Mon, 25 Sep 2023 00:00:23 +0800
Subject: [PATCH] Clean code

---
 quickjs/build.gradle                              |  2 +-
 .../java/com/fongmi/quickjs/crawler/Spider.java   | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/quickjs/build.gradle b/quickjs/build.gradle
index f7043ccca..16c55fe4c 100644
--- a/quickjs/build.gradle
+++ b/quickjs/build.gradle
@@ -13,5 +13,5 @@ android {
 
 dependencies {
     implementation project(':catvod')
-    implementation 'wang.harlon.quickjs:wrapper-android:0.22.1-beta'
+    implementation 'wang.harlon.quickjs:wrapper-android:1.0.0-beta'
 }
\ No newline at end of file
diff --git a/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java b/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java
index 1d7e0d364..2d3689c74 100644
--- a/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java
+++ b/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java
@@ -2,7 +2,10 @@ package com.fongmi.quickjs.crawler;
 
 import android.content.Context;
 
+import androidx.media3.common.util.UriUtil;
+
 import com.fongmi.quickjs.bean.Res;
+import com.fongmi.quickjs.method.Console;
 import com.fongmi.quickjs.method.Function;
 import com.fongmi.quickjs.method.Global;
 import com.fongmi.quickjs.method.Local;
@@ -10,7 +13,6 @@ import com.fongmi.quickjs.utils.JSUtil;
 import com.fongmi.quickjs.utils.Module;
 import com.github.catvod.utils.Json;
 import com.github.catvod.utils.Path;
-import com.whl.quickjs.android.QuickJSLoader;
 import com.whl.quickjs.wrapper.JSArray;
 import com.whl.quickjs.wrapper.JSMethod;
 import com.whl.quickjs.wrapper.JSObject;
@@ -134,8 +136,8 @@ public class Spider extends com.github.catvod.crawler.Spider {
         submit(() -> {
             if (ctx == null) createCtx();
             if (dex != null) createDex();
-            String context = getContent();
-            ctx.evaluateModule(context, api);
+            String content = getContent();
+            ctx.evaluateModule(content, api);
             jsObject = (JSObject) ctx.getProperty(ctx.getGlobalObject(), name);
             return null;
         }).get();
@@ -143,11 +145,16 @@ public class Spider extends com.github.catvod.crawler.Spider {
 
     private void createCtx() {
         ctx = QuickJSContext.create();
-        QuickJSLoader.initConsoleLog(ctx);
+        ctx.setConsole(new Console());
         Global.create(ctx, executor, proxy()).setProperty();
         ctx.getGlobalObject().setProperty("local", Local.class);
         ctx.getGlobalObject().getContext().evaluate(Path.asset("js/lib/http.js"));
         ctx.setModuleLoader(new QuickJSContext.DefaultModuleLoader() {
+            @Override
+            public String moduleNormalizeName(String baseModuleName, String moduleName) {
+                return UriUtil.resolve(baseModuleName, moduleName);
+            }
+
             @Override
             public String getModuleStringCode(String moduleName) {
                 return Module.get().fetch(proxy(), moduleName);