update:发布1.1.5版本

Author: hjdhnx

Diff for: .env.development

@@ -15,3 +15,4 @@ EPG_URL = https://epg.mxdyeah.top/api/diyp/?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

Diff for: .gitignore

@@ -134,3 +134,4 @@ dist
 /config/env.json
 /js/UC分享.js
 /json/UC分享.json
+/jx/奇奇.js

Diff for: README.md

@@ -16,13 +16,12 @@ nodejs作为服务端的drpy实现。全面升级异步写法
 
 ## 更新记录
 
-### 20250108
+### 20250109
 
-更新至V1.1.4
+更新至V1.1.5
 
-1. 更新文档
-2. 修复bug
-3. 增加 `batchExecute`
+1. 兼容低端设备运行本项目，如cm311-1a
+2. 解析功能超级增强
 
 [点此查看完整更新记录](docs/updateRecord.md)
 

Diff for: config/map.txt

@@ -4,4 +4,5 @@
 采集之王[合]@?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
 UC分享@?type=url&params=../json/UC分享.json@UC分享[盘]

Diff for: controllers/api.js

@@ -350,8 +350,13 @@ export default (fastify, options, done) => {
                 }
                 let t2 = (new Date()).getTime();
                 backResp.cost = t2 - t1;
-                return reply.code(statusCode).type(`${mediaType}; charset=utf-8`).send(JSON.stringify(backResp));
+                let backRespSend = JSON.stringify(backResp);
+                console.log(backRespSend);
+                return reply.code(statusCode).type(`${mediaType}; charset=utf-8`).send(backRespSend);
             } else if (typeof backResp === 'string') {
+                if (backResp.startsWith('redirect://')) {
+                    return reply.redirect(backResp.split('redirect://')[1]);
+                }
                 let statusCode = backResp && backResp !== query.url ? 200 : 404;
                 let msgState = backResp && backResp !== query.url ? '成功' : '失败';
                 let t2 = (new Date()).getTime();
@@ -361,7 +366,9 @@ export default (fastify, options, done) => {
                     msg: `${jxName}解析${msgState}`,
                     cost: t2 - t1
                 }
-                return reply.code(statusCode).type(`${mediaType}; charset=utf-8`).send(JSON.stringify(result));
+                let backRespSend = JSON.stringify(result);
+                console.log(backRespSend);
+                return reply.code(statusCode).type(`${mediaType}; charset=utf-8`).send(backRespSend);
             } else {
                 return reply.status(404).send({error: `${jxName}解析失败`});
             }

Diff for: controllers/config.js

@@ -133,46 +133,77 @@ async function generateSiteJSON(jsDir, configDir, requestHost, sub, subFilePath,
     return {sites};
 }
 
