Skip to content

fix(goto): continue intercepting after adblock teardown #626

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
merged 1 commit into from
Sep 11, 2025
Merged

fix(goto): continue intercepting after adblock teardown #626

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 packages/browserless/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
const closePage = async (page, name) => {
if (page && !page.isClosed()) {
const duration = debug.duration('closePage')
if (page.disableAdblock) await page.disableAdblock()
if (page.disableAdblock) page.disableAdblock()
const [browserProcess, browserContext] = await Promise.all([
getBrowser(),
getBrowserContext(),
Expand Down
27 changes: 18 additions & 9 deletions packages/goto/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,10 @@ module.exports = ({ defaultDevice = 'Macbook Pro 13', timeout: globalTimeout, ..
)
}

// TODO: drop this when https://github.com/ghostery/adblocker/pull/5161 is merged
let isRequestInterceptionEnabled = false
page.isRequestInterceptionEnabled = () => isRequestInterceptionEnabled

const enableInterception =
(onPageRequest || abortTypes.length > 0) &&
run({
fn: page.setRequestInterception(true).then(() => (isRequestInterceptionEnabled = true)),
fn: page.setRequestInterception(true),
debug: 'enableInterception'
})

Expand Down Expand Up @@ -273,15 +269,28 @@ module.exports = ({ defaultDevice = 'Macbook Pro 13', timeout: globalTimeout, ..
}

if (adblock) {
page.disableAdblock = async () => {
await engine.disableBlockingInPage(page)
isRequestInterceptionEnabled = false
let adblockContext

page.disableAdblock = () => {
// TODO: drop this when https://github.com/ghostery/adblocker/pull/5161 is merged

engine.contexts.delete(page)

if (adblockContext.blocker.config.loadNetworkFilters) {
adblockContext.page.off('request', adblockContext.onRequest)
}

if (adblockContext.blocker.config.loadCosmeticFilters) {
adblockContext.page.off('frameattached', adblockContext.onFrameNavigated)
adblockContext.page.off('domcontentloaded', adblockContext.onDomContentLoaded)
}

debug.adblock('disabled')
}

prePromises.push(
run({
fn: engine.enableBlockingInPage(page),
fn: engine.enableBlockingInPage(page).then(context => (adblockContext = context)),
timeout: actionTimeout,
debug: 'adblock'
})
Expand Down