feat: 更新版本至v1.2.0

Author: Taois

.env.development

@@ -1,4 +1,5 @@
-NODE_ENV=production
+#NODE_ENV=production
+NODE_ENV=development
 
 # just a flag
 ENV='staging'
@@ -16,4 +17,4 @@ EPG_URL = https://iptv.crestekk.cn/epgphp/index.php?ch={name}&date={date}
 LOGO_URL = https://live.mxdyeah.top/logo/{name}.png
 LIVE_URL = 'https://livetv.wqwqwq.sbs/tv.m3u'
 # LIVE_URL = './lives/tv.m3u'
-MAX_TASK = 8
+MAX_TASK = 8

.gitignore

@@ -132,10 +132,10 @@ dist
 !README.md
 .idea
 /config/env.json
-/js/UC分享.js
+/spider/js/UC分享.js
 /json/UC分享.json
 /jx/奇奇.js
-/js/百忙无果[官].js
+/spider/js/百忙无果[官].js
 /data/settings/link_data.json
 /yarn.lock
 /custom.json

README.md

@@ -1,7 +1,7 @@
 # drpyS(drpy-node)
 
 nodejs作为服务端的drpy实现。全面升级异步写法  
-~~积极开发中，每日一更~~，当前进度 `49%`  
+~~积极开发中，每日一更~~，当前进度 `55%`  
 找工作中，随缘更新
 
 * [本地配置接口-动态本地](/config?pwd=)
@@ -19,69 +19,22 @@ nodejs作为服务端的drpy实现。全面升级异步写法
 
 ## 更新记录
 
-### 20250310
-
-更新至V1.1.23
-
-### 20250227
-
-更新至V1.1.22
-
-### 20250226
-
-更新至V1.1.21
-
-### 20250225
-
-更新至V1.1.20
-
-### 20250224
-
-更新至V1.1.19
-
-### 20250211
-
-更新至V1.1.18
-
-### 20250206
+### 20250726
 
-更新至V1.1.17
+更新至V1.2.0
 
-### 20250123
+1. 支持挂载py源
 
-更新至V1.1.16
-
-### 20250122
-
-更新至V1.1.15
-
-1. ds源和dr2源增加装逼壳图标支持
-
-### 20250121
-
-更新至V1.1.14
-
-1. 猫源ds在线配置支持接口密码
-2. 新增源
-3. 磁盘加速
-
-### 20250120
-
-更新至V1.1.13
-
-1. 完善猫在线配置
-
-### 20250117
-
-本次未更新版本
+### 20250310
 
