Dispark/edgetunnel
1
0
Fork 0
mirror of https://github.com/lush2020/edgetunnel.git synced 2026-03-21 17:12:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update _worker.js

Browse Source 
修复了修复bug引起的bug；
修复了pages部署时，使用本地ADD*变量无法生成订阅内容；
修复了notls自定义域会触发启用中转域名的bug
This commit is contained in:
CMLiussss
2024-07-16 02:31:33 +08:00
committed by GitHub
parent 3c064a241f
commit fc285f91c8
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
_worker.js
View File

@@ -121,17 +121,13 @@ export default {
return new Response(`${fakeConfig}`, { status: 200 });
case `/${userID}`: {
await sendMessage(`#获取订阅 ${FileName}`, request.headers.get('CF-Connecting-IP'), `UA: ${UA}</tg-spoiler>\n域名: ${url.hostname}\n<tg-spoiler>入口: ${url.pathname + url.search}</tg-spoiler>`);
if (!sub || sub == ''){
if((addresses.length + addressesapi.length + addressesnotls.length + addressesnotlsapi.length + addressescsv.length) == 0){
if (request.headers.get('Host').includes(".workers.dev")) {
sub = 'workervless2sub-f1q.pages.dev';
subconfig = env.SUBCONFIG || 'https://raw.githubusercontent.com/cmliu/ACL4SSR/main/Clash/config/ACL4SSR_Online.ini';
} else {
sub = 'vless-4ca.pages.dev';
subconfig = env.SUBCONFIG || "https://raw.githubusercontent.com/cmliu/ACL4SSR/main/Clash/config/ACL4SSR_Online_Full_MultiMode.ini";
}
if ((!sub || sub == '') && (addresses.length + addressesapi.length + addressesnotls.length + addressesnotlsapi.length + addressescsv.length) == 0){
if (request.headers.get('Host').includes(".workers.dev")) {
sub = 'workervless2sub-f1q.pages.dev';
subconfig = env.SUBCONFIG || 'https://raw.githubusercontent.com/cmliu/ACL4SSR/main/Clash/config/ACL4SSR_Online.ini';
} else {
noTLS = 'true';
sub = 'vless-4ca.pages.dev';
subconfig = env.SUBCONFIG || "https://raw.githubusercontent.com/cmliu/ACL4SSR/main/Clash/config/ACL4SSR_Online_Full_MultiMode.ini";
}
}
const vlessConfig = await getVLESSConfig(userID, request.headers.get('Host'), sub, UA, RproxyIP, url);
@@ -1295,17 +1291,22 @@ https://github.com/cmliu/edgetunnel
return 'Error: fetch is not available in this environment.';
}
let newAddressesapi ;
let newAddressescsv ;
let newAddressesnotlsapi;
let newAddressesnotlscsv;
let newAddressesapi = [];
let newAddressescsv = [];
let newAddressesnotlsapi = [];
let newAddressesnotlscsv = [];
// 如果是使用默认域名，则改成一个workers的域名，订阅器会加上代理
if (hostName.includes(".pages.dev")){
if (hostName.includes(".workers.dev")){
noTLS = 'true';
fakeHostName = `${fakeHostName}.workers.dev`;
newAddressesnotlsapi = await getAddressesapi(addressesnotlsapi);
newAddressesnotlscsv = await getAddressescsv('FALSE');
} else if (hostName.includes(".pages.dev")){
fakeHostName = `${fakeHostName}.pages.dev`;
} else if (hostName.includes("worker") || hostName.includes("notls") || noTLS == 'true'){
noTLS = 'true';
fakeHostName = `${fakeHostName}.workers.dev`;
fakeHostName = `notls${fakeHostName}.net`;
newAddressesnotlsapi = await getAddressesapi(addressesnotlsapi);
newAddressesnotlscsv = await getAddressescsv('FALSE');
} else {
@@ -1343,6 +1344,7 @@ https://github.com/cmliu/edgetunnel
newAddressesapi = await getAddressesapi(addressesapi);
newAddressescsv = await getAddressescsv('TRUE');
url = `https://${hostName}/${fakeUserID}`;
if (hostName.includes("worker") || hostName.includes("notls") || noTLS == 'true') url += '?notls';
console.log(`虚假订阅: ${url}`);
}