Skip to content

Commit c24940e

Browse files
author
Taois
committed
feat: 更新drpy2-fast
1 parent 9b3fc0b commit c24940e

File tree

3 files changed

+133
-26
lines changed

3 files changed

+133
-26
lines changed

controllers/config.js

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,12 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
327327
}
328328

329329
fileSites.forEach((fileSite) => {
330-
if (enable_dr2 === '1') {
330+
if (enable_dr2 === '1' || enable_dr2 === '2') {
331331
// dr2ApiType=0 使用接口drpy2 dr2ApiType=1 使用壳子内置的drpy2
332332
let api = dr2ApiType ? `assets://js/lib/drpy2.js` : `${requestHost}/public/drpy/drpy2.min.js`;
333+
if (enable_dr2 === '2') {
334+
api = `${requestHost}/public/drpy/drpy2-fast.min.js`;
335+
}
333336
let ext = `${requestHost}/js/${file}`;
334337
if (pwd) {
335338
ext += `?pwd=${pwd}`;
@@ -348,31 +351,33 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
348351
ext: ext || "", // 固定为空字符串
349352
};
350353
sites.push(site);
351-
} else if (enable_dr2 === '2') {
352-
// 模式2:只启用T3脚本的T4风格API配置
353-
const t4site = {
354-
key: fileSite.key,
355-
name: fileSite.name,
356-
type: 4, // 固定值
357-
api: `${requestHost}/api/${baseName}`,
358-
...ruleMeta,
359-
ext: "", // 固定为空字符串
360-
};
361-
// 添加isdr2参数到API URL
362-
if (pwd) {
363-
t4site.api += `?pwd=${pwd}&do=dr`;
364-
} else {
365-
t4site.api += `?do=dr`;
366-
}
367-
368-
// 处理传参源的API参数
369-
if (fileSite.queryStr) {
370-
const separator = t4site.api.includes('?') ? '&' : '?';
371-
site.api += `${separator}extend=${encodeURIComponent(fileSite.queryStr)}`;
372-
}
373-
374-
sites.push(t4site);
375354
}
355+
// else if (enable_dr2 === '2') {
356+
//
357+
// // 模式2:只启用T3脚本的T4风格API配置
358+
// const t4site = {
359+
// key: fileSite.key,
360+
// name: fileSite.name,
361+
// type: 4, // 固定值
362+
// api: `${requestHost}/api/${baseName}`,
363+
// ...ruleMeta,
364+
// ext: "", // 固定为空字符串
365+
// };
366+
// // 添加isdr2参数到API URL
367+
// if (pwd) {
368+
// t4site.api += `?pwd=${pwd}&do=dr`;
369+
// } else {
370+
// t4site.api += `?do=dr`;
371+
// }
372+
//
373+
// // 处理传参源的API参数
374+
// if (fileSite.queryStr) {
375+
// const separator = t4site.api.includes('?') ? '&' : '?';
376+
// site.api += `${separator}extend=${encodeURIComponent(fileSite.queryStr)}`;
377+
// }
378+
//
379+
// sites.push(t4site);
380+
// }
376381
});
377382
},
378383
param: {file, dr2Dir, requestHost, pwd, drpyS, SitesMap},

public/drpy/drpy2-fast.min.js

Lines changed: 102 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

spider/js/设置中心.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ var rule = {
397397

398398
d.push(genMultiInput('play_proxy_mode', '设置播放代理模式', '默认为1,可自行配置成其他值如:2 (1 内存加速,2 磁盘加速 其他:内存加速)', images.settings));
399399
d.push(getInput('get_play_proxy_mode', '查看播放代理模式', images.settings));
400-
d.push(genMultiInput('enable_dr2', '设置drpy2源启用状态', '设置为1启用drpy2脚本服务,需要壳子内置处理;设置为2启用drpy2在线接口服务(默认2,设置其他值关闭)', images.settings));
400+
d.push(genMultiInput('enable_dr2', '设置drpy2源启用状态', '设置为1启用drpy2脚本服务,需要壳子内置处理;设置为2启用drpy2-fast,需要壳子适配新so(默认1,设置其他值关闭)', images.settings));
401401
d.push(getInput('get_enable_dr2', '查看drpy2源启用状态', images.settings));
402402
d.push(genMultiInput('enable_py', '设置py源启用状态', '设置为1可启用此功能,设置为2启用T4(默认没设置也属于启动,设置其他值关闭)', images.settings));
403403
d.push(getInput('get_enable_py', '查看py源启用状态', images.settings));

0 commit comments

Comments
 (0)