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

fix(webkit): do not swallow init errors (#2242)

Browse source 
This is a speculative fix to the following issue from the bots:

NON-TEST ERROR #0: UNHANDLED ERROR
  TypeError: Cannot read property 'url' of undefined
      at WKPage._onTargetCreated (/Users/runner/runners/2.169.1/work/playwright/playwright/src/webkit/wkPage.ts:274:12)
      at process._tickCallback (internal/process/next_tick.js:68:7)

I assume that _initializeSession did swallow an error, so we erroneously
consider Page to be fully initialized (and having main frame).
This commit is contained in:
Dmitry Gozman 2020-05-14 15:43:23 -07:00 committed by GitHub
parent e8e761f77f
commit 63cc126805
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/webkit/wkPage.ts
View file

@ -119,9 +119,11 @@ export class WKPage implements PageDelegate {
// This method is called for provisional targets as well. The session passed as the parameter // This method is called for provisional targets as well. The session passed as the parameter
// may be different from the current session and may be destroyed without becoming current. // may be different from the current session and may be destroyed without becoming current.
async _initializeSession(session: WKSession, resourceTreeHandler: (r: Protocol.Page.getResourceTreeReturnValue) => void) { async _initializeSession(session: WKSession, provisional: boolean, resourceTreeHandler: (r: Protocol.Page.getResourceTreeReturnValue) => void) {
await this._initializeSessionMayThrow(session, resourceTreeHandler).catch(e => { await this._initializeSessionMayThrow(session, resourceTreeHandler).catch(e => {
if (session.isDisposed()) // Provisional session can be disposed at any time, for example due to new navigation initiating
// a new provisional page.
if (provisional && session.isDisposed())
return; return;
// Swallow initialization errors due to newer target swap in, // Swallow initialization errors due to newer target swap in,
// since we will reinitialize again. // since we will reinitialize again.
@ -263,7 +265,7 @@ export class WKPage implements PageDelegate {
this._setSession(session); this._setSession(session);
await Promise.all([ await Promise.all([
this._initializePageProxySession(), this._initializePageProxySession(),
this._initializeSession(session, ({frameTree}) => this._handleFrameTree(frameTree)), this._initializeSession(session, false, ({frameTree}) => this._handleFrameTree(frameTree)),
]); ]);
pageOrError = this._page; pageOrError = this._page;
} catch (e) { } catch (e) {

2
src/webkit/wkProvisionalPage.ts
View file

@ -48,7 +48,7 @@ export class WKProvisionalPage {
helper.addEventListener(session, 'Network.loadingFailed', overrideFrameId(e => wkPage._onLoadingFailed(e))), helper.addEventListener(session, 'Network.loadingFailed', overrideFrameId(e => wkPage._onLoadingFailed(e))),
]; ];
this.initializationPromise = this._wkPage._initializeSession(session, ({frameTree}) => this._handleFrameTree(frameTree)); this.initializationPromise = this._wkPage._initializeSession(session, true, ({frameTree}) => this._handleFrameTree(frameTree));
} }
dispose() { dispose() {