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

core(scripts): narrow to only listen to parsed events #14120

Merged
merged 1 commit into from
Jun 13, 2022
Merged

core(scripts): narrow to only listen to parsed events #14120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 7 additions & 21 deletions lighthouse-core/gather/gatherers/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,29 +65,15 @@ class Scripts extends FRGatherer {

constructor() {
super();
this.onProtocolMessage = this.onProtocolMessage.bind(this);
this.onScriptParsed = this.onScriptParsed.bind(this);
}

/**
* @param {LH.Protocol.RawEventMessage} event
* @param {LH.Crdp.Debugger.ScriptParsedEvent} params
*/
onProtocolMessage(event) {
// Go read the comments in network-recorder.js _findRealRequestAndSetSession.
let sessionId = event.sessionId;
if (this._mainSessionId === null) {
this._mainSessionId = sessionId;
}
if (this._mainSessionId === sessionId) {
sessionId = undefined;
}

// We want to ignore scripts from OOPIFs. In reality, this does more than block just OOPIFs,
// it also blocks scripts from the same origin but that happen to run in a different process,
// like a worker.
if (event.method === 'Debugger.scriptParsed' && !sessionId) {
if (!isLighthouseRuntimeEvaluateScript(event.params)) {
this._scriptParsedEvents.push(event.params);
}
onScriptParsed(params) {
if (!isLighthouseRuntimeEvaluateScript(params)) {
this._scriptParsedEvents.push(params);
}
}

Expand All @@ -96,7 +82,7 @@ class Scripts extends FRGatherer {
*/
async startInstrumentation(context) {
const session = context.driver.defaultSession;
session.addProtocolMessageListener(this.onProtocolMessage);
session.on('Debugger.scriptParsed', this.onScriptParsed);
await session.sendCommand('Debugger.enable');
}

Expand All @@ -107,7 +93,7 @@ class Scripts extends FRGatherer {
const session = context.driver.defaultSession;
const formFactor = context.baseArtifacts.HostFormFactor;

session.removeProtocolMessageListener(this.onProtocolMessage);
session.off('Debugger.scriptParsed', this.onScriptParsed);

// Without this line the Debugger domain will be off in FR runner,
// because only the legacy gatherer has special handling for multiple,
Expand Down