Spaces:

clash-linux
/

clash

Paused

App Files Files Community

clash-linux commited on Apr 4, 2025

Commit

d9692e9

verified ·

1 Parent(s): 9fd3d43

Upload 18 files

Browse files

Files changed (2) hide show

app/main.py +0 -46
app/sub_manager.py +147 -149

app/main.py CHANGED Viewed

@@ -244,23 +244,6 @@ def debug_show_config():
         logger.error(f"读取配置文件时出错: {str(e)}")
         return jsonify({"success": False, "error": str(e)}), 500
-@app.route("/debug/raw-config", methods=["GET"])
-@authenticate
-def debug_show_raw_config():
-    """获取并显示原始下载的订阅内容"""
-    config_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), "data", "config.yaml.raw")
-    if not os.path.exists(config_path):
-        return jsonify({"success": False, "error": "原始配置文件不存在"}), 404
-    try:
-        with open(config_path, "r", encoding="utf-8") as f:
-            content = f.read()
-        return jsonify({"success": True, "content": content})
-    except Exception as e:
-        logger.error(f"读取原始配置文件时出错: {str(e)}")
-        return jsonify({"success": False, "error": str(e)}), 500
 # --- Yacd UI & Clash API 反向代理路由 ---
 @app.route('/ui/')
@@ -439,34 +422,6 @@ def index():
                         configDiv.innerHTML = '<p style="color:red">请求失败: ' + error + '</p>';
                     }});
                 }}
-                function viewRawConfig() {{
-                    const apiKey = prompt('请输入API密钥 (默认为 changeme)', 'changeme');
-                    if (apiKey === null) return;
-                    fetch('/debug/raw-config', {{
-                        headers: {{ 'X-API-Key': apiKey }}
-                    }})
-                    .then(response => response.json())
-                    .then(data => {{
-                        const configDiv = document.getElementById('config-content');
-                        configDiv.innerHTML = ''; // 清空之前的内容
-                        if (data.success) {{
-                            const pre = document.createElement('pre');
-                            pre.textContent = data.content;
-                            configDiv.appendChild(pre);
-                        }} else {{
-                            const errorP = document.createElement('p');
-                            errorP.style.color = 'red';
-                            errorP.textContent = '获取原始配置失败: ' + data.error;
-                            configDiv.appendChild(errorP);
-                        }}
-                    }})
-                    .catch(error => {{
-                        const configDiv = document.getElementById('config-content');
-                        configDiv.innerHTML = '<p style="color:red">请求失败: ' + error + '</p>';
-                    }});
-                }}
             </script>
         </head>
         <body>
@@ -484,7 +439,6 @@ def index():
                 <div class="debug-section">
                     <h3>调试选项</h3>
                     <button class="button" onclick="viewConfig()">查看当前配置文件</button>
-                    <button class="button" onclick="viewRawConfig()">查看原始订阅内容</button>
                     <button class="button danger" onclick="if(confirm('确定要清理配置并重启服务吗？此操作不可逆！')) requestWithApiKey('/debug/clean')">清理配置并重启</button>
                     <div id="config-content" style="margin-top: 15px;"></div>
                 </div>

         logger.error(f"读取配置文件时出错: {str(e)}")
         return jsonify({"success": False, "error": str(e)}), 500
 # --- Yacd UI & Clash API 反向代理路由 ---
 @app.route('/ui/')
                         configDiv.innerHTML = '<p style="color:red">请求失败: ' + error + '</p>';
                     }});
                 }}
             </script>
         </head>
         <body>
                 <div class="debug-section">
                     <h3>调试选项</h3>
                     <button class="button" onclick="viewConfig()">查看当前配置文件</button>
                     <button class="button danger" onclick="if(confirm('确定要清理配置并重启服务吗？此操作不可逆！')) requestWithApiKey('/debug/clean')">清理配置并重启</button>
                     <div id="config-content" style="margin-top: 15px;"></div>
                 </div>

app/sub_manager.py CHANGED Viewed

@@ -303,10 +303,7 @@ secret: ""
                 config_content = "secret: ''\n" + config_content
                 has_patch = True
