add url blocking function to driver #1195
Conversation
weiwei-lin
requested review from
brendankenny,
paulirish and
samuelli
and removed request for
brendankenny,
paulirish and
samuelli
weiwei-lin
force-pushed
the
request-blocking
branch
from
14873df
to
3fd4e9b
Compare
|
Just to clarify these blocked patterns will apply to ALL passes in the config, right? Given that, the blocking will stop when we disconnect from the protocol. So it appears we don't have to clean up with |
| @@ -701,6 +701,14 @@ class Driver { | |||
|
|
|||
| return collectUsage; | |||
| } | |||
|
|
|||
| blockUrlPatterns(urlPatterns) { | |||
| const promiseArr = []; | |||
There was a problem hiding this comment.
could simplify to
const promiseArr = urlPatterns.map(url => this.sendCommand('Network.addBlockedURL', {url}));
return Promise.all(promiseArr);There was a problem hiding this comment.
Thanks. Already changed.
| @@ -96,7 +96,8 @@ class GatherRunner { | |||
| .then(_ => driver.enableRuntimeEvents()) | |||
| .then(_ => driver.evaluateScriptOnLoad('window.__nativePromise = Promise;')) | |||
| .then(_ => driver.cleanAndDisableBrowserCaches()) | |||
| .then(_ => driver.clearDataForOrigin(options.url)); | |||
| .then(_ => driver.clearDataForOrigin(options.url)) | |||
| .then(_ => driver.blockUrlPatterns(options.flags.blockedUrlPatterns || [])); | |||
There was a problem hiding this comment.
I was mulling over if blockedUrlPatterns should live right on options rather than options.flags, but it'd probably require a line of plumbing in index.js that I don't love.
So yeah, I'm also fine with it hanging out on options.flags even if its not user-exposed.
There was a problem hiding this comment.
Yeah. As you mentioned, the main reason I did this is because I don't want to add an extra (and optional) parameter in lighthouse() and runLighthouse(), which looks ugly.
Yes. Actually, the blocking patterns are (mainly) to be used by perfX server when rerunning lighthouse. And we probably will use perf config or something similar when we rerun because we only care about the performance difference. So although it applies to all passes in one run, it won't affect passes defined by user (or default configs) since they are used in a separate run. |
|
boom. level 🆙 |
* add url blocking function to driver * update fake driver to match new driver * simplified Driver.blockUrlPatterns
Added request blocking method in Driver and it will be called during GatherRunner.setupDriver().
Blocked URLs will be passed in flags.blockedUrlPatterns. The flag is not exposed to users since copy-pasting a bunch of URLs seems inconvenient in cli. It will mainly been used by Perf-X server #1143.