Merge pull request #1792 from OpenBazaar/removeAutoReconnect

Removes the auto reconnect code

Author: jjeffryes

js/start.js

@@ -54,11 +54,12 @@ var Polyglot = require('node-polyglot'),
     PageConnectModal = require('./views/pageConnectModal'),
     Dialog = require('./views/dialog.js'),
     loadProfileNeeded = true,
-    startUpConnectMaxRetries = 5,
-    starutUpConnectCurrentRetries = startUpConnectMaxRetries,
-    startUpConnectRetryDelay = 3 * 1000,
+    startUpConnectMaxRetries = 2,
+    startUpConnectRetryDelay = 2 * 1000,
+    startUpConnectMaxTime = 6 * 1000,
+    startTime = Date.now(),
     startUpRetry,
-    resetRetry,
+    removeStartupRetry,
     onActiveServerSync,
     newPageNavView,
     newSocketView,
@@ -570,7 +571,7 @@ launchOnboarding = function(guidCreating) {
 })();
 
 pageConnectModal.on('cancel', () => {
-  resetRetry();
+  removeStartupRetry();
   app.getHeartbeatSocket()._socket.onclose = null;
   app.getHeartbeatSocket().close();
   pageConnectModal.remove();
@@ -593,10 +594,9 @@ app.serverConnectModal.on('connected', () => {
 });
 
 app.getHeartbeatSocket().on('open', function() {
-  resetRetry();
+  removeStartupRetry();
   pageConnectModal.remove();
-  //startUpLoadingModal.open();
-  this.retryConnectionMsg && this.retryConnectionMsg.remove();
+  startUpLoadingModal.open();
 
   if (!profileLoaded) {
     // clear some flags so the heartbeat events will
@@ -609,33 +609,21 @@ app.getHeartbeatSocket().on('open', function() {
 });
 
 app.getHeartbeatSocket().on('close', startUpRetry = function() {
-  if (starutUpConnectCurrentRetries
+  if (
+    Date.now() - startTime < startUpConnectMaxTime &&
+    startUpConnectMaxRetries
   ) {
     startUpRetry.timeout = setTimeout(() => {
-      var retryMsg = {
-        type: 'warning',
-        msg: '<i>' + window.polyglot.t('errorMessages.retryingConnection', {attempt: startUpConnectMaxRetries - starutUpConnectCurrentRetries +1, total: startUpConnectMaxRetries}) + '</i>',
-        duration: false
-      };
-      starutUpConnectCurrentRetries--;
+      startUpConnectMaxRetries--;
       app.connectHeartbeatSocket();
-      if (this.retryConnectionMsg) {
-        this.retryConnectionMsg.updateMessage(retryMsg);
-      } else {
-        this.retryConnectionMsg = app.statusBar.pushMessage(retryMsg);
-      }
     }, startUpConnectRetryDelay);
   } else {
-    this.retryConnectionMsg && this.retryConnectionMsg.remove();
     app.serverConnectModal.failConnection(null, app.serverConfigs.getActive())
       .open();
   }
 });
 
-resetRetry = function() {
-  starutUpConnectCurrentRetries = startUpConnectMaxRetries;
-  /* this code removed so the app will automatically reconnect when the internet connection is flaky */
-  /*
+removeStartupRetry = function() {
   clearTimeout(startUpRetry.timeout);
   app.getHeartbeatSocket().off('close', startUpRetry);
   app.getHeartbeatSocket().on('close', () => {
@@ -650,7 +638,6 @@ resetRetry = function() {
       app.serverConnectModal.open();
     }
   });
-  */
 };
 
 app.getHeartbeatSocket().on('message', function(e) {