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

fix: robustly check for launch executable (#8468)

Browse Source
This commit is contained in:
jrandolf 2022-06-07 15:25:04 +02:00 committed by GitHub
parent 328c3f5b08
commit b54dc55f76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/node/Launcher.ts
View File

@ -71,8 +71,8 @@ class ChromeLauncher implements ProductLauncher {
ignoreDefaultArgs = false,
args = [],
dumpio = false,
channel = null,
executablePath = null,
channel,
executablePath,
pipe = false,
env = process.env,
handleSIGINT = true,
@ -83,7 +83,7 @@ class ChromeLauncher implements ProductLauncher {
slowMo = 0,
timeout = 30000,
waitForInitialPage = true,
debuggingPort = null,
debuggingPort,
} = options;
const chromeArguments = [];
@ -103,7 +103,7 @@ class ChromeLauncher implements ProductLauncher {
) {
if (pipe) {
assert(
debuggingPort === null,
!debuggingPort,
'Browser should be launched with either pipe or debugging port - not both.'
);
chromeArguments.push('--remote-debugging-pipe');
@ -134,23 +134,20 @@ class ChromeLauncher implements ProductLauncher {
isTempUserDataDir = false;
let chromeExecutable = executablePath;
if (channel) {
// executablePath is detected by channel, so it should not be specified by user.
assert(
typeof executablePath === 'string',
!chromeExecutable,
'`executablePath` must not be specified when `channel` is given.'
);
chromeExecutable = executablePathForChannel(channel);
} else if (!executablePath) {
} else if (!chromeExecutable) {
const { missingText, executablePath } = resolveExecutablePath(this);
if (missingText) throw new Error(missingText);
chromeExecutable = executablePath;
if (missingText) {
throw new Error(missingText);
}
if (!chromeExecutable) {
throw new Error('chromeExecutable is not found.');
chromeExecutable = executablePath;
}
const usePipe = chromeArguments.includes('--remote-debugging-pipe');
@ -183,7 +180,7 @@ class ChromeLauncher implements ProductLauncher {
[],
ignoreHTTPSErrors,
defaultViewport,
runner.proc ?? undefined,
runner.proc,
runner.close.bind(runner)
);
} catch (error) {
@ -262,7 +259,8 @@ class ChromeLauncher implements ProductLauncher {
if (channel) {
return executablePathForChannel(channel);
} else {
return resolveExecutablePath(this).executablePath;
const results = resolveExecutablePath(this);
return results.executablePath;
}
}