reduce docker image size: clean caches, remove apt upgrade, use --no-install-recommends

Co-authored-by: ThePhaseless <33990351+ThePhaseless@users.noreply.github.com>

.devcontainer/devcontainer.json

@@ -21,7 +21,7 @@
   },
   "postCreateCommand": "uv sync --group test",
   "features": {
-    "ghcr.io/devcontainers/features/docker-in-docker:4": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {
       "moby": false
     }
   }

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -9,6 +9,7 @@ body:
       label: "I've completed the following steps:"
       options:
         - label: Read Loop Warning on Readme
+        - label: "Used --init/init: true in docker run/compose.yaml"
         - label: Done the troubleshooting from Readme
         - label: Checked if such issue already exists
         - label: Checked other websites with Cloudflare Turnstile

.github/workflows/docker-cleanup.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Delete PR Docker images
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             const owner = context.repo.owner.toLowerCase();

.github/workflows/docker-publish.yml

@@ -9,7 +9,7 @@ on:
   schedule:
     - cron: "25 0 * * *"
   push:
-    branches: ["main"]
+    branches: ["*"]
     # Publish semver tags as releases.
     tags: ["v*.*.*"]
     paths:
@@ -54,7 +54,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
@@ -65,12 +65,10 @@ jobs:
         with:
           context: .
           platforms: linux/amd64
-          cache-from: type=gha,scope=amd64
+          cache-from: type=gha,scope=x64
           pull: true
-          cache-to: type=gha,mode=max,scope=amd64
+          cache-to: type=gha,mode=max,scope=x64
           target: test
-          build-args: |
-            GITHUB_BUILD=true
 
   build:
     needs: test
@@ -88,7 +86,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
 
       - name: Prepare variables
         id: vars
@@ -137,8 +135,8 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: ${{ matrix.platform }}
-          cache-from: type=gha,scope=${{ steps.vars.outputs.SURFIX }}
-          cache-to: type=gha,mode=max,scope=${{ steps.vars.outputs.SURFIX }}
+          cache-from: type=gha,scope=${{ matrix.platform }}
+          cache-to: type=gha,mode=max,scope=${{ matrix.platform }}
           build-args: |
             GITHUB_BUILD=true
             VERSION=${{ github.ref_type == 'tag' && github.ref_name || github.sha }}
@@ -153,11 +151,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
 
       # Install the cosign tool
       - name: Install cosign
-        uses: sigstore/cosign-installer@v4.1.2
+        uses: sigstore/cosign-installer@v3
 
       # Set up Docker Buildx
       - name: Set up Docker Buildx
@@ -186,7 +184,6 @@ jobs:
 
       # Create manifest lists and push
       - name: Create and push manifest lists
-        id: manifests
         run: |
           TAGS="${{ steps.meta.outputs.tags }}"
           args=""
@@ -216,19 +213,11 @@ jobs:
             ${image}:${{github.sha}}-arm64
           fi
 
-          # All tags created above alias a single manifest list; capture its digest
-          # so the signature is bound to the image bytes, not a mutable tag.
-          # Tags from metadata-action are full references (image:tag), one per line,
-          # so take the first line rather than splitting on spaces.
-          FIRST_TAG=$(printf '%s' "$TAGS" | head -n1)
-          DIGEST=$(docker buildx imagetools inspect --format '{{.Manifest.Digest}}' "$FIRST_TAG")
-          echo "DIGEST=$DIGEST" >> $GITHUB_OUTPUT
-
-      # Sign the manifest list by digest — every consumer tag aliases this digest
-      - name: Sign the manifest list by digest
+      # Sign the manifest
+      - name: Sign the manifests
         env:
-          IMAGE: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          DIGEST: ${{ steps.manifests.outputs.DIGEST }}
+          TAGS: ${{ steps.meta.outputs.tags }}
         run: |
-          image=${IMAGE,,}
-          cosign sign --yes ${image}@${DIGEST}
+          for TAG in $TAGS; do
+            cosign sign --yes $TAG
+          done

Dockerfile

@@ -1,21 +1,22 @@
-# Ubuntu is required by playwright.
-# Pin to 24.04 LTS: ubuntu:latest floats to 26.04, which Playwright 1.58
-# cannot install firefox deps for (no libgtk-3 -> camoufox fails to launch).
-FROM ubuntu:24.04 AS base
+# Ubuntu is required by playwright
+FROM ubuntu:latest AS base
 
-ARG GITHUB_BUILD=false
+ARG GITHUB_BUILD=false \
+    VERSION
 
 ENV GITHUB_BUILD=${GITHUB_BUILD}\
+    VERSION=${VERSION}\
+    DEBIAN_FRONTEND=noninteractive \
     PYTHONUNBUFFERED=1 \
     # prevents python creating .pyc files
     PYTHONDONTWRITEBYTECODE=1 \
     UV_LINK_MODE=copy \
     PORT=8191 \
     XDG_CACHE_HOME=/cache \
-    HOME=/home/byparr
+    HOME=/tmp
 
 RUN apt-get update &&\
-    apt-get install -y --no-install-recommends curl ca-certificates git tini &&\
+    apt-get install -y --no-install-recommends curl ca-certificates &&\
     apt-get clean &&\
     rm -rf /var/lib/apt/lists/*
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
@@ -24,7 +25,7 @@ FROM base AS devcontainer
 RUN apt-get update &&\
     apt-get install -y --no-install-recommends git &&\
     uvx playwright install-deps firefox &&\
-    uvx --from git+https://github.com/feder-cr/invisible_playwright.git python -m invisible_playwright fetch &&\
+    uvx camoufox fetch &&\
     apt-get clean &&\
     rm -rf /var/lib/apt/lists/*
 ENTRYPOINT [ "sleep", "infinity" ]
@@ -35,7 +36,7 @@ WORKDIR /app
 COPY pyproject.toml uv.lock ./
 RUN mkdir -p /cache &&\
     uv sync &&\
-    uv run python -m invisible_playwright fetch &&\
+    uv run camoufox fetch &&\
     apt-get update &&\
     uv run playwright install-deps firefox &&\
     uv cache clean &&\
@@ -44,19 +45,17 @@ RUN mkdir -p /cache &&\
 
 COPY . .
 
-RUN mkdir -p /home/byparr &&\
-    chmod -R o+rX /app &&\
-    chmod -R a+rwX /cache /home/byparr
+# Make app and cache world-readable; addon scripts dir world-writable (runtime writes)
+RUN chmod -R o+rX /app /cache &&\
+    find /app/.venv -path "*/camoufox_add_init_script/addon" -type d -exec chmod -R o+rwX {} +
 
 FROM app AS test
 RUN \
     uv sync --group test &&\
-    uv run pytest -rs --retries 3
+    uv run pytest --retries 3
 
 FROM app
-ARG VERSION
-ENV VERSION=${VERSION}
 USER 1000
 EXPOSE $PORT
-HEALTHCHECK --interval=15m --timeout=30s --start-period=5s --retries=3 CMD curl "http://127.0.0.1:${PORT}/health"
-ENTRYPOINT ["tini", "--", "/app/.venv/bin/python", "main.py"]
+HEALTHCHECK --interval=15m --timeout=30s --start-period=5s --retries=3 CMD curl "http://localhost:${PORT}/health"
+ENTRYPOINT ["/app/.venv/bin/python", "main.py"]

README.md

@@ -16,14 +16,6 @@
 | `PROXY_SERVER`       | None      | Proxy to use in format: `protocol://host:port`.                                                                                                                   |
 | `PROXY_USERNAME`     | None      | Username for proxy authentication.                                                                                                                                |
 | `PROXY_PASSWORD`     | None      | Password for proxy authentication.                                                                                                                                |
