github/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

index: give usable error on failure to find browser

Browse Source
This commit is contained in:
CanadaHonk 2023-04-15 22:31:16 +01:00
parent 3ba54a6cf4
commit cc8f142252
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/index.js
View File

@ -32,13 +32,15 @@ const defaultCSP = [ 'upgrade-insecure-requests' ].concat(
const startBrowser = async (url, parentDir, { allowHTTP = false, allowNavigation = 'same-origin', windowSize, forceBrowser, forceEngine, localCSP = defaultCSP, devtools, userAgent, incognito }) => { const startBrowser = async (url, parentDir, { allowHTTP = false, allowNavigation = 'same-origin', windowSize, forceBrowser, forceEngine, localCSP = defaultCSP, devtools, userAgent, incognito }) => {
const [ browserPath, browserName ] = await findBrowserPath(forceBrowser, forceEngine); const [ browserPath, browserName ] = await findBrowserPath(forceBrowser, forceEngine);
const browserFriendlyName = getFriendlyName(browserName); if (!browserPath) {
throw new Error('Failed to find a usable browser installed');
}
if (!browserPath) return log('failed to find a good browser install'); const browserFriendlyName = getFriendlyName(browserName);
const browserType = getBrowserType(browserName);
let dataPath = getDataPath(browserName); let dataPath = getDataPath(browserName);
if (incognito) dataPath = join(dataPath, 'incognito-' + Math.random().toString().slice(2)); if (incognito) dataPath = join(dataPath, 'incognito-' + Math.random().toString().slice(2));
const browserType = getBrowserType(browserName);
log('found browser', browserName, `(${browserType} based)`, 'at path:', browserPath); log('found browser', browserName, `(${browserType} based)`, 'at path:', browserPath);
log('data path:', dataPath); log('data path:', dataPath);

2
src/lib/browserPaths.js
View File

@ -159,5 +159,5 @@ export const findBrowserPath = async (forceBrowser, forceEngine) => {
} }
} }
return null; return [ null, null ];
}; };