-            # 确保配置了全局策略组 - 使用简单的文本检查
-            has_proxy_groups = "proxy-groups:" in config_content
-            has_global_group = "GLOBAL" in config_content or "- name: GLOBAL" in config_content
             try:
                 import yaml
                 logger.info("正在使用PyYAML解析和修复配置")
@@ -314,182 +311,183 @@ secret: ""
                 # 解析配置
                 config_yaml = yaml.safe_load(config_content)
-                # 检查是否有代理和代理组
-                if config_yaml and isinstance(config_yaml, dict):
-                    # 确保proxies存在并且是一个有效的列表
-                    if "proxies" not in config_yaml or not isinstance(config_yaml["proxies"], list):
-                        logger.warning("配置中未找到有效的proxies列表，尝试保留原始内容")
-                    # 即使没有proxy-groups，也先保留所有已有的proxies
-                    if "proxies" in config_yaml and isinstance(config_yaml["proxies"], list):
-                        proxies_list = config_yaml["proxies"]
-                        # 收集所有代理节点名称
                         proxy_names = set()
                         for proxy in proxies_list:
                             if isinstance(proxy, dict) and "name" in proxy:
                                 proxy_names.add(proxy["name"])
-                        logger.info(f"找到 {len(proxy_names)} 个代理节点")
-                        # 添加内置代理
-                        proxy_names.add("DIRECT")
-                        proxy_names.add("REJECT")
-                        # 检查并固定proxy-groups
-                        if "proxy-groups" in config_yaml and isinstance(config_yaml["proxy-groups"], list):
-                            groups_fixed = False
-                            for group in config_yaml["proxy-groups"]:
-                                if isinstance(group, dict) and "proxies" in group and "name" in group:
-                                    group_name = group["name"]
-                                    # 检查group["proxies"]中哪些是无效引用
-                                    invalid_proxies = []
-                                    valid_proxies = []
-                                    for proxy in group["proxies"]:
-                                        if proxy in proxy_names or proxy == group_name:
-                                            valid_proxies.append(proxy)
-                                        else:
-                                            logger.warning(f"删除代理组 {group_name} 中的无效引用: {proxy}")
-                                            invalid_proxies.append(proxy)
-                                            groups_fixed = True
-                                    # 确保代理组至少有一个有效代理
-                                    if not valid_proxies:
-                                        valid_proxies.append("DIRECT")
-                                        logger.warning(f"为空代理组 {group_name} 添加默认代理: DIRECT")
-                                        groups_fixed = True
-                                    group["proxies"] = valid_proxies
-                            # 检查是否有GLOBAL组，如果没有，添加一个
-                            has_global = False
-                            for group in config_yaml["proxy-groups"]:
-                                if isinstance(group, dict) and group.get("name") == "GLOBAL":
-                                    has_global = True
-                                    break
-                            if not has_global:
-                                # 添加GLOBAL策略组
-                                logger.info("添加GLOBAL策略组")
-                                # 确定要放入GLOBAL组的代理
-                                global_proxies = ["DIRECT"]
-                                # 从代理节点和其他策略组中选择要添加到GLOBAL的项
-                                # 优先添加策略组
-                                for group in config_yaml["proxy-groups"]:
-                                    if isinstance(group, dict) and "name" in group:
-                                        group_name = group["name"]
-                                        if group_name != "GLOBAL":
-                                            global_proxies.append(group_name)
-                                # 如果没有其他策略组，添加所有代理节点
-                                if len(global_proxies) <= 1:  # 只有DIRECT
-                                    for proxy_name in proxy_names:
-                                        if proxy_name != "DIRECT" and proxy_name != "REJECT":
-                                            global_proxies.append(proxy_name)
-                                # 添加GLOBAL组到配置
-                                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
-                        # 如果没有proxy-groups，添加基本的proxy-groups
-                        elif not "proxy-groups" in config_yaml:
-                            # 添加GLOBAL策略组
-                            logger.info("添加GLOBAL策略组")
-                            # 确定要放入GLOBAL组的代理
-                            global_proxies = ["DIRECT"]
-                            # 如果有代理节点，添加所有代理节点
-                            for proxy_name in proxy_names:
-                                if proxy_name != "DIRECT" and proxy_name != "REJECT":
-                                    global_proxies.append(proxy_name)
-                            # 添加proxy-groups到配置
                             config_yaml["proxy-groups"] = [{
                                 "name": "GLOBAL",
                                 "type": "select",
-                                "proxies": global_proxies
                             }]
