@browserless/goto 10.9.2 → 10.9.7

package/package.json

@@ -2,7 +2,7 @@
   "name": "@browserless/goto",
   "description": "Go to a page aborting unnecessary requests",
   "homepage": "https://browserless.js.org/#/?id=gotopage-options",
-  "version": "10.9.2",
+  "version": "10.9.7",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -30,17 +30,17 @@
   ],
   "dependencies": {
     "@browserless/devices": "^10.7.13",
-    "@ghostery/adblocker-puppeteer": "~2.11.3",
-    "debug-logfmt": "~1.4.0",
+    "@ghostery/adblocker-puppeteer": "~2.12.3",
+    "debug-logfmt": "~1.4.5",
     "got": "~11.8.6",
-    "is-url-http": "~2.3.10",
+    "is-url-http": "~2.3.11",
     "p-reflect": "~2.1.0",
     "p-timeout": "~4.1.0",
     "shallow-equal": "~3.1.0",
     "tough-cookie": "~6.0.0"
   },
   "devDependencies": {
-    "@browserless/test": "^10.9.0",
+    "@browserless/test": "^10.9.7",
     "ava": "5",
     "p-wait-for": "3"
   },
@@ -64,5 +64,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "c693f31fb428b362ad32e3db53356e7d9c9ebbb6"
+  "gitHead": "1134ac8b6f7a110e4020042f1b8054af845bdb00"
 }

package/src/index.js

@@ -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'
       })
 
@@ -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'
         })