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

index: use error-based parent dir instead of argv dir for local path

Browse Source
This commit is contained in:
CanadaHonk 2023-02-09 19:17:50 +00:00
parent a6e5bbbd96
commit 4d63ab3056
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/index.js
View File

@ -194,7 +194,7 @@ const defaultCSP = [ 'upgrade-insecure-requests' ].concat(
[ 'connect-src', 'prefetch-src', 'font-src', 'img-src', 'media-src', 'style-src', 'form-action' ].map(x => `${x} ${csp_allowAll}`) [ 'connect-src', 'prefetch-src', 'font-src', 'img-src', 'media-src', 'style-src', 'form-action' ].map(x => `${x} ${csp_allowAll}`)
).join('; '); ).join('; ');
const startBrowser = async (url, { allowHTTP = false, allowNavigation = 'same-origin', windowSize, forceBrowser, forceEngine, localCSP = defaultCSP }) => { const startBrowser = async (url, parentDir, { allowHTTP = false, allowNavigation = 'same-origin', windowSize, forceBrowser, forceEngine, localCSP = defaultCSP }) => {
const [ browserPath, browserName ] = await findBrowserPath(forceBrowser, forceEngine); const [ browserPath, browserName ] = await findBrowserPath(forceBrowser, forceEngine);
const browserFriendlyName = getFriendlyName(browserName); const browserFriendlyName = getFriendlyName(browserName);
@ -208,7 +208,7 @@ const startBrowser = async (url, { allowHTTP = false, allowNavigation = 'same-or
const openingLocal = !url.includes('://'); const openingLocal = !url.includes('://');
const localUrl = browserType === 'firefox' ? `http://localhost:${generatePort()}` : 'https://gluon.local'; const localUrl = browserType === 'firefox' ? `http://localhost:${generatePort()}` : 'https://gluon.local';
const basePath = isAbsolute(url) ? url : join(ranJsDir, url); const basePath = isAbsolute(url) ? url : join(parentDir, url);
const closeHandlers = []; const closeHandlers = [];
if (openingLocal && browserType === 'firefox') closeHandlers.push(await LocalHTTP({ url: localUrl, basePath, csp: localCSP })); if (openingLocal && browserType === 'firefox') closeHandlers.push(await LocalHTTP({ url: localUrl, basePath, csp: localCSP }));
@ -236,6 +236,9 @@ const startBrowser = async (url, { allowHTTP = false, allowNavigation = 'same-or
return Window; return Window;
}; };
// get parent directory of where function was called from
const getParentDir = () => dirname(fileURLToPath((new Error()).stack.split('\n')[3].slice(7).trim().split(':').slice(0, -2).join(':')));
const checkForDangerousOptions = ({ allowHTTP, allowNavigation }) => { const checkForDangerousOptions = ({ allowHTTP, allowNavigation }) => {
if (allowHTTP === true) dangerousAPI('Gluon.open', 'allowHTTP', 'true'); if (allowHTTP === true) dangerousAPI('Gluon.open', 'allowHTTP', 'true');
if (allowNavigation === true) dangerousAPI('Gluon.open', 'allowNavigation', 'true'); if (allowNavigation === true) dangerousAPI('Gluon.open', 'allowNavigation', 'true');
@ -249,7 +252,7 @@ export const open = async (url, opts = {}) => {
checkForDangerousOptions(opts); checkForDangerousOptions(opts);
log('starting browser...'); log('starting browser...');
const Browser = await startBrowser(url, opts); const Browser = await startBrowser(url, getParentDir(), opts);
if (onLoad) { if (onLoad) {
const toRun = `(() => { const toRun = `(() => {