-                            config_content = yaml.dump(config_yaml, sort_keys=False, allow_unicode=True)
                             has_patch = True
-                    # 如果既没有proxies也没有proxy-groups，添加基本配置
-                    elif "proxies" not in config_yaml and "proxy-groups" not in config_yaml:
-                        # 可能不是Clash配置或非常基础的配置
-                        logger.warning("配置中未找到proxies和proxy-groups，添加基本配置")
-                        config_yaml["proxies"] = [{"name": "DIRECT", "type": "direct"}]
-                        config_yaml["proxy-groups"] = [{
                             "name": "GLOBAL",
                             "type": "select",
-                            "proxies": ["DIRECT"]
-                        }]
-                        config_content = yaml.dump(config_yaml, sort_keys=False, allow_unicode=True)
-                        has_patch = True
-                else:
-                    # 无法解析为有效的YAML，尝试简单文本修复
-                    logger.warning("配置无法解析为有效的YAML，使用简单文本修复")
-                    if not has_proxy_groups and not has_global_group:
-                        logger.info("未检测到proxy-groups或GLOBAL策略组，添加基本的GLOBAL策略组")
-                        config_content += """
-proxy-groups:
-  - name: GLOBAL
-    type: select
-    proxies:
-      - DIRECT
-"""
                         has_patch = True
-                    else:
-                        logger.info("检测到已有proxy-groups或GLOBAL配置，跳过添加")
             except ImportError as e:
-                logger.error(f"导入PyYAML模块失败: {str(e)}")
-                # 回退到简单的文本检查
                 if not has_proxy_groups and not has_global_group:
                     logger.info("未检测到proxy-groups或GLOBAL策略组，添加基本的GLOBAL策略组")
-                    config_content += """
-proxy-groups:
-  - name: GLOBAL
-    type: select
-    proxies:
-      - DIRECT
-"""
                     has_patch = True
                 else:
                     logger.info("检测到已有proxy-groups或GLOBAL配置，跳过添加")
             except Exception as yaml_err:
-                logger.error(f"处理YAML配置时出错: {str(yaml_err)}")
-                # 回退到简单的文本检查
                 if not has_proxy_groups and not has_global_group:
                     logger.info("未检测到proxy-groups或GLOBAL策略组，添加基本的GLOBAL策略组")
-                    config_content += """
-proxy-groups:
-  - name: GLOBAL
-    type: select
-    proxies:
-      - DIRECT
-"""
                     has_patch = True
                 else:
                     logger.info("检测到已有proxy-groups或GLOBAL配置，跳过添加")
-            # 如果我们修改了配置，保存回文件
             if has_patch:
-                with open(self.config_path, "w", encoding="utf-8") as f:
-                    f.write(config_content)
-                logger.info("已修补配置文件以添加必要的设置")
         except Exception as e:
