参考cm

2.7

Author: byJoey

明文源吗

@@ -1867,12 +1867,6 @@
         if (!user) user = at;
 
         const url = new URL(request.url);
-        
-        if (url.protocol === 'https:') {
-            const httpUrl = 'http://' + url.host + url.pathname + url.search;
-            return Response.redirect(httpUrl, 302);
-        }
-        
         // 优先检查Cookie中的语言设置
         const cookieHeader = request.headers.get('Cookie') || '';
         let langFromCookie = null;
@@ -4023,6 +4017,18 @@
                     });
                 }
 
+                function ipToHex(ip) {
+                    const parts = ip.split('.');
+                    if (parts.length !== 4) return null;
+                    let hex = '';
+                    for (let i = 0; i < 4; i++) {
+                        const num = parseInt(parts[i]);
+                        if (isNaN(num) || num < 0 || num > 255) return null;
+                        hex += num.toString(16).padStart(2, '0');
+                    }
+                    return hex;
+                }
+                
                 const coloMap = {
                     'SJC': '圣何塞', 'LAX': '洛杉矶', 'SEA': '西雅图', 'SFO': '旧金山', 'DFW': '达拉斯',
                     'ORD': '芝加哥', 'IAD': '华盛顿', 'ATL': '亚特兰大', 'MIA': '迈阿密', 'DEN': '丹佛',
@@ -4098,11 +4104,11 @@
                         }
 
                         const cleanHost = host.replace(/^\\[|\\]$/g, '');
-                        const isIPv6 = cleanHost.includes(':');
-                        const hostPart = isIPv6 ? ('[' + cleanHost + ']') : cleanHost;
-                        testUrl = 'http://' + hostPart + ':80/cdn-cgi/trace';
+                        const hexIP = ipToHex(cleanHost);
+                        const testDomain = hexIP ? (hexIP + '.nip.lfree.org') : (cleanHost + '.nip.lfree.org');
+                        testUrl = 'https://' + testDomain + ':' + port + '/';
 
-                        console.log('[LatencyTest] Testing:', testUrl, 'Original:', host + ':' + port);
+                        console.log('[LatencyTest] Testing:', testUrl, 'Original:', host + ':' + port, 'HexIP:', hexIP);
 
                         const firstStart = Date.now();
                         const response1 = await fetch(testUrl, { 
@@ -4118,9 +4124,9 @@
                         try {
                             const text = await response1.text();
                             console.log('[LatencyTest] Response body:', text.substring(0, 200));
-                            const coloMatch = text.match(/colo=([A-Z]+)/);
-                            if (coloMatch) {
-                                colo = coloMatch[1];
+                            const data = JSON.parse(text);
+                            if (data.colo) {
+                                colo = data.colo;
                             }
                         } catch (e) {
                             console.log('[LatencyTest] Parse error:', e.message);