Upload 21 files

Dockerfile

@@ -34,21 +34,24 @@ RUN mkdir -p ./clash_core ./subconverter ./data && \
     chmod -R 777 ./clash_core && \
     chmod -R 777 ./subconverter
 
-# 下载并安装Clash Meta，保留原始文件名
-RUN echo "Downloading Clash Meta..." && \
-    curl -L -f -o /tmp/clash-meta.gz "https://github.com/MetaCubeX/Clash.Meta/releases/download/v1.16.0/clash.meta-linux-amd64-v1.16.0.gz" && \
-    echo "Extracting 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..." && \
-    rm /tmp/clash-meta.gz
+# Download Clash Meta Core
+# Check https://github.com/MetaCubeX/Clash.Meta/releases for latest versions and architectures
+ARG CLASH_META_VERSION="v1.18.0" # Or specific version like v1.18.0
+ARG TARGETARCH
+
+# Determine Clash binary URL based on architecture
+RUN if [ "${TARGETARCH}" = "amd64" ]; then \
+        CLASH_URL="https://github.com/MetaCubeX/Clash.Meta/releases/download/${CLASH_META_VERSION}/clash.meta-linux-amd64-${CLASH_META_VERSION}.gz"; \
+    elif [ "${TARGETARCH}" = "arm64" ]; then \
+        CLASH_URL="https://github.com/MetaCubeX/Clash.Meta/releases/download/${CLASH_META_VERSION}/clash.meta-linux-arm64-${CLASH_META_VERSION}.gz"; \
+    else \
+        echo "Unsupported architecture: ${TARGETARCH}" && exit 1; \
+    fi && \
+    echo "Downloading Clash Meta Core from ${CLASH_URL}" && \
+    curl -sSL ${CLASH_URL} -o clash.meta.gz && \
+    gzip -d clash.meta.gz && \
+    mv clash.meta /app/clash_core/clash.meta-linux-${TARGETARCH} && \
+    chmod +x /app/clash_core/clash.meta-linux-${TARGETARCH} # Add execute permission here
 
 # 下载并完整解压subconverter
 RUN echo "Downloading subconverter..." && \
@@ -83,21 +86,12 @@ RUN echo "Installing Python dependencies..." && \
 # 可选：删除构建依赖以减小镜像体积
 RUN apk del python3-dev musl-dev libffi-dev yaml-dev
 
