Refactor fetch function and enhance proxy configuration handling in index.js

6Kmfi6HP · 6Kmfi6HP · commit 135e14f82d01 · 2025-05-06T08:52:16.000+07:00
- Introduced a request-specific configuration object to avoid global variable modifications.
- Added URL query parameter support for overriding proxy settings, including proxy IP, SOCKS5 address, and relay options.
- Implemented validation for proxy and SOCKS5 formats to ensure correct configurations.
- Updated ProtocolOverWSHandler and HandleTCPOutBound functions to utilize the new configuration object.
- Enhanced README.md to document the new URL query parameter features and usage examples.
diff --git a/README.md b/README.md
@@ -18,13 +18,15 @@ EDtunnel is a proxy tool based on Cloudflare Workers and Pages, supporting multi
 - 支持自定义代理 IP 和端口
 - 支持 SOCKS5 代理
 - 提供自动配置订阅链接
+- 支持 URL 查询参数覆盖配置
 - 简单易用的部署流程
 
 - Support for Cloudflare Workers and Pages deployment
 - Multiple UUID configuration support
 - Custom proxy IP and port support
 - SOCKS5 proxy support
 - Automatic configuration subscription link
+- URL query parameter configuration override support
 - Simple and easy deployment process
 
 ## 🚀 快速部署 | Quick Deployment
@@ -55,6 +57,60 @@ EDtunnel is a proxy tool based on Cloudflare Workers and Pages, supporting multi
 | `SOCKS5` | 否 (No) | `user:pass@host:port`<br>多个 (Multiple): `user1:pass1@host1:port1,user2:pass2@host2:port2` | SOCKS5代理配置 / SOCKS5 proxy configuration |
 | `SOCKS5_RELAY` | 否 (No) | `true` 或 (or) `false` | 启用SOCKS5流量转发 / Enable SOCKS5 traffic relay |
 
+### URL查询参数配置 | URL Query Parameter Configuration
+
+您可以使用URL查询参数直接覆盖环境变量配置，这些参数的优先级高于环境变量。出于安全考虑，UUID 不能通过 URL 查询参数设置。
+
+You can use URL query parameters to directly override environment variable configurations. These parameters have higher priority than environment variables. For security reasons, UUID cannot be set via URL query parameters.
+
+| 查询参数 (Query Parameter) | 对应环境变量 (Corresponding ENV) | 示例 (Example) | 说明 (Description) |
+|--------------------------|--------------------------------|---------------|-------------------|
+| `proxyip` | `PROXYIP` | `?proxyip=1.1.1.1:443` | 覆盖代理IP和端口 / Override proxy IP and port |
+| `socks5` | `SOCKS5` | `?socks5=user:pass@host:port` | 覆盖SOCKS5代理配置 / Override SOCKS5 proxy configuration |
+| `socks5_relay` | `SOCKS5_RELAY` | `?socks5_relay=true` | 覆盖SOCKS5转发设置 / Override SOCKS5 relay setting |
+
+> **安全说明**: UUID 必须通过环境变量或配置文件设置，不能通过 URL 参数设置，以防止未授权修改用户身份。  
+> **Security Note**: UUID must be set via environment variables or configuration files, not through URL parameters, to prevent unauthorized identity modifications.
+
+#### 使用示例 | Usage Examples:
+
+1. 临时更改代理IP | Temporarily change proxy IP:
+   ```
+   https://your-domain.workers.dev/?proxyip=another-proxy-ip:port
+   ```
+
+2. 组合多个参数 | Combine multiple parameters:
+   ```
+   https://your-domain.workers.dev/?proxyip=1.1.1.1:443&socks5_relay=true
+   ```
+
+3. 应用于特定路径 | Apply to specific paths:
+   ```
+   https://your-domain.workers.dev/sub/your-uuid?proxyip=1.1.1.1:443
+   ```
+
+#### 特性说明 | Feature Notes:
+
+- 优先级：URL参数 > 环境变量 > 默认值
+- 临时性：这些更改仅对当前请求有效，不会永久修改配置
+- 可组合：可以组合多个参数实现复杂配置调整
+- 适用场景：快速测试、临时切换配置、第三方系统动态调用
+
+- Priority: URL parameters > Environment Variables > Default Values
+- Temporary: These changes only apply to the current request and do not permanently modify configurations
+- Combinable: Multiple parameters can be combined for complex configuration adjustments
+- Use cases: Quick testing, temporary configuration switching, dynamic calls from third-party systems
+
+#### URL格式注意事项 | URL Format Notes:
+
+- 确保查询参数使用正确的格式: `?参数名=值`。问号 `?` 不应被URL编码（`%3F`）。
+- 如果您看到像 `/%3Fproxyip=value` 这样的URL，这不会正确工作，应改为 `/?proxyip=value`。
+- 本项目现已支持处理编码在路径中的查询参数，但建议使用标准格式以确保最佳兼容性。
+
+- Ensure query parameters use the correct format: `?parameter=value`. The question mark `?` should not be URL encoded (`%3F`).
+- If you see URLs like `/%3Fproxyip=value`, this won't work correctly. Use `/?proxyip=value` instead.
+- This project now supports handling query parameters encoded in the path, but using the standard format is recommended for best compatibility.
+
 ### 非443端口配置 | Non-443 Port Configuration
 
 1. 访问 (Visit) `https://proxyip.edtunnel.best/`