-            logger.error(f"修补配置文件时出错: {str(e)}")
     def _mask_url(self, url):
         """

                 config_content = "secret: ''\n" + config_content
                 has_patch = True
+            # 尝试解析YAML并修复代理组引用问题
             try:
                 import yaml
                 logger.info("正在使用PyYAML解析和修复配置")
                 # 解析配置
                 config_yaml = yaml.safe_load(config_content)
+                # 检查解析结果是否为有效字典
+                if not isinstance(config_yaml, dict):
+                    logger.error("配置文件解析结果不是有效的YAML字典，无法进行修复")
+                    # 使用简单的文本分析，避免添加重复的配置
+                    has_proxy_groups = "proxy-groups:" in config_content
+                    has_global_group = "GLOBAL" in config_content or "- name: GLOBAL" in config_content
+                    if not has_proxy_groups and not has_global_group:
+                        logger.info("未检测到proxy-groups或GLOBAL策略组，添加基本的GLOBAL策略组")
+                        config_content += "\nproxy-groups:\n  - name: GLOBAL\n    type: select\n    proxies:\n      - DIRECT\n"
+                        has_patch = True
+                    else:
+                        logger.info("检测到已有proxy-groups或GLOBAL配置，跳过添加")
+                else:
+                    # --- 开始修复逻辑 ---
+                    groups_fixed = False
+                    proxies_list = config_yaml.get("proxies")
+                    # 1. 检查代理列表是否有效
+                    if not proxies_list or not isinstance(proxies_list, list):
+                        logger.error("配置文件缺少有效的 'proxies' 列表或列表为空！将仅使用 DIRECT 代理。请检查原始订阅内容。")
+                        # 设置一个最小化的 proxies 和 proxy-groups
+                        config_yaml["proxies"] = [{"name": "DIRECT", "type": "direct"}]
+                        config_yaml["proxy-groups"] = [{
+                            "name": "GLOBAL",
+                            "type": "select",
+                            "proxies": ["DIRECT"]
+                        }]
+                        proxy_names = {"DIRECT", "REJECT"}
+                        groups_fixed = True # 标记需要重新生成配置内容
+                        has_patch = True
+                    else:
+                        # 2. 代理列表有效，获取所有代理节点名称
                         proxy_names = set()
+                        valid_proxies_list = []
                         for proxy in proxies_list:
                             if isinstance(proxy, dict) and "name" in proxy:
                                 proxy_names.add(proxy["name"])
+                                valid_proxies_list.append(proxy) # 只保留有效的代理定义
+                            else:
+                                logger.warning(f"配置文件中的 'proxies' 列表包含无效条目: {proxy}")
+                        # 如果所有条目都无效，则回退
+                        if not valid_proxies_list:
+                            logger.error("配置文件中的 'proxies' 列表所有条目均无效！将仅使用 DIRECT 代理。")
+                            config_yaml["proxies"] = [{"name": "DIRECT", "type": "direct"}]
                             config_yaml["proxy-groups"] = [{
                                 "name": "GLOBAL",
                                 "type": "select",
+                                "proxies": ["DIRECT"]
                             }]
+                            proxy_names = {"DIRECT", "REJECT"}
+                            groups_fixed = True
                             has_patch = True
+                        else:
+                            config_yaml["proxies"] = valid_proxies_list # 更新为仅包含有效代理的列表
+                            # 添加内置代理
+                            proxy_names.add("DIRECT")
+                            proxy_names.add("REJECT")
+                    # 3. 修复或添加代理组
+                    proxy_groups = config_yaml.get("proxy-groups", [])
+                    if not isinstance(proxy_groups, list):
+                        logger.warning("'proxy-groups' 不是一个列表，将重新创建")
+                        proxy_groups = []
+                        config_yaml["proxy-groups"] = proxy_groups
+                        groups_fixed = True
+                    has_global = False
+                    valid_groups = []
+                    for group in proxy_groups:
+                        if not isinstance(group, dict) or "name" not in group or "type" not in group:
+                            logger.warning(f"'proxy-groups' 中包含无效组定义: {group}")
+                            groups_fixed = True
+                            continue # 跳过无效组
+                        if "proxies" in group:
+                            if not isinstance(group["proxies"], list):
+                                logger.warning(f"代理组 '{group['name']}' 的 'proxies' 不是列表，设置为 ['DIRECT']")
+                                group["proxies"] = ["DIRECT"]
+                                groups_fixed = True
+                            else:
+                                # 删除组中引用的不存在的代理
+                                original_group_proxies = group["proxies"].copy()
+                                group["proxies"] = [p for p in group["proxies"] if p in proxy_names or p == group["name"]]
+                                if len(group["proxies"]) != len(original_group_proxies):
+                                    removed = set(original_group_proxies) - set(group["proxies"])
+                                    if removed:
+                                        logger.warning(f"删除代理组 '{group['name']}' 中的无效引用: {', '.join(removed)}")
+                                        groups_fixed = True
+                                # 确保代理组至少有一个有效代理
+                                if not group["proxies"]:
+                                    logger.warning(f"为空代理组 '{group['name']}' 添加默认代理: DIRECT")
+                                    group["proxies"].append("DIRECT")
+                                    groups_fixed = True
+                        else:
+                             # 如果组定义没有proxies列表（例如 url-test），通常是正常的
+                             pass
+                        valid_groups.append(group)
+                        if group["name"] == "GLOBAL":
+                            has_global = True
+                    # 更新为只包含有效组定义的列表
+                    config_yaml["proxy-groups"] = valid_groups
+                    # 4. 如果没有 GLOBAL 组，添加一个
+                    if not has_global:
+                        logger.info("添加 GLOBAL 策略组")
+                        # 确定要放入 GLOBAL 组的代理 (所有已知真实代理 + DIRECT)
+                        global_proxies = [p for p in proxy_names if p not in ("DIRECT", "REJECT")]
+                        global_proxies.sort() # 可选：排序
+                        global_proxies.insert(0, "DIRECT") # 将 DIRECT 放前面
+                        config_yaml["proxy-groups"].insert(0, {
                             "name": "GLOBAL",
                             "type": "select",
+                            "proxies": global_proxies
+                        })
+                        groups_fixed = True
                         has_patch = True
+                    # 5. 如果进行了修复，重新序列化 YAML
+                    if groups_fixed:
+                        try:
+                            config_content = yaml.dump(config_yaml, sort_keys=False, allow_unicode=True, default_flow_style=None)
+                            has_patch = True # 确保标记为已修改
+                        except Exception as dump_err:
+                            logger.error(f"重新序列化 YAML 失败: {dump_err}")
+                            # 序列化失败，放弃修复，依赖原始 content + 基础 patch
+                            # 重新读取原始content，只应用基础patch
+                            with open(self.config_path, "r", encoding="utf-8") as f:
+                                config_content = f.read()
+                            if "mixed-port:" not in config_content and "port:" not in config_content: config_content = "mixed-port: 7890\n" + config_content
+                            if "external-controller:" not in config_content: config_content = "external-controller: 127.0.0.1:9090\n" + config_content
+                            if "find-process-mode:" not in config_content: config_content = "find-process-mode: strict\n" + config_content
+                            if "secret:" not in config_content: config_content = "secret: ''\n" + config_content
+                            has_patch = True # 标记基础 patch 已应用
+            # --- 处理 YAML 导入或解析错误的回退逻辑 ---
             except ImportError as e:
+                logger.error(f"导入PyYAML模块失败: {str(e)}. 无法执行详细配置修复。")
+                # 使用简单的文本分析，避免添加重复的配置
+                has_proxy_groups = "proxy-groups:" in config_content
+                has_global_group = "GLOBAL" in config_content or "- name: GLOBAL" in config_content
                 if not has_proxy_groups and not has_global_group:
                     logger.info("未检测到proxy-groups或GLOBAL策略组，添加基本的GLOBAL策略组")
+                    config_content += "\nproxy-groups:\n  - name: GLOBAL\n    type: select\n    proxies:\n      - DIRECT\n"
                     has_patch = True
                 else:
                     logger.info("检测到已有proxy-groups或GLOBAL配置，跳过添加")
             except Exception as yaml_err:
+                logger.error(f"处理YAML配置时出错: {str(yaml_err)}. 无法执行详细配置修复。")
+                # 使用简单的文本分析，避免添加重复的配置
+                has_proxy_groups = "proxy-groups:" in config_content
+                has_global_group = "GLOBAL" in config_content or "- name: GLOBAL" in config_content
                 if not has_proxy_groups and not has_global_group:
                     logger.info("未检测到proxy-groups或GLOBAL策略组，添加基本的GLOBAL策略组")
+                    config_content += "\nproxy-groups:\n  - name: GLOBAL\n    type: select\n    proxies:\n      - DIRECT\n"
                     has_patch = True
                 else:
                     logger.info("检测到已有proxy-groups或GLOBAL配置，跳过添加")
+            # --- 写回文件 ---
             if has_patch:
+                logger.info("检测到配置更改，正在写回文件...")
+                try:
+                    with open(self.config_path, "w", encoding="utf-8") as f:
+                        f.write(config_content)
+                    logger.info("已修补配置文件并成功保存")
+                except Exception as write_err:
+                     logger.error(f"写回配置文件失败: {write_err}")
+            else:
+                logger.info("配置文件无需修补")
         except Exception as e:
+            logger.error(f"修补配置文件过程中发生意外错误: {str(e)}")
     def _mask_url(self, url):
         """