Skip to content

Commit 4af1509

Browse files
hjdhnxhjdhnx
committed
update:新增老白故事，新增筛选和快捷静态分类属性。优化一些细节问题
1 parent e15e29c commit 4af1509

15 files changed

+647
-186
lines changed

Diff for: ‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ nodejs作为服务端的drpy实现。全面升级异步写法
1111

1212
## 更新记录
1313

14-
### 20241207
14+
### 20241208
1515

16-
更新至V1.0.4
16+
更新至V1.0.5
1717

18-
1. 修复黑料搜索
18+
1. 新增源老白故事
1919

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

Diff for: ‎controllers/api.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ export default (fastify, options, done) => {
3333

3434
if ('ac' in query && 't' in query) {
3535
let ext = query.ext;
36+
// console.log('ext:', ext);
3637
let extend = {};
3738
if (ext) {
3839
try {
3940
extend = JSON.parse(base64Decode(ext))
4041
} catch (e) {
42+
fastify.log.error(`筛选参数错误:${e.message}`);
4143
}
4244
}
4345
// 分类逻辑
@@ -108,8 +110,8 @@ export default (fastify, options, done) => {
108110
try {
109111
const backRespList = await drpy.proxy(modulePath, env, query);
110112
const statusCode = backRespList[0];
111-
const mediaType = backRespList[1];
112-
let content = backRespList[2];
113+
const mediaType = backRespList[1] || 'application/octet-stream';
114+
let content = backRespList[2] || '';
113115
const headers = backRespList.length > 3 ? backRespList[3] : null;
114116
const toBytes = backRespList.length > 4 ? backRespList[4] : null;
115117
// 如果需要转换为字节内容
@@ -127,7 +129,7 @@ export default (fastify, options, done) => {
127129
// 根据媒体类型来决定如何设置字符编码
128130
if (typeof content === 'string') {
129131
// 如果返回的是文本内容（例如 JSON 或字符串）
130-
if (mediaType.includes('text') || mediaType === 'application/json') {
132+
if (mediaType && (mediaType.includes('text') || mediaType === 'application/json')) {
131133
// 对于文本类型，设置 UTF-8 编码
132134
reply
133135
.code(statusCode)

Diff for: ‎controllers/config.js

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ function generateSiteJSON(jsDir, requestHost) {
1717
type: 4, // 固定值
1818
api,
1919
searchable: 1, // 固定值
20+
filterable: 1, // 固定值
21+
quickSearch: 0, // 固定值
2022
ext: "", // 固定为空字符串
2123
};
2224
});

Diff for: ‎controllers/docs.js

+1-22
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,8 @@
11
import path from 'path';
22
import {existsSync, readFileSync} from 'fs';
3+
import {getMimeType} from '../utils/mime-type.js';
34
import '../utils/marked.min.js';
45

5-
/**
6-
* 根据扩展名返回 MIME 类型
7-
* @param {string} ext 文件扩展名
8-
* @returns {string} MIME 类型
9-
*/
10-
function getMimeType(ext) {
11-
const mimeTypes = {
12-
'.txt': 'text/plain; charset=utf-8',
13-
'.html': 'text/html; charset=utf-8',
14-
'.css': 'text/css; charset=utf-8',
15-
'.js': 'application/javascript; charset=utf-8',
16-
'.json': 'application/json; charset=utf-8',
17-
'.jpg': 'image/jpeg',
18-
'.jpeg': 'image/jpeg',
19-
'.png': 'image/png',
20-
'.gif': 'image/gif',
21-
'.svg': 'image/svg+xml',
22-
'.pdf': 'application/pdf',
23-
};
24-
return mimeTypes[ext] || 'application/octet-stream';
25-
}
26-
276
export default (fastify, options, done) => {
287
fastify.get('/docs/*', async (request, reply) => {
298
const fullPath = request.params['*']; // 捕获整个路径

Diff for: ‎custom.json

+47-9
Original file line numberDiff line numberDiff line change
@@ -4,72 +4,110 @@
44
"key": "drpyS_xvideos[密]",
55
"name": "xvideos[密](drpyS)",
66
"type": 4,
7-
"api": "http://192.168.31.49:5757/api/xvideos[密]",
7+
"api": "http://127.0.0.1:5757/api/xvideos[密]",
88
"searchable": 1,
9+
"filterable": 1,
10+
"quickSearch": 0,
911
"ext": ""
1012
},
1113
{
1214
"key": "drpyS_人人视频",
1315
"name": "人人视频(drpyS)",
1416
"type": 4,
15-
"api": "http://192.168.31.49:5757/api/人人视频",
17+
"api": "http://127.0.0.1:5757/api/人人视频",
1618
"searchable": 1,
19+
"filterable": 1,
20+
"quickSearch": 0,
1721
"ext": ""
1822
},
1923
{
2024
"key": "drpyS_动漫巴士[漫]",
2125
"name": "动漫巴士[漫](drpyS)",
2226
"type": 4,
23-
"api": "http://192.168.31.49:5757/api/动漫巴士[漫]",
27+
"api": "http://127.0.0.1:5757/api/动漫巴士[漫]",
2428
"searchable": 1,
29+
"filterable": 1,
30+
"quickSearch": 0,
2531
"ext": ""
2632
},
2733
{
2834
"key": "drpyS_星芽短剧",
2935
"name": "星芽短剧(drpyS)",
3036
"type": 4,
31-
"api": "http://192.168.31.49:5757/api/星芽短剧",
37+
"api": "http://127.0.0.1:5757/api/星芽短剧",
3238
"searchable": 1,
39+
"filterable": 1,
40+
"quickSearch": 0,
3341
"ext": ""
3442
},
3543
{
3644
"key": "drpyS_番茄小说[书]",
3745
"name": "番茄小说[书](drpyS)",
3846
"type": 4,
39-
"api": "http://192.168.31.49:5757/api/番茄小说[书]",
47+
"api": "http://127.0.0.1:5757/api/番茄小说[书]",
4048
"searchable": 1,
49+
"filterable": 1,
50+
"quickSearch": 0,
51+
"ext": ""
52+
},
53+
{
54+
"key": "drpyS_老白故事[听]",
55+
"name": "老白故事[听](drpyS)",
56+
"type": 4,
57+
"api": "http://127.0.0.1:5757/api/老白故事[听]",
58+
"searchable": 1,
59+
"filterable": 1,
60+
"quickSearch": 0,
4161
"ext": ""
4262
},
4363
{
4464
"key": "drpyS_色花堂[密+]",
4565
"name": "色花堂[密+](drpyS)",
4666
"type": 4,
47-
"api": "http://192.168.31.49:5757/api/色花堂[密+]",
67+
"api": "http://127.0.0.1:5757/api/色花堂[密+]",
68+
"searchable": 1,
69+
"filterable": 1,
70+
"quickSearch": 0,
71+
"ext": ""
72+
},
73+
{
74+
"key": "drpyS_色花堂[密]",
75+
"name": "色花堂[密](drpyS)",
76+
"type": 4,
77+
"api": "http://127.0.0.1:5757/api/色花堂[密]",
4878
"searchable": 1,
79+
"filterable": 1,
80+
"quickSearch": 0,
4981
"ext": ""
5082
},
5183
{
5284
"key": "drpyS_草榴社区[密]",
5385
"name": "草榴社区[密](drpyS)",
5486
"type": 4,
55-
"api": "http://192.168.31.49:5757/api/草榴社区[密]",
87+
"api": "http://127.0.0.1:5757/api/草榴社区[密]",
5688
"searchable": 1,
89+
"filterable": 1,
90+
"quickSearch": 0,
5791
"ext": ""
5892
},
5993
{
6094
"key": "drpyS_金牌影院",
6195
"name": "金牌影院(drpyS)",
6296
"type": 4,
63-
"api": "http://192.168.31.49:5757/api/金牌影院",
97+
"api": "http://127.0.0.1:5757/api/金牌影院",
6498
"searchable": 1,
99+
"filterable": 1,
100+
"quickSearch": 0,
65101
"ext": ""
66102
},
67103
{
68104
"key": "drpyS_黑料不打烊[密]",
69105
"name": "黑料不打烊[密](drpyS)",
70106
"type": 4,
71-
"api": "http://192.168.31.49:5757/api/黑料不打烊[密]",
107+
"api": "http://127.0.0.1:5757/api/黑料不打烊[密]",
72108
"searchable": 1,
109+
"filterable": 1,
110+
"quickSearch": 0,
73111
"ext": ""
74112
}
75113
]

Diff for: ‎docs/updateRecord.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
# drpyS更新记录
2+
### 20241208
3+
4+
更新至V1.0.5
5+
6+
1. 新增函数 getContentType、getMimeType，替代原docs.js里的用法，并注入给drpyS源使用
7+
2. drpyS支持class_name,class_url,filter等属性了
8+
3. 星芽短剧新增筛选
9+
4. 新增源老白故事
210

311
### 20241207
412

Diff for: ‎index.json

+38
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
"type": 4,
77
"api": "http://127.0.0.1:5757/api/xvideos[密]",
88
"searchable": 1,
9+
"filterable": 1,
10+
"quickSearch": 0,
911
"ext": ""
1012
},
1113
{
@@ -14,6 +16,8 @@
1416
"type": 4,
1517
"api": "http://127.0.0.1:5757/api/人人视频",
1618
"searchable": 1,
19+
"filterable": 1,
20+
"quickSearch": 0,
1721
"ext": ""
1822
},
1923
{
@@ -22,6 +26,8 @@
2226
"type": 4,
2327
"api": "http://127.0.0.1:5757/api/动漫巴士[漫]",
2428
"searchable": 1,
29+
"filterable": 1,
30+
"quickSearch": 0,
2531
"ext": ""
2632
},
2733
{
@@ -30,6 +36,8 @@
3036
"type": 4,
3137
"api": "http://127.0.0.1:5757/api/星芽短剧",
3238
"searchable": 1,
39+
"filterable": 1,
40+
"quickSearch": 0,
3341
"ext": ""
3442
},
3543
{
@@ -38,6 +46,18 @@
3846
"type": 4,
3947
"api": "http://127.0.0.1:5757/api/番茄小说[书]",
4048
"searchable": 1,
49+
"filterable": 1,
50+
"quickSearch": 0,
51+
"ext": ""
52+
},
53+
{
54+
"key": "drpyS_老白故事[听]",
55+
"name": "老白故事[听](drpyS)",
56+
"type": 4,
57+
"api": "http://127.0.0.1:5757/api/老白故事[听]",
58+
"searchable": 1,
59+
"filterable": 1,
60+
"quickSearch": 0,
4161
"ext": ""
4262
},
4363
{
@@ -46,6 +66,18 @@
4666
"type": 4,
4767
"api": "http://127.0.0.1:5757/api/色花堂[密+]",
4868
"searchable": 1,
69+
"filterable": 1,
70+
"quickSearch": 0,
71+
"ext": ""
72+
},
73+
{
74+
"key": "drpyS_色花堂[密]",
75+
"name": "色花堂[密](drpyS)",
76+
"type": 4,
77+
"api": "http://127.0.0.1:5757/api/色花堂[密]",
78+
"searchable": 1,
79+
"filterable": 1,
80+
"quickSearch": 0,
4981
"ext": ""
5082
},
5183
{
@@ -54,6 +86,8 @@
5486
"type": 4,
5587
"api": "http://127.0.0.1:5757/api/草榴社区[密]",
5688
"searchable": 1,
89+
"filterable": 1,
90+
"quickSearch": 0,
5791
"ext": ""
5892
},
5993
{
@@ -62,6 +96,8 @@
6296
"type": 4,
6397
"api": "http://127.0.0.1:5757/api/金牌影院",
6498
"searchable": 1,
99+
"filterable": 1,
100+
"quickSearch": 0,
65101
"ext": ""
66102
},
67103
{
@@ -70,6 +106,8 @@
70106
"type": 4,
71107
"api": "http://127.0.0.1:5757/api/黑料不打烊[密]",
72108
"searchable": 1,
109+
"filterable": 1,
110+
"quickSearch": 0,
73111
"ext": ""
74112
}
75113
]

0 commit comments

Comments
 (0)