mirror of
https://github.com/puppeteer/puppeteer
synced 2024-06-14 14:02:48 +00:00
13e8580a34
This patch:
- split browser launching logic from Browser into `lib/Launcher.js`
- introduce `puppeteer` namespace which currently has a single `launch`
method to start a browser
With this patch, the browser is no longer created with the `new
Browser(..)` command. Instead, it should be "launched" via the
`puppeteer.launch` method:
```js
const puppeteer = require('puppeteer');
puppeteer.launch().then(async browser => {
...
});
```
With this approach browser instance lifetime matches the lifetime of
actual browser process. This helps us:
- remove proxy streams, e.g. browser.stderr and browser.stdout
- cleanup browser class and make it possible to connect to remote
browser
- introduce events on the browser instance, e.g. 'page' event. In case
of lazy-launching browser, we should've launch browser when an event
listener is added, which is unneded comlpexity.
74 lines
2.0 KiB
JavaScript
74 lines
2.0 KiB
JavaScript
/**
|
|
* Copyright 2017 Google Inc. All rights reserved.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
const helper = require('./helper');
|
|
const Page = require('./Page');
|
|
|
|
class Browser {
|
|
/**
|
|
* @param {!Connection} connection
|
|
* @param {boolean} ignoreHTTPSErrors
|
|
* @param {function()=} closeCallback
|
|
*/
|
|
constructor(connection, ignoreHTTPSErrors, closeCallback) {
|
|
this._ignoreHTTPSErrors = ignoreHTTPSErrors;
|
|
this._screenshotTaskQueue = new TaskQueue();
|
|
this._connection = connection;
|
|
this._closeCallback = closeCallback || new Function();
|
|
}
|
|
|
|
/**
|
|
* @return {!Promise<!Page>}
|
|
*/
|
|
async newPage() {
|
|
const {targetId} = await this._connection.send('Target.createTarget', {url: 'about:blank'});
|
|
const client = await this._connection.createSession(targetId);
|
|
return await Page.create(client, this._ignoreHTTPSErrors, this._screenshotTaskQueue);
|
|
}
|
|
|
|
/**
|
|
* @return {!Promise<string>}
|
|
*/
|
|
async version() {
|
|
let version = await this._connection.send('Browser.getVersion');
|
|
return version.product;
|
|
}
|
|
|
|
close() {
|
|
this._connection.dispose();
|
|
this._closeCallback.call(null);
|
|
}
|
|
}
|
|
|
|
module.exports = Browser;
|
|
helper.tracePublicAPI(Browser);
|
|
|
|
class TaskQueue {
|
|
constructor() {
|
|
this._chain = Promise.resolve();
|
|
}
|
|
|
|
/**
|
|
* @param {function()} task
|
|
* @return {!Promise}
|
|
*/
|
|
postTask(task) {
|
|
const result = this._chain.then(task);
|
|
this._chain = result.catch(() => {});
|
|
return result;
|
|
}
|
|
}
|