feat: 重构Hipy逻辑

Author: Taois

.env.development

@@ -33,4 +33,6 @@ QQ_EMAIL =
 QQ_SMTP_AUTH_CODE =
 
 # 调试猫源-推荐开启
-CAT_DEBUG=1
+CAT_DEBUG=1
+PYTHON_PATH=
+VIRTUAL_ENV=

controllers/root.js

@@ -3,6 +3,8 @@ import {readdirSync, readFileSync, writeFileSync, existsSync} from 'fs';
 import '../utils/marked.min.js';
 import {computeHash} from '../utils/utils.js';
 import {validateBasicAuth} from "../utils/api_validate.js";
+import {daemon} from "../utils/daemonManager.js";
+import {toBeijingTime} from "../utils/datetime-format.js"
 
 export default (fastify, options, done) => {
     // 添加 / 接口
@@ -108,5 +110,17 @@ export default (fastify, options, done) => {
             reply.status(500).send({error: 'Failed to fetch cat', details: error.message});
         }
     });
+
+    // 健康检查端点
+    fastify.get('/health', async (request, reply) => {
+        return {
+            status: 'ok',
+            timestamp: toBeijingTime(new Date()),
+            python: {
+                available: await daemon.isPythonAvailable(),
+                daemon_running: daemon.isDaemonRunning()
+            }
+        };
+    });
     done();
 };

index.js

@@ -8,6 +8,8 @@ import formBody from '@fastify/formbody';
 import {validateBasicAuth, validateJs, validatePwd} from "./utils/api_validate.js";
 // 注册自定义import钩子
 import './utils/esm-register.mjs';
+// 引入python守护进程
+import {daemon} from "./utils/daemonManager.js";
 // 注册控制器
 import {registerRoutes} from './controllers/index.js';
 
