Upload 18 files

entrypoint.sh

@@ -1,6 +1,11 @@
-#!/bin/sh
-# 不再使用set -e，避免因chmod失败而中止脚本
-# set -e
+#!/bin/bash
+
+# Exit immediately if a command exits with a non-zero status.
+# set -e 
+# ^^^ We keep this commented out to allow warnings for non-critical errors like chmod
+
+# Enable xtrace to print commands and their arguments as they are executed.
+set -x
 
 # 设置颜色输出
 RED='\033[0;31m'
@@ -8,94 +13,111 @@ GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
 NC='\033[0m' # No Color
 
-echo "${GREEN}Starting Simple Clash Relay...${NC}"
+echo_color() {
+    local color_code="$1"
+    shift
+    echo -e "\033[${color_code}m$@\033[0m"
+}
+
+echo_info() {
+    echo_color "0;32" "INFO: $@"
+}
+echo_warning() {
+    echo_color "1;33" "WARN: $@"
+}
+echo_error() {
+    echo_color "0;31" "ERROR: $@"
+}
+
+echo "\n===== Application Startup at $(date '+%Y-%m-%d %H:%M:%S') =====\n"
+
+echo_info "Starting Simple Clash Relay..."
 
-# 添加诊断信息
-echo "${YELLOW}System information:${NC}"
+# Display system information
+echo_color "1;33" "System information:"
 uname -a
-echo "${YELLOW}Running as user:${NC}"
+echo_color "1;33" "Running as user:"
 id
 
-echo "${YELLOW}Checking executables:${NC}"
-file /app/clash_core/clash.meta-linux-amd64
-ls -la /app/clash_core/clash.meta-linux-amd64
+echo_info "Checking environment variables..."
+# Print key environment variables (mask sensitive ones if necessary in real logs)
+printenv | grep -E 'FLASK_PORT|CLASH_PROXY_PORT|CLASH_API_PORT|SUB_URL|API_KEY|PORT|TZ' || echo "No relevant env vars found or grep failed."
+
+# Check for critical env vars
+if [ -z "$SUB_URL" ]; then
+    echo_warning "SUB_URL environment variable is not set! Subscription download will likely fail."
+fi
+if [ -z "$API_KEY" ]; then
+    echo_warning "API_KEY environment variable is not set. Using default 'changeme' (insecure)."
+fi
+
+DATA_DIR="/app/data"
+echo_info "Ensuring data directory exists: ${DATA_DIR}"
+mkdir -p "${DATA_DIR}" || echo_warning "Failed to create data directory ${DATA_DIR}"
 
-# 可选清理旧配置（如果指定CLEAN_CONFIG=true）
+# Optionally clean config files
 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}"
+    echo_info "CLEAN_CONFIG is true. Removing old config files..."
+    rm -f "${DATA_DIR}/config.yaml" "${DATA_DIR}/config.yaml.raw"
+    echo_info "Old config files removed."
 fi
 
-# 确保数据目录存在
-mkdir -p /app/data || echo "${YELLOW}Warning: Failed to create /app/data directory${NC}"
+# Check necessary executables and set permissions
+CLASH_CORE_PATH="/app/clash_core/clash.meta-linux-amd64"
+SUBCONVERTER_PATH="/app/subconverter/subconverter"
 
-# 尝试设置权限，但允许失败
-chmod -R 777 /app/data 2>/dev/null || echo "${YELLOW}Warning: Failed to set permissions for /app/data, continuing anyway${NC}"
+echo_info "Checking executables and setting permissions..."
+ls -la "${CLASH_CORE_PATH}" || echo_warning "Clash core not found at ${CLASH_CORE_PATH}"
+ls -la "${SUBCONVERTER_PATH}" || echo_warning "Subconverter not found at ${SUBCONVERTER_PATH}"
 
