Update app.py

app.py

@@ -5,23 +5,30 @@ 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((?:{.*\n)*)', input_text)
-    if not proxies_match:
-        return "未找到proxies部分"
+    print("原始输入数据:")
+    print(input_text)
+    print("------------------------")
 
-    proxies_text = proxies_match.group(1)
-    
+    # 尝试直接解析整个输入作为YAML
     try:
-        # 尝试解析YAML
-        proxies_list = yaml.safe_load(proxies_text)
-        
-        # 检查proxies_list是否为None或不是列表
-        if proxies_list is None or not isinstance(proxies_list, list):
-            # 如果不是有效的YAML列表，尝试使用正则表达式解析
-            proxies_list = re.findall(r'{(.*?)}', proxies_text, re.DOTALL)
-            proxies_list = [dict(item.split(': ') for item in proxy.split(', ')) for proxy in proxies_list]
-    except yaml.YAMLError as e:
-        return f"YAML解析错误: {str(e)}"
+        data = yaml.safe_load(input_text)
+        if isinstance(data, dict) and 'proxies' in data:
+            proxies_list = data['proxies']
+        else:
+            proxies_list = data
+    except yaml.YAMLError:
+        # 如果整个输入不是有效的YAML，尝试提取proxies部分
+        proxies_match = re.search(r'proxies:\s*\n((?:[-\s]*{.*\n?)*)', input_text, re.MULTILINE)
+        if proxies_match:
+            proxies_text = proxies_match.group(1)
+            try:
+                proxies_list = yaml.safe_load(proxies_text)
+            except yaml.YAMLError:
+                # 如果YAML解析失败，尝试使用正则表达式解析
+                proxies_list = re.findall(r'{(.*?)}', proxies_text, re.DOTALL)
+                proxies_list = [dict(item.strip().split(': ') for item in proxy.split(',')) for proxy in proxies_list]
+        else:
+            return "未找到proxies部分"
 
     if not proxies_list:
         return "未找到有效的代理配置"
@@ -30,16 +37,19 @@ def extract_and_transform_proxies(input_text):
 
     for proxy in proxies_list:
         if isinstance(proxy, str):
-            # 如果proxy是字符串，说明使用了正则表达式解析，需要进一步处理
-            proxy = dict(item.split(': ') for item in proxy.split(', '))
-        
+            # 如果proxy是字符串，尝试解析为字典
+            try:
+                proxy = dict(item.strip().split(': ') for item in proxy.split(','))
+            except ValueError:
+                continue
+
         if proxy.get('type') == 'ss':
-            name = proxy.get('name', '')
-            server = proxy.get('server', '')
-            port = proxy.get('port', '')
-            cipher = proxy.get('cipher', '')
-            password = proxy.get('password', '')
-            udp = 'true' if proxy.get('udp') == 'true' else 'false'
+            name = proxy.get('name', '').strip()
+            server = proxy.get('server', '').strip()
+            port = proxy.get('port', '').strip()
+            cipher = proxy.get('cipher', '').strip()
+            password = proxy.get('password', '').strip()
+            udp = 'true' if proxy.get('udp') in [True, 'true', 'True'] else 'false'
 
             transformed = f"{name} = ss, {server}, {port}, encrypt-method={cipher}, password={password}, udp-relay={udp}"
             transformed_proxies.append(transformed)
@@ -55,7 +65,7 @@ class RequestHandler(BaseHTTPRequestHandler):
             url = query_params['url'][0]
             try:
                 response = requests.get(url)
-                response.raise_for_status()  # 这将抛出HTTPError，如果响应状态码不是200
+                response.raise_for_status()
                 input_text = response.text
                 result = extract_and_transform_proxies(input_text)
                 self.send_response(200)