From 60087f4200d60ff2fcfd5e99bc6b08b1f54975e1 Mon Sep 17 00:00:00 2001
From: cmliu <admin@cmliu.net>
Date: Mon, 24 Feb 2025 01:00:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20CF=E9=9A=8F=E6=9C=BA?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Loon=20=E8=AE=A2=E9=98=85=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...16\346\226\207\346\272\220\347\240\201.js" | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git "a/\346\230\216\346\226\207\346\272\220\347\240\201.js" "b/\346\230\216\346\226\207\346\272\220\347\240\201.js"
index 02d2798e..3c03b3d1 100644
--- "a/\346\230\216\346\226\207\346\272\220\347\240\201.js"
+++ "b/\346\230\216\346\226\207\346\272\220\347\240\201.js"
@@ -704,11 +704,20 @@ async function get特洛伊Config(password, hostName, sub, UA, RproxyIP, _url, f
 		if ((addresses.length + addressesapi.length + addressescsv.length) == 0) {
 			// 定义 Cloudflare IP 范围的 CIDR 列表
 			let cfips = [
-				'103.21.244.0/23',
+				'103.21.244.0/24',
+				'104.16.0.0/13',
+				'104.24.0.0/14',
+				'172.64.0.0/14',
+				'104.16.0.0/14',
+				'104.24.0.0/15',
+				'141.101.64.0/19',
+				'172.64.0.0/14',
+				'188.114.96.0/21',
+				'190.93.240.0/21',
+				'162.159.152.0/23',
 				'104.16.0.0/13',
 				'104.24.0.0/14',
 				'172.64.0.0/14',
-				'103.21.244.0/23',
 				'104.16.0.0/14',
 				'104.24.0.0/15',
 				'141.101.64.0/19',
@@ -734,7 +743,10 @@ async function get特洛伊Config(password, hostName, sub, UA, RproxyIP, _url, f
 				return randomIP.join('.');
 			}
 			addresses = addresses.concat('127.0.0.1:1234#CFnat');
-			addresses = addresses.concat(cfips.map(cidr => generateRandomIPFromCIDR(cidr) + '#CF随机节点'));
+			const randomPorts = httpsPorts.concat('443');
+			addresses = addresses.concat(
+				cfips.map(cidr => generateRandomIPFromCIDR(cidr) + ':' + randomPorts[Math.floor(Math.random() * randomPorts.length)] + '#CF随机节点' + String(counter++).padStart(2, '0'))
+			);
 		}
 	}
 
@@ -817,6 +829,9 @@ async function get特洛伊Config(password, hostName, sub, UA, RproxyIP, _url, f
 			singbox订阅地址:<br>
 			<a href="javascript:void(0)" onclick="copyToClipboard('https://${proxyhost}${hostName}/${password}?sb','qrcode_3')" style="color:blue;text-decoration:underline;cursor:pointer;">https://${proxyhost}${hostName}/${password}?sb</a><br>
 			<div id="qrcode_3" style="margin: 10px 10px 10px 10px;"></div>
+			loon订阅地址:<br>
+			<a href="javascript:void(0)" onclick="copyToClipboard('https://${proxyhost}${hostName}/${password}?loon','qrcode_5')" style="color:blue;text-decoration:underline;cursor:pointer;">https://${proxyhost}${hostName}/${password}?loon</a><br>
+			<div id="qrcode_5" style="margin: 10px 10px 10px 10px;"></div>
 			${surge}
 			<strong><a href="javascript:void(0);" id="noticeToggle" onclick="toggleNotice()">实用订阅技巧∨</a></strong><br>
 				<div id="noticeContent" class="notice-content" style="display: none;">
@@ -954,6 +969,9 @@ async function get特洛伊Config(password, hostName, sub, UA, RproxyIP, _url, f
 			} else if (userAgent.includes('surge') || _url.searchParams.has('surge')) {
 				url = `${subProtocol}://${subConverter}/sub?target=surge&ver=4&url=${encodeURIComponent(url)}&insert=false&config=${encodeURIComponent(subConfig)}&emoji=${subEmoji}&list=false&xudp=false&udp=false&tfo=false&expand=true&scv=true&fdn=false`;
 				isBase64 = false;
+			} else if (userAgent.includes('loon') || _url.searchParams.has('loon')) {
+				url = `${subProtocol}://${subConverter}/sub?target=loon&url=${encodeURIComponent(url)}&insert=false&config=${encodeURIComponent(subConfig)}&emoji=${subEmoji}&list=false&tfo=false&scv=true&fdn=false&sort=false&new_name=true`;
+				isBase64 = false;
 			}
 		}