use chrome-launcher for handling the browser.

This commit is contained in:
Paul Irish 2017-06-19 16:49:21 -07:00
parent 3d3e8dd038
commit 1e56a30ff6
3 changed files with 897 additions and 88 deletions

View File

@ -14,16 +14,11 @@
* limitations under the License.
*/
let http = require('http');
let path = require('path');
let removeRecursive = require('rimraf').sync;
let Page = require('./Page');
let childProcess = require('child_process');
let Downloader = require('../utils/ChromiumDownloader');
let Connection = require('./Connection');
const chromeLauncher = require('chrome-launcher');
let CHROME_PROFILE_PATH = path.resolve(__dirname, '..', '.dev_profile');
let browserId = 0;
const Page = require('./Page');
const Downloader = require('../utils/ChromiumDownloader');
const Connection = require('./Connection');
let DEFAULT_ARGS = [
'--disable-background-timer-throttling',
@ -36,15 +31,9 @@ class Browser {
*/
constructor(options) {
options = options || {};
++browserId;
this._userDataDir = CHROME_PROFILE_PATH + browserId;
this._remoteDebuggingPort = 9227;
if (typeof options.remoteDebuggingPort === 'number')
this._remoteDebuggingPort = options.remoteDebuggingPort;
this._chromeArguments = DEFAULT_ARGS.concat([
`--user-data-dir=${this._userDataDir}`,
`--remote-debugging-port=${this._remoteDebuggingPort}`,
]);
this._chromeArguments = DEFAULT_ARGS;
if (typeof options.headless !== 'boolean' || options.headless) {
this._chromeArguments.push(...[
`--headless`,
@ -54,8 +43,8 @@ class Browser {
if (typeof options.executablePath === 'string') {
this._chromeExecutable = options.executablePath;
} else {
let chromiumRevision = require('../package.json').puppeteer.chromium_revision;
let revisionInfo = Downloader.revisionInfo(Downloader.currentPlatform(), chromiumRevision);
const chromiumRevision = require('../package.json').puppeteer.chromium_revision;
const revisionInfo = Downloader.revisionInfo(Downloader.currentPlatform(), chromiumRevision);
console.assert(revisionInfo, 'Chromium revision is not downloaded. Run npm install');
this._chromeExecutable = revisionInfo.executablePath;
}
@ -98,19 +87,17 @@ class Browser {
async _ensureChromeIsRunning() {
if (this._chromeProcess)
return;
this._chromeProcess = childProcess.spawn(this._chromeExecutable, this._chromeArguments, {});
let stderr = '';
this._chromeProcess.stderr.on('data', data => stderr += data.toString('utf8'));
this._chromeProcess = await chromeLauncher.launch({
chromeFlags: this._chromeArguments,
chromePath: this._chromeExecutable,
port: this._remoteDebuggingPort
});
this._remoteDebuggingPort = this._chromeProcess.port;
// Cleanup as processes exit.
process.on('exit', () => this._chromeProcess.kill());
this._chromeProcess.on('exit', () => {
this._terminated = true;
removeRecursive(this._userDataDir);
});
await waitForChromeResponsive(this._remoteDebuggingPort, () => !this._terminated);
if (this._terminated)
throw new Error('Failed to launch chrome! ' + stderr);
// this._chromeProcess.on('exit', () => {
// this._terminated = true;
// });
}
close() {
@ -121,30 +108,3 @@ class Browser {
}
module.exports = Browser;
function waitForChromeResponsive(remoteDebuggingPort, shouldWaitCallback) {
let fulfill;
let promise = new Promise(x => fulfill = x);
let options = {
method: 'GET',
host: 'localhost',
port: remoteDebuggingPort,
path: '/json/list'
};
let probeTimeout = 100;
sendRequest();
return promise;
function sendRequest() {
let req = http.request(options, res => {
fulfill();
});
req.on('error', e => {
if (shouldWaitCallback())
setTimeout(sendRequest, probeTimeout);
else
fulfill();
});
req.end();
}
}

View File

@ -16,6 +16,7 @@
"author": "The Chromium Authors",
"license": "SEE LICENSE IN LICENSE",
"dependencies": {
"chrome-launcher": "^0.1.3",
"extract-zip": "^1.6.5",
"mime": "^1.3.4",
"progress": "^2.0.0",

868
yarn.lock

File diff suppressed because it is too large Load Diff