update:发布1.1.2版本

Author: hjdhnx

README.md

@@ -1,7 +1,7 @@
 # drpyS(drpy-node)
 
 nodejs作为服务端的drpy实现。全面升级异步写法  
-积极开发中，每日一更，当前进度 `27%`
+积极开发中，每日一更，当前进度 `28%`
 
 * [本地配置接口-动态本地](/config?pwd=)
 * [本地配置接口-动态外网/局域网](/config/1?pwd=)
@@ -16,11 +16,11 @@ nodejs作为服务端的drpy实现。全面升级异步写法
 
 ## 更新记录
 
-### 20250105
+### 20250106
 
-更新至V1.1.1
+更新至V1.1.2
 
-1. 增加了一些源，小改了框架功能
+1. 重写底层 `req` 方法，实现 `gbk` 等网页编码支持
 
 [点此查看完整更新记录](docs/updateRecord.md)
 

custom.json

@@ -1,5 +1,5 @@
 {
-  "sites_count": 61,
+  "sites_count": 63,
   "sites": [
     {
       "key": "drpyS_设置中心",
@@ -216,6 +216,16 @@
       "quickSearch": 0,
       "ext": ""
     },
+    {
+      "key": "drpyS_光速[优]",
+      "name": "光速[优](DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/光速[优]",
+      "searchable": 1,
+      "filterable": 0,
+      "quickSearch": 0,
+      "ext": ""
+    },
     {
       "key": "drpyS_好乐影视",
       "name": "好乐影视(DS)",
@@ -286,6 +296,16 @@
       "quickSearch": 0,
       "ext": ""
     },
+    {
+      "key": "drpyS_九七电影网",
+      "name": "九七电影网(DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/九七电影网",
+      "searchable": 2,
+      "filterable": 0,
+      "quickSearch": 0,
+      "ext": ""
+    },
     {
       "key": "drpyS_蜡笔[盘]",
       "name": "蜡笔[盘](DS)",

docs/updateRecord.md

@@ -1,5 +1,14 @@
 # drpyS更新记录
 
+### 20250106
+
+更新至V1.1.2
+
+1. 修复 `动漫巴士[漫].js`
+2. 重写 `req` 方法，使之支持 `request` 使用时支持字符串解码功能,支持 `gbk`等类型的网站数据，与之对应的源 `九七电影网.js`
+3. ds推送兼容装逼壳新增推送相关属性 `vod_play_flag` `vod_play_index` `vod_play_position`
+4. 增加源 `光速[优].js`
+
 ### 20250105
 
 更新至V1.1.1

index.json

@@ -1,5 +1,5 @@
 {
-  "sites_count": 61,
+  "sites_count": 63,
   "sites": [
     {
       "key": "drpyS_设置中心",
@@ -216,6 +216,16 @@
       "quickSearch": 0,
       "ext": ""
     },
+    {
+      "key": "drpyS_光速[优]",
+      "name": "光速[优](DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/光速[优]",
+      "searchable": 1,
+      "filterable": 0,
+      "quickSearch": 0,
+      "ext": ""
+    },
     {
       "key": "drpyS_好乐影视",
       "name": "好乐影视(DS)",
@@ -286,6 +296,16 @@
       "quickSearch": 0,
       "ext": ""
     },
+    {
+      "key": "drpyS_九七电影网",
+      "name": "九七电影网(DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/九七电影网",
+      "searchable": 2,
+      "filterable": 0,
+      "quickSearch": 0,
+      "ext": ""
+    },
     {
       "key": "drpyS_蜡笔[盘]",
       "name": "蜡笔[盘](DS)",

js/_base.js

@@ -0,0 +1,51 @@
+var rule = {
+    类型: '影视',
+    title: '',
+    host: '',
+    url: '',
+    searchUrl: '',
+    headers: {'User-Agent': 'UC_UA'},
+    searchable: 1,
+    quickSearch: 0,
+    filterable: 0,
+    double: true,
+    play_parse: true,
+    limit: 6,
+    class_name: '电影&电视剧&动漫&短剧&综艺',
+    class_url: '1&2&3&4&5',
+    hostJs: async function () {
+        let {HOST} = this;
+        return await request(HOST);
+    },
+    预处理: async function () {
+
+    },
+    class_parse: async function () {
+        let {input, pdfa, pdfh, pd} = this;
+        return {}
+    },
+    lazy: async function () {
+        let {input} = this;
+        return input
+    },
+    推荐: async function () {
+        let {input, pdfa, pdfh, pd} = this;
+        let d = [];
+        return setResult(d)
+    },
+    一级: async function () {
+        let {input, pdfa, pdfh, pd} = this;
+        let d = [];
+        return setResult(d)
+    },
+    二级: async function () {
+        let {input, pdfa, pdfh, pd} = this;
+        let VOD = {};
+        return VOD
+    },
+    搜索: async function () {
+        let {input, pdfa, pdfh, pd} = this;
+        let d = [];
+        return setResult(d)
+    }
+}

js/_lib.request.js

@@ -1,3 +1,5 @@
+const iconv = require('iconv-lite');
+
 async function requestHtml(url, options) {
     try {
         let html = (await req(url, options)).content;
@@ -43,10 +45,42 @@ async function getHtml(config) {
 
 }
 
+async function req_(reqUrl, mt, headers, data) {
+    let config = {
+        method: mt || 'Get',
+        url: reqUrl,
+        headers: headers || {
+            'User-Agent': 'Mozilla/5.0 (Linux; Android 9; RMX1931 Build/PQ3A.190605.05081124; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/91.0.4472.114 Mobile Safari/537.36 QSTAPP/1.6.9 Html5Plus/1.0',
+        },
+        data: data || '',
+    };
+    let res = await axios.request(config);
+    return res.data;
+}
+
+async function req_encoding(reqUrl, mt, headers, encoding, data) {
+    let config = {
+        method: mt || 'Get',
+        url: reqUrl,
+        headers: headers || {
+            'User-Agent': 'Mozilla/5.0 (Linux; Android 9; RMX1931 Build/PQ3A.190605.05081124; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/91.0.4472.114 Mobile Safari/537.36 QSTAPP/1.6.9 Html5Plus/1.0',
+        },
+        data: data || '',
+        responseType: 'arraybuffer'
+    };
+    let res = await axios.request(config);
+    if (encoding) {
+        res.data = iconv.decode(res.data, encoding);
+    }
+    return res.data;
+}
+
 $.exports = {
     requestHtml,
     requestJson,
     getPublicIp,
-    getHtml
+    getHtml,
+    req_,
+    req_encoding
     // axios // 没法import系统库
 }

js/push_agent.js

@@ -40,6 +40,9 @@ var rule = {
             vod.vod_play_url = push_vod.url || push_vod.vod_play_url || '';
             // 推送json兼容依赖播放属性
             vod.vod_play_api = push_vod.vod_play_api || '';
+            vod.vod_play_flag = push_vod.vod_play_flag || null;
+            vod.vod_play_index = push_vod.vod_play_index || null;
+            vod.vod_play_position = push_vod.vod_play_position || null;
             return vod
         } catch (e) {
         }

js/九七电影网.js

@@ -0,0 +1,112 @@
+var rule = {
+    类型: '影视',
+    title: '九七电影网',
+    编码: 'gb18030',
+    desc: '不告诉你',
+    host: 'http://m.aogetu.com',
+    url: '/fyclass/indexfypage.html[/fyclass]',
+    searchUrl: '/s.asp?page=fypage&searchword=**&searchtype=-1',
+    headers: {'User-Agent': 'MOBILE_UA'},
+    searchable: 2, quickSearch: 0, timeout: 5000, play_parse: true, filterable: 0,
+    class_name: '动作片&喜剧片&爱情片&科幻片&恐怖片&剧情片&战争片&纪录片&VIP&动画&国产剧&欧美剧&香港剧&韩国剧&台湾剧&日本剧&泰国剧&海外剧&微短剧&国产动漫&日韩动漫&欧美动漫&其他动漫&大陆综艺&香港综艺&台湾综艺&日韩综艺&欧美综艺&其他综艺&理论片&写真&主播',
+    class_url: 'dianying/dongzuopian&dianying/xijupian&dianying/aiqingpian&dianying/kehuanpian&dianying/kongbupian&dianying/juqingpian&dianying/zhanzhengpian&dianying/jilupian&dianying/fuli&dianying/dhdy&dianshiju/guochanju&dianshiju/oumeiju&dianshiju/hongkongju&dianshiju/hanguoju&dianshiju/taiwanju&dianshiju/ribengju&dianshiju/taiguoju&dianshiju/haiwaiju&dianshiju/duanju&dongmandonghua/guochandonghua&dongmandonghua/ribendongman&dongmandonghua/oumeidongman&dongmandonghua/qitadongman&zongyiyule/daluzongyi&zongyiyule/hongkongzongyi&zongyiyule/taiwanzongyi&zongyiyule/rihanzongyi&zongyiyule/oumeizongyi&zongyiyule/qitazongyi&wuyejuchang/lunli&wuyejuchang/xiezhen&wuyejuchang/zhubo',
+    预处理: async () => {
+        return []
+    },
+    推荐: async function (tid, pg, filter, extend) {
+        let {input, pdfa, pdfh, pd} = this;
+        let html = await request(input);
+        let d = [];
+        let data = pdfa(html, '.list_tab_img li');
+        data.forEach((it) => {
+            d.push({
+                title: pdfh(it, 'a&&title'),
+                pic_url: pd(it, '.loading&&data-original'),
+                desc: pdfh(it, '.title&&Text'),
+                url: pd(it, 'a&&href'),
+            })
+        });
+        return setResult(d)
+    },
+    一级: async function (tid, pg, filter, extend) {
+        let {input, pdfa, pdfh, pd} = this;
+        let html = await request(input);
+        let d = [];
+        let data = pdfa(html, '.list_tab_img li');
+        data.forEach((it) => {
+            d.push({
+                title: pdfh(it, 'a&&title'),
+                pic_url: pd(it, '.loading&&data-original'),
+                desc: pdfh(it, '.name&&Text'),
+                url: pd(it, 'a&&href'),
+            })
+        });
+        return setResult(d)
+    },
+    二级: async function (ids) {
+        let {input, pdfa, pdfh, pd} = this;
+        let html = await request(input);
+        let VOD = {};
+        VOD.vod_name = pdfh(html, 'h1&&Text');
+        VOD.vod_content = pdfh(html, '.v-js.clear.yc&&Text');
+        let playlist = pdfa(html, '.plau-ul-list');
+        let tabs = pdfa(html, '.vod-info-tab .play-title');
+        let playmap = {};
+        tabs.map((item, i) => {
+            const form = pdfh(item, 'Text');
+            const list = playlist[i];
+            const a = pdfa(list, 'body&&a');
+            a.map((it) => {
+                let title = pdfh(it, 'a&&Text');
+                let urls = pd(it, 'a&&href', input);
+                if (!playmap.hasOwnProperty(form)) {
+                    playmap[form] = [];
+                }
+                playmap[form].push(title + "$" + urls);
+            });
+        });
+        VOD.vod_play_from = Object.keys(playmap).join('$$$');
+        const urls = Object.values(playmap);
+        const playUrls = urls.map((urllist) => {
+            return urllist.join("#");
+        });
+        VOD.vod_play_url = playUrls.join('$$$');
+        return VOD;
+    },
+    搜索: async function (wd, quick, pg) {
+        let {input, pdfa, pdfh, pd} = this;
+        let html = await request(input);
+        let d = [];
+        let data = pdfa(html, '.list_tab_img li');
+        data.forEach((it) => {
+            d.push({
+                title: pdfh(it, 'a&&title'),
+                pic_url: pd(it, '.loading&&data-original'),
+                desc: pdfh(it, '.name&&Text'),
+                url: pd(it, 'a&&href'),
+                content: pdfh(it, ''),
+            })
+        });
+        return setResult(d);
+    },
+    lazy: async function (flag, id, flags) {
+        let {input, pdfa, pdfh, pd} = this;
+        let html = await request(input);
+        // log(html);
+        html = JSON.parse(html.match(/r player_.*?=(.*?)</)[1]);
+        let url = html.url;
+        if (html.encrypt == "1") {
+            url = unescape(url)
+            return {parse: 0, url: url}
+        } else if (html.encrypt == "2") {
+            url = unescape(base64Decode(url))
+            return {parse: 0, url: url}
+        }
+        if (/m3u8|mp4/.test(url)) {
+            input = url
+            return {parse: 0, url: input}
+        } else {
+            return {parse: 0, url: input}
+        }
+    }
+}