feat: 发布新版本

Author: Taois

.gitignore

@@ -147,3 +147,4 @@ dist
 /database.db
 /scripts/python/XYQ提取结果.json
 *.pyc
+/scripts/python/appMap.txt

README.md

@@ -1,7 +1,7 @@
 # drpyS(drpy-node)
 
 nodejs作为服务端的drpy实现。全面升级异步写法  
-~~积极开发中，每日一更~~，当前进度 `80%`  
+~~积极开发中，每日一更~~，当前进度 `82%`  
 ~~找工作中，随缘更新~~  
 上班当牛马，下班要带娃，阶段性佛系趁娃睡觉熬夜更新
 
@@ -25,6 +25,10 @@ nodejs作为服务端的drpy实现。全面升级异步写法
 
 ## 更新记录
 
+### 20250822
+
+更新至V1.2.17
+
 ### 20250821
 
 更新至V1.2.16

config/map.txt

@@ -1,20 +1,65 @@
-哔哩收藏[官]@?render=1&type=url&params=../json/哔哩收藏.json@哔哩收藏[官]
-我的哔哩[官]@?render=1&type=url&params=../json/哔哩教育.json@哔哩教育[官]
-我的哔哩[官]@?render=1&type=url&params=../json/哔哩少儿.json@哔哩少儿[官]
-我的哔哩[官]@?render=1&type=url&params=../json/哔哩大全.json@哔哩大全[官]
-我的哔哩[官]@?render=1&type=url&params=../json/哔哩大杂烩.json@哔哩大杂烩[官]
-直播转点播[合]@?type=url&params=../json/live2cms.json
-采集之王[合]@?type=url&params=../json/采集静态.json$1@采王道长[合]
-采集之王[合]@?type=url&params=../json/采集[zy]静态.json$1@采王zy[密]
-采集之王[合]@?type=url&params=../json/采集[密]静态.json$1$@采王成人[密]
-采集之王[合]@?type=url&params=../json/采集2024静态.json$1$@采王2024
-采集之王[合]@?type=url&params=../json/采集2025静态.json$1$@采王2025
-UC分享@?type=url&params=../json/UC分享.json@UC分享[盘]
-16wMV[听]@?type=url&params=../json/十六万歌曲.txt
-点歌欢唱[B]@?type=url&params=../json/十六万歌曲.txt
-Appfox@http://app.hktvyb.cc@TVB云播|APP
-Appfox@{"host":"http://45.192.110.211:1513","parse":{"qq|qiyi|mgtv|youku|bilibili":"https://api.qljson.xyz/api/?key=67f6a108dc6d84eaf81ac58417c1f72a&url="}}@魔方影视|APP
-Appfox@{"host":"https://cunchu8.obs.cn-north-4.myhuaweicloud.com/config.json","parse":{"JL4K":"http://194.147.100.155:7891/?url="}}@火猫影视|APP
-Appfox@{"host":"http://kumiao.yzbao.com.cn","parse":{"qq|qiyi|mgtv|youku|bilibili":"https://api.qljson.xyz/api/?key=67f6a108dc6d84eaf81ac58417c1f72a&url="}}@未来影视|APP
-getapp3.4.1@{"host":"https://appcms.xy4k.com","datakey":"7SDWjknU34zqFbVr"}@小羊4k
-getapp3.4.1@{"host":"https://jingyu4k-1312635929.cos.ap-nanjing.myqcloud.com/1.json","datakey":"AAdgrdghjfgswerA","api":2}@鲸鱼影视
+哔哩收藏[官]@@?render=1&type=url&params=../json/哔哩收藏.json@@哔哩收藏[官]
+我的哔哩[官]@@?render=1&type=url&params=../json/哔哩教育.json@@哔哩教育[官]
+我的哔哩[官]@@?render=1&type=url&params=../json/哔哩少儿.json@@哔哩少儿[官]
+我的哔哩[官]@@?render=1&type=url&params=../json/哔哩大全.json@@哔哩大全[官]
+我的哔哩[官]@@?render=1&type=url&params=../json/哔哩大杂烩.json@@哔哩大杂烩[官]
+直播转点播[合]@@?type=url&params=../json/live2cms.json
+采集之王[合]@@?type=url&params=../json/采集静态.json$1@@采王道长[合]
+采集之王[合]@@?type=url&params=../json/采集[zy]静态.json$1@@采王zy[密]
+采集之王[合]@@?type=url&params=../json/采集[密]静态.json$1$@@采王成人[密]
+采集之王[合]@@?type=url&params=../json/采集2024静态.json$1$@@采王2024
+采集之王[合]@@?type=url&params=../json/采集2025静态.json$1$@@采王2025
+UC分享@@?type=url&params=../json/UC分享.json@@UC分享[盘]
+16wMV[听]@@?type=url&params=../json/十六万歌曲.txt
+点歌欢唱[B]@@?type=url&params=../json/十六万歌曲.txt
+AppFox@@http://app.hktvyb.cc@@TVB云播[AFX]
+AppFox@@{"host": "https://cunchu8.obs.cn-north-4.myhuaweicloud.com/config.json", "parse": {"JL4K": "http://194.147.100.155:7891/?url="}}@@火猫影视[AFX]
+AppFox@@{"host": "http://kumiao.yzbao.com.cn", "parse": {"qq|qiyi|mgtv|youku|bilibili": "https://api.qljson.xyz/api/?key=67f6a108dc6d84eaf81ac58417c1f72a&url="}}@@未来影视[AFX]
+AppFei@@https://ysc.yy-fun.cc/feiapp@@呀哩4K[AF]
+AppFei@@https://ysa.yy-fun.cc/feiapp@@森林动漫[AF]
+AppGet@@{"host": "https://api1.bffree.cn", "key": "2015692015692015"}@@橘子[AG¹]
+AppGet@@{"host": "https://dy.58ys.vip", "key": "JEWibY1AgWF0V1xx"}@@五八[AG¹]
+AppGet@@{"host": "https://mac.555618.xyz", "key": "#getapp@TMD@2025"}@@玲珑[AG¹]
+AppGet@@{"host": "http://122.228.193.2:9654", "key": "ca94b06ca3c7d80e"}@@蓝光[AG¹]
+AppGet@@{"host": "http://110.40.59.188:9527", "key": "ebad3f1a58b13933"}@@若惜[AG¹]
+AppGet@@{"host": "http://154.12.90.59:14500", "key": "J6AIORKJ3PQOJKM3"}@@火猫[AG¹]
+AppGet@@{"host": "http://www.milkidc.cn", "key": "20c79c979da8db0f"}@@米诺-旧[AG¹]
+AppGet@@{"host": "http://new.tkbot.fun", "key": "d032c12876bc6848"}@@米兔-旧[AG¹]
+AppGet@@{"host": "http://jjjj.nilinili.org", "key": "672263e98f232a05"}@@囧次元[AG¹]
+AppGet@@{"host": "https://app.omofun1.top", "key": "66dc309cbeeca454"}@@OMOfun[AG¹]
+AppGet@@{"host": "http://tv.yy-fun.cc", "key": "qkxnwkfjwpcnwycl"}@@丫丫动漫[AG¹]
+AppGet@@{"host": "https://newappcms.cs4k.top", "key": "Z98KXaLtO2wC1Pte", "path": "/api.php/qijiappapi"}@@仓鼠[AG²]
+AppGet@@{"host": "https://lanyinghz.oss-cn-hangzhou.aliyuncs.com/lanyingxmy.txt", "key": "ca94b06ca359d80e", "path": "/api.php/qijiappapi"}@@雄鹰[AG²]
+AppMuou@@{"host": "https://muouapp.oss-cn-hangzhou.aliyuncs.com/MUOUAPP/764119293.txt", "version": "4.2.0"}@@23影视[AM]
+AppSk@@{"host": "https://skyappdata-1321528676.cos.accelerate.myqcloud.com/4kapp/appipr.txt", "key": "ygcnbckhcuvygdyb", "iv": "4023892775143708"}@@即看影视[AS]
+AppSk@@{"host": "https://kankelm.cn:2024/appdomain.txt", "key": "ygcnbcvybqqckwqy", "iv": "1583560747143708"}@@看客联盟[AS]
+AppSk@@{"host": "https://dmsk.oss-rg-china-mainland.aliyuncs.com/dmapp/dmapi.txt", "key": "ygcnbcobcegtgigg", "iv": "4058263969143708"}@@2k动漫[AS]
+AppSk@@{"host": "https://sk.xiaoyaoys.top/skkkkkkk.txt", "key": "ygcnbcczduwydmrs", "iv": "4672921073143708"}@@Free影视[AS]
+AppV6@@{"api": "http://yjyi.juyongjiu.com/icciu_api.php/v1.vod", "datasignkey": "6QQNUsP3PkD2ajJCPCY8", "apisignkey": "lvdoutv-1.0.0"}@@剧永久[AV⁶]
+AppV6@@http://jxfmax.juxiafan.com/icciu_api.php/v1.vod@@剧下饭[AV⁶]
+AppV2¹@@http://160.202.231.210:7080/ikumiao_api.php/v1.vod@@酷秒至尊[AV2¹]
+AppToV5@@http://118.89.203.120:8762@@番喜[ATV⁵]
+AppToV5@@http://118.89.203.120:8366@@畅看[ATV⁵]
+AppToV5@@http://111.173.114.61:8762@@爱看剧Fax[ATV⁵]
+AppToV5@@http://38.55.237.41:8762@@皮皮虾[ATV⁵]
+AppV2²@@https://dmz8k4.wiki@@大米[AV²]
+AppV2²@@https://www.heli888.cc@@河狸！[AV²]
+AppV2²@@http://38.47.213.61:41271@@闪影[AV²]
+AppV2²@@https://www.rebovod.com@@热剧[AV²]
+AppV2²@@http://v.lnhaozhenjin.cn@@好震惊[AV²]
+AppV2²@@http://jxfmax.juxiafan.com@@剧下饭[AV²]
+AppV1@@http://ziyuncms.feifan12.xyz/api.php@@紫云[AV¹]
+getapp3.4.2@@{"host": "https://appcms.xy4k.com", "datakey": "7SDWjknU34zqFbVr"}@@小羊4k[AG³]
+getapp3.4.2@@{"host": "https://jingyu4k-1312635929.cos.ap-nanjing.myqcloud.com/1.json", "datakey": "AAdgrdghjfgswerA", "api": 2}@@鲸鱼影视[AG³]
+getapp3.4.2@@{"host": "https://staraugust123456.oss-cn-hangzhou.aliyuncs.com/1.txt", "datakey": "staraugust123456", "api": 2}@@云云[AG³]
+getapp3.4.2@@{"host": "http://tengxunyunaliyun.oss-cn-shanghai.aliyuncs.com/tengxunyun.txt", "datakey": "n3l2tx5jdkp9s2c8"}@@白蛇[AG³]
+getapp3.4.2@@{"host": "http://appcms.4kdq.icu", "key": "R6FVRw4jsy4Hsitj"}@@4K大全[AG³]
+getapp3.4.2@@{"host": "https://www.guahd.com/1.txt", "key": "f2A7D4B9E8C16531"}@@瓜萌[AG³]
+getapp3.4.2@@{"host": "https://www.gugu3.com", "key": "nKfZ8KX6JTNWRzTD"}@@咕咕动漫[AG³]
+getapp3.4.2@@{"host": "https://apiapplbys.lbys.app:5678", "key": "apiapplbyskey168"}@@萝卜[AG³]
+getapp3.4.2@@{"host": "https://99.jl8.top/1.txt", "key": "xnybssspqtwotuwj"}@@七月[AG³]
+getapp3.4.2@@{"host": "https://qjappcms.sun4k.top", "key": "sBxqXVF5pAHbGzrH"}@@晴天[AG³]
+getapp3.4.2@@{"host": "https://sykjw.xyz", "key": "sicnagduxbSfisnz", "api": 2}@@世颜[AG³]
+getapp3.4.2@@{"host": "https://guowaiju.com", "key": "7xv16h7qgkrs9b1p"}@@外剧[AG³]
+getapp3.4.2@@{"host": "https://appcms.xy4k.com", "key": "7SDWjknU34zqFbVr"}@@小野[AG³]
+getapp3.4.2@@{"host": "http://tvb.yy-fun.cc", "key": "jcTz6Jda2aKrH8Tk"}@@掌上追剧[AG³]

controllers/config.js

@@ -109,7 +109,11 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
         valid_files = valid_files.filter(it => !(new RegExp('\\[[密]\\]|密+')).test(it));
     }
     let SitesMap = getSitesMap(configDir);
+    let mubanKeys = Object.keys(SitesMap);
     // console.log(SitesMap);
+    // console.log(mubanKeys);
+    // 排除模板后缀的DS源
+    valid_files = valid_files.filter(it => !/\[模板]\.js$/.test(it));
     log(`开始生成ds的t4配置，jsDir:${jsDir},源数量: ${valid_files.length}`);
     const tasks = valid_files.map((file) => {
         return {
@@ -156,11 +160,12 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
                 ruleMeta.title = enableRuleName ? ruleMeta.title || baseName : baseName;
 
                 let fileSites = [];
+                const isMuban = mubanKeys.includes(baseName);
                 if (baseName === 'push_agent') {
                     let key = 'push_agent';
                     let name = `${ruleMeta.title}(DS)`;
                     fileSites.push({key, name});
-                } else if (SitesMap.hasOwnProperty(baseName) && Array.isArray(SitesMap[baseName])) {
+                } else if (isMuban && SitesMap.hasOwnProperty(baseName) && Array.isArray(SitesMap[baseName])) {
                     SitesMap[baseName].forEach((it) => {
                         let key = `drpyS_${it.alias}`;
                         let name = `${it.alias}(DS)`;
@@ -170,6 +175,8 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
                         }
                         fileSites.push({key, name, ext});
                     });
+                } else if (isMuban) {
+                    return
                 } else {
                     let key = `drpyS_${ruleMeta.title}`;
                     let name = `${ruleMeta.title}(DS)`;
@@ -380,11 +387,12 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
 
                     let fileSites = [];
                     ext = ext || ruleMeta.ext || '';
+                    const isMuban = mubanKeys.includes(baseName) || /^(APP|getapp3)/.test(baseName);
                     if (baseName === 'push_agent') {
                         let key = 'push_agent';
                         let name = `${ruleMeta.title}(hipy)`;
                         fileSites.push({key, name, ext});
-                    } else if (SitesMap.hasOwnProperty(baseName) && Array.isArray(SitesMap[baseName])) {
+                    } else if (isMuban && SitesMap.hasOwnProperty(baseName) && Array.isArray(SitesMap[baseName])) {
                         // console.log(SitesMap[baseName]);
                         SitesMap[baseName].forEach((it) => {
                             let key = `hipy_py_${it.alias}`;
@@ -396,6 +404,8 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
                             console.log(`[HIPY-${baseName}] alias name: ${name},typeof _ext:${typeof _ext},_ext: ${logExt(_ext)}`);
                             fileSites.push({key, name, ext: _ext});
                         });
+                    } else if (isMuban) {
+                        return
                     } else {
                         let key = `hipy_py_${ruleMeta.title}`;
                         let name = `${ruleMeta.title}(hipy)`;
@@ -436,11 +446,12 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
                 func: async ({file, catDir, requestHost, pwd, SitesMap}) => {
                     const baseName = path.basename(file, '.js'); // 去掉文件扩展名
                     const extJson = path.join(catDir, baseName + '.json');
-                    let api = enable_cat === '1' ? `${requestHost}/cat/${file}` : `${requestHost}/api/${baseName}?do=cat`;  // 使用请求的 host 地址，避免硬编码端口
+                    const isT3 = enable_cat === '1' || baseName.includes('[B]');
+                    let api = isT3 ? `${requestHost}/cat/${file}` : `${requestHost}/api/${baseName}?do=cat`;  // 使用请求的 host 地址，避免硬编码端口
                     let ext = existsSync(extJson) ? `${requestHost}/cat/${file}` : '';
 
                     if (pwd) {
-                        api += api_type === 3 ? '?' : '&';
+                        api += isT3 ? '?' : '&';
                         api += `pwd=${pwd}`;
                         if (ext) {
                             ext += `?pwd=${pwd}`;
@@ -500,7 +511,7 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
                         const site = {
                             key: fileSite.key,
                             name: fileSite.name,
-                            type: api_type, // 固定值
+                            type: isT3 ? 3 : api_type, // 固定值
                             api,
                             ...ruleMeta,
                             ext: fileSite.ext || "", // 固定为空字符串

docs/updateRecord.md

@@ -1,5 +1,13 @@
 # drpyS更新记录
 
+### 20250822
+
+更新至V1.2.17
+
+1. 增加一堆 `hipy` 模板源 和相关APP模板
+2. hipy spider 增加 `setCache` `getCache` 函数
+3. map.txt 分隔符从 `@` 改为 `@@`
+
 ### 20250821
 
 更新至V1.2.16

index.js

@@ -110,7 +110,7 @@ const handleExit = async (signal) => {
 };
 
 // 捕获常见退出信号（Linux 上 pm2 stop 会发 SIGINT 或 SIGTERM）
-['SIGINT', 'SIGTERM'].forEach((sig) => {
+['SIGINT', 'SIGTERM', 'SIGUSR2'].forEach((sig) => {
     process.on(sig, () => handleExit(sig));
 });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "drpy-node",
-  "version": "1.2.16",
+  "version": "1.2.17",
   "main": "index.js",
   "type": "module",
   "scripts": {

public/index.html

@@ -8,7 +8,7 @@
                 </head>
                 <body>
                     <h1 id="drpysdrpy-node">drpyS(drpy-node)</h1>
-<p>nodejs作为服务端的drpy实现。全面升级异步写法<br><del>积极开发中，每日一更</del>，当前进度 <code>80%</code><br><del>找工作中，随缘更新</del><br>上班当牛马，下班要带娃，阶段性佛系趁娃睡觉熬夜更新</p>
+<p>nodejs作为服务端的drpy实现。全面升级异步写法<br><del>积极开发中，每日一更</del>，当前进度 <code>82%</code><br><del>找工作中，随缘更新</del><br>上班当牛马，下班要带娃，阶段性佛系趁娃睡觉熬夜更新</p>
 <ul>
 <li><a href="docs/apidoc.md">接口文档</a> | <a href="docs/apiList.md">接口列表如定时任务</a> | <a href="https://github.com/waifu-project/movie/pull/135">小猫影视-待对接T4</a></li>
 <li><a href="/config?pwd=dzyyds">本地配置接口-动态本地</a></li>
@@ -29,6 +29,8 @@ <h1 id="drpysdrpy-node">drpyS(drpy-node)</h1>
 <li><a href="/cat/index.html">在线猫ds源主页</a></li>
 </ul>
 <h2 id="更新记录">更新记录</h2>
+<h3 id="20250822">20250822</h3>
+<p>更新至V1.2.17</p>
 <h3 id="20250821">20250821</h3>
 <p>更新至V1.2.16</p>
 <h3 id="20250819">20250819</h3>

scripts/python/APP配置MAP提取器.py

@@ -0,0 +1,41 @@
+import json
+import os
+
+
+def process_json_to_txt(json_file_path, output_txt_path):
+    # 读取JSON文件
+    with open(json_file_path, 'r', encoding='utf-8') as f:
+        data = json.load(f)
+
+    results = []
+    splitStr = '@@'
+
+    for item in data:
+        # 从api字段提取文件名（不含.py后缀）
+        api_path = item.get('api', '')
+        filename = os.path.splitext(os.path.basename(api_path))[0]
+
+        # 获取name字段
+        name = item.get('name', '')
+
+        # 处理exts字段
+        exts = item.get('exts', {})
+        for key, value in exts.items():
+            if isinstance(value, dict):
+                value = json.dumps(value, ensure_ascii=False)
+            line = f"{filename}{splitStr}{value}{splitStr}{key}[{name}]"
+            results.append(line)
+
+    # 写入TXT文件
+    with open(output_txt_path, 'w+', encoding='utf-8') as f:
+        f.write('\n'.join(results).strip())
+
+    print(f"处理完成，共生成 {len(results)} 行数据")
+
+
+# 使用示例
+if __name__ == "__main__":
+    input_json = "App_PY.json"  # 输入的JSON文件路径
+    output_txt = "appMap.txt"  # 输出的TXT文件路径
+
+    process_json_to_txt(input_json, output_txt)