Upload 17 files

app/main.py

@@ -225,6 +225,83 @@ def proxy_root():
     """处理根代理请求"""
     return proxy_request("")
 
+@app.route("/debug/clean", methods=["POST"])
+@authenticate
+def debug_clean():
+    """清理并重新初始化配置"""
+    global clash_manager, sub_manager, initialization_error
+    
+    try:
+        # 停止Clash（如果正在运行）
+        if clash_manager is not None:
+            clash_manager.stop_clash()
+            clash_manager = None
+        
+        # 删除配置文件
+        config_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), "data", "config.yaml")
+        raw_config_path = f"{config_path}.raw"
+        
+        files_to_delete = [config_path, raw_config_path]
+        deleted_files = []
+        
+        for file_path in files_to_delete:
+            if os.path.exists(file_path):
+                try:
+                    os.remove(file_path)
+                    deleted_files.append(file_path)
+                except Exception as e:
+                    logger.error(f"删除文件 {file_path} 失败: {str(e)}")
+        
+        # 重新初始化
+        sub_manager = SubscriptionManager(
+            sub_url=SUB_URL,
+            config_path=config_path
+        )
+        
+        # 加载订阅并转换为Clash配置
+        sub_manager.load_and_convert_sub()
+        
+        # 初始化Clash管理器
+        clash_manager = ClashManager(
+            config_path=config_path,
+            clash_path=os.path.join(os.path.dirname(os.path.dirname(__file__)), "clash_core", "clash.meta-linux-amd64"),
+            api_port=CLASH_API_PORT,
+            proxy_port=CLASH_PROXY_PORT
+        )
+        
+        # 启动Clash
+        clash_manager.start_clash()
+        initialization_error = None
+        
+        return jsonify({
+            "success": True, 
+            "message": f"配置已清理并重新初始化，删除的文件: {', '.join(deleted_files)}"
+        })
+    
+    except Exception as e:
+        error_msg = f"清理配置失败: {str(e)}"
+        logger.error(error_msg)
+        initialization_error = error_msg
+        return jsonify({"success": False, "error": error_msg}), 500
+
+@app.route("/debug/config", methods=["GET"])
+@authenticate
+def debug_show_config():
+    """显示当前配置文件内容"""
+    config_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), "data", "config.yaml")
+    
+    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:
+        return jsonify({"success": False, "error": f"读取配置文件失败: {str(e)}"}), 500
+
 @app.route('/', methods=['GET'])
 def index():
     """首页 - 提供简单说明"""