-1. 新开项目，使ds源适用于新版猫影视 [猫爪catpwd](https://github.com/CatPawApp/CatPawOpen)
+更新至V1.1.23
 
 [点此查看完整更新记录](docs/updateRecord.md)
 
 **注意事项**
 
-总是有人遇到各种奇葩问题，像什么没弹幕，访问/config/1服务马上崩溃等等，能自行解决最好，解决不了我建议你使用下方安装教程 `3.道长腾讯轻量云服务器安装方案`
+总是有人遇到各种奇葩问题，像什么没弹幕，访问/config/1服务马上崩溃等等，能自行解决最好，解决不了我建议你使用下方安装教程
+`3.道长腾讯轻量云服务器安装方案`
 跟我一样还有问题那就不可能了，我能用你即能用
 
 ## 基础框架

controllers/api.js

@@ -1,11 +1,45 @@
 import path from 'path';
-import {existsSync} from 'fs';
+import {existsSync, watch} from 'fs';
 import {base64Decode} from '../libs_drpy/crypto-util.js';
 import * as drpy from '../libs/drpyS.js';
 import {ENV} from "../utils/env.js";
 import {validatePwd} from "../utils/api_validate.js";
 
+//添加JSON文件监听  
+let jsonWatcher = null;
+let debounceTimers = new Map(); // 防抖计时器
+function startJsonWatcher(jsonDir) {
+    if (process.env.NODE_ENV !== 'development') return;
+
+    try {
+        jsonWatcher = watch(jsonDir, {recursive: true}, (eventType, filename) => {
+            if (filename && filename.endsWith('.json')) {
+                // 清除之前的计时器  
+                if (debounceTimers.has(filename)) {
+                    clearTimeout(debounceTimers.get(filename));
+                }
+
+                // 设置新的防抖计时器  
+                const timer = setTimeout(() => {
+                    console.log(`${filename}文件已${eventType}，即将清除所有模块缓存`);
+                    drpy.clearAllCache();
+                    debounceTimers.delete(filename);
+                }, 100); // 100ms防抖延迟  
+
+                debounceTimers.set(filename, timer);
+            }
+        });
+
+        console.log(`start json file hot reload success，listening path: ${jsonDir}`);
+    } catch (error) {
+        console.error('start json file listening failed with error:', error);
+    }
+}
+
 export default (fastify, options, done) => {
+    // 启动JSON监听  
+    startJsonWatcher(options.jsonDir);
+
     // 动态加载模块并根据 query 执行不同逻辑
     fastify.route({
         method: ['GET', 'POST'], // 同时支持 GET 和 POST

controllers/config.js

@@ -1,10 +1,12 @@
 import {readdirSync, readFileSync, writeFileSync, existsSync} from 'fs';
+import {readFile} from 'fs/promises';
 import path from 'path';
 import * as drpy from '../libs/drpyS.js';
 import '../libs_drpy/jinja.js'
 import {naturalSort, urljoin, updateQueryString} from '../utils/utils.js'
 import {md5} from "../libs_drpy/crypto-util.js";
 import {ENV} from "../utils/env.js";
+import {extractNameFromCode} from "../utils/python.js";
 import {validateBasicAuth, validatePwd} from "../utils/api_validate.js";
 import {getSitesMap} from "../utils/sites-map.js";
 import {getParsesDict} from "../utils/file.js";
@@ -16,7 +18,9 @@ const {jsEncoder} = drpy;
 async function generateSiteJSON(options, requestHost, sub, pwd) {
     const jsDir = options.jsDir;
     const dr2Dir = options.dr2Dir;
+    const pyDir = options.pyDir;
     const configDir = options.configDir;
+    const jsonDir = options.jsonDir;
     const subFilePath = options.subFilePath;
     const rootDir = options.rootDir;
 
@@ -48,6 +52,33 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
         }
     }
     let sites = [];
+
+    //以下为自定义APP模板部分
+    try {
+        const templateConfigPath = path.join(jsonDir, './App模板配置.json');
+        if (existsSync(templateConfigPath)) {
+            const templateContent = readFileSync(templateConfigPath, 'utf-8');
+            const templateConfig = JSON.parse(templateContent);
+            sites = Object.entries(templateConfig).filter(([key]) => valid_files.includes(`${key}[模板].js`))
+                .flatMap(([key, config]) =>
+                    Object.entries(config)
+                        .filter(([name]) => name !== "示例")
+                        .map(([name]) => ({
+                            key: `drpyS_${name}_${key}`,
+                            name: `${name}[M](${key.replace('App', '').toUpperCase()})`,
+                            type: 4,
+                            api: `${requestHost}/api/${key}[模板]${pwd ? `?pwd=${pwd}` : ''}`,
+                            searchable: 1,
+                            filterable: 1,
+                            quickSearch: 0,
+                            ext: `../json/App模板配置.json$${name}`
+                        })));
+        }
+    } catch (e) {
+        console.error('读取App模板配置失败:', e.message);
+    }
+    //以上为自定义APP[模板]配置自动添加代码
+
     let link_jar = '';
     // console.log('hide_adult:', ENV.get('hide_adult'));
     if (ENV.get('hide_adult') === '1') {
@@ -73,6 +104,7 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
                 } catch (e) {
                     throw new Error(`Error parsing rule object for file: ${file}, ${e.message}`);
                 }
+                ruleObject.title = ruleObject.title || baseName;
 
                 let fileSites = [];
                 if (baseName === 'push_agent') {
@@ -90,8 +122,8 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
                         fileSites.push({key, name, ext});
                     });
                 } else {
-                    let key = `drpyS_${baseName}`;
-                    let name = `${baseName}(DS)`;
+                    let key = `drpyS_${ruleObject.title}`;
+                    let name = `${ruleObject.title}(DS)`;
                     fileSites.push({key, name});
                 }
 
@@ -156,6 +188,7 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
                     } catch (e) {
                         throw new Error(`Error parsing rule object for file: ${file}, ${e.message}`);
                     }