-| `OWUI_API_KEY`       | None      | Bearer token for `/load` endpoint authentication. Must match `EXTERNAL_WEB_LOADER_API_KEY` in Open WebUI.                                                         |
-| `BROWSER_LOCALE`     | None      | Override the browser's language with a [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) tag, e.g. `en-US`, `de-DE`, `fr-FR`. When unset, the locale is derived from the egress country. |
-
-#### Browser language
-
-Set `BROWSER_LOCALE` to a [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag like `en-US`, `de-DE`, `fr-FR`, `pl-PL`, or `zh-CN` to fix the browser's language and `Accept-Language` header. When unset, Byparr derives the locale from the egress country (e.g. a French proxy → `fr-FR`), keeping the browser language consistent with the exit IP.
-
-Valid tags are maintained in the [IANA Language Subtag Registry](https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry). For a friendlier list, see [List of ISO 639-1 codes](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) (language) combined with an [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) region code for the full tag, e.g. `pt-BR`.
 
 ## Proxy Recommendation
 
@@ -73,20 +65,6 @@ Once running, open:
 - `http://localhost:8191/docs`
 - `http://localhost:8191/` (redirects to `/docs`)
 
-### Open WebUI Integration
-
-Byparr can serve as an external web loader for [Open WebUI](https://github.com/open-webui/open-webui), allowing it to fetch web content through Byparr's anti-bot bypassing capabilities.
-
-Configure Open WebUI with these environment variables:
-
-```bash
-WEB_LOADER_ENGINE=external
-EXTERNAL_WEB_LOADER_URL=http://byparr:8191/load
-EXTERNAL_WEB_LOADER_API_KEY=your-secret-key  # Optional, must match OWUI_API_KEY
-```
-
-The `/load` endpoint accepts `POST` requests with `{"urls": ["https://..."]}` and returns extracted text content for RAG pipelines.
-
 ## Troubleshooting
 
 ### Docker troubleshooting
@@ -97,20 +75,6 @@ The `/load` endpoint accepts `POST` requests with `{"urls": ["https://..."]}` an
    1. If run successfully, try updating container or if already on newest stable release create an issue for creating new release with new dependencies
    2. If build fails, try troubleshooting on another host/using other method
 
-#### Proxmox OCI / LXC browser launch errors
-
-If you are running Byparr as an OCI container in Proxmox (or another LXC-based setup) and see a `FileNotFoundError` from `multiprocessing.synchronize`/`camoufox` when processing requests, increase the service's shared memory in `compose.yaml`:
-
-```yaml
-services:
-  byparr:
-    shm_size: 512mb
-    stdin_open: true
-    tty: true
-```
-
-`shm_size: 512mb` is usually enough; `stdin_open` and `tty` are only needed if your orchestrator runs the container without a TTY.
-
 ### Local troubleshooting
 
 1. Download [uv](https://docs.astral.sh/uv/getting-started/installation/)

compose.yaml

@@ -2,8 +2,7 @@ services:
   byparr:
     image: ghcr.io/thephaseless/byparr:latest
     restart: unless-stopped
-    # environment:
-    #   LOG_LEVEL: debug
+    init: true
     build:
       context: .
       dockerfile: Dockerfile

debug/click_modes.py

@@ -1,157 +0,0 @@
-"""Find a click Cloudflare's checkbox actually accepts.
-
-The widget is reachable now, but `Checkbox clicked successfully` leaves it
-`checked=False`, so the click is not registering as a user gesture. This tries
-each candidate in turn against a fresh page and reports which one ticks the box
-and which one clears the challenge.
-
-    docker run --rm -e PYTHONPATH=/app -e TRACE_URL=https://extratorrent.st/ \\
-      -v "$PWD/out:/out" byparr-test uv run python debug/click_modes.py
-
-MODES defaults to every strategy; set MODES=force,label to narrow it.
-"""
-
-import asyncio
-import os
-import pathlib
-import time
-
-from src.utils import get_browser
-
-URL = os.environ.get("TRACE_URL", "https://extratorrent.st/")
-MODES = os.environ.get(
-    "MODES", "locator,force,check,label,mouse,widget_centre"
-).split(",")
-SETTLE = int(os.environ.get("SETTLE", "45"))
-OUT = pathlib.Path(os.environ.get("DIAG_OUT", "/out"))
-
-
-def log(*a: object) -> None:
-    """Print immediately."""
-    print(*a, flush=True)
-
-
-def cf_frame(page):
-    """The turnstile widget frame."""
-    for frame in page.frames:
-        if "challenges.cloudflare.com" in frame.url and not frame.is_detached():
-            return frame
-    return None
-
-
-async def wait_for_widget(page, seconds: int = 30):
-    """Wait until the checkbox is visible, returning (frame, locator)."""
-    for _ in range(seconds * 2):
-        frame = cf_frame(page)
-        if frame is not None:
-            try:
-                box = frame.locator('input[type="checkbox"]')
-                if await box.count() and await box.first.is_visible():
-                    return frame, box.first
-            except Exception:  # noqa: BLE001
-                pass
-        await asyncio.sleep(0.5)
-    return None, None
-
-
-async def do_click(page, frame, box, mode: str) -> str:
-    """Perform one click strategy."""
-    if mode == "locator":
-        await box.click(timeout=10_000)
-        return "locator.click()"
-    if mode == "force":
-        await box.click(timeout=10_000, force=True)
-        return "locator.click(force=True)"
-    if mode == "check":
-        await box.check(timeout=10_000)
-        return "locator.check()"
-    if mode == "label":
-        label = frame.locator("label")
-        if await label.count():
-            await label.first.click(timeout=10_000)
-            return "label.click()"
-        return "no label present"
-    if mode in {"mouse", "widget_centre"}:
-        rect = await box.bounding_box()
-        if rect is None:
-            return "no bounding box"
-        x = rect["x"] + rect["width"] / 2
-        y = rect["y"] + rect["height"] / 2
-        # Approach first: a cursor that teleports is itself a signal.
-        await page.mouse.move(x - 180, y - 120)
-        await asyncio.sleep(0.3)
-        await page.mouse.move(x - 40, y - 20, steps=18)
-        await asyncio.sleep(0.2)
-        await page.mouse.move(x, y, steps=10)
-        await asyncio.sleep(0.35)
-        await page.mouse.down()
-        await asyncio.sleep(0.07)
-        await page.mouse.up()
-        return f"page.mouse at ({x:.0f}, {y:.0f})"
-    return f"unknown mode {mode}"
-
-
-async def try_mode(mode: str) -> None:
-    """One fresh browser, one strategy, one verdict."""
-    log(f"\n===== mode={mode} =====")
-    async for dep in get_browser():
-        page = dep.page
-        await page.goto(URL, timeout=60_000)
-        await page.wait_for_load_state("domcontentloaded", timeout=30_000)
-
-        # Is our shadow-root patch even surviving the page's CSP?
-        try:
-            src = await page.evaluate("() => Element.prototype.attachShadow.toString()")
-            flag = await page.evaluate("() => '_shadowRootPatched' in window")
-            log(f"  on challenge page: native={'[native code]' in src} flag={flag}")
-        except Exception as exc:  # noqa: BLE001
-            log(f"  tamper probe blocked: {str(exc)[:70]}")
-
-        frame, box = await wait_for_widget(page)
-        if box is None:
-            log("  checkbox never became visible")
-            return
-
-        log(f"  before: checked={await box.is_checked()}")
-        try:
-            what = await do_click(page, frame, box, mode)
-            log(f"  clicked via {what}")
-        except Exception as exc:  # noqa: BLE001
-            log(f"  click raised: {str(exc)[:120]}")
-            return
-
-        start = time.perf_counter()
-        for _ in range(SETTLE // 3):
-            await asyncio.sleep(3)
-            elapsed = time.perf_counter() - start
-            title = await page.title()
-            checked = None
-            frame_now = cf_frame(page)
-            if frame_now is not None:
-                try:
-                    b = frame_now.locator('input[type="checkbox"]')
-                    checked = await b.first.is_checked() if await b.count() else None
-                except Exception:  # noqa: BLE001
-                    checked = "unreadable"
-            log(f"    +{elapsed:3.0f}s checked={checked} title={title!r}")
-            if "oment" not in title and "ierpliwo" not in title:
-                log(f"  >>> CLEARED by {mode}")
-                await page.screenshot(path=str(OUT / f"cleared-{mode}.png"))
-                return
-        await page.screenshot(path=str(OUT / f"stuck-{mode}.png"))
-        log(f"  {mode}: still challenged")
-
-
-async def main() -> None:
-    """Try each strategy on its own fresh browser."""
-    OUT.mkdir(parents=True, exist_ok=True)
-    log(f"### {URL} modes={MODES}")
-    for mode in MODES:
-        try:
-            await try_mode(mode.strip())
-        except Exception as exc:  # noqa: BLE001
-            log(f"  mode {mode} blew up: {str(exc)[:150]}")
-
-
-if __name__ == "__main__":
-    asyncio.run(main())

debug/probe.py

@@ -1,119 +0,0 @@
-"""Watch Byparr work a Cloudflare challenge, with screenshots.
-
-Runs the real /v1 handler against one URL and narrates the page every few
-seconds: what Cloudflare is showing, whether the challenge markers are still
-there, whether the widget frame is reachable, and whether the checkbox is
-clickable. Screenshots land in /out.
-
-    docker run --rm -e PYTHONPATH=/app -e TRACE_URL=https://extratorrent.st/ \\
-      -e BUDGET=240 -v "$PWD/out:/out" byparr-test \\
-      uv run python debug/probe.py
-
-Set FRAMEWORK=patchright to launch the solver the other way for comparison.
-"""
-
-import asyncio
-import logging
-import os
-import pathlib
-import sys
-import time
-
-logging.basicConfig(
-    level=logging.INFO,
-    format="%(relativeCreated)8.0fms %(name)s %(levelname)s %(message)s",
-    stream=sys.stdout,
-)
-for noisy in ("asyncio", "httpx", "httpcore", "urllib3"):
-    logging.getLogger(noisy).setLevel(logging.WARNING)
-
-from src.endpoints import CHALLENGE_MARKERS, read_item  # noqa: E402
-from src.models import LinkRequest  # noqa: E402
-from src.utils import get_browser  # noqa: E402
-
-URL = os.environ.get("TRACE_URL", "https://extratorrent.st/")
-BUDGET = int(os.environ.get("BUDGET", "240"))
-OUT = pathlib.Path(os.environ.get("DIAG_OUT", "/out"))
-
-
-def log(*a: object) -> None:
-    """Print immediately so a hung step is still visible."""
-    print(*a, flush=True)
-
-
-def cf_frame(page):
-    """The turnstile widget frame, if the browser exposes it."""
-    for frame in page.frames:
-        if "challenges.cloudflare.com" in frame.url and not frame.is_detached():
-            return frame
-    return None
-
-
-async def watch(page, seconds: int) -> None:
-    """Narrate the page while the handler works."""
-    start = time.perf_counter()
-    for i in range(seconds // 5):
-        await asyncio.sleep(5)
-        elapsed = time.perf_counter() - start
-        try:
-            title = await page.title()
-            markers = await page.locator(CHALLENGE_MARKERS).count()
-            body = (await page.locator("body").inner_text())[:70]
-            body = body.replace("\n", " | ")
-
-            frame = cf_frame(page)
-            widget = "no frame"
-            if frame is not None:
-                try:
-                    box = frame.locator('input[type="checkbox"]')
-                    count = await box.count()
-                    visible = count and await box.first.is_visible()
-                    checked = await box.first.is_checked() if count else None
-                    widget = f"checkbox={count} visible={bool(visible)} checked={checked}"
-                except Exception as exc:  # noqa: BLE001
-                    widget = f"frame unreadable: {str(exc)[:50]}"
-
-            log(f"  +{elapsed:5.0f}s markers={markers} {widget} | {title!r} {body!r}")
-            if i % 3 == 0:
-                await page.screenshot(path=str(OUT / f"probe-{elapsed:04.0f}s.png"))
-        except Exception as exc:  # noqa: BLE001
-            log(f"  +{elapsed:5.0f}s <{str(exc)[:80]}>")
-
-
-async def main() -> None:
-    """Call read_item and report what came back."""
-    OUT.mkdir(parents=True, exist_ok=True)
-    log(f"### {URL} budget={BUDGET}s")
-    async for dep in get_browser():
-        try:
-            native = await dep.page.evaluate(
-                "() => Element.prototype.attachShadow.toString()"
-            )
-            flagged = await dep.page.evaluate("() => '_shadowRootPatched' in window")
-            log(f"  attachShadow native: {'[native code]' in native}")
-            log(f"  _shadowRootPatched flag on window: {flagged}")
-        except Exception as exc:  # noqa: BLE001
-            log(f"  tamper probe failed: {str(exc)[:80]}")
-
-        watcher = asyncio.create_task(watch(dep.page, BUDGET))
-        started = time.perf_counter()
-        try:
-            response = await read_item(LinkRequest(url=URL, max_timeout=BUDGET), dep)
-            took = time.perf_counter() - started
-            cookies = [c["name"] for c in response.solution.cookies]
-            log(f"\nRESULT ok in {took:.0f}s")
-            log(f"  solution.status = {response.solution.status}")
-            log(f"  bytes           = {len(response.solution.response)}")
-            log(f"  cf_clearance    = {'cf_clearance' in cookies}")
-        except Exception as exc:  # noqa: BLE001
-            log(f"\nRESULT failed in {time.perf_counter() - started:.0f}s: {exc!r}"[:250])
-        watcher.cancel()
-        try:
-            await dep.page.screenshot(path=str(OUT / "probe-final.png"))
-            log(f"final title = {await dep.page.title()!r}")
-        except Exception:  # noqa: BLE001
-            pass
-
-
-if __name__ == "__main__":
-    asyncio.run(main())

debug/stealth_click.py

@@ -1,222 +0,0 @@
-"""Two variables at once: hide the patch, and click where a human would.
-
-Findings this is built on, both measured on a residential connection:
-
-  * On the challenge page the library's unlockShadowRoot.js has run --
-    `_shadowRootPatched` is a global and attachShadow is visibly patched. Any
-    anti-bot script can read that in one line.
-  * Turnstile's <input type="checkbox"> is invisible. Playwright reports a
-    successful click on it and `checked` never flips, because the real target
-    is the overlay drawn on top.
-
-So: MODE=stealth patches shadow roots without leaving a global or a
-non-native toString; MODE=library keeps the current behaviour. Either way the
-click is a real mouse press at the widget's visible position, not a synthetic
-click on a hidden input.
-
-    docker run --rm -e PYTHONPATH=/app -e MODE=stealth \\
-      -e TRACE_URL=https://extratorrent.st/ -v "$PWD/out:/out" \\
-      byparr-test uv run python debug/stealth_click.py
-"""
-
-import asyncio
-import os
-import pathlib
-
-from invisible_playwright.async_api import InvisiblePlaywright
-from playwright_captcha import ClickSolver, FrameworkType
-
-URL = os.environ.get("TRACE_URL", "https://extratorrent.st/")
-MODE = os.environ.get("MODE", "stealth")
-WATCH = int(os.environ.get("WATCH", "60"))
-OUT = pathlib.Path(os.environ.get("DIAG_OUT", "/out"))
-
-PREFS = {
-    "devtools.jsonview.enabled": False,
-    "browser.tabs.remote.useCrossOriginOpenerPolicy": False,
-    "browser.tabs.remote.useCrossOriginEmbedderPolicy": False,
-}
-
-STEALTH_UNLOCK = """
-(() => {
-  const nativeToString = Function.prototype.toString;
-  const spoofed = new WeakMap();
-  const asNative = (fake, real) => { spoofed.set(fake, real); return fake; };
-
-  Function.prototype.toString = asNative(function toString() {
-    const real = spoofed.get(this);
-    return nativeToString.call(real === undefined ? this : real);
-  }, nativeToString);
-
-  const hidden = new WeakMap();
-  const realAttach = Element.prototype.attachShadow;
-  Element.prototype.attachShadow = asNative(function attachShadow(init) {
-    const root = realAttach.call(this, Object.assign({}, init, {mode: 'open'}));
-    hidden.set(this, root);
-    return root;
-  }, realAttach);
-
-  const desc = Object.getOwnPropertyDescriptor(Element.prototype, 'shadowRoot');
-  if (desc && desc.get) {
-    const realGet = desc.get;
-    Object.defineProperty(Element.prototype, 'shadowRoot', {
-      get: asNative(function shadowRoot() {
-        return realGet.call(this) || hidden.get(this);
-      }, realGet),
-      configurable: desc.configurable,
-      enumerable: desc.enumerable,
-    });
-  }
-})();
-"""
-
-PROBE = """
-() => ({
-  flag: '_shadowRootPatched' in window,
-  attachNative: /\\[native code\\]/.test(Element.prototype.attachShadow.toString()),
-})
-"""
-
-
-def log(*a: object) -> None:
-    """Print immediately."""
-    print(*a, flush=True)
-
-
-def cf_frame(page):
-    """The turnstile widget frame."""
-    for frame in page.frames:
-        if "challenges.cloudflare.com" in frame.url and not frame.is_detached():
-            return frame
-    return None
-
-
-async def widget_box(page):
-    """Where the widget is drawn, in main-page coordinates."""
-    try:
-        el = page.locator('iframe[src*="challenges.cloudflare.com"]').first
-        if await el.count():
-            return await el.bounding_box()
-    except Exception:  # noqa: BLE001
-        pass
-    return None
-
-
-async def checkbox_state(page) -> str:
-    """What the hidden input currently reports."""
-    frame = cf_frame(page)
-    if frame is None:
-        return "no frame"
-    try:
-        box = frame.locator('input[type="checkbox"]')
-        if not await box.count():
-            return "no input"
-        return f"checked={await box.first.is_checked()}"
-    except Exception as exc:  # noqa: BLE001
-        return f"unreadable ({str(exc)[:40]})"
-
-
-async def main() -> None:
-    """Load the challenge, press the widget like a person, watch the verdict."""
-    OUT.mkdir(parents=True, exist_ok=True)
-    log(f"### mode={MODE} {URL}")
-
-    async with InvisiblePlaywright(
-        headless=True, humanize=True, locale="auto", extra_prefs=PREFS
-    ) as browser:
-        context = await browser.new_context()
-        page = await context.new_page()
-
-        solver = None
-        if MODE == "stealth":
-            await page.add_init_script(STEALTH_UNLOCK)
-        else:
-            solver = ClickSolver(
-                framework=FrameworkType.PLAYWRIGHT, page=page, max_attempts=1
-            )
-            await solver.__aenter__()
-
-        goto_timeout = int(os.environ.get("GOTO_TIMEOUT", "120")) * 1000
-        try:
-            response = await page.goto(URL, timeout=goto_timeout)
-            log(f"  goto status: {response.status if response else None}")
-        except Exception as exc:  # noqa: BLE001
-            log(f"  goto FAILED: {type(exc).__name__}: {str(exc)[:150]}")
-            return
-        try:
-            await page.wait_for_load_state("domcontentloaded", timeout=60_000)
-        except Exception as exc:  # noqa: BLE001
-            log(f"  domcontentloaded wait failed: {str(exc)[:100]}")
-        log(f"  on challenge page: {await page.evaluate(PROBE)}")
-        log(f"  title: {await page.title()!r}")
-
-        # Wait for the checkbox to actually be presented, not merely for the
-        # iframe to exist. Cloudflare cycles: the widget frame appears first
-        # while it is still "checking if you are human" with no input in it,
-        # and only then renders the checkbox. Pressing during that first phase
-        # is a click into nothing, which is what every earlier probe did.
-        ready = False
-        for i in range(90):
-            frame = cf_frame(page)
-            if frame is not None:
-                try:
-                    count = await frame.locator('input[type="checkbox"]').count()
-                except Exception:  # noqa: BLE001
-                    count = 0
-                if count:
-                    log(f"  checkbox presented after {i}s")
-                    ready = True
-                    break
-            await asyncio.sleep(1)
-        if not ready:
-            log("  checkbox never appeared")
-            await page.screenshot(path=str(OUT / f"{MODE}-no-checkbox.png"))
-            return
-
-        # Let it settle, then confirm it is still presented before pressing.
-        await asyncio.sleep(2)
-        frame = cf_frame(page)
-        if frame is None or not await frame.locator('input[type="checkbox"]').count():
-            log("  checkbox vanished while settling -- Cloudflare moved on")
-            return
-
-        box = await widget_box(page)
-        if not box:
-            log("  widget has no bounding box")
-            return
-        log(f"  widget box: {box}")
-        log(f"  before: {await checkbox_state(page)}")
-        await page.screenshot(path=str(OUT / f"{MODE}-before-click.png"))
-
-        # The checkbox sits at the left of the widget, vertically centred.
-        x = box["x"] + 30
-        y = box["y"] + box["height"] / 2
-        await page.mouse.move(x - 200, y - 130)
-        await asyncio.sleep(0.4)
-        await page.mouse.move(x - 50, y - 25, steps=22)
-        await asyncio.sleep(0.25)
-        await page.mouse.move(x, y, steps=12)
-        await asyncio.sleep(0.4)
-        await page.mouse.down()
-        await asyncio.sleep(0.08)
-        await page.mouse.up()
-        log(f"  pressed at ({x:.0f}, {y:.0f})")
-
-        for i in range(WATCH // 3):
-            await asyncio.sleep(3)
-            title = await page.title()
-            log(f"    +{(i + 1) * 3:3d}s {await checkbox_state(page)} title={title!r}")
-            if "oment" not in title and "ierpliwo" not in title:
-                log(f"  >>> CLEARED by mode={MODE}")
-                await page.screenshot(path=str(OUT / f"{MODE}-cleared.png"))
-                log(f"  cookies={[c['name'] for c in await context.cookies()]}")
-                return
-        await page.screenshot(path=str(OUT / f"{MODE}-end.png"))
-        log(f"  mode={MODE}: still challenged")
-
-        if solver:
-            await solver.__aexit__(None, None, None)
-
-
-if __name__ == "__main__":
-    asyncio.run(main())

main.py

@@ -11,8 +11,7 @@ from fastapi.middleware.gzip import GZipMiddleware
 from src.consts import HOST, LOG_LEVEL, PORT, VERSION
 from src.endpoints import health_check, router
 from src.middlewares import LogRequest
-from src.owui import router as owui_router
-from src.utils import get_browser, logger
+from src.utils import get_camoufox, logger
 
 logger.info("Using version %s", VERSION)
 logger.info("Log level set to %s", logging.getLevelName(LOG_LEVEL))
@@ -22,12 +21,11 @@ app.add_middleware(GZipMiddleware)
 app.add_middleware(LogRequest)
 
 app.include_router(router=router)
-app.include_router(router=owui_router)
 
 
 async def init():
     """Initialize the application."""
-    async for browser in get_browser():
+    async for browser in get_camoufox():
         await health_check(browser)
 
 

pyproject.toml

@@ -8,28 +8,27 @@ version = "0.1.0"
 description = "API for getting cookies for Cloudflare challenges"
 readme = "README.md"
 dependencies = [
-    "fastapi[standard]==0.141.*",
-    "invisible-playwright>=0.6.1",
-    "playwright==1.60.*",
+    "camoufox[geoip]==0.4.*",
+    "fastapi[standard]==0.135.*",
     "playwright-captcha==0.1.*",
     "pydantic==2.*",
-    "pydantic-settings==2.*",
-    "trafilatura==2.2.*",
 ]
 urls = { repository = "https://github.com/ThePhaseless/Byparr" }
-[dependency-groups]
 
+[dependency-groups]
 test = [
-    "httpx2==2.10.*",
-    "pytest==9.1.*",
-    "pytest-asyncio==1.4.*",
+    "httpx==0.28.*",
+    "pytest==9.0.*",
+    "pytest-asyncio==1.3.*",
     "pytest-retry==1.7.*",
     "pytest-xdist==3.8.*",
     "setuptools>=80.9.0",
 ]
-dev = ["deptry==0.25.*", "ruff==0.16.*"]
+dev = ["deptry==0.25.*", "ruff==0.15.*"]
+
 [tool.deptry.per_rule_ignores]
 DEP002 = ["pyautogui"]
+
 [tool.ruff.lint]
 ignore = [
     "D203",
@@ -54,8 +53,7 @@ ignore = [
     "G004",
     "ANN001",
     "ANN204",
-    "CPY001",
-    "BLE001",
+    "ANN206",
 ]
 select = ["ALL"]
 extend-safe-fixes = ["D415"]

renovate.json

@@ -2,16 +2,6 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": ["config:recommended"],
   "forkProcessing": "enabled",
-  "lockFileMaintenance": {
-    "enabled": true,
-    "rebaseWhen": "behind-base-branch",
-    "branchTopic": "lock-file-maintenance",
-    "commitMessageAction": "Lock file maintenance",
-    "schedule": ["before 4am on monday"],
-    "prBodyDefinitions": {
-      "Change": "All locks refreshed"
-    }
-  },
   "packageRules": [
     {
       "automerge": true,

src/consts.py

@@ -1,50 +1,32 @@
 import logging
+import os
+import sys
+from pathlib import Path
 
-from pydantic_settings import BaseSettings, SettingsConfigDict
+from playwright_captcha import CaptchaType
+from playwright_captcha.utils.camoufox_add_init_script.add_init_script import (
+    get_addon_path,
+)
 
+LOG_LEVEL = logging.getLevelNamesMapping()[os.getenv("LOG_LEVEL", "INFO").upper()]
 
-class Settings(BaseSettings):
-    model_config = SettingsConfigDict(env_file=".env", extra="ignore")
+VERSION = os.getenv("VERSION", "unknown").removeprefix("v")
 
-    log_level: str = "INFO"
-    version: str = "unknown"
+ADDON_PATH = str(Path(get_addon_path()).absolute())
+MAX_ATTEMPTS = sys.maxsize
 
-    # The solver retries whenever it cannot reach the challenge widget, and
-    # that failure is usually structural rather than transient -- an
-    # unreachable widget stays unreachable. sys.maxsize meant a single request
-    # burned its whole max_timeout on ~1300 identical failed attempts before
-    # reporting a 408. Give it a handful of tries, then let the caller know.
-    max_attempts: int = 5
+PROXY_SERVER = os.getenv("PROXY_SERVER")
+PROXY_USERNAME = os.getenv("PROXY_USERNAME")
+PROXY_PASSWORD = os.getenv("PROXY_PASSWORD")
 
-    proxy_server: str | None = None
-    proxy_username: str | None = None
-    proxy_password: str | None = None
+HOST = os.getenv("HOST", "0.0.0.0")  # noqa: S104
+PORT = int(os.getenv("PORT", "8191"))
 
-    host: str = "0.0.0.0"  # noqa: S104
-    port: int = 8191
+CHALLENGE_TITLES_MAP: dict[CaptchaType, list[str]] = {
+    # Cloudflare
+    CaptchaType.CLOUDFLARE_INTERSTITIAL: ["Just a moment..."],
+}
 
-    block_media: bool = False
-    return_only_cookies: bool = False
-    owui_api_key: str | None = None
-    browser_locale: str | None = None
-
-
-settings = Settings()
-
-LOG_LEVEL = logging.getLevelNamesMapping()[settings.log_level.upper()]
-VERSION = settings.version.removeprefix("v")
-
-MAX_ATTEMPTS = settings.max_attempts
-
-PROXY_SERVER = settings.proxy_server
-PROXY_USERNAME = settings.proxy_username
-PROXY_PASSWORD = settings.proxy_password
-
-HOST = settings.host
-PORT = settings.port
-
-BLOCK_MEDIA = settings.block_media
-RETURN_ONLY_COOKIES = settings.return_only_cookies
-
-OWUI_API_KEY = settings.owui_api_key
-BROWSER_LOCALE = settings.browser_locale
+CHALLENGE_TITLES = [
+    title for titles in CHALLENGE_TITLES_MAP.values() for title in titles
+]

src/endpoints.py

@@ -1,58 +1,28 @@
-import base64
 import time
 import warnings
-from asyncio import sleep
+from asyncio import wait_for
 from http import HTTPStatus
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, HTTPException
 from fastapi.responses import RedirectResponse
-from playwright.async_api import Page
-from playwright.async_api import TimeoutError as PlaywrightTimeoutError
-from playwright_captcha.solvers.click.cloudflare.utils.detection import (
-    detect_cloudflare_challenge,
-)
+from playwright_captcha import CaptchaType
 
+from src.consts import CHALLENGE_TITLES
 from src.models import (
     HealthcheckResponse,
     LinkRequest,
     LinkResponse,
     Solution,
 )
-from src.utils import BrowserDepClass, TimeoutTimer, get_browser, logger
+from src.utils import CamoufoxDepClass, TimeoutTimer, get_camoufox, logger
 
 warnings.filterwarnings("ignore", category=SyntaxWarning)
 
 
 router = APIRouter()
 
-BrowserDep = Annotated[BrowserDepClass, Depends(get_browser)]
-
-# Markup only an unsolved challenge has. Two near misses to avoid:
-#
-#   script[src*="/cdn-cgi/challenge-platform/"] on its own also matches the jsd
-#   bot-scoring beacon Cloudflare serves from that path on ordinary pages, so it
-#   has to be narrowed to the challenge orchestrator (chl_page).
-#
-#   iframe[src*="challenges.cloudflare.com"] looks like the widget but outlives
-#   it: a cleared nowsecure.nl carries two of them with no challenge in sight.
-CHALLENGE_MARKERS = (
-    'script[src*="/cdn-cgi/challenge-platform/"][src*="chl_page"], '
-    "#challenge-error-text, #challenge-running, #challenge-stage"
-)
-
-# The widget lives in an iframe served from here; the checkbox is an invisible
-# input inside it, so it is pressed by position rather than by locator. 30px in
-# from the widget's left edge is the middle of the box Cloudflare draws.
-CF_WIDGET_HOST = "challenges.cloudflare.com"
-CHECKBOX_SELECTOR = 'input[type="checkbox"]'
-CHECKBOX_OFFSET_X = 30
-
-# How often to look, and how long to leave a press alone before trying again.
-# Verification takes 5-15s, and pressing over the top of it just restarts the
-# cycle.
-CHALLENGE_POLL_SECONDS = 1.0
-PRESS_INTERVAL_SECONDS = 12.0
+CamoufoxDep = Annotated[CamoufoxDepClass, Depends(get_camoufox)]
 
 
 @router.get("/", include_in_schema=False)
@@ -63,7 +33,7 @@ def read_root():
 
 
 @router.get("/health")
-async def health_check(sb: BrowserDep):
+async def health_check(sb: CamoufoxDep):
     """Health check endpoint."""
     health_check_request = await read_item(
         LinkRequest.model_construct(url="https://google.com"),
@@ -80,254 +50,57 @@ async def health_check(sb: BrowserDep):
 
 
 @router.post("/v1")
-async def read_item(request: LinkRequest, dep: BrowserDep) -> LinkResponse:
+async def read_item(request: LinkRequest, dep: CamoufoxDep) -> LinkResponse:
     """Handle POST requests."""
     start_time = int(time.time() * 1000)
+
     timer = TimeoutTimer(duration=request.max_timeout)
+
     request.url = request.url.replace('"', "").strip()
-
-    await setup_routes(request, dep)
-
     try:
-        challenge_detected, page_html, page_request, status = await _navigate_and_solve(
-            dep, request, timer
+        page_request = await dep.page.goto(
+            request.url, timeout=timer.remaining() * 1000
         )
-    except (TimeoutError, PlaywrightTimeoutError) as e:
-        logger.error("Timed out while loading the page or solving the challenge")
+        status = page_request.status if page_request else HTTPStatus.OK
+        await dep.page.wait_for_load_state(
+            state="domcontentloaded", timeout=timer.remaining() * 1000
+        )
+        await dep.page.wait_for_load_state(
+            "networkidle", timeout=timer.remaining() * 1000
+        )
+
+        if await dep.page.title() in CHALLENGE_TITLES:
+            logger.info("Challenge detected, attempting to solve...")
+            # Solve the captcha
+            await wait_for(
+                dep.solver.solve_captcha(  # pyright: ignore[reportUnknownMemberType,reportUnknownArgumentType]
+                    captcha_container=dep.page,
+                    captcha_type=CaptchaType.CLOUDFLARE_INTERSTITIAL,
+                    wait_checkbox_attempts=1,
+                    wait_checkbox_delay=0.5,
+                ),
+                timeout=timer.remaining(),
+            )
+            status = HTTPStatus.OK
+            logger.debug("Challenge solved successfully.")
+    except TimeoutError as e:
+        logger.error("Timed out while solving the challenge")
         raise HTTPException(
             status_code=408,
-            detail="Timed out while loading the page or solving the challenge",
+            detail="Timed out while solving the challenge",
         ) from e
 
     cookies = await dep.context.cookies()
-    content_type, response_content = await build_response_content(
-        dep,
-        request,
-        page_request,
-        challenge_detected=challenge_detected,
-        page_html=page_html,
-    )
-
-    user_agent = page_request.request.headers.get("user-agent") if page_request else ""
 
     return LinkResponse(
         message="Success",
         solution=Solution(
-            user_agent=user_agent,
+            user_agent=await dep.page.evaluate("navigator.userAgent"),
             url=dep.page.url,
             status=status,
             cookies=cookies,
             headers=page_request.headers if page_request else {},
-            response=response_content,
-            content_type=content_type,
+            response=await dep.page.content(),
         ),
         start_timestamp=start_time,
     )
-
-
-async def setup_routes(request: LinkRequest, dep: BrowserDep) -> None:
-    """Install request routes for media blocking."""
-    if request.block_media:
-
-        async def block_media_route(route) -> None:
-            if route.request.resource_type in ("image", "media", "font"):
-                await route.abort()
-            else:
-                await route.continue_()
-
-        await dep.page.route("**/*", block_media_route)
-
-
-async def _navigate_and_solve(
-    dep: BrowserDep,
-    request: LinkRequest,
-    timer: TimeoutTimer,
-) -> tuple[bool, str | None, object, HTTPStatus]:
-    """Navigate to the URL, then solve a challenge or wait for network idle."""
-    page_html: str | None = None
-    page_request = await dep.page.goto(request.url, timeout=timer.remaining() * 1000)
-    status = page_request.status if page_request else HTTPStatus.OK
-    await dep.page.wait_for_load_state(
-        state="domcontentloaded", timeout=timer.remaining() * 1000
-    )
-
-    challenge_active = await detect_cloudflare_challenge(
-        dep.page, "interstitial"
-    ) or await detect_cloudflare_challenge(dep.page, "turnstile")
-    if not challenge_active:
-        page_html = await dep.page.content()
-        await _wait_for_networkidle(dep, timer)
-        return False, page_html, page_request, status
-
-    await _solve_challenge(dep, timer)
-    status = HTTPStatus.OK
-    return True, page_html, page_request, status
-
-
-async def _solve_challenge(dep: BrowserDep, timer: TimeoutTimer) -> None:
-    """
-    Attempt to solve a detected Cloudflare interstitial challenge.
-
-    Handles both shapes Cloudflare serves: the non-interactive challenge, which
-    clears itself given a few seconds, and the interactive one, which needs the
-    checkbox pressed. Both are covered by the same loop -- watch for the
-    challenge markup to disappear, and press whenever a checkbox is on offer.
-
-    playwright-captcha's solver is deliberately not used here. It clicks the
-    checkbox input directly, and that input is invisible, so the click reports
-    success while `checked` never flips. It also judges the result by waiting
-    for networkidle, which returned 9ms after the click while Cloudflare was
-    still verifying, so it reported failure on challenges that were about to
-    pass.
-    """
-    logger.info("Challenge detected, attempting to solve...")
-    last_press = -PRESS_INTERVAL_SECONDS
-    while timer.remaining() > 0:
-        if not await _challenge_visible(dep.page):
-            logger.info("Challenge cleared")
-            return
-
-        elapsed = timer.duration - timer.remaining()
-        if elapsed - last_press >= PRESS_INTERVAL_SECONDS and await _press_checkbox(
-            dep.page
-        ):
-            last_press = elapsed
-
-        await sleep(CHALLENGE_POLL_SECONDS)
-
-    message = "Challenge still present when the request budget ran out"
-    raise TimeoutError(message)
-
-
-def _cloudflare_frame(page: Page) -> object | None:
-    """Find the turnstile widget's frame; None while Cloudflare is between states."""
-    for frame in page.frames:
-        if CF_WIDGET_HOST in frame.url and not frame.is_detached():
-            return frame
-    return None
-
-
-async def _press_checkbox(page: Page) -> bool:
-    """
-    Press the checkbox, if one is currently on offer. True when a press happened.
-
-    Two things make this harder than locator.click():
-
-    Cloudflare cycles between "checking if you are human", where the widget
-    frame holds no input at all, and the state where the checkbox is offered.
-    Pressing during the first phase clicks nothing, so wait for the input to
-    exist before reaching for the mouse.
-
-    And the input is invisible -- it sits under a styled overlay. Playwright
-    reports a successful click on it and `checked` never flips, which is why
-    playwright-captcha's own click has never solved one of these. Pressing the
-    widget's visible pixels does work: measured against ext.to, this clears the
-    challenge and returns a cf_clearance cookie.
-    """
-    frame = _cloudflare_frame(page)
-    if frame is None:
-        return False
-    try:
-        checkbox = frame.locator(CHECKBOX_SELECTOR)
-        if not await checkbox.count():
-            return False
-        if await checkbox.first.is_checked():
-            # A press has already landed and Cloudflare is verifying it.
-            # Pressing over the top restarts that verification, which is how
-            # ext.to and speed.cd sat on "performing security verification" for
-            # a full 300s budget while being pressed a dozen times.
-            return False
-        element = await frame.frame_element()
-        box = await element.bounding_box()
-    except Exception:
-        # The widget is mid-swap; try again on the next poll.
-        return False
-    if not box:
-        return False
-
-    x = box["x"] + CHECKBOX_OFFSET_X
-    y = box["y"] + box["height"] / 2
-    try:
-        # Approach before pressing: a cursor that teleports onto the target is
-        # itself a signal.
-        await page.mouse.move(x - 180, y - 120)
-        await sleep(0.3)
-        await page.mouse.move(x - 45, y - 20, steps=18)
-        await sleep(0.2)
-        await page.mouse.move(x, y, steps=10)
-        await sleep(0.35)
-        await page.mouse.down()
-        await sleep(0.08)
-        await page.mouse.up()
-    except Exception as exc:
-        logger.debug(f"Checkbox press failed: {exc}")
-        return False
-    logger.info(f"Pressed the Cloudflare checkbox at ({x:.0f}, {y:.0f}) in {box}")
-    return True
-
-
-async def _challenge_visible(page: Page) -> bool:
-    """
-    Report whether an unsolved challenge is still on the page.
-
-    Cloudflare serves two different scripts from /cdn-cgi/challenge-platform/:
-    the challenge orchestrator on an interstitial, and the jsd bot-scoring
-    beacon on ordinary pages once a visitor is cleared. detect_cloudflare_
-    challenge() matches both, so on its own it never reports success. Match the
-    orchestrator and the widget instead.
-    """
-    try:
-        return await page.locator(CHALLENGE_MARKERS).count() > 0
-    except Exception:
-        # A navigation tore down the execution context mid-check, which only
-        # happens once Cloudflare has moved us on.
-        logger.debug("Challenge lookup interrupted by a navigation")
-        return False
-
-
-async def _wait_for_networkidle(dep: BrowserDep, timer: TimeoutTimer) -> None:
-    """Wait for network idle, tolerating post-DOM-load stalls."""
-    try:
-        await dep.page.wait_for_load_state(
-            "networkidle", timeout=timer.remaining() * 1000
-        )
-    except PlaywrightTimeoutError:
-        logger.info(
-            "networkidle timed out after domcontentloaded; continuing with loaded page"
-        )
-
-
-async def build_response_content(
-    dep: BrowserDep,
-    request: LinkRequest,
-    page_request: object,
-    *,
-    challenge_detected: bool,
-    page_html: str | None,
-) -> tuple[str, str]:
-    """Build (content_type, response_content) from the settled page."""
-    if request.return_only_cookies:
-        return "text/html", ""
-
-    if page_request and page_request.headers.get("content-type", "").startswith(
-        "application/pdf"
-    ):
-        return await _fetch_pdf_content(dep)
-
-    response_content = (
-        page_html
-        if page_html is not None and not challenge_detected
-        else await dep.page.content()
-    )
-    return "text/html", response_content
-
-
-async def _fetch_pdf_content(dep: BrowserDep) -> tuple[str, str]:
-    """Fetch raw PDF bytes as base64, falling back to viewer HTML on failure."""
-    try:
-        fetch_response = await dep.page.request.fetch(dep.page.url)
-        response_content = base64.b64encode(await fetch_response.body()).decode("ascii")
-    except Exception:
-        logger.exception("Failed to fetch PDF bytes, falling back to viewer HTML")
-        return "text/html", await dep.page.content()
-    return "application/pdf", response_content

src/models.py

@@ -5,17 +5,13 @@ from http.client import INTERNAL_SERVER_ERROR
 from typing import Any
 
 from playwright.sync_api import Cookie
-from pydantic import BaseModel, Field, field_validator
+from pydantic import BaseModel, Field
 from pydantic.alias_generators import to_camel
 
 from src import consts
 
-MS_PER_SECOND = 1000
-
 
 class LinkRequest(BaseModel):
-    model_config = {"populate_by_name": True}
-
     cmd: str = Field(
         default="request.get",
         description="Type of request, currently only supports GET requests. This string is purely for compatibility with FlareSolverr.",
@@ -23,31 +19,8 @@ class LinkRequest(BaseModel):
     url: str = Field(pattern=r"^https?://", default="https://")
     max_timeout: int = Field(
         default=60,
-        alias="maxTimeout",
-        description=(
-            "Maximum timeout for resolving the anti-bot challenge. Values below 1000 "
-            "are treated as seconds; values of 1000 or more as milliseconds, matching "
-            "FlareSolverr's maxTimeout parameter."
-        ),
+        description="Maximum timeout in seconds for resolving the anti-bot challenge.",
     )
-    block_media: bool = Field(
-        default=consts.BLOCK_MEDIA,
-        alias="blockMedia",
-        description="Block image, media, and font resources from loading.",
-    )
-    return_only_cookies: bool = Field(
-        default=consts.RETURN_ONLY_COOKIES,
-        alias="returnOnlyCookies",
-        description="Return only cookies, skip the page HTML content in the response.",
-    )
-
-    @field_validator("max_timeout")
-    @classmethod
-    def normalize_max_timeout(cls, value: int) -> int:
-        """Normalize FlareSolverr-style millisecond values to seconds."""
-        if value >= MS_PER_SECOND:
-            return value // MS_PER_SECOND
-        return value
 
 
 class HealthcheckResponse(BaseModel):
@@ -65,7 +38,6 @@ class Solution(BaseModel):
     user_agent: str = ""
     headers: dict[str, Any] = {}
     response: str = ""
-    content_type: str = Field(default="text/html", alias="contentType")
 
 
 class LinkResponse(BaseModel):
@@ -78,7 +50,7 @@ class LinkResponse(BaseModel):
     version: str = consts.VERSION
 
     @classmethod
-    def invalid(cls, url: str) -> LinkResponse:
+    def invalid(cls, url: str):
         """
         Return an invalid LinkResponse with default error values.
 

src/owui.py

@@ -1,76 +0,0 @@
-"""Open WebUI external web loader endpoint: POST /load."""
-
-from __future__ import annotations
-
-from hmac import compare_digest
-from typing import Annotated
-
-import trafilatura
-from fastapi import APIRouter, Depends, Header, HTTPException
-from playwright.async_api import Page
-from playwright.async_api import TimeoutError as PlaywrightTimeoutError
-from pydantic import BaseModel
-
-from src.consts import OWUI_API_KEY
-from src.utils import BrowserDepClass, get_browser, logger
-
-router = APIRouter(tags=["Open WebUI"])
-
-BrowserDep = Annotated[BrowserDepClass, Depends(get_browser)]
-
-
-class LoadRequest(BaseModel):
-    urls: list[str]
-
-
-class LoadResult(BaseModel):
-    page_content: str
-    metadata: dict[str, str]
-
-
-def require_auth(authorization: Annotated[str | None, Header()] = None) -> None:
-    """Enforce a bearer token on /load when OWUI_API_KEY is set."""
-    if not OWUI_API_KEY:
-        return
-    if authorization is None or not compare_digest(
-        authorization.encode(), f"Bearer {OWUI_API_KEY}".encode()
-    ):
-        raise HTTPException(status_code=401, detail="Unauthorized")
-
-
-async def _extract_content(page: Page) -> str:
-    """Return the page's main article text, falling back to visible text."""
-    article = trafilatura.extract(await page.content())
-    if article:
-        return article
-    result = await page.locator("body").inner_text()
-    return "\n".join(line.strip() for line in result.splitlines() if line.strip())
-
-
-@router.post("/load", response_model=list[LoadResult])
-async def load_urls(
-    request: LoadRequest,
-    _auth: Annotated[None, Depends(require_auth)],
-    dep: BrowserDep,
-) -> list[LoadResult]:
-    """
-    Fetch URLs through the anti-bot browser and return their text content.
-
-    Each URL is fetched sequentially; a failing URL yields empty
-    page_content so Open WebUI's RAG pipeline degrades gracefully.
-    """
-    results: list[LoadResult] = []
-    for url in request.urls:
-        try:
-            await dep.page.goto(url, timeout=60_000)
-            await dep.page.wait_for_load_state("domcontentloaded", timeout=30_000)
-            try:
-                await dep.page.wait_for_load_state("networkidle", timeout=15_000)
-            except PlaywrightTimeoutError:
-                logger.debug("networkidle timed out for %s; extracting anyway", url)
-            content = await _extract_content(dep.page)
-        except Exception as exc:
-            logger.warning("Failed to load %s: %s", url, exc)
-            content = ""
-        results.append(LoadResult(page_content=content, metadata={"source": url}))
-    return results

src/utils.py

@@ -3,8 +3,8 @@ import time
 from collections.abc import AsyncGenerator
 from typing import Annotated, NamedTuple, cast
 
+from camoufox import AsyncCamoufox
 from fastapi import Header
-from invisible_playwright.async_api import InvisiblePlaywright
 from playwright.async_api import Browser, BrowserContext, Page
 from playwright_captcha import (
     ClickSolver,
@@ -13,7 +13,7 @@ from playwright_captcha import (
 from pydantic import BaseModel, Field
 
 from src.consts import (
-    BROWSER_LOCALE,
+    ADDON_PATH,
     LOG_LEVEL,
     MAX_ATTEMPTS,
     PROXY_PASSWORD,
@@ -35,31 +35,6 @@ if len(logger.handlers) == 0:
     logger.addHandler(logging.StreamHandler())
 
 
-# Cloudflare embeds its challenge widget in an iframe carrying
-# allow="cross-origin-isolated". Firefox honours that by moving the iframe into
-# a cross-origin-isolated content process, where Juggler sees a frame with no
-# docShell and no URL, so content_frame() raises "Permission denied to access
-# property docShell on cross-origin object" and the solver never reaches the
-# checkbox.
-#
-# Turning the two policies off (as upstream Playwright's Firefox does, and as
-# v2.1.0 did via camoufox's disable_coop=True) restores that access, and the
-# solver then clicks the checkbox successfully.
-#
-# It is not a demonstrated win: from a datacenter IP Cloudflare rejects the
-# click regardless -- measured across eight sites, nine clicks, and an
-# undetectable shadow-root patch -- so no outcome changed here. It is kept for
-# parity with v2, which users report worked on these sites, because reaching
-# the checkbox is a precondition for ever passing an interactive challenge and
-# Byparr mostly runs from residential addresses that Cloudflare treats far
-# better than CI does.
-BROWSER_PREFS = {
-    "devtools.jsonview.enabled": False,
-    "browser.tabs.remote.useCrossOriginOpenerPolicy": False,
-    "browser.tabs.remote.useCrossOriginEmbedderPolicy": False,
-}
-
-
 class TimeoutTimer(BaseModel):
     duration: int  # in seconds
     start_time: float = Field(default_factory=time.perf_counter)
@@ -69,13 +44,13 @@ class TimeoutTimer(BaseModel):
         return max(0, self.duration - (time.perf_counter() - self.start_time))
 
 
-class BrowserDepClass(NamedTuple):
+class CamoufoxDepClass(NamedTuple):
     page: Page
     solver: ClickSolver
     context: BrowserContext
 
 
-async def get_browser(
+async def get_camoufox(
     x_proxy_server: Annotated[
         str | None,
         Header(
@@ -95,8 +70,8 @@ async def get_browser(
             alias="X-Proxy-Password",
         ),
     ] = None,
-) -> AsyncGenerator[BrowserDepClass]:
-    """Get InvisiblePlaywright browser instance."""
+) -> AsyncGenerator[CamoufoxDepClass]:
+    """Get Camoufox instance."""
     header_server = x_proxy_server
     header_username = x_proxy_username
     header_password = x_proxy_password
@@ -116,27 +91,26 @@ async def get_browser(
             "password": PROXY_PASSWORD,
         }
 
-    async with InvisiblePlaywright(
-        headless=True,
+    async with AsyncCamoufox(
+        main_world_eval=True,
+        addons=[ADDON_PATH],
+        geoip=True,
         proxy=proxy_config,
+        locale="en-US",
+        headless=True,
         humanize=True,
-        locale=BROWSER_LOCALE or "auto",
-        extra_prefs=BROWSER_PREFS,
+        i_know_what_im_doing=True,
+        config={"forceScopeAccess": True},  # add this when creating Camoufox instance
+        disable_coop=True,  # add this when creating Camoufox instance
     ) as browser_raw:
-        # InvisiblePlaywright yields a Browser instance
+        # Cast to Browser since AsyncCamoufox always returns a Browser, not BrowserContext
         browser = cast("Browser", browser_raw)
         context = await browser.new_context()
         page = await context.new_page()
         async with ClickSolver(
-            # Not PATCHRIGHT: that path skips the unlockShadowRoot init script
-            # and injects it over CDP instead, which Firefox has no session for
-            # ("CDP session is only available in Chromium"). Cloudflare builds
-            # its widget inside a closed shadow root, so without that script
-            # nothing -- not the solver, not page.locator -- can see the
-            # challenge iframe, and every solve attempt fails outright.
-            framework=FrameworkType.PLAYWRIGHT,
+            framework=FrameworkType.CAMOUFOX,
             page=page,
             max_attempts=MAX_ATTEMPTS,
             attempt_delay=1,
         ) as solver:
-            yield BrowserDepClass(page, solver, context)
+            yield CamoufoxDepClass(page, solver, context)

tests/main_test.py

@@ -1,61 +1,33 @@
-import base64
-import json
-import re
 from http import HTTPStatus
 from json import JSONDecodeError
-from unittest.mock import AsyncMock, MagicMock
 
-import httpx2
+import httpx
 import pytest
-from fastapi import HTTPException
-from playwright.async_api import TimeoutError as PlaywrightTimeoutError
-from playwright_captcha.utils.exceptions import (
-    CaptchaDetectionError,
-    CaptchaSolvingError,
-)
 from starlette.testclient import TestClient
 
 from main import app
-from src.endpoints import CHALLENGE_MARKERS, read_item
 from src.models import LinkRequest
-from src.utils import BrowserDepClass
 
 client = TestClient(app)
 
-# Real Firefox advertises 16 cipher suites; Playwright's HTTP client advertised
-# 52. A small margin absorbs Firefox version drift without letting 52 through.
-FIREFOX_CIPHER_SUITE_CEILING = 20
-
-# Sites Byparr clears from any network, datacenter ranges included. These carry
-# the hard assertion: if the bypass breaks, one of these goes red.
 test_websites = [
-    # Purpose-built Cloudflare challenge target. Serves a real interstitial and
-    # hands back a cf_clearance cookie once it is passed, so a pass here means
-    # the challenge was solved rather than never presented.
-    "https://nowsecure.nl/",
-    'https://www.yggtorrent.top/engine/search?do=search&order=desc&sort=publish_date&name="UNESCAPED"+"DOUBLEQUOTES"&category=2145',
-]
-
-# Cloudflare hands these its interactive checkbox challenge and then refuses the
-# click from datacenter ranges: the widget goes to "verifying you are human" and
-# comes back as a fresh unchecked box, indefinitely. Measured over four fresh
-# navigations and nine clicks, and reproduced from two unrelated hosting
-# providers on two architectures -- it is the visitor's IP being judged, not our
-# code. They still run rather than being skipped, so a real regression is
-# visible in the report and a pass is recorded as xpass, but the runner's luck
-# with Cloudflare cannot turn the build red.
-datacenter_hostile_websites = [
     "https://ext.to/",
     # "https://www.ygg.re/",
     "https://extratorrent.st/",
     "https://speed.cd/login",
+    'https://www.yggtorrent.top/engine/search?do=search&order=desc&sort=publish_date&name="UNESCAPED"+"DOUBLEQUOTES"&category=2145',
     "https://1337x.to/home/",
 ]
 
 
-def _bypass(website: str) -> None:
-    """Ask Byparr for the page and require a clean answer."""
-    test_request = httpx2.get(
+@pytest.mark.parametrize("website", test_websites)
+def test_bypass(website: str):
+    """
+    Tests if the service can bypass cloudflare/DDOS-GUARD on given websites.
+
+    This test is skipped if the website is not reachable or does not have cloudflare/DDOS-GUARD.
+    """
+    test_request = httpx.get(
         website,
     )
     if (
@@ -78,82 +50,6 @@ def _bypass(website: str) -> None:
     assert response.status_code == HTTPStatus.OK
 
 
-@pytest.mark.parametrize("website", test_websites)
-def test_bypass(website: str):
-    """Tests if the service can bypass cloudflare/DDOS-GUARD on given websites."""
-    _bypass(website)
-
-
-@pytest.mark.xfail(
-    reason="Cloudflare refuses the checkbox click from datacenter IPs",
-    strict=False,
-)
-@pytest.mark.parametrize("website", datacenter_hostile_websites)
-def test_bypass_datacenter_hostile(website: str):
-    """Same check against sites Cloudflare guards hardest, outcome permitting."""
-    _bypass(website)
-
-
-def test_json_api():
-    """JSON APIs must return 200, not crash on the UA evaluate.
-
-    Firefox renders application/json in a built-in viewer whose CSP blocks
-    Playwright's eval-based evaluate() (issue #394). The browser must be
-    launched with the viewer disabled so /v1 works and returns the raw JSON.
-    """
-    url = "https://api.ipify.org?format=json"
-    test_request = httpx2.get(url)
-    if test_request.status_code >= HTTPStatus.INTERNAL_SERVER_ERROR:
-        pytest.skip(
-            f"Skipping JSON API test - upstream error ({test_request.status_code})"
-        )
-
-    response = client.post(
-        "/v1",
-        json=LinkRequest.model_construct(url=url, cmd="request.get").model_dump(),
-    )
-
-    if response.status_code == HTTPStatus.REQUEST_TIMEOUT:
-        pytest.skip("Skipping JSON API test - timed out (upstream issue)")
-
-    assert response.status_code == HTTPStatus.OK
-    solution = response.json()["solution"]
-    assert solution["userAgent"]
-    assert '"ip"' in solution["response"]
-
-
-def test_tls_handshake_looks_like_firefox():
-    """
-    The handshake must be Firefox's, not the HTTP client's (#398).
-
-    route.fetch() re-issued navigations through Playwright's own HTTP stack, so
-    the ClientHello advertised 52 cipher suites where Firefox offers 16 -- a
-    fingerprint no amount of header spoofing hides. Unlike a Cloudflare verdict
-    this is deterministic, so it pins the regression that motivated this branch.
-    """
-    url = "https://www.howsmyssl.com/a/check"
-    if httpx2.get(url).status_code >= HTTPStatus.INTERNAL_SERVER_ERROR:
-        pytest.skip("Skipping TLS check - howsmyssl is down")
-
-    response = client.post(
-        "/v1",
-        json=LinkRequest.model_construct(url=url, cmd="request.get").model_dump(),
-    )
-    assert response.status_code == HTTPStatus.OK
-
-    body = response.json()["solution"]["response"]
-    report = json.loads(
-        re.sub(r"<[^>]+>", "", re.search(r"\{.*\}", body, re.DOTALL).group(0))
-    )
-    suites = len(report["given_cipher_suites"])
-
-    # Firefox offers 16; Playwright's client offered 52. Anything in between
-    # means the navigation is no longer going through the browser.
-    assert suites <= FIREFOX_CIPHER_SUITE_CEILING, (
-        f"{suites} cipher suites offered - the handshake is not Firefox's"
-    )
-
-
 def test_health_check():
     """
     Tests the health check endpoint.
@@ -163,179 +59,3 @@ def test_health_check():
     """
     response = client.get("/health")
     assert response.status_code == HTTPStatus.OK
-
-
-def test_pdf_handling():
-    """Tests that PDF URLs return the raw PDF bytes, not the Firefox viewer HTML."""
-    pdf_url = "https://mondaymandala.com/wp-content/uploads/Mickey-And-Minnie-Mouse-Holding-An-Easter-Egg-Basket-Coloring-Page-For-Kids.pdf"
-    response = client.post(
-        "/v1",
-        json=LinkRequest.model_construct(url=pdf_url, cmd="request.get").model_dump(),
-    )
-    if response.status_code == HTTPStatus.REQUEST_TIMEOUT:
-        pytest.skip("Skipping PDF test - timed out (upstream issue)")
-    assert response.status_code == HTTPStatus.OK
-    solution = response.json()["solution"]
-    if solution.get("contentType") != "application/pdf":
-        pytest.skip(
-            "Skipping PDF test - PDF bytes could not be fetched (upstream issue)"
-        )
-    assert solution["response"]  # non-empty base64
-
-    decoded = base64.b64decode(solution["response"])
-    assert decoded[:5] == b"%PDF-"
-
-
-@pytest.mark.parametrize(
-    ("payload", "expected"),
-    [
-        ({"max_timeout": 60}, 60),  # native API: seconds
-        ({"maxTimeout": 60}, 60),  # FlareSolverr alias, seconds-range value
-        ({"maxTimeout": 60000}, 60),  # FlareSolverr alias: milliseconds
-        ({"maxTimeout": 55000}, 55),
-        ({"maxTimeout": 1000}, 1),
-        ({}, 60),  # default
-    ],
-)
-def test_max_timeout_normalization(payload: dict, expected: int):
-    """MaxTimeout must accept FlareSolverr's milliseconds while keeping seconds."""
-    request = LinkRequest(url="https://example.com", **payload)
-    assert request.max_timeout == expected
-
-
-def fake_dep(
-    *,
-    fail_states: set[str] | None = None,
-    challenged: bool = False,
-    marker_counts: list[int] | None = None,
-) -> BrowserDepClass:
-    """
-    Build a browser dependency triple backed by mocks.
-
-    `challenged` makes the detector report a Cloudflare challenge.
-    `marker_counts` drives the "is it still up?" check that runs after each
-    solve attempt: one entry per look, the last one repeating forever.
-    """
-    page = AsyncMock()
-    page.url = "https://example.test/login"
-    page.goto.return_value = MagicMock(
-        status=HTTPStatus.OK,
-        headers={"content-type": "text/html"},
-        request=MagicMock(headers={"user-agent": "UnitTestBrowser/1.0"}),
-    )
-    page.title.return_value = "Login"
-    page.evaluate.return_value = "UnitTestBrowser/1.0"
-    page.content.return_value = "<html><title>Login</title></html>"
-
-    remaining = list(marker_counts or [])
-
-    def count_for(selector: str) -> int:
-        """Answer the marker check from the script, everything else from `challenged`."""
-        if selector != CHALLENGE_MARKERS or not remaining:
-            return 1 if challenged else 0
-        return remaining.pop(0) if len(remaining) > 1 else remaining[0]
-
-    def locator(selector: str) -> MagicMock:
-        handle = MagicMock()
-        handle.count = AsyncMock(return_value=None)
-        handle.count.side_effect = lambda: count_for(selector)
-        return handle
-
-    page.locator = MagicMock(side_effect=locator)
-
-    def wait_for_load_state(state: str, **_kwargs: object) -> None:
-        """Fail the wait when asked for a configured state."""
-        if state in (fail_states or set()):
-            message = "load state wait timed out"
-            raise PlaywrightTimeoutError(message)
-
-    page.wait_for_load_state.side_effect = wait_for_load_state
-
-    context = AsyncMock()
-    context.cookies.return_value = []
-    return BrowserDepClass(page=page, solver=AsyncMock(), context=context)
-
-
-@pytest.mark.asyncio
-async def test_networkidle_timeout_after_domcontentloaded_returns_content():
-    """Pages that never go idle after DOM load must still return their content."""
-    dep = fake_dep(fail_states={"networkidle"})
-    response = await read_item(
-        LinkRequest(url="https://example.test/login"),
-        dep,
-    )
-
-    assert response.status == "ok"
-    assert response.solution.status == HTTPStatus.OK
-    assert response.solution.response == "<html><title>Login</title></html>"
-    dep.solver.solve_captcha.assert_not_called()
-
-
-@pytest.mark.asyncio
-async def test_domcontentloaded_timeout_returns_408():
-    """Fatal timeouts during initial page load still return a controlled 408."""
-    with pytest.raises(HTTPException) as exc:
-        await read_item(
-            LinkRequest(url="https://example.test/login"),
-            fake_dep(fail_states={"domcontentloaded"}),
-        )
-
-    assert exc.value.status_code == HTTPStatus.REQUEST_TIMEOUT
-
-
-@pytest.mark.asyncio
-async def test_challenge_that_clears_after_the_click_succeeds():
-    """
-    The solver's own "challenge still present" verdict must not end the request.
-
-    It judges its click by waiting for networkidle, which returns as soon as the
-    network happens to be quiet -- 9ms after the click, in practice -- while
-    Cloudflare is still showing "verifying you are human". Byparr has to wait
-    for the challenge markup itself to go away.
-    """
-    dep = fake_dep(challenged=True, marker_counts=[1, 0])
-    dep.solver.solve_captcha.side_effect = CaptchaSolvingError(
-        "challenge still present or expected content not detected"
-    )
-
-    response = await read_item(
-        LinkRequest(url="https://example.test/login", max_timeout=5), dep
-    )
-
-    assert response.status == "ok"
-    assert response.solution.status == HTTPStatus.OK
-
-
-@pytest.mark.asyncio
-async def test_challenge_that_never_clears_returns_408():
-    """A challenge still up when the budget runs out is a timeout, not a 500."""
-    dep = fake_dep(challenged=True, marker_counts=[1])
-    dep.solver.solve_captcha.side_effect = CaptchaDetectionError(
-        "Cloudflare iframes not found"
-    )
-
-    with pytest.raises(HTTPException) as exc:
-        await read_item(
-            LinkRequest(url="https://example.test/login", max_timeout=2), dep
-        )
-
-    assert exc.value.status_code == HTTPStatus.REQUEST_TIMEOUT
-
-
-@pytest.mark.asyncio
-async def test_user_agent_survives_csp_blocked_evaluate():
-    """UA comes from request headers when page CSP blocks evaluate (#394).
-
-    No CSP configuration (header, meta tag, or internal viewer document) may
-    turn /v1 into a 500.
-    """
-    dep = fake_dep()
-    dep.page.evaluate.side_effect = Exception("call to eval() blocked by CSP")
-
-    response = await read_item(
-        LinkRequest(url="https://example.test/login"),
-        dep,
-    )
-
-    assert response.status == "ok"
-    assert response.solution.user_agent == "UnitTestBrowser/1.0"

tests/owui_test.py

@@ -1,115 +0,0 @@
-from http import HTTPStatus
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-from playwright.async_api import TimeoutError as PlaywrightTimeoutError
-from starlette.testclient import TestClient
-
-from main import app
-from src.owui import LoadRequest, load_urls
-from src.utils import BrowserDepClass
-
-client = TestClient(app)
-
-
-def test_owui_load_basic():
-    """/load returns one result per URL with the expected shape."""
-    response = client.post("/load", json={"urls": ["https://example.com"]})
-    assert response.status_code == HTTPStatus.OK
-    results = response.json()
-    assert len(results) == 1
-    assert results[0]["page_content"]
-    assert results[0]["metadata"] == {"source": "https://example.com"}
-
-
-def test_owui_load_multiple_urls():
-    """/load returns one result per URL, in order."""
-    urls = ["https://example.com", "https://example.org"]
-    response = client.post("/load", json={"urls": urls})
-    assert response.status_code == HTTPStatus.OK
-    results = response.json()
-    assert [r["metadata"]["source"] for r in results] == urls
-
-
-def test_owui_load_invalid_url_graceful():
-    """Unreachable URLs yield empty page_content instead of an error."""
-    response = client.post(
-        "/load", json={"urls": ["https://this-domain-does-not-exist-12345.invalid"]}
-    )
-    assert response.status_code == HTTPStatus.OK
-    results = response.json()
-    assert len(results) == 1
-    assert results[0]["page_content"] == ""
-
-
-@pytest.mark.parametrize(
-    "headers",
-    [None, {"Authorization": "Bearer wrong-key"}],
-)
-def test_owui_load_rejects_missing_or_wrong_key(headers):
-    """/load returns 401 without a valid bearer token when a key is set."""
-    with patch("src.owui.OWUI_API_KEY", "test-secret-key"):
-        response = client.post(
-            "/load", json={"urls": ["https://example.com"]}, headers=headers
-        )
-        assert response.status_code == HTTPStatus.UNAUTHORIZED
-
-
-def test_owui_load_accepts_valid_key():
-    """/load succeeds with the configured bearer token."""
-    with patch("src.owui.OWUI_API_KEY", "test-secret-key"):
-        response = client.post(
-            "/load",
-            json={"urls": ["https://example.com"]},
-            headers={"Authorization": "Bearer test-secret-key"},
-        )
-        assert response.status_code == HTTPStatus.OK
-
-
-ARTICLE_HTML = """<html><head><title>Test</title></head><body>
-<article><h1>Example Title</h1><p>This is the main article body with enough words for
-trafilatura to consider it real content rather than boilerplate.</p></article>
-<nav><a href="/x">nav link</a></nav>
-</body></html>"""
-
-
-def fake_dep(*, html: str = ARTICLE_HTML) -> BrowserDepClass:
-    """Browser dependency whose page loads HTML but never reaches networkidle."""
-    page = AsyncMock()
-    page.goto.return_value = MagicMock()
-    page.content.return_value = html
-    page.locator = MagicMock()
-    page.locator.return_value.inner_text = AsyncMock(
-        return_value="line one\n\nline two"
-    )
-
-    def wait_for_load_state(state: str, **_kwargs: object) -> None:
-        if state == "networkidle":
-            message = "load state wait timed out"
-            raise PlaywrightTimeoutError(message)
-
-    page.wait_for_load_state.side_effect = wait_for_load_state
-    return BrowserDepClass(page=page, solver=AsyncMock(), context=AsyncMock())
-
-
-@pytest.mark.asyncio
-async def test_networkidle_timeout_still_extracts_content():
-    """A page that never reaches networkidle still yields its article text."""
-    results = await load_urls(
-        LoadRequest(urls=["https://example.test"]), None, fake_dep()
-    )
-    assert results[0].page_content == (
-        "Example TitleThis is the main article body with enough words for "
-        "trafilatura to consider it real content rather than boilerplate."
-    )
-
-
-@pytest.mark.asyncio
-async def test_extraction_falls_back_to_innertext():
-    """Pages trafilatura cannot score fall back to the rendered innerText."""
-    results = await load_urls(
-        LoadRequest(urls=["https://example.test"]),
-        None,
-        fake_dep(html="<html><body></body></html>"),
-    )
-    assert results[0].page_content == "line one\nline two"