mirror of
https://github.com/Llewellynvdm/nativefier.git
synced 2024-06-07 15:00:48 +00:00
7a08a2d676
* Catch promise errors better * Move subFunctions to bottom of createNewWindow * Use parents when creating child BrowserWindow instances * Some about:blank pages have an anchor (for some reason) * Inject browserWindowOptions better * Interim refactor to MainWindow object * Split up the window functions/helpers/events some * Further separate out window functions + tests * Add a mock for unit testing functions that access electron * Add unit tests for onWillPreventUnload * Improve windowEvents tests * Add the first test for windowHelpers * Move WebRequest event handling to node * insertCSS completely under test * clearAppData completely under test * Fix contextMenu require bug * More tests + fixes * Fix + add to createNewTab tests * Convert createMainWindow back to func + work out gremlins * Move setupWindow away from main since its shared * Make sure contextMenu is handling promises * Fix issues with fullscreen not working + menu refactor * Run jest against app/dist so that we can hit app unit tests as well * Requested PR changes * Add strict typing; tests currently failing * Fix failing unit tests * Add some more eslint warnings and fixes * More eslint fixes * Strict typing on (still issues with the lib dir) * Fix the package.json import/require * Fix some funky test errors * Warn -> Error for eslint rules * @ts-ignore -> @ts-expect-error * Add back the ext code I removed
33 lines
961 B
TypeScript
33 lines
961 B
TypeScript
import * as url from 'url';
|
|
|
|
import * as log from 'loglevel';
|
|
|
|
function appendProtocol(inputUrl: string): string {
|
|
const parsed = url.parse(inputUrl);
|
|
if (!parsed.protocol) {
|
|
const urlWithProtocol = `https://${inputUrl}`;
|
|
log.warn(
|
|
`URL "${inputUrl}" lacks a protocol.`,
|
|
`Will try to parse it as HTTPS: "${urlWithProtocol}".`,
|
|
`Please pass "http://${inputUrl}" if this is what you meant.`,
|
|
);
|
|
return urlWithProtocol;
|
|
}
|
|
return inputUrl;
|
|
}
|
|
|
|
export function normalizeUrl(urlToNormalize: string): string {
|
|
const urlWithProtocol = appendProtocol(urlToNormalize);
|
|
|
|
let parsedUrl: url.URL;
|
|
try {
|
|
parsedUrl = new url.URL(urlWithProtocol);
|
|
} catch (err: unknown) {
|
|
log.error('normalizeUrl ERROR', err);
|
|
throw new Error(`Your url "${urlWithProtocol}" is invalid`);
|
|
}
|
|
const normalizedUrl = parsedUrl.toString();
|
|
log.debug(`Normalized URL ${urlToNormalize} to:`, normalizedUrl);
|
|
return normalizedUrl;
|
|
}
|