diff --git a/index.js b/index.js
@@ -66,28 +66,79 @@ export default {
 	async fetch(request, env, _ctx) {
 		try {
 			const { UUID, PROXYIP, SOCKS5, SOCKS5_RELAY } = env;
-			userID = UUID || userID;
-			socks5Address = SOCKS5 || socks5Address;
-			socks5Relay = SOCKS5_RELAY || socks5Relay;
+			const url = new URL(request.url);
+			
+            // 为当前请求创建配置副本，避免修改全局变量
+            const requestConfig = {
+                userID: UUID || userID,
+                socks5Address: SOCKS5 || socks5Address,
+                socks5Relay: SOCKS5_RELAY === 'true' || socks5Relay,
+                proxyIP: null,
+                proxyPort: null,
+                enableSocks: false,
+                parsedSocks5Address: {}
+            };
+
+			// 获取正常URL参数
+			let urlPROXYIP = url.searchParams.get('proxyip');
+			let urlSOCKS5 = url.searchParams.get('socks5');
+			let urlSOCKS5_RELAY = url.searchParams.get('socks5_relay');
+
+			// 检查编码在路径中的参数
+			if (!urlPROXYIP && !urlSOCKS5 && !urlSOCKS5_RELAY) {
+				const encodedParams = parseEncodedQueryParams(url.pathname);
+				urlPROXYIP = urlPROXYIP || encodedParams.proxyip;
+				urlSOCKS5 = urlSOCKS5 || encodedParams.socks5;
+				urlSOCKS5_RELAY = urlSOCKS5_RELAY || encodedParams.socks5_relay;
+			}
+
+			// 验证proxyip格式
+			if (urlPROXYIP) {
+				// 验证格式: domain:port 或 ip:port
+				const proxyPattern = /^([a-zA-Z0-9][-a-zA-Z0-9.]*(\.[a-zA-Z0-9][-a-zA-Z0-9.]*)+|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}|\[[0-9a-fA-F:]+\]):\d{1,5}$/;
+				if (!proxyPattern.test(urlPROXYIP)) {
+					console.warn('无效的proxyip格式:', urlPROXYIP);
+					urlPROXYIP = null;
+				}
+			}
+
+			// 验证socks5格式
+			if (urlSOCKS5) {
+				// 基本验证 - 可以根据实际格式要求调整
+				const socks5Pattern = /^(([^:@]+:[^:@]+@)?[a-zA-Z0-9][-a-zA-Z0-9.]*(\.[a-zA-Z0-9][-a-zA-Z0-9.]*)+|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}):\d{1,5}$/;
+				if (!socks5Pattern.test(urlSOCKS5)) {
+					console.warn('无效的socks5格式:', urlSOCKS5);
+					urlSOCKS5 = null;
+				}
+			}
+
+			// 应用URL参数到当前请求的配置
+			requestConfig.socks5Address = urlSOCKS5 || requestConfig.socks5Address;
+			requestConfig.socks5Relay = urlSOCKS5_RELAY === 'true' || requestConfig.socks5Relay;
+
+			// 记录参数值，用于调试
+			console.log('配置参数:', requestConfig.userID, requestConfig.socks5Address, requestConfig.socks5Relay, urlPROXYIP);
+
+			// Handle proxy configuration for the current request
+			const proxyConfig = handleProxyConfig(urlPROXYIP || PROXYIP);
+			requestConfig.proxyIP = proxyConfig.ip;
+			requestConfig.proxyPort = proxyConfig.port;
 
-			// Handle proxy configuration
-			const proxyConfig = handleProxyConfig(PROXYIP);
-			proxyIP = proxyConfig.ip;
-			proxyPort = proxyConfig.port;
+			// 记录最终使用的代理设置
+			console.log('使用代理:', requestConfig.proxyIP, requestConfig.proxyPort);
 
-			if (socks5Address) {
+			if (requestConfig.socks5Address) {
 				try {
-					const selectedSocks5 = selectRandomAddress(socks5Address);
-					parsedSocks5Address = socks5AddressParser(selectedSocks5);
-					enableSocks = true;
+					const selectedSocks5 = selectRandomAddress(requestConfig.socks5Address);
+					requestConfig.parsedSocks5Address = socks5AddressParser(selectedSocks5);
+					requestConfig.enableSocks = true;
 				} catch (err) {
 					console.log(err.toString());
-					enableSocks = false;
+					requestConfig.enableSocks = false;
 				}
 			}
 
-			const userIDs = userID.includes(',') ? userID.split(',').map(id => id.trim()) : [userID];
-			const url = new URL(request.url);
+			const userIDs = requestConfig.userID.includes(',') ? requestConfig.userID.split(',').map(id => id.trim()) : [requestConfig.userID];
 			const host = request.headers.get('Host');
 			const requestedPath = url.pathname.substring(1); // Remove leading slash
 			const matchingUserID = userIDs.length === 1 ?
@@ -110,7 +161,7 @@ export default {
 				if (matchingUserID) {
 					if (url.pathname === `/${matchingUserID}` || url.pathname === `/sub/${matchingUserID}`) {
 						const isSubscription = url.pathname.startsWith('/sub/');
-						const proxyAddresses = PROXYIP ? PROXYIP.split(',').map(addr => addr.trim()) : proxyIP;
+						const proxyAddresses = PROXYIP ? PROXYIP.split(',').map(addr => addr.trim()) : requestConfig.proxyIP;
 						const content = isSubscription ?
 							GenSub(matchingUserID, host, proxyAddresses) :
 							getConfig(matchingUserID, host, proxyAddresses);
@@ -129,7 +180,7 @@ export default {
 				}
 				return handleDefaultPath(url, request);
 			} else {
-				return await ProtocolOverWSHandler(request);
+				return await ProtocolOverWSHandler(request, requestConfig);
 			}
 		} catch (err) {
 			return new Response(err.toString());
@@ -395,9 +446,22 @@ async function handleDefaultPath(url, request) {
 /**
  * Handles protocol over WebSocket requests by creating a WebSocket pair, accepting the WebSocket connection, and processing the protocol header.
  * @param {import("@cloudflare/workers-types").Request} request - The incoming request object
+ * @param {Object} config - The configuration for this request
  * @returns {Promise<Response>} WebSocket response
  */
-async function ProtocolOverWSHandler(request) {
+async function ProtocolOverWSHandler(request, config = null) {
+    // 如果没有传入配置，使用全局配置
+    if (!config) {
+        config = {
+            userID,
+            socks5Address,
+            socks5Relay,
+            proxyIP,
+            proxyPort,
+            enableSocks,
+            parsedSocks5Address
+        };
+    }
 
 	/** @type {import("@cloudflare/workers-types").WebSocket[]} */
 	// @ts-ignore
@@ -443,7 +507,7 @@ async function ProtocolOverWSHandler(request) {
 				rawDataIndex,
 				ProtocolVersion = new Uint8Array([0, 0]),
 				isUDP,
-			} = ProcessProtocolHeader(chunk, userID);
+			} = ProcessProtocolHeader(chunk, config.userID);
 			address = addressRemote;
 			portWithRandomLog = `${portRemote}--${Math.random()} ${isUDP ? 'udp ' : 'tcp '
 				} `;
@@ -467,7 +531,7 @@ async function ProtocolOverWSHandler(request) {
 			if (isDns) {
 				return handleDNSQuery(rawClientData, webSocket, ProtocolResponseHeader, log);
 			}
-			HandleTCPOutBound(remoteSocketWapper, addressType, addressRemote, portRemote, rawClientData, webSocket, ProtocolResponseHeader, log);
+			HandleTCPOutBound(remoteSocketWapper, addressType, addressRemote, portRemote, rawClientData, webSocket, ProtocolResponseHeader, log, config);
 		},
 		close() {
 			log(`readableWebSocketStream is close`);
@@ -497,15 +561,29 @@ async function ProtocolOverWSHandler(request) {
  * @param {WebSocket} webSocket - WebSocket connection
  * @param {Uint8Array} protocolResponseHeader - Protocol response header
  * @param {Function} log - Logging function
+ * @param {Object} config - The configuration for this request
  */
-async function HandleTCPOutBound(remoteSocket, addressType, addressRemote, portRemote, rawClientData, webSocket, protocolResponseHeader, log,) {
+async function HandleTCPOutBound(remoteSocket, addressType, addressRemote, portRemote, rawClientData, webSocket, protocolResponseHeader, log, config = null) {
+    // 如果没有传入配置，使用全局配置
+    if (!config) {
+        config = {
+            userID,
+            socks5Address,
+            socks5Relay,
+            proxyIP,
+            proxyPort,
+            enableSocks,
+            parsedSocks5Address
+        };
+    }
+
 	async function connectAndWrite(address, port, socks = false) {
 		/** @type {import("@cloudflare/workers-types").Socket} */
 		let tcpSocket;
-		if (socks5Relay) {
-			tcpSocket = await socks5Connect(addressType, address, port, log)
+		if (config.socks5Relay) {
+			tcpSocket = await socks5Connect(addressType, address, port, log, config.parsedSocks5Address)
 		} else {
-			tcpSocket = socks ? await socks5Connect(addressType, address, port, log)
+			tcpSocket = socks ? await socks5Connect(addressType, address, port, log, config.parsedSocks5Address)
 				: connect({
 					hostname: address,
 					port: port,
@@ -521,10 +599,11 @@ async function HandleTCPOutBound(remoteSocket, addressType, addressRemote, portR
 
 	// if the cf connect tcp socket have no incoming data, we retry to redirect ip
 	async function retry() {
-		if (enableSocks) {
+		let tcpSocket;
+		if (config.enableSocks) {
 			tcpSocket = await connectAndWrite(addressRemote, portRemote, true);
 		} else {
-			tcpSocket = await connectAndWrite(proxyIP || addressRemote, proxyPort || portRemote, false);
+			tcpSocket = await connectAndWrite(config.proxyIP || addressRemote, config.proxyPort || portRemote, false);
 		}
 		// no matter retry success or not, close websocket
 		tcpSocket.closed.catch(error => {
@@ -871,10 +950,13 @@ async function handleDNSQuery(udpChunk, webSocket, protocolResponseHeader, log)
  * @param {string} addressRemote - Remote address
  * @param {number} portRemote - Remote port
  * @param {Function} log - Logging function
+ * @param {Object} parsedSocks5Addr - Parsed SOCKS5 address information
  * @returns {Promise<Socket>} Connected socket
  */
-async function socks5Connect(addressType, addressRemote, portRemote, log) {
-	const { username, password, hostname, port } = parsedSocks5Address;
+async function socks5Connect(addressType, addressRemote, portRemote, log, parsedSocks5Addr = null) {
+	// 如果没有传入解析的SOCKS5地址，使用全局的
+	const { username, password, hostname, port } = parsedSocks5Addr || parsedSocks5Address;
+	
 	// Connect to the SOCKS server
 	const socket = connect({
 		hostname,
@@ -1237,9 +1319,9 @@ function getConfig(userIDs, hostName, proxyIP) {
         <h3>Best IP Configuration</h3>
         <div class="input-group mb-3">
           <select class="form-select" id="proxySelect" onchange="updateProxyConfig()">
-            ${typeof proxyIP === 'string' ? 
-              `<option value="${proxyIP}">${proxyIP}</option>` : 
-              Array.from(proxyIP).map(proxy => `<option value="${proxy}">${proxy}</option>`).join('')}
+            ${typeof proxyIP === 'string' ?
+				`<option value="${proxyIP}">${proxyIP}</option>` :
+				Array.from(proxyIP).map(proxy => `<option value="${proxy}">${proxy}</option>`).join('')}
           </select>
         </div>
 		<br>
@@ -1407,3 +1489,25 @@ function selectRandomAddress(addresses) {
 		addresses;
 	return addressArray[Math.floor(Math.random() * addressArray.length)];
 }
+
+/**
+ * 合并路径查询参数解析为通用函数
+ * @param {string} pathname - URL路径
+ * @returns {Object} 解析的参数对象
+ */
+function parseEncodedQueryParams(pathname) {
+	const params = {};
+	if (pathname.includes('%3F')) {
+		const encodedParamsMatch = pathname.match(/%3F(.+)$/);
+		if (encodedParamsMatch) {
+			const encodedParams = encodedParamsMatch[1];
+			const paramPairs = encodedParams.split('&');
+			
+			for (const pair of paramPairs) {
+				const [key, value] = pair.split('=');
+				if (value) params[key] = decodeURIComponent(value);
+			}
+		}
+	}
+	return params;
+}
