Upload 17 files

Dockerfile

@@ -84,6 +84,7 @@ RUN pip install --upgrade pip
 # 安装剩余的Python依赖 (PyYAML 已通过 apk 安装)
 RUN echo "Installing Python dependencies..." && \
     pip install --no-cache-dir -r requirements.txt
+RUN pip install --no-cache-dir pyyaml
 
 # 可选：删除构建依赖以减小镜像体积
 # RUN apk del python3-dev musl-dev libffi-dev yaml-dev

app/sub_manager.py

@@ -304,8 +304,10 @@ secret: ""
                 has_patch = True
             
             # 尝试解析YAML并修复代理组引用问题
+            yaml_available = False
             try:
                 import yaml
+                yaml_available = True
                 
                 # 解析配置
                 config_yaml = yaml.safe_load(config_content)
@@ -394,19 +396,54 @@ secret: ""
                         
                         # 更新配置内容
                         config_content = yaml.dump(config_yaml, sort_keys=False, allow_unicode=True)
+            except ImportError as yaml_err:
+                logger.error(f"解析YAML时出错: {str(yaml_err)}")
             except Exception as yaml_err:
                 logger.error(f"解析YAML时出错: {str(yaml_err)}")
-                # 无法解析YAML，添加基本的GLOBAL策略组
-                if "GLOBAL" not in config_content:
-                    config_content += """
+            
+            # 如果yaml模块不可用，使用简单的文本处理方式
+            if not yaml_available:
+                # 检查配置中是否已经有GLOBAL组
+                global_exists = "name: GLOBAL" in config_content or "GLOBAL" in config_content
+                proxy_groups_exists = "proxy-groups:" in config_content
+                
+                # 只有在没有GLOBAL组且需要添加时才添加
+                if not global_exists:
+                    if proxy_groups_exists:
+                        # 如果已经有proxy-groups部分，不要重复添加proxy-groups键
+                        # 尝试在proxy-groups部分添加GLOBAL组
+                        try:
+                            # 寻找proxy-groups部分
+                            groups_index = config_content.find("proxy-groups:")
+                            if groups_index != -1:
+                                # 找到插入点 - 在proxy-groups行之后
+                                lines = config_content.split("\n")
+                                for i, line in enumerate(lines):
+                                    if line.strip().startswith("proxy-groups:"):
+                                        # 在proxy-groups后面直接添加GLOBAL组
+                                        global_group = """  - name: GLOBAL
+    type: select
+    proxies:
+      - DIRECT"""
+                                        lines.insert(i + 1, global_group)
+                                        config_content = "\n".join(lines)
+                                        has_patch = True
+                                        logger.info("在现有proxy-groups中添加了GLOBAL策略组")
+                                        break
+                        except Exception as e:
+                            logger.error(f"尝试添加GLOBAL组时出错: {str(e)}")
+                    else:
+                        # 如果没有proxy-groups部分，添加完整的部分
+                        global_section = """
 proxy-groups:
   - name: GLOBAL
     type: select
     proxies:
       - DIRECT
 """
-                    has_patch = True
-                    logger.info("添加了基本的GLOBAL策略组")
+                        config_content += global_section
+                        has_patch = True
+                        logger.info("添加了基本的GLOBAL策略组")
             
             # 如果我们修改了配置，保存回文件
             if has_patch:

entrypoint.sh

@@ -1,101 +1,100 @@
-#!/bin/sh
-# 不再使用set -e，避免因chmod失败而中止脚本
-# set -e
+#!/bin/bash
 
-# 设置颜色输出
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-NC='\033[0m' # No Color
+# 彩色输出函数
+function log_info() {
+    echo -e "\033[0;32m$1\033[0m"
+}
 
-echo "${GREEN}Starting Simple Clash Relay...${NC}"
+function log_warning() {
+    echo -e "\033[1;33m$1\033[0m"
+}
 
-# 添加诊断信息
-echo "${YELLOW}System information:${NC}"
+function log_error() {
+    echo -e "\033[0;31m$1\033[0m"
+}
+
+# 打印启动标题
+DATE=$(date "+%Y-%m-%d %H:%M:%S")
+echo "===== Application Startup at $DATE ====="
+echo ""
+log_info "Starting Simple Clash Relay..."
+
+# 打印系统信息
+log_warning "System information:"
 uname -a
-echo "${YELLOW}Running as user:${NC}"
+log_warning "Running as user:"
 id
 
-echo "${YELLOW}Checking executables:${NC}"
+# 检查可执行文件
+log_warning "Checking executables:"
 file /app/clash_core/clash.meta-linux-amd64
 ls -la /app/clash_core/clash.meta-linux-amd64
 
-# 可选清理旧配置（如果指定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}"
-
-# 尝试设置权限，但允许失败
-chmod -R 777 /app/data 2>/dev/null || echo "${YELLOW}Warning: Failed to set permissions for /app/data, continuing anyway${NC}"
+mkdir -p /app/data
+if [ $? -ne 0 ]; then
+    log_warning "Warning: Failed to create /app/data, continuing anyway"
+else
+    # 尝试设置权限
+    chmod -R 777 /app/data 2>/dev/null || log_warning "Warning: Failed to set permissions for /app/data, continuing anyway" 
+fi
 
-# 尝试设置subconverter执行权限，但允许失败
-if [ -f "/app/subconverter/subconverter" ]; then
-    chmod +x /app/subconverter/subconverter 2>/dev/null || echo "${YELLOW}Warning: Failed to set executable permission for subconverter${NC}"
+# 检查是否需要清理配置
+if [ "$CLEAN_CONFIG" = "true" ]; then
+    log_info "Cleaning old configuration files..."
+    rm -f /app/data/config.yaml /app/data/config.yaml.raw
+    if [ $? -eq 0 ]; then
+        log_info "Old configuration files cleaned successfully"
+    else
+        log_warning "Failed to clean old configuration files"
+    fi
 fi
 
-# 尝试设置Clash Core执行权限，但允许失败
-if [ -f "/app/clash_core/clash.meta-linux-amd64" ]; then
-    chmod +x /app/clash_core/clash.meta-linux-amd64 2>/dev/null || echo "${YELLOW}Warning: Failed to set executable permission for Clash Meta${NC}"
-    echo "${GREEN}Clash Meta found${NC}"
+# 尝试给二进制文件设置可执行权限
+chmod +x /app/subconverter/subconverter 2>/dev/null || log_warning "Warning: Failed to set executable permission for subconverter"
+chmod +x /app/clash_core/clash.meta-linux-amd64 2>/dev/null || log_warning "Warning: Failed to set executable permission for Clash Meta"
+
+# 检查Clash Core是否存在
+if [ -f /app/clash_core/clash.meta-linux-amd64 ]; then
+    log_info "Clash Meta found"
 else
-    echo "${RED}Error: Clash Core executable not found!${NC}"
+    log_error "Clash Meta binary not found!"
     exit 1
 fi
 
 # 加载环境变量
-if [ -f ".env" ]; then
-    echo "${GREEN}Loading environment variables from .env file...${NC}"
-    export $(grep -v '^#' .env | xargs -d '\n')
+if [ -f .env ]; then
+    source .env
 fi
 
 # 检查必要的环境变量
-if [ -z "$SUB_URL" ]; then
-    echo "${RED}Error: SUB_URL environment variable is not set!${NC}"
-    exit 1
-fi
-
-# 设置默认端口
-export FLASK_PORT=${FLASK_PORT:-7860}
-echo "${GREEN}Flask will listen on port ${FLASK_PORT}${NC}"
-
-# 输出基本信息
+echo -e "\033[0;32mFlask will listen on port $FLASK_PORT\033[0m"
 echo "=========================="
 echo "  Simple Clash Relay"
 echo "=========================="
 echo "Starting services..."
-
-# 打印环境变量（隐藏敏感信息）
 echo "Environment:"
-echo "FLASK_PORT:        ${FLASK_PORT:-7860}"
-echo "CLASH_PROXY_PORT:  ${CLASH_PROXY_PORT:-7890}"
-echo "CLASH_API_PORT:    ${CLASH_API_PORT:-9090}"
+echo "FLASK_PORT:        $FLASK_PORT"
+echo "CLASH_PROXY_PORT:  $CLASH_PROXY_PORT"
+echo "CLASH_API_PORT:    $CLASH_API_PORT"
 echo "SUB_URL:           [hidden]"
 echo "API_KEY:           [hidden]"
 
-# 检查必要的环境变量
-if [ -z "$API_KEY" ]; then
+# 检查API密钥
+if [ -z "$API_KEY" ] || [ "$API_KEY" = "changeme" ]; then
     echo "WARNING: API_KEY is not set. Using default value (insecure)!"
-    export API_KEY="changeme"
 fi
 
-# 启动Flask应用
-echo "${GREEN}Starting Flask application...${NC}"
-
-# 使用gunicorn启动Flask应用（生产环境推荐）
-# 如果WORKER_COUNT未设置，使用CPU核心数+1的worker数量
-WORKER_COUNT=${WORKER_COUNT:-$(( $(nproc) + 1 ))}
-echo "Using $WORKER_COUNT workers"
+# 检查订阅链接
+if [ -z "$SUB_URL" ]; then
+    echo "WARNING: SUB_URL is not set. Proxy functionality will not work properly."
+fi
 
-# 确保所有参数在一行或使用清晰的续行符
-exec gunicorn \
-    --workers $WORKER_COUNT \
-    --bind 0.0.0.0:${FLASK_PORT:-7860} \
-    --log-level info \
-    --access-logfile - \
-    --error-logfile - \
-    app.main:app 
+# 启动Flask应用
+log_info "Starting Flask application..."
+WORKERS=$(nproc)
+if [ $WORKERS -gt 16 ]; then
+    WORKERS=16  # 限制最大工作进程数
+fi
+echo "Using $WORKERS workers"
+exec gunicorn app.main:app -b 0.0.0.0:$FLASK_PORT -w $WORKERS 

requirements.txt

@@ -1,5 +1,6 @@
-flask==2.0.1
+Flask==2.2.3
 gunicorn==20.1.0
-requests==2.26.0
+requests==2.28.2
+pyyaml==6.0
 # pyyaml==6.0 # 已通过 apk 安装 
 Werkzeug==2.0.3 # 添加与 Flask==2.0.1 兼容的版本