Merge pull request #1774 from OpenBazaar/bumpHeartbeatTimeout

Increase the heartbeat timeout to help with people who have to re-con…

Author: jjeffryes

js/start.js

@@ -51,12 +51,12 @@ var Polyglot = require('node-polyglot'),
     ServerConfigsCl = require('./collections/serverConfigsCl'),
     ServerConnectModal = require('./views/serverConnectModal'),
     OnboardingModal = require('./views/onboardingModal'),
-    PageConnectModal = require('./views/pageConnectModal'), 
+    PageConnectModal = require('./views/pageConnectModal'),
     Dialog = require('./views/dialog.js'),
     loadProfileNeeded = true,
-    startUpConnectMaxRetries = 2,
+    startUpConnectMaxRetries = 4,
     startUpConnectRetryDelay = 2 * 1000,
-    startUpConnectMaxTime = 6 * 1000,
+    startUpConnectMaxTime = 10 * 1000,
     startTime = Date.now(),
     startUpRetry,
     removeStartupRetry,
@@ -145,7 +145,7 @@ app.serverConfigs.fetch().done(() => {
     // old single config set-up (_serverConfig-1)
     if (oldConfig = localStorage['_serverConfig-1']) { // eslint-disable-line no-cond-assign
       oldConfig = JSON.parse(oldConfig);
-      
+
       // don't create a ported connection if it's the same as the default one
       if (
         oldConfig.server_ip +
@@ -164,7 +164,7 @@ app.serverConfigs.fetch().done(() => {
               __.omit(oldConfig, ['local_username', 'local_password', 'id']),
               { name: window.polyglot.t('serverConnectModal.portedConnectionName') }
             )
-          ).id          
+          ).id
         );
       }
 
@@ -177,14 +177,14 @@ app.serverConfigs.fetch().done(() => {
     } else {
       app.serverConfigs.setActive(defaultConfig.id);
     }
-  }  
+  }
 });
 
 ipcRenderer.send('activeServerChange', app.serverConfigs.getActive().toJSON());
 
 app.serverConfigs.on('activeServerChange', (server) => {
   ipcRenderer.send('activeServerChange', server.toJSON());
-});  
+});
 
 //keep user and profile urls synced with the active server configuration
 (setServerUrl = function() {
@@ -422,7 +422,7 @@ var loadProfile = function(landingRoute, onboarded) {
                 userProfile: userProfile,
                 showDiscIntro: onboarded
               });
-              
+
               newPageNavView.render();
 
               app.chatVw = new ChatVw({
@@ -594,7 +594,7 @@ app.serverConnectModal.on('connected', () => {
 app.getHeartbeatSocket().on('open', function() {
   removeStartupRetry();
   pageConnectModal.remove();
-  startUpLoadingModal.open();  
+  startUpLoadingModal.open();
 
   if (!profileLoaded) {
     // clear some flags so the heartbeat events will
@@ -603,7 +603,7 @@ app.getHeartbeatSocket().on('open', function() {
     loadProfileNeeded = true;
     app.serverConnectModal.close();
     startUpLoadingModal.open();
-  }  
+  }
 });
 
 app.getHeartbeatSocket().on('close', startUpRetry = function() {
@@ -626,15 +626,15 @@ removeStartupRetry = function() {
   app.getHeartbeatSocket().off('close', startUpRetry);
   app.getHeartbeatSocket().on('close', () => {
     app.serverConnectModal.failConnection(null, app.serverConfigs.getActive());
-    
+
     if (app.serverConnectModal.getConnectAttempt()) {
       app.serverConnectModal.getConnectAttempt()
         .fail(() => {
           app.serverConnectModal.open();
         });
     } else {
       app.serverConnectModal.open();
-    }      
+    }
   });
 };
 
@@ -692,7 +692,7 @@ app.getHeartbeatSocket().on('message', function(e) {
             app.serverConnectModal.failConnection(
                 data.reason === 'too many attempts' ? 'failed-auth-too-many' : 'failed-auth',
                 app.serverConfigs.getActive()
-              ).open();              
+              ).open();
           }
         }).fail(function() {
           app.serverConnectModal.failConnection(null, app.serverConfigs.getActive())
@@ -715,4 +715,4 @@ app.getHeartbeatSocket().on('message', function(e) {
     }
   }
 });
-// end - server connection and app initialization flow
+// end - server connection and app initialization flow