Upload 17 files

Dockerfile

@@ -16,7 +16,11 @@ RUN apk add --no-cache \
     musl-dev \
     libffi-dev \
     yaml-dev \
-    py3-yaml
+    py3-yaml \
+    # 添加调试工具
+    file \
+    ldd \
+    strace
     # 不再需要 build-base，因为不再编译 PyYAML
 
 # 设置时区为亚洲/上海
@@ -35,6 +39,10 @@ RUN echo "Downloading Clash Meta..." && \
     gunzip -c /tmp/clash-meta.gz > ./clash_core/clash.meta-linux-amd64 && \
     echo "Setting Clash Meta permissions..." && \
     chmod +x ./clash_core/clash.meta-linux-amd64 && \
+    # 确保Linux可执行属性已设置
+    ls -la ./clash_core/clash.meta-linux-amd64 && \
+    # 显示文件类型
+    file ./clash_core/clash.meta-linux-amd64 && \
     echo "Verifying Clash Meta exists..." && \
     test -f ./clash_core/clash.meta-linux-amd64 && \
     echo "Cleaning up Clash Meta download..." && \
@@ -47,6 +55,10 @@ RUN echo "Downloading subconverter..." && \
     tar -xzf /tmp/subconverter.tar.gz -C ./subconverter --strip-components=1 && \
     echo "Setting subconverter permissions..." && \
     chmod +x ./subconverter/subconverter && \
+    # 确保Linux可执行属性已设置
+    ls -la ./subconverter/subconverter && \
+    # 显示文件类型
+    file ./subconverter/subconverter && \
     echo "Verifying subconverter exists..." && \
     test -f ./subconverter/subconverter && \
     echo "Cleaning up subconverter download..." && \

app.py

@@ -18,20 +18,45 @@ def setup_environment():
     except Exception as e:
         print(f"⚠️ 创建数据目录失败: {str(e)}")
     
-    # 尝试设置执行权限，但允许失败
-    try:
-        if os.path.exists("subconverter/subconverter"):
-            os.chmod("subconverter/subconverter", 0o755)
-            print("✅ subconverter权限已设置")
-    except Exception as e:
-        print(f"⚠️ 设置subconverter权限失败: {str(e)}")
+    # 打印环境诊断信息
+    print("🔍 系统信息:")
+    print(f"  - Python: {sys.version}")
+    print(f"  - 工作目录: {os.getcwd()}")
+    print(f"  - 用户: {os.getuid() if hasattr(os, 'getuid') else 'N/A'}")
     
-    try:
-        if os.path.exists("clash_core/clash.meta-linux-amd64"):
-            os.chmod("clash_core/clash.meta-linux-amd64", 0o755)
-            print("✅ Clash Core权限已设置")
-    except Exception as e:
-        print(f"⚠️ 设置Clash Core权限失败: {str(e)}")
+    # 检查二进制文件
+    for binary in ["subconverter/subconverter", "clash_core/clash.meta-linux-amd64"]:
+        if os.path.exists(binary):
+            try:
+                # 文件信息
+                print(f"✅ 发现二进制文件: {binary}")
+                print(f"  - 大小: {os.path.getsize(binary)} 字节")
+                print(f"  - 权限: {oct(os.stat(binary).st_mode)[-3:]}")
+                print(f"  - 可执行: {os.access(binary, os.X_OK)}")
+                
+                # 尝试获取文件类型
+                try:
+                    file_type = subprocess.check_output(["file", binary], universal_newlines=True)
+                    print(f"  - 类型: {file_type.strip()}")
+                except Exception as e:
+                    print(f"  - 获取文件类型失败: {str(e)}")
+                
+                # 设置执行权限
+                os.chmod(binary, 0o755)
+                print(f"✅ {binary}权限已设置")
+            except Exception as e:
+                print(f"⚠️ 检查{binary}时出错: {str(e)}")
+        else:
+            print(f"❌ 找不到二进制文件: {binary}")
+    
+    # 尝试执行 Clash 来获取版本信息
+    clash_path = "clash_core/clash.meta-linux-amd64"
+    if os.path.exists(clash_path):
+        try:
+            version_output = subprocess.check_output([clash_path, "-v"], stderr=subprocess.STDOUT, universal_newlines=True, timeout=2)
+            print(f"✅ Clash版本信息: {version_output.strip()}")
+        except Exception as e:
+            print(f"⚠️ 获取Clash版本信息失败: {str(e)}")
     
     # 设置环境变量
     os.environ["FLASK_PORT"] = "7860"  # HF Spaces 要求的端口

