Update app.py

app.py

@@ -1,4 +1,5 @@
 import re
+import json
 import yaml
 import aiohttp
 import asyncio
@@ -47,18 +48,44 @@ async def fetch_url(url, session, max_retries=5):
 
 async def extract_and_transform_proxies(input_text):
     try:
-        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_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)
+        # 首先尝试解析为JSON格式
+        try:
+            # 检查是否是JSON数组格式
+            if input_text.strip().startswith('['):
+                proxies_list = json.loads(input_text)
+            # 检查是否是多个JSON对象
+            elif input_text.strip().startswith('{'):
+                # 将多个JSON对象转换为数组
+                input_text = f"[{input_text}]"
+                proxies_list = json.loads(input_text)
             else:
-                return "未找到有效的代理配置"
+                # 如果不是JSON格式，继续尝试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_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 json.JSONDecodeError:
+            # 如果JSON解析失败，继续使用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_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:
         return "YAML解析错误"
 
@@ -68,34 +95,48 @@ async def extract_and_transform_proxies(input_text):
     transformed_proxies = []
 
     for proxy in proxies_list:
-        if proxy.get('type') in ['ss', 'trojan', 'hysteria2']:
-            name = proxy.get('name', '').strip()
+        proxy_type = proxy.get('type')
+        if proxy_type in ['ss', 'trojan', 'hysteria2']:
+            # 获取名称，优先使用tag字段
+            name = proxy.get('tag', '') or proxy.get('name', '')
+            name = name.strip()
+            
             server = proxy.get('server', '').strip()
-            port = str(proxy.get('port', '')).strip()
+            # 处理端口，可能是server_port或port
+            port = str(proxy.get('server_port', '') or proxy.get('port', '')).strip()
             
-            parts = [f"{name} = {proxy['type']}, {server}, {port}"]
+            parts = [f"{name} = {proxy_type}, {server}, {port}"]
             
-            if proxy['type'] == 'ss':
+            if proxy_type == 'ss':
                 if 'cipher' in proxy:
                     parts.append(f"encrypt-method={proxy['cipher'].strip()}")
                 if 'password' in proxy:
                     parts.append(f"password={proxy['password'].strip()}")
-            elif proxy['type'] in ['trojan', 'hysteria2']:
+            elif proxy_type in ['trojan', 'hysteria2']:
                 if 'password' in proxy:
                     parts.append(f"password={proxy['password'].strip()}")
                 if 'sni' in proxy:
                     parts.append(f"sni={proxy['sni'].strip()}")
-                if 'skip-cert-verify' in proxy:
+                
+                # 处理TLS配置
+                if 'tls' in proxy and isinstance(proxy['tls'], dict):
+                    if proxy['tls'].get('insecure', False):
+                        parts.append("skip-cert-verify=true")
+                elif 'skip-cert-verify' in proxy:
                     parts.append(f"skip-cert-verify={str(proxy['skip-cert-verify']).lower()}")
-                elif proxy['type'] == 'hysteria2':  # 如果没有 skip-cert-verify，则默认添加
+                elif proxy_type == 'hysteria2':
                     parts.append(f"skip-cert-verify=true")
+                
+                # 处理TCP Fast Open配置
+                if 'tcp_fast_open' in proxy:
+                    parts.append(f"tfo={str(proxy['tcp_fast_open']).lower()}")
             
             if 'udp' in proxy:
                 parts.append(f"udp-relay={'true' if proxy['udp'] in [True, 'true', 'True'] else 'false'}")
 
             transformed_proxies.append(", ".join(parts))
 
-    return "\n".join(transformed_proxies) if transformed_proxies else "未找到有效的SS或Trojan代理配置"
+    return "\n".join(transformed_proxies) if transformed_proxies else "未找到有效的代理配置"
 
 def get_client_ip(request):
     headers_to_check = [