-# 尝试设置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}"
-fi
+# Attempt to set executable permissions, warn on failure
+chmod +x "${CLASH_CORE_PATH}" || echo_warning "Failed to set executable permission for Clash Meta."
+chmod +x "${SUBCONVERTER_PATH}" || echo_warning "Failed to set executable permission for subconverter."
+
+# Check file types
+echo_info "Checking file types..."
+file "${CLASH_CORE_PATH}" || echo_warning "Failed to check file type for Clash Meta."
+file "${SUBCONVERTER_PATH}" || echo_warning "Failed to check file type for subconverter."
 
-# 尝试设置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}"
+# Check if Clash core exists and seems valid
+if [ -f "${CLASH_CORE_PATH}" ]; then
+    echo_info "Clash Meta found at ${CLASH_CORE_PATH}"
 else
-    echo "${RED}Error: Clash Core executable not found!${NC}"
-    exit 1
+    echo_error "Clash Meta executable not found at ${CLASH_CORE_PATH}! Cannot start Clash."
+    # Optionally exit here if Clash core is absolutely required
+    # exit 1 
 fi
 
-# 加载环境变量
-if [ -f ".env" ]; then
-    echo "${GREEN}Loading environment variables from .env file...${NC}"
-    export $(grep -v '^#' .env | xargs -d '\n')
+# Check if subconverter exists and seems valid
+if [ -f "${SUBCONVERTER_PATH}" ]; then
+    echo_info "Subconverter found at ${SUBCONVERTER_PATH}"
+else
+    echo_warning "Subconverter executable not found at ${SUBCONVERTER_PATH}. Conversion might fail if needed."
 fi
 
-# ��查必要的环境变量
-if [ -z "$SUB_URL" ]; then
-    echo "${RED}Error: SUB_URL environment variable is not set!${NC}"
-    exit 1
-fi
+# --- Launch Application ---
+FLASK_PORT=${PORT:-7860} # Use PORT env var if set (common in PaaS), otherwise default
+WORKERS=${WORKERS:-4} # Default to 4 workers, allow override via env var
 
-# 设置默认端口
-export FLASK_PORT=${FLASK_PORT:-7860}
-echo "${GREEN}Flask will listen on port ${FLASK_PORT}${NC}"
-
-# 输出基本信息
-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 "SUB_URL:           [hidden]"
-echo "API_KEY:           [hidden]"
-
-# 检查必要的环境变量
-if [ -z "$API_KEY" ]; then
-    echo "WARNING: API_KEY is not set. Using default value (insecure)!"
-    export API_KEY="changeme"
-fi
+echo_info "Preparing to launch Flask application on port ${FLASK_PORT} with ${WORKERS} workers..."
 
-# 启动Flask应用
-echo "${GREEN}Starting Flask application...${NC}"
+# Navigate to the app directory just in case
+cd /app || { echo_error "Failed to cd into /app directory!"; exit 1; }
 
-# 使用gunicorn启动Flask应用（生产环境推荐）
-# 如果WORKER_COUNT未设置，使用CPU核心数+1的worker数量
-WORKER_COUNT=${WORKER_COUNT:-$(( $(nproc) + 1 ))}
-echo "Using $WORKER_COUNT workers"
+echo_info "Current directory: $(pwd)"
+echo_info "Listing contents of /app:"
+ls -la
 
-# 确保所有参数在一行或使用清晰的续行符
+echo_info "Launching Gunicorn..."
+
+# Execute Gunicorn
 exec gunicorn \
-    --workers $WORKER_COUNT \
-    --bind 0.0.0.0:${FLASK_PORT:-7860} \
+    --workers ${WORKERS} \
+    --bind 0.0.0.0:${FLASK_PORT} \
     --log-level info \
-    --access-logfile - \
-    --error-logfile - \
-    app.main:app 
+    --access-logfile '-' \
+    --error-logfile '-' \
+    app.main:app
+
+# If exec fails, this part will be reached
+echo_error "Failed to execute Gunicorn!"