Skip to content

[pull] master from apify:master #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jun 5, 2026
Merged

[pull] master from apify:master #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"apify-node-curl-impersonate": "^1.0.15",
"basic-auth-parser": "^0.0.2",
"body-parser": "^2.0.0",
"camoufox-js": "^0.10.0",
"camoufox-js": "^0.11.0",
"commitlint": "^21.0.0",
"cross-env": "^10.0.0",
"deep-equal": "^2.0.5",
Expand Down
10 changes: 8 additions & 2 deletions packages/playwright-crawler/src/internals/utils/playwright-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,9 @@ async function handleCloudflareChallenge(

options.isChallengeCallback ??= async () => {
return await page.evaluate(async () => {
return !!document.querySelector('.footer > .footer-inner > .diagnostic-wrapper > .ray-id');
// Cloudflare nests the ray ID under varying wrapper elements, so we match by descendants
// instead of a direct-child chain (e.g. a `.footer-wrapper` was inserted in between).
return !!document.querySelector('.footer .footer-inner .diagnostic-wrapper .ray-id');
});
};

Expand Down Expand Up @@ -782,7 +784,11 @@ async function handleCloudflareChallenge(

const bb = await page
.evaluate(() => {
const div = document.querySelector('.main-content div');
// Prefer the actual challenge widget (the box holding the Turnstile checkbox input);
// fall back to the first content div for older challenge layouts.
const div =
document.querySelector('.main-content div:has(input[id^="cf-chl-widget-"])') ??
document.querySelector('.main-content div');
return div?.getBoundingClientRect();
})
.catch(() => undefined);
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/camoufox-cloudflare/actor/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ await Actor.main(async () => {
async requestHandler({ page, parseWithCheerio }) {
const isBlocked = await page
.evaluate(async () => {
return !!document.querySelector('.footer > .footer-inner > .diagnostic-wrapper > .ray-id');
return !!document.querySelector('.footer .footer-inner .diagnostic-wrapper .ray-id');
})
.catch(() => false);
const $ = await parseWithCheerio();
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/camoufox-cloudflare/actor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"@crawlee/playwright": "file:./packages/playwright-crawler",
"@crawlee/types": "file:./packages/types",
"@crawlee/utils": "file:./packages/utils",
"camoufox-js": "^0.9.3",
"playwright": "1.58.2"
"camoufox-js": "^0.11.0",
"playwright": "1.60.0"
},
"overrides": {
"apify": {
Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,7 +1141,7 @@ __metadata:
apify-node-curl-impersonate: "npm:^1.0.15"
basic-auth-parser: "npm:^0.0.2"
body-parser: "npm:^2.0.0"
camoufox-js: "npm:^0.10.0"
camoufox-js: "npm:^0.11.0"
commitlint: "npm:^21.0.0"
cross-env: "npm:^10.0.0"
deep-equal: "npm:^2.0.5"
Expand Down Expand Up @@ -4401,14 +4401,14 @@ __metadata:
languageName: node
linkType: hard

"better-sqlite3@npm:^12.2.0":
version: 12.4.1
resolution: "better-sqlite3@npm:12.4.1"
"better-sqlite3@npm:^12.10.0":
version: 12.10.0
resolution: "better-sqlite3@npm:12.10.0"
dependencies:
bindings: "npm:^1.5.0"
node-gyp: "npm:latest"
prebuild-install: "npm:^7.1.1"
checksum: 10c0/88773a75d996b4171e5690a38459b05dc814a792701b224bd9909ee084dc0b4c64aaffbdbcf4bbbc6d4e247faf19e91b2a56cf4175d746d3bd9ff14764eb05aa
checksum: 10c0/b269792c1e456201b16fb9abd1e3fa9284d7710929f991899cebbb61e56dc3703673be29dadcb2f4a2d02961c49145f53d7d7b13b7b47298c033ec9de524f34f
languageName: node
linkType: hard

Expand Down Expand Up @@ -4764,12 +4764,12 @@ __metadata:
languageName: node
linkType: hard

"camoufox-js@npm:^0.10.0":
version: 0.10.2
resolution: "camoufox-js@npm:0.10.2"
"camoufox-js@npm:^0.11.0":
version: 0.11.0
resolution: "camoufox-js@npm:0.11.0"
dependencies:
adm-zip: "npm:^0.5.16"
better-sqlite3: "npm:^12.2.0"
better-sqlite3: "npm:^12.10.0"
cli-progress: "npm:^3.12.0"
commander: "npm:^14.0.0"
fingerprint-generator: "npm:^2.1.66"
Expand All @@ -4784,7 +4784,7 @@ __metadata:
playwright-core: "*"
bin:
camoufox-js: dist/__main__.js
checksum: 10c0/f04cd3b46f507649d7d2c882ad5f9e1a3a4420480d5a196b40d26ca635d2d2193764625fa6518baa17a2283445a689194aa2139c67825f1326604870859f7890
checksum: 10c0/ac17d937edd690133638568e34726fe5b60ce763d6252edf163e6326571de7263d6103facd5fb3a7ca6979d7339aad454c588eef945676e96a8083d06c884165
languageName: node
linkType: hard

Expand Down
Loading