yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(firefox): do not run firefox as a part of the installation process (#2125)

Browse Source
This commit is contained in:
Pavel Feldman 2020-05-06 10:42:27 -07:00 committed by GitHub
parent 10cca041fb
commit 793a2bf7d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/install/installer.ts
View File

@ -22,7 +22,6 @@ import * as util from 'util';
import * as removeFolder from 'rimraf'; import * as removeFolder from 'rimraf';
import * as browserPaths from '../install/browserPaths'; import * as browserPaths from '../install/browserPaths';
import * as browserFetcher from '../install/browserFetcher'; import * as browserFetcher from '../install/browserFetcher';
import { Playwright } from '../server/playwright';
const fsMkdirAsync = util.promisify(fs.mkdir.bind(fs)); const fsMkdirAsync = util.promisify(fs.mkdir.bind(fs));
const fsReaddirAsync = util.promisify(fs.readdir.bind(fs)); const fsReaddirAsync = util.promisify(fs.readdir.bind(fs));
@ -74,24 +73,10 @@ async function validateCache(packagePath: string, browsersPath: string, linksDir
const myBrowsers = JSON.parse((await fsReadFileAsync(path.join(packagePath, 'browsers.json'))).toString())['browsers']; const myBrowsers = JSON.parse((await fsReadFileAsync(path.join(packagePath, 'browsers.json'))).toString())['browsers'];
for (const browser of myBrowsers) { for (const browser of myBrowsers) {
const browserPath = browserPaths.browserDirectory(browsersPath, browser); const browserPath = browserPaths.browserDirectory(browsersPath, browser);
if (await browserFetcher.downloadBrowserWithProgressBar(browserPath, browser)) await browserFetcher.downloadBrowserWithProgressBar(browserPath, browser);
await installBrowser(packagePath, browserPath, browser);
} }
} }
async function installBrowser(packagePath: string, browserPath: string, browser: browserPaths.BrowserDescriptor) {
if (browser.name !== 'firefox')
return;
const firefox = new Playwright(packagePath, [browser]).firefox!;
const userDataDir = path.join(browserPath, 'cached-profile');
await fsMkdirAsync(userDataDir, { recursive: true });
logPolitely('Pre-compiling Firefox scripts at ' + userDataDir);
const browserContext = await firefox.launchPersistentContext(userDataDir);
const page = await browserContext.newPage();
await page.goto('data:text/html,<html>Hello world</html>');
await browserContext.close();
}
function sha1(data: string): string { function sha1(data: string): string {
const sum = crypto.createHash('sha1'); const sum = crypto.createHash('sha1');
sum.update(data); sum.update(data);

5
src/server/browserType.ts
View File

@ -54,14 +54,13 @@ export interface BrowserType<Browser> {
export abstract class AbstractBrowserType<Browser> implements BrowserType<Browser> { export abstract class AbstractBrowserType<Browser> implements BrowserType<Browser> {
private _name: string; private _name: string;
readonly _browserPath: string;
private _executablePath: string | undefined; private _executablePath: string | undefined;
constructor(packagePath: string, browser: browserPaths.BrowserDescriptor) { constructor(packagePath: string, browser: browserPaths.BrowserDescriptor) {
this._name = browser.name; this._name = browser.name;
const browsersPath = browserPaths.browsersPath(packagePath); const browsersPath = browserPaths.browsersPath(packagePath);
this._browserPath = browserPaths.browserDirectory(browsersPath, browser); const browserPath = browserPaths.browserDirectory(browsersPath, browser);
this._executablePath = browserPaths.executablePath(this._browserPath, browser); this._executablePath = browserPaths.executablePath(browserPath, browser);
} }
executablePath(): string { executablePath(): string {

26
src/server/firefox.ts
View File

@ -91,7 +91,7 @@ export class Firefox extends AbstractBrowserType<FFBrowser> {
let temporaryProfileDir = null; let temporaryProfileDir = null;
if (!userDataDir) { if (!userDataDir) {
userDataDir = await this._createTemporaryProfile(); userDataDir = await mkdtempAsync(path.join(os.tmpdir(), 'playwright_dev_firefox_profile-'));
temporaryProfileDir = userDataDir; temporaryProfileDir = userDataDir;
} }
@ -189,15 +189,6 @@ export class Firefox extends AbstractBrowserType<FFBrowser> {
return firefoxArguments; return firefoxArguments;
} }
async _createTemporaryProfile(): Promise<string> {
const userDataDir = await mkdtempAsync(path.join(os.tmpdir(), 'playwright_dev_firefox_profile-'));
const cachedProfileDir = path.join(this._browserPath, 'cached-profile');
const files = fs.readdirSync(cachedProfileDir);
for (const file of files)
copyRecursiveSync(path.join(cachedProfileDir, file), userDataDir);
return userDataDir;
}
} }
function wrapTransportWithWebSocket(transport: ConnectionTransport, logger: InnerLogger, port: number): WebSocketWrapper { function wrapTransportWithWebSocket(transport: ConnectionTransport, logger: InnerLogger, port: number): WebSocketWrapper {
@ -328,18 +319,3 @@ function wrapTransportWithWebSocket(transport: ConnectionTransport, logger: Inne
return new WebSocketWrapper(wsEndpoint, return new WebSocketWrapper(wsEndpoint,
[pendingBrowserContextCreations, pendingBrowserContextDeletions, browserContextIds, sessionToSocket, sockets]); [pendingBrowserContextCreations, pendingBrowserContextDeletions, browserContextIds, sessionToSocket, sockets]);
} }
function copyRecursiveSync(source: string, targetFolder: string) {
const target = path.join(targetFolder, path.basename(source));
const stat = fs.lstatSync(source);
if (stat.isFile()) {
fs.copyFileSync(source, target);
return;
}
if (stat.isDirectory()) {
fs.mkdirSync(target, { recursive: true });
const files = fs.readdirSync(source);
for (const file of files)
copyRecursiveSync(path.join(source, file), target);
}
}