github/puppeteer
0
0
Fork 0
mirror of https://github.com/puppeteer/puppeteer synced 2024-06-14 14:02:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement Request.resourceType getter (#590)

Browse Source 
This patch plumbs `resourceType` parameter of RequestWillBeSent
and requestIntercepted methods.
This commit is contained in:
Andrey Lushnikov
2017-08-29 16:27:59 -07:00
committed by GitHub
parent 8f74cc8a90
commit 11ce8b249f
4 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/NetworkManager.js
View File

@@ -91,7 +91,7 @@ class NetworkManager extends EventEmitter {
const request = this._interceptionIdToRequest.get(event.interceptionId);
console.assert(request, 'INTERNAL ERROR: failed to find request for interception redirect.');
this._handleRequestRedirect(request, event.redirectStatusCode, event.redirectHeaders);
this._handleRequestStart(request._requestId, event.interceptionId, event.redirectUrl, event.request);
this._handleRequestStart(request._requestId, event.interceptionId, event.redirectUrl, event.resourceType, event.request);
return;
}
const requestHash = generateRequestHash(event.request);
@@ -117,10 +117,11 @@ class NetworkManager extends EventEmitter {
* @param {string} requestId
* @param {string} interceptionId
* @param {string} url
* @param {string} resourceType
* @param {!Object} requestPayload
*/
_handleRequestStart(requestId, interceptionId, url, requestPayload) {
const request = new Request(this._client, requestId, interceptionId, url, requestPayload);
_handleRequestStart(requestId, interceptionId, url, resourceType, requestPayload) {
const request = new Request(this._client, requestId, interceptionId, url, resourceType, requestPayload);
this._requestIdToRequest.set(requestId, request);
this._interceptionIdToRequest.set(interceptionId, request);
this.emit(NetworkManager.Events.Request, request);
@@ -143,7 +144,7 @@ class NetworkManager extends EventEmitter {
const request = this._requestIdToRequest.get(event.requestId);
this._handleRequestRedirect(request, event.redirectResponse.status, event.redirectResponse.headers);
}
this._handleRequestStart(event.requestId, null, event.request.url, event.request);
this._handleRequestStart(event.requestId, null, event.request.url, event.type, event.request);
}
/**
@@ -157,7 +158,7 @@ class NetworkManager extends EventEmitter {
return;
this._requestHashToRequestIds.delete(requestHash, requestId);
this._requestHashToInterceptions.delete(requestHash, interception);
this._handleRequestStart(requestId, interception.interceptionId, interception.request.url, interception.request);
this._handleRequestStart(requestId, interception.interceptionId, interception.request.url, interception.resourceType, interception.request);
}
/**
@@ -210,9 +211,10 @@ class Request {
* @param {string} requestId
* @param {string} interceptionId
* @param {string} url
* @param {string} resourceType
* @param {!Object} payload
*/
constructor(client, requestId, interceptionId, url, payload) {
constructor(client, requestId, interceptionId, url, resourceType, payload) {
this._client = client;
this._requestId = requestId;
this._interceptionId = interceptionId;
@@ -223,6 +225,7 @@ class Request {
});
this.url = url;
this.resourceType = resourceType;
this.method = payload.method;
this.postData = payload.postData;
this.headers = {};