mirror of
https://github.com/lush2020/CF-Workers-SUB.git
synced 2026-03-21 02:34:04 +08:00
更新_worker.js,添加对base64订阅格式的支持,优化订阅转换逻辑并处理错误
This commit is contained in:
15
_worker.js
15
_worker.js
@@ -104,7 +104,7 @@ export default {
|
|||||||
订阅格式 = 'loon';
|
订阅格式 = 'loon';
|
||||||
} else if (userAgent.includes('clash') || userAgent.includes('meta') || userAgent.includes('mihomo') || url.searchParams.has('clash')) {
|
} else if (userAgent.includes('clash') || userAgent.includes('meta') || userAgent.includes('mihomo') || url.searchParams.has('clash')) {
|
||||||
订阅格式 = 'clash';
|
订阅格式 = 'clash';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let subConverterUrl;
|
let subConverterUrl;
|
||||||
@@ -141,6 +141,19 @@ export default {
|
|||||||
const result = [...uniqueLines].join('\n');
|
const result = [...uniqueLines].join('\n');
|
||||||
//console.log(result);
|
//console.log(result);
|
||||||
|
|
||||||
|
if (订阅格式 == 'base64' && !userAgent.includes('subconverter') && 订阅转换URL.includes('://')) {
|
||||||
|
subConverterUrl = `${subProtocol}://${subConverter}/sub?target=mixed&url=${encodeURIComponent(订阅转换URL)}&insert=false&config=${encodeURIComponent(subConfig)}&emoji=true&list=false&tfo=false&scv=true&fdn=false&sort=false&new_name=true`;
|
||||||
|
try {
|
||||||
|
const subConverterResponse = await fetch(subConverterUrl);
|
||||||
|
if (subConverterResponse.ok) {
|
||||||
|
const subConverterContent = await subConverterResponse.text();
|
||||||
|
result += '\n' + atob(subConverterContent);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.log('订阅转换请回base64失败,检查订阅转换后端是否正常运行');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let base64Data;
|
let base64Data;
|
||||||
try {
|
try {
|
||||||
base64Data = btoa(result);
|
base64Data = btoa(result);
|
||||||
|
|||||||
Reference in New Issue
Block a user