Update app.py

app.py

@@ -9,26 +9,23 @@ def extract_and_transform_proxies(input_text):
     print(input_text)
     print("------------------------")
 
-    # 尝试直接解析整个输入作为YAML
+    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:
-        data = yaml.safe_load(input_text)
-        if isinstance(data, dict) and 'proxies' in data:
-            proxies_list = data['proxies']
-        else:
-            proxies_list = data
+        proxies_list = yaml.safe_load(proxies_text)
     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部分"
+        # 如果YAML解析失败，使用正则表达式解析
+        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)
 
     if not proxies_list:
         return "未找到有效的代理配置"
@@ -36,17 +33,10 @@ def extract_and_transform_proxies(input_text):
     transformed_proxies = []
 
     for proxy in proxies_list:
-        if isinstance(proxy, str):
-            # 如果proxy是字符串，尝试解析为字典
-            try:
-                proxy = dict(item.strip().split(': ') for item in proxy.split(','))
-            except ValueError:
-                continue
-
         if proxy.get('type') == 'ss':
             name = proxy.get('name', '').strip()
             server = proxy.get('server', '').strip()
-            port = proxy.get('port', '').strip()
+            port = str(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'