Skip to content

Commit bdfe21f

Browse files
hjdhnxhjdhnx
committed
update:发布1.1.6版本
1 parent 7f8f2d8 commit bdfe21f

30 files changed

+835
-293
lines changed

Diff for: ‎README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# drpyS(drpy-node)
22

33
nodejs作为服务端的drpy实现。全面升级异步写法
4-
积极开发中，每日一更，当前进度 `32%`
4+
积极开发中，每日一更，当前进度 `34%`
55

66
* [本地配置接口-动态本地](/config?pwd=)
77
* [本地配置接口-动态外网/局域网](/config/1?pwd=)
@@ -16,12 +16,12 @@ nodejs作为服务端的drpy实现。全面升级异步写法
1616

1717
## 更新记录
1818

19-
### 20250109
19+
### 20250110
2020

21-
更新至V1.1.5
21+
更新至V1.1.6
2222

23-
1. 兼容低端设备运行本项目，如cm311-1a
24-
2. 解析功能超级增强
23+
1. 更新了一些解析相关的东西
24+
2. 测试了一些bug
2525

2626
[点此查看完整更新记录](docs/updateRecord.md)
2727

Diff for: ‎config/parses.conf

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# 这是用户自定义解析列表,可以自行编辑
2+
# 参数三可填0123分别对应:普通解析、json解析、并发多json解析、聚合解析。参数3不填默认0
3+
# 名称,链接,类型,ua,flag (ua不填默认 Mozilla/5.0) 可以手动填 Dart/2.14 (dart:io)
4+
# JSON解析排前面
5+
6+
J1,https://zy.qiaoji8.com/gouzi.php?url=,1
7+
J2,https://jxjson.icu/neibu.php?url=,1
8+
# J3,http://pan.qiaoji8.com/tvbox/neibu.php?url=,1
9+
# J4,http://yunhai.qijiyun.vip/home/api?type=ys&uid=177259&key=dijnouxKNOQSTUWXY5&url=,1
10+
HGvip,http://1.94.221.189:88/algorithm.php?url=,1
11+
# J皮皮虾,http://45.207.215.101:5423/index.php?url=,1
12+
13+
# WEB解析放后面
14+
# W虾米,https://jx.xmflv.com/?url=
15+
# W无双,http://103.117.123.193:1980/players/?url=
16+
W1,https://jx.xymp4.cc/?url=
17+
# W2,https://cdn.zyc888.top/?url=
18+
# W3,https://yparse.ik9.cc/index.php?url=
19+
# W4,https://jx.yparse.com/index.php?url=
20+
# W5,https://jx.2s0.cn/player/?url=
21+
# W6,https://jx.quankan.app/?url=
22+
# W7,https://jx.aidouer.net/?url=
23+
# W8,https://www.8090g.cn/?url=
24+
# W9,https://jx.yangtu.top?url=
25+
# W10,https://jx.m3u8.tv/jiexi/?url=
26+
W11,https://www.ckplayer.vip/jiexi/?url=

Diff for: ‎controllers/config.js

+5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {naturalSort, urljoin} from '../utils/utils.js'
55
import {ENV} from "../utils/env.js";
66
import {validatePwd} from "../utils/api_validate.js";
77
import {getSitesMap} from "../utils/sites-map.js";
8+
import {getParsesDict} from "../utils/file.js";
89
import batchExecute from '../libs_drpy/batchExecute.js';
910