@@ -244,7 +321,77 @@ def index():
                 .running {{ background-color: #dff0d8; color: #3c763d; }}
                 .error {{ background-color: #f2dede; color: #a94442; }}
                 .container {{ max-width: 800px; margin: 0 auto; }}
+                .button {{ 
+                    display: inline-block; 
+                    padding: 8px 16px; 
+                    background-color: #337ab7; 
+                    color: white; 
+                    text-decoration: none;
+                    border-radius: 4px;
+                    margin-right: 10px;
+                }}
+                .button.danger {{ background-color: #d9534f; }}
+                .debug-section {{ 
+                    margin-top: 20px; 
+                    padding: 15px; 
+                    border: 1px dashed #ccc; 
+                    background-color: #f9f9f9; 
+                }}
             </style>
+            <script>
+                function cleanConfig() {{
+                    if (confirm('确定要清理配置并重启服务吗？')) {{
+                        fetch('/debug/clean', {{
+                            method: 'POST',
+                            headers: {{ 'X-API-Key': prompt('请输入API密钥') }}
+                        }})
+                        .then(response => response.json())
+                        .then(data => {{
+                            alert(data.success ? data.message : '失败: ' + data.error);
+                            location.reload();
+                        }})
+                        .catch(error => alert('请求失败: ' + error));
+                    }}
+                }}
+                
+                function viewConfig() {{
+                    fetch('/debug/config', {{
+                        headers: {{ 'X-API-Key': prompt('请输入API密钥') }}
+                    }})
+                    .then(response => response.json())
+                    .then(data => {{
+                        if (data.success) {{
+                            const pre = document.createElement('pre');
+                            pre.textContent = data.content;
+                            pre.style.maxHeight = '500px';
+                            pre.style.overflow = 'auto';
+                            pre.style.backgroundColor = '#f5f5f5';
+                            pre.style.padding = '10px';
+                            pre.style.borderRadius = '4px';
+                            
+                            const configDiv = document.getElementById('config-content');
+                            configDiv.innerHTML = '';
+                            configDiv.appendChild(pre);
+                        }} else {{
+                            alert('获取配置失败: ' + data.error);
+                        }}
+                    }})
+                    .catch(error => alert('请求失败: ' + error));
+                }}
+                
+                function refreshSubscription() {{
+                    fetch('/api/refresh', {{
+                        method: 'POST',
+                        headers: {{ 'X-API-Key': prompt('请输入API密钥') }}
+                    }})
+                    .then(response => response.json())
+                    .then(data => {{
+                        alert(data.success ? data.message : '失败: ' + data.error);
+                        location.reload();
+                    }})
+                    .catch(error => alert('请求失败: ' + error));
+                }}
+            </script>
         </head>
         <body>
             <div class='container'>
@@ -258,9 +405,15 @@ def index():
                     <li>健康检查: /health</li>
                 </ul>
                 <h2>操作</h2>
-                <p><a href='/api/refresh'>刷新订阅</a> (需要认证)</p>
-                <p><a href='/api/nodes'>查看可用节点</a> (需要认证)</p>
-                <p><a href='/api/current'>查看当前节点</a> (需要认证)</p>
+                <button class="button" onclick="refreshSubscription()">刷新订阅</button>
+                
+                <div class="debug-section">
+                    <h3>调试选项</h3>
+                    <button class="button" onclick="viewConfig()">查看配置文件</button>
+                    <button class="button danger" onclick="cleanConfig()">清理配置并重启</button>
+                    <div id="config-content" style="margin-top: 15px;"></div>
+                </div>
+                
                 <h2>帮助</h2>
                 <p>更多信息请查看 <a href='https://github.com/yourusername/simple-clash-relay'>文档</a>。</p>
             </div>

app/sub_manager.py

@@ -128,6 +128,20 @@ class SubscriptionManager:
             except Exception as e:
                 logger.error(f"创建数据目录失败: {str(e)}")
         
+        # 尝试直接读取订阅内容，确认它是否已经是Clash配置
+        try:
+            with open(input_file, "r", encoding="utf-8") as f:
+                content = f.read()
+            
+            # 简单检查是否已经是Clash配置
+            if "proxies:" in content and ("port:" in content or "mixed-port:" in content):
+                logger.info("检测到输入文件已是Clash配置格式，直接使用")
+                with open(self.config_path, "w", encoding="utf-8") as f:
+                    f.write(content)
+                return
+        except Exception as e:
+            logger.warning(f"读取输入文件时出错: {str(e)}，将尝试转换")
+        
         # 准备subconverter命令
         cmd = [
             self.subconverter_path,
@@ -177,6 +191,11 @@ class SubscriptionManager:
                 try:
                     with open(input_file, "r", encoding="utf-8") as f:
                         content = f.read()
+                    
+                    # 确保它是有效的配置，如果是普通订阅格式，添加基本的Clash头
+                    if "proxies:" not in content:
+                        content = self._add_clash_headers() + content
+                    
                     with open(self.config_path, "w", encoding="utf-8") as f:
                         f.write(content)
                     logger.warning("尝试直接使用订阅内容作为配置文件")
@@ -213,6 +232,11 @@ class SubscriptionManager:
                         try:
                             with open(input_file, "r", encoding="utf-8") as f:
                                 content = f.read()
+                            
+                            # 确保它是有效的配置，如果是普通订阅格式，添加基本的Clash头
+                            if "proxies:" not in content:
+                                content = self._add_clash_headers() + content
+                                
                             with open(self.config_path, "w", encoding="utf-8") as f:
                                 f.write(content)
                             logger.warning("使用订阅内容作为配置文件")
@@ -224,6 +248,20 @@ class SubscriptionManager:
             logger.error(f"执行subconverter时出错: {str(e)}")
             raise RuntimeError(f"配置转换失败: {str(e)}")
     
+    def _add_clash_headers(self):
+        """添加基本的Clash配置头"""
+        return """# 自动生成的Clash配置
+port: 7890
+socks-port: 7891
+mixed-port: 7890
+allow-lan: true
+mode: Rule
+log-level: info
+external-controller: 127.0.0.1:9090
+secret: ""
+
+"""
+    
     def _patch_config(self):
         """
         修改配置文件以确保端口设置正确，并兼容Clash Meta
@@ -244,23 +282,24 @@ class SubscriptionManager:
             # 这里需要检查配置是否为有效的YAML并进行适当修补
             # 为简单起见，我们只检查和添加一些基本端口配置
             
-            if "port: 7890" not in config_content and "mixed-port: 7890" not in config_content:
+            if "mixed-port:" not in config_content and "port:" not in config_content:
                 # 添加混合端口配置
                 config_content = "mixed-port: 7890\n" + config_content
                 has_patch = True
             
-            if "external-controller: 127.0.0.1:9090" not in config_content and "external-controller: :9090" not in config_content:
+            # 不要添加重复的external-controller配置
+            if "external-controller:" not in config_content:
                 # 添加API控制器配置 (兼容Clash Meta)
                 config_content = "external-controller: 127.0.0.1:9090\n" + config_content
                 has_patch = True
             
             # Clash Meta特定配置
-            if "find-process-mode: strict" not in config_content:
+            if "find-process-mode:" not in config_content:
                 config_content = "find-process-mode: strict\n" + config_content
                 has_patch = True
             
             # 确保启用了API
-            if "secret: " not in config_content:
+            if "secret:" not in config_content:
                 config_content = "secret: ''\n" + config_content
                 has_patch = True
             

entrypoint.sh

@@ -16,17 +16,16 @@ uname -a
 echo "${YELLOW}Running as user:${NC}"
 id
 
-echo "${YELLOW}Checking Clash Core:${NC}"
+echo "${YELLOW}Checking executables:${NC}"
 file /app/clash_core/clash.meta-linux-amd64
 ls -la /app/clash_core/clash.meta-linux-amd64
-echo "${YELLOW}Checking Clash Core dependencies:${NC}"
-ldd /app/clash_core/clash.meta-linux-amd64 || echo "ldd command failed"
-
-echo "${YELLOW}Checking subconverter:${NC}"
-file /app/subconverter/subconverter
-ls -la /app/subconverter/subconverter
-echo "${YELLOW}Checking subconverter dependencies:${NC}"
-ldd /app/subconverter/subconverter || echo "ldd command failed"
+
+# 可选清理旧配置（如果指定CLEAN_CONFIG=true）
+if [ "${CLEAN_CONFIG}" = "true" ]; then
+    echo "${YELLOW}Cleaning old config files...${NC}"
+    rm -f /app/data/config.yaml /app/data/config.yaml.raw
+    echo "${GREEN}Old config files cleaned${NC}"
+fi
 
 # 确保数据目录存在
 mkdir -p /app/data || echo "${YELLOW}Warning: Failed to create /app/data directory${NC}"