@@ -72,6 +74,26 @@ fastify.register(fastifyStatic, {
 // 注册插件以支持 application/x-www-form-urlencoded
 fastify.register(formBody);
 
+fastify.addHook('onReady', async () => {
+    try {
+        await daemon.startDaemon();
+        fastify.log.info('Python守护进程已启动');
+    } catch (error) {
+        fastify.log.error(`启动Python守护进程失败: ${error.message}`);
+        fastify.log.error('Python相关功能将不可用');
+    }
+});
+
+// 停止时清理守护进程
+fastify.addHook('onClose', async () => {
+    try {
+        await daemon.stopDaemon();
+        fastify.log.info('Python守护进程已停止');
+    } catch (error) {
+        fastify.log.error(`停止Python守护进程失败: ${error.message}`);
+    }
+});
+
 // 给静态目录插件中心挂载basic验证
 fastify.addHook('preHandler', (req, reply, done) => {
     if (req.raw.url.startsWith('/apps/')) {

libs/hipy.js

@@ -6,6 +6,7 @@ import {fileURLToPath} from 'url';
 import {md5} from "../libs_drpy/crypto-util.js";
 import {PythonShell, PythonShellError} from 'python-shell';
 import {fastify} from "../controllers/fastlogger.js";
+import {daemon} from "../utils/daemonManager.js";
 
 // 缓存已初始化的模块和文件 hash 值
 const moduleCache = new Map();
@@ -32,7 +33,7 @@ const loadEsmWithHash = async function (filePath, fileHash, env) {
     const bridgePath = path.join(_lib_path, '_bridge.py'); // 桥接脚本路径
 
     // 创建方法调用函数
-    const callPythonMethod = async (methodName, env, ...args) => {
+    const callPythonMethodOld = async (methodName, env, ...args) => {
 
         const options = {
             mode: 'text',     // 使用JSON模式自动解析
@@ -98,6 +99,69 @@ const loadEsmWithHash = async function (filePath, fileHash, env) {
         }
     };
 
+    const callPythonMethod = async (methodName, env, ...args) => {
+        const config = daemon.getDaemonConfig();
+        const command = [
+            `"${daemon.getPythonPath()}"`,
+            `"${config.clientScript}"`,
+            `--script-path "${filePath}"`,
+            `--method-name "${methodName}"`,
+            `--env '${JSON.stringify(env)}'`,
+            ...args.map(arg => `--arg '${JSON.stringify(arg)}'`)
+        ].join(' ');
+        // console.log(command);
+        const cmd_args = [];
+        args.forEach(arg => {
+            cmd_args.push(`--arg`);
+            cmd_args.push(`${JSON.stringify(arg)}`);
+        });
+        const options = {
+            mode: 'text',
+            pythonPath: daemon.getPythonPath(),
+            pythonOptions: ['-u'], // 无缓冲输出
+            env: {
+                "PYTHONIOENCODING": 'utf-8',
+            },
+            args: [
+                '--script-path', filePath,
+                '--method-name', methodName,
+                '--env', JSON.stringify(env),
+                ...cmd_args
+            ]
+        };
+        const results = await PythonShell.run(config.clientScript, {
+            ...options,
+        });
+        // 取最后一条返回
+        const stdout = results.slice(-1)[0];
+        fastify.log.info(`hipy logs: ${JSON.stringify(results.slice(0, -1))}`);
+        // console.log(`hipy logs: ${JSON.stringify(results.slice(0, -1))}`);
+        let vodResult = {};
+        if (typeof stdout === 'string' && stdout) {
+            switch (stdout) {
+                case 'None':
+                    vodResult = null;
+                    break;
+                case 'True':
+                    vodResult = true;
+                    break;
+                case 'False':
+                    vodResult = false;
+                    break;
+                default:
+                    vodResult = JSON5.parse(stdout);
+                    break;
+            }
+        }
+        // console.log(typeof vodResult);
+        // 检查是否有错误
+        if (vodResult && vodResult.error) {
+            throw new Error(`Python错误: ${vodResult.error}\n${vodResult.traceback}`);
+        }
+        // console.log(vodResult);
+        return vodResult.result;
+    }
+
     // 定义Spider类的方法
     const spiderMethods = [
         'init', 'home', 'homeVod', 'homeContent', 'category',
@@ -162,12 +226,13 @@ const init = async function (filePath, env = {}, refresh) {
         module = await loadEsmWithHash(filePath, fileHash, env);
         // console.log('module:', module);
         const rule = module;
-        await rule.init(default_init_cfg);
+        const initValue = await rule.init(default_init_cfg) || {};
         let t2 = getNowTime();
         const moduleObject = deepCopy(rule);
         moduleObject.cost = t2 - t1;
         moduleCache.set(hashMd5, {moduleObject, hash: fileHash, proxyUrl: env.proxyUrl});
-        return moduleObject;
+        // return moduleObject;
+        return {...moduleObject, ...initValue};
     } catch (error) {
         console.log(`Error in hipy.init :${filePath}`, error);
         throw new Error(`Failed to initialize module:${error.message}`);

spider/py/core/bridge.py

@@ -0,0 +1,73 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import argparse
+import json
+import pickle
+import socket
+import struct
+import sys
+
+HOST = "127.0.0.1"
+PORT = 57570
+MAX_MSG_SIZE = 10 * 1024 * 1024
+TIMEOUT = 30
+
+def send_packet(sock, obj: dict):
+    payload = pickle.dumps(obj, protocol=pickle.HIGHEST_PROTOCOL)
+    if len(payload) > MAX_MSG_SIZE:
+        raise ValueError("payload too large")
+    sock.sendall(struct.pack(">I", len(payload)))
+    sock.sendall(payload)
+
+def recv_exact(sock, n: int) -> bytes:
+    data = b""
+    while len(data) < n:
+        chunk = sock.recv(n - len(data))
+        if not chunk:
+            raise ConnectionError("peer closed")
+        data += chunk
+    return data
+
+def recv_packet(sock) -> dict:
+    header = recv_exact(sock, 4)
+    (length,) = struct.unpack(">I", header)
+    if length <= 0 or length > MAX_MSG_SIZE:
+        raise ValueError("invalid length")
+    payload = recv_exact(sock, length)
+    return pickle.loads(payload)
+
+def main():
+    p = argparse.ArgumentParser(description="T4 CLI bridge")
+    p.add_argument("--script-path", required=True, help="Spider脚本路径或模块名")
+    p.add_argument("--method-name", required=True, help="要调用的方法名")
+    p.add_argument("--env", default="", help="JSON字符串（可包含 proxyUrl/ext）或普通字符串")
+    p.add_argument("--arg", action="append", default=[], help="方法参数；可多次传入。每个参数若可解析为JSON则按JSON，否则按字符串")
+    p.add_argument("--host", default=HOST, help="守护进程主机（默认127.0.0.1）")
+    p.add_argument("--port", type=int, default=PORT, help="守护进程端口（默认57570）")
+    p.add_argument("--timeout", type=int, default=TIMEOUT, help="超时秒数（默认30）")
+    args = p.parse_args()
+
+    req = {
+        "script_path": args.script_path,
+        "method_name": args.method_name,
+        "env": args.env,
+        "args": args.arg,
+    }
+
+    try:
+        with socket.create_connection((args.host, args.port), timeout=args.timeout) as s:
+            s.settimeout(args.timeout)
+            send_packet(s, req)
+            resp = recv_packet(s)
+    except Exception as e:
+        print(json.dumps({"success": False, "error": str(e)}, ensure_ascii=False))
+        sys.exit(2)
+
+    # 统一以 JSON 打印到 stdout，便于脚本链路消费
+    print(json.dumps(resp, ensure_ascii=False))
+    # 非0退出码用于指示错误，方便shell判断
+    sys.exit(0 if resp.get("success") else 1)
+
+if __name__ == "__main__":
+    main()