[pull] main from TheSmallHanCat:main

.github/workflows/docker-publish-beta.yml

@@ -0,0 +1,55 @@
+name: Build and Push Beta Docker Image
+
+on:
+  push:
+    branches:
+      - beta
+  workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push-beta:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=beta
+
+      - name: Build and push Docker image (beta)
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfile.headed
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha,scope=beta
+          cache-to: type=gha,mode=max,scope=beta

.github/workflows/docker-publish.yml

@@ -0,0 +1,77 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - variant: standard
+            dockerfile: Dockerfile
+            image_suffix: ""
+            cache_scope: standard
+          - variant: headed
+            dockerfile: Dockerfile.headed
+            image_suffix: -headed
+            cache_scope: headed
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels)
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}${{ matrix.image_suffix }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=raw,value=latest,enable={{is_default_branch}}
+
+      - name: Build and push Docker image (${{ matrix.variant }})
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ${{ matrix.dockerfile }}
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha,scope=${{ matrix.cache_scope }}
+          cache-to: type=gha,mode=max,scope=${{ matrix.cache_scope }}

.gitignore

@@ -36,6 +36,7 @@ logs.txt
 # IDE
 .vscode/
 .idea/
+.lh/
 *.swp
 *.swo
 *~
@@ -54,7 +55,15 @@ logs.txt
 *.cache
 
 browser_data
+browser_data_rt
 
 data
+tmp/
 config/setting.toml
-config/setting_warp.toml
+config/setting_warp.toml
+config/setting_warp_example.toml
+
+# 测试文件
+test_*
+tests/__pycache__/
+*.har

Dockerfile

@@ -2,40 +2,9 @@ FROM python:3.11-slim
 
 WORKDIR /app
 
-# 使用清华镜像源加速 apt (Debian bookworm)
-RUN sed -i 's|deb.debian.org|mirrors.tuna.tsinghua.edu.cn|g' /etc/apt/sources.list.d/debian.sources \
-    && sed -i 's|security.debian.org|mirrors.tuna.tsinghua.edu.cn|g' /etc/apt/sources.list.d/debian.sources
-
-# 安装 Playwright 所需的系统依赖
-RUN apt-get update && apt-get install -y \
-    libnss3 \
-    libnspr4 \
-    libatk1.0-0 \
-    libatk-bridge2.0-0 \
-    libcups2 \
-    libdrm2 \
-    libxkbcommon0 \
-    libxcomposite1 \
-    libxdamage1 \
-    libxfixes3 \
-    libxrandr2 \
-    libgbm1 \
-    libasound2 \
-    libpango-1.0-0 \
-    libcairo2 \
-    && rm -rf /var/lib/apt/lists/*
-
-# 安装 Python 依赖（使用清华 PyPI 镜像）
+# 安装 Python 依赖
 COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt \
-    -i https://pypi.tuna.tsinghua.edu.cn/simple/ \
-    --trusted-host pypi.tuna.tsinghua.edu.cn
-
-# 设置 Playwright 下载镜像（使用 npmmirror）
-ENV PLAYWRIGHT_DOWNLOAD_HOST=https://registry.npmmirror.com/-/binary/playwright
-
-# 安装 Playwright 浏览器
-RUN playwright install chromium
+RUN pip install --no-cache-dir --root-user-action=ignore -r requirements.txt
 
 COPY . .
 

Dockerfile.headed

@@ -0,0 +1,22 @@
+FROM python:3.11-slim
+
+WORKDIR /app
+
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    ALLOW_DOCKER_HEADED_CAPTCHA=true \
+    PLAYWRIGHT_BROWSERS_PATH=0
+
+# 在镜像构建阶段预装 Playwright Chromium，供 personal/browser 模式复用
+COPY requirements.txt ./
+
+RUN pip install --no-cache-dir --root-user-action=ignore -r requirements.txt \
+    && python -m playwright install --with-deps chromium
+
+COPY . .
+COPY docker/entrypoint.headed.sh /usr/local/bin/entrypoint.headed.sh
+RUN sed -i 's/\r$//' /usr/local/bin/entrypoint.headed.sh && chmod +x /usr/local/bin/entrypoint.headed.sh
+
+EXPOSE 8000
+
+CMD ["/usr/local/bin/entrypoint.headed.sh"]