Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(chromium): pause workers on start to not miss any events (#832)

Browse source
This commit is contained in:
Dmitry Gozman 2020-02-04 19:36:46 -08:00 committed by GitHub
parent 4b761f4485
commit 8f1df5e1e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/chromium/crPage.ts
View file

@ -98,6 +98,7 @@ export class CRPage implements PageDelegate {
this._client.send('Page.setLifecycleEventsEnabled', { enabled: true }), this._client.send('Page.setLifecycleEventsEnabled', { enabled: true }),
this._client.send('Runtime.enable', {}).then(() => this._ensureIsolatedWorld(UTILITY_WORLD_NAME)), this._client.send('Runtime.enable', {}).then(() => this._ensureIsolatedWorld(UTILITY_WORLD_NAME)),
this._networkManager.initialize(), this._networkManager.initialize(),
this._client.send('Target.setAutoAttach', { autoAttach: true, waitForDebuggerOnStart: true, flatten: true }),
]; ];
const options = this._page.browserContext()._options; const options = this._page.browserContext()._options;
if (options.bypassCSP) if (options.bypassCSP)
@ -215,10 +216,14 @@ export class CRPage implements PageDelegate {
} }
_onAttachedToTarget(event: Protocol.Target.attachedToTargetPayload) { _onAttachedToTarget(event: Protocol.Target.attachedToTargetPayload) {
if (event.targetInfo.type !== 'worker')
return;
const url = event.targetInfo.url;
const session = CRConnection.fromSession(this._client).session(event.sessionId)!; const session = CRConnection.fromSession(this._client).session(event.sessionId)!;
if (event.targetInfo.type !== 'worker') {
// Ideally, detaching should resume any target, but there is bug in the backend.
session.send('Runtime.runIfWaitingForDebugger').catch(debugError);
this._client.send('Target.detachFromTarget', { sessionId: event.sessionId }).catch(debugError);
return;
}
const url = event.targetInfo.url;
const worker = new Worker(url); const worker = new Worker(url);
this._page._addWorker(event.sessionId, worker); this._page._addWorker(event.sessionId, worker);
session.once('Runtime.executionContextCreated', async event => { session.once('Runtime.executionContextCreated', async event => {
@ -227,6 +232,7 @@ export class CRPage implements PageDelegate {
Promise.all([ Promise.all([
session.send('Runtime.enable'), session.send('Runtime.enable'),
session.send('Network.enable'), session.send('Network.enable'),
session.send('Runtime.runIfWaitingForDebugger'),
]).catch(debugError); // This might fail if the target is closed before we initialize. ]).catch(debugError); // This might fail if the target is closed before we initialize.
session.on('Runtime.consoleAPICalled', event => { session.on('Runtime.consoleAPICalled', event => {
const args = event.args.map(o => worker._existingExecutionContext!._createHandle(o)); const args = event.args.map(o => worker._existingExecutionContext!._createHandle(o));

7
src/chromium/crTarget.ts
View file

@ -84,14 +84,7 @@ export class CRTarget {
const page = this._crPage.page(); const page = this._crPage.page();
(page as any)[targetSymbol] = this; (page as any)[targetSymbol] = this;
client.once(CRSessionEvents.Disconnected, () => page._didDisconnect()); client.once(CRSessionEvents.Disconnected, () => page._didDisconnect());
client.on('Target.attachedToTarget', event => {
if (event.targetInfo.type !== 'worker') {
// If we don't detach from service workers, they will never die.
client.send('Target.detachFromTarget', { sessionId: event.sessionId }).catch(debugError);
}
});
await this._crPage.initialize(); await this._crPage.initialize();
await client.send('Target.setAutoAttach', {autoAttach: true, waitForDebuggerOnStart: false, flatten: true});
return page; return page;
}); });
} }

2
test/workers.spec.js
View file

@ -113,7 +113,7 @@ module.exports.describe = function({testRunner, expect, FFOX, CHROMIUM, WEBKIT})
expect(response.request()).toBe(request); expect(response.request()).toBe(request);
expect(response.ok()).toBe(true); expect(response.ok()).toBe(true);
}); });
it.skip(CHROMIUM)('should report network activity on worker creation', async function({page, server}) { it('should report network activity on worker creation', async function({page, server}) {
// Chromium needs waitForDebugger enabled for this one. // Chromium needs waitForDebugger enabled for this one.
await page.goto(server.EMPTY_PAGE); await page.goto(server.EMPTY_PAGE);
const url = server.PREFIX + '/one-style.css'; const url = server.PREFIX + '/one-style.css';