thunderstrike/puppeteer
thunderstrike/puppeteer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: ensure dom binding is not called after detach (#8024)

Browse Source 
* fix: ensure dom binding is not called after detatch

Fixes #7814

* refactor: detach listeners instead

* refactor: safer approach

* fix: test in test/page.spec.ts

Co-authored-by: Alex Rudenko <OrKoN@users.noreply.github.com>
This commit is contained in:
Michael Mok 2022-02-17 16:52:51 +01:00 committed by GitHub
parent 0eb9c78617
commit 5c308b0704
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/DOMWorld.ts
View File

@ -111,9 +111,8 @@ export class DOMWorld {
this._frame = frame; this._frame = frame;
this._timeoutSettings = timeoutSettings; this._timeoutSettings = timeoutSettings;
this._setContext(null); this._setContext(null);
this._client.on('Runtime.bindingCalled', (event) => this._onBindingCalled = this._onBindingCalled.bind(this);
this._onBindingCalled(event) this._client.on('Runtime.bindingCalled', this._onBindingCalled);
);
} }
frame(): Frame { frame(): Frame {
@ -144,6 +143,7 @@ export class DOMWorld {
_detach(): void { _detach(): void {
this._detached = true; this._detached = true;
this._client.off('Runtime.bindingCalled', this._onBindingCalled);
for (const waitTask of this._waitTasks) for (const waitTask of this._waitTasks)
waitTask.terminate( waitTask.terminate(
new Error('waitForFunction failed: frame got detached.') new Error('waitForFunction failed: frame got detached.')

16
test/page.spec.ts
View File

@ -1035,6 +1035,22 @@ describe('Page', function () {
}); });
expect(result).toBe(15); expect(result).toBe(15);
}); });
it('should not throw when frames detach', async () => {
const { page, server } = getTestState();
await page.goto(server.EMPTY_PAGE);
await utils.attachFrame(page, 'frame1', server.EMPTY_PAGE);
await page.exposeFunction('compute', function (a, b) {
return Promise.resolve(a * b);
});
await utils.detachFrame(page, 'frame1');
await expect(
page.evaluate(async function () {
return await globalThis.compute(3, 5);
})
).resolves.toEqual(15);
});
it('should work with complex objects', async () => { it('should work with complex objects', async () => {
const { page } = getTestState(); const { page } = getTestState();