-function generateParseJSON(jxDir, requestHost) {
+async function generateParseJSON(jxDir, requestHost) {
     const files = readdirSync(jxDir);
-    const parses = files
-        .filter((file) => file.endsWith('.js') && !file.startsWith('_')) // 筛选出不是 "_" 开头的 .js 文件
-        .map((file) => {
-            const baseName = path.basename(file, '.js'); // 去掉文件扩展名
-            const api = `${requestHost}/parse/${baseName}?url=`;  // 使用请求的 host 地址，避免硬编码端口
-            return {
-                name: baseName,
-                url: api,
-                type: 1,
-                ext: {
-                    flag: [
-                        "qiyi",
-                        "imgo",
-                        "爱奇艺",
-                        "奇艺",
-                        "qq",
-                        "qq 预告及花絮",
-                        "腾讯",
-                        "youku",
-                        "优酷",
-                        "pptv",
-                        "PPTV",
-                        "letv",
-                        "乐视",
-                        "leshi",
-                        "mgtv",
-                        "芒果",
-                        "sohu",
-                        "xigua",
-                        "fun",
-                        "风行"
-                    ]
-                },
-                header: {
-                    "User-Agent": "Mozilla/5.0"
+    const jx_files = files.filter((file) => file.endsWith('.js') && !file.startsWith('_')) // 筛选出不是 "_" 开头的 .js 文件
+    let parses = [];
+    const tasks = jx_files.map((file) => {
+        return {
+            func: async ({file, jxDir, requestHost, drpy}) => {
+                const baseName = path.basename(file, '.js'); // 去掉文件扩展名
+                const api = `${requestHost}/parse/${baseName}?url=`;  // 使用请求的 host 地址，避免硬编码端口
+
+                let jxObject = {
+                    type: 1, // 固定值
+                    ext: {
+                        flag: [
+                            "qiyi",
+                            "imgo",
+                            "爱奇艺",
+                            "奇艺",
+                            "qq",
+                            "qq 预告及花絮",
+                            "腾讯",
+                            "youku",
+                            "优酷",
+                            "pptv",
+                            "PPTV",
+                            "letv",
+                            "乐视",
+                            "leshi",
+                            "mgtv",
+                            "芒果",
+                            "sohu",
+                            "xigua",
+                            "fun",
+                            "风行"
+                        ]
+                    },
+                    header: {
+                        "User-Agent": "Mozilla/5.0"
+                    }
+                };
+                try {
+                    let _jxObject = await drpy.getJx(path.join(jxDir, file));
+                    jxObject = {...jxObject, ..._jxObject};
+                } catch (e) {
+                    throw new Error(`Error parsing jx object for file: ${file}, ${e.message}`);
                 }
+
+                parses.push({
+                    name: baseName,
+                    url: jxObject.url || api,
+                    type: jxObject.type,
+                    ext: jxObject.ext,
+                    header: jxObject.header
+                });
+            },
+            param: {file, jxDir, requestHost, drpy},
+            id: file,
+        };
+    });
+
+    const listener = {
+        func: (param, id, error, result) => {
+            if (error) {
+                console.error(`Error processing file ${id}:`, error.message);
+            } else {
+                // console.log(`Successfully processed file ${id}:`, result);
             }
-        });
+        },
+        param: {}, // 外部参数可以在这里传入
+    };
+    await batchExecute(tasks, listener);
     return {parses};
 }
 
@@ -263,7 +294,7 @@ export default (fastify, options, done) => {
             }
 
             const siteJSON = await generateSiteJSON(options.jsDir, options.configDir, requestHost, sub, options.subFilePath, pwd);
-            const parseJSON = generateParseJSON(options.jxDir, requestHost);
+            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};

Diff for: custom.json

@@ -1,5 +1,5 @@
 {
-  "sites_count": 66,
+  "sites_count": 69,
   "sites": [
     {
       "key": "drpyS_设置中心",
@@ -114,24 +114,24 @@
       "ext": ""
     },
     {
-      "key": "drpyS_UC分享[盘]",
-      "name": "UC分享[盘](DS)",
+      "key": "drpyS_hdmoli[盘]",
+      "name": "hdmoli[盘](DS)",
       "type": 4,
-      "api": "http://localhost:5757/api/UC分享",
+      "api": "http://localhost:5757/api/hdmoli[盘]",
       "searchable": 2,
       "filterable": 0,
       "quickSearch": 0,
-      "ext": "H4sIAAAAAAAAA9PT088qzs/TD3V+2tH2ZNdqPRAPAKubOwMVAAAA"
+      "ext": ""
     },
     {
-      "key": "drpyS_团长资源[盘]",
-      "name": "团长资源[盘](DS)",
+      "key": "drpyS_UC分享[盘]",
+      "name": "UC分享[盘](DS)",
       "type": 4,
-      "api": "http://localhost:5757/api/团长资源[盘]",
-      "searchable": 1,
+      "api": "http://localhost:5757/api/UC分享",
+      "searchable": 2,
       "filterable": 0,
-      "quickSearch": 1,
-      "ext": ""
+      "quickSearch": 0,
+      "ext": "H4sIAAAAAAAAA9PT088qzs/TD3V+2tH2ZNdqPRAPAKubOwMVAAAA"
     },
     {
       "key": "drpyS_多多[盘]",
@@ -143,6 +143,16 @@
       "quickSearch": 0,
       "ext": ""
     },
+    {
+      "key": "drpyS_团长资源[盘]",
+      "name": "团长资源[盘](DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/团长资源[盘]",
+      "searchable": 1,
+      "filterable": 0,
+      "quickSearch": 1,
+      "ext": ""
+    },
     {
       "key": "drpyS_小米[盘]",
       "name": "小米[盘](DS)",
@@ -253,6 +263,16 @@
       "quickSearch": 0,
       "ext": ""
     },
+    {
+      "key": "drpyS_奇珍异兽[官]",
+      "name": "奇珍异兽[官](DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/奇珍异兽[官]",
+      "searchable": 2,
+      "filterable": 1,
+      "quickSearch": 0,
+      "ext": ""
+    },
     {
       "key": "drpyS_哔哩教育[官]",
       "name": "哔哩教育[官](DS)",
@@ -303,6 +323,16 @@
       "quickSearch": 0,
       "ext": ""
     },
+    {
+      "key": "drpyS_采王2024",
+      "name": "采王2024(DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/采集之王[合]",
+      "searchable": 1,
+      "filterable": 1,
+      "quickSearch": 0,
+      "ext": "H4sIAAAAAAAAA9PT088qzs/Tf9ne/nJ2m5GBkcnLuTOfNTTqgURVDFUAlKCu7yAAAAA="
+    },
     {
       "key": "drpyS_采王成人[密]",
       "name": "采王成人[密](DS)",
@@ -695,6 +725,63 @@
     }
   ],
   "parses": [
+    {
+      "name": "json1",
+      "url": "http://localhost:5757/parse/json1?url=",
+      "type": 1,
+      "ext": {
+        "flag": [
+          "qiyi",
+          "imgo",
+          "爱奇艺",
+          "奇艺",
+          "qq",
+          "qq 预告及花絮",
+          "腾讯",
+          "youku",
+          "优酷"
+        ]
+      },
+      "header": {
+        "User-Agent": "Mozilla/5.0 (Linux; Android 11; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.91 Mobile Safari/537.36"
+      }
+    },
+    {
+      "name": "奇奇",
+      "url": "http://localhost:5757/parse/奇奇?url=",
+      "type": 1,
+      "ext": {
+        "flag": [
+          "qiyi",
+          "爱奇艺",
+          "奇艺"
+        ]
+      },
+      "header": {
+        "User-Agent": "Mozilla/5.0"
+      }
+    },
+    {
+      "name": "web1",
+      "url": "https://bfq.cfwlgzs.cn/player?url=",
+      "type": 0,
+      "ext": {
+        "flag": [
+          "qiyi",
+          "imgo",
+          "爱奇艺",
+          "奇艺",
+          "qq",
+          "qq 预告及花絮",
+          "腾讯",
+          "youku",
+          "优酷"
+        ]
+      },
+      "header": {
+        "User-Agent": "Mozilla/5.0 (Linux; Android 11; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.91 Mobile Safari/537.36"
+      }
+    },
     {
       "name": "虾米",
       "url": "http://localhost:5757/parse/虾米?url=",
@@ -724,7 +811,8 @@
         ]
       },
       "header": {
-        "User-Agent": "Mozilla/5.0"
+        "User-Agent": "Mozilla/5.0 (Linux; Android 11; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.91 Mobile Safari/537.36",
+        "Referer": "https://jx.xmflv.com/?url="
       }
     }
   ],

Diff for: docs/updateRecord.md

@@ -1,5 +1,40 @@
 # drpyS更新记录
 
+### 20250109
+
+更新至V1.1.5
+
+1. `.env` 增加 `MAX_TASK`参数，配置系统多任务数限制，默认不设置则为2，解决低端设备如arm盒子访问配置崩溃问题。高端设备实测发现设置为8比较快
+2. 自建解析功能增强，支持自定义其他参数，增加两个示例解析
+3. 抓取了一些采集源扩充采王，抓取方式，zy3.7版本运行以下代码
+
+```javascript
+var rule = {
+    推荐: $js.toString(() => {
+        let url = 'https://blog.ilol.top/p/zqgwes.html';
+        let html = request(url);
+        let tlist = pdfa(html, '.post-content&&h2');
+        log(tlist)
+        let alist = pdfa(html, '.post-content&&a:gt(0)');
+        log(alist);
+
+        VODS = [];
+
+        for (let i in tlist) {
+            VODS.push({
+                name: pdfh(tlist[i], 'Text'),
+                url: pdfh(alist[i], 'a&&href'),
+            })
+        }
+        log(JSON.stringify(VODS))
+
+    })
+}
+```
+
+4. 增加源 `奇珍异兽[官].js`
+5. 新增一个源 `hdmoli.js` 用于演示二级同时存在播放列表和网盘分享链接的写法
+
 ### 20250108
 
 更新至V1.1.4