Skip to content

Commit 9353504

Browse files
Apply suggestions from code review
Co-authored-by: Sapphire <imsapphire0@gmail.com>
1 parent 34d35fa commit 9353504

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

gui/electron/main/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,15 @@ handleIpc(IPC_CHANNELS.LOG, (e, type, ...args) => {
111111
});
112112

113113
handleIpc(IPC_CHANNELS.OPEN_URL, (e, url) => {
114-
const allowsd_urls = [
114+
const allowed_urls = [
115115
/steam:\/\/.*/,
116116
/ms-settings:network$/,
117117
/https:\/\/.*\.slimevr\.dev.*/,
118118
/https:\/\/github\.com\/.*/,
119119
/https:\/\/discord\.gg\/slimevr$/,
120120
];
121-
if (allowsd_urls.find((a) => url.match(a))) open(url);
122-
else logger.error({ url }, 'trying to open non allowed url');
121+
if (allowed_urls.find((a) => url.match(a))) open(url);
122+
else logger.error({ url }, 'attempted to open non-whitelisted URL');
123123
});
124124

125125
handleIpc(IPC_CHANNELS.STORAGE, async (e, { type, method, key, value }) => {
@@ -336,7 +336,7 @@ const isServerRunning = async () => !await isPortAvailable(21110)
336336

337337
const spawnServer = async () => {
338338
if (options.skipServerIfRunning && await isServerRunning()) {
339-
logger.info({ skipServerIfRunning: options.skipServerIfRunning }, 'Server alredy running, skipping');
339+
logger.info({ skipServerIfRunning: options.skipServerIfRunning }, 'Server is already running, skipping server start');
340340
return;
341341
}
342342

@@ -357,7 +357,7 @@ const spawnServer = async () => {
357357
return;
358358
}
359359

360-
logger.info({ serverJar }, 'found server jar');
360+
logger.info({ javaBin, serverJar }, 'Found Java and server jar');
361361

362362
const process = spawn(javaBin, ['-Xmx128M', '-jar', serverJar, 'run']);
363363

gui/electron/main/paths.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ const javaHomeBin = () => {
6060
const javaHome = process.env['JAVA_HOME'];
6161
if (!javaHome) return null;
6262
const javaHomeJre = join(javaHome, 'bin', javaBin);
63-
console.log(javaHomeJre);
6463
return javaHomeJre;
6564
};
6665

0 commit comments

Comments
 (0)