生成提交信息中

.gitignore

@@ -1,16 +1,4 @@
-# Python-generated files
-__pycache__/
-*.py[oc]
-build/
-dist/
-wheels/
-*.egg-info
-
-# Virtual environments
-.venv
-
-# Account Data
-gemini_accounts/
-
-# Config File
-config.json
+*
+!.gitignore
+!Dockerfile
+!README.md

Dockerfile

@@ -1,22 +1,73 @@
 FROM python:3.12.12
 
-WORKDIR /app
+WORKDIR /opt/app
 ENV PYTHONUNBUFFERED=1
 ENV PORT=7860
 ENV LANG=zh_CN.UTF-8
 ENV LC_ALL=zh_CN.UTF-8
 ENV TZ=Asia/Shanghai
 
-COPY . .
-COPY example.config.json config.json
-
 RUN apt-get update -y \
-    && apt-get install -y chromium chromium-driver xvfb locales tzdata \
+    && apt-get install -y \
+        curl unzip xvfb locales tzdata \
+        libnss3 libgtk-3-0 libx11-xcb1 libxcomposite1 libxdamage1 libxfixes3 \
+        libxrandr2 libgbm1 libxkbcommon0 libasound2 libpangocairo-1.0-0 \
+        libcairo2 libatk1.0-0 libatk-bridge2.0-0 libpango-1.0-0 libdrm2 \
+        libdbus-1-3 libcups2 \
     && localedef -i zh_CN -f UTF-8 zh_CN.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-RUN pip install --no-cache-dir -r requirements.txt
-RUN chmod +x /app/startup.sh
+COPY requirements.txt /tmp/requirements.txt
+RUN pip install --no-cache-dir -r /tmp/requirements.txt
+RUN python -m camoufox fetch
+
+RUN cat <<'EOF' > /entrypoint.sh
+#!/bin/sh
+set -eu
+
+# 1. 环境检查
+if [ -z "${APP_ARCHIVE_URL:-}" ]; then
+  echo "Error: APP_ARCHIVE_URL is not set." >&2
+  exit 1
+fi
+
+# 2. 准备目录
+mkdir -p /opt/app
+cd /opt/app
+ARCHIVE_FILE="app_archive"
+
+# 3. 清洗 Cloudflare 变量 (核心修正：去除换行、空格、单双引号)
+CF_ID="$(printf '%s' "${CF_ACCESS_CLIENT_ID:-}" | tr -d '\r\n "\047')"
+CF_SECRET="$(printf '%s' "${CF_ACCESS_CLIENT_SECRET:-}" | tr -d '\r\n "\047')"
+
+# 4. 组装 Curl (含浏览器伪装，防止 WAF 拦截)
+# -f: 失败报错 -s: 静默 -S: 出错时显示 -L: 跟随重定向
+UA="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+set -- -fsSL -A "$UA" "$APP_ARCHIVE_URL" -o "$ARCHIVE_FILE"
+
+if [ -n "$CF_ID" ] && [ -n "$CF_SECRET" ]; then
+  set -- -H "CF-Access-Client-Id: $CF_ID" \
+         -H "CF-Access-Client-Secret: $CF_SECRET" \
+         "$@"
+fi
+
+# 5. 下载
+echo "[entrypoint] Downloading..." >&2
+if ! curl "$@"; then
+  echo "Error: Download failed." >&2
+  exit 1
+fi
+
+# 6. 解压
+echo "[entrypoint] Extracting..." >&2
+unzip -oq "$ARCHIVE_FILE" 2>/dev/null || tar -xzf "$ARCHIVE_FILE" 2>/dev/null
+rm -f "$ARCHIVE_FILE"
+
+# 7. 启动
+echo "[entrypoint] Starting app..." >&2
+exec uvicorn app:app --host 0.0.0.0 --port 7860
+EOF
+RUN chmod +x /entrypoint.sh
 
 EXPOSE 7860
-CMD ["/app/startup.sh"]
+ENTRYPOINT ["/entrypoint.sh"]

pyproject.toml

@@ -6,10 +6,10 @@ readme = "README.md"
 requires-python = ">=3.12"
 dependencies = [
     "beautifulsoup4>=4.14.3",
+    "camoufox>=0.4.11",
     "fastapi>=0.115.0",
+    "playwright>=1.57.0",
     "requests>=2.32.5",
-    "selenium>=4.39.0",
-    "seleniumbase>=4.30.5",
     "setuptools>=80.9.0",
     "uvicorn>=0.30.0",
 ]

requirements.txt

@@ -4,6 +4,7 @@ anyio==4.12.1
 attrs==25.4.0
 beautifulsoup4==4.14.3
 behave==1.2.6
+camoufox==0.4.11
 certifi==2026.1.4
 cffi==2.0.0
 chardet==5.2.0
@@ -34,6 +35,7 @@ pdbp==1.8.1
 pip==25.3
 platformdirs==4.5.1
 pluggy==1.6.0
+playwright==1.57.0
 pycparser==2.23
 pydantic==2.12.5
 pydantic-core==2.41.5
@@ -52,8 +54,6 @@ pyyaml==6.0.3
 requests==2.32.5
 rich==14.2.0
 sbvirtualdisplay==1.4.0
-selenium==4.39.0
-seleniumbase==4.45.10
 setuptools==80.9.0
 six==1.17.0
 sniffio==1.3.1
@@ -65,7 +65,6 @@ trio==0.32.0
 trio-websocket==0.12.2
 typing-extensions==4.15.0
 typing-inspection==0.4.2
-undetected-chromedriver==3.5.5
 urllib3==2.6.3
 uvicorn==0.40.0
 websocket-client==1.9.0

startup.sh

@@ -7,14 +7,6 @@ if [ ! -f /app/config.json ] && [ -f /app/example.config.json ]; then
   cp /app/example.config.json /app/config.json
 fi
 
-if [ -z "${CHROME_BIN:-}" ]; then
-  if [ -x /usr/bin/chromium-browser ]; then
-    export CHROME_BIN=/usr/bin/chromium-browser
-  elif [ -x /usr/bin/chromium ]; then
-    export CHROME_BIN=/usr/bin/chromium
-  fi
-fi
-
 if [ -z "${DISABLE_XVFB:-}" ] && command -v Xvfb >/dev/null 2>&1; then
   echo "Starting Xvfb for virtual display."
   Xvfb :99 -screen 0 1366x768x24 >/tmp/xvfb.log 2>&1 &