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

refactor(node): apply optimizations (#7557)

Browse Source 
Replaced unnecessary template strings and used less calls for optimization.
This commit is contained in:
Voltrex 2021-09-13 13:44:23 +04:30 committed by GitHub
parent 491614c7f8
commit 57d1bd4240
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/node/BrowserFetcher.ts
View File

@ -35,7 +35,7 @@ import createHttpsProxyAgent, {
import { getProxyForUrl } from 'proxy-from-env'; import { getProxyForUrl } from 'proxy-from-env';
import { assert } from '../common/assert.js'; import { assert } from '../common/assert.js';
const debugFetcher = debug(`puppeteer:fetcher`); const debugFetcher = debug('puppeteer:fetcher');
const downloadURLs = { const downloadURLs = {
chrome: { chrome: {
@ -112,10 +112,12 @@ function handleArm64(): void {
if (stats === undefined) { if (stats === undefined) {
fs.stat('/usr/bin/chromium', function (err, stats) { fs.stat('/usr/bin/chromium', function (err, stats) {
if (stats === undefined) { if (stats === undefined) {
console.error(`The chromium binary is not available for arm64.`); console.error(
console.error(`If you are on Ubuntu, you can install with: `); 'The chromium binary is not available for arm64.' +
console.error(`\n sudo apt install chromium\n`); '\nIf you are on Ubuntu, you can install with: ' +
console.error(`\n sudo apt install chromium-browser\n`); '\n\n sudo apt install chromium\n' +
'\n\n sudo apt install chromium-browser\n'
);
throw new Error(); throw new Error();
} }
}); });
@ -216,7 +218,7 @@ export class BrowserFetcher {
else if (platform === 'linux') this._platform = 'linux'; else if (platform === 'linux') this._platform = 'linux';
else if (platform === 'win32') else if (platform === 'win32')
this._platform = os.arch() === 'x64' ? 'win64' : 'win32'; this._platform = os.arch() === 'x64' ? 'win64' : 'win32';
else assert(this._platform, 'Unsupported platform: ' + os.platform()); else assert(this._platform, 'Unsupported platform: ' + platform);
} }
/** /**
@ -387,9 +389,7 @@ export class BrowserFetcher {
else if (this._platform === 'win32' || this._platform === 'win64') else if (this._platform === 'win32' || this._platform === 'win64')
executablePath = path.join(folderPath, 'firefox', 'firefox.exe'); executablePath = path.join(folderPath, 'firefox', 'firefox.exe');
else throw new Error('Unsupported platform: ' + this._platform); else throw new Error('Unsupported platform: ' + this._platform);
} else { } else throw new Error('Unsupported product: ' + this._product);
throw new Error('Unsupported product: ' + this._product);
}
const url = downloadURL( const url = downloadURL(
this._product, this._product,
this._platform, this._platform,
@ -419,7 +419,7 @@ export class BrowserFetcher {
* @internal * @internal
*/ */
_getFolderPath(revision: string): string { _getFolderPath(revision: string): string {
return path.join(this._downloadsFolder, this._platform + '-' + revision); return path.join(this._downloadsFolder, `${this._platform}-${revision}`);
} }
} }
@ -528,9 +528,9 @@ function installDMG(dmgPath: string, folderPath: string): Promise<void> {
mountPath = volumes[0]; mountPath = volumes[0];
readdirAsync(mountPath) readdirAsync(mountPath)
.then((fileNames) => { .then((fileNames) => {
const appName = fileNames.filter( const appName = fileNames.find(
(item) => typeof item === 'string' && item.endsWith('.app') (item) => typeof item === 'string' && item.endsWith('.app')
)[0]; );
if (!appName) if (!appName)
return reject(new Error(`Cannot find app in ${mountPath}`)); return reject(new Error(`Cannot find app in ${mountPath}`));
const copyPath = path.join(mountPath, appName); const copyPath = path.join(mountPath, appName);