aboutsummaryrefslogtreecommitdiffstats
path: root/src/electron/ipc-api/localServer.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/electron/ipc-api/localServer.js')
-rw-r--r--src/electron/ipc-api/localServer.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/electron/ipc-api/localServer.js b/src/electron/ipc-api/localServer.js
index 9b800fdf6..591e70504 100644
--- a/src/electron/ipc-api/localServer.js
+++ b/src/electron/ipc-api/localServer.js
@@ -1,9 +1,9 @@
1import { ipcMain, app } from 'electron'; 1import { ipcMain } from 'electron';
2import net from 'net'; 2import net from 'net';
3import { LOCAL_HOSTNAME, LOCAL_PORT } from '../../config';
4import { userDataPath } from '../../environment';
3import startServer from '../../internal-server/start'; 5import startServer from '../../internal-server/start';
4 6
5const DEFAULT_PORT = 45569;
6
7const portInUse = function (port) { 7const portInUse = function (port) {
8 return new Promise((resolve) => { 8 return new Promise((resolve) => {
9 const server = net.createServer((socket) => { 9 const server = net.createServer((socket) => {
@@ -11,7 +11,7 @@ const portInUse = function (port) {
11 socket.pipe(socket); 11 socket.pipe(socket);
12 }); 12 });
13 13
14 server.listen(port, '127.0.0.1'); 14 server.listen(port, LOCAL_HOSTNAME);
15 server.on('error', () => { 15 server.on('error', () => {
16 resolve(true); 16 resolve(true);
17 }); 17 });
@@ -28,15 +28,15 @@ export default (params) => {
28 ipcMain.on('startLocalServer', () => { 28 ipcMain.on('startLocalServer', () => {
29 if (!localServerStarted) { 29 if (!localServerStarted) {
30 // Find next unused port for server 30 // Find next unused port for server
31 let port = DEFAULT_PORT; 31 let port = LOCAL_PORT;
32 (async () => { 32 (async () => {
33 // eslint-disable-next-line no-await-in-loop 33 // eslint-disable-next-line no-await-in-loop
34 while ((await portInUse(port)) && port < DEFAULT_PORT + 10) { 34 while ((await portInUse(port)) && port < LOCAL_PORT + 10) {
35 port += 1; 35 port += 1;
36 } 36 }
37 console.log('Starting local server on port', port); 37 console.log('Starting local server on port', port);
38 38
39 startServer(app.getPath('userData'), port); 39 startServer(userDataPath(), port);
40 40
41 params.mainWindow.webContents.send('localServerPort', { 41 params.mainWindow.webContents.send('localServerPort', {
42 port, 42 port,