Skip to content

Commit 9ba9bcc

Browse files
hjdhnxhjdhnx
committed
update:兼容新版本海阔
1 parent fb6b721 commit 9ba9bcc

File tree

8 files changed

+85
-63
lines changed

8 files changed

+85
-63
lines changed

‎controllers/config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function generateSiteJSON(jsDir, requestHost) {
99
.map((file) => {
1010
const baseName = path.basename(file, '.js'); // 去掉文件扩展名
1111
const key = `drpyS_${baseName}`;
12-
const name = `${baseName}(drpyS)`;
12+
const name = `${baseName}(DS)`;
1313
const api = `${requestHost}/api/${baseName}`; // 使用请求的 host 地址，避免硬编码端口
1414
return {
1515
key,

‎custom.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,109 +2,109 @@
22
"sites": [
33
{
44
"key": "drpyS_xvideos[密]",
5-
"name": "xvideos[密](drpyS)",
5+
"name": "xvideos[密](DS)",
66
"type": 4,
7-
"api": "http://127.0.0.1:5757/api/xvideos[密]",
7+
"api": "http://192.168.31.49:5757/api/xvideos[密]",
88
"searchable": 1,
99
"filterable": 1,
1010
"quickSearch": 0,
1111
"ext": ""
1212
},
1313
{
1414
"key": "drpyS_人人视频",
15-
"name": "人人视频(drpyS)",
15+
"name": "人人视频(DS)",
1616
"type": 4,
17-
"api": "http://127.0.0.1:5757/api/人人视频",
17+
"api": "http://192.168.31.49:5757/api/人人视频",
1818
"searchable": 1,
1919
"filterable": 1,
2020
"quickSearch": 0,
2121
"ext": ""
2222
},
2323
{
2424
"key": "drpyS_动漫巴士[漫]",
25-
"name": "动漫巴士[漫](drpyS)",
25+
"name": "动漫巴士[漫](DS)",
2626
"type": 4,
27-
"api": "http://127.0.0.1:5757/api/动漫巴士[漫]",
27+
"api": "http://192.168.31.49:5757/api/动漫巴士[漫]",
2828
"searchable": 1,
2929
"filterable": 1,
3030
"quickSearch": 0,
3131
"ext": ""
3232
},
3333
{
3434
"key": "drpyS_星芽短剧",
35-
"name": "星芽短剧(drpyS)",
35+
"name": "星芽短剧(DS)",
3636
"type": 4,
37-
"api": "http://127.0.0.1:5757/api/星芽短剧",
37+
"api": "http://192.168.31.49:5757/api/星芽短剧",
3838
"searchable": 1,
3939
"filterable": 1,
4040
"quickSearch": 0,
4141
"ext": ""
4242
},
4343
{
4444
"key": "drpyS_番茄小说[书]",
45-
"name": "番茄小说[书](drpyS)",
45+
"name": "番茄小说[书](DS)",
4646
"type": 4,
47-
"api": "http://127.0.0.1:5757/api/番茄小说[书]",
47+
"api": "http://192.168.31.49:5757/api/番茄小说[书]",
4848
"searchable": 1,
4949
"filterable": 1,
5050
"quickSearch": 0,
5151
"ext": ""
5252
},
5353
{
5454
"key": "drpyS_老白故事[听]",
55-
"name": "老白故事[听](drpyS)",
55+
"name": "老白故事[听](DS)",
5656
"type": 4,
57-
"api": "http://127.0.0.1:5757/api/老白故事[听]",
57+
"api": "http://192.168.31.49:5757/api/老白故事[听]",
5858
"searchable": 1,
5959
"filterable": 1,
6060
"quickSearch": 0,
6161
"ext": ""
6262
},
6363
{
6464
"key": "drpyS_色花堂[密+]",
65-
"name": "色花堂[密+](drpyS)",
65+
"name": "色花堂[密+](DS)",
6666
"type": 4,
67-
"api": "http://127.0.0.1:5757/api/色花堂[密+]",
67+
"api": "http://192.168.31.49:5757/api/色花堂[密+]",
6868
"searchable": 1,
6969
"filterable": 1,
7070
"quickSearch": 0,
7171
"ext": ""
7272
},
7373
{
7474
"key": "drpyS_色花堂[密]",
75-
"name": "色花堂[密](drpyS)",
75+
"name": "色花堂[密](DS)",
7676
"type": 4,
77-
"api": "http://127.0.0.1:5757/api/色花堂[密]",
77+
"api": "http://192.168.31.49:5757/api/色花堂[密]",
7878
"searchable": 1,
7979
"filterable": 1,
8080
"quickSearch": 0,
8181
"ext": ""
8282
},
8383
{
8484
"key": "drpyS_草榴社区[密]",
85-
"name": "草榴社区[密](drpyS)",
85+
"name": "草榴社区[密](DS)",
8686
"type": 4,
87-
"api": "http://127.0.0.1:5757/api/草榴社区[密]",
87+
"api": "http://192.168.31.49:5757/api/草榴社区[密]",
8888
"searchable": 1,
8989
"filterable": 1,
9090
"quickSearch": 0,
9191
"ext": ""
9292
},
9393
{
9494
"key": "drpyS_金牌影院",
95-
"name": "金牌影院(drpyS)",
95+
"name": "金牌影院(DS)",
9696
"type": 4,
97-
"api": "http://127.0.0.1:5757/api/金牌影院",
97+
"api": "http://192.168.31.49:5757/api/金牌影院",
9898
"searchable": 1,
9999
"filterable": 1,
100100
"quickSearch": 0,
101101
"ext": ""
102102
},
103103
{
104104
"key": "drpyS_黑料不打烊[密]",
105-
"name": "黑料不打烊[密](drpyS)",
105+
"name": "黑料不打烊[密](DS)",
106106
"type": 4,
107-
"api": "http://127.0.0.1:5757/api/黑料不打烊[密]",
107+
"api": "http://192.168.31.49:5757/api/黑料不打烊[密]",
108108
"searchable": 1,
109109
"filterable": 1,
110110
"quickSearch": 0,

‎docs/updateRecord.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
4. 新增源老白故事
1111
5. 优化首页分类接口机制，支持在class_parse里返回list,然后推荐留空。
1212
6. 推荐函数注入this变量
13+
7. 兼容新版海阔多任务nodejs
1314

1415
### 20241207
1516

‎index.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,109 +2,109 @@
22
"sites": [
33
{
44
"key": "drpyS_xvideos[密]",
5-
"name": "xvideos[密](drpyS)",
5+
"name": "xvideos[密](DS)",
66
"type": 4,
7-
"api": "http://127.0.0.1:5757/api/xvideos[密]",
7+
"api": "http://192.168.31.49:5757/api/xvideos[密]",
88
"searchable": 1,
99
"filterable": 1,
1010
"quickSearch": 0,
1111
"ext": ""
1212
},
1313
{
1414
"key": "drpyS_人人视频",
15-
"name": "人人视频(drpyS)",
15+
"name": "人人视频(DS)",
1616
"type": 4,
17-
"api": "http://127.0.0.1:5757/api/人人视频",
17+
"api": "http://192.168.31.49:5757/api/人人视频",
1818
"searchable": 1,
1919
"filterable": 1,
2020
"quickSearch": 0,
2121
"ext": ""
2222
},
2323
{
2424
"key": "drpyS_动漫巴士[漫]",
25-
"name": "动漫巴士[漫](drpyS)",
25+
"name": "动漫巴士[漫](DS)",
2626
"type": 4,
27-
"api": "http://127.0.0.1:5757/api/动漫巴士[漫]",
27+
"api": "http://192.168.31.49:5757/api/动漫巴士[漫]",
2828
"searchable": 1,
2929
"filterable": 1,
3030
"quickSearch": 0,
3131
"ext": ""
3232
},
3333
{
3434
"key": "drpyS_星芽短剧",
35-
"name": "星芽短剧(drpyS)",
35+
"name": "星芽短剧(DS)",
3636
"type": 4,
37-
"api": "http://127.0.0.1:5757/api/星芽短剧",
37+
"api": "http://192.168.31.49:5757/api/星芽短剧",
3838
"searchable": 1,
3939
"filterable": 1,
4040
"quickSearch": 0,
4141
"ext": ""
4242
},
4343
{
4444
"key": "drpyS_番茄小说[书]",
45-
"name": "番茄小说[书](drpyS)",
45+
"name": "番茄小说[书](DS)",
4646
"type": 4,
47-
"api": "http://127.0.0.1:5757/api/番茄小说[书]",
47+
"api": "http://192.168.31.49:5757/api/番茄小说[书]",
4848
"searchable": 1,
4949
"filterable": 1,
5050
"quickSearch": 0,
5151
"ext": ""
5252
},
5353
{
5454
"key": "drpyS_老白故事[听]",
55-
"name": "老白故事[听](drpyS)",
55+
"name": "老白故事[听](DS)",
5656
"type": 4,
57-
"api": "http://127.0.0.1:5757/api/老白故事[听]",
57+
"api": "http://192.168.31.49:5757/api/老白故事[听]",
5858
"searchable": 1,
5959
"filterable": 1,
6060
"quickSearch": 0,
6161
"ext": ""
6262
},
6363
{
6464
"key": "drpyS_色花堂[密+]",
65-
"name": "色花堂[密+](drpyS)",
65+
"name": "色花堂[密+](DS)",
6666
"type": 4,
67-
"api": "http://127.0.0.1:5757/api/色花堂[密+]",
67+
"api": "http://192.168.31.49:5757/api/色花堂[密+]",
6868
"searchable": 1,
6969
"filterable": 1,
7070
"quickSearch": 0,
7171
"ext": ""
7272
},
7373
{
7474
"key": "drpyS_色花堂[密]",
75-
"name": "色花堂[密](drpyS)",
75+
"name": "色花堂[密](DS)",
7676
"type": 4,
77-
"api": "http://127.0.0.1:5757/api/色花堂[密]",
77+
"api": "http://192.168.31.49:5757/api/色花堂[密]",
7878
"searchable": 1,
7979
"filterable": 1,
8080
"quickSearch": 0,
8181
"ext": ""
8282
},
8383
{
8484
"key": "drpyS_草榴社区[密]",
85-
"name": "草榴社区[密](drpyS)",
85+
"name": "草榴社区[密](DS)",
8686
"type": 4,
87-
"api": "http://127.0.0.1:5757/api/草榴社区[密]",
87+
"api": "http://192.168.31.49:5757/api/草榴社区[密]",
8888
"searchable": 1,
8989
"filterable": 1,
9090
"quickSearch": 0,
9191
"ext": ""
9292
},
9393
{
9494
"key": "drpyS_金牌影院",
95-
"name": "金牌影院(drpyS)",
95+
"name": "金牌影院(DS)",
9696
"type": 4,
97-
"api": "http://127.0.0.1:5757/api/金牌影院",
97+
"api": "http://192.168.31.49:5757/api/金牌影院",
9898
"searchable": 1,
9999
"filterable": 1,
100100
"quickSearch": 0,
101101
"ext": ""
102102
},
103103
{
104104
"key": "drpyS_黑料不打烊[密]",
105-
"name": "黑料不打烊[密](drpyS)",
105+
"name": "黑料不打烊[密](DS)",
106106
"type": 4,
107-
"api": "http://127.0.0.1:5757/api/黑料不打烊[密]",
107+
"api": "http://192.168.31.49:5757/api/黑料不打烊[密]",
108108
"searchable": 1,
109109
"filterable": 1,
110110
"quickSearch": 0,

‎js/_lib.request.js‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// import axios from '../libs_drpy/axios.min.js';
2+
13
async function requestHtml(url, options) {
24
try {
35
let html = (await req(url, options)).content;
@@ -12,14 +14,23 @@ async function requestHtml(url, options) {
1214

1315
async function requestJson(url, options) {
1416
try {
15-
return JSON.parse(await req(url, options).content)
17+
let html = (await req(url, options)).content;
18+
return JSON.parse(html)
1619
} catch (e) {
1720
log(`requestJson error:${e.message}`);
1821
return {}
1922
}
2023
}
2124

25+
async function getPublicIp() {
26+
let ip_obj = await requestJson('http://httpbin.org/ip');
27+
// log('ip_obj:',ip_obj);
28+
return ip_obj.origin
29+
}
30+
2231
$.exports = {
2332
requestHtml,
24-
requestJson
33+
requestJson,
34+
getPublicIp,
35+
// axios // 没法import系统库
2536
}

‎js/人人视频.js‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22
// http://localhost:5757/api/人人视频?ac=detail&ids=447
33
// http://localhost:5757/api/人人视频?wd=&pg=1
44
// http://localhost:5757/api/人人视频?play=&flag=人人视频
5+
const {getPublicIp} = $.require('./_lib.request.js');
6+
57
var rule = {
68
类型: '影视',
79
title: '人人视频',
810
desc: '人人视频纯js版本',
911
homeUrl: '',
10-
class_name:'电视剧&电影&动漫',
11-
class_url:'2&1&3',
12+
class_name: '电视剧&电影&动漫',
13+
class_url: '2&1&3',
1214
url: '/api.php/getappapi.index/typeFilterVodList',
1315
searchUrl: '/api.php/getappapi.index/searchList',
1416
searchable: 2,
@@ -42,6 +44,9 @@ var rule = {
4244
if (homeUrl) {
4345
rule.homeUrl = homeUrl;
4446
}
47+
let _ip = await getPublicIp();
48+
rule.ip = _ip;
49+
log('_ip:', _ip);
4550
},
4651
推荐: async () => {
4752
return []
@@ -136,23 +141,26 @@ var rule = {
136141
lazy: async function (flag, id, flags) {
137142
let {getProxyUrl, input} = this;
138143
if (input.indexOf('m3u8') < 0) {
139-
let html = JSON.parse((await req(input,{
144+
input = input.replace('$ip',rule.ip);
145+
let html = JSON.parse((await req(input, {
140146
method: 'post',
141-
headers: {
142-
'User-Agent': 'Mozilla/9.0 (Macintosh; Intel Mac OS X 10.8; rv:69.0) Gecko/20100101 Firefox/69.0'
143-
}
147+
// headers: {
148+
// 'User-Agent': 'Mozilla/9.0 (Macintosh; Intel Mac OS X 10.8; rv:69.0) Gecko/20100101 Firefox/69.0'
149+
// },
150+
headers: rule.headers,
144151
})).content)
145152
let link = html.url
146-
return {parse: 0, url: getProxyUrl() + '&url=' + encodeURIComponent(link), js: ''}
153+
return {parse: 0, url: link}
154+
// return {parse: 0, url: getProxyUrl() + '&url=' + encodeURIComponent(link), js: ''}
147155
} else {
148156
return {parse: 0, url: getProxyUrl() + '&url=' + input, js: ''}
149157
}
150158
},
151159
proxy_rule: async function (params) {
152160
let {input} = this;
153161
input = decodeURIComponent(input);
154-
if(input.includes('.mp4')){
155-
return [302, getContentType(input), '',{location:input}];
162+
if (input.includes('.mp4')) {
163+
return [302, getContentType(input), '', {location: input}];
156164
}
157165
if (input.indexOf('m3u8') < 0) {
158166
let m3u8_content = (await req(input)).content

0 commit comments

Comments
 (0)