Upload 11 files

Dockerfile

@@ -6,12 +6,14 @@ WORKDIR /app
 
 # 安装系统依赖
 # 添加 py3-yaml 直接通过 apk 安装 PyYAML
+# 添加 unzip 用于解压源码包
 RUN apk add --no-cache \
     curl \
     ca-certificates \
     tzdata \
     tar \
     gzip \
+    unzip \
     python3-dev \
     musl-dev \
     libffi-dev \
@@ -38,17 +40,26 @@ RUN echo "Downloading Clash Meta..." && \
     echo "Cleaning up Clash Meta download..." && \
     rm /tmp/clash-meta.gz
 
-# 下载并完整解压subconverter
-RUN echo "Downloading subconverter..." && \
-    curl -L -f -o /tmp/subconverter.tar.gz "https://github.com/tindy2013/subconverter/releases/download/v0.7.2/subconverter_linux64.tar.gz" && \
-    echo "Extracting subconverter archive..." && \
+# 下载并安装subconverter及其配置文件
+ARG SUBVER=v0.7.2
+RUN echo "Downloading subconverter binary..." && \
+    curl -L -f -o /tmp/subconverter.tar.gz "https://github.com/tindy2013/subconverter/releases/download/${SUBVER}/subconverter_linux64.tar.gz" && \
+    echo "Downloading subconverter source code (for config files)..." && \
+    curl -L -f -o /tmp/subconverter_src.zip "https://github.com/tindy2013/subconverter/archive/refs/tags/${SUBVER}.zip" && \
+    echo "Extracting subconverter binary..." && \
     tar -xzf /tmp/subconverter.tar.gz -C ./subconverter --strip-components=1 && \
+    echo "Extracting subconverter config files..." && \
+    unzip -j /tmp/subconverter_src.zip "subconverter-${SUBVER}/pref.yml" -d ./subconverter/ && \
+    unzip -oq /tmp/subconverter_src.zip "subconverter-${SUBVER}/rules/*" -d ./subconverter/ && \
+    # 重命名解压出来的规则目录（如果需要）
+    # mv ./subconverter/subconverter-${SUBVER}/rules ./subconverter/rules && \
+    # rmdir ./subconverter/subconverter-${SUBVER} || true && \
     echo "Setting subconverter permissions..." && \
     chmod +x ./subconverter/subconverter && \
-    echo "Verifying subconverter exists..." && \
-    test -f ./subconverter/subconverter && \
-    echo "Cleaning up subconverter download..." && \
-    rm /tmp/subconverter.tar.gz
+    echo "Verifying subconverter binary and config exist..." && \
+    test -f ./subconverter/subconverter && test -f ./subconverter/pref.yml && test -d ./subconverter/rules && \
+    echo "Cleaning up subconverter downloads..." && \
+    rm /tmp/subconverter.tar.gz /tmp/subconverter_src.zip
 
 # 复制Python依赖列表
 COPY requirements.txt ./
@@ -72,7 +83,7 @@ RUN echo "Installing Python dependencies..." && \
     pip install --no-cache-dir -r requirements.txt
 
 # 可选：删除构建依赖以减小镜像体积
-# RUN apk del python3-dev musl-dev libffi-dev yaml-dev
+# RUN apk del python3-dev musl-dev libffi-dev yaml-dev unzip
 
 # 设置环境变量
 ENV PYTHONDONTWRITEBYTECODE=1 \

app/clash_manager.py

@@ -49,27 +49,15 @@ class ClashManager:
         if not os.path.exists(self.config_path):
             raise FileNotFoundError(f"Clash配置文件未找到: {self.config_path}")
         
-        # 设置Clash命令行参数 (兼容Clash Meta)
+        # 设置Clash命令行参数 (使用 -ext-ctl)
         cmd = [
             self.clash_path,
             "-f", self.config_path,
-            "-d", os.path.dirname(self.config_path)
+            "-d", os.path.dirname(self.config_path),
+            "-ext-ctl", f"127.0.0.1:{self.api_port}"
+            # 不再需要 "-ext-ui", ""
         ]
         
-        # 为Clash Meta添加额外参数
-        if "meta" in self.clash_path.lower():
-            # Clash Meta特有参数
-            cmd.extend([
-                "--controller-addr", f"127.0.0.1:{self.api_port}",
-                # 如果需要可以添加更多Clash Meta特有参数
-            ])
-        else:
-            # 原始Clash参数
-            cmd.extend([
-                "-ext-ctl", f"127.0.0.1:{self.api_port}",
-                "-ext-ui", "" # 禁用外部UI
-            ])
-        
         # 启动Clash进程
         logger.info(f"正在启动Clash Core: {' '.join(cmd)}")
         self.clash_process = subprocess.Popen(