From dd90609a7240eea00a33677148b757edec281892 Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 12 Aug 2024 00:50:53 +0800 Subject: [PATCH] Fix bug --- .../java/com/fongmi/quickjs/crawler/Spider.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 12260ab4d..a27840da4 100644 --- a/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java +++ b/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java @@ -160,19 +160,21 @@ public class Spider extends com.github.catvod.crawler.Spider { @Override public byte[] getModuleBytecode(String moduleName) { - String spider = "__JS_SPIDER__"; - String jsEval = "__jsEvalReturn"; - String global = "globalThis." + spider; String content = Module.get().fetch(moduleName); - cat = content.startsWith("//bb") || content.contains(jsEval); - return content.startsWith("//bb") ? Module.get().bb(content) : ctx.compileModule(content.replace(spider, global), moduleName); + return content.startsWith("//bb") ? Module.get().bb(content) : ctx.compileModule(content, moduleName); } }); } private void createObj() { + String spider = "__JS_SPIDER__"; + String global = "globalThis." + spider; + String content = Module.get().fetch(api); + boolean bb = content.startsWith("//bb"); + cat = bb || content.contains("__jsEvalReturn"); + if (!bb) ctx.evaluateModule(content.replace(spider, global), api); ctx.evaluateModule(String.format(Asset.read("js/lib/spider.js"), api)); - jsObject = (JSObject) ctx.getProperty(ctx.getGlobalObject(), "__JS_SPIDER__"); + jsObject = (JSObject) ctx.getProperty(ctx.getGlobalObject(), spider); } private JSObject cfg(String ext) {