Upload 21 files

Dockerfile

@@ -4,25 +4,6 @@ FROM python:3.9-alpine
 # 设置工作目录
 WORKDIR /app
 
-# 添加一个随机标签，强制破坏缓存
-LABEL rebuild=$(date +%s)
-
-# 创建data目录
-RUN mkdir -p ./data
-
-# 立即复制数据目录 - 这是最优先的
-COPY data/ ./data/
-# 添加验证命令
-RUN echo "=== CHECKING CONFIG FILES IN /app/data ===" && \
-    ls -la ./data && \
-    if [ -f "./data/config.yaml" ]; then \
-        echo "CONFIG FILE FOUND AND COPIED SUCCESSFULLY!"; \
-        head -n 5 ./data/config.yaml; \
-    else \
-        echo "ERROR: CONFIG FILE NOT FOUND!"; \
-        exit 1; \
-    fi
-
 # 安装系统依赖
 # 添加 yaml-dev 提供编译PyYAML所需的libyaml
 # 添加 unzip 用于解压 Yacd
@@ -47,8 +28,8 @@ RUN apk add --no-cache \
 # 设置时区为亚洲/上海
 ENV TZ=Asia/Shanghai
 
-# 创建必要的目录并设置权限
-RUN mkdir -p ./clash_core ./subconverter && \
+# 创建必要的目录并设置权限(构建阶段就设置好权限)
+RUN mkdir -p ./clash_core ./subconverter ./data && \
     chmod -R 777 ./data && \
     chmod -R 777 ./clash_core && \
     chmod -R 777 ./subconverter
@@ -129,8 +110,7 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
     FLASK_PORT=7860 \
     CLASH_PROXY_PORT=7890 \
     CLASH_API_PORT=9090 \
-    PORT=7860 \
-    USE_LOCAL_CONFIG=true
+    PORT=7860
 
 # 复制应用代码和静态文件
 COPY app/ ./app/
@@ -139,15 +119,9 @@ COPY app/ ./app/
 COPY entrypoint.sh ./
 RUN chmod +x ./entrypoint.sh
 
-# 再次检查配置文件是否存在 - 确保没被覆盖
-RUN echo "=== FINAL CHECK FOR CONFIG FILES ===" && \
-    ls -la ./data && \
-    if [ -f "./data/config.yaml" ]; then \
-        echo "CONFIG FILE STILL EXISTS - GOOD!"; \
-    else \
-        echo "ERROR: CONFIG FILE MISSING AFTER APP COPY!"; \
-        exit 1; \
-    fi
+# 给脚本和二进制文件执行权限 (重复的chmod可能不需要，但在构建阶段设置更安全)
+RUN chmod +x ./clash_core/clash.meta-linux-amd64 || true
+RUN chmod +x ./subconverter/subconverter || true
 
 # 暴露端口
 EXPOSE $FLASK_PORT $CLASH_PROXY_PORT $CLASH_API_PORT

app/main.py

@@ -39,39 +39,16 @@ initialization_error = None
 @app.before_request
 def initialize_once():
     """应用首次请求前的初始化"""
-    global clash_manager, sub_manager, initialization_error
+    global clash_manager, sub_manager, initialization_error, _initialized
     
     # 使用类变量确保只初始化一次
     if not getattr(initialize_once, '_initialized', False):
         logger.info("正在初始化应用 (首次请求)...")
         
-        config_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), "data", "config.yaml")
-        
-        # 首先检查是否存在有效的本地配置文件
-        if os.path.exists(config_path) and os.path.getsize(config_path) > 0:
-            logger.info("检测到有效的本地配置文件，直接使用它启动Clash")
-            try:
-                # 初始化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 Core
-                clash_manager.start_clash()
-                logger.info("成功使用本地配置文件启动Clash Core")
-                initialize_once._initialized = True
-                return
-            except Exception as e:
-                logger.warning(f"使用本地配置文件启动失败，将尝试从订阅加载: {str(e)}")
-                # 继续尝试从订阅加载
-        
         # 初始化订阅管理器
         sub_manager = SubscriptionManager(
             sub_url=SUB_URL,
-            config_path=config_path
+            config_path=os.path.join(os.path.dirname(os.path.dirname(__file__)), "data", "config.yaml")
         )
         
         # 加载订阅并转换为Clash配置
@@ -87,7 +64,7 @@ def initialize_once():
         
         # 初始化Clash管理器
         clash_manager = ClashManager(
-            config_path=config_path,
+            config_path=os.path.join(os.path.dirname(os.path.dirname(__file__)), "data", "config.yaml"),
             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
@@ -475,44 +452,6 @@ def index():
     </html>
     """
 
-@app.route("/api/use_local_config", methods=["POST"])
-@authenticate
-def use_local_config():
-    """直接使用本地的config.yaml文件，跳过订阅转换"""
-    global clash_manager, sub_manager, initialization_error
-    
-    try:
-        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
-            
-        # 停止当前的Clash服务（如果正在运行）
-        if clash_manager is not None:
-            clash_manager.stop_clash()
-        
-        # 重新初始化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 Core
-        clash_manager.start_clash()
-        initialization_error = None
-        
-        logger.info("成功使用本地配置文件启动Clash Core")
-        return jsonify({"success": True, "message": "已使用本地配置文件启动服务"})
-        
-    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
-
 if __name__ == "__main__":
     # 如果直接运行此文件，将初始化应用并启动Flask服务器
     initialize_once()

entrypoint.sh

@@ -53,24 +53,10 @@ if [ -f ".env" ]; then
     export $(grep -v '^#' .env | xargs -d '\n')
 fi
 
-# 检查是否使用本地配置文件
-if [ "${USE_LOCAL_CONFIG}" = "true" ]; then
-    echo "${GREEN}Using local config.yaml file (skipping subscription)...${NC}"
-    # 检查配置文件是否存在
-    if [ -f "/app/data/config.yaml" ]; then
-        echo "${GREEN}Local config.yaml found${NC}"
-    else
-        echo "${RED}Error: Local config.yaml not found in /app/data/!${NC}"
-        echo "${YELLOW}Please mount your config.yaml to /app/data/config.yaml${NC}"
-        exit 1
-    fi
-else
-    # 检查必要的环境变量
-    if [ -z "$SUB_URL" ]; then
-        echo "${RED}Error: SUB_URL environment variable is not set!${NC}"
-        echo "${YELLOW}Either set SUB_URL or use USE_LOCAL_CONFIG=true${NC}"
-        exit 1
-    fi
+# 检查必要的环境变量
+if [ -z "$SUB_URL" ]; then
+    echo "${RED}Error: SUB_URL environment variable is not set!${NC}"
+    exit 1
 fi
 
 # 设置默认端口
@@ -88,11 +74,7 @@ echo "Environment:"
 echo "FLASK_PORT:        ${FLASK_PORT:-7860}"
 echo "CLASH_PROXY_PORT:  ${CLASH_PROXY_PORT:-7890}"
 echo "CLASH_API_PORT:    ${CLASH_API_PORT:-9090}"
-if [ "${USE_LOCAL_CONFIG}" = "true" ]; then
-    echo "Using local config:  YES"
-else
-    echo "SUB_URL:           [hidden]"
-fi
+echo "SUB_URL:           [hidden]"
 echo "API_KEY:           [hidden]"
 
 # 检查必要的环境变量