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

fix(webkit): make interception work with cross-process navigation (#529)

Browse source
This commit is contained in:
Yury Semikhatsky 2020-01-17 16:48:50 -08:00 committed by Dmitry Gozman
parent 2520dedb41
commit f76db837c9
4 changed files with 34 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/webkit/wkNetworkManager.ts
View file

@ -46,11 +46,11 @@ export class WKNetworkManager {
helper.removeEventListeners(this._sessionListeners); helper.removeEventListeners(this._sessionListeners);
this._session = session; this._session = session;
this._sessionListeners = [ this._sessionListeners = [
helper.addEventListener(this._session, 'Network.requestWillBeSent', this._onRequestWillBeSent.bind(this)), helper.addEventListener(session, 'Network.requestWillBeSent', e => this._onRequestWillBeSent(session, e)),
helper.addEventListener(this._session, 'Network.requestIntercepted', this._onRequestIntercepted.bind(this)), helper.addEventListener(session, 'Network.requestIntercepted', e => this._onRequestIntercepted(e)),
helper.addEventListener(this._session, 'Network.responseReceived', this._onResponseReceived.bind(this)), helper.addEventListener(session, 'Network.responseReceived', e => this._onResponseReceived(e)),
helper.addEventListener(this._session, 'Network.loadingFinished', this._onLoadingFinished.bind(this)), helper.addEventListener(session, 'Network.loadingFinished', e => this._onLoadingFinished(e)),
helper.addEventListener(this._session, 'Network.loadingFailed', this._onLoadingFailed.bind(this)), helper.addEventListener(session, 'Network.loadingFailed', e => this._onLoadingFailed(e)),
]; ];
} }
@ -77,13 +77,13 @@ export class WKNetworkManager {
await this._session.send('Network.setInterceptionEnabled', { enabled, interceptRequests: enabled }); await this._session.send('Network.setInterceptionEnabled', { enabled, interceptRequests: enabled });
} }
async _updateProtocolCacheDisabled() { private async _updateProtocolCacheDisabled() {
await this._session.send('Network.setResourceCachingDisabled', { await this._session.send('Network.setResourceCachingDisabled', {
disabled: this._userCacheDisabled disabled: this._userCacheDisabled
}); });
} }
_onRequestWillBeSent(event: Protocol.Network.requestWillBeSentPayload) { _onRequestWillBeSent(session: WKSession, event: Protocol.Network.requestWillBeSentPayload) {
if (event.request.url.startsWith('data:')) if (event.request.url.startsWith('data:'))
return; return;
let redirectChain: network.Request[] = []; let redirectChain: network.Request[] = [];
@ -99,7 +99,7 @@ export class WKNetworkManager {
// TODO(einbinder) this will fail if we are an XHR document request // TODO(einbinder) this will fail if we are an XHR document request
const isNavigationRequest = event.type === 'Document'; const isNavigationRequest = event.type === 'Document';
const documentId = isNavigationRequest ? event.loaderId : undefined; 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._requestIdToRequest.set(event.requestId, request);
this._page._frameManager.requestStarted(request.request); this._page._frameManager.requestStarted(request.request);
} }
@ -110,17 +110,17 @@ export class WKNetworkManager {
request._interceptedCallback(); 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 remoteAddress: network.RemoteAddress = { ip: '', port: 0 };
const getResponseBody = async () => { 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 platform.Buffer.from(response.body, response.base64Encoded ? 'base64' : 'utf8');
}; };
return new network.Response(request.request, responsePayload.status, responsePayload.statusText, headersObject(responsePayload.headers), remoteAddress, getResponseBody); return new network.Response(request.request, responsePayload.status, responsePayload.statusText, headersObject(responsePayload.headers), remoteAddress, getResponseBody);
} }
_handleRequestRedirect(request: InterceptableRequest, responsePayload: Protocol.Network.Response) { private _handleRequestRedirect(request: InterceptableRequest, responsePayload: Protocol.Network.Response) {
const response = this._createResponse(request, responsePayload); const response = WKNetworkManager._createResponse(request, responsePayload);
request.request._redirectChain.push(request.request); request.request._redirectChain.push(request.request);
response._requestFinished(new Error('Response body is unavailable for redirect responses')); response._requestFinished(new Error('Response body is unavailable for redirect responses'));
this._requestIdToRequest.delete(request._requestId); this._requestIdToRequest.delete(request._requestId);
@ -133,7 +133,7 @@ export class WKNetworkManager {
// FileUpload sends a response without a matching request. // FileUpload sends a response without a matching request.
if (!request) if (!request)
return; return;
const response = this._createResponse(request, event.response); const response = WKNetworkManager._createResponse(request, event.response);
this._page._frameManager.requestReceivedResponse(response); this._page._frameManager.requestReceivedResponse(response);
} }
@ -194,7 +194,7 @@ const errorReasons: { [reason: string]: string } = {
}; };
class InterceptableRequest implements network.RequestDelegate { class InterceptableRequest implements network.RequestDelegate {
private _session: WKSession; readonly _session: WKSession;
readonly request: network.Request; readonly request: network.Request;
_requestId: string; _requestId: string;
_documentId: string | undefined; _documentId: string | undefined;

2
src/webkit/wkPage.ts
View file

@ -43,7 +43,7 @@ export class WKPage implements PageDelegate {
_session: WKSession; _session: WKSession;
readonly _page: Page; readonly _page: Page;
private readonly _pageProxySession: WKSession; private readonly _pageProxySession: WKSession;
private readonly _networkManager: WKNetworkManager; readonly _networkManager: WKNetworkManager;
private readonly _workers: WKWorkers; private readonly _workers: WKWorkers;
private readonly _contextIdToContext: Map<number, dom.FrameExecutionContext>; private readonly _contextIdToContext: Map<number, dom.FrameExecutionContext>;
private _sessionListeners: RegisteredListener[] = []; private _sessionListeners: RegisteredListener[] = [];

30
src/webkit/wkProvisionalPage.ts
View file

@ -29,13 +29,24 @@ export class WKProvisionalPage {
this._session = session; this._session = session;
this._wkPage = page; this._wkPage = page;
const overrideFrameId = (handler: (p: any) => void) => {
return (payload: any) => {
// Pretend that the events happened in the same process.
if (payload.frameId)
payload.frameId = this._wkPage._page._frameManager.mainFrame()._id;
handler(payload);
};
};
const networkManager = this._wkPage._networkManager;
this._sessionListeners = [ this._sessionListeners = [
'Network.requestWillBeSent', helper.addEventListener(session, 'Network.requestWillBeSent', overrideFrameId(e => networkManager._onRequestWillBeSent(session, e))),
'Network.requestIntercepted', helper.addEventListener(session, 'Network.requestIntercepted', overrideFrameId(e => networkManager._onRequestIntercepted(e))),
'Network.responseReceived', helper.addEventListener(session, 'Network.responseReceived', overrideFrameId(e => networkManager._onResponseReceived(e))),
'Network.loadingFinished', helper.addEventListener(session, 'Network.loadingFinished', overrideFrameId(e => networkManager._onLoadingFinished(e))),
'Network.loadingFailed', helper.addEventListener(session, 'Network.loadingFailed', overrideFrameId(e => networkManager._onLoadingFailed(e))),
].map(name => helper.addEventListener(this._session, name, args => this._onNetworkEvent(name, args))); ];
this._wkPage._initializeSession(session, ({frameTree}) => this._handleFrameTree(frameTree)); this._wkPage._initializeSession(session, ({frameTree}) => this._handleFrameTree(frameTree));
} }
@ -49,13 +60,6 @@ export class WKProvisionalPage {
this._wkPage._onFrameAttached(this._mainFrameId!, null); this._wkPage._onFrameAttached(this._mainFrameId!, null);
} }
private _onNetworkEvent(eventName: string, payload: any) {
// 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);
}
private _handleFrameTree(frameTree: Protocol.Page.FrameResourceTree) { private _handleFrameTree(frameTree: Protocol.Page.FrameResourceTree) {
assert(!frameTree.frame.parentId); assert(!frameTree.frame.parentId);
this._mainFrameId = frameTree.frame.id; this._mainFrameId = frameTree.frame.id;

4
test/interception.spec.js
View file

@ -386,7 +386,7 @@ module.exports.describe = function({testRunner, expect, defaultBrowserOptions, p
await page.goto(server.EMPTY_PAGE); await page.goto(server.EMPTY_PAGE);
expect(error.message).toContain('Request Interception is not enabled'); 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.goto(server.EMPTY_PAGE);
await page.setRequestInterception(true); await page.setRequestInterception(true);
let intercepted = false; 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); const notAnError = await request.continue().then(() => null).catch(e => e);
expect(notAnError).toBe(null); 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); await page.setRequestInterception(true);
page.on('request', request => { page.on('request', request => {
if (request.url() !== server.PREFIX + '/one-style.css') if (request.url() !== server.PREFIX + '/one-style.css')