Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

core: remove protocol timeout for Page.navigate #6413

Merged
merged 11 commits into from
Nov 20, 2018
Merged

core: remove protocol timeout for Page.navigate #6413

Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d798047
core: increase Page.navigate timeout (#6412)
connorjclark Oct 27, 2018
9af14cc
disable timeout for Page.navigate
connorjclark Oct 29, 2018
273166c
add comment
connorjclark Oct 30, 2018
e0fa246
pr changes
connorjclark Oct 30, 2018
7dd175a
no ternary
connorjclark Oct 31, 2018
81c00a1
edit comment
connorjclark Oct 31, 2018
3c58396
innerSendCommand
connorjclark Nov 19, 2018
0383285
update comment
connorjclark Nov 19, 2018
175cc67
Merge branch 'master' into issue-6407-increase-page-navigate-timeout
connorjclark Nov 19, 2018
6f88aaf
add tests
connorjclark Nov 20, 2018
c08cb46
update test
connorjclark Nov 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions lighthouse-core/gather/driver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ class Driver {
}

/**
* timeout is used for the next call to 'sendCommand'.
* NOTE: This can eventually be replaced when TypeScript
* resolves https://github.com/Microsoft/TypeScript/issues/5453.
* @param {number} timeout
Expand All @@ -268,7 +269,7 @@ class Driver {
}

/**
* Call protocol methods.
* Call protocol methods, with a timeout.
* To configure the timeout for the next call, use 'setNextProtocolTimeout'.
* @template {keyof LH.CrdpCommands} C
* @param {C} method
Expand All @@ -278,30 +279,41 @@ class Driver {
sendCommand(method, ...params) {
const timeout = this._nextProtocolTimeout;
this._nextProtocolTimeout = DEFAULT_PROTOCOL_TIMEOUT;
const domainCommand = /^(\w+)\.(enable|disable)$/.exec(method);
if (domainCommand) {
const enable = domainCommand[2] === 'enable';
if (!this._shouldToggleDomain(domainCommand[1], enable)) {
return Promise.resolve();
}
}
return new Promise(async (resolve, reject) => {
const asyncTimeout = setTimeout((_ => {
const asyncTimeout = setTimeout((() => {
const err = new LHError(LHError.errors.PROTOCOL_TIMEOUT);
err.message += ` Method: ${method}`;
reject(err);
}), timeout);
try {
const result = await this._connection.sendCommand(method, ...params);
clearTimeout(asyncTimeout);
const result = await this.innerSendCommand(method, ...params);
resolve(result);
} catch (err) {
clearTimeout(asyncTimeout);
reject(err);
} finally {
clearTimeout(asyncTimeout);
}
});
}

/**
* Call protocol methods.
* @template {keyof LH.CrdpCommands} C
* @param {C} method
* @param {LH.CrdpCommands[C]['paramsType']} params
* @return {Promise<LH.CrdpCommands[C]['returnType']>}
*/
innerSendCommand(method, ...params) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add a leading _ and mark it with @private (someday tsc will support it) to make it super clear it's intended for internal use

const domainCommand = /^(\w+)\.(enable|disable)$/.exec(method);
if (domainCommand) {
const enable = domainCommand[2] === 'enable';
if (!this._shouldToggleDomain(domainCommand[1], enable)) {
return Promise.resolve();
}
}
return this._connection.sendCommand(method, ...params);
}

/**
* Returns whether a domain is currently enabled.
* @param {string} domain
Expand Down Expand Up @@ -882,8 +894,8 @@ class Driver {
// happen _after_ onload: https://crbug.com/768961
this.sendCommand('Page.enable');
this.sendCommand('Emulation.setScriptExecutionDisabled', {value: disableJS});
this.setNextProtocolTimeout(30 * 1000);
this.sendCommand('Page.navigate', {url});
// No timeout needed for Page.navigate. See #6413.
this.innerSendCommand('Page.navigate', {url});

if (waitForNavigated) {
await this._waitForFrameNavigated();
Expand Down