fix: 修复bug,重新发布版本

Author: Taois

controllers/cron-tasker.js

@@ -15,6 +15,17 @@ export default (fastify, options, done) => {
     };
 
     const taskRegistry = new Map();
+    const format_task_object = (task) => {
+        return {
+            name: task.name,
+            path: task.path,
+            schedule: task.schedule,
+            lastRun: toBeijingTime(task.lastRun),
+            nextRun: toBeijingTime(task.nextRun),
+            status: task.status,
+            // cronTask: task.cronTask,
+        }
+    };
 
     function getNextRunFromJob(job) {
         try {
@@ -206,7 +217,7 @@ export default (fastify, options, done) => {
             return {
                 message: `Task "${taskName}" executed manually`,
                 status: 'success',
-                task: taskRegistry.get(taskName)
+                task: format_task_object(taskRegistry.get(taskName))
             };
         }
 
@@ -223,14 +234,7 @@ export default (fastify, options, done) => {
     });
 
     fastify.get('/tasks', {preHandler: validateBasicAuth}, async (request, reply) => {
-        const tasks = [...taskRegistry.values()].map(task => ({
-            name: task.name,
-            schedule: task.schedule,
-            status: task.status,
-            lastRun: toBeijingTime(task.lastRun),
-            nextRun: toBeijingTime(task.nextRun),
-            path: task.path
-        }));
+        const tasks = [...taskRegistry.values()].map(task => (format_task_object(task)));
 
         return tasks;
     });
@@ -246,14 +250,7 @@ export default (fastify, options, done) => {
         }
 
         const task = taskRegistry.get(taskName);
-        return {
-            name: task.name,
-            schedule: task.schedule,
-            status: task.status,
-            lastRun: toBeijingTime(task.lastRun),
-            nextRun: toBeijingTime(task.nextRun),
-            path: task.path
-        };
+        return format_task_object(task);
     });
 
     fastify.addHook('onClose', async () => {

docs/updateRecord.md

@@ -10,6 +10,8 @@
 1. 增加 `hipy` 适配器
 2. 新增依赖 `python-shell` 需要手动安装
 3. 统一libs接口 `cate` 改为 `category`
+4. 修复了 定时任务 `execute-now` 接口返回数据错误
+5. 目前py源的T4支持 ext扩展、getDependence依赖、以及 本地代理 和 动作，凑合能用，代码实现很狗屎。
 
 ### 20250815
 

libs/hipy.js

@@ -32,7 +32,7 @@ const loadEsmWithHash = async function (filePath, fileHash, env) {
     const bridgePath = path.join(_lib_path, '_bridge.py'); // 桥接脚本路径
 
     // 创建方法调用函数
-    const callPythonMethod = async (methodName, ...args) => {
+    const callPythonMethod = async (methodName, env, ...args) => {
 
         const options = {
             mode: 'text',     // 使用JSON模式自动解析
@@ -49,7 +49,7 @@ const loadEsmWithHash = async function (filePath, fileHash, env) {
         try {
             const results = await PythonShell.run(bridgePath, {
                 ...options,
-                args: [filePath, methodName, ...jsonArgs]
+                args: [filePath, methodName, JSON.stringify(env), ...jsonArgs]
             });
             // 取最后一条返回
             let vodResult = results.slice(-1)[0];
@@ -107,7 +107,7 @@ const loadEsmWithHash = async function (filePath, fileHash, env) {
     // 为代理对象添加方法
     spiderMethods.forEach(method => {
         spiderProxy[method] = async (...args) => {
-            return callPythonMethod(method, ...args);
+            return callPythonMethod(method, env, ...args);
         };
     });
 
@@ -126,7 +126,6 @@ const getRule = async function (filePath, env) {
 
 const init = async function (filePath, env = {}, refresh) {
     try {
-        // console.log('execute init');
         const fileContent = await readFile(filePath, 'utf-8');
         const fileHash = computeHash(fileContent);
         const moduleName = path.basename(filePath, '.js');
@@ -153,6 +152,7 @@ const init = async function (filePath, env = {}, refresh) {
             const cached = moduleCache.get(hashMd5);
             // 除hash外还必须保证proxyUrl实时相等，避免本地代理url的尴尬情况
             if (cached.hash === fileHash && cached.proxyUrl === env.proxyUrl) {
+                // console.log('cached init');
                 return cached.moduleObject;
             }
         }

spider/py/_bridge.py

@@ -21,8 +21,14 @@ def import_module(module_url):
     return importlib.import_module(module_url)
 
 
-def load_spider(script_path):
+def load_spider(script_path, env):
     """动态加载指定路径的 Python 脚本并实例化 Spider 类"""
+    try:
+        env = json.loads(env)
+    except json.JSONDecodeError:
+        # 保持原始字符串
+        pass
+
     try:
         script_name = os.path.basename(script_path)[:-3]
         print('load_spider:', script_name)
@@ -32,8 +38,9 @@ def load_spider(script_path):
         if not hasattr(module, 'Spider'):
             raise AttributeError(f"Script {script_path} does not contain a 'Spider' class")
 
+        proxyUrl = env.get('proxyUrl') if isinstance(env, dict) else ''
         # 实例化 Spider
-        spider = module.Spider()
+        spider = module.Spider(t4_api=proxyUrl)
         return spider
 
     except Exception as e:
@@ -54,7 +61,7 @@ def t4_spider_init(spider, ext=''):
     module_names = []
     for lib in depends:
         try:
-            module = import_module(lib).Spider()
+            module = import_module(lib).Spider(t4_api=ext)
             modules.append(module)
             module_names.append(lib)
         except Exception as e:
@@ -68,7 +75,7 @@ def t4_spider_init(spider, ext=''):
     return spider, result
 
 
-def call_spider_method(spider, method_name, args):
+def call_spider_method(spider, method_name, env, args):
     """调用 Spider 实例的指定方法"""
     invoke_method_name = method_dict.get(method_name) or method_name
     try:
@@ -87,18 +94,25 @@ def call_spider_method(spider, method_name, args):
             except json.JSONDecodeError:
                 # 保持原始字符串
                 parsed_args.append(arg)
+        try:
+            env = json.loads(env)
+        except json.JSONDecodeError:
+            # 保持原始字符串
+            pass
 
         print(f'parsed_args:{parsed_args}')
 
         if method_name == 'init':
-            extend = parsed_args[0] if parsed_args else ''
+            extend = parsed_args[0] if parsed_args and isinstance(parsed_args, list) else ''
             spider, result = t4_spider_init(spider, extend)
             #             result = spider.init(modules)
             return result
         else:
             if not hasattr(spider, '_init_ok_'):
                 #                 spider,_ = t4_spider_init(spider,*parsed_args) # 需要传extend参数，暂时没有好办法
-                extend = parsed_args[0] if parsed_args else ''
+                #                 extend = parsed_args[0] if parsed_args and isinstance(parsed_args,list)  else ''
+                #                 extend = env.get('ext','')
+                extend = env.get('ext') if isinstance(env, dict) else ''
                 spider, _ = t4_spider_init(spider, extend)
                 method = getattr(spider, invoke_method_name)
             result = method(*parsed_args)
@@ -125,10 +139,11 @@ def main():
         return
     script_path = sys.argv[1]
     method_name = sys.argv[2]
-    args = sys.argv[3:]
+    env = sys.argv[3]
+    args = sys.argv[4:]
     print(f'script_path:{script_path},method_name:{method_name}')
-    spider = load_spider(script_path)
-    result = call_spider_method(spider, method_name, args)
+    spider = load_spider(script_path, env)
+    result = call_spider_method(spider, method_name, env, args)
     print(result)
 
 

spider/py/base/spider.py

@@ -112,6 +112,13 @@ def getName(self):
     def init_api_ext_file(self):
         pass
 
+    def initEnv(self, env=None):
+        if env is None:
+            env = {}
+        self._ENV = env
+        self.t4_api = env.get('proxyUrl')
+
+
     def getProxyUrl(self):
         """
         获取本地代理地址

spider/py/动作代理测试.py

@@ -0,0 +1,118 @@
+"""
+@header({
+  searchable: 0,
+  filterable: 0,
+  quickSearch: 0,
+  title: '动作代理测试',
+  lang: 'hipy'
+})
+"""
+
+# coding=utf-8
+# !/usr/bin/python
+import json
+import sys
+import time
+
+sys.path.append('..')
+try:
+    from base.spider import BaseSpider
+except ImportError:
+    from t4.base.spider import BaseSpider
+
+
+class Spider(BaseSpider):
+    def getName(self):
+        return "动作代理测试"
+
+    filterate = False
+
+    def init(self, extend=""):
+        print("============{0}============".format(extend))
+
+    def getDependence(self):
+        return []
+
+    def isVideoFormat(self, url):
+        pass
+
+    def manualVideoCheck(self):
+        pass
+
+    def homeContent(self, filter):
+        return {
+            'class': [],
+            'type_flag': '3-00-S'
+        }
+
+    def homeVideoContent(self):
+        print('homeVod...')
+        videos = [{
+            "vod_id": json.dumps({
+                'actionId': '代理地址',
+                'id': 'proxy_url',
+                'type': 'input',
+                'title': '直接用的代理m3u链接',
+                'tip': '..',
+                'value': self.getProxyUrl() + '&flag=live'
+            }, ensure_ascii=False),
+            'vod_pic': 'clan://assets/tab.png?bgcolor=0',
+            'vod_name': '复制代理地址',
+            'vod_tag': 'action'
+        }]
+
+        return {
+            'list': videos
+        }
+
+    def categoryContent(self, tid, pg, filter, extend):
+        print('categoryContent:', tid, pg, filter, extend)
+        return {}
+
+    def detailContent(self, array):
+        vod = {}
+        result = {
+            'list': [
+                vod
+            ]
+        }
+        return result
+
+    def searchContent(self, key, quick, pg=1):
+        videos = []
+        result = {
+            'list': videos
+        }
+        return result
+
+    def playerContent(self, flag, id, vipFlags):
+        result = {}
+        parse = 1
+        url = id
+        result["parse"] = parse  # 0=直接播放、1=嗅探
+        result["playUrl"] = ''
+        result["url"] = url
+        result['jx'] = 0  # VIP解析,0=不解析、1=解析
+        result["header"] = ''
+        return result
+
+    config = {
+        "player": {},
+        "filter": {}
+    }
+    header = {}
+
+    def localProxy(self, params):
+        return [404, 'text/plain', 'localProxy response with 404 not found']
+
+    def action(self, action, value):
+        if action == '代理地址':
+            json_dict = json.loads(value)
+            return {
+                'action': {
+                    'actionId': '__copy__',
+                    'content': json_dict.get('proxy_url', '')
+                },
+
+                'toast': '直播源已复制到剪贴板',
+            }