Update app.py

app.py

@@ -48,18 +48,21 @@ async def fetch_url(url, session, max_retries=5):
 
 async def extract_and_transform_proxies(input_text):
     try:
-        # 首先尝试解析为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}]"
+        # 首先尝试处理特殊的JSON格式
+        if input_text.strip().startswith('{"type"'):
+            # 处理多个相邻的JSON对象
+            # 将它们用逗号分隔并包装在数组中
+            input_text = f"[{input_text}]"
+            # 替换相邻的JSON对象之间的}{为},{
+            input_text = input_text.replace('},{', '},{')
+            try:
                 proxies_list = json.loads(input_text)
-            else:
-                # 如果不是JSON格式，继续尝试YAML格式
+            except json.JSONDecodeError:
+                # 如果JSON解析失败，尝试其他格式
+                proxies_list = None
+        else:
+            # 尝试常规的YAML格式
+            try:
                 data = yaml.safe_load(input_text)
                 if isinstance(data, dict) and 'proxies' in data:
                     proxies_list = data['proxies']
@@ -71,72 +74,61 @@ async def extract_and_transform_proxies(input_text):
                         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解析错误"
+                        proxies_list = None
+            except yaml.YAMLError:
+                proxies_list = None
 
-    if not proxies_list:
-        return "未找到有效的代理配置"
+        if not proxies_list:
+            return "未找到有效的代理配置"
 
-    transformed_proxies = []
+        transformed_proxies = []
 
-    for proxy in proxies_list:
-        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()
-            # 处理端口，可能是server_port或port
-            port = str(proxy.get('server_port', '') or proxy.get('port', '')).strip()
-            
-            parts = [f"{name} = {proxy_type}, {server}, {port}"]
-            
-            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']:
-                if 'password' in proxy:
-                    parts.append(f"password={proxy['password'].strip()}")
-                if 'sni' in proxy:
-                    parts.append(f"sni={proxy['sni'].strip()}")
+        for proxy in proxies_list:
+            proxy_type = proxy.get('type')
+            if proxy_type in ['ss', 'trojan', 'hysteria2']:
+                # 获取名称，优先使用tag字段
+                name = proxy.get('tag', '') or proxy.get('name', '')
+                name = name.strip()
                 
-                # 处理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':
-                    parts.append(f"skip-cert-verify=true")
+                server = proxy.get('server', '').strip()
+                # 处理端口，可能是server_port或port
+                port = str(proxy.get('server_port', '') or proxy.get('port', '')).strip()
                 
-                # 处理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'}")
+                parts = [f"{name} = {proxy_type}, {server}, {port}"]
+                
+                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']:
+                    if 'password' in proxy:
+                        parts.append(f"password={proxy['password'].strip()}")
+                    if 'sni' in proxy:
+                        parts.append(f"sni={proxy['sni'].strip()}")
+                    
+                    # 处理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':
+                        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))
+                transformed_proxies.append(", ".join(parts))
 
-    return "\n".join(transformed_proxies) if transformed_proxies else "未找到有效的代理配置"
+        return "\n".join(transformed_proxies) if transformed_proxies else "未找到有效的代理配置"
+    except Exception as e:
+        print(f"Error in extract_and_transform_proxies: {str(e)}", flush=True)
+        return f"配置解析错误: {str(e)}"
 
 def get_client_ip(request):
     headers_to_check = [