Skip to content

Commit 0ad62ce

Browse files
authored
Merge pull request #829 from cmliu/beta2.0
fix: 统一处理反代IP和SOCKS5账号逻辑,确保小写格式和默认值
2 parents 096d055 + 07ce3ae commit 0ad62ce

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

_worker.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default {
1717
if (env.PROXYIP) {
1818
const proxyIPs = await 整理成数组(env.PROXYIP);
1919
反代IP = proxyIPs[Math.floor(Math.random() * proxyIPs.length)];
20-
} else 反代IP = 反代IP ? 反代IP : request.cf.colo + '.PrOxYIp.CmLiUsSsS.nEt';
20+
} else 反代IP = (request.cf.colo + '.PrOxYIp.CmLiUsSsS.nEt').toLowerCase();
2121
const 访问IP = request.headers.get('X-Real-IP') || request.headers.get('CF-Connecting-IP') || request.headers.get('X-Forwarded-For') || request.headers.get('True-Client-IP') || request.headers.get('Fly-Client-IP') || request.headers.get('X-Appengine-Remote-Addr') || request.headers.get('X-Forwarded-For') || request.headers.get('X-Real-IP') || request.headers.get('X-Cluster-Client-IP') || request.cf?.clientTcpRtt || '未知IP';
2222
if (env.GO2SOCKS5) SOCKS5白名单 = await 整理成数组(env.GO2SOCKS5);
2323
if (!upgradeHeader || upgradeHeader !== 'websocket') {
@@ -1061,8 +1061,8 @@ async function 反代参数获取(request) {
10611061
const pathLower = pathname.toLowerCase();
10621062

10631063
// 初始化
1064-
我的SOCKS5账号 = searchParams.get('socks5') || searchParams.get('http') || 我的SOCKS5账号;
1065-
启用SOCKS5全局反代 = searchParams.has('globalproxy') || 启用SOCKS5全局反代;
1064+
我的SOCKS5账号 = searchParams.get('socks5') || searchParams.get('http') || null;
1065+
启用SOCKS5全局反代 = searchParams.has('globalproxy') || false;
10661066

10671067
// 统一处理反代IP参数 (优先级最高,使用正则一次匹配)
10681068
const proxyMatch = pathLower.match(/\/(proxyip[.=]|pyip=|ip=)(.+)/);
@@ -1108,7 +1108,7 @@ async function 反代参数获取(request) {
11081108
console.error('解析SOCKS5地址失败:', err.message);
11091109
启用SOCKS5反代 = null;
11101110
}
1111-
}
1111+
} else 启用SOCKS5反代 = null;
11121112
}
11131113

11141114
async function 获取SOCKS5账号(address) {

0 commit comments

Comments
 (0)