Upload 17 files

app/sub_manager.py

@@ -303,11 +303,110 @@ secret: ""
                 config_content = "secret: ''\n" + config_content
                 has_patch = True
             
-            # 确保配置了全局策略组
-            if "GLOBAL" not in config_content and "- name: GLOBAL" not in config_content:
-                # 我们可能需要添加全局策略组，但这取决于具体的配置结构
-                # 此处简化处理，仅检测，不修改
-                logger.warning("未检测到GLOBAL策略组，切换节点功能可能无法正常工作")
+            # 尝试解析YAML并修复代理组引用问题
+            try:
+                import yaml
+                
+                # 解析配置
+                config_yaml = yaml.safe_load(config_content)
+                
+                # 检查是否有代理和代理组
+                if config_yaml and isinstance(config_yaml, dict):
+                    if "proxies" in config_yaml and "proxy-groups" in config_yaml:
+                        # 获取所有代理节点名称
+                        proxy_names = set()
+                        for proxy in config_yaml.get("proxies", []):
+                            if isinstance(proxy, dict) and "name" in proxy:
+                                proxy_names.add(proxy["name"])
+                        
+                        # 添加内置代理
+                        proxy_names.add("DIRECT")
+                        proxy_names.add("REJECT")
+                        
+                        # 修复代理组引用
+                        groups_fixed = False
+                        for group in config_yaml.get("proxy-groups", []):
+                            if isinstance(group, dict) and "proxies" in group:
+                                # 删除组中引用的不存在的代理
+                                valid_proxies = []
+                                for proxy in group["proxies"]:
+                                    if proxy in proxy_names or proxy == group.get("name", ""):
+                                        valid_proxies.append(proxy)
+                                    else:
+                                        logger.warning(f"删除代理组 {group.get('name', '未知')} 中的无效引用: {proxy}")
+                                        groups_fixed = True
+                                
+                                # 确保代理组至少有一个有效代理
+                                if not valid_proxies:
+                                    valid_proxies.append("DIRECT")
+                                    logger.warning(f"为空代理组 {group.get('name', '未知')} 添加默认代理: DIRECT")
+                                    groups_fixed = True
+                                
+                                group["proxies"] = valid_proxies
+                        
+                        # 检查是否有GLOBAL组，如果没有，添加一个
+                        has_global = False
+                        for group in config_yaml.get("proxy-groups", []):
+                            if isinstance(group, dict) and group.get("name") == "GLOBAL":
+                                has_global = True
+                                break
+                        
+                        if not has_global:
+                            # 添加GLOBAL策略组
+                            logger.info("添加GLOBAL策略组")
+                            if "proxy-groups" not in config_yaml:
+                                config_yaml["proxy-groups"] = []
+                            
+                            # 确定要放入GLOBAL组的代理
+                            global_proxies = ["DIRECT"]
+                            # 添加所有代理节点到GLOBAL组
+                            for proxy in config_yaml.get("proxies", []):
+                                if isinstance(proxy, dict) and "name" in proxy:
+                                    proxy_name = proxy["name"]
+                                    if proxy_name != "DIRECT" and proxy_name != "REJECT":
+                                        global_proxies.append(proxy_name)
+                            
+                            config_yaml["proxy-groups"].insert(0, {
+                                "name": "GLOBAL",
+                                "type": "select",
+                                "proxies": global_proxies
+                            })
+                            groups_fixed = True
+                            has_patch = True
+                        
+                        # 如果修复了代理组，重新生成配置
+                        if groups_fixed:
+                            config_content = yaml.dump(config_yaml, sort_keys=False, allow_unicode=True)
+                            has_patch = True
+                    else:
+                        # 配置缺少代理或代理组，添加基本结构
+                        if "proxies" not in config_yaml:
+                            config_yaml["proxies"] = [{"name": "DIRECT", "type": "direct"}]
+                            has_patch = True
+                        
+                        if "proxy-groups" not in config_yaml:
+                            config_yaml["proxy-groups"] = [{
+                                "name": "GLOBAL",
+                                "type": "select",
+                                "proxies": ["DIRECT"]
+                            }]
+                            has_patch = True
+                        
+                        # 更新配置内容
+                        config_content = yaml.dump(config_yaml, sort_keys=False, allow_unicode=True)
+            except Exception as yaml_err:
+                logger.error(f"解析YAML时出错: {str(yaml_err)}")
+                # 无法解析YAML，添加基本的GLOBAL策略组
+                if "GLOBAL" not in config_content:
+                    config_content += """
+proxy-groups:
+  - name: GLOBAL
+    type: select
+    proxies:
+      - DIRECT
+"""
+                    has_patch = True
+                    logger.info("添加了基本的GLOBAL策略组")
             
             # 如果我们修改了配置，保存回文件
             if has_patch: