thunderstrike/puppeteer
thunderstrike/puppeteer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: enable Network Service by default (#3738)

Browse Source 
References #3471.
This commit is contained in:
Andrey Lushnikov 2019-01-09 15:47:08 -08:00 committed by GitHub
parent c86bc0fa9f
commit 1899e7931c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Launcher.js
View File

@ -34,6 +34,7 @@ const CHROME_PROFILE_PATH = path.join(os.tmpdir(), 'puppeteer_dev_profile-');
const DEFAULT_ARGS = [ const DEFAULT_ARGS = [
'--disable-background-networking', '--disable-background-networking',
'--enable-features=NetworkService,NetworkServiceInProcess',
'--disable-background-timer-throttling', '--disable-background-timer-throttling',
'--disable-backgrounding-occluded-windows', '--disable-backgrounding-occluded-windows',
'--disable-breakpad', '--disable-breakpad',

9
lib/NetworkManager.js
View File

@ -135,7 +135,8 @@ class NetworkManager extends EventEmitter {
* @param {!Protocol.Network.requestWillBeSentPayload} event * @param {!Protocol.Network.requestWillBeSentPayload} event
*/ */
_onRequestWillBeSent(event) { _onRequestWillBeSent(event) {
if (this._protocolRequestInterceptionEnabled) { // Request interception doesn't happen for data URLs with Network Service.
if (this._protocolRequestInterceptionEnabled && !event.request.url.startsWith('data:')) {
const requestHash = generateRequestHash(event.request); const requestHash = generateRequestHash(event.request);
const interceptionId = this._requestHashToInterceptionIds.firstValue(requestHash); const interceptionId = this._requestHashToInterceptionIds.firstValue(requestHash);
if (interceptionId) { if (interceptionId) {
@ -394,6 +395,9 @@ class Request {
* @param {!{url?: string, method?:string, postData?: string, headers?: !Object}} overrides * @param {!{url?: string, method?:string, postData?: string, headers?: !Object}} overrides
*/ */
async continue(overrides = {}) { async continue(overrides = {}) {
// Request interception is not supported for data: urls.
if (this._url.startsWith('data:'))
return;
assert(this._allowInterception, 'Request Interception is not enabled!'); assert(this._allowInterception, 'Request Interception is not enabled!');
assert(!this._interceptionHandled, 'Request is already handled!'); assert(!this._interceptionHandled, 'Request is already handled!');
const { const {
@ -466,6 +470,9 @@ class Request {
* @param {string=} errorCode * @param {string=} errorCode
*/ */
async abort(errorCode = 'failed') { async abort(errorCode = 'failed') {
// Request interception is not supported for data: urls.
if (this._url.startsWith('data:'))
return;
const errorReason = errorReasons[errorCode]; const errorReason = errorReasons[errorCode];
assert(errorReason, 'Unknown error code: ' + errorCode); assert(errorReason, 'Unknown error code: ' + errorCode);
assert(this._allowInterception, 'Request Interception is not enabled!'); assert(this._allowInterception, 'Request Interception is not enabled!');

9
test/network.spec.js
View File

@ -495,15 +495,6 @@ module.exports.addTests = function({testRunner, expect}) {
expect(requests.length).toBe(1); expect(requests.length).toBe(1);
expect(requests[0].url()).toBe(dataURL); expect(requests[0].url()).toBe(dataURL);
}); });
it('should abort data server', async({page, server}) => {
await page.setRequestInterception(true);
page.on('request', request => {
request.abort();
});
let error = null;
await page.goto('data:text/html,No way!').catch(err => error = err);
expect(error.message).toContain('net::ERR_FAILED');
});
it('should navigate to URL with hash and and fire requests without hash', async({page, server}) => { it('should navigate to URL with hash and and fire requests without hash', async({page, server}) => {
await page.setRequestInterception(true); await page.setRequestInterception(true);
const requests = []; const requests = [];