Update app.py

app.py

@@ -7,22 +7,23 @@ from http.server import HTTPServer, BaseHTTPRequestHandler
 from urllib.parse import urlparse, parse_qs
 
 def extract_and_transform_proxies(input_text):
-    proxies_match = re.search(r'proxies:\s*\n((?:[-\s]*{.*\n?)*)', input_text, re.MULTILINE)
-    if not proxies_match:
-        return "未找到proxies部分"
-
-    proxies_text = proxies_match.group(1)
-    
     try:
-        proxies_list = yaml.safe_load(proxies_text)
+        # 尝试解析整个输入作为YAML
+        data = yaml.safe_load(input_text)
+        if isinstance(data, dict) and 'proxies' in data:
+            proxies_list = data['proxies']
+        elif isinstance(data, list):
+            proxies_list = data
+        else:
+            # 如果不是预期的格式，尝试提取proxies部分
+            proxies_match = re.search(r'proxies:\s*\n((?:[-\s]*{.*\n?)*)', input_text, re.MULTILINE)
+            if proxies_match:
+                proxies_text = proxies_match.group(1)
+                proxies_list = yaml.safe_load(proxies_text)
+            else:
+                return "未找到有效的代理配置"
     except yaml.YAMLError:
-        proxies_list = []
-        for proxy_str in re.findall(r'{(.*?)}', proxies_text, re.DOTALL):
-            proxy_dict = {}
-            for item in proxy_str.split(','):
-                key, value = item.split(':', 1)
-                proxy_dict[key.strip()] = value.strip()
-            proxies_list.append(proxy_dict)
+        return "YAML解析错误"
 
     if not proxies_list:
         return "未找到有效的代理配置"
@@ -60,6 +61,8 @@ def extract_and_transform_proxies(input_text):
                 trojan_parts.append(f"sni={proxy['sni'].strip()}")
             if 'skip-cert-verify' in proxy:
                 trojan_parts.append(f"skip-cert-verify={str(proxy['skip-cert-verify']).lower()}")
+            if 'udp' in proxy:
+                trojan_parts.append(f"udp={'true' if proxy['udp'] in [True, 'true', 'True'] else 'false'}")
 
             transformed = ", ".join(trojan_parts)
             transformed_proxies.append(transformed)