-# 下载并准备 Yacd UI 文件 (从 Yacd-meta 的 gh-pages 分支)
-RUN echo "Downloading Yacd-meta UI (gh-pages branch)..." && \
-    YACD_DIR=/app/app/static/yacd && \
-    mkdir -p ${YACD_DIR} && \
-    # 下载 gh-pages 分支的 zip 压缩包
-    curl -L -f -o /tmp/yacd-gh-pages.zip "https://github.com/MetaCubeX/Yacd-meta/archive/refs/heads/gh-pages.zip" && \
-    echo "Extracting Yacd-meta UI (gh-pages)..." && \
-    # 解压到临时目录
-    unzip -q /tmp/yacd-gh-pages.zip -d /tmp && \
-    # 将解压后的 gh-pages 目录下的 *所有内容* 移动到目标位置
-    # 注意：解压后的文件夹名通常是 {repo_name}-{branch_name}，即 Yacd-meta-gh-pages
-    mv /tmp/Yacd-meta-gh-pages/* ${YACD_DIR}/ && \
-    echo "Cleaning up Yacd-meta download..." && \
-    rm /tmp/yacd-gh-pages.zip && \
-    rm -rf /tmp/Yacd-meta-gh-pages
+# Download Yacd UI (gh-pages branch)
+RUN echo "Downloading Yacd UI from gh-pages branch..." && \
+    curl -sSL https://github.com/MetaCubeX/Yacd-meta/archive/gh-pages.tar.gz -o yacd.tar.gz && \
+    mkdir -p /app/static/yacd && \
+    tar -xzf yacd.tar.gz --strip-components=1 -C /app/static/yacd && \
+    rm yacd.tar.gz
 
 # 设置环境变量
 ENV PYTHONDONTWRITEBYTECODE=1 \
@@ -117,7 +111,7 @@ COPY entrypoint.sh ./
 RUN chmod +x ./entrypoint.sh
 
 # 给脚本和二进制文件执行权限 (重复的chmod可能不需要，但在构建阶段设置更安全)
-RUN chmod +x ./clash_core/clash.meta-linux-amd64 || true
+RUN chmod +x ./clash_core/clash.meta-linux-${TARGETARCH} || true
 RUN chmod +x ./subconverter/subconverter || true
 
 # 暴露端口

app/main.py

@@ -13,6 +13,7 @@ from .sub_manager import SubscriptionManager
 from .auth import authenticate
 import requests
 from functools import wraps
+from threading import Lock
 
 # 配置日志
 logging.basicConfig(
@@ -21,21 +22,109 @@ logging.basicConfig(
 )
 logger = logging.getLogger(__name__)
 
-# 从环境变量加载配置
-SUB_URL = os.environ.get("SUB_URL")
-API_KEY = os.environ.get("API_KEY", "changeme")
+# --- 全局变量 ---
+clash_manager = None
+sub_manager = None
+initialization_error = "尚未初始化" # 初始状态
+API_KEY = os.environ.get("API_KEY", "changeme") # 从环境变量获取API密钥，默认changeme
+SUB_URL = os.environ.get("SUB_URL") # 从环境变量获取订阅链接
 FLASK_PORT = int(os.environ.get("FLASK_PORT", 7860))  # 默认端口改为7860
 CLASH_PROXY_PORT = int(os.environ.get("CLASH_PROXY_PORT", 7890))
 CLASH_API_PORT = int(os.environ.get("CLASH_API_PORT", 9090))
 
+# 基础路径
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+DATA_DIR = os.path.join(BASE_DIR, "data")
+CLASH_CORE_DIR = os.path.join(BASE_DIR, "clash_core")
+CONFIG_PATH = os.path.join(DATA_DIR, "config.yaml")
+RAW_CONFIG_PATH = f"{CONFIG_PATH}.raw"
+CLASH_BINARY_PATH = os.path.join(CLASH_CORE_DIR, "clash.meta-linux-amd64") # 根据实际文件名调整
+
+# 确保目录存在
+os.makedirs(DATA_DIR, exist_ok=True)
+os.makedirs(CLASH_CORE_DIR, exist_ok=True)
+
+class InitializationManager:
+    def __init__(self):
+        self._initialized = False
+        self._lock = Lock()
+
+    def __call__(self):
+        global clash_manager, sub_manager, initialization_error
+        
+        # 使用锁确保只初始化一次
+        with self._lock:
+            if self._initialized:
+                return # 如果已经初始化，直接返回
+            
+            logger.info("正在初始化应用 (首次请求或重新初始化)...")
+            initialization_error = "正在初始化..." # 设置状态
+
+            try:
+                # 优先检查本地配置文件是否存在
+                if os.path.exists(CONFIG_PATH):
+                    logger.info(f"找到本地配置文件: {CONFIG_PATH}，优先使用此配置")
+                    try:
+                        # 验证并可能需要修补现有配置
+                        temp_sub_manager = SubscriptionManager(config_path=CONFIG_PATH)
+                        temp_sub_manager._patch_config() # 确保端口等设置正确
+                        logger.info("已检查并修补本地配置文件")
+                        
+                        # 使用本地配置启动Clash
+                        clash_manager = ClashManager(
+                            config_path=CONFIG_PATH,
+                            clash_path=CLASH_BINARY_PATH,
+                            api_port=CLASH_API_PORT,
+                            proxy_port=CLASH_PROXY_PORT
+                        )
+                        clash_manager.start_clash()
+                        initialization_error = None # 初始化成功
+                        self._initialized = True
+                        logger.info("使用本地配置成功初始化并启动Clash")
+                        return # 初始化成功，退出
+                    except Exception as e:
+                        error_msg = f"使用本地配置文件启动Clash失败: {str(e)}"
+                        logger.error(error_msg)
+                        initialization_error = error_msg
+                        # 不要在这里返回，继续尝试下载订阅（如果提供了URL）
+
+                # 如果本地配置不存在或启动失败，并且提供了订阅URL，则尝试下载
+                if SUB_URL:
+                    logger.info("未找到本地配置或启动失败，尝试从订阅URL加载...")
+                    sub_manager = SubscriptionManager(sub_url=SUB_URL, config_path=CONFIG_PATH)
+                    sub_manager.load_and_convert_sub() # 下载并转换
+                    
+                    clash_manager = ClashManager(
+                        config_path=CONFIG_PATH,
+                        clash_path=CLASH_BINARY_PATH,
+                        api_port=CLASH_API_PORT,
+                        proxy_port=CLASH_PROXY_PORT
+                    )
+                    clash_manager.start_clash()
+                    initialization_error = None # 初始化成功
+                    logger.info("成功从订阅URL初始化并启动Clash")
+                
+                # 如果没有本地配置，也没有提供订阅URL
+                elif not os.path.exists(CONFIG_PATH):
+                    error_msg = "初始化失败：未找到本地 config.yaml 且未设置 SUB_URL 环境变量"
+                    logger.error(error_msg)
+                    initialization_error = error_msg
+                
+                # 如果走到这里，表示初始化完成（可能成功也可能失败）
+                self._initialized = True
+
+            except Exception as e:
+                error_msg = f"应用初始化过程中���生严重错误: {str(e)}"
+                logger.exception(error_msg) # 使用exception记录堆栈信息
+                initialization_error = error_msg
+                # 即使失败，也标记为已尝试初始化，避免无限重试
+                self._initialized = True
+
+initialize_once = InitializationManager()
+
 # 初始化Flask应用
 app = Flask(__name__, static_folder='static')
 
-# 初始化管理器
-clash_manager = None
-sub_manager = None
-initialization_error = None
-
 @app.before_request
 def initialize_once():
     """应用首次请求前的初始化"""