@browserless/goto 9.8.4 → 9.9.4

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": "9.8.4",
+  "version": "9.9.4",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -29,23 +29,23 @@
     "puppeteer"
   ],
   "dependencies": {
-    "@browserless/devices": "^9.7.2",
-    "@cliqz/adblocker-puppeteer": "~1.25.2",
+    "@browserless/devices": "^9.9.3",
+    "@cliqz/adblocker-puppeteer": "~1.26.1",
     "debug-logfmt": "~1.0.4",
     "got": "~11.8.6",
     "is-url-http": "~2.3.5",
     "p-reflect": "~2.1.0",
     "p-timeout": "~4.1.0",
     "pretty-ms": "~7.0.1",
-    "shallow-equal": "~3.0.0",
+    "shallow-equal": "~3.1.0",
     "time-span": "~4.0.0",
     "top-user-agents": "~1.0.50",
     "tough-cookie": "~4.1.2",
     "unique-random-array": "~2.0.0"
   },
   "devDependencies": {
-    "@browserless/test": "^9.7.2",
-    "ava": "3",
+    "@browserless/test": "^9.9.3",
+    "ava": "latest",
     "browserless": "latest",
     "fpscanner": "latest",
     "p-wait-for": "3"
@@ -68,7 +68,6 @@
     ],
     "serial": true,
     "timeout": "30s",
-    "verbose": true
-  },
-  "gitHead": "cd2a76f7ffaa3fbe676796b8777debe9a65d1961"
+    "workerThreads": false
+  }
 }

package/src/index.js

@@ -1,8 +1,6 @@
 'use strict'
 
-const debugAdblock = require('debug-logfmt')('browserless:goto:adblock')
 const { PuppeteerBlocker } = require('@cliqz/adblocker-puppeteer')
-const debug = require('debug-logfmt')('browserless:goto')
 const { shallowEqualObjects } = require('shallow-equal')
 const createDevices = require('@browserless/devices')
 const toughCookie = require('tough-cookie')
@@ -14,6 +12,11 @@ const isUrl = require('is-url-http')
 const path = require('path')
 const fs = require('fs')
 
+const debug = require('debug-logfmt')('browserless:goto')
+debug.continue = require('debug-logfmt')('browserless:goto:continue')
+debug.abort = require('debug-logfmt')('browserless:goto:abort')
+debug.adblock = require('debug-logfmt')('browserless:goto:adblock')
+
 const truncate = (str, n = 80) => (str.length > n ? str.substr(0, n - 1) + '…' : str)
 
 const EVASIONS = require('./evasions')
@@ -24,8 +27,8 @@ const engine = PuppeteerBlocker.deserialize(
   new Uint8Array(fs.readFileSync(path.resolve(__dirname, './engine.bin')))
 )
 
-engine.on('request-blocked', ({ url }) => debugAdblock('block', url))
-engine.on('request-redirected', ({ url }) => debugAdblock('redirect', url))
+engine.on('request-blocked', ({ url }) => debug.adblock('block', url))
+engine.on('request-redirected', ({ url }) => debug.adblock('redirect', url))
 
 const isEmpty = val => val == null || !(Object.keys(val) || val).length
 
@@ -260,10 +263,10 @@ module.exports = ({
           const url = truncate(req.url())
 
           if (!abortTypes.includes(resourceType)) {
-            debug('continue', { url, resourceType })
+            debug.continue({ url, resourceType })
             return req.continue(req.continueRequestOverrides(), 0)
           }
-          debug('abort', { url, resourceType })
+          debug.abort({ url, resourceType })
           return req.abort('blockedbyclient', 0)
         })
       })