1011
const {jsEncoder} = drpy;
@@ -136,6 +137,7 @@ async function generateSiteJSON(jsDir, configDir, requestHost, sub, subFilePath,
136137
async function generateParseJSON(jxDir, requestHost) {
137138
const files = readdirSync(jxDir);
138139
const jx_files = files.filter((file) => file.endsWith('.js') && !file.startsWith('_')) // 筛选出不是 "_" 开头的 .js 文件
140+
const jx_dict = getParsesDict();
139141
let parses = [];
140142
const tasks = jx_files.map((file) => {
141143
return {
@@ -204,6 +206,9 @@ async function generateParseJSON(jxDir, requestHost) {
204206
param: {}, // 外部参数可以在这里传入
205207
};
206208
await batchExecute(tasks, listener);
209+
let sorted_parses = naturalSort(parses, 'name', ['JSON并发', 'JSON合集', '虾米', '奇奇']);
210+
let sorted_jx_dict = naturalSort(jx_dict, 'name', ['J', 'W']);
211+
parses = sorted_parses.concat(sorted_jx_dict);
207212
return {parses};
208213
}
209214

Diff for: ‎custom.json

+149-35
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"sites_count": 69,
2+
"sites_count": 70,
33
"sites": [
44
{
55
"key": "drpyS_设置中心",
@@ -133,16 +133,6 @@
133133
"quickSearch": 0,
134134
"ext": "H4sIAAAAAAAAA9PT088qzs/TD3V+2tH2ZNdqPRAPAKubOwMVAAAA"
135135
},
136-
{
137-
"key": "drpyS_多多[盘]",
138-
"name": "多多[盘](DS)",
139-
"type": 4,
140-
"api": "http://localhost:5757/api/多多[盘]",
141-
"searchable": 1,
142-
"filterable": 1,
143-
"quickSearch": 0,
144-
"ext": ""
145-
},
146136
{
147137
"key": "drpyS_团长资源[盘]",
148138
"name": "团长资源[盘](DS)",
@@ -153,6 +143,16 @@
153143
"quickSearch": 1,
154144
"ext": ""
155145
},
146+
{
147+
"key": "drpyS_多多[盘]",
148+
"name": "多多[盘](DS)",
149+
"type": 4,
150+
"api": "http://localhost:5757/api/多多[盘]",
151+
"searchable": 1,
152+
"filterable": 1,
153+
"quickSearch": 0,
154+
"ext": ""
155+
},
156156
{
157157
"key": "drpyS_小米[盘]",
158158
"name": "小米[盘](DS)",
@@ -363,6 +363,16 @@
363363
"quickSearch": 0,
364364
"ext": "H4sIAAAAAAAAA9PT088qzs/Tf9ne/nJ2W3RVZezLuTOfNTTqgURVDAGu/MCKHwAAAA=="
365365
},
366+
{
367+
"key": "drpyS_大嫂TV[密]",
368+
"name": "大嫂TV[密](DS)",
369+
"type": 4,
370+
"api": "http://localhost:5757/api/大嫂TV[密]",
371+
"searchable": 1,
372+
"filterable": 1,
373+
"quickSearch": 0,
374+
"ext": ""
375+
},
366376
{
367377
"key": "drpyS_动漫巴士[漫]",
368378
"name": "动漫巴士[漫](DS)",
@@ -726,8 +736,72 @@
726736
],
727737
"parses": [
728738
{
729-
"name": "json1",
730-
"url": "http://localhost:5757/parse/json1?url=",
739+
"name": "JSON并发",
740+
"url": "http://localhost:5757/parse/JSON并发?url=",
741+
"type": 2,
742+
"ext": {
743+
"flag": [
744+
"qiyi",
745+
"imgo",
746+
"爱奇艺",
747+
"奇艺",
748+
"qq",
749+
"qq 预告及花絮",
750+
"腾讯",
751+
"youku",
752+
"优酷",
753+
"pptv",
754+
"PPTV",
755+
"letv",
756+
"乐视",
757+
"leshi",
758+
"mgtv",
759+
"芒果",
760+
"sohu",
761+
"xigua",
762+
"fun",
763+
"风行"
764+
]
765+
},
766+
"header": {
767+
"User-Agent": "Mozilla/5.0"
768+
}
769+
},
770+
{
771+
"name": "JSON合集",
772+
"url": "http://localhost:5757/parse/JSON合集?url=",
773+
"type": 3,
774+
"ext": {
775+
"flag": [
776+
"qiyi",
777+
"imgo",
778+
"爱奇艺",
779+
"奇艺",
780+
"qq",
781+
"qq 预告及花絮",
782+
"腾讯",
783+
"youku",
784+
"优酷",
785+
"pptv",
786+
"PPTV",
787+
"letv",
788+
"乐视",
789+
"leshi",
790+
"mgtv",
791+
"芒果",
792+
"sohu",
793+
"xigua",
794+
"fun",
795+
"风行"
796+
]
797+
},
798+
"header": {
799+
"User-Agent": "Mozilla/5.0"
800+
}
801+
},
802+
{
803+
"name": "虾米",
804+
"url": "http://localhost:5757/parse/虾米?url=",
731805
"type": 1,
732806
"ext": {
733807
"flag": [
@@ -739,11 +813,23 @@
739813
"qq 预告及花絮",
740814
"腾讯",
741815
"youku",
742-
"优酷"
816+
"优酷",
817+
"pptv",
818+
"PPTV",
819+
"letv",
820+
"乐视",
821+
"leshi",
822+
"mgtv",
823+
"芒果",
824+
"sohu",
825+
"xigua",
826+
"fun",
827+
"风行"
743828
]
744829
},
745830
"header": {
746-
"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"
831+
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.54 Safari/537.36",
832+
"Referer": "https://jx.xmflv.com"
747833
}
748834
},
749835
{
@@ -762,9 +848,9 @@
762848
}
763849
},
764850
{
765-
"name": "web1",
766-
"url": "https://bfq.cfwlgzs.cn/player?url=",
767-
"type": 0,
851+
"name": "json1",
852+
"url": "http://localhost:5757/parse/json1?url=",
853+
"type": 1,
768854
"ext": {
769855
"flag": [
770856
"qiyi",
@@ -783,9 +869,9 @@
783869
}
784870
},
785871
{
786-
"name": "虾米",
787-
"url": "http://localhost:5757/parse/虾米?url=",
788-
"type": 1,
872+
"name": "web1",
873+
"url": "https://bfq.cfwlgzs.cn/player?url=",
874+
"type": 0,
789875
"ext": {
790876
"flag": [
791877
"qiyi",
@@ -796,23 +882,51 @@
796882
"qq 预告及花絮",
797883
"腾讯",
798884
"youku",
799-
"优酷",
800-
"pptv",
801-
"PPTV",
802-
"letv",
803-
"乐视",
804-
"leshi",
805-
"mgtv",
806-
"芒果",
807-
"sohu",
808-
"xigua",
809-
"fun",
810-
"风行"
885+
"优酷"
811886
]
812887
},
813888
"header": {
814-
"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",
815-
"Referer": "https://jx.xmflv.com/?url="
889+
"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"
890+
}
891+
},
892+
{
893+
"name": "J1",
894+
"url": "https://zy.qiaoji8.com/gouzi.php?url=",
895+
"type": 1,
896+
"header": {
897+
"User-Agent": "Mozilla/5.0"
898+
}
899+
},
900+
{
901+
"name": "J2",
902+
"url": "https://jxjson.icu/neibu.php?url=",
903+
"type": 1,
904+
"header": {
905+
"User-Agent": "Mozilla/5.0"
906+
}
907+
},
908+
{
909+
"name": "W1",
910+
"url": "https://jx.xymp4.cc/?url=",
911+
"type": 0,
912+
"header": {
913+
"User-Agent": "Mozilla/5.0"
914+
}
915+
},
916+
{
917+
"name": "W11",
918+
"url": "https://www.ckplayer.vip/jiexi/?url=",
919+
"type": 0,
920+
"header": {
921+
"User-Agent": "Mozilla/5.0"
922+
}
923+
},
924+
{
925+
"name": "HGvip",
926+
"url": "http://1.94.221.189:88/algorithm.php?url=",
927+
"type": 1,
928+
"header": {
929+
"User-Agent": "Mozilla/5.0"
816930
}
817931
}
818932
],

Diff for: ‎docs/updateRecord.md

+19
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
# drpyS更新记录
22

3+
### 20250110
4+
5+
更新至V1.1.6
6+
7+
1. 更新 `虎斑[盘].js` 域名
8+
2. `req` 底层请求函数优化，确保错误返回时可以取到返回的html内容
9+
3. `火车太堵`原域名访问有cf验证了无法获取源码没法修了，现在更换一个域名
10+
4. 修复示例代码 `360test.js` 运行错误
11+
5. `moduleExt` 增加默认值为空字符串而不是 `undefined`
12+
6. 不允许在源或者解析里写 `const axios = require('axios');` 会出现无法解决的问题
13+
7. 增加一个密源
14+
8. 尝试修复解析 `虾米.js` 以失败告终，解出来ip开头的地址还是无法播放
15+
9. 增加 `config/parses.conf` 用于手动配置web解析和json解析
16+
10. 更新所有网盘源的搜索，为套娃党的粗心擦屁股
17+
18+
已知bug:
19+
20+
1. 装逼壳搜索不支持传参源，采王系列无法获取结果，easybox正常
21+
322
### 20250109
423

524
更新至V1.1.5

0 commit comments

Comments
 (0)