yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

browser(firefox): rewrite network instrumentation (#2638)

Browse Source 
This change introduces NetworkRequest object that encapsulates
internal redirects as they happen in netwerk/ stack.

NetworkRequest now serves as both ResponseBodyListener and NotificationCallbacks.
This commit is contained in:
Dmitry Gozman 2020-06-20 20:45:01 -07:00 committed by GitHub
parent eac7dab8b7
commit 2fa32f7e9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 481 additions and 511 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser_patches/firefox/BUILD_NUMBER
View File

@ -1 +1 @@
1113 1114

980
browser_patches/firefox/juggler/NetworkObserver.js
View File

File diff suppressed because it is too large Load Diff

10
browser_patches/firefox/juggler/protocol/NetworkHandler.js
View File

@ -114,13 +114,13 @@ class NetworkHandler {
this._httpActivity.delete(activity._id); this._httpActivity.delete(activity._id);
} }
async _onRequest(httpChannel, eventDetails) { async _onRequest(eventDetails, channelId) {
let pendingRequestCallback; let pendingRequestCallback;
let pendingRequestPromise = new Promise(x => pendingRequestCallback = x); let pendingRequestPromise = new Promise(x => pendingRequestCallback = x);
this._pendingRequstWillBeSentEvents.add(pendingRequestPromise); this._pendingRequstWillBeSentEvents.add(pendingRequestPromise);
let details = null; let details = null;
try { try {
details = await this._contentPage.send('requestDetails', {channelId: httpChannel.channelId}); details = await this._contentPage.send('requestDetails', {channelId});
} catch (e) { } catch (e) {
pendingRequestCallback(); pendingRequestCallback();
this._pendingRequstWillBeSentEvents.delete(pendingRequestPromise); this._pendingRequstWillBeSentEvents.delete(pendingRequestPromise);
@ -139,19 +139,19 @@ class NetworkHandler {
this._pendingRequstWillBeSentEvents.delete(pendingRequestPromise); this._pendingRequstWillBeSentEvents.delete(pendingRequestPromise);
} }
async _onResponse(httpChannel, eventDetails) { async _onResponse(eventDetails) {
const activity = this._ensureHTTPActivity(eventDetails.requestId); const activity = this._ensureHTTPActivity(eventDetails.requestId);
activity.response = eventDetails; activity.response = eventDetails;
this._reportHTTPAcitivityEvents(activity); this._reportHTTPAcitivityEvents(activity);
} }
async _onRequestFinished(httpChannel, eventDetails) { async _onRequestFinished(eventDetails) {
const activity = this._ensureHTTPActivity(eventDetails.requestId); const activity = this._ensureHTTPActivity(eventDetails.requestId);
activity.complete = eventDetails; activity.complete = eventDetails;
this._reportHTTPAcitivityEvents(activity); this._reportHTTPAcitivityEvents(activity);
} }
async _onRequestFailed(httpChannel, eventDetails) { async _onRequestFailed(eventDetails) {
const activity = this._ensureHTTPActivity(eventDetails.requestId); const activity = this._ensureHTTPActivity(eventDetails.requestId);
activity.failed = eventDetails; activity.failed = eventDetails;
this._reportHTTPAcitivityEvents(activity); this._reportHTTPAcitivityEvents(activity);