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

chore: simplify responseExtraInfo handling (#8560)

Browse source
This commit is contained in:
Dmitry Gozman 2021-08-30 12:57:44 -07:00 committed by GitHub
parent 4c1b47a00c
commit e3cc5b3e3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/server/chromium/crNetworkManager.ts
View file

@ -566,7 +566,6 @@ const errorReasons: { [reason: string]: Protocol.Network.ErrorReason } = {
type RequestInfo = { type RequestInfo = {
requestId: string, requestId: string,
responseReceived: (Protocol.Network.Response | undefined)[],
responseReceivedExtraInfo: Protocol.Network.responseReceivedExtraInfoPayload[], responseReceivedExtraInfo: Protocol.Network.responseReceivedExtraInfoPayload[],
responses: network.Response[], responses: network.Response[],
loadingFinished?: Protocol.Network.loadingFinishedPayload, loadingFinished?: Protocol.Network.loadingFinishedPayload,
@ -591,9 +590,6 @@ type RequestInfo = {
class ResponseExtraInfoTracker { class ResponseExtraInfoTracker {
private _requests = new Map<string, RequestInfo>(); private _requests = new Map<string, RequestInfo>();
constructor() {
}
requestWillBeSent(event: Protocol.Network.requestWillBeSentPayload) { requestWillBeSent(event: Protocol.Network.requestWillBeSentPayload) {
const info = this._requests.get(event.requestId); const info = this._requests.get(event.requestId);
if (info) { if (info) {
@ -602,7 +598,6 @@ class ResponseExtraInfoTracker {
} else { } else {
this._requests.set(event.requestId, { this._requests.set(event.requestId, {
requestId: event.requestId, requestId: event.requestId,
responseReceived: [],
responseReceivedExtraInfo: [], responseReceivedExtraInfo: [],
responses: [], responses: [],
sawResponseWithoutConnectionId: false sawResponseWithoutConnectionId: false
@ -618,7 +613,6 @@ class ResponseExtraInfoTracker {
} }
private _innerResponseReceived(info: RequestInfo, response: Protocol.Network.Response | undefined) { private _innerResponseReceived(info: RequestInfo, response: Protocol.Network.Response | undefined) {
info.responseReceived.push(response);
if (!response?.connectionId) { if (!response?.connectionId) {
// Starting with this response we no longer can guarantee that response and extra info correspond to the same index. // Starting with this response we no longer can guarantee that response and extra info correspond to the same index.
info.sawResponseWithoutConnectionId = true; info.sawResponseWithoutConnectionId = true;
@ -677,16 +671,9 @@ class ResponseExtraInfoTracker {
if (!info.loadingFinished && !info.loadingFailed) if (!info.loadingFinished && !info.loadingFailed)
return; return;
// Loading finished, check that we have all ExtraInfo events in place.
if (!info.responseReceived.length) {
// loading finished without responses, finish it immediately.
this._stopTracking(info.requestId);
return;
}
// We could have more extra infos because we stopped collecting responses at some point.
if (info.responses.length <= info.responseReceivedExtraInfo.length) { if (info.responses.length <= info.responseReceivedExtraInfo.length) {
// We have extra info for each response. // We have extra info for each response.
// We could have more extra infos because we stopped collecting responses at some point.
this._stopTracking(info.requestId); this._stopTracking(info.requestId);
return; return;
} }