mirror of
https://github.com/CloakHQ/CloakBrowser.git
synced 2026-06-23 11:41:46 +02:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d63ddd4d43 | ||
|
|
03a0ad732f |
@@ -83,8 +83,10 @@ jobs:
|
|||||||
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
||||||
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
|
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
|
||||||
with:
|
with:
|
||||||
node-version: 24 # npm 11.11.0 native — no upgrade needed (Node 22.22.2 has broken npm)
|
node-version: 22
|
||||||
registry-url: 'https://registry.npmjs.org'
|
registry-url: 'https://registry.npmjs.org'
|
||||||
|
- name: Upgrade npm
|
||||||
|
run: npm install -g npm@latest
|
||||||
- name: Build
|
- name: Build
|
||||||
run: cd js && npm ci && npm run build
|
run: cd js && npm ci && npm run build
|
||||||
- name: Publish to npm
|
- name: Publish to npm
|
||||||
|
|||||||
@@ -67,8 +67,3 @@ debug
|
|||||||
publish-docker.sh
|
publish-docker.sh
|
||||||
captures
|
captures
|
||||||
20[0-9][0-9]-[0-9][0-9]-[0-9][0-9]-*.txt
|
20[0-9][0-9]-[0-9][0-9]-[0-9][0-9]-*.txt
|
||||||
|
|
||||||
# Beads / Dolt files (added by bd init)
|
|
||||||
.dolt/
|
|
||||||
*.db
|
|
||||||
.beads-credential-key
|
|
||||||
|
|||||||
@@ -6,39 +6,6 @@ Changes are tagged: **[wrapper]** for Python/JS wrapper, **[binary]** for Chromi
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## [0.3.23] — 2026-04-09
|
|
||||||
|
|
||||||
- **[wrapper]** Add full Puppeteer humanize support — human-like mouse, keyboard, and scroll behavior for `puppeteer-core` users (thanks [@evelaa123](https://github.com/evelaa123), #129)
|
|
||||||
- **[wrapper]** Fix Playwright humanize gaps — `pressSequentially`, `tap`, `clear` on pages and frames now use human-like behavior (#129)
|
|
||||||
- **[wrapper]** Expose humanize module for CDP-connected browsers — `import from 'cloakbrowser/human'` for manual patching of external Playwright instances (#126)
|
|
||||||
- **[docker]** Fix `cloakserve` locale/timezone mismatch — CLI args now route through `build_args()` so the companion `--lang` flag is added automatically (#130)
|
|
||||||
- **[meta]** Use Node 24 in CI publish workflow to work around broken npm in Node 22.22.2
|
|
||||||
|
|
||||||
## [0.3.22] — 2026-04-09
|
|
||||||
|
|
||||||
- **[binary]** Upgrade Linux x64 build to Chromium 146.0.7680.177.1 — 49 source-level C++ patches (up from 48), rebased from 145.0.7632.x
|
|
||||||
|
|
||||||
## [0.3.21] — 2026-04-07
|
|
||||||
|
|
||||||
- **[wrapper]** Remove dead `--disable-blink-features=AutomationControlled` flag -- binary patch 009 already handles `navigator.webdriver` at source level
|
|
||||||
- **[wrapper]** Remove hardcoded GPU vendor/renderer flags -- binary auto-generates diverse, realistic GPU profiles from the fingerprint seed. Each seed gets a unique GPU instead of every user sharing the same one
|
|
||||||
- **[wrapper]** Allow `viewport=None` to disable viewport emulation in both Python and JS wrappers (thanks [@kitiho](https://github.com/kitiho), #107)
|
|
||||||
- **[wrapper]** Enable `geoip=True` in stealth test example to fix FingerprintJS detection
|
|
||||||
- **[meta]** Remove npm self-upgrade step in CI -- Node 22 ships with compatible npm
|
|
||||||
- **[docker]** Install `geoip2` in Docker image for GeoIP auto-detection support
|
|
||||||
|
|
||||||
## [0.3.20] — 2026-04-06
|
|
||||||
|
|
||||||
- **[binary]** Upgrade Linux x64 build to 145.0.7632.159.9 — 48 source-level C++ patches (up from 42)
|
|
||||||
- **[binary]** 6 new patches: WebRTC IP spoofing, proxy signal removal, network timing normalization, WebGL accuracy improvements
|
|
||||||
- **[binary]** New `--fingerprint-webrtc-ip` flag — spoof WebRTC ICE candidate IPs to match your proxy exit IP
|
|
||||||
- **[binary]** Proxy detection signals eliminated — timing, headers, and network metadata normalized when proxy is active
|
|
||||||
- **[binary]** WebGL rendering accuracy improvements for headed mode
|
|
||||||
- **[wrapper]** Auto-inject `--fingerprint-webrtc-ip` when `geoip=True` — uses resolved exit IP from GeoIP lookup
|
|
||||||
- **[wrapper]** Rewrite `cloakserve` as CDP multiplexer with per-connection fingerprint seeds and connection tracking
|
|
||||||
- **[wrapper]** Humanize keyboard improvements — better behavioral stealth for typing interactions (thanks [@evelaa123](https://github.com/evelaa123))
|
|
||||||
- **[meta]** Bump GitHub Actions dependencies
|
|
||||||
|
|
||||||
## [0.3.19] — 2026-03-30
|
## [0.3.19] — 2026-03-30
|
||||||
|
|
||||||
- **[binary]** Upgrade Linux x64 build to 145.0.7632.159.8 — 42 source-level C++ patches (up from 33)
|
- **[binary]** Upgrade Linux x64 build to 145.0.7632.159.8 — 42 source-level C++ patches (up from 33)
|
||||||
|
|||||||
+1
-1
@@ -20,7 +20,7 @@ WORKDIR /app
|
|||||||
# Python wrapper
|
# Python wrapper
|
||||||
COPY pyproject.toml README.md LICENSE BINARY-LICENSE.md CHANGELOG.md ./
|
COPY pyproject.toml README.md LICENSE BINARY-LICENSE.md CHANGELOG.md ./
|
||||||
COPY cloakbrowser/ cloakbrowser/
|
COPY cloakbrowser/ cloakbrowser/
|
||||||
RUN pip install --no-cache-dir ".[serve,geoip]"
|
RUN pip install --no-cache-dir ".[serve]"
|
||||||
|
|
||||||
# JS wrapper
|
# JS wrapper
|
||||||
COPY js/ js/
|
COPY js/ js/
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ Drop-in Playwright/Puppeteer replacement for Python and JavaScript.<br>
|
|||||||
Same API, same code — just swap the import. <strong>3 lines of code, 30 seconds to unblock.</strong>
|
Same API, same code — just swap the import. <strong>3 lines of code, 30 seconds to unblock.</strong>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
- **49 source-level C++ patches** — canvas, WebGL, audio, fonts, GPU, screen, WebRTC, network timing, automation signals, CDP input behavior
|
- **42 source-level C++ patches** — canvas, WebGL, audio, fonts, GPU, screen, automation signals, CDP input behavior
|
||||||
- **`humanize=True`** — human-like mouse curves, keyboard timing, and scroll patterns. One flag, behavioral detection passes
|
- **`humanize=True`** — human-like mouse curves, keyboard timing, and scroll patterns. One flag, behavioral detection passes
|
||||||
- **0.9 reCAPTCHA v3 score** — human-level, server-verified
|
- **0.9 reCAPTCHA v3 score** — human-level, server-verified
|
||||||
- **Passes Cloudflare Turnstile**, FingerprintJS, BrowserScan — tested against 30+ detection sites
|
- **Passes Cloudflare Turnstile**, FingerprintJS, BrowserScan — tested against 30+ detection sites
|
||||||
@@ -128,15 +128,13 @@ Open [http://localhost:8080](http://localhost:8080). Create a profile. Click **L
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Latest: v0.3.22 (Chromium 146.0.7680.177.1)
|
## Latest: v0.3.19 (Chromium 145.0.7632.159.8)
|
||||||
|
|
||||||
- **Chromium 146 upgrade** — rebased all patches from 145.0.7632.x to 146.0.7680.177
|
- **`humanize=True`** — one flag makes all mouse, keyboard, and scroll interactions behave like a real user. Bézier curves, per-character typing, realistic scroll patterns. Two presets: `default` and `careful`
|
||||||
- **49 fingerprint patches** (Linux x64) — 1 new patch, all existing patches carried forward
|
- **CDP input behavior mimicking** — input events sent via CDP now produce the same signals as real user interactions. 4 source-level patches covering pointer, keyboard, and mouse behavior
|
||||||
- **WebRTC IP spoofing** — `--fingerprint-webrtc-ip=auto` resolves your proxy's exit IP and spoofs WebRTC ICE candidates. Auto-injected when using `geoip=True` (no extra network call)
|
- **Native locale spoofing** — new C++ patch replaces detectable CDP-level locale emulation
|
||||||
- **Proxy signal removal** — DNS/connect/SSL timing zeroed, proxy cache headers stripped, Proxy-Connection header leak removed
|
- **WebGPU fingerprint hardening** — adapter features, limits, and device ID spoofed for cross-API consistency
|
||||||
- **`cloakserve` CDP multiplexer** — rewritten as a multi-connection CDP proxy with per-connection fingerprint seeds
|
- **42 fingerprint patches** (Linux x64) — all 4 platforms on Chromium 145
|
||||||
- **Humanize CDP isolation** — keyboard events now use isolated worlds and trusted dispatch for better behavioral stealth
|
|
||||||
- **`humanize=True`** — one flag makes all mouse, keyboard, and scroll interactions behave like a real user. Bézier curves, per-character typing, realistic scroll patterns
|
|
||||||
- **Stealthy with zero flags** — binary auto-generates a random fingerprint seed at startup. No configuration required
|
- **Stealthy with zero flags** — binary auto-generates a random fingerprint seed at startup. No configuration required
|
||||||
- **Timezone & locale from proxy IP** — `launch(proxy="...", geoip=True)` auto-detects timezone and locale
|
- **Timezone & locale from proxy IP** — `launch(proxy="...", geoip=True)` auto-detects timezone and locale
|
||||||
- **Persistent profiles** — `launch_persistent_context()` keeps cookies and localStorage across sessions, bypasses incognito detection
|
- **Persistent profiles** — `launch_persistent_context()` keeps cookies and localStorage across sessions, bypasses incognito detection
|
||||||
@@ -155,7 +153,7 @@ CloakBrowser doesn't solve CAPTCHAs — it prevents them from appearing. No CAPT
|
|||||||
|
|
||||||
## Test Results
|
## Test Results
|
||||||
|
|
||||||
All tests verified against live detection services. Last tested: Apr 2026 (Chromium 146).
|
All tests verified against live detection services. Last tested: Mar 2026 (Chromium 145).
|
||||||
|
|
||||||
| Detection Service | Stock Playwright | CloakBrowser | Notes |
|
| Detection Service | Stock Playwright | CloakBrowser | Notes |
|
||||||
|---|---|---|---|
|
|---|---|---|---|
|
||||||
@@ -170,7 +168,7 @@ All tests verified against live detection services. Last tested: Apr 2026 (Chrom
|
|||||||
| `navigator.webdriver` | `true` | **`false`** | Source-level patch |
|
| `navigator.webdriver` | `true` | **`false`** | Source-level patch |
|
||||||
| `navigator.plugins.length` | 0 | **5** | Real plugin list |
|
| `navigator.plugins.length` | 0 | **5** | Real plugin list |
|
||||||
| `window.chrome` | `undefined` | **`object`** | Present like real Chrome |
|
| `window.chrome` | `undefined` | **`object`** | Present like real Chrome |
|
||||||
| UA string | `HeadlessChrome` | **`Chrome/146.0.0.0`** | No headless leak |
|
| UA string | `HeadlessChrome` | **`Chrome/145.0.0.0`** | No headless leak |
|
||||||
| CDP detection | Detected | **Not detected** | `isAutomatedWithCDP: false` |
|
| CDP detection | Detected | **Not detected** | `isAutomatedWithCDP: false` |
|
||||||
| TLS fingerprint | Mismatch | **Identical to Chrome** | ja3n/ja4/akamai match |
|
| TLS fingerprint | Mismatch | **Identical to Chrome** | ja3n/ja4/akamai match |
|
||||||
| | | **Tested against 30+ detection sites** | |
|
| | | **Tested against 30+ detection sites** | |
|
||||||
@@ -219,11 +217,11 @@ All tests verified against live detection services. Last tested: Apr 2026 (Chrom
|
|||||||
CloakBrowser is a thin wrapper (Python + JavaScript) around a custom-built Chromium binary:
|
CloakBrowser is a thin wrapper (Python + JavaScript) around a custom-built Chromium binary:
|
||||||
|
|
||||||
1. **You install** → `pip install cloakbrowser` or `npm install cloakbrowser`
|
1. **You install** → `pip install cloakbrowser` or `npm install cloakbrowser`
|
||||||
2. **First launch** → binary auto-downloads for your platform (Chromium 146)
|
2. **First launch** → binary auto-downloads for your platform (Chromium 145)
|
||||||
3. **Every launch** → Playwright or Puppeteer starts with our binary + stealth args
|
3. **Every launch** → Playwright or Puppeteer starts with our binary + stealth args
|
||||||
4. **You write code** → standard Playwright/Puppeteer API, nothing new to learn
|
4. **You write code** → standard Playwright/Puppeteer API, nothing new to learn
|
||||||
|
|
||||||
The binary includes 49 source-level patches covering canvas, WebGL, audio, fonts, GPU, screen properties, WebRTC, network timing, hardware reporting, automation signal removal, and CDP input behavior mimicking.
|
The binary includes 42 source-level patches covering canvas, WebGL, audio, fonts, GPU, screen properties, hardware reporting, automation signal removal, and CDP input behavior mimicking.
|
||||||
|
|
||||||
These are compiled into the Chromium binary — not injected via JavaScript, not set via flags.
|
These are compiled into the Chromium binary — not injected via JavaScript, not set via flags.
|
||||||
|
|
||||||
@@ -255,19 +253,11 @@ browser = launch(args=["--disable-gpu"])
|
|||||||
browser = launch(timezone="America/New_York", locale="en-US")
|
browser = launch(timezone="America/New_York", locale="en-US")
|
||||||
|
|
||||||
# Auto-detect timezone/locale from proxy IP (requires: pip install cloakbrowser[geoip])
|
# Auto-detect timezone/locale from proxy IP (requires: pip install cloakbrowser[geoip])
|
||||||
# Also auto-injects --fingerprint-webrtc-ip to prevent WebRTC IP leaks (no extra cost)
|
|
||||||
# Note: makes HTTP calls through your proxy to resolve exit IP (ipify.org, checkip.amazonaws.com)
|
|
||||||
browser = launch(proxy="http://proxy:8080", geoip=True)
|
browser = launch(proxy="http://proxy:8080", geoip=True)
|
||||||
|
|
||||||
# Explicit timezone/locale always win over auto-detection
|
# Explicit timezone/locale always win over auto-detection
|
||||||
browser = launch(proxy="http://proxy:8080", geoip=True, timezone="Europe/London")
|
browser = launch(proxy="http://proxy:8080", geoip=True, timezone="Europe/London")
|
||||||
|
|
||||||
# WebRTC IP spoofing only (no geoip dep needed — resolves exit IP via HTTP call through proxy)
|
|
||||||
browser = launch(proxy="http://proxy:8080", args=["--fingerprint-webrtc-ip=auto"])
|
|
||||||
|
|
||||||
# Explicit WebRTC IP (no network call)
|
|
||||||
browser = launch(proxy="http://proxy:8080", args=["--fingerprint-webrtc-ip=1.2.3.4"])
|
|
||||||
|
|
||||||
# Human-like mouse, keyboard, and scroll behavior
|
# Human-like mouse, keyboard, and scroll behavior
|
||||||
browser = launch(humanize=True)
|
browser = launch(humanize=True)
|
||||||
|
|
||||||
@@ -370,7 +360,7 @@ from cloakbrowser import binary_info, clear_cache, ensure_binary
|
|||||||
|
|
||||||
# Check binary installation status
|
# Check binary installation status
|
||||||
print(binary_info())
|
print(binary_info())
|
||||||
# {'version': '146.0.7680.177.1', 'platform': 'linux-x64', 'installed': True, ...}
|
# {'version': '145.0.7632.159.2', 'platform': 'linux-x64', 'installed': True, ...}
|
||||||
|
|
||||||
# Force re-download
|
# Force re-download
|
||||||
clear_cache()
|
clear_cache()
|
||||||
@@ -452,7 +442,7 @@ clearCache();
|
|||||||
|
|
||||||
## Human Behavior
|
## Human Behavior
|
||||||
|
|
||||||
Pass `humanize=True` to make all mouse, keyboard, and scroll interactions indistinguishable from real users. All Playwright calls (`page.click()`, `page.fill()`, `page.type()`, `page.mouse.*`, `page.keyboard.*`, Locator API) and Puppeteer calls (`page.click()`, `page.type()`, `page.mouse.*`, `page.keyboard.*`, ElementHandle API) are automatically replaced with human-like equivalents. No code changes needed.
|
Pass `humanize=True` to make all mouse, keyboard, and scroll interactions indistinguishable from real users. All Playwright calls — `page.click()`, `page.fill()`, `page.type()`, `page.mouse.*`, `page.keyboard.*`, and the full Locator API — are automatically replaced with human-like equivalents. No code changes needed.
|
||||||
|
|
||||||
```python
|
```python
|
||||||
browser = launch(humanize=True)
|
browser = launch(humanize=True)
|
||||||
@@ -463,14 +453,6 @@ page.locator("button[type=submit]").click() # Bézier curve, realistic aim
|
|||||||
```
|
```
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
// Playwright
|
|
||||||
import { launch } from 'cloakbrowser';
|
|
||||||
const browser = await launch({ humanize: true });
|
|
||||||
```
|
|
||||||
|
|
||||||
```javascript
|
|
||||||
// Puppeteer
|
|
||||||
import { launch } from 'cloakbrowser/puppeteer';
|
|
||||||
const browser = await launch({ humanize: true });
|
const browser = await launch({ humanize: true });
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -519,11 +501,9 @@ const browser = await launch({
|
|||||||
|
|
||||||
Access the original un-patched Playwright page at `page._original` if you need raw speed for a specific call.
|
Access the original un-patched Playwright page at `page._original` if you need raw speed for a specific call.
|
||||||
|
|
||||||
> **Note (Playwright):** Always use `page.click(selector)`, `page.type(selector, text)`, `page.hover(selector)`, or `page.locator(selector).*` — these go through the full humanize pipeline. Avoid `page.query_selector()` — `ElementHandle` objects bypass all patches, so mouse movement teleports, keyboard events fire without timing, and scroll has no human curve.
|
> **Note:** Always use `page.click(selector)`, `page.type(selector, text)`, `page.hover(selector)`, or `page.locator(selector).*` — these go through the full humanize pipeline. Avoid `page.query_selector()` — `ElementHandle` objects bypass all patches, so mouse movement teleports, keyboard events fire without timing, and scroll has no human curve.
|
||||||
>
|
|
||||||
> **Note (Puppeteer):** Both selector-based methods (`page.click()`, `page.type()`) and ElementHandle methods (`el.click()`, `el.type()`) are fully humanized. `page.$()`, `page.$$()`, and `page.waitForSelector()` return patched handles automatically.
|
|
||||||
|
|
||||||
> Contributed by [@evelaa123](https://github.com/evelaa123) — full Playwright and Puppeteer API coverage.
|
> Contributed by [@evelaa123](https://github.com/evelaa123) — full Playwright API coverage.
|
||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
|
|
||||||
@@ -565,10 +545,14 @@ Every `launch()` call sets these automatically. The **wrapper** applies platform
|
|||||||
|------|--------------|---------------|----------|
|
|------|--------------|---------------|----------|
|
||||||
| `--fingerprint` | Random (10000–99999) | Random (10000–99999) | Master seed for canvas, WebGL, audio, fonts, client rects |
|
| `--fingerprint` | Random (10000–99999) | Random (10000–99999) | Master seed for canvas, WebGL, audio, fonts, client rects |
|
||||||
| `--fingerprint-platform` | `windows` | `macos` | `navigator.platform`, User-Agent OS, GPU pool selection |
|
| `--fingerprint-platform` | `windows` | `macos` | `navigator.platform`, User-Agent OS, GPU pool selection |
|
||||||
|
| `--fingerprint-gpu-vendor` | `NVIDIA Corporation` | `Google Inc. (Apple)` | WebGL `UNMASKED_VENDOR_WEBGL` |
|
||||||
|
| `--fingerprint-gpu-renderer` | `NVIDIA GeForce RTX 3070` | `ANGLE (Apple, ANGLE Metal Renderer: Apple M3, Unspecified Version)` | WebGL `UNMASKED_RENDERER_WEBGL` |
|
||||||
|
|
||||||
The binary auto-generates everything else from the seed: GPU, hardware concurrency, device memory, and screen dimensions. Each seed produces a unique, consistent fingerprint. Override with explicit flags if needed.
|
The binary auto-generates hardware concurrency (8), device memory (8), and screen dimensions (1920x1080 on Windows/Linux, 1440x900 on macOS) from the seed. Override with explicit flags if needed.
|
||||||
|
|
||||||
> **Using the binary directly?** It works out of the box with zero flags -- the binary auto-spoofs everything. Pass `--fingerprint=seed` for a persistent identity, or use explicit flags like `--fingerprint-gpu-renderer` to override any auto-generated value.
|
> **Using the binary directly?** It works out of the box with zero flags — the binary auto-spoofs everything. Pass `--fingerprint=seed` for a persistent identity, or use explicit flags like `--fingerprint-gpu-renderer` to override any auto-generated value.
|
||||||
|
|
||||||
|
> **Production tip:** For better stealth at scale, pass your own GPU, screen, and hardware values instead of relying on defaults. Custom parameters make your sessions harder to cluster by anti-bot systems that look for uniform fingerprint profiles.
|
||||||
|
|
||||||
### Additional Flags
|
### Additional Flags
|
||||||
|
|
||||||
@@ -576,8 +560,6 @@ Supported by the binary but **not set by default** — pass via `args` to custom
|
|||||||
|
|
||||||
| Flag | Controls |
|
| Flag | Controls |
|
||||||
|------|----------|
|
|------|----------|
|
||||||
| `--fingerprint-gpu-vendor` | WebGL `UNMASKED_VENDOR_WEBGL` (auto-generated from seed + platform) |
|
|
||||||
| `--fingerprint-gpu-renderer` | WebGL `UNMASKED_RENDERER_WEBGL` (auto-generated from seed + platform) |
|
|
||||||
| `--fingerprint-hardware-concurrency` | `navigator.hardwareConcurrency` (auto-generated: `8`) |
|
| `--fingerprint-hardware-concurrency` | `navigator.hardwareConcurrency` (auto-generated: `8`) |
|
||||||
| `--fingerprint-device-memory` | `navigator.deviceMemory` in GB (auto-generated: `8`) |
|
| `--fingerprint-device-memory` | `navigator.deviceMemory` in GB (auto-generated: `8`) |
|
||||||
| `--fingerprint-screen-width` | Screen width (auto-generated: `1920` Win/Linux, `1440` macOS) |
|
| `--fingerprint-screen-width` | Screen width (auto-generated: `1920` Win/Linux, `1440` macOS) |
|
||||||
@@ -591,7 +573,6 @@ Supported by the binary but **not set by default** — pass via `args` to custom
|
|||||||
| `--fingerprint-storage-quota` | Override storage quota in MB — affects `storage.estimate()`, `storageBuckets`, and legacy webkit APIs. Auto-normalized when `--fingerprint` is set |
|
| `--fingerprint-storage-quota` | Override storage quota in MB — affects `storage.estimate()`, `storageBuckets`, and legacy webkit APIs. Auto-normalized when `--fingerprint` is set |
|
||||||
| `--fingerprint-taskbar-height` | Override taskbar height (binary defaults: Win=48, Mac=95, Linux=0) |
|
| `--fingerprint-taskbar-height` | Override taskbar height (binary defaults: Win=48, Mac=95, Linux=0) |
|
||||||
| `--fingerprint-fonts-dir` | Path to cross-platform font directory |
|
| `--fingerprint-fonts-dir` | Path to cross-platform font directory |
|
||||||
| `--fingerprint-webrtc-ip` | WebRTC ICE candidate IP replacement. Use `auto` to resolve from proxy exit IP (makes an HTTP call through the proxy), or pass an explicit IP. Auto-injected when `geoip=True` |
|
|
||||||
| `--fingerprint-noise=false` | Disable noise injection (canvas, WebGL, audio, client rects) while keeping the deterministic fingerprint seed active |
|
| `--fingerprint-noise=false` | Disable noise injection (canvas, WebGL, audio, client rects) while keeping the deterministic fingerprint seed active |
|
||||||
| `--enable-blink-features=FakeShadowRoot` | Access closed shadow DOM elements |
|
| `--enable-blink-features=FakeShadowRoot` | Access closed shadow DOM elements |
|
||||||
|
|
||||||
@@ -607,9 +588,11 @@ browser = launch(args=["--fingerprint=42069"])
|
|||||||
browser = launch(stealth_args=False, args=[
|
browser = launch(stealth_args=False, args=[
|
||||||
"--fingerprint=42069",
|
"--fingerprint=42069",
|
||||||
"--fingerprint-platform=windows",
|
"--fingerprint-platform=windows",
|
||||||
|
"--fingerprint-gpu-vendor=NVIDIA Corporation",
|
||||||
|
"--fingerprint-gpu-renderer=NVIDIA GeForce RTX 3070",
|
||||||
])
|
])
|
||||||
|
|
||||||
# Override GPU to look like a specific machine
|
# Override GPU to look like a different machine
|
||||||
browser = launch(args=[
|
browser = launch(args=[
|
||||||
"--fingerprint-gpu-vendor=Intel Inc.",
|
"--fingerprint-gpu-vendor=Intel Inc.",
|
||||||
"--fingerprint-gpu-renderer=Intel Iris OpenGL Engine",
|
"--fingerprint-gpu-renderer=Intel Iris OpenGL Engine",
|
||||||
@@ -663,11 +646,11 @@ browser = await launch_async(args=["--remote-debugging-port=9242"])
|
|||||||
|
|
||||||
| Platform | Chromium | Patches | Status |
|
| Platform | Chromium | Patches | Status |
|
||||||
|---|---|---|---|
|
|---|---|---|---|
|
||||||
| Linux x86_64 | 146 | 49 | ✅ Latest |
|
| Linux x86_64 | 145 | 42 | ✅ Latest |
|
||||||
| Linux arm64 (RPi, Graviton) | 145 | 48 | ✅ |
|
| Linux arm64 (RPi, Graviton) | 145 | 33 | ✅ |
|
||||||
| macOS arm64 (Apple Silicon) | 145 | 26 | ✅ |
|
| macOS arm64 (Apple Silicon) | 145 | 26 | ✅ |
|
||||||
| macOS x86_64 (Intel) | 145 | 26 | ✅ |
|
| macOS x86_64 (Intel) | 145 | 26 | ✅ |
|
||||||
| Windows x86_64 | 145 | 48 | ✅ |
|
| Windows x86_64 | 145 | 33 | ✅ |
|
||||||
|
|
||||||
The wrapper auto-downloads the correct binary for your platform.
|
The wrapper auto-downloads the correct binary for your platform.
|
||||||
|
|
||||||
@@ -928,9 +911,9 @@ export CLOAKBROWSER_BINARY_PATH=/path/to/your/chrome
|
|||||||
|
|
||||||
Install a specific wrapper version to downgrade both the wrapper and the binary it downloads:
|
Install a specific wrapper version to downgrade both the wrapper and the binary it downloads:
|
||||||
```bash
|
```bash
|
||||||
pip install cloakbrowser==0.3.21 # Python
|
pip install cloakbrowser==0.3.11 # Python
|
||||||
npm install cloakbrowser@0.3.21 # JavaScript
|
npm install cloakbrowser@0.3.11 # JavaScript
|
||||||
docker pull cloakhq/cloakbrowser:0.3.21 # Docker
|
docker pull cloakhq/cloakbrowser:0.3.11 # Docker
|
||||||
```
|
```
|
||||||
Each wrapper version pins its own binary version, so downgrading the wrapper automatically gets you the matching binary on next launch.
|
Each wrapper version pins its own binary version, so downgrading the wrapper automatically gets you the matching binary on next launch.
|
||||||
|
|
||||||
@@ -1026,7 +1009,7 @@ A: Yes. Pass `proxy="http://user:pass@host:port"` to `launch()`.
|
|||||||
|
|
||||||
| Feature | Status |
|
| Feature | Status |
|
||||||
|---------|--------|
|
|---------|--------|
|
||||||
| Linux x64 — Chromium 146 (49 patches) | ✅ Released |
|
| Linux x64 — Chromium 145 (42 patches) | ✅ Released |
|
||||||
| macOS arm64/x64 — Chromium 145 (26 patches) | ✅ Released |
|
| macOS arm64/x64 — Chromium 145 (26 patches) | ✅ Released |
|
||||||
| Windows x64 — Chromium 145 (33 patches) | ✅ Released |
|
| Windows x64 — Chromium 145 (33 patches) | ✅ Released |
|
||||||
| JavaScript/Puppeteer + Playwright support | ✅ Released |
|
| JavaScript/Puppeteer + Playwright support | ✅ Released |
|
||||||
@@ -1050,7 +1033,7 @@ All releases are signed for supply chain verification.
|
|||||||
```bash
|
```bash
|
||||||
# Verify GPG signature (binary release tag)
|
# Verify GPG signature (binary release tag)
|
||||||
gpg --keyserver keyserver.ubuntu.com --recv-keys C60C0DDC9D0DE2DD
|
gpg --keyserver keyserver.ubuntu.com --recv-keys C60C0DDC9D0DE2DD
|
||||||
git verify-tag chromium-v146.0.7680.177.1
|
git verify-tag chromium-v145.0.7632.159.8
|
||||||
|
|
||||||
# Verify GitHub binary attestation (Sigstore)
|
# Verify GitHub binary attestation (Sigstore)
|
||||||
gh attestation verify cloakbrowser-linux-x64.tar.gz --repo CloakHQ/cloakbrowser
|
gh attestation verify cloakbrowser-linux-x64.tar.gz --repo CloakHQ/cloakbrowser
|
||||||
@@ -1075,4 +1058,3 @@ Issues and PRs welcome. If something isn't working, [open an issue](https://gith
|
|||||||
|
|
||||||
- [@evelaa123](https://github.com/evelaa123) — humanize behavior, persistent contexts, Windows fix
|
- [@evelaa123](https://github.com/evelaa123) — humanize behavior, persistent contexts, Windows fix
|
||||||
- [@yahooguntu](https://github.com/yahooguntu) — persistent contexts
|
- [@yahooguntu](https://github.com/yahooguntu) — persistent contexts
|
||||||
- [@kitiho](https://github.com/kitiho) — null viewport fix
|
|
||||||
|
|||||||
+3
-43
@@ -36,7 +36,7 @@ import aiohttp
|
|||||||
import websockets
|
import websockets
|
||||||
from aiohttp import web
|
from aiohttp import web
|
||||||
|
|
||||||
from cloakbrowser.browser import build_args, maybe_resolve_geoip, _resolve_webrtc_args
|
from cloakbrowser.browser import build_args, maybe_resolve_geoip
|
||||||
from cloakbrowser.download import ensure_binary
|
from cloakbrowser.download import ensure_binary
|
||||||
|
|
||||||
logging.basicConfig(
|
logging.basicConfig(
|
||||||
@@ -88,17 +88,11 @@ class ChromePool:
|
|||||||
global_args: list[str],
|
global_args: list[str],
|
||||||
headless: bool,
|
headless: bool,
|
||||||
data_dir: str = "/tmp/cloakserve",
|
data_dir: str = "/tmp/cloakserve",
|
||||||
default_seed: str | None = None,
|
|
||||||
default_locale: str | None = None,
|
|
||||||
default_timezone: str | None = None,
|
|
||||||
):
|
):
|
||||||
self._binary = binary
|
self._binary = binary
|
||||||
self._global_args = global_args
|
self._global_args = global_args
|
||||||
self._headless = headless
|
self._headless = headless
|
||||||
self._data_dir = data_dir
|
self._data_dir = data_dir
|
||||||
self._default_seed = default_seed
|
|
||||||
self._default_locale = default_locale
|
|
||||||
self._default_timezone = default_timezone
|
|
||||||
self._processes: dict[str, ChromeProcess] = {}
|
self._processes: dict[str, ChromeProcess] = {}
|
||||||
self._default: ChromeProcess | None = None
|
self._default: ChromeProcess | None = None
|
||||||
self._locks: dict[str, asyncio.Lock] = {}
|
self._locks: dict[str, asyncio.Lock] = {}
|
||||||
@@ -146,14 +140,6 @@ class ChromePool:
|
|||||||
geoip: bool = False,
|
geoip: bool = False,
|
||||||
) -> ChromeProcess:
|
) -> ChromeProcess:
|
||||||
"""Get existing or launch new Chrome process for a seed."""
|
"""Get existing or launch new Chrome process for a seed."""
|
||||||
# Apply CLI defaults when query params don't provide values
|
|
||||||
if seed is None and self._default_seed:
|
|
||||||
seed = self._default_seed
|
|
||||||
if locale is None:
|
|
||||||
locale = self._default_locale
|
|
||||||
if timezone is None:
|
|
||||||
timezone = self._default_timezone
|
|
||||||
|
|
||||||
# No seed = default shared process
|
# No seed = default shared process
|
||||||
if seed is None:
|
if seed is None:
|
||||||
seed_key = "__default__"
|
seed_key = "__default__"
|
||||||
@@ -180,9 +166,8 @@ class ChromePool:
|
|||||||
await self._cleanup_process(seed_key)
|
await self._cleanup_process(seed_key)
|
||||||
|
|
||||||
# Resolve geoip if requested
|
# Resolve geoip if requested
|
||||||
exit_ip = None
|
|
||||||
if geoip and proxy:
|
if geoip and proxy:
|
||||||
timezone, locale, exit_ip = maybe_resolve_geoip(True, proxy, timezone, locale)
|
timezone, locale = maybe_resolve_geoip(True, proxy, timezone, locale)
|
||||||
|
|
||||||
# Build Chrome args via shared logic
|
# Build Chrome args via shared logic
|
||||||
fp_extra = [f"--fingerprint={actual_seed}"]
|
fp_extra = [f"--fingerprint={actual_seed}"]
|
||||||
@@ -191,12 +176,6 @@ class ChromePool:
|
|||||||
if proxy:
|
if proxy:
|
||||||
fp_extra.append(f"--proxy-server={proxy}")
|
fp_extra.append(f"--proxy-server={proxy}")
|
||||||
|
|
||||||
# WebRTC IP spoofing: resolve auto, inject geoip exit IP
|
|
||||||
fp_extra = _resolve_webrtc_args(fp_extra, proxy)
|
|
||||||
if exit_ip and not any(a.startswith("--fingerprint-webrtc-ip") for a in (fp_extra or [])):
|
|
||||||
fp_extra = list(fp_extra or [])
|
|
||||||
fp_extra.append(f"--fingerprint-webrtc-ip={exit_ip}")
|
|
||||||
|
|
||||||
chrome_args = build_args(
|
chrome_args = build_args(
|
||||||
stealth_args=True,
|
stealth_args=True,
|
||||||
extra_args=fp_extra,
|
extra_args=fp_extra,
|
||||||
@@ -566,20 +545,11 @@ def _default_data_dir() -> str:
|
|||||||
|
|
||||||
|
|
||||||
def parse_cli_args(argv: list[str]) -> tuple[dict, list[str]]:
|
def parse_cli_args(argv: list[str]) -> tuple[dict, list[str]]:
|
||||||
"""Parse cloakserve-specific args, return (config, passthrough_args).
|
"""Parse cloakserve-specific args, return (config, passthrough_args)."""
|
||||||
|
|
||||||
--fingerprint, --fingerprint-locale, and --fingerprint-timezone are
|
|
||||||
extracted into config defaults so they route through build_args()
|
|
||||||
(e.g. locale needs both --lang and --fingerprint-locale).
|
|
||||||
Query-string params override these defaults per-connection.
|
|
||||||
"""
|
|
||||||
config: dict = {
|
config: dict = {
|
||||||
"port": 9222,
|
"port": 9222,
|
||||||
"headless": True,
|
"headless": True,
|
||||||
"data_dir": None,
|
"data_dir": None,
|
||||||
"default_seed": None,
|
|
||||||
"default_locale": None,
|
|
||||||
"default_timezone": None,
|
|
||||||
}
|
}
|
||||||
passthrough = []
|
passthrough = []
|
||||||
# Flags consumed by cloakserve (not passed to Chrome)
|
# Flags consumed by cloakserve (not passed to Chrome)
|
||||||
@@ -600,13 +570,6 @@ def parse_cli_args(argv: list[str]) -> tuple[dict, list[str]]:
|
|||||||
passthrough.append(arg)
|
passthrough.append(arg)
|
||||||
elif arg.startswith(consumed_prefixes):
|
elif arg.startswith(consumed_prefixes):
|
||||||
pass # Strip these silently
|
pass # Strip these silently
|
||||||
# Route through build_args() so companion flags are set correctly
|
|
||||||
elif arg.startswith("--fingerprint-locale="):
|
|
||||||
config["default_locale"] = arg.split("=", 1)[1]
|
|
||||||
elif arg.startswith("--fingerprint-timezone="):
|
|
||||||
config["default_timezone"] = arg.split("=", 1)[1]
|
|
||||||
elif arg.startswith("--fingerprint="):
|
|
||||||
config["default_seed"] = arg.split("=", 1)[1]
|
|
||||||
else:
|
else:
|
||||||
passthrough.append(arg)
|
passthrough.append(arg)
|
||||||
|
|
||||||
@@ -629,9 +592,6 @@ def main() -> None:
|
|||||||
global_args=global_args,
|
global_args=global_args,
|
||||||
headless=config["headless"],
|
headless=config["headless"],
|
||||||
data_dir=config["data_dir"],
|
data_dir=config["data_dir"],
|
||||||
default_seed=config["default_seed"],
|
|
||||||
default_locale=config["default_locale"],
|
|
||||||
default_timezone=config["default_timezone"],
|
|
||||||
)
|
)
|
||||||
|
|
||||||
app = web.Application()
|
app = web.Application()
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
__version__ = "0.3.23"
|
__version__ = "0.3.19"
|
||||||
|
|||||||
+21
-122
@@ -24,9 +24,6 @@ from .download import ensure_binary
|
|||||||
|
|
||||||
logger = logging.getLogger("cloakbrowser")
|
logger = logging.getLogger("cloakbrowser")
|
||||||
|
|
||||||
# Sentinel to distinguish "viewport not provided" from "viewport=None" (disable emulation)
|
|
||||||
_VIEWPORT_UNSET = object()
|
|
||||||
|
|
||||||
|
|
||||||
def _resolve_timezone(timezone: str | None, kwargs: dict[str, Any]) -> str | None:
|
def _resolve_timezone(timezone: str | None, kwargs: dict[str, Any]) -> str | None:
|
||||||
"""Accept both timezone and timezone_id — either works, no warning."""
|
"""Accept both timezone and timezone_id — either works, no warning."""
|
||||||
@@ -104,11 +101,7 @@ def launch(
|
|||||||
sync_playwright = _import_sync_playwright(_resolve_backend(backend))
|
sync_playwright = _import_sync_playwright(_resolve_backend(backend))
|
||||||
|
|
||||||
binary_path = ensure_binary()
|
binary_path = ensure_binary()
|
||||||
timezone, locale, exit_ip = maybe_resolve_geoip(geoip, proxy, timezone, locale)
|
timezone, locale = maybe_resolve_geoip(geoip, proxy, timezone, locale)
|
||||||
args = _resolve_webrtc_args(args, proxy)
|
|
||||||
if exit_ip and not (args and any(a.startswith("--fingerprint-webrtc-ip") for a in args)):
|
|
||||||
args = list(args or [])
|
|
||||||
args.append(f"--fingerprint-webrtc-ip={exit_ip}")
|
|
||||||
chrome_args = build_args(stealth_args, args, timezone=timezone, locale=locale, headless=headless)
|
chrome_args = build_args(stealth_args, args, timezone=timezone, locale=locale, headless=headless)
|
||||||
|
|
||||||
logger.debug("Launching stealth Chromium (headless=%s, args=%d)", headless, len(chrome_args))
|
logger.debug("Launching stealth Chromium (headless=%s, args=%d)", headless, len(chrome_args))
|
||||||
@@ -193,11 +186,7 @@ async def launch_async( # noqa: C901
|
|||||||
async_playwright = _import_async_playwright(_resolve_backend(backend))
|
async_playwright = _import_async_playwright(_resolve_backend(backend))
|
||||||
|
|
||||||
binary_path = ensure_binary()
|
binary_path = ensure_binary()
|
||||||
timezone, locale, exit_ip = maybe_resolve_geoip(geoip, proxy, timezone, locale)
|
timezone, locale = maybe_resolve_geoip(geoip, proxy, timezone, locale)
|
||||||
args = _resolve_webrtc_args(args, proxy)
|
|
||||||
if exit_ip and not (args and any(a.startswith("--fingerprint-webrtc-ip") for a in args)):
|
|
||||||
args = list(args or [])
|
|
||||||
args.append(f"--fingerprint-webrtc-ip={exit_ip}")
|
|
||||||
chrome_args = build_args(stealth_args, args, timezone=timezone, locale=locale, headless=headless)
|
chrome_args = build_args(stealth_args, args, timezone=timezone, locale=locale, headless=headless)
|
||||||
|
|
||||||
logger.debug("Launching stealth Chromium async (headless=%s, args=%d)", headless, len(chrome_args))
|
logger.debug("Launching stealth Chromium async (headless=%s, args=%d)", headless, len(chrome_args))
|
||||||
@@ -240,7 +229,7 @@ def launch_persistent_context(
|
|||||||
args: list[str] | None = None,
|
args: list[str] | None = None,
|
||||||
stealth_args: bool = True,
|
stealth_args: bool = True,
|
||||||
user_agent: str | None = None,
|
user_agent: str | None = None,
|
||||||
viewport: dict | None = _VIEWPORT_UNSET,
|
viewport: dict | None = None,
|
||||||
locale: str | None = None,
|
locale: str | None = None,
|
||||||
timezone: str | None = None,
|
timezone: str | None = None,
|
||||||
color_scheme: Literal["light", "dark", "no-preference"] | None = None,
|
color_scheme: Literal["light", "dark", "no-preference"] | None = None,
|
||||||
@@ -267,7 +256,6 @@ def launch_persistent_context(
|
|||||||
stealth_args: Include default stealth fingerprint args (default True).
|
stealth_args: Include default stealth fingerprint args (default True).
|
||||||
user_agent: Custom user agent string.
|
user_agent: Custom user agent string.
|
||||||
viewport: Viewport size dict, e.g. {"width": 1920, "height": 1080}.
|
viewport: Viewport size dict, e.g. {"width": 1920, "height": 1080}.
|
||||||
Pass None to disable viewport emulation (use OS window size).
|
|
||||||
locale: Browser locale, e.g. "en-US".
|
locale: Browser locale, e.g. "en-US".
|
||||||
timezone: IANA timezone (e.g. 'America/New_York').
|
timezone: IANA timezone (e.g. 'America/New_York').
|
||||||
color_scheme: Color scheme preference — 'light', 'dark', or 'no-preference'.
|
color_scheme: Color scheme preference — 'light', 'dark', or 'no-preference'.
|
||||||
@@ -296,11 +284,7 @@ def launch_persistent_context(
|
|||||||
timezone = _resolve_timezone(timezone, kwargs)
|
timezone = _resolve_timezone(timezone, kwargs)
|
||||||
|
|
||||||
binary_path = ensure_binary()
|
binary_path = ensure_binary()
|
||||||
timezone, locale, exit_ip = maybe_resolve_geoip(geoip, proxy, timezone, locale)
|
timezone, locale = maybe_resolve_geoip(geoip, proxy, timezone, locale)
|
||||||
args = _resolve_webrtc_args(args, proxy)
|
|
||||||
if exit_ip and not (args and any(a.startswith("--fingerprint-webrtc-ip") for a in args)):
|
|
||||||
args = list(args or [])
|
|
||||||
args.append(f"--fingerprint-webrtc-ip={exit_ip}")
|
|
||||||
chrome_args = build_args(stealth_args, args, timezone=timezone, locale=locale, headless=headless)
|
chrome_args = build_args(stealth_args, args, timezone=timezone, locale=locale, headless=headless)
|
||||||
|
|
||||||
logger.debug(
|
logger.debug(
|
||||||
@@ -314,12 +298,7 @@ def launch_persistent_context(
|
|||||||
context_kwargs: dict[str, Any] = {}
|
context_kwargs: dict[str, Any] = {}
|
||||||
if user_agent:
|
if user_agent:
|
||||||
context_kwargs["user_agent"] = user_agent
|
context_kwargs["user_agent"] = user_agent
|
||||||
if viewport is _VIEWPORT_UNSET:
|
context_kwargs["viewport"] = viewport or DEFAULT_VIEWPORT
|
||||||
context_kwargs["viewport"] = DEFAULT_VIEWPORT
|
|
||||||
elif viewport is None:
|
|
||||||
context_kwargs["no_viewport"] = True
|
|
||||||
else:
|
|
||||||
context_kwargs["viewport"] = viewport
|
|
||||||
if color_scheme:
|
if color_scheme:
|
||||||
context_kwargs["color_scheme"] = color_scheme
|
context_kwargs["color_scheme"] = color_scheme
|
||||||
context_kwargs.update(kwargs)
|
context_kwargs.update(kwargs)
|
||||||
@@ -363,7 +342,7 @@ async def launch_persistent_context_async(
|
|||||||
args: list[str] | None = None,
|
args: list[str] | None = None,
|
||||||
stealth_args: bool = True,
|
stealth_args: bool = True,
|
||||||
user_agent: str | None = None,
|
user_agent: str | None = None,
|
||||||
viewport: dict | None = _VIEWPORT_UNSET,
|
viewport: dict | None = None,
|
||||||
locale: str | None = None,
|
locale: str | None = None,
|
||||||
timezone: str | None = None,
|
timezone: str | None = None,
|
||||||
color_scheme: Literal["light", "dark", "no-preference"] | None = None,
|
color_scheme: Literal["light", "dark", "no-preference"] | None = None,
|
||||||
@@ -389,7 +368,6 @@ async def launch_persistent_context_async(
|
|||||||
stealth_args: Include default stealth fingerprint args (default True).
|
stealth_args: Include default stealth fingerprint args (default True).
|
||||||
user_agent: Custom user agent string.
|
user_agent: Custom user agent string.
|
||||||
viewport: Viewport size dict, e.g. {"width": 1920, "height": 1080}.
|
viewport: Viewport size dict, e.g. {"width": 1920, "height": 1080}.
|
||||||
Pass None to disable viewport emulation (use OS window size).
|
|
||||||
locale: Browser locale, e.g. "en-US".
|
locale: Browser locale, e.g. "en-US".
|
||||||
timezone: IANA timezone (e.g. 'America/New_York').
|
timezone: IANA timezone (e.g. 'America/New_York').
|
||||||
color_scheme: Color scheme preference — 'light', 'dark', or 'no-preference'.
|
color_scheme: Color scheme preference — 'light', 'dark', or 'no-preference'.
|
||||||
@@ -421,11 +399,7 @@ async def launch_persistent_context_async(
|
|||||||
timezone = _resolve_timezone(timezone, kwargs)
|
timezone = _resolve_timezone(timezone, kwargs)
|
||||||
|
|
||||||
binary_path = ensure_binary()
|
binary_path = ensure_binary()
|
||||||
timezone, locale, exit_ip = maybe_resolve_geoip(geoip, proxy, timezone, locale)
|
timezone, locale = maybe_resolve_geoip(geoip, proxy, timezone, locale)
|
||||||
args = _resolve_webrtc_args(args, proxy)
|
|
||||||
if exit_ip and not (args and any(a.startswith("--fingerprint-webrtc-ip") for a in args)):
|
|
||||||
args = list(args or [])
|
|
||||||
args.append(f"--fingerprint-webrtc-ip={exit_ip}")
|
|
||||||
chrome_args = build_args(stealth_args, args, timezone=timezone, locale=locale, headless=headless)
|
chrome_args = build_args(stealth_args, args, timezone=timezone, locale=locale, headless=headless)
|
||||||
|
|
||||||
logger.debug(
|
logger.debug(
|
||||||
@@ -439,12 +413,7 @@ async def launch_persistent_context_async(
|
|||||||
context_kwargs: dict[str, Any] = {}
|
context_kwargs: dict[str, Any] = {}
|
||||||
if user_agent:
|
if user_agent:
|
||||||
context_kwargs["user_agent"] = user_agent
|
context_kwargs["user_agent"] = user_agent
|
||||||
if viewport is _VIEWPORT_UNSET:
|
context_kwargs["viewport"] = viewport or DEFAULT_VIEWPORT
|
||||||
context_kwargs["viewport"] = DEFAULT_VIEWPORT
|
|
||||||
elif viewport is None:
|
|
||||||
context_kwargs["no_viewport"] = True
|
|
||||||
else:
|
|
||||||
context_kwargs["viewport"] = viewport
|
|
||||||
if color_scheme:
|
if color_scheme:
|
||||||
context_kwargs["color_scheme"] = color_scheme
|
context_kwargs["color_scheme"] = color_scheme
|
||||||
context_kwargs.update(kwargs)
|
context_kwargs.update(kwargs)
|
||||||
@@ -487,7 +456,7 @@ def launch_context(
|
|||||||
args: list[str] | None = None,
|
args: list[str] | None = None,
|
||||||
stealth_args: bool = True,
|
stealth_args: bool = True,
|
||||||
user_agent: str | None = None,
|
user_agent: str | None = None,
|
||||||
viewport: dict | None = _VIEWPORT_UNSET,
|
viewport: dict | None = None,
|
||||||
locale: str | None = None,
|
locale: str | None = None,
|
||||||
timezone: str | None = None,
|
timezone: str | None = None,
|
||||||
color_scheme: Literal["light", "dark", "no-preference"] | None = None,
|
color_scheme: Literal["light", "dark", "no-preference"] | None = None,
|
||||||
@@ -510,7 +479,6 @@ def launch_context(
|
|||||||
stealth_args: Include default stealth fingerprint args (default True).
|
stealth_args: Include default stealth fingerprint args (default True).
|
||||||
user_agent: Custom user agent string.
|
user_agent: Custom user agent string.
|
||||||
viewport: Viewport size dict, e.g. {"width": 1920, "height": 1080}.
|
viewport: Viewport size dict, e.g. {"width": 1920, "height": 1080}.
|
||||||
Pass None to disable viewport emulation (use OS window size).
|
|
||||||
locale: Browser locale, e.g. "en-US".
|
locale: Browser locale, e.g. "en-US".
|
||||||
timezone: IANA timezone (e.g. 'America/New_York').
|
timezone: IANA timezone (e.g. 'America/New_York').
|
||||||
color_scheme: Color scheme preference — 'light', 'dark', or 'no-preference'.
|
color_scheme: Color scheme preference — 'light', 'dark', or 'no-preference'.
|
||||||
@@ -529,11 +497,7 @@ def launch_context(
|
|||||||
|
|
||||||
# Resolve geoip BEFORE launch() to avoid double-resolution and ensure
|
# Resolve geoip BEFORE launch() to avoid double-resolution and ensure
|
||||||
# resolved values flow to binary flags
|
# resolved values flow to binary flags
|
||||||
timezone, locale, exit_ip = maybe_resolve_geoip(geoip, proxy, timezone, locale)
|
timezone, locale = maybe_resolve_geoip(geoip, proxy, timezone, locale)
|
||||||
# Inject geoip exit IP for WebRTC spoofing (free — no extra HTTP call)
|
|
||||||
if exit_ip and not (args and any(a.startswith("--fingerprint-webrtc-ip") for a in args)):
|
|
||||||
args = list(args or [])
|
|
||||||
args.append(f"--fingerprint-webrtc-ip={exit_ip}")
|
|
||||||
# --fingerprint-timezone is process-wide (reads CommandLine in renderer),
|
# --fingerprint-timezone is process-wide (reads CommandLine in renderer),
|
||||||
# so it applies to ALL contexts, not just the default one.
|
# so it applies to ALL contexts, not just the default one.
|
||||||
# locale and timezone are set via binary flags only — no CDP emulation.
|
# locale and timezone are set via binary flags only — no CDP emulation.
|
||||||
@@ -543,12 +507,7 @@ def launch_context(
|
|||||||
context_kwargs: dict[str, Any] = {}
|
context_kwargs: dict[str, Any] = {}
|
||||||
if user_agent:
|
if user_agent:
|
||||||
context_kwargs["user_agent"] = user_agent
|
context_kwargs["user_agent"] = user_agent
|
||||||
if viewport is _VIEWPORT_UNSET:
|
context_kwargs["viewport"] = viewport or DEFAULT_VIEWPORT
|
||||||
context_kwargs["viewport"] = DEFAULT_VIEWPORT
|
|
||||||
elif viewport is None:
|
|
||||||
context_kwargs["no_viewport"] = True
|
|
||||||
else:
|
|
||||||
context_kwargs["viewport"] = viewport
|
|
||||||
if color_scheme:
|
if color_scheme:
|
||||||
context_kwargs["color_scheme"] = color_scheme
|
context_kwargs["color_scheme"] = color_scheme
|
||||||
context_kwargs.update(kwargs)
|
context_kwargs.update(kwargs)
|
||||||
@@ -631,88 +590,28 @@ def _ensure_proxy_scheme(proxy_url: str) -> str:
|
|||||||
return proxy_url if "://" in proxy_url else f"http://{proxy_url}"
|
return proxy_url if "://" in proxy_url else f"http://{proxy_url}"
|
||||||
|
|
||||||
|
|
||||||
def _extract_proxy_url(proxy: str | ProxySettings | None) -> str | None:
|
|
||||||
"""Extract and normalize proxy URL string from proxy param."""
|
|
||||||
if proxy is None:
|
|
||||||
return None
|
|
||||||
raw = proxy.get("server") if isinstance(proxy, dict) else proxy
|
|
||||||
if not raw:
|
|
||||||
return None
|
|
||||||
return _ensure_proxy_scheme(raw)
|
|
||||||
|
|
||||||
|
|
||||||
def maybe_resolve_geoip(
|
def maybe_resolve_geoip(
|
||||||
geoip: bool,
|
geoip: bool,
|
||||||
proxy: str | ProxySettings | None,
|
proxy: str | ProxySettings | None,
|
||||||
timezone: str | None,
|
timezone: str | None,
|
||||||
locale: str | None,
|
locale: str | None,
|
||||||
) -> tuple[str | None, str | None, str | None]:
|
) -> tuple[str | None, str | None]:
|
||||||
"""Auto-fill timezone/locale from proxy IP when geoip is enabled.
|
"""Auto-fill timezone/locale from proxy IP when geoip is enabled."""
|
||||||
|
if not geoip or not proxy or (timezone is not None and locale is not None):
|
||||||
|
return timezone, locale
|
||||||
|
|
||||||
Returns ``(timezone, locale, exit_ip)``. *exit_ip* is a free bonus
|
from .geoip import resolve_proxy_geo
|
||||||
from the geoip lookup (no extra HTTP call) — used for WebRTC spoofing.
|
|
||||||
"""
|
|
||||||
if not geoip or not proxy:
|
|
||||||
return timezone, locale, None
|
|
||||||
|
|
||||||
from .geoip import resolve_proxy_geo_with_ip
|
proxy_url = proxy.get("server") if isinstance(proxy, dict) else proxy
|
||||||
|
|
||||||
proxy_url = _extract_proxy_url(proxy)
|
|
||||||
if not proxy_url:
|
if not proxy_url:
|
||||||
return timezone, locale, None
|
return timezone, locale
|
||||||
|
proxy_url = _ensure_proxy_scheme(proxy_url)
|
||||||
# When both tz/locale are explicit, still resolve exit IP for WebRTC
|
geo_tz, geo_locale = resolve_proxy_geo(proxy_url)
|
||||||
if timezone is not None and locale is not None:
|
|
||||||
from .geoip import _resolve_exit_ip
|
|
||||||
exit_ip = _resolve_exit_ip(proxy_url)
|
|
||||||
return timezone, locale, exit_ip
|
|
||||||
|
|
||||||
geo_tz, geo_locale, exit_ip = resolve_proxy_geo_with_ip(proxy_url)
|
|
||||||
if timezone is None:
|
if timezone is None:
|
||||||
timezone = geo_tz
|
timezone = geo_tz
|
||||||
if locale is None:
|
if locale is None:
|
||||||
locale = geo_locale
|
locale = geo_locale
|
||||||
return timezone, locale, exit_ip
|
return timezone, locale
|
||||||
|
|
||||||
|
|
||||||
def _resolve_webrtc_args(
|
|
||||||
args: list[str] | None,
|
|
||||||
proxy: str | ProxySettings | None,
|
|
||||||
) -> list[str] | None:
|
|
||||||
"""Replace --fingerprint-webrtc-ip=auto with the resolved proxy exit IP.
|
|
||||||
|
|
||||||
Returns args unchanged if no ``auto`` value is present.
|
|
||||||
"""
|
|
||||||
if not args:
|
|
||||||
return args
|
|
||||||
idx = None
|
|
||||||
for i, a in enumerate(args):
|
|
||||||
if a == "--fingerprint-webrtc-ip=auto":
|
|
||||||
idx = i
|
|
||||||
break
|
|
||||||
if idx is None:
|
|
||||||
return args
|
|
||||||
proxy_url = _extract_proxy_url(proxy)
|
|
||||||
if not proxy_url:
|
|
||||||
logger.debug("--fingerprint-webrtc-ip=auto but no proxy set — removing flag")
|
|
||||||
args = list(args)
|
|
||||||
del args[idx]
|
|
||||||
return args
|
|
||||||
try:
|
|
||||||
from .geoip import _resolve_exit_ip
|
|
||||||
exit_ip = _resolve_exit_ip(proxy_url)
|
|
||||||
except Exception:
|
|
||||||
logger.debug("WebRTC IP resolution failed — removing flag")
|
|
||||||
args = list(args)
|
|
||||||
del args[idx]
|
|
||||||
return args
|
|
||||||
if exit_ip:
|
|
||||||
args = list(args)
|
|
||||||
args[idx] = f"--fingerprint-webrtc-ip={exit_ip}"
|
|
||||||
else:
|
|
||||||
args = list(args)
|
|
||||||
del args[idx]
|
|
||||||
return args
|
|
||||||
|
|
||||||
|
|
||||||
def build_args(
|
def build_args(
|
||||||
|
|||||||
+14
-5
@@ -15,10 +15,10 @@ from ._version import __version__
|
|||||||
# CHROMIUM_VERSION is the latest across all platforms (for display/reference).
|
# CHROMIUM_VERSION is the latest across all platforms (for display/reference).
|
||||||
# Use get_chromium_version() for the current platform's actual version.
|
# Use get_chromium_version() for the current platform's actual version.
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
CHROMIUM_VERSION = "146.0.7680.177.1"
|
CHROMIUM_VERSION = "145.0.7632.159.8"
|
||||||
|
|
||||||
PLATFORM_CHROMIUM_VERSIONS: dict[str, str] = {
|
PLATFORM_CHROMIUM_VERSIONS: dict[str, str] = {
|
||||||
"linux-x64": "146.0.7680.177.1",
|
"linux-x64": "145.0.7632.159.8",
|
||||||
"linux-arm64": "145.0.7632.159.7",
|
"linux-arm64": "145.0.7632.159.7",
|
||||||
"darwin-arm64": "145.0.7632.109.2",
|
"darwin-arm64": "145.0.7632.109.2",
|
||||||
"darwin-x64": "145.0.7632.109.2",
|
"darwin-x64": "145.0.7632.109.2",
|
||||||
@@ -48,17 +48,26 @@ def get_default_stealth_args() -> list[str]:
|
|||||||
|
|
||||||
base = [
|
base = [
|
||||||
"--no-sandbox",
|
"--no-sandbox",
|
||||||
|
"--disable-blink-features=AutomationControlled",
|
||||||
f"--fingerprint={seed}",
|
f"--fingerprint={seed}",
|
||||||
]
|
]
|
||||||
|
|
||||||
if system == "Darwin":
|
if system == "Darwin":
|
||||||
# Tell the fingerprint patches we're on macOS so GPU/UA match natively
|
# Tell the fingerprint patches we're on macOS so GPU/UA match natively
|
||||||
return base + ["--fingerprint-platform=macos"]
|
return base + [
|
||||||
|
"--fingerprint-platform=macos",
|
||||||
|
"--fingerprint-gpu-vendor=Google Inc. (Apple)",
|
||||||
|
"--fingerprint-gpu-renderer=ANGLE (Apple, ANGLE Metal Renderer: Apple M3, Unspecified Version)",
|
||||||
|
]
|
||||||
|
|
||||||
# Linux/Windows: Windows fingerprint profile
|
# Linux/Windows: Windows fingerprint profile
|
||||||
# Hardware concurrency, device memory, screen, window size, and GPU are
|
# Hardware concurrency, device memory, screen, and window size are
|
||||||
# auto-generated by the binary from the seed (v14+).
|
# auto-generated by the binary from the seed (v14+).
|
||||||
return base + ["--fingerprint-platform=windows"]
|
return base + [
|
||||||
|
"--fingerprint-platform=windows",
|
||||||
|
"--fingerprint-gpu-vendor=Google Inc. (NVIDIA)",
|
||||||
|
"--fingerprint-gpu-renderer=ANGLE (NVIDIA, NVIDIA GeForce RTX 3070 (0x00002484) Direct3D11 vs_5_0 ps_5_0, D3D11)",
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
+4
-16
@@ -53,18 +53,6 @@ def resolve_proxy_geo(proxy_url: str) -> tuple[str | None, str | None]:
|
|||||||
Returns ``(timezone, locale)`` — either or both may be ``None`` on
|
Returns ``(timezone, locale)`` — either or both may be ``None`` on
|
||||||
failure (missing dep, DB download error, lookup miss). Never raises.
|
failure (missing dep, DB download error, lookup miss). Never raises.
|
||||||
"""
|
"""
|
||||||
tz, locale, _ip = resolve_proxy_geo_with_ip(proxy_url)
|
|
||||||
return tz, locale
|
|
||||||
|
|
||||||
|
|
||||||
def resolve_proxy_geo_with_ip(
|
|
||||||
proxy_url: str,
|
|
||||||
) -> tuple[str | None, str | None, str | None]:
|
|
||||||
"""Resolve timezone, locale, and exit IP from a proxy.
|
|
||||||
|
|
||||||
Returns ``(timezone, locale, exit_ip)``. The exit IP is a free bonus
|
|
||||||
from the lookup — reused for WebRTC spoofing without an extra HTTP call.
|
|
||||||
"""
|
|
||||||
try:
|
try:
|
||||||
import geoip2.database # noqa: F811
|
import geoip2.database # noqa: F811
|
||||||
except ImportError:
|
except ImportError:
|
||||||
@@ -75,14 +63,14 @@ def resolve_proxy_geo_with_ip(
|
|||||||
|
|
||||||
db_path = _ensure_geoip_db()
|
db_path = _ensure_geoip_db()
|
||||||
if db_path is None:
|
if db_path is None:
|
||||||
return None, None, None
|
return None, None
|
||||||
|
|
||||||
# Exit IP (through proxy) is most accurate — gateway DNS may differ from exit
|
# Exit IP (through proxy) is most accurate — gateway DNS may differ from exit
|
||||||
ip = _resolve_exit_ip(proxy_url)
|
ip = _resolve_exit_ip(proxy_url)
|
||||||
if ip is None:
|
if ip is None:
|
||||||
ip = _resolve_proxy_ip(proxy_url)
|
ip = _resolve_proxy_ip(proxy_url)
|
||||||
if ip is None:
|
if ip is None:
|
||||||
return None, None, None
|
return None, None
|
||||||
|
|
||||||
try:
|
try:
|
||||||
with geoip2.database.Reader(str(db_path)) as reader:
|
with geoip2.database.Reader(str(db_path)) as reader:
|
||||||
@@ -94,10 +82,10 @@ def resolve_proxy_geo_with_ip(
|
|||||||
"GeoIP: %s → tz=%s, country=%s, locale=%s",
|
"GeoIP: %s → tz=%s, country=%s, locale=%s",
|
||||||
ip, timezone, country, locale,
|
ip, timezone, country, locale,
|
||||||
)
|
)
|
||||||
return timezone, locale, ip
|
return timezone, locale
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
logger.debug("GeoIP lookup failed for %s: %s", ip, exc)
|
logger.debug("GeoIP lookup failed for %s: %s", ip, exc)
|
||||||
return None, None, ip
|
return None, None
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
+11
-274
@@ -3,20 +3,14 @@
|
|||||||
Activated via humanize=True in launch() / launch_async().
|
Activated via humanize=True in launch() / launch_async().
|
||||||
Patches page methods to use Bezier mouse curves, realistic typing, and smooth scrolling.
|
Patches page methods to use Bezier mouse curves, realistic typing, and smooth scrolling.
|
||||||
|
|
||||||
Stealth-aware (fixes #110):
|
|
||||||
- isInputElement / isSelectorFocused use CDP Isolated Worlds instead of page.evaluate
|
|
||||||
- Shift symbol typing uses CDP Input.dispatchKeyEvent for isTrusted=true events
|
|
||||||
- Falls back to page.evaluate only when CDP session is unavailable
|
|
||||||
|
|
||||||
Supports both sync and async Playwright APIs.
|
Supports both sync and async Playwright APIs.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import json
|
|
||||||
import logging
|
import logging
|
||||||
import sys
|
import sys
|
||||||
from typing import Any, Optional
|
from typing import Any
|
||||||
|
|
||||||
from .config import HumanConfig, HumanPreset, resolve_config
|
from .config import HumanConfig, HumanPreset, resolve_config
|
||||||
from .config import rand, rand_range, sleep_ms, async_sleep_ms
|
from .config import rand, rand_range, sleep_ms, async_sleep_ms
|
||||||
@@ -39,153 +33,6 @@ __all__ = [
|
|||||||
|
|
||||||
logger = logging.getLogger("cloakbrowser.human")
|
logger = logging.getLogger("cloakbrowser.human")
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# CDP Isolated World — stealth DOM evaluation
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
class _SyncIsolatedWorld:
|
|
||||||
"""Manages a CDP isolated execution context for DOM reads (sync).
|
|
||||||
|
|
||||||
Produces clean Error.stack traces (no 'eval at evaluate :302:')
|
|
||||||
and is invisible to querySelector monkey-patches in the main world.
|
|
||||||
Context ID is invalidated on navigation and auto-recreated on next call.
|
|
||||||
"""
|
|
||||||
|
|
||||||
__slots__ = ("_page", "_cdp", "_context_id")
|
|
||||||
|
|
||||||
def __init__(self, page: Any):
|
|
||||||
self._page = page
|
|
||||||
self._cdp: Any = None
|
|
||||||
self._context_id: Optional[int] = None
|
|
||||||
|
|
||||||
def _ensure_cdp(self) -> Any:
|
|
||||||
if self._cdp is None:
|
|
||||||
self._cdp = self._page.context.new_cdp_session(self._page)
|
|
||||||
return self._cdp
|
|
||||||
|
|
||||||
def _create_world(self) -> int:
|
|
||||||
cdp = self._ensure_cdp()
|
|
||||||
tree = cdp.send("Page.getFrameTree")
|
|
||||||
frame_id = tree["frameTree"]["frame"]["id"]
|
|
||||||
result = cdp.send("Page.createIsolatedWorld", {
|
|
||||||
"frameId": frame_id,
|
|
||||||
"worldName": "",
|
|
||||||
"grantUniveralAccess": True,
|
|
||||||
})
|
|
||||||
self._context_id = result["executionContextId"]
|
|
||||||
return self._context_id
|
|
||||||
|
|
||||||
def evaluate(self, expression: str) -> Any:
|
|
||||||
"""Evaluate JS in isolated world. Auto-recreates on stale context."""
|
|
||||||
if self._context_id is None:
|
|
||||||
self._create_world()
|
|
||||||
|
|
||||||
for attempt in range(2):
|
|
||||||
try:
|
|
||||||
result = self._cdp.send("Runtime.evaluate", {
|
|
||||||
"expression": expression,
|
|
||||||
"contextId": self._context_id,
|
|
||||||
"returnByValue": True,
|
|
||||||
})
|
|
||||||
if "exceptionDetails" in result:
|
|
||||||
if attempt == 0:
|
|
||||||
self._create_world()
|
|
||||||
continue
|
|
||||||
return None
|
|
||||||
return result.get("result", {}).get("value")
|
|
||||||
except Exception:
|
|
||||||
if attempt == 0:
|
|
||||||
self._context_id = None
|
|
||||||
try:
|
|
||||||
self._create_world()
|
|
||||||
except Exception:
|
|
||||||
return None
|
|
||||||
continue
|
|
||||||
return None
|
|
||||||
return None
|
|
||||||
|
|
||||||
def invalidate(self) -> None:
|
|
||||||
"""Mark context as stale — call after navigation."""
|
|
||||||
self._context_id = None
|
|
||||||
|
|
||||||
def get_cdp_session(self) -> Any:
|
|
||||||
"""Get the underlying CDP session (reused for Input.dispatchKeyEvent)."""
|
|
||||||
return self._ensure_cdp()
|
|
||||||
|
|
||||||
|
|
||||||
class _AsyncIsolatedWorld:
|
|
||||||
"""Manages a CDP isolated execution context for DOM reads (async).
|
|
||||||
|
|
||||||
Same as _SyncIsolatedWorld but uses await for all CDP calls.
|
|
||||||
"""
|
|
||||||
|
|
||||||
__slots__ = ("_page", "_cdp", "_context_id")
|
|
||||||
|
|
||||||
def __init__(self, page: Any):
|
|
||||||
self._page = page
|
|
||||||
self._cdp: Any = None
|
|
||||||
self._context_id: Optional[int] = None
|
|
||||||
|
|
||||||
async def _ensure_cdp(self) -> Any:
|
|
||||||
if self._cdp is None:
|
|
||||||
self._cdp = await self._page.context.new_cdp_session(self._page)
|
|
||||||
return self._cdp
|
|
||||||
|
|
||||||
async def _create_world(self) -> int:
|
|
||||||
cdp = await self._ensure_cdp()
|
|
||||||
tree = await cdp.send("Page.getFrameTree")
|
|
||||||
frame_id = tree["frameTree"]["frame"]["id"]
|
|
||||||
result = await cdp.send("Page.createIsolatedWorld", {
|
|
||||||
"frameId": frame_id,
|
|
||||||
"worldName": "",
|
|
||||||
"grantUniveralAccess": True,
|
|
||||||
})
|
|
||||||
self._context_id = result["executionContextId"]
|
|
||||||
return self._context_id
|
|
||||||
|
|
||||||
async def evaluate(self, expression: str) -> Any:
|
|
||||||
"""Evaluate JS in isolated world. Auto-recreates on stale context."""
|
|
||||||
if self._context_id is None:
|
|
||||||
await self._create_world()
|
|
||||||
|
|
||||||
for attempt in range(2):
|
|
||||||
try:
|
|
||||||
result = await self._cdp.send("Runtime.evaluate", {
|
|
||||||
"expression": expression,
|
|
||||||
"contextId": self._context_id,
|
|
||||||
"returnByValue": True,
|
|
||||||
})
|
|
||||||
if "exceptionDetails" in result:
|
|
||||||
if attempt == 0:
|
|
||||||
await self._create_world()
|
|
||||||
continue
|
|
||||||
return None
|
|
||||||
return result.get("result", {}).get("value")
|
|
||||||
except Exception:
|
|
||||||
if attempt == 0:
|
|
||||||
self._context_id = None
|
|
||||||
try:
|
|
||||||
await self._create_world()
|
|
||||||
except Exception:
|
|
||||||
return None
|
|
||||||
continue
|
|
||||||
return None
|
|
||||||
return None
|
|
||||||
|
|
||||||
def invalidate(self) -> None:
|
|
||||||
"""Mark context as stale — call after navigation."""
|
|
||||||
self._context_id = None
|
|
||||||
|
|
||||||
async def get_cdp_session(self) -> Any:
|
|
||||||
"""Get the underlying CDP session (reused for Input.dispatchKeyEvent)."""
|
|
||||||
return await self._ensure_cdp()
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# Cursor state
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
class _CursorState:
|
class _CursorState:
|
||||||
__slots__ = ("x", "y", "initialized")
|
__slots__ = ("x", "y", "initialized")
|
||||||
|
|
||||||
@@ -195,30 +42,7 @@ class _CursorState:
|
|||||||
self.initialized: bool = False
|
self.initialized: bool = False
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# Stealth DOM queries — isolated world with evaluate fallback
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
def _is_input_element(page: Any, selector: str) -> bool:
|
def _is_input_element(page: Any, selector: str) -> bool:
|
||||||
"""Check if selector is an input element. Uses CDP isolated world when available."""
|
|
||||||
world: Optional[_SyncIsolatedWorld] = getattr(page, '_stealth_world', None)
|
|
||||||
if world is not None:
|
|
||||||
try:
|
|
||||||
escaped = json.dumps(selector)
|
|
||||||
result = world.evaluate(
|
|
||||||
f"(() => {{"
|
|
||||||
f" const el = document.querySelector({escaped});"
|
|
||||||
f" if (!el) return false;"
|
|
||||||
f" const tag = el.tagName.toLowerCase();"
|
|
||||||
f" return tag === 'input' || tag === 'textarea'"
|
|
||||||
f" || el.getAttribute('contenteditable') === 'true';"
|
|
||||||
f"}})()"
|
|
||||||
)
|
|
||||||
return bool(result)
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
# Fallback: page.evaluate (detectable — should only happen if CDP fails)
|
|
||||||
try:
|
try:
|
||||||
return page.evaluate(
|
return page.evaluate(
|
||||||
"""(sel) => {
|
"""(sel) => {
|
||||||
@@ -235,24 +59,6 @@ def _is_input_element(page: Any, selector: str) -> bool:
|
|||||||
|
|
||||||
|
|
||||||
async def _async_is_input_element(page: Any, selector: str) -> bool:
|
async def _async_is_input_element(page: Any, selector: str) -> bool:
|
||||||
"""Check if selector is an input element (async). Uses CDP isolated world when available."""
|
|
||||||
world: Optional[_AsyncIsolatedWorld] = getattr(page, '_stealth_world', None)
|
|
||||||
if world is not None:
|
|
||||||
try:
|
|
||||||
escaped = json.dumps(selector)
|
|
||||||
result = await world.evaluate(
|
|
||||||
f"(() => {{"
|
|
||||||
f" const el = document.querySelector({escaped});"
|
|
||||||
f" if (!el) return false;"
|
|
||||||
f" const tag = el.tagName.toLowerCase();"
|
|
||||||
f" return tag === 'input' || tag === 'textarea'"
|
|
||||||
f" || el.getAttribute('contenteditable') === 'true';"
|
|
||||||
f"}})()"
|
|
||||||
)
|
|
||||||
return bool(result)
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
return await page.evaluate(
|
return await page.evaluate(
|
||||||
"""(sel) => {
|
"""(sel) => {
|
||||||
@@ -269,22 +75,7 @@ async def _async_is_input_element(page: Any, selector: str) -> bool:
|
|||||||
|
|
||||||
|
|
||||||
def _is_selector_focused(page: Any, selector: str) -> bool:
|
def _is_selector_focused(page: Any, selector: str) -> bool:
|
||||||
"""Check if the element matching selector is currently focused.
|
"""Check if the element matching selector is currently focused."""
|
||||||
Uses CDP isolated world when available."""
|
|
||||||
world: Optional[_SyncIsolatedWorld] = getattr(page, '_stealth_world', None)
|
|
||||||
if world is not None:
|
|
||||||
try:
|
|
||||||
escaped = json.dumps(selector)
|
|
||||||
result = world.evaluate(
|
|
||||||
f"(() => {{"
|
|
||||||
f" const el = document.querySelector({escaped});"
|
|
||||||
f" return el === document.activeElement;"
|
|
||||||
f"}})()"
|
|
||||||
)
|
|
||||||
return bool(result)
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
return page.evaluate(
|
return page.evaluate(
|
||||||
"""(sel) => {
|
"""(sel) => {
|
||||||
@@ -298,22 +89,7 @@ def _is_selector_focused(page: Any, selector: str) -> bool:
|
|||||||
|
|
||||||
|
|
||||||
async def _async_is_selector_focused(page: Any, selector: str) -> bool:
|
async def _async_is_selector_focused(page: Any, selector: str) -> bool:
|
||||||
"""Check if the element matching selector is currently focused (async).
|
"""Check if the element matching selector is currently focused (async)."""
|
||||||
Uses CDP isolated world when available."""
|
|
||||||
world: Optional[_AsyncIsolatedWorld] = getattr(page, '_stealth_world', None)
|
|
||||||
if world is not None:
|
|
||||||
try:
|
|
||||||
escaped = json.dumps(selector)
|
|
||||||
result = await world.evaluate(
|
|
||||||
f"(() => {{"
|
|
||||||
f" const el = document.querySelector({escaped});"
|
|
||||||
f" return el === document.activeElement;"
|
|
||||||
f"}})()"
|
|
||||||
)
|
|
||||||
return bool(result)
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
return await page.evaluate(
|
return await page.evaluate(
|
||||||
"""(sel) => {
|
"""(sel) => {
|
||||||
@@ -440,6 +216,7 @@ def _patch_locator_class_sync():
|
|||||||
def _humanized_press(self, key, **kwargs):
|
def _humanized_press(self, key, **kwargs):
|
||||||
if _is_humanized(self):
|
if _is_humanized(self):
|
||||||
selector = _get_selector(self)
|
selector = _get_selector(self)
|
||||||
|
# Only click if not already focused — avoids redundant mouse moves
|
||||||
if not _is_selector_focused(self.page, selector):
|
if not _is_selector_focused(self.page, selector):
|
||||||
self.page.click(selector)
|
self.page.click(selector)
|
||||||
sleep_ms(rand(50, 150))
|
sleep_ms(rand(50, 150))
|
||||||
@@ -739,17 +516,6 @@ def patch_page(page: Any, cfg: HumanConfig, cursor: _CursorState) -> None:
|
|||||||
page._original = originals
|
page._original = originals
|
||||||
page._human_cfg = cfg
|
page._human_cfg = cfg
|
||||||
|
|
||||||
# --- Stealth infrastructure ---
|
|
||||||
try:
|
|
||||||
stealth = _SyncIsolatedWorld(page)
|
|
||||||
page._stealth_world = stealth
|
|
||||||
cdp_session = stealth.get_cdp_session()
|
|
||||||
except Exception:
|
|
||||||
stealth = None
|
|
||||||
page._stealth_world = None
|
|
||||||
cdp_session = None
|
|
||||||
logger.debug("Could not create CDP session — stealth features disabled")
|
|
||||||
|
|
||||||
raw_mouse: RawMouse = type("_RawMouse", (), {
|
raw_mouse: RawMouse = type("_RawMouse", (), {
|
||||||
"move": originals.mouse_move,
|
"move": originals.mouse_move,
|
||||||
"down": originals.mouse_down,
|
"down": originals.mouse_down,
|
||||||
@@ -773,9 +539,6 @@ def patch_page(page: Any, cfg: HumanConfig, cursor: _CursorState) -> None:
|
|||||||
|
|
||||||
def _human_goto(url: str, **kwargs: Any) -> Any:
|
def _human_goto(url: str, **kwargs: Any) -> Any:
|
||||||
response = originals.goto(url, **kwargs)
|
response = originals.goto(url, **kwargs)
|
||||||
# Invalidate isolated world after navigation (context ID becomes stale)
|
|
||||||
if stealth is not None:
|
|
||||||
stealth.invalidate()
|
|
||||||
return response
|
return response
|
||||||
|
|
||||||
def _human_click(selector: str, **kwargs: Any) -> None:
|
def _human_click(selector: str, **kwargs: Any) -> None:
|
||||||
@@ -830,7 +593,7 @@ def patch_page(page: Any, cfg: HumanConfig, cursor: _CursorState) -> None:
|
|||||||
sleep_ms(rand_range(cfg.field_switch_delay))
|
sleep_ms(rand_range(cfg.field_switch_delay))
|
||||||
_human_click(selector)
|
_human_click(selector)
|
||||||
sleep_ms(rand(100, 250))
|
sleep_ms(rand(100, 250))
|
||||||
human_type(page, raw_keyboard, text, cfg, cdp_session=cdp_session)
|
human_type(page, raw_keyboard, text, cfg)
|
||||||
|
|
||||||
def _human_fill(selector: str, value: str, **kwargs: Any) -> None:
|
def _human_fill(selector: str, value: str, **kwargs: Any) -> None:
|
||||||
sleep_ms(rand_range(cfg.field_switch_delay))
|
sleep_ms(rand_range(cfg.field_switch_delay))
|
||||||
@@ -840,7 +603,7 @@ def patch_page(page: Any, cfg: HumanConfig, cursor: _CursorState) -> None:
|
|||||||
sleep_ms(rand(30, 80))
|
sleep_ms(rand(30, 80))
|
||||||
originals.keyboard_press("Backspace")
|
originals.keyboard_press("Backspace")
|
||||||
sleep_ms(rand(50, 150))
|
sleep_ms(rand(50, 150))
|
||||||
human_type(page, raw_keyboard, value, cfg, cdp_session=cdp_session)
|
human_type(page, raw_keyboard, value, cfg)
|
||||||
|
|
||||||
def _human_check(selector: str, **kwargs: Any) -> None:
|
def _human_check(selector: str, **kwargs: Any) -> None:
|
||||||
try:
|
try:
|
||||||
@@ -883,7 +646,7 @@ def patch_page(page: Any, cfg: HumanConfig, cursor: _CursorState) -> None:
|
|||||||
human_click(raw_mouse, False, cfg)
|
human_click(raw_mouse, False, cfg)
|
||||||
|
|
||||||
def _human_keyboard_type(text: str, **kwargs: Any) -> None:
|
def _human_keyboard_type(text: str, **kwargs: Any) -> None:
|
||||||
human_type(page, raw_keyboard, text, cfg, cdp_session=cdp_session)
|
human_type(page, raw_keyboard, text, cfg)
|
||||||
|
|
||||||
page.goto = _human_goto
|
page.goto = _human_goto
|
||||||
page.click = _human_click
|
page.click = _human_click
|
||||||
@@ -927,10 +690,6 @@ def _patch_frames_sync(
|
|||||||
|
|
||||||
def _frame_aware_goto(url: str, **kwargs: Any) -> Any:
|
def _frame_aware_goto(url: str, **kwargs: Any) -> Any:
|
||||||
response = _orig_goto(url, **kwargs)
|
response = _orig_goto(url, **kwargs)
|
||||||
# Invalidate isolated world after navigation
|
|
||||||
stealth_world = getattr(page, '_stealth_world', None)
|
|
||||||
if stealth_world is not None:
|
|
||||||
stealth_world.invalidate()
|
|
||||||
for frame in _iter_frames(page):
|
for frame in _iter_frames(page):
|
||||||
if not getattr(frame, "_human_patched", False):
|
if not getattr(frame, "_human_patched", False):
|
||||||
_patch_single_frame_sync(frame, page, cfg, cursor, raw_mouse, raw_keyboard, originals)
|
_patch_single_frame_sync(frame, page, cfg, cursor, raw_mouse, raw_keyboard, originals)
|
||||||
@@ -950,6 +709,7 @@ def _patch_single_frame_sync(
|
|||||||
return
|
return
|
||||||
frame._human_patched = True
|
frame._human_patched = True
|
||||||
|
|
||||||
|
# Save originals for methods that need fallback
|
||||||
_orig_frame_select_option = frame.select_option
|
_orig_frame_select_option = frame.select_option
|
||||||
_orig_frame_drag_and_drop = getattr(frame, 'drag_and_drop', None)
|
_orig_frame_drag_and_drop = getattr(frame, 'drag_and_drop', None)
|
||||||
|
|
||||||
@@ -1081,7 +841,6 @@ def patch_browser(browser: Any, cfg: HumanConfig) -> None:
|
|||||||
|
|
||||||
|
|
||||||
def patch_page_async(page: Any, cfg: HumanConfig, cursor: _CursorState) -> None:
|
def patch_page_async(page: Any, cfg: HumanConfig, cursor: _CursorState) -> None:
|
||||||
"""Replace page methods with human-like implementations (async)."""
|
|
||||||
originals = type("Originals", (), {
|
originals = type("Originals", (), {
|
||||||
"click": page.click,
|
"click": page.click,
|
||||||
"type": page.type,
|
"type": page.type,
|
||||||
@@ -1104,19 +863,6 @@ def patch_page_async(page: Any, cfg: HumanConfig, cursor: _CursorState) -> None:
|
|||||||
page._original = originals
|
page._original = originals
|
||||||
page._human_cfg = cfg
|
page._human_cfg = cfg
|
||||||
|
|
||||||
# --- Stealth infrastructure (lazy-initialized, async) ---
|
|
||||||
stealth = _AsyncIsolatedWorld(page)
|
|
||||||
page._stealth_world = stealth
|
|
||||||
cdp_session_holder: list[Any] = [None] # mutable container for closure
|
|
||||||
|
|
||||||
async def _ensure_cdp() -> Any:
|
|
||||||
if cdp_session_holder[0] is None:
|
|
||||||
try:
|
|
||||||
cdp_session_holder[0] = await stealth.get_cdp_session()
|
|
||||||
except Exception:
|
|
||||||
logger.debug("Could not create async CDP session")
|
|
||||||
return cdp_session_holder[0]
|
|
||||||
|
|
||||||
raw_mouse: AsyncRawMouse = type("_AsyncRawMouse", (), {
|
raw_mouse: AsyncRawMouse = type("_AsyncRawMouse", (), {
|
||||||
"move": originals.mouse_move,
|
"move": originals.mouse_move,
|
||||||
"down": originals.mouse_down,
|
"down": originals.mouse_down,
|
||||||
@@ -1140,8 +886,6 @@ def patch_page_async(page: Any, cfg: HumanConfig, cursor: _CursorState) -> None:
|
|||||||
|
|
||||||
async def _human_goto(url: str, **kwargs: Any) -> Any:
|
async def _human_goto(url: str, **kwargs: Any) -> Any:
|
||||||
response = await originals.goto(url, **kwargs)
|
response = await originals.goto(url, **kwargs)
|
||||||
# Invalidate isolated world after navigation
|
|
||||||
stealth.invalidate()
|
|
||||||
return response
|
return response
|
||||||
|
|
||||||
async def _human_click(selector: str, **kwargs: Any) -> None:
|
async def _human_click(selector: str, **kwargs: Any) -> None:
|
||||||
@@ -1196,8 +940,7 @@ def patch_page_async(page: Any, cfg: HumanConfig, cursor: _CursorState) -> None:
|
|||||||
await async_sleep_ms(rand_range(cfg.field_switch_delay))
|
await async_sleep_ms(rand_range(cfg.field_switch_delay))
|
||||||
await _human_click(selector)
|
await _human_click(selector)
|
||||||
await async_sleep_ms(rand(100, 250))
|
await async_sleep_ms(rand(100, 250))
|
||||||
cdp = await _ensure_cdp()
|
await async_human_type(page, raw_keyboard, text, cfg)
|
||||||
await async_human_type(page, raw_keyboard, text, cfg, cdp_session=cdp)
|
|
||||||
|
|
||||||
async def _human_fill(selector: str, value: str, **kwargs: Any) -> None:
|
async def _human_fill(selector: str, value: str, **kwargs: Any) -> None:
|
||||||
await async_sleep_ms(rand_range(cfg.field_switch_delay))
|
await async_sleep_ms(rand_range(cfg.field_switch_delay))
|
||||||
@@ -1207,8 +950,7 @@ def patch_page_async(page: Any, cfg: HumanConfig, cursor: _CursorState) -> None:
|
|||||||
await async_sleep_ms(rand(30, 80))
|
await async_sleep_ms(rand(30, 80))
|
||||||
await originals.keyboard_press("Backspace")
|
await originals.keyboard_press("Backspace")
|
||||||
await async_sleep_ms(rand(50, 150))
|
await async_sleep_ms(rand(50, 150))
|
||||||
cdp = await _ensure_cdp()
|
await async_human_type(page, raw_keyboard, value, cfg)
|
||||||
await async_human_type(page, raw_keyboard, value, cfg, cdp_session=cdp)
|
|
||||||
|
|
||||||
async def _human_check(selector: str, **kwargs: Any) -> None:
|
async def _human_check(selector: str, **kwargs: Any) -> None:
|
||||||
try:
|
try:
|
||||||
@@ -1246,8 +988,7 @@ def patch_page_async(page: Any, cfg: HumanConfig, cursor: _CursorState) -> None:
|
|||||||
await async_human_click(raw_mouse, False, cfg)
|
await async_human_click(raw_mouse, False, cfg)
|
||||||
|
|
||||||
async def _human_keyboard_type(text: str, **kwargs: Any) -> None:
|
async def _human_keyboard_type(text: str, **kwargs: Any) -> None:
|
||||||
cdp = await _ensure_cdp()
|
await async_human_type(page, raw_keyboard, text, cfg)
|
||||||
await async_human_type(page, raw_keyboard, text, cfg, cdp_session=cdp)
|
|
||||||
|
|
||||||
page.goto = _human_goto
|
page.goto = _human_goto
|
||||||
page.click = _human_click
|
page.click = _human_click
|
||||||
@@ -1283,10 +1024,6 @@ def _patch_frames_async(
|
|||||||
|
|
||||||
async def _frame_aware_goto(url: str, **kwargs: Any) -> Any:
|
async def _frame_aware_goto(url: str, **kwargs: Any) -> Any:
|
||||||
response = await _orig_goto(url, **kwargs)
|
response = await _orig_goto(url, **kwargs)
|
||||||
# Invalidate isolated world after navigation
|
|
||||||
stealth_world = getattr(page, '_stealth_world', None)
|
|
||||||
if stealth_world is not None:
|
|
||||||
stealth_world.invalidate()
|
|
||||||
for frame in _iter_frames(page):
|
for frame in _iter_frames(page):
|
||||||
if not getattr(frame, "_human_patched", False):
|
if not getattr(frame, "_human_patched", False):
|
||||||
_patch_single_frame_async(frame, page, cfg, cursor, raw_mouse, raw_keyboard, originals)
|
_patch_single_frame_async(frame, page, cfg, cursor, raw_mouse, raw_keyboard, originals)
|
||||||
|
|||||||
@@ -1,14 +1,9 @@
|
|||||||
"""cloakbrowser-human — Human-like keyboard input.
|
"""cloakbrowser-human — Human-like keyboard input."""
|
||||||
|
|
||||||
Stealth-aware: when a CDP session is provided, shift symbols are typed
|
|
||||||
via CDP Input.dispatchKeyEvent (isTrusted=true, no evaluate stack trace).
|
|
||||||
Falls back to page.evaluate when no CDP session is available.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import random
|
import random
|
||||||
from typing import Any, Optional, Protocol
|
from typing import Any, Protocol
|
||||||
|
|
||||||
from .config import HumanConfig, rand, rand_range, sleep_ms
|
from .config import HumanConfig, rand, rand_range, sleep_ms
|
||||||
|
|
||||||
@@ -33,25 +28,6 @@ NEARBY_KEYS = {
|
|||||||
'6': '57ty', '7': '68yu', '8': '79ui', '9': '80io', '0': '9p',
|
'6': '57ty', '7': '68yu', '8': '79ui', '9': '80io', '0': '9p',
|
||||||
}
|
}
|
||||||
|
|
||||||
# CDP key code for each shift symbol's physical key.
|
|
||||||
_SHIFT_SYMBOL_CODES: dict[str, str] = {
|
|
||||||
'!': 'Digit1', '@': 'Digit2', '#': 'Digit3', '$': 'Digit4',
|
|
||||||
'%': 'Digit5', '^': 'Digit6', '&': 'Digit7', '*': 'Digit8',
|
|
||||||
'(': 'Digit9', ')': 'Digit0', '_': 'Minus', '+': 'Equal',
|
|
||||||
'{': 'BracketLeft', '}': 'BracketRight', '|': 'Backslash',
|
|
||||||
':': 'Semicolon', '"': 'Quote', '<': 'Comma', '>': 'Period',
|
|
||||||
'?': 'Slash', '~': 'Backquote',
|
|
||||||
}
|
|
||||||
|
|
||||||
# Windows virtual key codes for Input.dispatchKeyEvent.
|
|
||||||
_SHIFT_SYMBOL_KEYCODES: dict[str, int] = {
|
|
||||||
'!': 49, '@': 50, '#': 51, '$': 52, '%': 53,
|
|
||||||
'^': 54, '&': 55, '*': 56, '(': 57, ')': 48,
|
|
||||||
'_': 189, '+': 187, '{': 219, '}': 221, '|': 220,
|
|
||||||
':': 186, '"': 222, '<': 188, '>': 190, '?': 191,
|
|
||||||
'~': 192,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def _get_nearby_key(ch: str) -> str:
|
def _get_nearby_key(ch: str) -> str:
|
||||||
"""Return a random adjacent key for the given character."""
|
"""Return a random adjacent key for the given character."""
|
||||||
@@ -63,17 +39,7 @@ def _get_nearby_key(ch: str) -> str:
|
|||||||
return ch
|
return ch
|
||||||
|
|
||||||
|
|
||||||
def human_type(
|
def human_type(page: Any, raw: RawKeyboard, text: str, cfg: HumanConfig) -> None:
|
||||||
page: Any, raw: RawKeyboard, text: str, cfg: HumanConfig,
|
|
||||||
cdp_session: Any = None,
|
|
||||||
) -> None:
|
|
||||||
"""Type text with human-like per-character timing.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
cdp_session: If provided, shift symbols use CDP Input.dispatchKeyEvent
|
|
||||||
producing isTrusted=true events with no evaluate stack trace.
|
|
||||||
If None, falls back to page.evaluate (detectable).
|
|
||||||
"""
|
|
||||||
for i, ch in enumerate(text):
|
for i, ch in enumerate(text):
|
||||||
# Non-ASCII characters (Cyrillic, CJK, emoji) — use insertText
|
# Non-ASCII characters (Cyrillic, CJK, emoji) — use insertText
|
||||||
if not ch.isascii():
|
if not ch.isascii():
|
||||||
@@ -96,7 +62,7 @@ def human_type(
|
|||||||
if ch.isupper() and ch.isalpha():
|
if ch.isupper() and ch.isalpha():
|
||||||
_type_shifted_char(page, raw, ch, cfg)
|
_type_shifted_char(page, raw, ch, cfg)
|
||||||
elif ch in SHIFT_SYMBOLS:
|
elif ch in SHIFT_SYMBOLS:
|
||||||
_type_shift_symbol(page, raw, ch, cfg, cdp_session)
|
_type_shift_symbol(page, raw, ch, cfg)
|
||||||
else:
|
else:
|
||||||
_type_normal_char(raw, ch, cfg)
|
_type_normal_char(raw, ch, cfg)
|
||||||
|
|
||||||
@@ -120,50 +86,7 @@ def _type_shifted_char(page: Any, raw: RawKeyboard, ch: str, cfg: HumanConfig) -
|
|||||||
raw.up("Shift")
|
raw.up("Shift")
|
||||||
|
|
||||||
|
|
||||||
def _type_shift_symbol(
|
def _type_shift_symbol(page: Any, raw: RawKeyboard, ch: str, cfg: HumanConfig) -> None:
|
||||||
page: Any, raw: RawKeyboard, ch: str, cfg: HumanConfig,
|
|
||||||
cdp_session: Any = None,
|
|
||||||
) -> None:
|
|
||||||
"""Type a shift symbol character.
|
|
||||||
|
|
||||||
Stealth path (cdp_session provided):
|
|
||||||
Uses CDP Input.dispatchKeyEvent → isTrusted=true, clean stack.
|
|
||||||
|
|
||||||
Fallback path (no cdp_session):
|
|
||||||
Uses raw.insertText + page.evaluate to dispatch synthetic KeyboardEvent.
|
|
||||||
Detectable via isTrusted=false and evaluate stack frame.
|
|
||||||
"""
|
|
||||||
if cdp_session is not None:
|
|
||||||
# --- Stealth path: CDP Input.dispatchKeyEvent ---
|
|
||||||
code = _SHIFT_SYMBOL_CODES.get(ch, '')
|
|
||||||
key_code = _SHIFT_SYMBOL_KEYCODES.get(ch, 0)
|
|
||||||
|
|
||||||
raw.down("Shift")
|
|
||||||
sleep_ms(rand_range(cfg.shift_down_delay))
|
|
||||||
|
|
||||||
cdp_session.send("Input.dispatchKeyEvent", {
|
|
||||||
"type": "keyDown",
|
|
||||||
"modifiers": 8, # Shift modifier flag
|
|
||||||
"key": ch,
|
|
||||||
"code": code,
|
|
||||||
"windowsVirtualKeyCode": key_code,
|
|
||||||
"text": ch,
|
|
||||||
"unmodifiedText": ch,
|
|
||||||
})
|
|
||||||
sleep_ms(rand_range(cfg.key_hold))
|
|
||||||
|
|
||||||
cdp_session.send("Input.dispatchKeyEvent", {
|
|
||||||
"type": "keyUp",
|
|
||||||
"modifiers": 8,
|
|
||||||
"key": ch,
|
|
||||||
"code": code,
|
|
||||||
"windowsVirtualKeyCode": key_code,
|
|
||||||
})
|
|
||||||
|
|
||||||
sleep_ms(rand_range(cfg.shift_up_delay))
|
|
||||||
raw.up("Shift")
|
|
||||||
else:
|
|
||||||
# --- Fallback path: page.evaluate (detectable) ---
|
|
||||||
raw.down("Shift")
|
raw.down("Shift")
|
||||||
sleep_ms(rand_range(cfg.shift_down_delay))
|
sleep_ms(rand_range(cfg.shift_down_delay))
|
||||||
raw.insert_text(ch)
|
raw.insert_text(ch)
|
||||||
|
|||||||
@@ -2,19 +2,15 @@
|
|||||||
|
|
||||||
Mirrors keyboard.py but uses ``await`` for all Playwright calls and
|
Mirrors keyboard.py but uses ``await`` for all Playwright calls and
|
||||||
``async_sleep_ms`` instead of ``sleep_ms``.
|
``async_sleep_ms`` instead of ``sleep_ms``.
|
||||||
|
|
||||||
Stealth-aware: when a CDP session is provided, shift symbols are typed
|
|
||||||
via CDP Input.dispatchKeyEvent (isTrusted=true, no evaluate stack trace).
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import random
|
import random
|
||||||
from typing import Any, Optional, Protocol
|
from typing import Any, Protocol
|
||||||
|
|
||||||
from .config import HumanConfig, rand, rand_range, async_sleep_ms
|
from .config import HumanConfig, rand, rand_range, async_sleep_ms
|
||||||
from .keyboard import SHIFT_SYMBOLS, NEARBY_KEYS, _get_nearby_key
|
from .keyboard import SHIFT_SYMBOLS, NEARBY_KEYS, _get_nearby_key
|
||||||
from .keyboard import _SHIFT_SYMBOL_CODES, _SHIFT_SYMBOL_KEYCODES
|
|
||||||
|
|
||||||
|
|
||||||
class AsyncRawKeyboard(Protocol):
|
class AsyncRawKeyboard(Protocol):
|
||||||
@@ -24,17 +20,7 @@ class AsyncRawKeyboard(Protocol):
|
|||||||
async def insert_text(self, text: str) -> None: ...
|
async def insert_text(self, text: str) -> None: ...
|
||||||
|
|
||||||
|
|
||||||
async def async_human_type(
|
async def async_human_type(page: Any, raw: AsyncRawKeyboard, text: str, cfg: HumanConfig) -> None:
|
||||||
page: Any, raw: AsyncRawKeyboard, text: str, cfg: HumanConfig,
|
|
||||||
cdp_session: Any = None,
|
|
||||||
) -> None:
|
|
||||||
"""Type text with human-like per-character timing (async).
|
|
||||||
|
|
||||||
Args:
|
|
||||||
cdp_session: If provided, shift symbols use CDP Input.dispatchKeyEvent
|
|
||||||
producing isTrusted=true events with no evaluate stack trace.
|
|
||||||
If None, falls back to page.evaluate (detectable).
|
|
||||||
"""
|
|
||||||
for i, ch in enumerate(text):
|
for i, ch in enumerate(text):
|
||||||
# Non-ASCII characters (Cyrillic, CJK, emoji) — use insertText
|
# Non-ASCII characters (Cyrillic, CJK, emoji) — use insertText
|
||||||
if not ch.isascii():
|
if not ch.isascii():
|
||||||
@@ -57,7 +43,7 @@ async def async_human_type(
|
|||||||
if ch.isupper() and ch.isalpha():
|
if ch.isupper() and ch.isalpha():
|
||||||
await _type_shifted_char(page, raw, ch, cfg)
|
await _type_shifted_char(page, raw, ch, cfg)
|
||||||
elif ch in SHIFT_SYMBOLS:
|
elif ch in SHIFT_SYMBOLS:
|
||||||
await _type_shift_symbol(page, raw, ch, cfg, cdp_session)
|
await _type_shift_symbol(page, raw, ch, cfg)
|
||||||
else:
|
else:
|
||||||
await _type_normal_char(raw, ch, cfg)
|
await _type_normal_char(raw, ch, cfg)
|
||||||
|
|
||||||
@@ -81,50 +67,7 @@ async def _type_shifted_char(page: Any, raw: AsyncRawKeyboard, ch: str, cfg: Hum
|
|||||||
await raw.up("Shift")
|
await raw.up("Shift")
|
||||||
|
|
||||||
|
|
||||||
async def _type_shift_symbol(
|
async def _type_shift_symbol(page: Any, raw: AsyncRawKeyboard, ch: str, cfg: HumanConfig) -> None:
|
||||||
page: Any, raw: AsyncRawKeyboard, ch: str, cfg: HumanConfig,
|
|
||||||
cdp_session: Any = None,
|
|
||||||
) -> None:
|
|
||||||
"""Type a shift symbol character (async).
|
|
||||||
|
|
||||||
Stealth path (cdp_session provided):
|
|
||||||
Uses CDP Input.dispatchKeyEvent → isTrusted=true, clean stack.
|
|
||||||
|
|
||||||
Fallback path (no cdp_session):
|
|
||||||
Uses raw.insertText + page.evaluate to dispatch synthetic KeyboardEvent.
|
|
||||||
Detectable via isTrusted=false and evaluate stack frame.
|
|
||||||
"""
|
|
||||||
if cdp_session is not None:
|
|
||||||
# --- Stealth path: CDP Input.dispatchKeyEvent ---
|
|
||||||
code = _SHIFT_SYMBOL_CODES.get(ch, '')
|
|
||||||
key_code = _SHIFT_SYMBOL_KEYCODES.get(ch, 0)
|
|
||||||
|
|
||||||
await raw.down("Shift")
|
|
||||||
await async_sleep_ms(rand_range(cfg.shift_down_delay))
|
|
||||||
|
|
||||||
await cdp_session.send("Input.dispatchKeyEvent", {
|
|
||||||
"type": "keyDown",
|
|
||||||
"modifiers": 8, # Shift modifier flag
|
|
||||||
"key": ch,
|
|
||||||
"code": code,
|
|
||||||
"windowsVirtualKeyCode": key_code,
|
|
||||||
"text": ch,
|
|
||||||
"unmodifiedText": ch,
|
|
||||||
})
|
|
||||||
await async_sleep_ms(rand_range(cfg.key_hold))
|
|
||||||
|
|
||||||
await cdp_session.send("Input.dispatchKeyEvent", {
|
|
||||||
"type": "keyUp",
|
|
||||||
"modifiers": 8,
|
|
||||||
"key": ch,
|
|
||||||
"code": code,
|
|
||||||
"windowsVirtualKeyCode": key_code,
|
|
||||||
})
|
|
||||||
|
|
||||||
await async_sleep_ms(rand_range(cfg.shift_up_delay))
|
|
||||||
await raw.up("Shift")
|
|
||||||
else:
|
|
||||||
# --- Fallback path: page.evaluate (detectable) ---
|
|
||||||
await raw.down("Shift")
|
await raw.down("Shift")
|
||||||
await async_sleep_ms(rand_range(cfg.shift_down_delay))
|
await async_sleep_ms(rand_range(cfg.shift_down_delay))
|
||||||
await raw.insert_text(ch)
|
await raw.insert_text(ch)
|
||||||
|
|||||||
@@ -228,7 +228,7 @@ def main():
|
|||||||
print()
|
print()
|
||||||
print("Launching stealth browser...", flush=True)
|
print("Launching stealth browser...", flush=True)
|
||||||
|
|
||||||
browser = launch(headless=not HEADED, proxy=PROXY, geoip=True)
|
browser = launch(headless=not HEADED, proxy=PROXY)
|
||||||
page = browser.new_page()
|
page = browser.new_page()
|
||||||
|
|
||||||
# Show browser fingerprint details
|
# Show browser fingerprint details
|
||||||
|
|||||||
+4
-4
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
Drop-in Playwright/Puppeteer replacement. Same API, same code — just swap the import. **3 lines of code, 30 seconds to unblock.**
|
Drop-in Playwright/Puppeteer replacement. Same API, same code — just swap the import. **3 lines of code, 30 seconds to unblock.**
|
||||||
|
|
||||||
- **48 source-level C++ patches** — canvas, WebGL, audio, fonts, GPU, screen, WebRTC, network timing, automation signals
|
- **42 source-level C++ patches** — canvas, WebGL, audio, fonts, GPU, screen, automation signals
|
||||||
- **0.9 reCAPTCHA v3 score** — human-level, server-verified
|
- **0.9 reCAPTCHA v3 score** — human-level, server-verified
|
||||||
- **Passes Cloudflare Turnstile**, FingerprintJS, BrowserScan — tested against 30+ detection sites
|
- **Passes Cloudflare Turnstile**, FingerprintJS, BrowserScan — tested against 30+ detection sites
|
||||||
- **`npm install cloakbrowser`** — binary auto-downloads, auto-updates, zero config
|
- **`npm install cloakbrowser`** — binary auto-downloads, auto-updates, zero config
|
||||||
@@ -203,11 +203,11 @@ const page = await browser.newPage();
|
|||||||
|
|
||||||
| Platform | Chromium | Patches | Status |
|
| Platform | Chromium | Patches | Status |
|
||||||
|---|---|---|---|
|
|---|---|---|---|
|
||||||
| Linux x86_64 | 145 | 48 | ✅ Latest |
|
| Linux x86_64 | 145 | 33 | ✅ Latest |
|
||||||
| Linux arm64 (RPi, Graviton) | 145 | 48 | ✅ Latest |
|
| Linux arm64 (RPi, Graviton) | 145 | 33 | ✅ Latest |
|
||||||
| macOS arm64 (Apple Silicon) | 145 | 26 | ✅ Latest |
|
| macOS arm64 (Apple Silicon) | 145 | 26 | ✅ Latest |
|
||||||
| macOS x86_64 (Intel) | 145 | 26 | ✅ Latest |
|
| macOS x86_64 (Intel) | 145 | 26 | ✅ Latest |
|
||||||
| Windows x86_64 | 145 | 48 | ✅ Latest |
|
| Windows x86_64 | 145 | 33 | ✅ Latest |
|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
|
|
||||||
|
|||||||
+1
-5
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "cloakbrowser",
|
"name": "cloakbrowser",
|
||||||
"version": "0.3.23",
|
"version": "0.3.19",
|
||||||
"description": "Stealth Chromium that passes every bot detection test. Drop-in Playwright/Puppeteer replacement with source-level fingerprint patches.",
|
"description": "Stealth Chromium that passes every bot detection test. Drop-in Playwright/Puppeteer replacement with source-level fingerprint patches.",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
@@ -13,10 +13,6 @@
|
|||||||
"./puppeteer": {
|
"./puppeteer": {
|
||||||
"types": "./dist/puppeteer.d.ts",
|
"types": "./dist/puppeteer.d.ts",
|
||||||
"import": "./dist/puppeteer.js"
|
"import": "./dist/puppeteer.js"
|
||||||
},
|
|
||||||
"./human": {
|
|
||||||
"types": "./dist/human/index.d.ts",
|
|
||||||
"import": "./dist/human/index.js"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
|
|||||||
+16
-5
@@ -27,10 +27,10 @@ export { WRAPPER_VERSION };
|
|||||||
// CHROMIUM_VERSION is the latest across all platforms (for display/reference).
|
// CHROMIUM_VERSION is the latest across all platforms (for display/reference).
|
||||||
// Use getChromiumVersion() for the current platform's actual version.
|
// Use getChromiumVersion() for the current platform's actual version.
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
export const CHROMIUM_VERSION = "146.0.7680.177.1";
|
export const CHROMIUM_VERSION = "145.0.7632.159.8";
|
||||||
|
|
||||||
export const PLATFORM_CHROMIUM_VERSIONS: Record<string, string> = {
|
export const PLATFORM_CHROMIUM_VERSIONS: Record<string, string> = {
|
||||||
"linux-x64": "146.0.7680.177.1",
|
"linux-x64": "145.0.7632.159.8",
|
||||||
"linux-arm64": "145.0.7632.159.7",
|
"linux-arm64": "145.0.7632.159.7",
|
||||||
"darwin-arm64": "145.0.7632.109.2",
|
"darwin-arm64": "145.0.7632.109.2",
|
||||||
"darwin-x64": "145.0.7632.109.2",
|
"darwin-x64": "145.0.7632.109.2",
|
||||||
@@ -211,16 +211,27 @@ export function getDefaultStealthArgs(): string[] {
|
|||||||
|
|
||||||
const base = [
|
const base = [
|
||||||
"--no-sandbox",
|
"--no-sandbox",
|
||||||
|
"--disable-blink-features=AutomationControlled",
|
||||||
`--fingerprint=${seed}`,
|
`--fingerprint=${seed}`,
|
||||||
];
|
];
|
||||||
|
|
||||||
if (isMac) {
|
if (isMac) {
|
||||||
// macOS: run as native Mac browser — GPU/UA match natively
|
// macOS: run as native Mac browser — GPU/UA match natively
|
||||||
return [...base, "--fingerprint-platform=macos"];
|
return [
|
||||||
|
...base,
|
||||||
|
"--fingerprint-platform=macos",
|
||||||
|
"--fingerprint-gpu-vendor=Google Inc. (Apple)",
|
||||||
|
"--fingerprint-gpu-renderer=ANGLE (Apple, ANGLE Metal Renderer: Apple M3, Unspecified Version)",
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
// Linux/Windows: spoof as Windows desktop
|
// Linux/Windows: spoof as Windows desktop
|
||||||
// Hardware concurrency, device memory, screen, window size, and GPU are
|
// Hardware concurrency, device memory, screen, and window size are
|
||||||
// auto-generated by the binary from the seed (v14+).
|
// auto-generated by the binary from the seed (v14+).
|
||||||
return [...base, "--fingerprint-platform=windows"];
|
return [
|
||||||
|
...base,
|
||||||
|
"--fingerprint-platform=windows",
|
||||||
|
"--fingerprint-gpu-vendor=Google Inc. (NVIDIA)",
|
||||||
|
"--fingerprint-gpu-renderer=ANGLE (NVIDIA, NVIDIA GeForce RTX 3070 (0x00002484) Direct3D11 vs_5_0 ps_5_0, D3D11)",
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
+8
-53
@@ -44,7 +44,6 @@ export const COUNTRY_LOCALE_MAP: Record<string, string> = {
|
|||||||
export interface GeoResult {
|
export interface GeoResult {
|
||||||
timezone: string | null;
|
timezone: string | null;
|
||||||
locale: string | null;
|
locale: string | null;
|
||||||
exitIp: string | null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -66,12 +65,12 @@ export async function resolveProxyGeo(
|
|||||||
}
|
}
|
||||||
|
|
||||||
const dbPath = await ensureGeoipDb();
|
const dbPath = await ensureGeoipDb();
|
||||||
if (!dbPath) return { timezone: null, locale: null, exitIp: null };
|
if (!dbPath) return { timezone: null, locale: null };
|
||||||
|
|
||||||
// Exit IP (through proxy) is most accurate — gateway DNS may differ from exit
|
// Exit IP (through proxy) is most accurate — gateway DNS may differ from exit
|
||||||
let ip = await resolveExitIp(proxyUrl);
|
let ip = await resolveExitIp(proxyUrl);
|
||||||
if (!ip) ip = await resolveProxyIp(proxyUrl);
|
if (!ip) ip = await resolveProxyIp(proxyUrl);
|
||||||
if (!ip) return { timezone: null, locale: null, exitIp: null };
|
if (!ip) return { timezone: null, locale: null };
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const buf = fs.readFileSync(dbPath);
|
const buf = fs.readFileSync(dbPath);
|
||||||
@@ -81,9 +80,9 @@ export async function resolveProxyGeo(
|
|||||||
const countryCode: string | null = result?.country?.iso_code ?? null;
|
const countryCode: string | null = result?.country?.iso_code ?? null;
|
||||||
const locale =
|
const locale =
|
||||||
countryCode ? (COUNTRY_LOCALE_MAP[countryCode] ?? null) : null;
|
countryCode ? (COUNTRY_LOCALE_MAP[countryCode] ?? null) : null;
|
||||||
return { timezone, locale, exitIp: ip };
|
return { timezone, locale };
|
||||||
} catch {
|
} catch {
|
||||||
return { timezone: null, locale: null, exitIp: ip };
|
return { timezone: null, locale: null };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -266,64 +265,20 @@ function maybeTriggerUpdate(dbPath: string): void {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Auto-fill timezone/locale from proxy IP when geoip is enabled.
|
* Auto-fill timezone/locale from proxy IP when geoip is enabled.
|
||||||
* Also returns exitIp as a free bonus (reused for WebRTC spoofing).
|
* Shared by the Playwright and Puppeteer wrappers.
|
||||||
*/
|
*/
|
||||||
export async function maybeResolveGeoip(
|
export async function maybeResolveGeoip(
|
||||||
options: LaunchOptions
|
options: LaunchOptions
|
||||||
): Promise<{ timezone?: string; locale?: string; exitIp?: string }> {
|
): Promise<{ timezone?: string; locale?: string }> {
|
||||||
if (!options.geoip || !options.proxy) return { timezone: options.timezone, locale: options.locale };
|
if (!options.geoip || !options.proxy) return { timezone: options.timezone, locale: options.locale };
|
||||||
|
if (options.timezone && options.locale) return { timezone: options.timezone, locale: options.locale };
|
||||||
|
|
||||||
let proxyUrl = typeof options.proxy === "string" ? options.proxy : options.proxy.server;
|
let proxyUrl = typeof options.proxy === "string" ? options.proxy : options.proxy.server;
|
||||||
if (!proxyUrl) return { timezone: options.timezone, locale: options.locale };
|
if (!proxyUrl) return { timezone: options.timezone, locale: options.locale };
|
||||||
proxyUrl = ensureProxyScheme(proxyUrl);
|
proxyUrl = ensureProxyScheme(proxyUrl);
|
||||||
|
const { timezone: geoTz, locale: geoLocale } = await resolveProxyGeo(proxyUrl);
|
||||||
// When both tz/locale are explicit, still resolve exit IP for WebRTC
|
|
||||||
if (options.timezone && options.locale) {
|
|
||||||
const exitIp = await resolveExitIp(proxyUrl) ?? undefined;
|
|
||||||
return { timezone: options.timezone, locale: options.locale, exitIp };
|
|
||||||
}
|
|
||||||
|
|
||||||
const { timezone: geoTz, locale: geoLocale, exitIp: geoExitIp } = await resolveProxyGeo(proxyUrl);
|
|
||||||
const exitIp = geoExitIp ?? undefined;
|
|
||||||
return {
|
return {
|
||||||
timezone: options.timezone ?? geoTz ?? undefined,
|
timezone: options.timezone ?? geoTz ?? undefined,
|
||||||
locale: options.locale ?? geoLocale ?? undefined,
|
locale: options.locale ?? geoLocale ?? undefined,
|
||||||
exitIp,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Replace --fingerprint-webrtc-ip=auto with the resolved proxy exit IP.
|
|
||||||
* Returns args unchanged if no ``auto`` value is present.
|
|
||||||
*/
|
|
||||||
export async function resolveWebrtcArgs(
|
|
||||||
options: LaunchOptions
|
|
||||||
): Promise<string[] | undefined> {
|
|
||||||
const args = options.args;
|
|
||||||
if (!args) return args;
|
|
||||||
const idx = args.findIndex(a => a === "--fingerprint-webrtc-ip=auto");
|
|
||||||
if (idx === -1) return args;
|
|
||||||
|
|
||||||
let proxyUrl = typeof options.proxy === "string" ? options.proxy : options.proxy?.server;
|
|
||||||
if (!proxyUrl) {
|
|
||||||
const result = [...args];
|
|
||||||
result.splice(idx, 1);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
proxyUrl = ensureProxyScheme(proxyUrl);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const ip = await resolveExitIp(proxyUrl);
|
|
||||||
const result = [...args];
|
|
||||||
if (ip) {
|
|
||||||
result[idx] = `--fingerprint-webrtc-ip=${ip}`;
|
|
||||||
} else {
|
|
||||||
result.splice(idx, 1);
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
} catch {
|
|
||||||
const result = [...args];
|
|
||||||
result.splice(idx, 1);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,913 +0,0 @@
|
|||||||
/**
|
|
||||||
* Human-like behavioral layer for cloakbrowser — Puppeteer edition.
|
|
||||||
*
|
|
||||||
* Mirrors Playwright humanize architecture, adapted for Puppeteer API.
|
|
||||||
*
|
|
||||||
* Patches ALL native Puppeteer interaction surfaces:
|
|
||||||
*
|
|
||||||
* PAGE-LEVEL:
|
|
||||||
* click (with clickCount support for dblclick), hover, type,
|
|
||||||
* select, focus, tap, goto
|
|
||||||
*
|
|
||||||
* MOUSE:
|
|
||||||
* move, click (with clickCount support for dblclick), wheel,
|
|
||||||
* dragAndDrop
|
|
||||||
*
|
|
||||||
* KEYBOARD:
|
|
||||||
* type, down, up, press, sendCharacter
|
|
||||||
*
|
|
||||||
* FRAME-LEVEL:
|
|
||||||
* click, hover, type, select, focus, tap
|
|
||||||
* + $, $$, waitForSelector (return patched ElementHandles)
|
|
||||||
*
|
|
||||||
* ELEMENTHANDLE-LEVEL (Puppeteer-specific, no Playwright equivalent):
|
|
||||||
* click (with clickCount), hover, type, press, tap, select,
|
|
||||||
* focus, drop, dragAndDrop
|
|
||||||
* + $, $$, waitForSelector (nested elements are also patched)
|
|
||||||
*
|
|
||||||
* BROWSER-LEVEL:
|
|
||||||
* newPage, createBrowserContext / createIncognitoBrowserContext,
|
|
||||||
* targetcreated event
|
|
||||||
*
|
|
||||||
* Stealth-aware:
|
|
||||||
* - isInputElement / isSelectorFocused use CDP Isolated Worlds
|
|
||||||
* - Shift symbol typing uses CDP Input.dispatchKeyEvent (isTrusted=true)
|
|
||||||
* - ElementHandle isInput check uses CDP DOM.describeNode (no JS execution)
|
|
||||||
* - Falls back to page.evaluate only when CDP session is unavailable
|
|
||||||
*
|
|
||||||
* Puppeteer-specific adaptations:
|
|
||||||
* - page.createCDPSession() instead of context.newCDPSession(page)
|
|
||||||
* - page.viewport() instead of page.viewportSize()
|
|
||||||
* - page.$(selector) instead of page.locator(selector)
|
|
||||||
* - keyboard.sendCharacter() mapped via RawKeyboard.insertText
|
|
||||||
* - mouse.wheel({deltaX, deltaY}) object form adapted to (dx, dy)
|
|
||||||
* - page.select() instead of page.selectOption()
|
|
||||||
* - ElementHandle prototype patching (Puppeteer-only)
|
|
||||||
* - No page.dblclick() — Puppeteer uses click({clickCount:2})
|
|
||||||
*/
|
|
||||||
|
|
||||||
import type { Browser, Page, Frame, CDPSession, ElementHandle, BrowserContext } from 'puppeteer-core';
|
|
||||||
import type { HumanConfig } from '../human/config.js';
|
|
||||||
import { resolveConfig, rand, randRange, sleep } from '../human/config.js';
|
|
||||||
import { RawMouse, RawKeyboard, humanMove, humanClick, clickTarget, humanIdle } from '../human/mouse.js';
|
|
||||||
import { humanType } from './keyboard.js';
|
|
||||||
import { scrollToElement, smoothWheel } from './scroll.js';
|
|
||||||
|
|
||||||
export type { HumanConfig } from '../human/config.js';
|
|
||||||
export { resolveConfig } from '../human/config.js';
|
|
||||||
export { humanMove, humanClick, clickTarget, humanIdle } from '../human/mouse.js';
|
|
||||||
export { humanType } from './keyboard.js';
|
|
||||||
export { scrollToElement } from './scroll.js';
|
|
||||||
|
|
||||||
|
|
||||||
// ============================================================================
|
|
||||||
// CDP Isolated World — stealth DOM evaluation (Puppeteer version)
|
|
||||||
// ============================================================================
|
|
||||||
|
|
||||||
class StealthEval {
|
|
||||||
private cdp: CDPSession | null = null;
|
|
||||||
private contextId: number | null = null;
|
|
||||||
private page: Page;
|
|
||||||
|
|
||||||
constructor(page: Page) {
|
|
||||||
this.page = page;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async ensureCdp(): Promise<CDPSession> {
|
|
||||||
if (!this.cdp) {
|
|
||||||
this.cdp = await this.page.createCDPSession();
|
|
||||||
}
|
|
||||||
return this.cdp;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async createWorld(): Promise<number> {
|
|
||||||
const cdp = await this.ensureCdp();
|
|
||||||
const tree = await cdp.send('Page.getFrameTree');
|
|
||||||
const frameId = (tree as any).frameTree.frame.id;
|
|
||||||
const result = await cdp.send('Page.createIsolatedWorld', {
|
|
||||||
frameId,
|
|
||||||
worldName: '',
|
|
||||||
grantUniveralAccess: true,
|
|
||||||
});
|
|
||||||
const ctxId = (result as any).executionContextId;
|
|
||||||
this.contextId = ctxId;
|
|
||||||
return ctxId;
|
|
||||||
}
|
|
||||||
|
|
||||||
async evaluate(expression: string): Promise<any> {
|
|
||||||
if (this.contextId === null) {
|
|
||||||
await this.createWorld();
|
|
||||||
}
|
|
||||||
|
|
||||||
for (let attempt = 0; attempt < 2; attempt++) {
|
|
||||||
try {
|
|
||||||
const cdp = await this.ensureCdp();
|
|
||||||
const result = await cdp.send('Runtime.evaluate', {
|
|
||||||
expression,
|
|
||||||
contextId: this.contextId!,
|
|
||||||
returnByValue: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
if ((result as any).exceptionDetails) {
|
|
||||||
if (attempt === 0) {
|
|
||||||
await this.createWorld();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (result as any).result?.value;
|
|
||||||
} catch {
|
|
||||||
if (attempt === 0) {
|
|
||||||
this.contextId = null;
|
|
||||||
try { await this.createWorld(); } catch { return undefined; }
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
invalidate(): void {
|
|
||||||
this.contextId = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
async getCdpSession(): Promise<CDPSession> {
|
|
||||||
return this.ensureCdp();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// ============================================================================
|
|
||||||
// Cursor state
|
|
||||||
// ============================================================================
|
|
||||||
|
|
||||||
class CursorState {
|
|
||||||
x = 0;
|
|
||||||
y = 0;
|
|
||||||
initialized = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// ============================================================================
|
|
||||||
// Stealth DOM queries
|
|
||||||
// ============================================================================
|
|
||||||
|
|
||||||
async function isInputElement(
|
|
||||||
stealth: StealthEval | null,
|
|
||||||
page: Page,
|
|
||||||
selector: string,
|
|
||||||
): Promise<boolean> {
|
|
||||||
if (stealth) {
|
|
||||||
try {
|
|
||||||
const escaped = JSON.stringify(selector);
|
|
||||||
const result = await stealth.evaluate(`
|
|
||||||
(() => {
|
|
||||||
const el = document.querySelector(${escaped});
|
|
||||||
if (!el) return false;
|
|
||||||
const tag = el.tagName.toLowerCase();
|
|
||||||
return tag === 'input' || tag === 'textarea'
|
|
||||||
|| el.getAttribute('contenteditable') === 'true';
|
|
||||||
})()
|
|
||||||
`);
|
|
||||||
return !!result;
|
|
||||||
} catch { /* fallthrough */ }
|
|
||||||
}
|
|
||||||
|
|
||||||
return page.evaluate((sel: string) => {
|
|
||||||
const el = document.querySelector(sel);
|
|
||||||
if (!el) return false;
|
|
||||||
const tag = el.tagName.toLowerCase();
|
|
||||||
return tag === 'input' || tag === 'textarea'
|
|
||||||
|| el.getAttribute('contenteditable') === 'true';
|
|
||||||
}, selector).catch(() => false);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function isSelectorFocused(
|
|
||||||
stealth: StealthEval | null,
|
|
||||||
page: Page,
|
|
||||||
selector: string,
|
|
||||||
): Promise<boolean> {
|
|
||||||
if (stealth) {
|
|
||||||
try {
|
|
||||||
const escaped = JSON.stringify(selector);
|
|
||||||
const result = await stealth.evaluate(`
|
|
||||||
(() => {
|
|
||||||
const el = document.querySelector(${escaped});
|
|
||||||
return el === document.activeElement;
|
|
||||||
})()
|
|
||||||
`);
|
|
||||||
return !!result;
|
|
||||||
} catch { /* fallthrough */ }
|
|
||||||
}
|
|
||||||
|
|
||||||
return page.evaluate((sel: string) => {
|
|
||||||
const el = document.querySelector(sel);
|
|
||||||
return el === document.activeElement;
|
|
||||||
}, selector).catch(() => false);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// ============================================================================
|
|
||||||
// Stealth ElementHandle input check — uses CDP DOM.describeNode
|
|
||||||
// instead of el.evaluate() to avoid main-world JS execution.
|
|
||||||
// ============================================================================
|
|
||||||
|
|
||||||
async function isInputElementHandle(
|
|
||||||
stealth: StealthEval | null,
|
|
||||||
el: ElementHandle,
|
|
||||||
): Promise<boolean> {
|
|
||||||
if (stealth) {
|
|
||||||
try {
|
|
||||||
const cdp = await stealth.getCdpSession();
|
|
||||||
const remoteObject = (el as any).remoteObject?.();
|
|
||||||
if (remoteObject?.objectId) {
|
|
||||||
const { node } = await cdp.send('DOM.describeNode', {
|
|
||||||
objectId: remoteObject.objectId,
|
|
||||||
}) as any;
|
|
||||||
|
|
||||||
const tag = (node?.nodeName || '').toLowerCase();
|
|
||||||
if (tag === 'input' || tag === 'textarea') return true;
|
|
||||||
|
|
||||||
const attrs: string[] = node?.attributes || [];
|
|
||||||
for (let i = 0; i < attrs.length; i += 2) {
|
|
||||||
if (attrs[i] === 'contenteditable' && attrs[i + 1] === 'true') {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
} catch { /* fallthrough to el.evaluate */ }
|
|
||||||
}
|
|
||||||
|
|
||||||
return el.evaluate((node: any) => {
|
|
||||||
const tag = node.tagName?.toLowerCase();
|
|
||||||
return tag === 'input' || tag === 'textarea'
|
|
||||||
|| node.getAttribute?.('contenteditable') === 'true';
|
|
||||||
}).catch(() => false);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// ============================================================================
|
|
||||||
// Page-level patching
|
|
||||||
// ============================================================================
|
|
||||||
|
|
||||||
function patchPage(page: Page, cfg: HumanConfig, cursor: CursorState): void {
|
|
||||||
const originals = {
|
|
||||||
click: page.click.bind(page),
|
|
||||||
hover: page.hover.bind(page),
|
|
||||||
type: page.type.bind(page),
|
|
||||||
select: page.select.bind(page),
|
|
||||||
focus: page.focus.bind(page),
|
|
||||||
goto: page.goto.bind(page),
|
|
||||||
tap: page.tap.bind(page),
|
|
||||||
|
|
||||||
mouseMove: page.mouse.move.bind(page.mouse),
|
|
||||||
mouseClick: page.mouse.click.bind(page.mouse),
|
|
||||||
mouseDown: page.mouse.down.bind(page.mouse),
|
|
||||||
mouseUp: page.mouse.up.bind(page.mouse),
|
|
||||||
mouseWheel: (page.mouse as any).wheel?.bind(page.mouse),
|
|
||||||
mouseDragAndDrop: (page.mouse as any).dragAndDrop?.bind(page.mouse),
|
|
||||||
|
|
||||||
keyboardType: page.keyboard.type.bind(page.keyboard),
|
|
||||||
keyboardDown: page.keyboard.down.bind(page.keyboard) as (key: string) => Promise<void>,
|
|
||||||
keyboardUp: page.keyboard.up.bind(page.keyboard) as (key: string) => Promise<void>,
|
|
||||||
keyboardPress: page.keyboard.press.bind(page.keyboard),
|
|
||||||
keyboardSendCharacter: page.keyboard.sendCharacter.bind(page.keyboard),
|
|
||||||
};
|
|
||||||
|
|
||||||
(page as any)._original = originals;
|
|
||||||
(page as any)._humanCfg = cfg;
|
|
||||||
|
|
||||||
const stealth = new StealthEval(page);
|
|
||||||
(page as any)._stealth = stealth;
|
|
||||||
|
|
||||||
let cdpSession: CDPSession | null = null;
|
|
||||||
const ensureCdp = async (): Promise<CDPSession | null> => {
|
|
||||||
if (!cdpSession) {
|
|
||||||
try { cdpSession = await stealth.getCdpSession(); } catch {}
|
|
||||||
}
|
|
||||||
return cdpSession;
|
|
||||||
};
|
|
||||||
|
|
||||||
const raw: RawMouse = {
|
|
||||||
move: originals.mouseMove,
|
|
||||||
down: originals.mouseDown,
|
|
||||||
up: originals.mouseUp,
|
|
||||||
wheel: async (deltaX: number, deltaY: number) => {
|
|
||||||
if (originals.mouseWheel) {
|
|
||||||
await originals.mouseWheel({ deltaX, deltaY });
|
|
||||||
}
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const rawKb: RawKeyboard = {
|
|
||||||
down: originals.keyboardDown,
|
|
||||||
up: originals.keyboardUp,
|
|
||||||
type: originals.keyboardType,
|
|
||||||
insertText: originals.keyboardSendCharacter,
|
|
||||||
};
|
|
||||||
|
|
||||||
async function ensureCursorInit(): Promise<void> {
|
|
||||||
if (!cursor.initialized) {
|
|
||||||
cursor.x = rand(cfg.initial_cursor_x[0], cfg.initial_cursor_x[1]);
|
|
||||||
cursor.y = rand(cfg.initial_cursor_y[0], cfg.initial_cursor_y[1]);
|
|
||||||
await originals.mouseMove(cursor.x, cursor.y);
|
|
||||||
cursor.initialized = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ==== goto ====
|
|
||||||
const humanGoto = async (url: string, options?: any) => {
|
|
||||||
const response = await originals.goto(url, options);
|
|
||||||
stealth.invalidate();
|
|
||||||
patchFrames(page, cfg, cursor, raw, rawKb, originals, stealth);
|
|
||||||
return response;
|
|
||||||
};
|
|
||||||
|
|
||||||
// ==== click (with clickCount support for dblclick) ====
|
|
||||||
const humanClickFn = async (selector: string, options?: any) => {
|
|
||||||
await ensureCursorInit();
|
|
||||||
if (cfg.idle_between_actions) {
|
|
||||||
await humanIdle(raw, rand(cfg.idle_between_duration[0], cfg.idle_between_duration[1]), cursor.x, cursor.y, cfg);
|
|
||||||
}
|
|
||||||
const { box, cursorX, cursorY } = await scrollToElement(page, raw, selector, cursor.x, cursor.y, cfg);
|
|
||||||
cursor.x = cursorX;
|
|
||||||
cursor.y = cursorY;
|
|
||||||
const isInput = await isInputElement(stealth, page, selector);
|
|
||||||
const target = clickTarget(box, isInput, cfg);
|
|
||||||
await humanMove(raw, cursor.x, cursor.y, target.x, target.y, cfg);
|
|
||||||
cursor.x = target.x;
|
|
||||||
cursor.y = target.y;
|
|
||||||
|
|
||||||
const clickCount = options?.clickCount ?? options?.count ?? 1;
|
|
||||||
if (clickCount >= 2) {
|
|
||||||
await humanClick(raw, isInput, cfg);
|
|
||||||
await sleep(rand(40, 90));
|
|
||||||
await raw.down({ clickCount: 2 });
|
|
||||||
await sleep(rand(30, 60));
|
|
||||||
await raw.up({ clickCount: 2 });
|
|
||||||
} else {
|
|
||||||
await humanClick(raw, isInput, cfg);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// ==== hover ====
|
|
||||||
const humanHoverFn = async (selector: string, options?: any) => {
|
|
||||||
await ensureCursorInit();
|
|
||||||
if (cfg.idle_between_actions) {
|
|
||||||
await humanIdle(raw, rand(cfg.idle_between_duration[0], cfg.idle_between_duration[1]), cursor.x, cursor.y, cfg);
|
|
||||||
}
|
|
||||||
const { box, cursorX, cursorY } = await scrollToElement(page, raw, selector, cursor.x, cursor.y, cfg);
|
|
||||||
cursor.x = cursorX;
|
|
||||||
cursor.y = cursorY;
|
|
||||||
const target = clickTarget(box, false, cfg);
|
|
||||||
await humanMove(raw, cursor.x, cursor.y, target.x, target.y, cfg);
|
|
||||||
cursor.x = target.x;
|
|
||||||
cursor.y = target.y;
|
|
||||||
};
|
|
||||||
|
|
||||||
// ==== type ====
|
|
||||||
const humanTypeFn = async (selector: string, text: string, options?: any) => {
|
|
||||||
await sleep(randRange(cfg.field_switch_delay));
|
|
||||||
await humanClickFn(selector);
|
|
||||||
await sleep(rand(100, 250));
|
|
||||||
const cdp = await ensureCdp();
|
|
||||||
await humanType(page, rawKb, text, cfg, cdp);
|
|
||||||
};
|
|
||||||
|
|
||||||
// ==== select ====
|
|
||||||
const humanSelectFn = async (selector: string, ...values: string[]) => {
|
|
||||||
await humanHoverFn(selector);
|
|
||||||
await sleep(rand(100, 300));
|
|
||||||
return originals.select(selector, ...values);
|
|
||||||
};
|
|
||||||
|
|
||||||
// ==== focus ====
|
|
||||||
const humanFocusFn = async (selector: string) => {
|
|
||||||
if (!await isSelectorFocused(stealth, page, selector)) {
|
|
||||||
await humanClickFn(selector);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// ==== tap ====
|
|
||||||
const humanTapFn = async (selector: string, options?: any) => {
|
|
||||||
await humanClickFn(selector, options);
|
|
||||||
};
|
|
||||||
|
|
||||||
// ============================================================
|
|
||||||
// Assign page-level patches
|
|
||||||
// ============================================================
|
|
||||||
(page as any).goto = humanGoto;
|
|
||||||
(page as any).click = humanClickFn;
|
|
||||||
(page as any).hover = humanHoverFn;
|
|
||||||
(page as any).type = humanTypeFn;
|
|
||||||
(page as any).select = humanSelectFn;
|
|
||||||
(page as any).focus = humanFocusFn;
|
|
||||||
(page as any).tap = humanTapFn;
|
|
||||||
|
|
||||||
// ============================================================
|
|
||||||
// Mouse patches
|
|
||||||
// ============================================================
|
|
||||||
page.mouse.move = async (x: number, y: number, options?: any) => {
|
|
||||||
await ensureCursorInit();
|
|
||||||
await humanMove(raw, cursor.x, cursor.y, x, y, cfg);
|
|
||||||
cursor.x = x;
|
|
||||||
cursor.y = y;
|
|
||||||
};
|
|
||||||
|
|
||||||
page.mouse.click = async (x: number, y: number, options?: any) => {
|
|
||||||
await ensureCursorInit();
|
|
||||||
await humanMove(raw, cursor.x, cursor.y, x, y, cfg);
|
|
||||||
cursor.x = x;
|
|
||||||
cursor.y = y;
|
|
||||||
|
|
||||||
const clickCount = options?.clickCount ?? options?.count ?? 1;
|
|
||||||
if (clickCount >= 2) {
|
|
||||||
await humanClick(raw, false, cfg);
|
|
||||||
await sleep(rand(40, 90));
|
|
||||||
await raw.down({ clickCount: 2 });
|
|
||||||
await sleep(rand(30, 60));
|
|
||||||
await raw.up({ clickCount: 2 });
|
|
||||||
} else {
|
|
||||||
await humanClick(raw, false, cfg);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if (originals.mouseWheel) {
|
|
||||||
(page.mouse as any).wheel = async (options?: { deltaX?: number; deltaY?: number }) => {
|
|
||||||
const dx = options?.deltaX ?? 0;
|
|
||||||
const dy = options?.deltaY ?? 0;
|
|
||||||
if (Math.abs(dy) > 0) {
|
|
||||||
await smoothWheel(raw, dy, cfg, 'y');
|
|
||||||
}
|
|
||||||
if (Math.abs(dx) > 0) {
|
|
||||||
await smoothWheel(raw, dx, cfg, 'x');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
if (originals.mouseDragAndDrop) {
|
|
||||||
(page.mouse as any).dragAndDrop = async (
|
|
||||||
start: { x: number; y: number },
|
|
||||||
target: { x: number; y: number },
|
|
||||||
options?: any,
|
|
||||||
) => {
|
|
||||||
await ensureCursorInit();
|
|
||||||
await humanMove(raw, cursor.x, cursor.y, start.x, start.y, cfg);
|
|
||||||
cursor.x = start.x;
|
|
||||||
cursor.y = start.y;
|
|
||||||
await sleep(rand(100, 200));
|
|
||||||
await originals.mouseDown();
|
|
||||||
await sleep(rand(80, 150));
|
|
||||||
await humanMove(raw, cursor.x, cursor.y, target.x, target.y, cfg);
|
|
||||||
cursor.x = target.x;
|
|
||||||
cursor.y = target.y;
|
|
||||||
await sleep(rand(80, 150));
|
|
||||||
await originals.mouseUp();
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// ============================================================
|
|
||||||
// Keyboard patches
|
|
||||||
// ============================================================
|
|
||||||
page.keyboard.type = async (text: string, options?: any) => {
|
|
||||||
const cdp = await ensureCdp();
|
|
||||||
await humanType(page, rawKb, text, cfg, cdp);
|
|
||||||
};
|
|
||||||
|
|
||||||
page.keyboard.press = async (key: any, options?: any) => {
|
|
||||||
await sleep(rand(20, 60));
|
|
||||||
await originals.keyboardDown(key as any);
|
|
||||||
await sleep(randRange(cfg.key_hold));
|
|
||||||
await originals.keyboardUp(key as any);
|
|
||||||
};
|
|
||||||
|
|
||||||
page.keyboard.down = async (key: any) => {
|
|
||||||
await sleep(rand(10, 30));
|
|
||||||
await originals.keyboardDown(key as any);
|
|
||||||
};
|
|
||||||
|
|
||||||
page.keyboard.up = async (key: any) => {
|
|
||||||
await sleep(rand(10, 30));
|
|
||||||
await originals.keyboardUp(key as any);
|
|
||||||
};
|
|
||||||
|
|
||||||
// ============================================================
|
|
||||||
// Store helpers for frame/element patching
|
|
||||||
// ============================================================
|
|
||||||
(page as any)._humanCursor = cursor;
|
|
||||||
(page as any)._humanRaw = raw;
|
|
||||||
(page as any)._humanRawKb = rawKb;
|
|
||||||
(page as any)._ensureCursorInit = ensureCursorInit;
|
|
||||||
|
|
||||||
// Initialize cursor
|
|
||||||
cursor.x = rand(cfg.initial_cursor_x[0], cfg.initial_cursor_x[1]);
|
|
||||||
cursor.y = rand(cfg.initial_cursor_y[0], cfg.initial_cursor_y[1]);
|
|
||||||
originals.mouseMove(cursor.x, cursor.y).then(() => {
|
|
||||||
cursor.initialized = true;
|
|
||||||
}).catch(() => {});
|
|
||||||
|
|
||||||
// Patch frames
|
|
||||||
patchFrames(page, cfg, cursor, raw, rawKb, originals, stealth);
|
|
||||||
|
|
||||||
// Patch ElementHandle selectors
|
|
||||||
patchElementHandle(page, cfg, cursor, raw, rawKb, originals, stealth);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// ============================================================================
|
|
||||||
// ElementHandle patching — PUPPETEER-SPECIFIC
|
|
||||||
// ============================================================================
|
|
||||||
|
|
||||||
function patchElementHandle(
|
|
||||||
page: Page,
|
|
||||||
cfg: HumanConfig,
|
|
||||||
cursor: CursorState,
|
|
||||||
raw: RawMouse,
|
|
||||||
rawKb: RawKeyboard,
|
|
||||||
originals: any,
|
|
||||||
stealth: StealthEval,
|
|
||||||
): void {
|
|
||||||
const orig$ = page.$.bind(page);
|
|
||||||
const orig$$ = page.$$.bind(page);
|
|
||||||
const origWaitForSelector = page.waitForSelector.bind(page);
|
|
||||||
|
|
||||||
(page as any).$ = async (selector: string) => {
|
|
||||||
const el = await orig$(selector);
|
|
||||||
if (el) patchSingleElementHandle(el, page, cfg, cursor, raw, rawKb, originals, stealth);
|
|
||||||
return el;
|
|
||||||
};
|
|
||||||
|
|
||||||
(page as any).$$ = async (selector: string) => {
|
|
||||||
const els = await orig$$(selector);
|
|
||||||
for (const el of els) {
|
|
||||||
patchSingleElementHandle(el, page, cfg, cursor, raw, rawKb, originals, stealth);
|
|
||||||
}
|
|
||||||
return els;
|
|
||||||
};
|
|
||||||
|
|
||||||
(page as any).waitForSelector = async (selector: string, options?: any) => {
|
|
||||||
const el = await origWaitForSelector(selector, options);
|
|
||||||
if (el) patchSingleElementHandle(el, page, cfg, cursor, raw, rawKb, originals, stealth);
|
|
||||||
return el;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function patchSingleElementHandle(
|
|
||||||
el: ElementHandle,
|
|
||||||
page: Page,
|
|
||||||
cfg: HumanConfig,
|
|
||||||
cursor: CursorState,
|
|
||||||
raw: RawMouse,
|
|
||||||
rawKb: RawKeyboard,
|
|
||||||
originals: any,
|
|
||||||
stealth: StealthEval,
|
|
||||||
): void {
|
|
||||||
if ((el as any)._humanPatched) return;
|
|
||||||
(el as any)._humanPatched = true;
|
|
||||||
|
|
||||||
const origElClick = el.click.bind(el);
|
|
||||||
const origElHover = el.hover.bind(el);
|
|
||||||
const origElType = el.type.bind(el);
|
|
||||||
const origElPress = (el as any).press?.bind(el);
|
|
||||||
const origElTap = (el as any).tap?.bind(el);
|
|
||||||
const origElFocus = (el as any).focus?.bind(el);
|
|
||||||
const origElDragAndDrop = (el as any).dragAndDrop?.bind(el);
|
|
||||||
const origElSelect = (el as any).select?.bind(el);
|
|
||||||
const origElDrop = (el as any).drop?.bind(el);
|
|
||||||
|
|
||||||
// --- Nested selectors ---
|
|
||||||
const origEl$ = el.$.bind(el);
|
|
||||||
const origEl$$ = el.$$.bind(el);
|
|
||||||
const origElWaitForSelector = el.waitForSelector.bind(el);
|
|
||||||
|
|
||||||
(el as any).$ = async (selector: string) => {
|
|
||||||
const child = await origEl$(selector);
|
|
||||||
if (child) patchSingleElementHandle(child, page, cfg, cursor, raw, rawKb, originals, stealth);
|
|
||||||
return child;
|
|
||||||
};
|
|
||||||
|
|
||||||
(el as any).$$ = async (selector: string) => {
|
|
||||||
const children = await origEl$$(selector);
|
|
||||||
for (const child of children) {
|
|
||||||
patchSingleElementHandle(child, page, cfg, cursor, raw, rawKb, originals, stealth);
|
|
||||||
}
|
|
||||||
return children;
|
|
||||||
};
|
|
||||||
|
|
||||||
(el as any).waitForSelector = async (selector: string, options?: any) => {
|
|
||||||
const child = await origElWaitForSelector(selector, options);
|
|
||||||
if (child) patchSingleElementHandle(child, page, cfg, cursor, raw, rawKb, originals, stealth);
|
|
||||||
return child;
|
|
||||||
};
|
|
||||||
|
|
||||||
// --- Helper: get box and move cursor ---
|
|
||||||
const moveToElement = async () => {
|
|
||||||
await (page as any)._ensureCursorInit();
|
|
||||||
const box = await el.boundingBox();
|
|
||||||
if (!box) return null;
|
|
||||||
|
|
||||||
const isInp = await isInputElementHandle(stealth, el);
|
|
||||||
const target = clickTarget(box, isInp, cfg);
|
|
||||||
|
|
||||||
if (cfg.idle_between_actions) {
|
|
||||||
await humanIdle(raw, rand(cfg.idle_between_duration[0], cfg.idle_between_duration[1]), cursor.x, cursor.y, cfg);
|
|
||||||
}
|
|
||||||
|
|
||||||
await humanMove(raw, cursor.x, cursor.y, target.x, target.y, cfg);
|
|
||||||
cursor.x = target.x;
|
|
||||||
cursor.y = target.y;
|
|
||||||
return { box, isInp };
|
|
||||||
};
|
|
||||||
|
|
||||||
// --- el.click() ---
|
|
||||||
(el as any).click = async (options?: any) => {
|
|
||||||
const info = await moveToElement();
|
|
||||||
if (!info) return origElClick(options);
|
|
||||||
|
|
||||||
const clickCount = options?.clickCount ?? options?.count ?? 1;
|
|
||||||
if (clickCount >= 2) {
|
|
||||||
await humanClick(raw, info.isInp, cfg);
|
|
||||||
await sleep(rand(40, 90));
|
|
||||||
await raw.down({ clickCount: 2 });
|
|
||||||
await sleep(rand(30, 60));
|
|
||||||
await raw.up({ clickCount: 2 });
|
|
||||||
} else {
|
|
||||||
await humanClick(raw, info.isInp, cfg);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// --- el.hover() ---
|
|
||||||
(el as any).hover = async () => {
|
|
||||||
const info = await moveToElement();
|
|
||||||
if (!info) return origElHover();
|
|
||||||
};
|
|
||||||
|
|
||||||
// --- el.type() ---
|
|
||||||
(el as any).type = async (text: string, options?: any) => {
|
|
||||||
const info = await moveToElement();
|
|
||||||
if (!info) return origElType(text, options);
|
|
||||||
await humanClick(raw, info.isInp, cfg);
|
|
||||||
await sleep(rand(100, 250));
|
|
||||||
const cdp = await stealth.getCdpSession().catch(() => null);
|
|
||||||
await humanType(page, rawKb, text, cfg, cdp);
|
|
||||||
};
|
|
||||||
|
|
||||||
// --- el.press() ---
|
|
||||||
if (origElPress) {
|
|
||||||
(el as any).press = async (key: string, options?: any) => {
|
|
||||||
await sleep(rand(20, 60));
|
|
||||||
await originals.keyboardDown(key as any);
|
|
||||||
await sleep(randRange(cfg.key_hold));
|
|
||||||
await originals.keyboardUp(key as any);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- el.tap() ---
|
|
||||||
if (origElTap) {
|
|
||||||
(el as any).tap = async () => {
|
|
||||||
const info = await moveToElement();
|
|
||||||
if (!info) return origElTap();
|
|
||||||
await humanClick(raw, info.isInp, cfg);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- el.focus() ---
|
|
||||||
if (origElFocus) {
|
|
||||||
(el as any).focus = async () => {
|
|
||||||
const info = await moveToElement();
|
|
||||||
if (!info) return origElFocus();
|
|
||||||
await humanClick(raw, info.isInp, cfg);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- el.select() ---
|
|
||||||
if (origElSelect) {
|
|
||||||
(el as any).select = async (...values: string[]) => {
|
|
||||||
const info = await moveToElement();
|
|
||||||
if (!info) return origElSelect(...values);
|
|
||||||
await humanClick(raw, false, cfg);
|
|
||||||
await sleep(rand(100, 300));
|
|
||||||
return origElSelect(...values);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- el.drop() ---
|
|
||||||
if (origElDrop) {
|
|
||||||
(el as any).drop = async (draggable: ElementHandle, options?: any) => {
|
|
||||||
const srcBox = await draggable.boundingBox();
|
|
||||||
const tgtBox = await el.boundingBox();
|
|
||||||
|
|
||||||
if (srcBox && tgtBox) {
|
|
||||||
const sx = srcBox.x + srcBox.width / 2;
|
|
||||||
const sy = srcBox.y + srcBox.height / 2;
|
|
||||||
const tx = tgtBox.x + tgtBox.width / 2;
|
|
||||||
const ty = tgtBox.y + tgtBox.height / 2;
|
|
||||||
|
|
||||||
await (page as any)._ensureCursorInit();
|
|
||||||
await humanMove(raw, cursor.x, cursor.y, sx, sy, cfg);
|
|
||||||
cursor.x = sx;
|
|
||||||
cursor.y = sy;
|
|
||||||
await sleep(rand(100, 200));
|
|
||||||
await originals.mouseDown();
|
|
||||||
await sleep(rand(80, 150));
|
|
||||||
await humanMove(raw, cursor.x, cursor.y, tx, ty, cfg);
|
|
||||||
cursor.x = tx;
|
|
||||||
cursor.y = ty;
|
|
||||||
await sleep(rand(80, 150));
|
|
||||||
await originals.mouseUp();
|
|
||||||
} else {
|
|
||||||
return origElDrop(draggable, options);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- el.dragAndDrop() ---
|
|
||||||
if (origElDragAndDrop) {
|
|
||||||
(el as any).dragAndDrop = async (targetEl: ElementHandle, options?: any) => {
|
|
||||||
const srcBox = await el.boundingBox();
|
|
||||||
const tgtBox = await targetEl.boundingBox();
|
|
||||||
|
|
||||||
if (srcBox && tgtBox) {
|
|
||||||
const sx = srcBox.x + srcBox.width / 2;
|
|
||||||
const sy = srcBox.y + srcBox.height / 2;
|
|
||||||
const tx = tgtBox.x + tgtBox.width / 2;
|
|
||||||
const ty = tgtBox.y + tgtBox.height / 2;
|
|
||||||
|
|
||||||
await (page as any)._ensureCursorInit();
|
|
||||||
await humanMove(raw, cursor.x, cursor.y, sx, sy, cfg);
|
|
||||||
cursor.x = sx;
|
|
||||||
cursor.y = sy;
|
|
||||||
await sleep(rand(100, 200));
|
|
||||||
await originals.mouseDown();
|
|
||||||
await sleep(rand(80, 150));
|
|
||||||
await humanMove(raw, cursor.x, cursor.y, tx, ty, cfg);
|
|
||||||
cursor.x = tx;
|
|
||||||
cursor.y = ty;
|
|
||||||
await sleep(rand(80, 150));
|
|
||||||
await originals.mouseUp();
|
|
||||||
} else {
|
|
||||||
return origElDragAndDrop(targetEl, options);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// ============================================================================
|
|
||||||
// Frame-level patching — native Puppeteer Frame methods only
|
|
||||||
// Puppeteer Frame has: click, hover, type, select, focus, tap
|
|
||||||
// ============================================================================
|
|
||||||
|
|
||||||
function patchFrames(
|
|
||||||
page: Page,
|
|
||||||
cfg: HumanConfig,
|
|
||||||
cursor: CursorState,
|
|
||||||
raw: RawMouse,
|
|
||||||
rawKb: RawKeyboard,
|
|
||||||
originals: any,
|
|
||||||
stealth: StealthEval,
|
|
||||||
): void {
|
|
||||||
for (const frame of iterFrames(page)) {
|
|
||||||
patchSingleFrame(frame, page, cfg, cursor, raw, rawKb, originals, stealth);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function patchSingleFrame(
|
|
||||||
frame: Frame,
|
|
||||||
page: Page,
|
|
||||||
cfg: HumanConfig,
|
|
||||||
cursor: CursorState,
|
|
||||||
raw: RawMouse,
|
|
||||||
rawKb: RawKeyboard,
|
|
||||||
originals: any,
|
|
||||||
stealth: StealthEval,
|
|
||||||
): void {
|
|
||||||
if ((frame as any)._humanPatched) return;
|
|
||||||
(frame as any)._humanPatched = true;
|
|
||||||
|
|
||||||
const origFrameSelect = frame.select.bind(frame);
|
|
||||||
|
|
||||||
(frame as any).click = async (selector: string, options?: any) => {
|
|
||||||
await (page as any).click(selector, options);
|
|
||||||
};
|
|
||||||
|
|
||||||
(frame as any).hover = async (selector: string, options?: any) => {
|
|
||||||
await (page as any).hover(selector, options);
|
|
||||||
};
|
|
||||||
|
|
||||||
(frame as any).type = async (selector: string, text: string, options?: any) => {
|
|
||||||
await (page as any).type(selector, text, options);
|
|
||||||
};
|
|
||||||
|
|
||||||
(frame as any).select = async (selector: string, ...values: string[]) => {
|
|
||||||
await (page as any).hover(selector);
|
|
||||||
await sleep(rand(100, 300));
|
|
||||||
return origFrameSelect(selector, ...values);
|
|
||||||
};
|
|
||||||
|
|
||||||
(frame as any).focus = async (selector: string) => {
|
|
||||||
await (page as any).focus(selector);
|
|
||||||
};
|
|
||||||
|
|
||||||
(frame as any).tap = async (selector: string, options?: any) => {
|
|
||||||
await (page as any).click(selector, options);
|
|
||||||
};
|
|
||||||
|
|
||||||
// Patch frame.$() to return patched ElementHandles
|
|
||||||
const origFrame$ = frame.$.bind(frame);
|
|
||||||
const origFrame$$ = frame.$$.bind(frame);
|
|
||||||
const origFrameWaitForSelector = frame.waitForSelector.bind(frame);
|
|
||||||
|
|
||||||
(frame as any).$ = async (selector: string) => {
|
|
||||||
const el = await origFrame$(selector);
|
|
||||||
if (el) patchSingleElementHandle(el, page, cfg, cursor, raw, rawKb, originals, stealth);
|
|
||||||
return el;
|
|
||||||
};
|
|
||||||
|
|
||||||
(frame as any).$$ = async (selector: string) => {
|
|
||||||
const els = await origFrame$$(selector);
|
|
||||||
for (const el of els) {
|
|
||||||
patchSingleElementHandle(el, page, cfg, cursor, raw, rawKb, originals, stealth);
|
|
||||||
}
|
|
||||||
return els;
|
|
||||||
};
|
|
||||||
|
|
||||||
(frame as any).waitForSelector = async (selector: string, options?: any) => {
|
|
||||||
const el = await origFrameWaitForSelector(selector, options);
|
|
||||||
if (el) patchSingleElementHandle(el, page, cfg, cursor, raw, rawKb, originals, stealth);
|
|
||||||
return el;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
function* iterFrames(page: Page): Generator<Frame> {
|
|
||||||
try {
|
|
||||||
const mainFrame = page.mainFrame();
|
|
||||||
yield mainFrame;
|
|
||||||
for (const child of mainFrame.childFrames()) {
|
|
||||||
yield child;
|
|
||||||
}
|
|
||||||
} catch {}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// ============================================================================
|
|
||||||
// Browser-level patching
|
|
||||||
// ============================================================================
|
|
||||||
|
|
||||||
export function patchBrowser(browser: Browser, cfg: HumanConfig): void {
|
|
||||||
browser.pages().then(pages => {
|
|
||||||
for (const page of pages) {
|
|
||||||
if (!(page as any)._original) {
|
|
||||||
patchPage(page, cfg, new CursorState());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}).catch(() => {});
|
|
||||||
|
|
||||||
const origNewPage = browser.newPage.bind(browser);
|
|
||||||
(browser as any).newPage = async () => {
|
|
||||||
const page = await origNewPage();
|
|
||||||
if (!(page as any)._original) {
|
|
||||||
patchPage(page, cfg, new CursorState());
|
|
||||||
}
|
|
||||||
return page;
|
|
||||||
};
|
|
||||||
|
|
||||||
// v21: createIncognitoBrowserContext
|
|
||||||
// v22+: createBrowserContext (renamed in puppeteer/puppeteer#11834)
|
|
||||||
for (const methodName of ['createBrowserContext', 'createIncognitoBrowserContext'] as const) {
|
|
||||||
if (typeof (browser as any)[methodName] === 'function') {
|
|
||||||
const origCreateContext = (browser as any)[methodName].bind(browser);
|
|
||||||
(browser as any)[methodName] = async (options?: any) => {
|
|
||||||
const context: BrowserContext = await origCreateContext(options);
|
|
||||||
|
|
||||||
const origCtxNewPage = context.newPage.bind(context);
|
|
||||||
(context as any).newPage = async () => {
|
|
||||||
const page = await origCtxNewPage();
|
|
||||||
if (!(page as any)._original) {
|
|
||||||
patchPage(page, cfg, new CursorState());
|
|
||||||
}
|
|
||||||
return page;
|
|
||||||
};
|
|
||||||
|
|
||||||
return context;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
browser.on('targetcreated', async (target: any) => {
|
|
||||||
try {
|
|
||||||
if (target.type() === 'page') {
|
|
||||||
const page = await target.page();
|
|
||||||
if (page && !(page as any)._original) {
|
|
||||||
patchPage(page, cfg, new CursorState());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch {}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
export { patchPage };
|
|
||||||
@@ -1,187 +0,0 @@
|
|||||||
/**
|
|
||||||
* cloakbrowser-human — Human-like keyboard input.
|
|
||||||
* Adapted for Puppeteer API.
|
|
||||||
*
|
|
||||||
* Changes from Playwright version:
|
|
||||||
* - Uses puppeteer-core Page/CDPSession types
|
|
||||||
* - keyboard.sendCharacter() mapped via RawKeyboard.insertText adapter
|
|
||||||
* - CDPSession obtained via page.createCDPSession()
|
|
||||||
*
|
|
||||||
* Stealth-aware: shift symbols use CDP Input.dispatchKeyEvent (isTrusted=true).
|
|
||||||
*/
|
|
||||||
|
|
||||||
import type { Page, CDPSession } from 'puppeteer-core';
|
|
||||||
import { RawKeyboard } from '../human/mouse.js';
|
|
||||||
import type { HumanConfig } from '../human/config.js';
|
|
||||||
import { rand, randRange, sleep } from '../human/config.js';
|
|
||||||
|
|
||||||
const SHIFT_SYMBOLS = new Set([
|
|
||||||
'@', '#', '!', '$', '%', '^', '&', '*', '(', ')',
|
|
||||||
'_', '+', '{', '}', '|', ':', '"', '<', '>', '?', '~',
|
|
||||||
]);
|
|
||||||
|
|
||||||
const NEARBY_KEYS: Record<string, string> = {
|
|
||||||
a: 'sqwz', b: 'vghn', c: 'xdfv', d: 'sfecx', e: 'wrsdf',
|
|
||||||
f: 'dgrtcv', g: 'fhtyb', h: 'gjybn', i: 'ujko', j: 'hkunm',
|
|
||||||
k: 'jloi', l: 'kop', m: 'njk', n: 'bhjm', o: 'iklp',
|
|
||||||
p: 'ol', q: 'wa', r: 'edft', s: 'awedxz', t: 'rfgy',
|
|
||||||
u: 'yhji', v: 'cfgb', w: 'qase', x: 'zsdc', y: 'tghu',
|
|
||||||
z: 'asx',
|
|
||||||
'1': '2q', '2': '13qw', '3': '24we', '4': '35er', '5': '46rt',
|
|
||||||
'6': '57ty', '7': '68yu', '8': '79ui', '9': '80io', '0': '9p',
|
|
||||||
};
|
|
||||||
|
|
||||||
const SHIFT_SYMBOL_CODES: Record<string, string> = {
|
|
||||||
'!': 'Digit1', '@': 'Digit2', '#': 'Digit3', '$': 'Digit4',
|
|
||||||
'%': 'Digit5', '^': 'Digit6', '&': 'Digit7', '*': 'Digit8',
|
|
||||||
'(': 'Digit9', ')': 'Digit0', '_': 'Minus', '+': 'Equal',
|
|
||||||
'{': 'BracketLeft', '}': 'BracketRight', '|': 'Backslash',
|
|
||||||
':': 'Semicolon', '"': 'Quote', '<': 'Comma', '>': 'Period',
|
|
||||||
'?': 'Slash', '~': 'Backquote',
|
|
||||||
};
|
|
||||||
|
|
||||||
const SHIFT_SYMBOL_KEYCODES: Record<string, number> = {
|
|
||||||
'!': 49, '@': 50, '#': 51, '$': 52, '%': 53,
|
|
||||||
'^': 54, '&': 55, '*': 56, '(': 57, ')': 48,
|
|
||||||
'_': 189, '+': 187, '{': 219, '}': 221, '|': 220,
|
|
||||||
':': 186, '"': 222, '<': 188, '>': 190, '?': 191,
|
|
||||||
'~': 192,
|
|
||||||
};
|
|
||||||
|
|
||||||
function isAscii(ch: string): boolean {
|
|
||||||
const code = ch.codePointAt(0);
|
|
||||||
return code !== undefined && code < 128;
|
|
||||||
}
|
|
||||||
|
|
||||||
function getNearbyKey(ch: string): string {
|
|
||||||
const lower = ch.toLowerCase();
|
|
||||||
if (lower in NEARBY_KEYS) {
|
|
||||||
const neighbors = NEARBY_KEYS[lower];
|
|
||||||
const wrong = neighbors[Math.floor(Math.random() * neighbors.length)];
|
|
||||||
return ch === ch.toUpperCase() && ch !== ch.toLowerCase() ? wrong.toUpperCase() : wrong;
|
|
||||||
}
|
|
||||||
return ch;
|
|
||||||
}
|
|
||||||
|
|
||||||
function isUpperCase(ch: string): boolean {
|
|
||||||
return ch.length === 1 && ch >= 'A' && ch <= 'Z';
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function humanType(
|
|
||||||
page: Page,
|
|
||||||
raw: RawKeyboard,
|
|
||||||
text: string,
|
|
||||||
cfg: HumanConfig,
|
|
||||||
cdpSession?: CDPSession | null,
|
|
||||||
): Promise<void> {
|
|
||||||
const chars = [...text];
|
|
||||||
|
|
||||||
for (let i = 0; i < chars.length; i++) {
|
|
||||||
const ch = chars[i];
|
|
||||||
|
|
||||||
// Non-ASCII → sendCharacter via insertText adapter
|
|
||||||
if (!isAscii(ch)) {
|
|
||||||
await sleep(randRange(cfg.key_hold));
|
|
||||||
await raw.insertText(ch);
|
|
||||||
if (i < chars.length - 1) await interCharDelay(cfg);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Mistype
|
|
||||||
if (Math.random() < cfg.mistype_chance && /^[a-zA-Z0-9]$/.test(ch)) {
|
|
||||||
const wrong = getNearbyKey(ch);
|
|
||||||
await typeNormalChar(raw, wrong, cfg);
|
|
||||||
await sleep(randRange(cfg.mistype_delay_notice));
|
|
||||||
await raw.down('Backspace');
|
|
||||||
await sleep(randRange(cfg.key_hold));
|
|
||||||
await raw.up('Backspace');
|
|
||||||
await sleep(randRange(cfg.mistype_delay_correct));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isUpperCase(ch)) {
|
|
||||||
await typeShiftedChar(raw, ch, cfg);
|
|
||||||
} else if (SHIFT_SYMBOLS.has(ch)) {
|
|
||||||
await typeShiftSymbol(page, raw, ch, cfg, cdpSession);
|
|
||||||
} else {
|
|
||||||
await typeNormalChar(raw, ch, cfg);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i < chars.length - 1) await interCharDelay(cfg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function typeNormalChar(raw: RawKeyboard, ch: string, cfg: HumanConfig): Promise<void> {
|
|
||||||
await raw.down(ch);
|
|
||||||
await sleep(randRange(cfg.key_hold));
|
|
||||||
await raw.up(ch);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function typeShiftedChar(raw: RawKeyboard, ch: string, cfg: HumanConfig): Promise<void> {
|
|
||||||
await raw.down('Shift');
|
|
||||||
await sleep(randRange(cfg.shift_down_delay));
|
|
||||||
await raw.down(ch);
|
|
||||||
await sleep(randRange(cfg.key_hold));
|
|
||||||
await raw.up(ch);
|
|
||||||
await sleep(randRange(cfg.shift_up_delay));
|
|
||||||
await raw.up('Shift');
|
|
||||||
}
|
|
||||||
|
|
||||||
async function typeShiftSymbol(
|
|
||||||
page: Page,
|
|
||||||
raw: RawKeyboard,
|
|
||||||
ch: string,
|
|
||||||
cfg: HumanConfig,
|
|
||||||
cdpSession?: CDPSession | null,
|
|
||||||
): Promise<void> {
|
|
||||||
if (cdpSession) {
|
|
||||||
const code = SHIFT_SYMBOL_CODES[ch] || '';
|
|
||||||
const keyCode = SHIFT_SYMBOL_KEYCODES[ch] || 0;
|
|
||||||
|
|
||||||
await raw.down('Shift');
|
|
||||||
await sleep(randRange(cfg.shift_down_delay));
|
|
||||||
|
|
||||||
await cdpSession.send('Input.dispatchKeyEvent', {
|
|
||||||
type: 'keyDown',
|
|
||||||
modifiers: 8,
|
|
||||||
key: ch,
|
|
||||||
code,
|
|
||||||
windowsVirtualKeyCode: keyCode,
|
|
||||||
text: ch,
|
|
||||||
unmodifiedText: ch,
|
|
||||||
});
|
|
||||||
await sleep(randRange(cfg.key_hold));
|
|
||||||
|
|
||||||
await cdpSession.send('Input.dispatchKeyEvent', {
|
|
||||||
type: 'keyUp',
|
|
||||||
modifiers: 8,
|
|
||||||
key: ch,
|
|
||||||
code,
|
|
||||||
windowsVirtualKeyCode: keyCode,
|
|
||||||
});
|
|
||||||
|
|
||||||
await sleep(randRange(cfg.shift_up_delay));
|
|
||||||
await raw.up('Shift');
|
|
||||||
} else {
|
|
||||||
await raw.down('Shift');
|
|
||||||
await sleep(randRange(cfg.shift_down_delay));
|
|
||||||
await raw.insertText(ch);
|
|
||||||
await page.evaluate((key: string) => {
|
|
||||||
const el = document.activeElement;
|
|
||||||
if (el) {
|
|
||||||
el.dispatchEvent(new KeyboardEvent('keydown', { key, bubbles: true }));
|
|
||||||
el.dispatchEvent(new KeyboardEvent('keyup', { key, bubbles: true }));
|
|
||||||
}
|
|
||||||
}, ch);
|
|
||||||
await sleep(randRange(cfg.shift_up_delay));
|
|
||||||
await raw.up('Shift');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function interCharDelay(cfg: HumanConfig): Promise<void> {
|
|
||||||
if (Math.random() < cfg.typing_pause_chance) {
|
|
||||||
await sleep(randRange(cfg.typing_pause_range));
|
|
||||||
} else {
|
|
||||||
const delay = cfg.typing_delay + (Math.random() - 0.5) * 2 * cfg.typing_delay_spread;
|
|
||||||
await sleep(Math.max(10, delay));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,166 +0,0 @@
|
|||||||
/**
|
|
||||||
* cloakbrowser-human — Human-like scrolling via mouse wheel events.
|
|
||||||
* Adapted for Puppeteer API.
|
|
||||||
*
|
|
||||||
* Changes from Playwright version:
|
|
||||||
* - page.viewport() instead of page.viewportSize()
|
|
||||||
* - page.$(selector) + el.boundingBox() instead of page.locator().boundingBox()
|
|
||||||
* - No timeout parameter on boundingBox()
|
|
||||||
*/
|
|
||||||
|
|
||||||
import type { Page } from 'puppeteer-core';
|
|
||||||
import type { HumanConfig } from '../human/config.js';
|
|
||||||
import { rand, randRange, randIntRange, sleep } from '../human/config.js';
|
|
||||||
import { RawMouse, humanMove } from '../human/mouse.js';
|
|
||||||
|
|
||||||
interface ElementBounds {
|
|
||||||
x: number;
|
|
||||||
y: number;
|
|
||||||
width: number;
|
|
||||||
height: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
function isInViewport(
|
|
||||||
bounds: ElementBounds,
|
|
||||||
viewportHeight: number,
|
|
||||||
cfg: HumanConfig,
|
|
||||||
): boolean {
|
|
||||||
const topEdge = bounds.y;
|
|
||||||
const bottomEdge = bounds.y + bounds.height;
|
|
||||||
const zoneTop = viewportHeight * cfg.scroll_target_zone[0];
|
|
||||||
const zoneBottom = viewportHeight * cfg.scroll_target_zone[1];
|
|
||||||
return topEdge >= zoneTop && bottomEdge <= zoneBottom;
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function smoothWheel(
|
|
||||||
raw: RawMouse,
|
|
||||||
delta: number,
|
|
||||||
cfg: HumanConfig,
|
|
||||||
axis: 'x' | 'y' = 'y',
|
|
||||||
): Promise<void> {
|
|
||||||
const absD = Math.abs(delta);
|
|
||||||
const sign = delta > 0 ? 1 : -1;
|
|
||||||
let sent = 0;
|
|
||||||
while (sent < absD) {
|
|
||||||
const stepSize = rand(20, 40);
|
|
||||||
const chunk = Math.min(stepSize, absD - sent);
|
|
||||||
const d = Math.round(chunk) * sign;
|
|
||||||
if (axis === 'x') {
|
|
||||||
await raw.wheel(d, 0);
|
|
||||||
} else {
|
|
||||||
await raw.wheel(0, d);
|
|
||||||
}
|
|
||||||
sent += chunk;
|
|
||||||
await sleep(rand(8, 20));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getElementBox(page: Page, selector: string): Promise<ElementBounds | null> {
|
|
||||||
try {
|
|
||||||
const el = await page.$(selector);
|
|
||||||
if (!el) return null;
|
|
||||||
const box = await el.boundingBox();
|
|
||||||
if (!box) return null;
|
|
||||||
return { x: box.x, y: box.y, width: box.width, height: box.height };
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function scrollToElement(
|
|
||||||
page: Page,
|
|
||||||
raw: RawMouse,
|
|
||||||
selector: string,
|
|
||||||
cursorX: number,
|
|
||||||
cursorY: number,
|
|
||||||
cfg: HumanConfig,
|
|
||||||
): Promise<{ box: ElementBounds; cursorX: number; cursorY: number }> {
|
|
||||||
const viewport = page.viewport();
|
|
||||||
if (!viewport) throw new Error('Viewport size not available');
|
|
||||||
|
|
||||||
let box = await getElementBox(page, selector);
|
|
||||||
if (!box) {
|
|
||||||
await sleep(200);
|
|
||||||
box = await getElementBox(page, selector);
|
|
||||||
if (!box) throw new Error(`Element not found: ${selector}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isInViewport(box, viewport.height, cfg)) {
|
|
||||||
return { box, cursorX, cursorY };
|
|
||||||
}
|
|
||||||
|
|
||||||
// Move cursor into scroll area
|
|
||||||
const scrollAreaX = Math.round(viewport.width * rand(0.3, 0.7));
|
|
||||||
const scrollAreaY = Math.round(viewport.height * rand(0.3, 0.7));
|
|
||||||
await humanMove(raw, cursorX, cursorY, scrollAreaX, scrollAreaY, cfg);
|
|
||||||
cursorX = scrollAreaX;
|
|
||||||
cursorY = scrollAreaY;
|
|
||||||
await sleep(randRange(cfg.scroll_pre_move_delay));
|
|
||||||
|
|
||||||
// Calculate scroll distance
|
|
||||||
const targetY = viewport.height * rand(cfg.scroll_target_zone[0], cfg.scroll_target_zone[1]);
|
|
||||||
const elementCenter = box.y + box.height / 2;
|
|
||||||
const distanceToScroll = elementCenter - targetY;
|
|
||||||
|
|
||||||
const direction = distanceToScroll > 0 ? 1 : -1;
|
|
||||||
const absDistance = Math.abs(distanceToScroll);
|
|
||||||
const avgDelta = (cfg.scroll_delta_base[0] + cfg.scroll_delta_base[1]) / 2;
|
|
||||||
const totalClicks = Math.max(3, Math.ceil(absDistance / avgDelta));
|
|
||||||
const accelSteps = randIntRange(cfg.scroll_accel_steps);
|
|
||||||
const decelSteps = randIntRange(cfg.scroll_decel_steps);
|
|
||||||
|
|
||||||
let scrolled = 0;
|
|
||||||
|
|
||||||
for (let i = 0; i < totalClicks; i++) {
|
|
||||||
let delta: number;
|
|
||||||
let pause: number;
|
|
||||||
|
|
||||||
if (i < accelSteps) {
|
|
||||||
delta = rand(80, 100);
|
|
||||||
pause = randRange(cfg.scroll_pause_slow);
|
|
||||||
} else if (i >= totalClicks - decelSteps) {
|
|
||||||
delta = rand(60, 90);
|
|
||||||
pause = randRange(cfg.scroll_pause_slow);
|
|
||||||
} else {
|
|
||||||
delta = randRange(cfg.scroll_delta_base);
|
|
||||||
pause = randRange(cfg.scroll_pause_fast);
|
|
||||||
}
|
|
||||||
|
|
||||||
delta *= 1 + (Math.random() - 0.5) * 2 * cfg.scroll_delta_variance;
|
|
||||||
delta = Math.round(delta) * direction;
|
|
||||||
|
|
||||||
await smoothWheel(raw, delta, cfg);
|
|
||||||
scrolled += Math.abs(delta);
|
|
||||||
await sleep(pause);
|
|
||||||
|
|
||||||
if (i % 3 === 2 || i === totalClicks - 1) {
|
|
||||||
box = await getElementBox(page, selector);
|
|
||||||
if (box && isInViewport(box, viewport.height, cfg)) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (scrolled >= absDistance * 1.1) break;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Optional overshoot + correction
|
|
||||||
if (Math.random() < cfg.scroll_overshoot_chance) {
|
|
||||||
const overshootPx = Math.round(randRange(cfg.scroll_overshoot_px)) * direction;
|
|
||||||
await smoothWheel(raw, overshootPx, cfg);
|
|
||||||
await sleep(randRange(cfg.scroll_settle_delay));
|
|
||||||
|
|
||||||
const corrections = randIntRange([1, 2]);
|
|
||||||
for (let c = 0; c < corrections; c++) {
|
|
||||||
const corrDelta = Math.round(rand(40, 80)) * -direction;
|
|
||||||
await smoothWheel(raw, corrDelta, cfg);
|
|
||||||
await sleep(rand(100, 250));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await sleep(randRange(cfg.scroll_settle_delay));
|
|
||||||
|
|
||||||
box = await getElementBox(page, selector);
|
|
||||||
if (!box) throw new Error(`Element lost after scrolling: ${selector}`);
|
|
||||||
|
|
||||||
return { box, cursorX, cursorY };
|
|
||||||
}
|
|
||||||
+21
-222
@@ -4,17 +4,12 @@
|
|||||||
* Activated via humanize: true in launch() / launchContext().
|
* Activated via humanize: true in launch() / launchContext().
|
||||||
* Patches page methods to use Bezier mouse curves, realistic typing, and smooth scrolling.
|
* Patches page methods to use Bezier mouse curves, realistic typing, and smooth scrolling.
|
||||||
*
|
*
|
||||||
* Stealth-aware (fixes #110):
|
|
||||||
* - isInputElement / isSelectorFocused use CDP Isolated Worlds instead of page.evaluate
|
|
||||||
* - Shift symbol typing uses CDP Input.dispatchKeyEvent for isTrusted=true events
|
|
||||||
* - Falls back to page.evaluate only when CDP session is unavailable
|
|
||||||
*
|
|
||||||
* Patches all interaction methods:
|
* Patches all interaction methods:
|
||||||
* click, dblclick, hover, type, fill, check, uncheck, selectOption,
|
* click, dblclick, hover, type, fill, check, uncheck, selectOption,
|
||||||
* press, pressSequentially, tap, dragTo, clear + Frame-level equivalents.
|
* press, pressSequentially, tap, dragTo, clear + Frame-level equivalents.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import type { Browser, BrowserContext, Page, Frame, CDPSession } from 'playwright-core';
|
import type { Browser, BrowserContext, Page, Frame } from 'playwright-core';
|
||||||
import { HumanConfig, resolveConfig, rand, randRange, sleep } from './config.js';
|
import { HumanConfig, resolveConfig, rand, randRange, sleep } from './config.js';
|
||||||
import { RawMouse, RawKeyboard, humanMove, humanClick, clickTarget, humanIdle } from './mouse.js';
|
import { RawMouse, RawKeyboard, humanMove, humanClick, clickTarget, humanIdle } from './mouse.js';
|
||||||
import { humanType } from './keyboard.js';
|
import { humanType } from './keyboard.js';
|
||||||
@@ -28,148 +23,13 @@ export { scrollToElement } from './scroll.js';
|
|||||||
// --- Platform-aware select-all shortcut (macOS uses Meta, others use Control) ---
|
// --- Platform-aware select-all shortcut (macOS uses Meta, others use Control) ---
|
||||||
const SELECT_ALL = process.platform === 'darwin' ? 'Meta+a' : 'Control+a';
|
const SELECT_ALL = process.platform === 'darwin' ? 'Meta+a' : 'Control+a';
|
||||||
|
|
||||||
|
|
||||||
// ============================================================================
|
|
||||||
// CDP Isolated World — stealth DOM evaluation
|
|
||||||
// ============================================================================
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Manages a CDP isolated execution context for DOM reads.
|
|
||||||
* Produces clean Error.stack traces (no 'eval at evaluate :302:')
|
|
||||||
* and is invisible to querySelector monkey-patches in the main world.
|
|
||||||
*
|
|
||||||
* Context ID is invalidated on navigation and auto-recreated on next call.
|
|
||||||
*/
|
|
||||||
class StealthEval {
|
|
||||||
private cdp: CDPSession | null = null;
|
|
||||||
private contextId: number | null = null;
|
|
||||||
private page: Page;
|
|
||||||
|
|
||||||
constructor(page: Page) {
|
|
||||||
this.page = page;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async ensureCdp(): Promise<CDPSession> {
|
|
||||||
if (!this.cdp) {
|
|
||||||
this.cdp = await this.page.context().newCDPSession(this.page);
|
|
||||||
}
|
|
||||||
return this.cdp;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async createWorld(): Promise<number> {
|
|
||||||
const cdp = await this.ensureCdp();
|
|
||||||
const tree = await cdp.send('Page.getFrameTree');
|
|
||||||
const frameId = tree.frameTree.frame.id;
|
|
||||||
const result = await cdp.send('Page.createIsolatedWorld', {
|
|
||||||
frameId,
|
|
||||||
worldName: '',
|
|
||||||
grantUniveralAccess: true,
|
|
||||||
});
|
|
||||||
const ctxId = result.executionContextId;
|
|
||||||
this.contextId = ctxId;
|
|
||||||
return ctxId;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Evaluate a JS expression in the isolated world.
|
|
||||||
* Auto-recreates the world if the context was invalidated (navigation).
|
|
||||||
* Returns the result value, or undefined on failure.
|
|
||||||
*/
|
|
||||||
async evaluate(expression: string): Promise<any> {
|
|
||||||
if (this.contextId === null) {
|
|
||||||
await this.createWorld();
|
|
||||||
}
|
|
||||||
|
|
||||||
for (let attempt = 0; attempt < 2; attempt++) {
|
|
||||||
try {
|
|
||||||
const cdp = await this.ensureCdp();
|
|
||||||
const result = await cdp.send('Runtime.evaluate', {
|
|
||||||
expression,
|
|
||||||
contextId: this.contextId!,
|
|
||||||
returnByValue: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (result.exceptionDetails) {
|
|
||||||
// Context was likely invalidated by navigation
|
|
||||||
if (attempt === 0) {
|
|
||||||
await this.createWorld();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
return result.result?.value;
|
|
||||||
} catch {
|
|
||||||
if (attempt === 0) {
|
|
||||||
this.contextId = null;
|
|
||||||
try {
|
|
||||||
await this.createWorld();
|
|
||||||
} catch {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Mark context as stale — call after navigation. */
|
|
||||||
invalidate(): void {
|
|
||||||
this.contextId = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Get the underlying CDP session (reused for Input.dispatchKeyEvent etc.). */
|
|
||||||
async getCdpSession(): Promise<CDPSession> {
|
|
||||||
return this.ensureCdp();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// ============================================================================
|
|
||||||
// Cursor state
|
|
||||||
// ============================================================================
|
|
||||||
|
|
||||||
class CursorState {
|
class CursorState {
|
||||||
x = 0;
|
x = 0;
|
||||||
y = 0;
|
y = 0;
|
||||||
initialized = false;
|
initialized = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function isInputElement(page: Page, selector: string): Promise<boolean> {
|
||||||
// ============================================================================
|
|
||||||
// Stealth DOM queries — isolated world with evaluate fallback
|
|
||||||
// ============================================================================
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if selector matches an input/textarea/contenteditable element.
|
|
||||||
* Uses CDP Isolated World when available — invisible to main world.
|
|
||||||
*/
|
|
||||||
async function isInputElement(
|
|
||||||
stealth: StealthEval | null,
|
|
||||||
page: Page,
|
|
||||||
selector: string,
|
|
||||||
): Promise<boolean> {
|
|
||||||
if (stealth) {
|
|
||||||
try {
|
|
||||||
const escaped = JSON.stringify(selector);
|
|
||||||
const result = await stealth.evaluate(`
|
|
||||||
(() => {
|
|
||||||
const el = document.querySelector(${escaped});
|
|
||||||
if (!el) return false;
|
|
||||||
const tag = el.tagName.toLowerCase();
|
|
||||||
return tag === 'input' || tag === 'textarea'
|
|
||||||
|| el.getAttribute('contenteditable') === 'true';
|
|
||||||
})()
|
|
||||||
`);
|
|
||||||
return !!result;
|
|
||||||
} catch {
|
|
||||||
// Fall through to page.evaluate
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fallback: page.evaluate (detectable — should only happen if CDP fails)
|
|
||||||
return page.evaluate((sel: string) => {
|
return page.evaluate((sel: string) => {
|
||||||
const el = document.querySelector(sel);
|
const el = document.querySelector(sel);
|
||||||
if (!el) return false;
|
if (!el) return false;
|
||||||
@@ -179,37 +39,13 @@ async function isInputElement(
|
|||||||
}, selector).catch(() => false);
|
}, selector).catch(() => false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
async function isSelectorFocused(page: Page, selector: string): Promise<boolean> {
|
||||||
* Check if the element matching selector is currently focused.
|
|
||||||
* Uses CDP Isolated World when available — invisible to main world.
|
|
||||||
*/
|
|
||||||
async function isSelectorFocused(
|
|
||||||
stealth: StealthEval | null,
|
|
||||||
page: Page,
|
|
||||||
selector: string,
|
|
||||||
): Promise<boolean> {
|
|
||||||
if (stealth) {
|
|
||||||
try {
|
|
||||||
const escaped = JSON.stringify(selector);
|
|
||||||
const result = await stealth.evaluate(`
|
|
||||||
(() => {
|
|
||||||
const el = document.querySelector(${escaped});
|
|
||||||
return el === document.activeElement;
|
|
||||||
})()
|
|
||||||
`);
|
|
||||||
return !!result;
|
|
||||||
} catch {
|
|
||||||
// Fall through to page.evaluate
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return page.evaluate((sel: string) => {
|
return page.evaluate((sel: string) => {
|
||||||
const el = document.querySelector(sel);
|
const el = document.querySelector(sel);
|
||||||
return el === document.activeElement;
|
return el === document.activeElement;
|
||||||
}, selector).catch(() => false);
|
}, selector).catch(() => false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
// Page-level patching
|
// Page-level patching
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
@@ -246,21 +82,6 @@ function patchPage(page: Page, cfg: HumanConfig, cursor: CursorState): void {
|
|||||||
(page as any)._original = originals;
|
(page as any)._original = originals;
|
||||||
(page as any)._humanCfg = cfg;
|
(page as any)._humanCfg = cfg;
|
||||||
|
|
||||||
// --- Stealth infrastructure ---
|
|
||||||
const stealth = new StealthEval(page);
|
|
||||||
(page as any)._stealth = stealth;
|
|
||||||
|
|
||||||
// CDP session for shift symbol typing (lazy-initialized, reuses stealth's session)
|
|
||||||
let cdpSession: CDPSession | null = null;
|
|
||||||
const ensureCdp = async (): Promise<CDPSession | null> => {
|
|
||||||
if (!cdpSession) {
|
|
||||||
try {
|
|
||||||
cdpSession = await stealth.getCdpSession();
|
|
||||||
} catch {}
|
|
||||||
}
|
|
||||||
return cdpSession;
|
|
||||||
};
|
|
||||||
|
|
||||||
const raw: RawMouse = {
|
const raw: RawMouse = {
|
||||||
move: originals.mouseMove,
|
move: originals.mouseMove,
|
||||||
down: originals.mouseDown,
|
down: originals.mouseDown,
|
||||||
@@ -284,11 +105,11 @@ function patchPage(page: Page, cfg: HumanConfig, cursor: CursorState): void {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- goto (invalidate isolated world on navigation) ---
|
// --- goto ---
|
||||||
const humanGoto = async (url: string, options?: any) => {
|
const humanGoto = async (url: string, options?: any) => {
|
||||||
const response = await originals.goto(url, options);
|
const response = await originals.goto(url, options);
|
||||||
stealth.invalidate();
|
// Patch any new frames after navigation
|
||||||
patchFrames(page, cfg, cursor, raw, rawKb, originals, stealth);
|
patchFrames(page, cfg, cursor, raw, rawKb, originals);
|
||||||
return response;
|
return response;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -301,7 +122,7 @@ function patchPage(page: Page, cfg: HumanConfig, cursor: CursorState): void {
|
|||||||
const { box, cursorX, cursorY } = await scrollToElement(page, raw, selector, cursor.x, cursor.y, cfg);
|
const { box, cursorX, cursorY } = await scrollToElement(page, raw, selector, cursor.x, cursor.y, cfg);
|
||||||
cursor.x = cursorX;
|
cursor.x = cursorX;
|
||||||
cursor.y = cursorY;
|
cursor.y = cursorY;
|
||||||
const isInput = await isInputElement(stealth, page, selector);
|
const isInput = await isInputElement(page, selector);
|
||||||
const target = clickTarget(box, isInput, cfg);
|
const target = clickTarget(box, isInput, cfg);
|
||||||
await humanMove(raw, cursor.x, cursor.y, target.x, target.y, cfg);
|
await humanMove(raw, cursor.x, cursor.y, target.x, target.y, cfg);
|
||||||
cursor.x = target.x;
|
cursor.x = target.x;
|
||||||
@@ -318,7 +139,7 @@ function patchPage(page: Page, cfg: HumanConfig, cursor: CursorState): void {
|
|||||||
const { box, cursorX, cursorY } = await scrollToElement(page, raw, selector, cursor.x, cursor.y, cfg);
|
const { box, cursorX, cursorY } = await scrollToElement(page, raw, selector, cursor.x, cursor.y, cfg);
|
||||||
cursor.x = cursorX;
|
cursor.x = cursorX;
|
||||||
cursor.y = cursorY;
|
cursor.y = cursorY;
|
||||||
const isInput = await isInputElement(stealth, page, selector);
|
const isInput = await isInputElement(page, selector);
|
||||||
const target = clickTarget(box, isInput, cfg);
|
const target = clickTarget(box, isInput, cfg);
|
||||||
await humanMove(raw, cursor.x, cursor.y, target.x, target.y, cfg);
|
await humanMove(raw, cursor.x, cursor.y, target.x, target.y, cfg);
|
||||||
cursor.x = target.x;
|
cursor.x = target.x;
|
||||||
@@ -348,8 +169,7 @@ function patchPage(page: Page, cfg: HumanConfig, cursor: CursorState): void {
|
|||||||
await sleep(randRange(cfg.field_switch_delay));
|
await sleep(randRange(cfg.field_switch_delay));
|
||||||
await humanClickFn(selector);
|
await humanClickFn(selector);
|
||||||
await sleep(rand(100, 250));
|
await sleep(rand(100, 250));
|
||||||
const cdp = await ensureCdp();
|
await humanType(page, rawKb, text, cfg);
|
||||||
await humanType(page, rawKb, text, cfg, cdp);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// --- fill (clears existing content first) ---
|
// --- fill (clears existing content first) ---
|
||||||
@@ -361,13 +181,12 @@ function patchPage(page: Page, cfg: HumanConfig, cursor: CursorState): void {
|
|||||||
await sleep(rand(30, 80));
|
await sleep(rand(30, 80));
|
||||||
await originals.keyboardPress('Backspace');
|
await originals.keyboardPress('Backspace');
|
||||||
await sleep(rand(50, 150));
|
await sleep(rand(50, 150));
|
||||||
const cdp = await ensureCdp();
|
await humanType(page, rawKb, value, cfg);
|
||||||
await humanType(page, rawKb, value, cfg, cdp);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// --- clear ---
|
// --- clear ---
|
||||||
const humanClearFn = async (selector: string, options?: any) => {
|
const humanClearFn = async (selector: string, options?: any) => {
|
||||||
if (!await isSelectorFocused(stealth, page, selector)) {
|
if (!await isSelectorFocused(page, selector)) {
|
||||||
await humanClickFn(selector);
|
await humanClickFn(selector);
|
||||||
}
|
}
|
||||||
await sleep(rand(50, 150));
|
await sleep(rand(50, 150));
|
||||||
@@ -407,7 +226,7 @@ function patchPage(page: Page, cfg: HumanConfig, cursor: CursorState): void {
|
|||||||
|
|
||||||
// --- press (checks focus first — avoids redundant mouse moves) ---
|
// --- press (checks focus first — avoids redundant mouse moves) ---
|
||||||
const humanPressFn = async (selector: string, key: string, options?: any) => {
|
const humanPressFn = async (selector: string, key: string, options?: any) => {
|
||||||
if (!await isSelectorFocused(stealth, page, selector)) {
|
if (!await isSelectorFocused(page, selector)) {
|
||||||
await humanClickFn(selector);
|
await humanClickFn(selector);
|
||||||
}
|
}
|
||||||
await sleep(rand(50, 150));
|
await sleep(rand(50, 150));
|
||||||
@@ -416,12 +235,11 @@ function patchPage(page: Page, cfg: HumanConfig, cursor: CursorState): void {
|
|||||||
|
|
||||||
// --- pressSequentially ---
|
// --- pressSequentially ---
|
||||||
const humanPressSequentiallyFn = async (selector: string, text: string, options?: any) => {
|
const humanPressSequentiallyFn = async (selector: string, text: string, options?: any) => {
|
||||||
if (!await isSelectorFocused(stealth, page, selector)) {
|
if (!await isSelectorFocused(page, selector)) {
|
||||||
await humanClickFn(selector);
|
await humanClickFn(selector);
|
||||||
}
|
}
|
||||||
await sleep(rand(100, 250));
|
await sleep(rand(100, 250));
|
||||||
const cdp = await ensureCdp();
|
await humanType(page, rawKb, text, cfg);
|
||||||
await humanType(page, rawKb, text, cfg, cdp);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// --- tap ---
|
// --- tap ---
|
||||||
@@ -440,9 +258,6 @@ function patchPage(page: Page, cfg: HumanConfig, cursor: CursorState): void {
|
|||||||
(page as any).uncheck = humanUncheckFn;
|
(page as any).uncheck = humanUncheckFn;
|
||||||
(page as any).selectOption = humanSelectOptionFn;
|
(page as any).selectOption = humanSelectOptionFn;
|
||||||
(page as any).press = humanPressFn;
|
(page as any).press = humanPressFn;
|
||||||
(page as any).pressSequentially = humanPressSequentiallyFn;
|
|
||||||
(page as any).tap = humanTapFn;
|
|
||||||
(page as any).clear = humanClearFn;
|
|
||||||
|
|
||||||
// --- mouse patches ---
|
// --- mouse patches ---
|
||||||
page.mouse.move = async (x: number, y: number, options?: any) => {
|
page.mouse.move = async (x: number, y: number, options?: any) => {
|
||||||
@@ -462,8 +277,7 @@ function patchPage(page: Page, cfg: HumanConfig, cursor: CursorState): void {
|
|||||||
|
|
||||||
// --- keyboard patches ---
|
// --- keyboard patches ---
|
||||||
page.keyboard.type = async (text: string, options?: any) => {
|
page.keyboard.type = async (text: string, options?: any) => {
|
||||||
const cdp = await ensureCdp();
|
await humanType(page, rawKb, text, cfg);
|
||||||
await humanType(page, rawKb, text, cfg, cdp);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// Store helpers for frame patching
|
// Store helpers for frame patching
|
||||||
@@ -487,7 +301,7 @@ function patchPage(page: Page, cfg: HumanConfig, cursor: CursorState): void {
|
|||||||
}).catch(() => {});
|
}).catch(() => {});
|
||||||
|
|
||||||
// --- Patch Frame-level methods (for sub-frames) ---
|
// --- Patch Frame-level methods (for sub-frames) ---
|
||||||
patchFrames(page, cfg, cursor, raw, rawKb, originals, stealth);
|
patchFrames(page, cfg, cursor, raw, rawKb, originals);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -497,8 +311,8 @@ function patchPage(page: Page, cfg: HumanConfig, cursor: CursorState): void {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Patch Frame methods so Locator-based calls go through humanization.
|
* Patch Frame methods so Locator-based calls go through humanization.
|
||||||
* All 13 methods patched: click, dblclick, hover, type, fill, check, uncheck,
|
* All 11 methods patched: click, dblclick, hover, type, fill, check, uncheck,
|
||||||
* selectOption, press, pressSequentially, tap, clear, dragAndDrop.
|
* selectOption, press, clear, dragAndDrop.
|
||||||
*/
|
*/
|
||||||
function patchFrames(
|
function patchFrames(
|
||||||
page: Page,
|
page: Page,
|
||||||
@@ -507,20 +321,13 @@ function patchFrames(
|
|||||||
raw: RawMouse,
|
raw: RawMouse,
|
||||||
rawKb: RawKeyboard,
|
rawKb: RawKeyboard,
|
||||||
originals: any,
|
originals: any,
|
||||||
stealth: StealthEval,
|
|
||||||
): void {
|
): void {
|
||||||
for (const frame of iterFrames(page)) {
|
for (const frame of iterFrames(page)) {
|
||||||
patchSingleFrame(frame, page, cfg, originals, stealth);
|
patchSingleFrame(frame, page, cfg, originals);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function patchSingleFrame(
|
function patchSingleFrame(frame: Frame, page: Page, cfg: HumanConfig, originals: any): void {
|
||||||
frame: Frame,
|
|
||||||
page: Page,
|
|
||||||
cfg: HumanConfig,
|
|
||||||
originals: any,
|
|
||||||
stealth: StealthEval,
|
|
||||||
): void {
|
|
||||||
if ((frame as any)._humanPatched) return;
|
if ((frame as any)._humanPatched) return;
|
||||||
(frame as any)._humanPatched = true;
|
(frame as any)._humanPatched = true;
|
||||||
|
|
||||||
@@ -566,16 +373,8 @@ function patchSingleFrame(
|
|||||||
await (page as any).press(selector, key, options);
|
await (page as any).press(selector, key, options);
|
||||||
};
|
};
|
||||||
|
|
||||||
(frame as any).pressSequentially = async (selector: string, text: string, options?: any) => {
|
|
||||||
await (page as any).pressSequentially(selector, text, options);
|
|
||||||
};
|
|
||||||
|
|
||||||
(frame as any).tap = async (selector: string, options?: any) => {
|
|
||||||
await (page as any).tap(selector, options);
|
|
||||||
};
|
|
||||||
|
|
||||||
(frame as any).clear = async (selector: string, options?: any) => {
|
(frame as any).clear = async (selector: string, options?: any) => {
|
||||||
if (!await isSelectorFocused(stealth, page, selector)) {
|
if (!await isSelectorFocused(page, selector)) {
|
||||||
await (page as any).click(selector);
|
await (page as any).click(selector);
|
||||||
}
|
}
|
||||||
await sleep(rand(50, 150));
|
await sleep(rand(50, 150));
|
||||||
|
|||||||
@@ -1,12 +1,8 @@
|
|||||||
/**
|
/**
|
||||||
* cloakbrowser-human — Human-like keyboard input.
|
* cloakbrowser-human — Human-like keyboard input.
|
||||||
*
|
|
||||||
* Stealth-aware: when a CDPSession is provided, shift symbols are typed
|
|
||||||
* via CDP Input.dispatchKeyEvent (isTrusted=true, no evaluate stack trace).
|
|
||||||
* Falls back to page.evaluate when no CDPSession is available.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import type { Page, CDPSession } from 'playwright-core';
|
import type { Page } from 'playwright-core';
|
||||||
import { RawKeyboard } from './mouse.js';
|
import { RawKeyboard } from './mouse.js';
|
||||||
import { HumanConfig, rand, randRange, sleep } from './config.js';
|
import { HumanConfig, rand, randRange, sleep } from './config.js';
|
||||||
|
|
||||||
@@ -26,31 +22,6 @@ const NEARBY_KEYS: Record<string, string> = {
|
|||||||
'6': '57ty', '7': '68yu', '8': '79ui', '9': '80io', '0': '9p',
|
'6': '57ty', '7': '68yu', '8': '79ui', '9': '80io', '0': '9p',
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* CDP key code for each shift symbol's physical key.
|
|
||||||
* Used by Input.dispatchKeyEvent to produce isTrusted=true events.
|
|
||||||
*/
|
|
||||||
const SHIFT_SYMBOL_CODES: Record<string, string> = {
|
|
||||||
'!': 'Digit1', '@': 'Digit2', '#': 'Digit3', '$': 'Digit4',
|
|
||||||
'%': 'Digit5', '^': 'Digit6', '&': 'Digit7', '*': 'Digit8',
|
|
||||||
'(': 'Digit9', ')': 'Digit0', '_': 'Minus', '+': 'Equal',
|
|
||||||
'{': 'BracketLeft', '}': 'BracketRight', '|': 'Backslash',
|
|
||||||
':': 'Semicolon', '"': 'Quote', '<': 'Comma', '>': 'Period',
|
|
||||||
'?': 'Slash', '~': 'Backquote',
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Windows virtual key codes for shift symbols.
|
|
||||||
* Input.dispatchKeyEvent uses these to match real keyboard behavior.
|
|
||||||
*/
|
|
||||||
const SHIFT_SYMBOL_KEYCODES: Record<string, number> = {
|
|
||||||
'!': 49, '@': 50, '#': 51, '$': 52, '%': 53,
|
|
||||||
'^': 54, '&': 55, '*': 56, '(': 57, ')': 48,
|
|
||||||
'_': 189, '+': 187, '{': 219, '}': 221, '|': 220,
|
|
||||||
':': 186, '"': 222, '<': 188, '>': 190, '?': 191,
|
|
||||||
'~': 192,
|
|
||||||
};
|
|
||||||
|
|
||||||
function isAscii(ch: string): boolean {
|
function isAscii(ch: string): boolean {
|
||||||
const code = ch.codePointAt(0);
|
const code = ch.codePointAt(0);
|
||||||
return code !== undefined && code < 128;
|
return code !== undefined && code < 128;
|
||||||
@@ -66,24 +37,11 @@ function getNearbyKey(ch: string): string {
|
|||||||
return ch;
|
return ch;
|
||||||
}
|
}
|
||||||
|
|
||||||
function isUpperCase(ch: string): boolean {
|
|
||||||
return ch.length === 1 && ch >= 'A' && ch <= 'Z';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Type text with human-like per-character timing, mistype simulation,
|
|
||||||
* and realistic shift handling.
|
|
||||||
*
|
|
||||||
* @param cdpSession - If provided, shift symbols use CDP Input.dispatchKeyEvent
|
|
||||||
* producing isTrusted=true events with no evaluate stack trace.
|
|
||||||
* If null/undefined, falls back to page.evaluate (detectable).
|
|
||||||
*/
|
|
||||||
export async function humanType(
|
export async function humanType(
|
||||||
page: Page,
|
page: Page,
|
||||||
raw: RawKeyboard,
|
raw: RawKeyboard,
|
||||||
text: string,
|
text: string,
|
||||||
cfg: HumanConfig,
|
cfg: HumanConfig,
|
||||||
cdpSession?: CDPSession | null,
|
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const chars = [...text]; // Handle emoji surrogate pairs correctly
|
const chars = [...text]; // Handle emoji surrogate pairs correctly
|
||||||
|
|
||||||
@@ -114,7 +72,7 @@ export async function humanType(
|
|||||||
if (isUpperCase(ch)) {
|
if (isUpperCase(ch)) {
|
||||||
await typeShiftedChar(raw, ch, cfg);
|
await typeShiftedChar(raw, ch, cfg);
|
||||||
} else if (SHIFT_SYMBOLS.has(ch)) {
|
} else if (SHIFT_SYMBOLS.has(ch)) {
|
||||||
await typeShiftSymbol(page, raw, ch, cfg, cdpSession);
|
await typeShiftSymbol(page, raw, ch, cfg);
|
||||||
} else {
|
} else {
|
||||||
await typeNormalChar(raw, ch, cfg);
|
await typeNormalChar(raw, ch, cfg);
|
||||||
}
|
}
|
||||||
@@ -141,54 +99,7 @@ async function typeShiftedChar(raw: RawKeyboard, ch: string, cfg: HumanConfig):
|
|||||||
await raw.up('Shift');
|
await raw.up('Shift');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
async function typeShiftSymbol(page: Page, raw: RawKeyboard, ch: string, cfg: HumanConfig): Promise<void> {
|
||||||
* Type a shift symbol character.
|
|
||||||
*
|
|
||||||
* Stealth path (cdpSession provided):
|
|
||||||
* Uses CDP Input.dispatchKeyEvent → isTrusted=true, clean stack.
|
|
||||||
*
|
|
||||||
* Fallback path (no cdpSession):
|
|
||||||
* Uses raw.insertText + page.evaluate to dispatch synthetic KeyboardEvent.
|
|
||||||
* Detectable via isTrusted=false and evaluate stack frame.
|
|
||||||
*/
|
|
||||||
async function typeShiftSymbol(
|
|
||||||
page: Page,
|
|
||||||
raw: RawKeyboard,
|
|
||||||
ch: string,
|
|
||||||
cfg: HumanConfig,
|
|
||||||
cdpSession?: CDPSession | null,
|
|
||||||
): Promise<void> {
|
|
||||||
if (cdpSession) {
|
|
||||||
// --- Stealth path: CDP Input.dispatchKeyEvent ---
|
|
||||||
const code = SHIFT_SYMBOL_CODES[ch] || '';
|
|
||||||
const keyCode = SHIFT_SYMBOL_KEYCODES[ch] || 0;
|
|
||||||
|
|
||||||
await raw.down('Shift');
|
|
||||||
await sleep(randRange(cfg.shift_down_delay));
|
|
||||||
|
|
||||||
await cdpSession.send('Input.dispatchKeyEvent', {
|
|
||||||
type: 'keyDown',
|
|
||||||
modifiers: 8, // Shift modifier flag
|
|
||||||
key: ch,
|
|
||||||
code,
|
|
||||||
windowsVirtualKeyCode: keyCode,
|
|
||||||
text: ch,
|
|
||||||
unmodifiedText: ch,
|
|
||||||
});
|
|
||||||
await sleep(randRange(cfg.key_hold));
|
|
||||||
|
|
||||||
await cdpSession.send('Input.dispatchKeyEvent', {
|
|
||||||
type: 'keyUp',
|
|
||||||
modifiers: 8,
|
|
||||||
key: ch,
|
|
||||||
code,
|
|
||||||
windowsVirtualKeyCode: keyCode,
|
|
||||||
});
|
|
||||||
|
|
||||||
await sleep(randRange(cfg.shift_up_delay));
|
|
||||||
await raw.up('Shift');
|
|
||||||
} else {
|
|
||||||
// --- Fallback path: page.evaluate (detectable) ---
|
|
||||||
await raw.down('Shift');
|
await raw.down('Shift');
|
||||||
await sleep(randRange(cfg.shift_down_delay));
|
await sleep(randRange(cfg.shift_down_delay));
|
||||||
await raw.insertText(ch);
|
await raw.insertText(ch);
|
||||||
@@ -202,6 +113,9 @@ async function typeShiftSymbol(
|
|||||||
await sleep(randRange(cfg.shift_up_delay));
|
await sleep(randRange(cfg.shift_up_delay));
|
||||||
await raw.up('Shift');
|
await raw.up('Shift');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function isUpperCase(ch: string): boolean {
|
||||||
|
return ch.length === 1 && ch >= 'A' && ch <= 'Z';
|
||||||
}
|
}
|
||||||
|
|
||||||
async function interCharDelay(cfg: HumanConfig): Promise<void> {
|
async function interCharDelay(cfg: HumanConfig): Promise<void> {
|
||||||
|
|||||||
+9
-22
@@ -9,7 +9,7 @@ import { DEFAULT_VIEWPORT, IGNORE_DEFAULT_ARGS } from "./config.js";
|
|||||||
import { buildArgs } from "./args.js";
|
import { buildArgs } from "./args.js";
|
||||||
import { ensureBinary } from "./download.js";
|
import { ensureBinary } from "./download.js";
|
||||||
import { parseProxyUrl } from "./proxy.js";
|
import { parseProxyUrl } from "./proxy.js";
|
||||||
import { maybeResolveGeoip, resolveWebrtcArgs } from "./geoip.js";
|
import { maybeResolveGeoip } from "./geoip.js";
|
||||||
|
|
||||||
/** @internal Accept both timezone and timezoneId — either works, no warning. Exported for testing. */
|
/** @internal Accept both timezone and timezoneId — either works, no warning. Exported for testing. */
|
||||||
export function resolveTimezone<T extends { timezone?: string; timezoneId?: string }>(options: T): T {
|
export function resolveTimezone<T extends { timezone?: string; timezoneId?: string }>(options: T): T {
|
||||||
@@ -38,12 +38,8 @@ export async function launch(options: LaunchOptions = {}): Promise<Browser> {
|
|||||||
const { chromium } = await import("playwright-core");
|
const { chromium } = await import("playwright-core");
|
||||||
|
|
||||||
const binaryPath = process.env.CLOAKBROWSER_BINARY_PATH || (await ensureBinary());
|
const binaryPath = process.env.CLOAKBROWSER_BINARY_PATH || (await ensureBinary());
|
||||||
const { exitIp, ...resolved } = await maybeResolveGeoip(options);
|
const resolved = await maybeResolveGeoip(options);
|
||||||
let resolvedArgs = await resolveWebrtcArgs(options);
|
const args = buildArgs({ ...options, ...resolved });
|
||||||
if (exitIp && !(resolvedArgs ?? []).some(a => a.startsWith("--fingerprint-webrtc-ip"))) {
|
|
||||||
resolvedArgs = [...(resolvedArgs ?? []), `--fingerprint-webrtc-ip=${exitIp}`];
|
|
||||||
}
|
|
||||||
const args = buildArgs({ ...options, ...resolved, args: resolvedArgs });
|
|
||||||
|
|
||||||
const browser = await chromium.launch({
|
const browser = await chromium.launch({
|
||||||
executablePath: binaryPath,
|
executablePath: binaryPath,
|
||||||
@@ -91,22 +87,17 @@ export async function launchContext(
|
|||||||
): Promise<BrowserContext> {
|
): Promise<BrowserContext> {
|
||||||
options = resolveTimezone(options);
|
options = resolveTimezone(options);
|
||||||
// Resolve geoip BEFORE launch() to avoid double-resolution
|
// Resolve geoip BEFORE launch() to avoid double-resolution
|
||||||
const { exitIp, ...resolved } = await maybeResolveGeoip(options);
|
const resolved = await maybeResolveGeoip(options);
|
||||||
let launchArgs = await resolveWebrtcArgs(options);
|
|
||||||
// Inject geoip exit IP for WebRTC spoofing (free — no extra HTTP call)
|
|
||||||
if (exitIp && !(launchArgs ?? []).some(a => a.startsWith("--fingerprint-webrtc-ip"))) {
|
|
||||||
launchArgs = [...(launchArgs ?? []), `--fingerprint-webrtc-ip=${exitIp}`];
|
|
||||||
}
|
|
||||||
// --fingerprint-timezone is process-wide (reads CommandLine in renderer),
|
// --fingerprint-timezone is process-wide (reads CommandLine in renderer),
|
||||||
// so it applies to ALL contexts, not just the default one.
|
// so it applies to ALL contexts, not just the default one.
|
||||||
// locale and timezone are set via binary flags only — no CDP emulation.
|
// locale and timezone are set via binary flags only — no CDP emulation.
|
||||||
const browser = await launch({ ...options, ...resolved, args: launchArgs, geoip: false });
|
const browser = await launch({ ...options, ...resolved, geoip: false });
|
||||||
|
|
||||||
let context: BrowserContext;
|
let context: BrowserContext;
|
||||||
try {
|
try {
|
||||||
context = await browser.newContext({
|
context = await browser.newContext({
|
||||||
...(options.userAgent ? { userAgent: options.userAgent } : {}),
|
...(options.userAgent ? { userAgent: options.userAgent } : {}),
|
||||||
viewport: options.viewport === undefined ? DEFAULT_VIEWPORT : options.viewport,
|
viewport: options.viewport ?? DEFAULT_VIEWPORT,
|
||||||
...(options.colorScheme ? { colorScheme: options.colorScheme } : {}),
|
...(options.colorScheme ? { colorScheme: options.colorScheme } : {}),
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -163,12 +154,8 @@ export async function launchPersistentContext(
|
|||||||
const { chromium } = await import("playwright-core");
|
const { chromium } = await import("playwright-core");
|
||||||
|
|
||||||
const binaryPath = process.env.CLOAKBROWSER_BINARY_PATH || (await ensureBinary());
|
const binaryPath = process.env.CLOAKBROWSER_BINARY_PATH || (await ensureBinary());
|
||||||
const { exitIp, ...resolved } = await maybeResolveGeoip(options);
|
const resolved = await maybeResolveGeoip(options);
|
||||||
let resolvedArgs = await resolveWebrtcArgs(options);
|
const args = buildArgs({ ...options, ...resolved });
|
||||||
if (exitIp && !(resolvedArgs ?? []).some(a => a.startsWith("--fingerprint-webrtc-ip"))) {
|
|
||||||
resolvedArgs = [...(resolvedArgs ?? []), `--fingerprint-webrtc-ip=${exitIp}`];
|
|
||||||
}
|
|
||||||
const args = buildArgs({ ...options, ...resolved, args: resolvedArgs });
|
|
||||||
|
|
||||||
// locale and timezone are set via binary flags (--lang, --fingerprint-timezone)
|
// locale and timezone are set via binary flags (--lang, --fingerprint-timezone)
|
||||||
// — NOT via Playwright context kwargs which use detectable CDP emulation.
|
// — NOT via Playwright context kwargs which use detectable CDP emulation.
|
||||||
@@ -181,7 +168,7 @@ export async function launchPersistentContext(
|
|||||||
? { proxy: typeof options.proxy === "string" ? parseProxyUrl(options.proxy) : options.proxy }
|
? { proxy: typeof options.proxy === "string" ? parseProxyUrl(options.proxy) : options.proxy }
|
||||||
: {}),
|
: {}),
|
||||||
...(options.userAgent ? { userAgent: options.userAgent } : {}),
|
...(options.userAgent ? { userAgent: options.userAgent } : {}),
|
||||||
viewport: options.viewport === undefined ? DEFAULT_VIEWPORT : options.viewport,
|
viewport: options.viewport ?? DEFAULT_VIEWPORT,
|
||||||
...(options.colorScheme ? { colorScheme: options.colorScheme } : {}),
|
...(options.colorScheme ? { colorScheme: options.colorScheme } : {}),
|
||||||
...options.launchOptions,
|
...options.launchOptions,
|
||||||
});
|
});
|
||||||
|
|||||||
+13
-28
@@ -1,7 +1,6 @@
|
|||||||
/**
|
/**
|
||||||
* Puppeteer launch wrapper for cloakbrowser.
|
* Puppeteer launch wrapper for cloakbrowser.
|
||||||
* NOW WITH HUMANIZE SUPPORT — humanize: true enables human-like
|
* Alternative to the Playwright wrapper for users who prefer Puppeteer.
|
||||||
* mouse curves, keyboard timing, and scroll patterns (same as Playwright).
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import type { Browser } from "puppeteer-core";
|
import type { Browser } from "puppeteer-core";
|
||||||
@@ -10,7 +9,7 @@ import { IGNORE_DEFAULT_ARGS } from "./config.js";
|
|||||||
import { buildArgs } from "./args.js";
|
import { buildArgs } from "./args.js";
|
||||||
import { ensureBinary } from "./download.js";
|
import { ensureBinary } from "./download.js";
|
||||||
import { parseProxyUrl } from "./proxy.js";
|
import { parseProxyUrl } from "./proxy.js";
|
||||||
import { maybeResolveGeoip, resolveWebrtcArgs } from "./geoip.js";
|
import { maybeResolveGeoip } from "./geoip.js";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Launch stealth Chromium browser via Puppeteer.
|
* Launch stealth Chromium browser via Puppeteer.
|
||||||
@@ -18,25 +17,19 @@ import { maybeResolveGeoip, resolveWebrtcArgs } from "./geoip.js";
|
|||||||
* @example
|
* @example
|
||||||
* ```ts
|
* ```ts
|
||||||
* import { launch } from 'cloakbrowser/puppeteer';
|
* import { launch } from 'cloakbrowser/puppeteer';
|
||||||
* * // With humanize — human-like mouse, keyboard, scroll
|
* const browser = await launch();
|
||||||
* const browser = await launch({ humanize: true });
|
|
||||||
* const page = await browser.newPage();
|
* const page = await browser.newPage();
|
||||||
* await page.goto('[https://example.com](https://example.com)');
|
* await page.goto('https://bot.incolumitas.com');
|
||||||
* await page.click('#login'); // Bézier curve mouse movement
|
* console.log(await page.title());
|
||||||
* await page.type('#email', 'user@example.com'); // Per-character timing
|
* await browser.close();
|
||||||
* ```
|
* ```
|
||||||
*/
|
*/
|
||||||
export async function launch(options: LaunchOptions = {}): Promise<Browser> {
|
export async function launch(options: LaunchOptions = {}): Promise<Browser> {
|
||||||
const puppeteer = await import("puppeteer-core");
|
const puppeteer = await import("puppeteer-core");
|
||||||
|
|
||||||
const binaryPath = process.env.CLOAKBROWSER_BINARY_PATH || (await ensureBinary());
|
const binaryPath = process.env.CLOAKBROWSER_BINARY_PATH || (await ensureBinary());
|
||||||
const { exitIp, ...resolved } = (await maybeResolveGeoip(options)) ?? {};
|
const resolved = await maybeResolveGeoip(options);
|
||||||
let resolvedArgs = (await resolveWebrtcArgs(options)) ?? options.args;
|
const args = buildArgs({ ...options, ...resolved });
|
||||||
|
|
||||||
if (exitIp && !(resolvedArgs ?? []).some(a => a.startsWith("--fingerprint-webrtc-ip"))) {
|
|
||||||
resolvedArgs = [...(resolvedArgs ?? []), `--fingerprint-webrtc-ip=${exitIp}`];
|
|
||||||
}
|
|
||||||
const args = buildArgs({ ...options, ...resolved, args: resolvedArgs });
|
|
||||||
|
|
||||||
// Puppeteer handles proxy via CLI args, not a separate option.
|
// Puppeteer handles proxy via CLI args, not a separate option.
|
||||||
// Chromium's --proxy-server does NOT support inline credentials,
|
// Chromium's --proxy-server does NOT support inline credentials,
|
||||||
@@ -85,18 +78,10 @@ export async function launch(options: LaunchOptions = {}): Promise<Browser> {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// Human-like behavioral patching — FULL coverage, same as Playwright.
|
|
||||||
// This enables Bézier mouse movements, organic typing rhythms, and
|
|
||||||
// natural scrolling to bypass advanced anti-bot detection.
|
|
||||||
if (options.humanize) {
|
|
||||||
const { patchBrowser } = await import('./human-puppeteer/index.js');
|
|
||||||
const { resolveConfig } = await import('./human/config.js');
|
|
||||||
const cfg = resolveConfig(
|
|
||||||
(options.humanPreset as any) ?? 'default',
|
|
||||||
options.humanConfig as any,
|
|
||||||
);
|
|
||||||
patchBrowser(browser, cfg);
|
|
||||||
}
|
|
||||||
|
|
||||||
return browser;
|
return browser;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Internal
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -36,7 +36,7 @@ export interface LaunchContextOptions extends LaunchOptions {
|
|||||||
/** Custom user agent string. */
|
/** Custom user agent string. */
|
||||||
userAgent?: string;
|
userAgent?: string;
|
||||||
/** Viewport size. */
|
/** Viewport size. */
|
||||||
viewport?: { width: number; height: number } | null;
|
viewport?: { width: number; height: number };
|
||||||
/** Browser locale, e.g. "en-US". */
|
/** Browser locale, e.g. "en-US". */
|
||||||
locale?: string;
|
locale?: string;
|
||||||
/** IANA timezone — alias for `timezone`. Either works. */
|
/** IANA timezone — alias for `timezone`. Either works. */
|
||||||
|
|||||||
+3
-16
@@ -21,17 +21,16 @@ describe("config", () => {
|
|||||||
const isMac = process.platform === "darwin";
|
const isMac = process.platform === "darwin";
|
||||||
|
|
||||||
expect(args).toContain("--no-sandbox");
|
expect(args).toContain("--no-sandbox");
|
||||||
|
expect(args).toContain("--disable-blink-features=AutomationControlled");
|
||||||
|
|
||||||
if (isMac) {
|
if (isMac) {
|
||||||
expect(args).toContain("--fingerprint-platform=macos");
|
expect(args).toContain("--fingerprint-platform=macos");
|
||||||
|
// macOS: no hardware-concurrency or GPU spoofing (uses native values)
|
||||||
|
expect(args.some((a) => a.includes("hardware-concurrency"))).toBe(false);
|
||||||
} else {
|
} else {
|
||||||
expect(args).toContain("--fingerprint-platform=windows");
|
expect(args).toContain("--fingerprint-platform=windows");
|
||||||
}
|
}
|
||||||
|
|
||||||
// GPU flags removed — binary auto-generates from seed + platform
|
|
||||||
expect(args.some((a) => a.includes("fingerprint-gpu-vendor"))).toBe(false);
|
|
||||||
expect(args.some((a) => a.includes("fingerprint-gpu-renderer"))).toBe(false);
|
|
||||||
|
|
||||||
// Should have a random fingerprint seed
|
// Should have a random fingerprint seed
|
||||||
const fingerprintArg = args.find((a) => a.startsWith("--fingerprint="));
|
const fingerprintArg = args.find((a) => a.startsWith("--fingerprint="));
|
||||||
expect(fingerprintArg).toBeDefined();
|
expect(fingerprintArg).toBeDefined();
|
||||||
@@ -183,18 +182,6 @@ describe("buildArgs deduplication", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("buildArgs webrtc IP", () => {
|
|
||||||
it("passes --fingerprint-webrtc-ip from args", () => {
|
|
||||||
const args = _buildArgsForTest({ args: ["--fingerprint-webrtc-ip=1.2.3.4"] });
|
|
||||||
expect(args).toContain("--fingerprint-webrtc-ip=1.2.3.4");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("does not inject when not in args", () => {
|
|
||||||
const args = _buildArgsForTest({});
|
|
||||||
expect(args.some(a => a.startsWith("--fingerprint-webrtc-ip"))).toBe(false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("resolveTimezone alias", () => {
|
describe("resolveTimezone alias", () => {
|
||||||
it("resolves timezoneId to timezone", () => {
|
it("resolves timezoneId to timezone", () => {
|
||||||
const result = resolveTimezone({ timezoneId: "Europe/Paris" });
|
const result = resolveTimezone({ timezoneId: "Europe/Paris" });
|
||||||
|
|||||||
@@ -451,89 +451,6 @@ describe("module exports", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// =========================================================================
|
|
||||||
// patchBrowser on CDP-connected browser (issue #126)
|
|
||||||
// =========================================================================
|
|
||||||
describe("patchBrowser CDP-connected workflow", () => {
|
|
||||||
it("patches existing pages on a browser with pre-existing contexts", async () => {
|
|
||||||
const { patchBrowser, resolveConfig } = await import("../src/human/index.js");
|
|
||||||
|
|
||||||
// Simulate a CDP-connected browser: it already has contexts and pages
|
|
||||||
const page = buildMockPage();
|
|
||||||
const context: any = {
|
|
||||||
pages: vi.fn(() => [page]),
|
|
||||||
on: vi.fn(),
|
|
||||||
newPage: vi.fn(async () => buildMockPage()),
|
|
||||||
addInitScript: vi.fn(async () => {}),
|
|
||||||
};
|
|
||||||
const browser: any = {
|
|
||||||
contexts: vi.fn(() => [context]),
|
|
||||||
newContext: vi.fn(async () => context),
|
|
||||||
newPage: vi.fn(async () => page),
|
|
||||||
};
|
|
||||||
|
|
||||||
const cfg = resolveConfig("default");
|
|
||||||
patchBrowser(browser, cfg);
|
|
||||||
|
|
||||||
// page should now have _original (proof it was patched)
|
|
||||||
expect((page as any)._original).toBeDefined();
|
|
||||||
expect((page as any)._original.click).toBeTypeOf("function");
|
|
||||||
expect((page as any)._original.fill).toBeTypeOf("function");
|
|
||||||
expect((page as any)._humanCfg).toBe(cfg);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("patched click calls mouse.down (humanized path, not original)", async () => {
|
|
||||||
const { patchBrowser, resolveConfig } = await import("../src/human/index.js");
|
|
||||||
|
|
||||||
let downCalled = false;
|
|
||||||
const page = buildMockPage();
|
|
||||||
page.mouse.down = vi.fn(async () => { downCalled = true; });
|
|
||||||
|
|
||||||
const context: any = {
|
|
||||||
pages: vi.fn(() => [page]),
|
|
||||||
on: vi.fn(),
|
|
||||||
newPage: vi.fn(async () => buildMockPage()),
|
|
||||||
addInitScript: vi.fn(async () => {}),
|
|
||||||
};
|
|
||||||
const browser: any = {
|
|
||||||
contexts: vi.fn(() => [context]),
|
|
||||||
newContext: vi.fn(async () => context),
|
|
||||||
newPage: vi.fn(async () => page),
|
|
||||||
};
|
|
||||||
|
|
||||||
patchBrowser(browser, resolveConfig("default"));
|
|
||||||
|
|
||||||
// Click through the patched method — should go through humanize path
|
|
||||||
try { await (page as any).click("button"); } catch (_) {}
|
|
||||||
|
|
||||||
expect(downCalled).toBe(true);
|
|
||||||
}, 30000);
|
|
||||||
|
|
||||||
it("new contexts created after patchBrowser are also patched", async () => {
|
|
||||||
const { patchBrowser, resolveConfig } = await import("../src/human/index.js");
|
|
||||||
|
|
||||||
const newPage = buildMockPage();
|
|
||||||
const newContext: any = {
|
|
||||||
pages: vi.fn(() => [newPage]),
|
|
||||||
on: vi.fn(),
|
|
||||||
newPage: vi.fn(async () => buildMockPage()),
|
|
||||||
addInitScript: vi.fn(async () => {}),
|
|
||||||
};
|
|
||||||
const browser: any = {
|
|
||||||
contexts: vi.fn(() => []),
|
|
||||||
newContext: vi.fn(async () => newContext),
|
|
||||||
newPage: vi.fn(async () => newPage),
|
|
||||||
};
|
|
||||||
|
|
||||||
patchBrowser(browser, resolveConfig("default"));
|
|
||||||
|
|
||||||
// Create a new context via the patched newContext
|
|
||||||
const ctx = await browser.newContext();
|
|
||||||
// Pages in the new context should be patched
|
|
||||||
expect((newPage as any)._original).toBeDefined();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
// Test helpers
|
// Test helpers
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ vi.mock("../src/download.js", () => ({
|
|||||||
vi.mock("../src/geoip.js", () => ({
|
vi.mock("../src/geoip.js", () => ({
|
||||||
resolveProxyGeo: vi.fn().mockResolvedValue({ timezone: null, locale: null }),
|
resolveProxyGeo: vi.fn().mockResolvedValue({ timezone: null, locale: null }),
|
||||||
maybeResolveGeoip: vi.fn().mockResolvedValue({}),
|
maybeResolveGeoip: vi.fn().mockResolvedValue({}),
|
||||||
resolveWebrtcArgs: vi.fn().mockImplementation((opts: any) => Promise.resolve(opts.args)),
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
describe("puppeteer launch", () => {
|
describe("puppeteer launch", () => {
|
||||||
@@ -22,7 +21,6 @@ describe("puppeteer launch", () => {
|
|||||||
let mockBrowser: any;
|
let mockBrowser: any;
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
delete process.env.CLOAKBROWSER_BINARY_PATH;
|
|
||||||
puppeteerMock = await import("puppeteer-core");
|
puppeteerMock = await import("puppeteer-core");
|
||||||
mockBrowser = {
|
mockBrowser = {
|
||||||
newPage: vi.fn().mockResolvedValue({
|
newPage: vi.fn().mockResolvedValue({
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -158,44 +158,3 @@ def test_override_logs_debug(caplog):
|
|||||||
with caplog.at_level(logging.DEBUG, logger="cloakbrowser"):
|
with caplog.at_level(logging.DEBUG, logger="cloakbrowser"):
|
||||||
build_args(stealth_args=True, extra_args=["--fingerprint=99887"])
|
build_args(stealth_args=True, extra_args=["--fingerprint=99887"])
|
||||||
assert any("--fingerprint=" in r.message and "99887" in r.message for r in caplog.records)
|
assert any("--fingerprint=" in r.message and "99887" in r.message for r in caplog.records)
|
||||||
|
|
||||||
|
|
||||||
# --- WebRTC IP spoofing ---
|
|
||||||
|
|
||||||
|
|
||||||
def test_webrtc_ip_passed_through_args():
|
|
||||||
"""--fingerprint-webrtc-ip in args should pass through to output."""
|
|
||||||
args = build_args(stealth_args=True, extra_args=["--fingerprint-webrtc-ip=1.2.3.4"])
|
|
||||||
assert "--fingerprint-webrtc-ip=1.2.3.4" in args
|
|
||||||
|
|
||||||
|
|
||||||
def test_webrtc_ip_not_present_by_default():
|
|
||||||
"""No --fingerprint-webrtc-ip when not in args."""
|
|
||||||
args = build_args(stealth_args=True, extra_args=None)
|
|
||||||
assert not any(a.startswith("--fingerprint-webrtc-ip") for a in args)
|
|
||||||
|
|
||||||
|
|
||||||
def test_resolve_webrtc_args_auto():
|
|
||||||
"""--fingerprint-webrtc-ip=auto should be resolved to an IP."""
|
|
||||||
from cloakbrowser.browser import _resolve_webrtc_args
|
|
||||||
from unittest.mock import patch
|
|
||||||
|
|
||||||
with patch("cloakbrowser.geoip._resolve_exit_ip", return_value="5.6.7.8"):
|
|
||||||
result = _resolve_webrtc_args(["--fingerprint-webrtc-ip=auto"], "http://proxy:8080")
|
|
||||||
assert result == ["--fingerprint-webrtc-ip=5.6.7.8"]
|
|
||||||
|
|
||||||
|
|
||||||
def test_resolve_webrtc_args_explicit_ip_unchanged():
|
|
||||||
"""Explicit IP in args should not be touched."""
|
|
||||||
from cloakbrowser.browser import _resolve_webrtc_args
|
|
||||||
|
|
||||||
result = _resolve_webrtc_args(["--fingerprint-webrtc-ip=9.9.9.9"], "http://proxy:8080")
|
|
||||||
assert result == ["--fingerprint-webrtc-ip=9.9.9.9"]
|
|
||||||
|
|
||||||
|
|
||||||
def test_resolve_webrtc_args_no_flag():
|
|
||||||
"""No webrtc flag in args should return args unchanged."""
|
|
||||||
from cloakbrowser.browser import _resolve_webrtc_args
|
|
||||||
|
|
||||||
result = _resolve_webrtc_args(["--no-sandbox"], "http://proxy:8080")
|
|
||||||
assert result == ["--no-sandbox"]
|
|
||||||
|
|||||||
@@ -133,14 +133,10 @@ class TestStealthArgs:
|
|||||||
with patch("cloakbrowser.config.platform.system", return_value="Darwin"):
|
with patch("cloakbrowser.config.platform.system", return_value="Darwin"):
|
||||||
args = get_default_stealth_args()
|
args = get_default_stealth_args()
|
||||||
assert "--fingerprint-platform=macos" in args
|
assert "--fingerprint-platform=macos" in args
|
||||||
# GPU flags removed — binary auto-generates from seed + platform
|
assert any("Apple" in a for a in args)
|
||||||
assert not any("fingerprint-gpu-vendor" in a for a in args)
|
|
||||||
assert not any("fingerprint-gpu-renderer" in a for a in args)
|
|
||||||
|
|
||||||
def test_linux_windows_profile(self):
|
def test_linux_windows_profile(self):
|
||||||
with patch("cloakbrowser.config.platform.system", return_value="Linux"):
|
with patch("cloakbrowser.config.platform.system", return_value="Linux"):
|
||||||
args = get_default_stealth_args()
|
args = get_default_stealth_args()
|
||||||
assert "--fingerprint-platform=windows" in args
|
assert "--fingerprint-platform=windows" in args
|
||||||
# GPU flags removed — binary auto-generates from seed + platform
|
assert any("NVIDIA" in a for a in args)
|
||||||
assert not any("fingerprint-gpu-vendor" in a for a in args)
|
|
||||||
assert not any("fingerprint-gpu-renderer" in a for a in args)
|
|
||||||
|
|||||||
+10
-15
@@ -97,51 +97,46 @@ def test_resolve_geo_returns_none_when_db_missing():
|
|||||||
|
|
||||||
|
|
||||||
def test_maybe_resolve_skips_when_geoip_false():
|
def test_maybe_resolve_skips_when_geoip_false():
|
||||||
tz, loc, ip = maybe_resolve_geoip(False, "http://proxy:8080", None, None)
|
tz, loc = maybe_resolve_geoip(False, "http://proxy:8080", None, None)
|
||||||
assert tz is None
|
assert tz is None
|
||||||
assert loc is None
|
assert loc is None
|
||||||
assert ip is None
|
|
||||||
|
|
||||||
|
|
||||||
def test_maybe_resolve_skips_when_no_proxy():
|
def test_maybe_resolve_skips_when_no_proxy():
|
||||||
tz, loc, ip = maybe_resolve_geoip(True, None, None, None)
|
tz, loc = maybe_resolve_geoip(True, None, None, None)
|
||||||
assert tz is None
|
assert tz is None
|
||||||
assert loc is None
|
assert loc is None
|
||||||
assert ip is None
|
|
||||||
|
|
||||||
|
|
||||||
def test_maybe_resolve_skips_when_both_explicit():
|
def test_maybe_resolve_skips_when_both_explicit():
|
||||||
"""Explicit values should still resolve exit IP for WebRTC."""
|
"""Explicit values should not trigger geoip resolution."""
|
||||||
with patch("cloakbrowser.geoip._resolve_exit_ip", return_value="1.2.3.4"):
|
tz, loc = maybe_resolve_geoip(True, "http://proxy:8080", "Europe/Berlin", "de-DE")
|
||||||
tz, loc, ip = maybe_resolve_geoip(True, "http://proxy:8080", "Europe/Berlin", "de-DE")
|
|
||||||
assert tz == "Europe/Berlin"
|
assert tz == "Europe/Berlin"
|
||||||
assert loc == "de-DE"
|
assert loc == "de-DE"
|
||||||
assert ip == "1.2.3.4"
|
|
||||||
|
|
||||||
|
|
||||||
def test_maybe_resolve_fills_missing_timezone():
|
def test_maybe_resolve_fills_missing_timezone():
|
||||||
"""When only locale is explicit, geoip should fill timezone."""
|
"""When only locale is explicit, geoip should fill timezone."""
|
||||||
with patch("cloakbrowser.geoip.resolve_proxy_geo_with_ip", return_value=("America/New_York", "en-US", "1.2.3.4")):
|
with patch("cloakbrowser.geoip.resolve_proxy_geo", return_value=("America/New_York", "en-US")):
|
||||||
tz, loc, ip = maybe_resolve_geoip(True, "http://proxy:8080", None, "fr-FR")
|
tz, loc = maybe_resolve_geoip(True, "http://proxy:8080", None, "fr-FR")
|
||||||
assert tz == "America/New_York"
|
assert tz == "America/New_York"
|
||||||
assert loc == "fr-FR" # Explicit wins
|
assert loc == "fr-FR" # Explicit wins
|
||||||
|
|
||||||
|
|
||||||
def test_maybe_resolve_fills_missing_locale():
|
def test_maybe_resolve_fills_missing_locale():
|
||||||
"""When only timezone is explicit, geoip should fill locale."""
|
"""When only timezone is explicit, geoip should fill locale."""
|
||||||
with patch("cloakbrowser.geoip.resolve_proxy_geo_with_ip", return_value=("America/New_York", "en-US", "1.2.3.4")):
|
with patch("cloakbrowser.geoip.resolve_proxy_geo", return_value=("America/New_York", "en-US")):
|
||||||
tz, loc, ip = maybe_resolve_geoip(True, "http://proxy:8080", "Asia/Tokyo", None)
|
tz, loc = maybe_resolve_geoip(True, "http://proxy:8080", "Asia/Tokyo", None)
|
||||||
assert tz == "Asia/Tokyo" # Explicit wins
|
assert tz == "Asia/Tokyo" # Explicit wins
|
||||||
assert loc == "en-US"
|
assert loc == "en-US"
|
||||||
|
|
||||||
|
|
||||||
def test_maybe_resolve_fills_both():
|
def test_maybe_resolve_fills_both():
|
||||||
"""When neither is set, geoip should fill both."""
|
"""When neither is set, geoip should fill both."""
|
||||||
with patch("cloakbrowser.geoip.resolve_proxy_geo_with_ip", return_value=("Europe/Berlin", "de-DE", "5.6.7.8")):
|
with patch("cloakbrowser.geoip.resolve_proxy_geo", return_value=("Europe/Berlin", "de-DE")):
|
||||||
tz, loc, ip = maybe_resolve_geoip(True, "http://proxy:8080", None, None)
|
tz, loc = maybe_resolve_geoip(True, "http://proxy:8080", None, None)
|
||||||
assert tz == "Europe/Berlin"
|
assert tz == "Europe/Berlin"
|
||||||
assert loc == "de-DE"
|
assert loc == "de-DE"
|
||||||
assert ip == "5.6.7.8"
|
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ def test_color_scheme(mock_launch, _mock_bin):
|
|||||||
assert ctx_kwargs[1]["color_scheme"] == "dark"
|
assert ctx_kwargs[1]["color_scheme"] == "dark"
|
||||||
|
|
||||||
|
|
||||||
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=("Europe/Berlin", "de-DE", "5.6.7.8"))
|
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=("Europe/Berlin", "de-DE"))
|
||||||
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
||||||
@patch("cloakbrowser.browser.launch")
|
@patch("cloakbrowser.browser.launch")
|
||||||
def test_geoip_resolution(mock_launch, _mock_bin, _mock_geoip):
|
def test_geoip_resolution(mock_launch, _mock_bin, _mock_geoip):
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ def _make_mock_pw_and_context():
|
|||||||
|
|
||||||
|
|
||||||
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
||||||
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None, None))
|
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None))
|
||||||
def test_persistent_context_args_built(_mock_geoip, _mock_bin):
|
def test_persistent_context_args_built(_mock_geoip, _mock_bin):
|
||||||
"""Stealth args + extra args combined correctly."""
|
"""Stealth args + extra args combined correctly."""
|
||||||
pw_cm, pw, context = _make_mock_pw_and_context()
|
pw_cm, pw, context = _make_mock_pw_and_context()
|
||||||
@@ -42,7 +42,7 @@ def test_persistent_context_args_built(_mock_geoip, _mock_bin):
|
|||||||
|
|
||||||
|
|
||||||
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
||||||
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None, None))
|
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None))
|
||||||
def test_persistent_context_default_viewport(_mock_geoip, _mock_bin):
|
def test_persistent_context_default_viewport(_mock_geoip, _mock_bin):
|
||||||
"""DEFAULT_VIEWPORT applied when no viewport given."""
|
"""DEFAULT_VIEWPORT applied when no viewport given."""
|
||||||
pw_cm, pw, context = _make_mock_pw_and_context()
|
pw_cm, pw, context = _make_mock_pw_and_context()
|
||||||
@@ -56,7 +56,7 @@ def test_persistent_context_default_viewport(_mock_geoip, _mock_bin):
|
|||||||
|
|
||||||
|
|
||||||
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
||||||
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None, None))
|
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None))
|
||||||
def test_persistent_context_custom_viewport(_mock_geoip, _mock_bin):
|
def test_persistent_context_custom_viewport(_mock_geoip, _mock_bin):
|
||||||
"""Custom viewport overrides DEFAULT_VIEWPORT."""
|
"""Custom viewport overrides DEFAULT_VIEWPORT."""
|
||||||
pw_cm, pw, context = _make_mock_pw_and_context()
|
pw_cm, pw, context = _make_mock_pw_and_context()
|
||||||
@@ -71,7 +71,7 @@ def test_persistent_context_custom_viewport(_mock_geoip, _mock_bin):
|
|||||||
|
|
||||||
|
|
||||||
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
||||||
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None, None))
|
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None))
|
||||||
def test_persistent_context_user_agent(_mock_geoip, _mock_bin):
|
def test_persistent_context_user_agent(_mock_geoip, _mock_bin):
|
||||||
"""user_agent forwarded to launch_persistent_context()."""
|
"""user_agent forwarded to launch_persistent_context()."""
|
||||||
pw_cm, pw, context = _make_mock_pw_and_context()
|
pw_cm, pw, context = _make_mock_pw_and_context()
|
||||||
@@ -103,7 +103,7 @@ def test_persistent_context_locale_and_timezone(_mock_bin):
|
|||||||
|
|
||||||
|
|
||||||
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
||||||
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None, None))
|
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None))
|
||||||
def test_persistent_context_color_scheme(_mock_geoip, _mock_bin):
|
def test_persistent_context_color_scheme(_mock_geoip, _mock_bin):
|
||||||
"""color_scheme forwarded correctly."""
|
"""color_scheme forwarded correctly."""
|
||||||
pw_cm, pw, context = _make_mock_pw_and_context()
|
pw_cm, pw, context = _make_mock_pw_and_context()
|
||||||
@@ -116,7 +116,7 @@ def test_persistent_context_color_scheme(_mock_geoip, _mock_bin):
|
|||||||
assert call_kwargs["color_scheme"] == "dark"
|
assert call_kwargs["color_scheme"] == "dark"
|
||||||
|
|
||||||
|
|
||||||
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=("Europe/Berlin", "de-DE", "5.6.7.8"))
|
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=("Europe/Berlin", "de-DE"))
|
||||||
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
||||||
def test_persistent_context_geoip(_mock_bin, _mock_geoip):
|
def test_persistent_context_geoip(_mock_bin, _mock_geoip):
|
||||||
"""geoip fills missing tz/locale — flows to binary args, not CDP context."""
|
"""geoip fills missing tz/locale — flows to binary args, not CDP context."""
|
||||||
@@ -150,7 +150,7 @@ def test_persistent_context_timezone_id_alias(_mock_bin):
|
|||||||
|
|
||||||
|
|
||||||
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
||||||
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None, None))
|
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None))
|
||||||
def test_persistent_context_close_stops_pw(_mock_geoip, _mock_bin):
|
def test_persistent_context_close_stops_pw(_mock_geoip, _mock_bin):
|
||||||
"""context.close() also calls pw.stop()."""
|
"""context.close() also calls pw.stop()."""
|
||||||
pw_cm, pw, context = _make_mock_pw_and_context()
|
pw_cm, pw, context = _make_mock_pw_and_context()
|
||||||
@@ -166,7 +166,7 @@ def test_persistent_context_close_stops_pw(_mock_geoip, _mock_bin):
|
|||||||
|
|
||||||
|
|
||||||
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
||||||
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None, None))
|
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None))
|
||||||
def test_persistent_context_proxy_string(_mock_geoip, _mock_bin):
|
def test_persistent_context_proxy_string(_mock_geoip, _mock_bin):
|
||||||
"""Proxy string parsed and passed."""
|
"""Proxy string parsed and passed."""
|
||||||
pw_cm, pw, context = _make_mock_pw_and_context()
|
pw_cm, pw, context = _make_mock_pw_and_context()
|
||||||
@@ -182,7 +182,7 @@ def test_persistent_context_proxy_string(_mock_geoip, _mock_bin):
|
|||||||
|
|
||||||
|
|
||||||
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
||||||
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None, None))
|
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None))
|
||||||
def test_persistent_context_proxy_dict(_mock_geoip, _mock_bin):
|
def test_persistent_context_proxy_dict(_mock_geoip, _mock_bin):
|
||||||
"""Proxy dict passed through."""
|
"""Proxy dict passed through."""
|
||||||
pw_cm, pw, context = _make_mock_pw_and_context()
|
pw_cm, pw, context = _make_mock_pw_and_context()
|
||||||
@@ -213,7 +213,7 @@ def _make_mock_async_pw_and_context():
|
|||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
||||||
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None, None))
|
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None))
|
||||||
async def test_persistent_context_async_args_built(_mock_geoip, _mock_bin):
|
async def test_persistent_context_async_args_built(_mock_geoip, _mock_bin):
|
||||||
"""Async launch builds args correctly."""
|
"""Async launch builds args correctly."""
|
||||||
pw_cm, pw, context = _make_mock_async_pw_and_context()
|
pw_cm, pw, context = _make_mock_async_pw_and_context()
|
||||||
@@ -229,7 +229,7 @@ async def test_persistent_context_async_args_built(_mock_geoip, _mock_bin):
|
|||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
@patch("cloakbrowser.browser.ensure_binary", return_value="/fake/chrome")
|
||||||
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None, None))
|
@patch("cloakbrowser.browser.maybe_resolve_geoip", return_value=(None, None))
|
||||||
async def test_persistent_context_async_close_stops_pw(_mock_geoip, _mock_bin):
|
async def test_persistent_context_async_close_stops_pw(_mock_geoip, _mock_bin):
|
||||||
"""await context.close() calls await pw.stop()."""
|
"""await context.close() calls await pw.stop()."""
|
||||||
pw_cm, pw, context = _make_mock_async_pw_and_context()
|
pw_cm, pw, context = _make_mock_async_pw_and_context()
|
||||||
|
|||||||
+12
-15
@@ -68,52 +68,49 @@ class TestBuildProxyKwargs:
|
|||||||
|
|
||||||
|
|
||||||
class TestMaybeResolveGeoip:
|
class TestMaybeResolveGeoip:
|
||||||
@patch("cloakbrowser.geoip.resolve_proxy_geo_with_ip", return_value=("America/New_York", "en-US", "1.2.3.4"))
|
@patch("cloakbrowser.geoip.resolve_proxy_geo", return_value=("America/New_York", "en-US"))
|
||||||
def test_geoip_with_string_proxy(self, mock_geo):
|
def test_geoip_with_string_proxy(self, mock_geo):
|
||||||
tz, locale, ip = maybe_resolve_geoip(True, "http://proxy:8080", None, None)
|
tz, locale = maybe_resolve_geoip(True, "http://proxy:8080", None, None)
|
||||||
mock_geo.assert_called_once_with("http://proxy:8080")
|
mock_geo.assert_called_once_with("http://proxy:8080")
|
||||||
assert tz == "America/New_York"
|
assert tz == "America/New_York"
|
||||||
assert locale == "en-US"
|
assert locale == "en-US"
|
||||||
assert ip == "1.2.3.4"
|
|
||||||
|
|
||||||
@patch("cloakbrowser.geoip.resolve_proxy_geo_with_ip", return_value=("Europe/London", "en-GB", "5.6.7.8"))
|
@patch("cloakbrowser.geoip.resolve_proxy_geo", return_value=("Europe/London", "en-GB"))
|
||||||
def test_geoip_with_dict_proxy_extracts_server(self, mock_geo):
|
def test_geoip_with_dict_proxy_extracts_server(self, mock_geo):
|
||||||
proxy_dict = {"server": "http://proxy:8080", "bypass": ".google.com"}
|
proxy_dict = {"server": "http://proxy:8080", "bypass": ".google.com"}
|
||||||
tz, locale, ip = maybe_resolve_geoip(True, proxy_dict, None, None)
|
tz, locale = maybe_resolve_geoip(True, proxy_dict, None, None)
|
||||||
mock_geo.assert_called_once_with("http://proxy:8080")
|
mock_geo.assert_called_once_with("http://proxy:8080")
|
||||||
assert tz == "Europe/London"
|
assert tz == "Europe/London"
|
||||||
assert locale == "en-GB"
|
assert locale == "en-GB"
|
||||||
|
|
||||||
def test_geoip_disabled_skips_resolution(self):
|
def test_geoip_disabled_skips_resolution(self):
|
||||||
tz, locale, ip = maybe_resolve_geoip(False, "http://proxy:8080", None, None)
|
tz, locale = maybe_resolve_geoip(False, "http://proxy:8080", None, None)
|
||||||
assert tz is None
|
assert tz is None
|
||||||
assert locale is None
|
assert locale is None
|
||||||
assert ip is None
|
|
||||||
|
|
||||||
def test_geoip_no_proxy_skips_resolution(self):
|
def test_geoip_no_proxy_skips_resolution(self):
|
||||||
tz, locale, ip = maybe_resolve_geoip(True, None, None, None)
|
tz, locale = maybe_resolve_geoip(True, None, None, None)
|
||||||
assert tz is None
|
assert tz is None
|
||||||
assert locale is None
|
assert locale is None
|
||||||
assert ip is None
|
|
||||||
|
|
||||||
@patch("cloakbrowser.geoip.resolve_proxy_geo_with_ip", return_value=("Asia/Tokyo", "ja-JP", "9.8.7.6"))
|
@patch("cloakbrowser.geoip.resolve_proxy_geo", return_value=("Asia/Tokyo", "ja-JP"))
|
||||||
def test_geoip_preserves_explicit_timezone(self, mock_geo):
|
def test_geoip_preserves_explicit_timezone(self, mock_geo):
|
||||||
tz, locale, _ip = maybe_resolve_geoip(True, "http://proxy:8080", "Europe/Berlin", None)
|
tz, locale = maybe_resolve_geoip(True, "http://proxy:8080", "Europe/Berlin", None)
|
||||||
assert tz == "Europe/Berlin"
|
assert tz == "Europe/Berlin"
|
||||||
assert locale == "ja-JP"
|
assert locale == "ja-JP"
|
||||||
|
|
||||||
@patch("cloakbrowser.geoip.resolve_proxy_geo_with_ip", return_value=("America/New_York", "en-US", "1.2.3.4"))
|
@patch("cloakbrowser.geoip.resolve_proxy_geo", return_value=("America/New_York", "en-US"))
|
||||||
def test_geoip_normalizes_bare_proxy_with_creds(self, mock_geo):
|
def test_geoip_normalizes_bare_proxy_with_creds(self, mock_geo):
|
||||||
# "user:pass@host:port" must be normalized to http:// before geoip lookup.
|
# "user:pass@host:port" must be normalized to http:// before geoip lookup.
|
||||||
tz, locale, _ip = maybe_resolve_geoip(True, "user:pass@proxy:8080", None, None)
|
tz, locale = maybe_resolve_geoip(True, "user:pass@proxy:8080", None, None)
|
||||||
mock_geo.assert_called_once_with("http://user:pass@proxy:8080")
|
mock_geo.assert_called_once_with("http://user:pass@proxy:8080")
|
||||||
assert tz == "America/New_York"
|
assert tz == "America/New_York"
|
||||||
assert locale == "en-US"
|
assert locale == "en-US"
|
||||||
|
|
||||||
@patch("cloakbrowser.geoip.resolve_proxy_geo_with_ip", return_value=("America/New_York", "en-US", "1.2.3.4"))
|
@patch("cloakbrowser.geoip.resolve_proxy_geo", return_value=("America/New_York", "en-US"))
|
||||||
def test_geoip_normalizes_schemeless_proxy_no_creds(self, mock_geo):
|
def test_geoip_normalizes_schemeless_proxy_no_creds(self, mock_geo):
|
||||||
# "host:port" (no @ and no scheme) must also be normalized.
|
# "host:port" (no @ and no scheme) must also be normalized.
|
||||||
tz, locale, _ip = maybe_resolve_geoip(True, "proxy:8080", None, None)
|
tz, locale = maybe_resolve_geoip(True, "proxy:8080", None, None)
|
||||||
mock_geo.assert_called_once_with("http://proxy:8080")
|
mock_geo.assert_called_once_with("http://proxy:8080")
|
||||||
assert tz == "America/New_York"
|
assert tz == "America/New_York"
|
||||||
|
|
||||||
|
|||||||
@@ -1,168 +0,0 @@
|
|||||||
# tests/test_stealth_reproduction_110.py
|
|
||||||
"""
|
|
||||||
Exact reproduction of issue #110 detection vectors.
|
|
||||||
Proves all three leaks (isInputElement, isSelectorFocused, typeShiftSymbol)
|
|
||||||
are fixed with CDP isolated worlds.
|
|
||||||
"""
|
|
||||||
import asyncio
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
@pytest.mark.slow
|
|
||||||
class TestIssue110Reproduction:
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_exact_reproduction_from_issue(self):
|
|
||||||
"""Exact detection script from issue #110 — must produce zero detections."""
|
|
||||||
from cloakbrowser import launch_async
|
|
||||||
|
|
||||||
browser = await launch_async(headless=True, humanize=True)
|
|
||||||
page = await browser.new_page()
|
|
||||||
|
|
||||||
await page.goto('https://www.wikipedia.org', wait_until='domcontentloaded')
|
|
||||||
await asyncio.sleep(1)
|
|
||||||
|
|
||||||
# === EXACT detection from issue #110 ===
|
|
||||||
await page.evaluate("""
|
|
||||||
() => {
|
|
||||||
window.__detections = {
|
|
||||||
evaluateQS: [],
|
|
||||||
untrustedKeydown: []
|
|
||||||
};
|
|
||||||
|
|
||||||
// Detection 1: querySelector from evaluate context
|
|
||||||
const origQS = document.querySelector.bind(document);
|
|
||||||
document.querySelector = function(sel) {
|
|
||||||
try { throw new Error(); } catch (e) {
|
|
||||||
if (e.stack.includes(':302:')) {
|
|
||||||
window.__detections.evaluateQS.push(sel);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return origQS(sel);
|
|
||||||
};
|
|
||||||
|
|
||||||
// Detection 2: untrusted keyboard events
|
|
||||||
document.addEventListener('keydown', (e) => {
|
|
||||||
if (!e.isTrusted) {
|
|
||||||
window.__detections.untrustedKeydown.push(e.key);
|
|
||||||
}
|
|
||||||
}, true);
|
|
||||||
}
|
|
||||||
""")
|
|
||||||
|
|
||||||
# === Trigger all three vectors from issue ===
|
|
||||||
|
|
||||||
# Vector 1: isInputElement — click triggers querySelector check
|
|
||||||
await page.click('#searchInput')
|
|
||||||
await asyncio.sleep(0.3)
|
|
||||||
|
|
||||||
# Vector 2+3: typeShiftSymbol — type text with shift symbols
|
|
||||||
await page.keyboard.type('Hello!@#$%^&*()')
|
|
||||||
await asyncio.sleep(0.5)
|
|
||||||
|
|
||||||
# === Verify: zero detections ===
|
|
||||||
detections = await page.evaluate('() => window.__detections')
|
|
||||||
|
|
||||||
qs_leaks = detections['evaluateQS']
|
|
||||||
untrusted = detections['untrustedKeydown']
|
|
||||||
|
|
||||||
print(f"\n{'='*60}")
|
|
||||||
print(f"Issue #110 Reproduction Results:")
|
|
||||||
print(f" querySelector from evaluate: {len(qs_leaks)} detections")
|
|
||||||
print(f" Untrusted keyboard events: {len(untrusted)} detections")
|
|
||||||
print(f"{'='*60}")
|
|
||||||
|
|
||||||
assert len(qs_leaks) == 0, (
|
|
||||||
f"LEAK: querySelector called from evaluate context: {qs_leaks}"
|
|
||||||
)
|
|
||||||
assert len(untrusted) == 0, (
|
|
||||||
f"LEAK: Untrusted keyboard events detected: {untrusted}"
|
|
||||||
)
|
|
||||||
|
|
||||||
await browser.close()
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_all_21_shift_symbols_trusted(self):
|
|
||||||
"""Every single shift symbol must produce isTrusted=true."""
|
|
||||||
from cloakbrowser import launch_async
|
|
||||||
|
|
||||||
browser = await launch_async(headless=True, humanize=True)
|
|
||||||
page = await browser.new_page()
|
|
||||||
|
|
||||||
await page.goto('https://www.wikipedia.org', wait_until='domcontentloaded')
|
|
||||||
await asyncio.sleep(1)
|
|
||||||
|
|
||||||
await page.evaluate("""
|
|
||||||
() => {
|
|
||||||
window.__keyResults = { trusted: [], untrusted: [] };
|
|
||||||
const input = document.querySelector('#searchInput');
|
|
||||||
input.addEventListener('keydown', (e) => {
|
|
||||||
const list = e.isTrusted ? 'trusted' : 'untrusted';
|
|
||||||
window.__keyResults[list].push(e.key);
|
|
||||||
}, true);
|
|
||||||
}
|
|
||||||
""")
|
|
||||||
|
|
||||||
await page.click('#searchInput')
|
|
||||||
await asyncio.sleep(0.3)
|
|
||||||
|
|
||||||
# Type ALL 21 shift symbols
|
|
||||||
all_shift = '!@#$%^&*()_+{}|:"<>?~'
|
|
||||||
await page.keyboard.type(all_shift)
|
|
||||||
await asyncio.sleep(1)
|
|
||||||
|
|
||||||
results = await page.evaluate('() => window.__keyResults')
|
|
||||||
|
|
||||||
print(f"\n{'='*60}")
|
|
||||||
print(f"All 21 Shift Symbols Test:")
|
|
||||||
print(f" Trusted: {results['trusted']}")
|
|
||||||
print(f" Untrusted: {results['untrusted']}")
|
|
||||||
print(f"{'='*60}")
|
|
||||||
|
|
||||||
# Every shift symbol must be trusted
|
|
||||||
for sym in all_shift:
|
|
||||||
assert sym in results['trusted'], f"'{sym}' NOT in trusted events"
|
|
||||||
assert sym not in results['untrusted'], f"'{sym}' IS in untrusted events"
|
|
||||||
|
|
||||||
await browser.close()
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_clear_uses_isolated_world(self):
|
|
||||||
"""clear() calls isSelectorFocused — must not leak evaluate."""
|
|
||||||
from cloakbrowser import launch_async
|
|
||||||
|
|
||||||
browser = await launch_async(headless=True, humanize=True)
|
|
||||||
page = await browser.new_page()
|
|
||||||
|
|
||||||
await page.goto('https://www.wikipedia.org', wait_until='domcontentloaded')
|
|
||||||
await asyncio.sleep(1)
|
|
||||||
|
|
||||||
await page.evaluate("""
|
|
||||||
() => {
|
|
||||||
window.__evalLeaks = [];
|
|
||||||
const origQS = document.querySelector.bind(document);
|
|
||||||
document.querySelector = function(sel) {
|
|
||||||
try { throw new Error(); } catch (e) {
|
|
||||||
if (e.stack.includes(':302:')) {
|
|
||||||
window.__evalLeaks.push(sel);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return origQS(sel);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
""")
|
|
||||||
|
|
||||||
# fill → click + type (isInputElement + isSelectorFocused)
|
|
||||||
await page.locator('#searchInput').fill('some text')
|
|
||||||
await asyncio.sleep(0.3)
|
|
||||||
|
|
||||||
# clear → isSelectorFocused check
|
|
||||||
await page.locator('#searchInput').clear()
|
|
||||||
await asyncio.sleep(0.3)
|
|
||||||
|
|
||||||
leaks = await page.evaluate('() => window.__evalLeaks')
|
|
||||||
assert len(leaks) == 0, f"clear() leaked via evaluate: {leaks}"
|
|
||||||
|
|
||||||
val = await page.locator('#searchInput').input_value()
|
|
||||||
assert val == '', f"clear() didn't clear: '{val}'"
|
|
||||||
|
|
||||||
await browser.close()
|
|
||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user