Remove many instances of deprecated url.parse
This commit is contained in:
Evan Hahn
Scott Nonnenberg
parent
2fc3e4c698
commit
18abe93022
10 changed files with 220 additions and 89 deletions
118
main.js
118
main.js
|
|
@ -4,7 +4,7 @@
|
|||
/* eslint-disable no-console */
|
||||
|
||||
const path = require('path');
|
||||
const url = require('url');
|
||||
const { pathToFileURL } = require('url');
|
||||
const os = require('os');
|
||||
const fs = require('fs-extra');
|
||||
const crypto = require('crypto');
|
||||
|
|
@ -123,6 +123,7 @@ const {
|
|||
} = require('./ts/types/Settings');
|
||||
const { Environment } = require('./ts/environment');
|
||||
const { ChallengeMainHandler } = require('./ts/main/challengeMain');
|
||||
const { maybeParseUrl, setUrlSearchParams } = require('./ts/util/url');
|
||||
|
||||
const sql = new MainSQL();
|
||||
const challengeHandler = new ChallengeMainHandler();
|
||||
|
|
@ -228,49 +229,57 @@ const loadLocale = require('./app/locale').load;
|
|||
let logger;
|
||||
let locale;
|
||||
|
||||
function prepareURL(pathSegments, moreKeys) {
|
||||
const parsed = url.parse(path.join(...pathSegments));
|
||||
function prepareFileUrl(
|
||||
pathSegments /* : ReadonlyArray<string> */,
|
||||
moreKeys /* : undefined | Record<string, unknown> */
|
||||
) /* : string */ {
|
||||
const filePath = path.join(...pathSegments);
|
||||
const fileUrl = pathToFileURL(filePath);
|
||||
return prepareUrl(fileUrl, moreKeys);
|
||||
}
|
||||
|
||||
return url.format({
|
||||
...parsed,
|
||||
protocol: parsed.protocol || 'file:',
|
||||
slashes: true,
|
||||
query: {
|
||||
name: packageJson.productName,
|
||||
locale: locale.name,
|
||||
version: app.getVersion(),
|
||||
buildExpiration: config.get('buildExpiration'),
|
||||
serverUrl: config.get('serverUrl'),
|
||||
storageUrl: config.get('storageUrl'),
|
||||
directoryUrl: config.get('directoryUrl'),
|
||||
directoryEnclaveId: config.get('directoryEnclaveId'),
|
||||
directoryTrustAnchor: config.get('directoryTrustAnchor'),
|
||||
cdnUrl0: config.get('cdn').get('0'),
|
||||
cdnUrl2: config.get('cdn').get('2'),
|
||||
certificateAuthority: config.get('certificateAuthority'),
|
||||
environment: enableCI ? 'production' : config.environment,
|
||||
enableCI: enableCI ? true : undefined,
|
||||
node_version: process.versions.node,
|
||||
hostname: os.hostname(),
|
||||
appInstance: process.env.NODE_APP_INSTANCE,
|
||||
proxyUrl: process.env.HTTPS_PROXY || process.env.https_proxy,
|
||||
contentProxyUrl: config.contentProxyUrl,
|
||||
sfuUrl: config.get('sfuUrl'),
|
||||
importMode: importMode ? true : undefined, // for stringify()
|
||||
reducedMotionSetting: animationSettings.prefersReducedMotion
|
||||
? true
|
||||
: undefined,
|
||||
serverPublicParams: config.get('serverPublicParams'),
|
||||
serverTrustRoot: config.get('serverTrustRoot'),
|
||||
appStartInitialSpellcheckSetting,
|
||||
...moreKeys,
|
||||
},
|
||||
});
|
||||
function prepareUrl(
|
||||
url /* : URL */,
|
||||
moreKeys = {} /* : undefined | Record<string, unknown> */
|
||||
) /* : string */ {
|
||||
return setUrlSearchParams(url, {
|
||||
name: packageJson.productName,
|
||||
locale: locale.name,
|
||||
version: app.getVersion(),
|
||||
buildExpiration: config.get('buildExpiration'),
|
||||
serverUrl: config.get('serverUrl'),
|
||||
storageUrl: config.get('storageUrl'),
|
||||
directoryUrl: config.get('directoryUrl'),
|
||||
directoryEnclaveId: config.get('directoryEnclaveId'),
|
||||
directoryTrustAnchor: config.get('directoryTrustAnchor'),
|
||||
cdnUrl0: config.get('cdn').get('0'),
|
||||
cdnUrl2: config.get('cdn').get('2'),
|
||||
certificateAuthority: config.get('certificateAuthority'),
|
||||
environment: enableCI ? 'production' : config.environment,
|
||||
enableCI: enableCI ? 'true' : '',
|
||||
node_version: process.versions.node,
|
||||
hostname: os.hostname(),
|
||||
appInstance: process.env.NODE_APP_INSTANCE,
|
||||
proxyUrl: process.env.HTTPS_PROXY || process.env.https_proxy,
|
||||
contentProxyUrl: config.contentProxyUrl,
|
||||
sfuUrl: config.get('sfuUrl'),
|
||||
importMode: importMode ? 'true' : '',
|
||||
reducedMotionSetting: animationSettings.prefersReducedMotion ? 'true' : '',
|
||||
serverPublicParams: config.get('serverPublicParams'),
|
||||
serverTrustRoot: config.get('serverTrustRoot'),
|
||||
appStartInitialSpellcheckSetting,
|
||||
...moreKeys,
|
||||
}).href;
|
||||
}
|
||||
|
||||
async function handleUrl(event, target) {
|
||||
event.preventDefault();
|
||||
const { protocol, hostname } = url.parse(target);
|
||||
const parsedUrl = maybeParseUrl(target);
|
||||
if (!parsedUrl) {
|
||||
return;
|
||||
}
|
||||
|
||||
const { protocol, hostname } = parsedUrl;
|
||||
const isDevServer = config.enableHttp && hostname === 'localhost';
|
||||
// We only want to specially handle urls that aren't requesting the dev server
|
||||
if (isSgnlHref(target) || isSignalHttpsLink(target)) {
|
||||
|
|
@ -459,13 +468,20 @@ async function createWindow() {
|
|||
};
|
||||
|
||||
if (config.environment === 'test') {
|
||||
mainWindow.loadURL(prepareURL([__dirname, 'test', 'index.html'], moreKeys));
|
||||
mainWindow.loadURL(
|
||||
prepareFileUrl([__dirname, 'test', 'index.html'], moreKeys)
|
||||
);
|
||||
} else if (config.environment === 'test-lib') {
|
||||
mainWindow.loadURL(
|
||||
prepareURL([__dirname, 'libtextsecure', 'test', 'index.html'], moreKeys)
|
||||
prepareFileUrl(
|
||||
[__dirname, 'libtextsecure', 'test', 'index.html'],
|
||||
moreKeys
|
||||
)
|
||||
);
|
||||
} else {
|
||||
mainWindow.loadURL(prepareURL([__dirname, 'background.html'], moreKeys));
|
||||
mainWindow.loadURL(
|
||||
prepareFileUrl([__dirname, 'background.html'], moreKeys)
|
||||
);
|
||||
}
|
||||
|
||||
if (!enableCI && config.get('openDevTools')) {
|
||||
|
|
@ -766,7 +782,7 @@ function showAbout() {
|
|||
|
||||
handleCommonWindowEvents(aboutWindow);
|
||||
|
||||
aboutWindow.loadURL(prepareURL([__dirname, 'about.html']));
|
||||
aboutWindow.loadURL(prepareFileUrl([__dirname, 'about.html']));
|
||||
|
||||
aboutWindow.on('closed', () => {
|
||||
aboutWindow = null;
|
||||
|
|
@ -823,7 +839,7 @@ function showSettingsWindow() {
|
|||
|
||||
handleCommonWindowEvents(settingsWindow);
|
||||
|
||||
settingsWindow.loadURL(prepareURL([__dirname, 'settings.html']));
|
||||
settingsWindow.loadURL(prepareFileUrl([__dirname, 'settings.html']));
|
||||
|
||||
settingsWindow.on('closed', () => {
|
||||
removeDarkOverlay();
|
||||
|
|
@ -895,8 +911,10 @@ async function showStickerCreator() {
|
|||
handleCommonWindowEvents(stickerCreatorWindow);
|
||||
|
||||
const appUrl = config.enableHttp
|
||||
? prepareURL(['http://localhost:6380/sticker-creator/dist/index.html'])
|
||||
: prepareURL([__dirname, 'sticker-creator/dist/index.html']);
|
||||
? prepareUrl(
|
||||
new URL('http://localhost:6380/sticker-creator/dist/index.html')
|
||||
)
|
||||
: prepareFileUrl([__dirname, 'sticker-creator/dist/index.html']);
|
||||
|
||||
stickerCreatorWindow.loadURL(appUrl);
|
||||
|
||||
|
|
@ -947,7 +965,9 @@ async function showDebugLogWindow() {
|
|||
|
||||
handleCommonWindowEvents(debugLogWindow);
|
||||
|
||||
debugLogWindow.loadURL(prepareURL([__dirname, 'debug_log.html'], { theme }));
|
||||
debugLogWindow.loadURL(
|
||||
prepareFileUrl([__dirname, 'debug_log.html'], { theme })
|
||||
);
|
||||
|
||||
debugLogWindow.on('closed', () => {
|
||||
removeDarkOverlay();
|
||||
|
|
@ -1000,7 +1020,7 @@ function showPermissionsPopupWindow(forCalling, forCamera) {
|
|||
handleCommonWindowEvents(permissionsPopupWindow);
|
||||
|
||||
permissionsPopupWindow.loadURL(
|
||||
prepareURL([__dirname, 'permissions_popup.html'], {
|
||||
prepareFileUrl([__dirname, 'permissions_popup.html'], {
|
||||
theme,
|
||||
forCalling,
|
||||
forCamera,
|
||||
|
|
@ -1175,7 +1195,7 @@ app.on('ready', async () => {
|
|||
loadingWindow = null;
|
||||
});
|
||||
|
||||
loadingWindow.loadURL(prepareURL([__dirname, 'loading.html']));
|
||||
loadingWindow.loadURL(prepareFileUrl([__dirname, 'loading.html']));
|
||||
});
|
||||
|
||||
// Run window preloading in parallel with database initialization.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue