发布新版本

Author: hjdhnx

Diff for: .env.development

@@ -11,7 +11,8 @@ COOKIE_AUTH_CODE = drpys
 API_AUTH_NAME = admin
 API_AUTH_CODE = drpys
 API_PWD = dzyyds
-EPG_URL = https://epg.mxdyeah.top/api/diyp/?ch={name}&date={date}
+# EPG_URL = https://epg.mxdyeah.top/api/diyp/?ch={name}&date={date}
+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'

Diff for: README.md

@@ -1,7 +1,7 @@
 # drpyS(drpy-node)
 
 nodejs作为服务端的drpy实现。全面升级异步写法  
-积极开发中，每日一更，当前进度 `44%`
+积极开发中，每日一更，当前进度 `46%`
 
 * [本地配置接口-动态本地](/config?pwd=)
 * [本地配置接口-动态外网/局域网](/config/1?pwd=)
@@ -18,6 +18,10 @@ nodejs作为服务端的drpy实现。全面升级异步写法
 
 ## 更新记录
 
+### 20250123
+
+更新至V1.1.16
+
 ### 20250122
 
 更新至V1.1.15

Diff for: config/player.json

@@ -1,6 +1,6 @@
 {
   "wallpaper": "https://api.likepoems.com/img/bing/",
-  "spider": "",
+  "spider": "../public/jar/custom_spider.jar;md5;cc3b3d2ddf389338b62eccd4a938b610",
   "homepage": "https://github.com/hjdhnx/drpy-node",
   "aiLogo": "https://image.baidu.com/search/index?tn=baiduimage&ct=201326592&lm=-1&cl=2&word=%E7%8B%97%E4%BD%9C%E4%B8%BA%E8%BD%AF%E4%BB%B6%E5%9B%BE%E6%A0%87&dyTabStr=MCwxMiwzLDEsMiwxMyw3LDYsNSw5",
   "homeLogo": "https://github.catvod.com/https://raw.githubusercontent.com/hjdhnx/drpy-node/refs/heads/main/public/images/logo500x200-1.png",

Diff for: controllers/config.js

@@ -48,6 +48,7 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
         }
     }
     let sites = [];
+    let link_jar = '';
     // console.log('hide_adult:', ENV.get('hide_adult'));
     if (ENV.get('hide_adult') === '1') {
         valid_files = valid_files.filter(it => !(new RegExp('\\[[密]\\]|密+')).test(it));
@@ -205,9 +206,19 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
         let link_sites = [];
         let link_url = ENV.get('link_url');
         let enable_link_push = ENV.get('enable_link_push', '0');
+        let enable_link_jar = ENV.get('enable_link_jar', '0');
         try {
             let link_data = readFileSync(path.join(rootDir, './data/settings/link_data.json'), 'utf-8');
-            link_sites = JSON.parse(link_data).sites.filter(site => site.type = 4);
+            let link_config = JSON.parse(link_data);
+            link_sites = link_config.sites.filter(site => site.type = 4);
+            if (link_config.spider && enable_link_jar === '1') {
+                let link_spider_arr = link_config.spider.split(';');
+                link_jar = urljoin(link_url, link_spider_arr[0]);
+                if (link_spider_arr.length > 1) {
+                    link_jar = [link_jar].concat(link_spider_arr.slice(1)).join(';')
+                }
+                log(`开始挂载外部T4 Jar: ${link_jar}`);
+            }
             link_sites.forEach((site) => {
                 if (site.key === 'push_agent' && enable_link_push !== '1') {
                     return
@@ -246,7 +257,7 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
         sites = sites.filter(it => !(new RegExp('\\[[密]\\]|密+')).test(it.name));
     }
     sites = naturalSort(sites, 'name', sort_list);
-    return {sites};
+    return {sites, spider: link_jar};
 }
 
 async function generateParseJSON(jxDir, requestHost) {
@@ -495,7 +506,7 @@ export default (fastify, options, done) => {
             const parseJSON = await generateParseJSON(options.jxDir, requestHost);
             const livesJSON = generateLivesJSON(requestHost);
             const playerJSON = generatePlayerJSON(options.configDir, requestHost);
-            const configObj = {sites_count: siteJSON.sites.length, ...siteJSON, ...parseJSON, ...livesJSON, ...playerJSON};
+            const configObj = {sites_count: siteJSON.sites.length, ...playerJSON, ...siteJSON, ...parseJSON, ...livesJSON};
             // console.log(configObj);
             const configStr = JSON.stringify(configObj, null, 2);
             if (!process.env.VERCEL) { // Vercel 环境不支持写文件，关闭此功能