From f5bb11d5276640f7881659290dd6797633b6e5bb Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Fri, 17 Jan 2020 16:13:35 -0800 Subject: [PATCH] fix(webkit): make interception work with cross-process navigation --- src/webkit/wkConnection.ts | 2 +- src/webkit/wkNetworkManager.ts | 26 +++++++++++++------------- src/webkit/wkProvisionalPage.ts | 2 +- test/interception.spec.js | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/webkit/wkConnection.ts b/src/webkit/wkConnection.ts index 329c2a5b05..0c0434f5e7 100644 --- a/src/webkit/wkConnection.ts +++ b/src/webkit/wkConnection.ts @@ -157,7 +157,7 @@ export class WKSession extends platform.EventEmitter { // Response might come after session has been disposed and rejected all callbacks. assert(this.isDisposed()); } else { - Promise.resolve().then(() => this.emit(object.method, object.params)); + Promise.resolve().then(() => this.emit(object.method, object.params, this)); } } } diff --git a/src/webkit/wkNetworkManager.ts b/src/webkit/wkNetworkManager.ts index 94b9bb65ea..ba60e1d123 100644 --- a/src/webkit/wkNetworkManager.ts +++ b/src/webkit/wkNetworkManager.ts @@ -77,13 +77,13 @@ export class WKNetworkManager { await this._session.send('Network.setInterceptionEnabled', { enabled, interceptRequests: enabled }); } - async _updateProtocolCacheDisabled() { + private async _updateProtocolCacheDisabled() { await this._session.send('Network.setResourceCachingDisabled', { disabled: this._userCacheDisabled }); } - _onRequestWillBeSent(event: Protocol.Network.requestWillBeSentPayload) { + private _onRequestWillBeSent(event: Protocol.Network.requestWillBeSentPayload, session: WKSession) { if (event.request.url.startsWith('data:')) return; let redirectChain: network.Request[] = []; @@ -99,28 +99,28 @@ export class WKNetworkManager { // TODO(einbinder) this will fail if we are an XHR document request const isNavigationRequest = event.type === 'Document'; const documentId = isNavigationRequest ? event.loaderId : undefined; - const request = new InterceptableRequest(this._session, !!this._page._state.interceptNetwork, frame, event, redirectChain, documentId); + const request = new InterceptableRequest(session, !!this._page._state.interceptNetwork, frame, event, redirectChain, documentId); this._requestIdToRequest.set(event.requestId, request); this._page._frameManager.requestStarted(request.request); } - _onRequestIntercepted(event: Protocol.Network.requestInterceptedPayload) { + private _onRequestIntercepted(event: Protocol.Network.requestInterceptedPayload) { const request = this._requestIdToRequest.get(event.requestId); if (request) request._interceptedCallback(); } - _createResponse(request: InterceptableRequest, responsePayload: Protocol.Network.Response): network.Response { + private static _createResponse(request: InterceptableRequest, responsePayload: Protocol.Network.Response): network.Response { const remoteAddress: network.RemoteAddress = { ip: '', port: 0 }; const getResponseBody = async () => { - const response = await this._session.send('Network.getResponseBody', { requestId: request._requestId }); + const response = await request._session.send('Network.getResponseBody', { requestId: request._requestId }); return platform.Buffer.from(response.body, response.base64Encoded ? 'base64' : 'utf8'); }; return new network.Response(request.request, responsePayload.status, responsePayload.statusText, headersObject(responsePayload.headers), remoteAddress, getResponseBody); } - _handleRequestRedirect(request: InterceptableRequest, responsePayload: Protocol.Network.Response) { - const response = this._createResponse(request, responsePayload); + private _handleRequestRedirect(request: InterceptableRequest, responsePayload: Protocol.Network.Response) { + const response = WKNetworkManager._createResponse(request, responsePayload); request.request._redirectChain.push(request.request); response._requestFinished(new Error('Response body is unavailable for redirect responses')); this._requestIdToRequest.delete(request._requestId); @@ -128,16 +128,16 @@ export class WKNetworkManager { this._page._frameManager.requestFinished(request.request); } - _onResponseReceived(event: Protocol.Network.responseReceivedPayload) { + private _onResponseReceived(event: Protocol.Network.responseReceivedPayload) { const request = this._requestIdToRequest.get(event.requestId); // FileUpload sends a response without a matching request. if (!request) return; - const response = this._createResponse(request, event.response); + const response = WKNetworkManager._createResponse(request, event.response); this._page._frameManager.requestReceivedResponse(response); } - _onLoadingFinished(event: Protocol.Network.loadingFinishedPayload) { + private _onLoadingFinished(event: Protocol.Network.loadingFinishedPayload) { const request = this._requestIdToRequest.get(event.requestId); // For certain requestIds we never receive requestWillBeSent event. // @see https://crbug.com/750469 @@ -153,7 +153,7 @@ export class WKNetworkManager { this._page._frameManager.requestFinished(request.request); } - _onLoadingFailed(event: Protocol.Network.loadingFailedPayload) { + private _onLoadingFailed(event: Protocol.Network.loadingFailedPayload) { const request = this._requestIdToRequest.get(event.requestId); // For certain requestIds we never receive requestWillBeSent event. // @see https://crbug.com/750469 @@ -194,7 +194,7 @@ const errorReasons: { [reason: string]: string } = { }; class InterceptableRequest implements network.RequestDelegate { - private _session: WKSession; + readonly _session: WKSession; readonly request: network.Request; _requestId: string; _documentId: string | undefined; diff --git a/src/webkit/wkProvisionalPage.ts b/src/webkit/wkProvisionalPage.ts index 6e89018e62..34c721870b 100644 --- a/src/webkit/wkProvisionalPage.ts +++ b/src/webkit/wkProvisionalPage.ts @@ -53,7 +53,7 @@ export class WKProvisionalPage { // Pretend that the events happened in the same process. if (payload.frameId) payload.frameId = this._wkPage._page._frameManager.mainFrame()._id; - this._wkPage._session.emit(eventName, payload); + this._wkPage._session.emit(eventName, payload, this._session); } private _handleFrameTree(frameTree: Protocol.Page.FrameResourceTree) { diff --git a/test/interception.spec.js b/test/interception.spec.js index 3a3c6f2e91..b9a759a7fa 100644 --- a/test/interception.spec.js +++ b/test/interception.spec.js @@ -386,7 +386,7 @@ module.exports.describe = function({testRunner, expect, defaultBrowserOptions, p await page.goto(server.EMPTY_PAGE); expect(error.message).toContain('Request Interception is not enabled'); }); - it.skip(WEBKIT)('should intercept main resource during cross-process navigation', async({page, server}) => { + it('should intercept main resource during cross-process navigation', async({page, server}) => { await page.goto(server.EMPTY_PAGE); await page.setRequestInterception(true); let intercepted = false; @@ -414,7 +414,7 @@ module.exports.describe = function({testRunner, expect, defaultBrowserOptions, p const notAnError = await request.continue().then(() => null).catch(e => e); expect(notAnError).toBe(null); }); - it.skip(WEBKIT)('should not throw when continued after cross-process navigation', async({page, server}) => { + it('should not throw when continued after cross-process navigation', async({page, server}) => { await page.setRequestInterception(true); page.on('request', request => { if (request.url() !== server.PREFIX + '/one-style.css')