@browserless/goto 10.11.4 → 10.12.6

package/package.json

@@ -2,7 +2,7 @@
   "name": "@browserless/goto",
   "description": "Navigate to web pages with built-in ad blocking, device emulation, and optimized loading for faster automation.",
   "homepage": "https://browserless.js.org/#/?id=gotopage-options",
-  "version": "10.11.4",
+  "version": "10.12.6",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -31,18 +31,18 @@
   ],
   "dependencies": {
     "@browserless/devices": "^10.11.3",
-    "@duckduckgo/autoconsent": "~14.56.0",
+    "@duckduckgo/autoconsent": "~14.67.0",
     "@ghostery/adblocker-puppeteer": "~2.14.1",
-    "debug-logfmt": "~1.4.8",
+    "debug-logfmt": "~1.4.10",
     "got": "~11.8.6",
     "is-url-http": "~2.3.13",
     "p-reflect": "~2.1.0",
     "p-timeout": "~4.1.0",
     "shallow-equal": "~3.1.0",
-    "tough-cookie": "~6.0.0"
+    "tough-cookie": "~6.0.1"
   },
   "devDependencies": {
-    "@browserless/test": "^10.11.4",
+    "@browserless/test": "^10.12.6",
     "ava": "5",
     "p-wait-for": "3"
   },
@@ -66,5 +66,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "9ff2a0f0dad20d64a5c47a04a989ee77d1ee5ae8"
+  "gitHead": "5d4aaa106be3e196f5bfb1b52fc3d712ba9d512c"
 }

package/src/adblock.js

@@ -1,6 +1,8 @@
 'use strict'
 
 const { PuppeteerBlocker } = require('@ghostery/adblocker-puppeteer')
+const { randomUUID } = require('crypto')
+const pTimeout = require('p-timeout')
 const fs = require('fs/promises')
 const path = require('path')
 
@@ -53,6 +55,10 @@ const autoconsentConfig = Object.freeze({
   enablePrehide: true,
   /* apply CSS-only rules that hide popups lacking a reject button */
   enableCosmeticRules: true,
+  /* enable rules auto-generated from common CMP patterns */
+  enableGeneratedRules: true,
+  /* fall back to heuristic click when no specific rule matches */
+  enableHeuristicAction: true,
   /* skip bundled ABP/uBO cosmetic filter list (saves bundle size) */
   enableFilterList: false,
   /* how many times to retry CMP detection (~50 ms apart) */
@@ -80,29 +86,44 @@ const sendMessage = (page, message) =>
     }, message)
     .catch(() => {})
 
-const setupAutoConsent = async page => {
+const setupAutoConsent = async (page, timeout) => {
   if (page._autoconsentSetup) return
   const autoconsentPlaywrightScript = await getAutoconsentPlaywrightScript()
+  const nonce = randomUUID()
 
   await page.exposeFunction('autoconsentSendMessage', async message => {
     if (!message || typeof message !== 'object') return
+    if (message.__nonce !== nonce) return
 
     if (message.type === 'init') {
       return sendMessage(page, { type: 'initResp', config: autoconsentConfig })
     }
 
     if (message.type === 'eval') {
-      return sendMessage(page, { type: 'evalResp', id: message.id, result: false })
+      let result = false
+      try {
+        result = await pTimeout(page.evaluate(message.code), timeout)
+      } catch {}
+      return sendMessage(page, { type: 'evalResp', id: message.id, result })
     }
   })
 
+  /* Wrap the binding in the top frame so every outgoing message carries the
+     nonce.  Child frames (including cross-origin iframes) keep the raw CDP
+     binding which lacks the nonce, so their messages are silently rejected. */
+  await page.evaluateOnNewDocument(n => {
+    if (window.self !== window.top) return
+    const raw = window.autoconsentSendMessage
+    if (raw) window.autoconsentSendMessage = msg => raw({ ...msg, __nonce: n })
+  }, nonce)
+
   await page.evaluateOnNewDocument(autoconsentPlaywrightScript)
   page._autoconsentSetup = true
 }
 
 const runAutoConsent = async page => page.evaluate(await getAutoconsentPlaywrightScript())
 
-const enableBlockingInPage = (page, run, actionTimeout) => {
+const enableBlockingInPage = (page, run, timeout) => {
   page.disableAdblock = () =>
     getEngine()
       .then(engine => engine.disableBlockingInPage(page, { keepRequestInterception: true }))
@@ -111,13 +132,13 @@ const enableBlockingInPage = (page, run, actionTimeout) => {
 
   return [
     run({
-      fn: setupAutoConsent(page),
-      timeout: actionTimeout,
+      fn: setupAutoConsent(page, timeout),
+      timeout,
       debug: 'autoconsent:setup'
     }),
     run({
       fn: getEngine().then(engine => engine.enableBlockingInPage(page)),
-      timeout: actionTimeout,
+      timeout,
       debug: 'adblock'
     })
   ]