app/clash_manager.py

@@ -12,6 +12,7 @@ import logging
 import subprocess
 import requests
 import json
+from .debug_tools import run_debug_diagnostics
 
 logger = logging.getLogger(__name__)
 
@@ -68,6 +69,20 @@ class ClashManager:
         # 验证配置文件内容
         self._validate_config_file()
         
+        # 运行调试诊断
+        logger.info("运行环境诊断...")
+        try:
+            diagnostics = run_debug_diagnostics(self.clash_path, self.config_path)
+            if not diagnostics.get("clash_binary", {}).get("is_executable", False):
+                logger.warning("Clash Core不是可执行文件，尝试设置执行权限")
+                try:
+                    os.chmod(self.clash_path, 0o755)
+                    logger.info("已设置执行权限")
+                except Exception as e:
+                    logger.error(f"设置执行权限失败: {str(e)}")
+        except Exception as e:
+            logger.error(f"运行诊断时出错: {str(e)}")
+        
         # 设置Clash命令行参数 (兼容Clash Meta)
         cmd = [
             self.clash_path,
@@ -91,28 +106,86 @@ class ClashManager:
         
         # 启动Clash进程
         logger.info(f"正在启动Clash Core: {' '.join(cmd)}")
-        self.clash_process = subprocess.Popen(
-            cmd,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            universal_newlines=True
-        )
         
-        # 等待Clash启动
-        time.sleep(2)
+        # 首先尝试检查Clash可执行文件是否存在并且可执行
+        if not os.path.exists(self.clash_path):
+            raise FileNotFoundError(f"Clash可执行文件未找到: {self.clash_path}")
         
-        # 检查进程是否成功启动
-        if self.clash_process.poll() is not None:
-            stderr = self.clash_process.stderr.read()
-            raise RuntimeError(f"Clash启动失败: {stderr}")
-        
-        # 验证API是否可访问
+        # 检查Clash文件是否有执行权限
         try:
-            self._call_api("GET", "/version")
-            logger.info("Clash API已就绪")
+            # 尝试设置执行权限
+            os.chmod(self.clash_path, 0o755)
+            logger.info(f"已设置Clash Core的执行权限")
         except Exception as e:
-            self.stop_clash()
-            raise RuntimeError(f"无法连接到Clash API: {str(e)}")
+            logger.warning(f"无法设置执行权限: {str(e)}, 尝试继续执行...")
+        
+        # 启动进程并捕获输出
+        try:
+            self.clash_process = subprocess.Popen(
+                cmd,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                universal_newlines=True
+            )
+            
+            # 等待Clash启动
+            logger.info("等待Clash Core启动...")
+            time.sleep(2)
+            
+            # 检查进程是否成功启动
+            if self.clash_process.poll() is not None:
+                # 如果进程已经退出，获取错误输出
+                stdout, stderr = self.clash_process.communicate()
+                logger.error(f"Clash启动失败，退出代码: {self.clash_process.returncode}")
+                logger.error(f"标准输出: {stdout}")
+                logger.error(f"错误输出: {stderr}")
+                
+                # 如果没有错误输出，尝试读取配置文件周围的日志
+                if not stderr.strip():
+                    try:
+                        # 查看配置文件内容
+                        with open(self.config_path, 'r', encoding='utf-8') as f:
+                            config_content = f.read()
+                        logger.error(f"配置文件内容预览 (前100字符): {config_content[:100]}")
+                    except Exception as file_err:
+                        logger.error(f"读取配置文件失败: {str(file_err)}")
+                
+                # 创建更有意义的错误消息
+                error_message = stderr or stdout or "无错误信息，可能是程序无法执行或立即崩溃"
+                raise RuntimeError(f"Clash启动失败: {error_message}")
+            
+            # 进程仍在运行，验证API是否可访问
+            logger.info("进程仍在运行，验证API...")
+            
+            try:
+                # 尝试多次连接API，有时需要一些时间
+                max_retries = 3
+                for i in range(max_retries):
+                    try:
+                        self._call_api("GET", "/version")
+                        logger.info("Clash API已就绪")
+                        return  # 成功，退出函数
+                    except Exception as api_err:
+                        if i < max_retries - 1:
+                            logger.warning(f"API连接尝试 {i+1}/{max_retries} 失败: {str(api_err)}，重试...")
+                            time.sleep(1)
+                        else:
+                            # 最后一次尝试失败，捕获并记���错误
+                            stdout, stderr = self.clash_process.communicate(timeout=1)
+                            logger.error(f"API连接失败，标准输出: {stdout}")
+                            logger.error(f"API连接失败，错误输出: {stderr}")
+                            # 杀掉进程并抛出异常
+                            self.stop_clash()
+                            raise RuntimeError(f"无法连接到Clash API: {str(api_err)}，进程输出: {stderr or stdout}")
+            except Exception as e:
+                # 捕获其他异常
+                self.stop_clash()
+                raise RuntimeError(f"验证API时出错: {str(e)}")
+                
+        except (subprocess.SubprocessError, OSError) as e:
+            # 进程启动失败
+            logger.error(f"启动Clash进程时出错: {str(e)}")
+            raise RuntimeError(f"无法启动Clash进程: {str(e)}")
     
     def stop_clash(self):
         """停止Clash Core进程"""

app/debug_tools.py

@@ -0,0 +1,177 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+"""
+调试工具 - 用于分析 Clash Core 的运行环境
+"""
+
+import os
+import sys
+import subprocess
+import logging
+import platform
+import json
+
+logger = logging.getLogger(__name__)
+
+def check_binary(binary_path):
+    """检查二进制文件，并返回详细信息"""
+    results = {
+        "path": binary_path,
+        "exists": os.path.exists(binary_path),
+        "size": 0,
+        "permissions": "",
+        "file_type": "",
+        "ldd_output": "",
+        "system_info": get_system_info()
+    }
+    
+    if results["exists"]:
+        try:
+            # 获取文件大小
+            results["size"] = os.path.getsize(binary_path)
+            
+            # 获取文件权限
+            results["permissions"] = oct(os.stat(binary_path).st_mode)[-3:]
+            
+            # 检查是否可执行
+            results["is_executable"] = os.access(binary_path, os.X_OK)
+            
+            # 获取文件类型 (file 命令)
+            try:
+                file_output = subprocess.check_output(["file", binary_path], universal_newlines=True)
+                results["file_type"] = file_output.strip()
+            except Exception as e:
+                results["file_type_error"] = str(e)
+            
+            # 获取库依赖 (ldd 命令)
+            try:
+                ldd_output = subprocess.check_output(["ldd", binary_path], universal_newlines=True)
+                results["ldd_output"] = ldd_output.strip()
+            except Exception as e:
+                results["ldd_error"] = str(e)
+            
+            # 尝试直接执行获取版本或帮助
+            try:
+                version_output = subprocess.check_output([binary_path, "-v"], stderr=subprocess.STDOUT, universal_newlines=True, timeout=2)
+                results["version_output"] = version_output.strip()
+            except Exception as e:
+                results["version_error"] = str(e)
+                
+                # 如果 -v 失败，尝试 --version
+                try:
+                    version_output = subprocess.check_output([binary_path, "--version"], stderr=subprocess.STDOUT, universal_newlines=True, timeout=2)
+                    results["version_output"] = version_output.strip()
+                except Exception as e2:
+                    results["version_error_alt"] = str(e2)
+            
+        except Exception as e:
+            results["error"] = str(e)
+    
+    return results
+
+def get_system_info():
+    """获取系统信息"""
+    info = {
+        "platform": platform.platform(),
+        "system": platform.system(),
+        "release": platform.release(),
+        "version": platform.version(),
+        "architecture": platform.machine(),
+        "python_version": sys.version,
+        "cwd": os.getcwd(),
+        "env": {key: value for key, value in os.environ.items()}
+    }
+    return info
+
+def check_clash_environment(clash_path, config_path):
+    """检查 Clash 运行环境"""
+    results = {
+        "clash_binary": check_binary(clash_path),
+        "config_file": {
+            "path": config_path,
+            "exists": os.path.exists(config_path),
+            "size": 0,
+            "content_preview": ""
+        },
+        "directory_info": {}
+    }
+    
+    # 检查配置文件
+    if results["config_file"]["exists"]:
+        try:
+            results["config_file"]["size"] = os.path.getsize(config_path)
+            with open(config_path, 'r', encoding='utf-8') as f:
+                content = f.read(1000)  # 读取前1000个字符
+                results["config_file"]["content_preview"] = content
+        except Exception as e:
+            results["config_file"]["error"] = str(e)
+    
+    # 检查目录结构
+    dirs_to_check = [
+        os.path.dirname(clash_path),
+        os.path.dirname(config_path),
+        ".",
+        "./data",
+        "./clash_core",
+        "./subconverter"
+    ]
+    
+    for dir_path in dirs_to_check:
+        try:
+            if os.path.exists(dir_path):
+                files = os.listdir(dir_path)
+                results["directory_info"][dir_path] = {
+                    "exists": True,
+                    "files": files,
+                    "permissions": oct(os.stat(dir_path).st_mode)[-3:]
+                }
+            else:
+                results["directory_info"][dir_path] = {
+                    "exists": False
+                }
+        except Exception as e:
+            results["directory_info"][dir_path] = {
+                "error": str(e)
+            }
+    
+    return results
+
+def run_debug_diagnostics(clash_path, config_path):
+    """运行调试诊断，并记录结果"""
+    logger.info("运行调试诊断...")
+    
+    try:
+        results = check_clash_environment(clash_path, config_path)
+        logger.info("诊断完成")
+        
+        # 将结果保存到文件
+        diagnostics_file = "clash_diagnostics.json"
+        with open(diagnostics_file, 'w', encoding='utf-8') as f:
+            json.dump(results, f, indent=2, ensure_ascii=False)
+        logger.info(f"诊断结果已保存到 {diagnostics_file}")
+        
+        # 打印关键信息
+        if results["clash_binary"]["exists"]:
+            logger.info(f"Clash 二进制文件: {results['clash_binary']['path']}")
+            logger.info(f"  - 大小: {results['clash_binary']['size']} 字节")
+            logger.info(f"  - 权限: {results['clash_binary']['permissions']}")
+            logger.info(f"  - 文件类型: {results['clash_binary']['file_type']}")
+            logger.info(f"  - 可执行: {results['clash_binary'].get('is_executable', False)}")
+        else:
+            logger.error(f"Clash 二进制文件不存在: {results['clash_binary']['path']}")
+        
+        if results["config_file"]["exists"]:
+            logger.info(f"配置文件: {results['config_file']['path']}")
+            logger.info(f"  - 大小: {results['config_file']['size']} 字节")
+            preview = results["config_file"].get("content_preview", "")
+            if preview:
+                logger.info(f"  - 内容预览: {preview[:100]}...")
+        else:
+            logger.error(f"配置文件不存在: {results['config_file']['path']}")
+        
+        return results
+    
+    except Exception as e:
+        logger.error(f"诊断过程中出错: {str(e)}")
+        return {"error": str(e)} 

entrypoint.sh

@@ -10,6 +10,24 @@ NC='\033[0m' # No Color
 
 echo "${GREEN}Starting Simple Clash Relay...${NC}"
 
+# 添加诊断信息
+echo "${YELLOW}System information:${NC}"
+uname -a
+echo "${YELLOW}Running as user:${NC}"
+id
+
+echo "${YELLOW}Checking Clash Core:${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"
+
 # 确保数据目录存在
 mkdir -p /app/data || echo "${YELLOW}Warning: Failed to create /app/data directory${NC}"