Merge pull request #1810 from rmisio/randomizePorts

when using the bundled app randomizing the ports the local server is …

Author: jjeffryes

js/start.js

@@ -132,14 +132,23 @@ window.addEventListener('contextmenu', (e) => {
 
 app.serverConfigs = new ServerConfigsCl();
 app.serverConfigs.fetch().done(() => {
-  var oldConfig,
+  var activeServer = app.serverConfigs.getActive(),
+      oldConfig,
       defaultConfig;
 
-  if (!app.serverConfigs.getActive()) {
-    defaultConfig = app.serverConfigs.create({
+  if (!activeServer) {
+    var serverConfigOpts = {
       name: window.polyglot.t('serverConnectModal.defaultServerName'),
       default: true
-    });
+    };
+
+    if (remote.getGlobal('launched_from_installer')) {
+      serverConfigOpts.rest_api_port = remote.getGlobal('restAPIPort');
+      serverConfigOpts.api_socket_port = remote.getGlobal('apiSocketPort');
+      serverConfigOpts.heartbeat_socket_port = remote.getGlobal('heartbeatSocketPort');
+    }
+
+    defaultConfig = app.serverConfigs.create(serverConfigOpts);
 
     // migrate any existing connection from the
     // old single config set-up (_serverConfig-1)
@@ -177,6 +186,12 @@ app.serverConfigs.fetch().done(() => {
     } else {
       app.serverConfigs.setActive(defaultConfig.id);
     }
+  } else if (remote.getGlobal('launched_from_installer') && activeServer.get('default')) {
+    activeServer.save({
+      'rest_api_port': remote.getGlobal('restAPIPort'),
+      'api_socket_port': remote.getGlobal('apiSocketPort'),
+      'heartbeat_socket_port': remote.getGlobal('heartbeatSocketPort'),
+    });
   }
 });
 

main.js

@@ -133,6 +133,22 @@ var kill_local_server = function() {
   }
 };
 
+var getRandomPort = function() {
+  var port = Math.floor((Math.random() * 10000) + 30000);
+
+  while (port === global.serverPort || port === global.restAPIPort ||
+    port === global.apiSocketPort || port === global.heartbeatSocketPort) {
+    port = Math.floor((Math.random() * 10000) + 30000);
+  }
+
+  return port;
+};
+
+var serverPort;
+global.restAPIPort = getRandomPort();
+global.apiSocketPort = getRandomPort();
+global.heartbeatSocketPort = getRandomPort();
+
 var start_local_server = function() {
   if(fs.existsSync(serverPath)) {
     if (pendingKill) {
@@ -147,9 +163,22 @@ var start_local_server = function() {
 
     console.log('Starting OpenBazaar Server');
 
-    var random_port = Math.floor((Math.random() * 10000) + 30000);
-
-    subpy = require('child_process').spawn(serverPath + daemon, ['start', '--loglevel', 'debug', '-p', random_port], {
+    serverPort = getRandomPort();
+
+    subpy = require('child_process').spawn(serverPath + daemon,
+      [
+        'start',
+        '--loglevel',
+        'debug',
+        '-p',
+        serverPort,
+        '-r',
+        global.restAPIPort,
+        '-w',
+        global.apiSocketPort,
+        '-b',
+        global.heartbeatSocketPort
+      ], {
       detach: false,
       cwd: __dirname + path.sep + '..' + path.sep + 'OpenBazaar-Server'
     });