+                    ruleObject.title = ruleObject.title || baseName;
 
                     let fileSites = [];
                     if (baseName === 'push_agent') {
@@ -170,8 +203,8 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
                             fileSites.push({key, name, ext: _ext});
                         });
                     } else {
-                        let key = `drpy2_${baseName}`;
-                        let name = `${baseName}(DR2)`;
+                        let key = `drpy2_${ruleObject.title}`;
+                        let name = `${ruleObject.title}(DR2)`;
                         fileSites.push({key, name, ext});
                     }
 
@@ -200,6 +233,77 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
 
     }
 
+    // 根据用户是否启用py源去生成对应配置
+    if (ENV.get('enable_py', '1') === '1') {
+        const py_files = readdirSync(pyDir);
+        let py_valid_files = py_files.filter((file) => file.endsWith('.py') && !file.startsWith('_')); // 筛选出不是 "_" 开头的 .py 文件
+        // log(py_valid_files);
+        log(`开始生成python的t3配置，pyDir:${pyDir},源数量: ${py_valid_files.length}`);
+
+        const py_tasks = py_valid_files.map((file) => {
+            return {
+                func: async ({file, pyDir, requestHost, pwd, SitesMap}) => {
+                    const baseName = path.basename(file, '.py'); // 去掉文件扩展名
+                    const extJson = path.join(pyDir, baseName + '.json');
+                    let api = `${requestHost}/py/${file}`;
+                    let ext = existsSync(extJson) ? `${requestHost}/py/${file}` : '';
+                    if (pwd) {
+                        api += `?pwd=${pwd}`;
+                        if (ext) {
+                            ext += `?pwd=${pwd}`;
+                        }
+                    }
+                    let ruleObject = {
+                        searchable: 1, // 固定值
+                        filterable: 1, // 固定值
+                        quickSearch: 1, // 固定值
+                    };
+                    const fileContent = await readFile(path.join(pyDir, file), 'utf-8');
+                    ruleObject.title = extractNameFromCode(fileContent) || baseName;
+
+                    let fileSites = [];
+                    if (baseName === 'push_agent') {
+                        let key = 'push_agent';
+                        let name = `${ruleObject.title}(hipy_t3)`;
+                        fileSites.push({key, name, ext});
+                    } else if (SitesMap.hasOwnProperty(baseName) && Array.isArray(SitesMap[baseName])) {
+                        SitesMap[baseName].forEach((it) => {
+                            let key = `hipy_py_${it.alias}`;
+                            let name = `${it.alias}(hipy_t3)`;
+                            let _ext = updateQueryString(ext, it.queryStr);
+                            fileSites.push({key, name, ext: _ext});
+                        });
+                    } else {
+                        let key = `hipy_py_${ruleObject.title}`;
+                        let name = `${ruleObject.title}(hipy_t3)`;
+                        fileSites.push({key, name, ext});
+                    }
+
+                    fileSites.forEach((fileSite) => {
+                        const site = {
+                            key: fileSite.key,
+                            name: fileSite.name,
+                            type: 3, // 固定值
+                            api,
+                            searchable: ruleObject.searchable,
+                            filterable: ruleObject.filterable,
+                            quickSearch: ruleObject.quickSearch,
+                            more: ruleObject.more,
+                            logo: ruleObject.logo,
+                            ext: fileSite.ext || "", // 固定为空字符串
+                        };
+                        sites.push(site);
+                    });
+                },
+                param: {file, pyDir, requestHost, pwd, SitesMap},
+                id: file,
+            };
+        });
+
+        await batchExecute(py_tasks, listener);
+
+    }
+
     // 根据用户是否启用挂载数据源去生成对应配置
     if (ENV.get('enable_link_data', '0') === '1') {
         log(`开始挂载外部T4数据`);