@browserless/goto 9.9.3 → 9.9.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -3
- package/src/index.js +9 -6
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@browserless/goto",
|
|
3
3
|
"description": "Go to a page aborting unnecessary requests",
|
|
4
4
|
"homepage": "https://browserless.js.org/#/?id=gotopage-options",
|
|
5
|
-
"version": "9.9.
|
|
5
|
+
"version": "9.9.4",
|
|
6
6
|
"main": "src/index.js",
|
|
7
7
|
"author": {
|
|
8
8
|
"email": "hello@microlink.io",
|
|
@@ -69,6 +69,5 @@
|
|
|
69
69
|
"serial": true,
|
|
70
70
|
"timeout": "30s",
|
|
71
71
|
"workerThreads": false
|
|
72
|
-
}
|
|
73
|
-
"gitHead": "37f98091cbd58ac697b1194c5f786a9eb252f82f"
|
|
72
|
+
}
|
|
74
73
|
}
|
package/src/index.js
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
'use strict'
|
|
2
2
|
|
|
3
|
-
const debugAdblock = require('debug-logfmt')('browserless:goto:adblock')
|
|
4
3
|
const { PuppeteerBlocker } = require('@cliqz/adblocker-puppeteer')
|
|
5
|
-
const debug = require('debug-logfmt')('browserless:goto')
|
|
6
4
|
const { shallowEqualObjects } = require('shallow-equal')
|
|
7
5
|
const createDevices = require('@browserless/devices')
|
|
8
6
|
const toughCookie = require('tough-cookie')
|
|
@@ -14,6 +12,11 @@ const isUrl = require('is-url-http')
|
|
|
14
12
|
const path = require('path')
|
|
15
13
|
const fs = require('fs')
|
|
16
14
|
|
|
15
|
+
const debug = require('debug-logfmt')('browserless:goto')
|
|
16
|
+
debug.continue = require('debug-logfmt')('browserless:goto:continue')
|
|
17
|
+
debug.abort = require('debug-logfmt')('browserless:goto:abort')
|
|
18
|
+
debug.adblock = require('debug-logfmt')('browserless:goto:adblock')
|
|
19
|
+
|
|
17
20
|
const truncate = (str, n = 80) => (str.length > n ? str.substr(0, n - 1) + '…' : str)
|
|
18
21
|
|
|
19
22
|
const EVASIONS = require('./evasions')
|
|
@@ -24,8 +27,8 @@ const engine = PuppeteerBlocker.deserialize(
|
|
|
24
27
|
new Uint8Array(fs.readFileSync(path.resolve(__dirname, './engine.bin')))
|
|
25
28
|
)
|
|
26
29
|
|
|
27
|
-
engine.on('request-blocked', ({ url }) =>
|
|
28
|
-
engine.on('request-redirected', ({ url }) =>
|
|
30
|
+
engine.on('request-blocked', ({ url }) => debug.adblock('block', url))
|
|
31
|
+
engine.on('request-redirected', ({ url }) => debug.adblock('redirect', url))
|
|
29
32
|
|
|
30
33
|
const isEmpty = val => val == null || !(Object.keys(val) || val).length
|
|
31
34
|
|
|
@@ -260,10 +263,10 @@ module.exports = ({
|
|
|
260
263
|
const url = truncate(req.url())
|
|
261
264
|
|
|
262
265
|
if (!abortTypes.includes(resourceType)) {
|
|
263
|
-
debug(
|
|
266
|
+
debug.continue({ url, resourceType })
|
|
264
267
|
return req.continue(req.continueRequestOverrides(), 0)
|
|
265
268
|
}
|
|
266
|
-
debug(
|
|
269
|
+
debug.abort({ url, resourceType })
|
|
267
270
|
return req.abort('blockedbyclient', 0)
|
|
268
271
|
})
|
|
269
272
|
})
|