update:增加es6扩展。尝试写源支持方法的局部变量input等等，失败告终

Author: hjdhnx

Diff for: README.md

@@ -8,3 +8,4 @@ todo:
 
 1. js里的源能否去除export开头，保持跟qjs一致
 2. js里的源，像一级这种异步js，里面调用未定义的函数，能否不通过函数参数传入直接注入调用
+3. 在源的各个函数调用的时候动态注入input、MY_URL等局部变量不影响全局。搞了半天没成功，有点难受，待解决

Diff for: index.js

@@ -15,6 +15,7 @@ fastify.get('/api/:module', async (request, reply) => {
     const query = request.query; // 获取 query 参数
     const modulePath = path.join(__dirname, 'js', `${moduleName}.js`);
 
+    const pg = Number(query.pg) || 1;
     try {
         // 根据 query 参数决定执行逻辑
         if ('play' in query) {
@@ -33,7 +34,7 @@ fastify.get('/api/:module', async (request, reply) => {
                 }
             }
             // 分类逻辑
-            const result = await drpy.cate(modulePath, query.t, query.pg || 1, extend);
+            const result = await drpy.cate(modulePath, query.t, pg, extend);
             return reply.send(result);
         }
 
@@ -48,7 +49,7 @@ fastify.get('/api/:module', async (request, reply) => {
             if (!('quick' in query)) {
                 query.quick = 0
             }
-            const result = await drpy.search(modulePath, query.wd, query.quick, query.pg || 1);
+            const result = await drpy.search(modulePath, query.wd, query.quick, pg);
             return reply.send(result);
         }
 
@@ -64,7 +65,7 @@ fastify.get('/api/:module', async (request, reply) => {
         const result_home = await drpy.home(modulePath, query.filter);
         const result_homeVod = await drpy.homeVod(modulePath);
         const result = {
-            class: result_home,
+            ...result_home,
             list: result_homeVod
         }
         reply.send(result);

Diff for: js/fq.js

@@ -0,0 +1,32 @@
+// http://localhost:5757/api/番茄小说[书]?ac=list&t=主分类&pg=1
+var rule = {
+    类型: '小说',
+    title: '番茄小说[书]',
+    desc: '番茄小说纯js版本',
+    host: 'https://fanqienovel.com/',
+    homeUrl: 'https://fanqienovel.com/api/author/book/category_list/v0/',
+    url: '/api/author/library/book_list/v0/?page_count=18&page_index=(fypage-1)&gender=-1&category_id=fyclass&creation_status=-1&word_count=-1&sort=0#fyfilter',
+    class_parse: async () => {
+
+    },
+    预处理: async () => {
+    },
+    推荐: async () => {
+        return []
+    },
+    一级: async (tid, pg, filter, extend) => {
+        console.log(input);
+        console.log({tid,pg,filter,extend});
+        console.log(rule.host);
+        console.log(rule.host.rstrip('/'));
+    },
+    二级: async () => {
+        return '这是二级:' + rule.title
+    },
+    搜索: async () => {
+        return '这是搜索:' + rule.title
+    },
+    lazy: async () => {
+        return template.getMubans()
+    },
+};

Diff for: js/番茄小说[书].js

@@ -0,0 +1,93 @@
+// http://localhost:5757/api/番茄小说[书]?ac=list&t=主分类&pg=1
+var rule = {
+    类型: '小说',
+    title: '番茄小说[书]',
+    desc: '番茄小说纯js版本',
+    host: 'https://fanqienovel.com/',
+    homeUrl: 'https://fanqienovel.com/api/author/book/category_list/v0/',
+    url: '/api/author/library/book_list/v0/?page_count=18&page_index=(fypage-1)&gender=-1&category_id=fyclass&creation_status=-1&word_count=-1&sort=0#fyfilter',
+    searchUrl:'https://api5-normal-lf.fqnovel.com/reading/bookapi/search/page/v/?query=**&aid=1967&channel=0&os_version=0&device_type=0&device_platform=0&iid=466614321180296&passback=((fypage-1)*10)&version_code=999',
+    searchable: 2,
+    quickSearch: 0,
+    filterable: 1,
+    filter: '',
+    filter_url: '{{fl.筛选}}',
+    filter_def: {
+        //全部: {筛选: '-1'},
+        主分类: {筛选: '1016'},//男频衍生
+        主题: {筛选: '516'},//都市异能
+        角色: {筛选: '29'},//如懿衍生
+        情节: {筛选: '1034'},//如懿衍生
+    },
+    headers: {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36',
+    },
+    config: {
+        api: 'https://novel.snssdk.com/api',
+        封面域名: 'http://p6-novel.byteimg.com/large/',
+    },
+    timeout: 5000,
+    play_parse: true,
+    class_parse: async () => {
+        let html = (await req(rule.homeUrl)).content;
+        let json = JSON.parse(html);
+        let data_list = json.data;
+        let ret = {};
+        for (let data of data_list) {
+            if (!ret[data.label]) {
+                ret[data.label] = {
+                    title: [],
+                    url: []
+                }
+            }
+            ret[data.label].title.push(data.name);
+            ret[data.label].url.push(data.category_id);
+        }
+        let classes = [];
+        let filters = {};
+        let keys = Object.keys(ret);
+        for (let key of keys) {
+            let _titles = ret[key].title;
+            let _urls = ret[key].url;
+            classes.push({
+                type_name: key,
+                type_id: key,
+            });
+            filters[key] = [{
+                key: '筛选',
+                name: '筛选',
+                value: _titles.map((it, index) => {
+                    return {
+                        n: it,
+                        v: _urls[index]
+                    }
+                })
+            }];
+        }
+        classes.unshift({
+            type_name: '全部',
+            type_id: '-1',
+        });
+        return {class:classes,filters}
+    },
+    预处理: async () => {
+    },
+    推荐: async () => {
+        return []
+    },
+    一级: async (tid, pg, filter, extend) => {
+        console.log({tid,pg,filter,extend});
+        console.log(`input:${input},MY_URL:${MY_URL}`);
+        console.log(rule.host);
+        console.log(rule.host.rstrip('/'));
+    },
+    二级: async () => {
+        return '这是二级:' + rule.title
+    },
+    搜索: async () => {
+        return '这是搜索:' + rule.title
+    },
+    lazy: async () => {
+        return template.getMubans()
+    },
+};

Diff for: libs/drpy.js

@@ -1,6 +1,8 @@
 import {readFile} from 'fs/promises';
-import crypto from 'crypto';
+import {readFileSync} from 'fs';
+import path from "path";
 import vm from 'vm';
+import '../libs_drpy/es6-extend.js'
 import * as utils from '../utils/utils.js';
 // const { req } = await import('../utils/req.js');
 import {matchesAll, stringUtils, cut} from '../libs_drpy/external.js'
@@ -14,21 +16,16 @@ import '../libs_drpy/node-rsa.js';
 import '../libs_drpy/pako.min.js';
 import '../libs_drpy/json5.js'
 import '../libs_drpy/jinja.js'
+import {fileURLToPath} from "url";
 
-const {sleep, sleepSync} = utils
-
+const {sleep, sleepSync, computeHash} = utils
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const es6JsPath = path.join(__dirname, '../libs_drpy/es6-extend.js');
+// 读取扩展代码
+const es6_extend_code = readFileSync(es6JsPath, 'utf8');
 // 缓存已初始化的模块和文件 hash 值
 const moduleCache = new Map();
 
-/**
- * 计算文件内容的 hash 值
- * @param {string} content - 文件内容
- * @returns {string} - 文件内容的 hash 值
- */
-function computeHash(content) {
-    return crypto.createHash('sha256').update(content, 'utf8').digest('hex');
-}
-
 /**
  * 初始化模块：加载并执行模块文件，存储初始化后的 rule 对象
  * 如果存在 `预处理` 属性且为函数，会在缓存前执行
@@ -40,7 +37,6 @@ export async function init(filePath, refresh) {
     try {
         // 读取文件内容
         const fileContent = await readFile(filePath, 'utf-8');
-
         // 计算文件的 hash 值
         const fileHash = computeHash(fileContent);
 
@@ -59,6 +55,7 @@ export async function init(filePath, refresh) {
             sleep,
             sleepSync,
             utils,
+            computeHash,
         }
         const drpySanbox = {
             jsp,
@@ -101,7 +98,13 @@ export async function init(filePath, refresh) {
 
         // 创建一个沙箱上下文，注入需要的全局变量和函数
         const sandbox = {
-            console,
+            console,      // 将 console 注入沙箱，便于调试
+            setTimeout,   // 注入定时器方法
+            setInterval,
+            clearTimeout,
+            clearInterval,
+            module: {},   // 模块支持
+            exports: {},   // 模块支持
             rule: {}, // 用于存放导出的 rule 对象
             ...utilsSanbox,
             ...drpySanbox,
@@ -111,12 +114,63 @@ export async function init(filePath, refresh) {
         // 创建一个上下文
         const context = vm.createContext(sandbox);
 
+        // 注入扩展代码到沙箱中
+        const polyfillsScript = new vm.Script(es6_extend_code);
+        polyfillsScript.runInContext(context);
+
         // 执行文件内容，将其放入沙箱中
         const script = new vm.Script(fileContent);
         script.runInContext(context);
 
         // 访问沙箱中的 rule 对象
         const moduleObject = utils.deepCopy(sandbox.rule);
+        moduleObject.injectMethodVars = async function (method, args, vars) {
+            async function _inner() {
+                let input;
+                let MY_URL;
+                // 遍历 vars 对象，将其中的键值对转化为局部变量
+                for (let key in vars) {
+                    let value = vars[key];
+
+                    // 根据类型判断并转化值
+                    if (value === undefined) {
+                        value = 'undefined';  // undefined转为 'undefined'
+                    } else if (value === null) {
+                        value = 'null';       // null 转为 'null'
+                    } else if (value === '') {
+                        value = "''";         // 空字符串转为 "''"
+                    } else if (typeof value === 'boolean') {
+                        value = value ? 'true' : 'false';  // 布尔值转为 'true' 或 'false'
+                    } else if (typeof value === 'object') {
+                        if (Array.isArray(value)) {
+                            value = JSON.stringify(value);  // 数组转为 JSON 字符串
+                        } else if (value instanceof Date) {
+                            value = `new Date("${value.toISOString()}")`;  // Date 对象转为日期字符串
+                        } else if (value instanceof RegExp) {
+                            value = value.toString();  // 正则表达式转为字符串表示
+                        } else {
+                            value = JSON.stringify(value);  // 普通对象转为 JSON 字符串
+                        }
+                    }
+
+                    // 构造赋值代码，并通过 eval 动态执行
+                    let _code = `${key} = ${value}`;
+                    console.log(_code); // 打印每个注入的变量代码
+                    eval(_code); // 使用 eval 在当前作用域中定义变量
+                }
+
+                // 打印 inject 的变量值，确保它们在 eval 中被正确注入
+                console.log('=====inject vars=====');
+                console.log(input);   // 现在 input 应该是定义好的
+                console.log(MY_URL);  // MY_URL 应该被注入并可用
+
+                // 执行传入的 method
+                return await method(...args);
+            }
+
+            return await _inner();
+        };
+
 
         // 检查并执行 `预处理` 方法
         if (typeof moduleObject.预处理 === 'function') {
@@ -129,7 +183,7 @@ export async function init(filePath, refresh) {
 
         // 缓存模块和文件的 hash 值
         moduleCache.set(filePath, {moduleObject, hash: fileHash});
-
+        console.log(moduleObject);
         return moduleObject;
     } catch (error) {
         console.error('Error in drpy.init:', error);
@@ -142,43 +196,62 @@ export async function init(filePath, refresh) {
  * 调用模块的指定方法
  * @param {string} filePath - 模块文件路径
  * @param {string} method - 要调用的属性方法名称
- * @param args
+ * @param args - 传递给方法的普通参数
+ * @param {object} injectVars - 需要注入的变量（如 input 和 MY_URL）
  * @returns {Promise<any>} - 方法调用的返回值
  */
-async function invokeMethod(filePath, method, ...args) {
+async function invokeMethod(filePath, method, args = [], injectVars = {}) {
     const moduleObject = await init(filePath); // 确保模块已初始化
+
     if (moduleObject[method] && typeof moduleObject[method] === 'function') {
-        return await moduleObject[method](...args); // 调用对应的方法并传递参数
+        return await moduleObject.injectMethodVars(moduleObject[method], args, injectVars);
+        // return await moduleObject[method](...args); // 调用对应的方法并传递参数
     } else {
         throw new Error(`Method ${method} not found in module ${filePath}`);
     }
 }
 
-// 各种接口调用方法
-
-export async function home(filePath, filter = 1) {
-    return await invokeMethod(filePath, 'class_parse', {filter});
+export async function home(filePath, filter = 1, inputValue, urlValue) {
+    return await invokeMethod(filePath, 'class_parse', [filter], {
+        input: inputValue || '',
+        MY_URL: urlValue || ''
+    });
 }
 
-export async function homeVod(filePath) {
-    return await invokeMethod(filePath, '推荐');
+export async function homeVod(filePath, inputValue, urlValue) {
+    return await invokeMethod(filePath, '推荐', [], {
+        input: inputValue || '',
+        MY_URL: urlValue || ''
+    });
 }
 
-export async function cate(filePath, tid, pg = 1, filter = 1, extend = {}) {
-    return await invokeMethod(filePath, '一级', {tid, pg, filter, extend});
+export async function cate(filePath, tid, pg = 1, filter = 1, extend = {}, inputValue, urlValue) {
+    return await invokeMethod(filePath, '一级', [tid, pg, filter, extend], {
+        input: inputValue || '',
+        MY_URL: urlValue || ''
+    });
 }
 
-export async function detail(filePath, ids) {
+export async function detail(filePath, ids, inputValue, urlValue) {
     if (!Array.isArray(ids)) throw new Error('Parameter "ids" must be an array');
-    return await invokeMethod(filePath, '二级', {ids});
+    return await invokeMethod(filePath, '二级', [ids], {
+        input: inputValue || '',
+        MY_URL: urlValue || ''
+    });
 }
 
-export async function search(filePath, wd, quick = 0, pg = 1) {
-    return await invokeMethod(filePath, '搜索', {wd, quick, pg});
+export async function search(filePath, wd, quick = 0, pg = 1, inputValue, urlValue) {
+    return await invokeMethod(filePath, '搜索', [wd, quick, pg], {
+        input: inputValue || '',
+        MY_URL: urlValue || ''
+    });
 }
 
-export async function play(filePath, flag, id, flags) {
+export async function play(filePath, flag, id, flags, inputValue, urlValue) {
     flags = flags || [];
     if (!Array.isArray(flags)) throw new Error('Parameter "flags" must be an array');
-    return await invokeMethod(filePath, 'lazy', {flag, id, flags});
+    return await invokeMethod(filePath, 'lazy', [flag, id, flags], {
+        input: inputValue || '',
+        MY_URL: urlValue || ''
+    });
 }