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

Never sent 'requestfinished' event without passing actual request

Browse Source 
It turns out we're not receiving 'Network.requestWillBeSent' event
for every requestId.

This patch makes sure we don't dispatch `requestfinished` and
`requestfailed` events without passing actual request.

References #168
This commit is contained in:
Andrey Lushnikov 2017-07-29 18:16:15 -07:00
parent 8e8517026f
commit 67f4264162
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/NetworkManager.js
View File

@ -114,6 +114,10 @@ class NetworkManager extends EventEmitter {
*/ */
_onLoadingFinished(event) { _onLoadingFinished(event) {
let request = this._idToRequest.get(event.requestId); let request = this._idToRequest.get(event.requestId);
// For certain requestIds we never receive requestWillBeSent event.
// @see https://github.com/GoogleChrome/puppeteer/issues/168
if (!request)
return;
this._idToRequest.delete(event.requestId); this._idToRequest.delete(event.requestId);
this.emit(NetworkManager.Events.RequestFinished, request); this.emit(NetworkManager.Events.RequestFinished, request);
} }
@ -123,6 +127,10 @@ class NetworkManager extends EventEmitter {
*/ */
_onLoadingFailed(event) { _onLoadingFailed(event) {
let request = this._idToRequest.get(event.requestId); let request = this._idToRequest.get(event.requestId);
// For certain requestIds we never receive requestWillBeSent event.
// @see https://github.com/GoogleChrome/puppeteer/issues/168
if (!request)
return;
this._idToRequest.delete(event.requestId); this._idToRequest.delete(event.requestId);
this.emit(NetworkManager.Events.RequestFailed, request); this.emit(NetworkManager.Events.RequestFailed, request);
} }

3
test/test.js
View File

@ -457,6 +457,9 @@ describe('Puppeteer', function() {
expect(error.message).toContain('Cannot navigate to invalid URL'); expect(error.message).toContain('Cannot navigate to invalid URL');
})); }));
it('should fail when navigating to bad SSL', SX(async function() { it('should fail when navigating to bad SSL', SX(async function() {
page.on('request', request => expect(request).toBeTruthy());
page.on('requestfinished', request => expect(request).toBeTruthy());
page.on('requestfailed', request => expect(request).toBeTruthy());
let error = null; let error = null;
try { try {
await page.navigate(HTTPS_PREFIX + '/empty.html'); await page.navigate(HTTPS_PREFIX + '/empty.html');