worked more through some init connect scenarios

Author: rmisio

css/obBase.css

@@ -4249,6 +4249,10 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   top: 372px;
 }
 
+#ov1 .server-config-row {
+  /*min-height: 73px;*/
+}
+
 #ov1 .server-config-row .connection-failed::after {
   content: '';
   position: absolute;

js/App.js

@@ -3,14 +3,10 @@ var ipcRenderer = require('ipc-renderer'),
     __ = require('underscore'),
     $ = require('jquery'),
     Socket = require('./utils/Socket'),
-    LanguagesMd = require('./models/languagesMd'),
-    languages = new LanguagesMd(),
-    ServerConfigsCl = require('./collections/serverConfigsCl'),
     _app;
 
 function App() {
-  var self = this,
-      serverConfig;
+  var self = this;
 
   // ensure we're a singleton
   if (_app) return _app;
@@ -20,54 +16,24 @@ function App() {
   this._notifUnread = 0;
   this._chatMessagesUnread = 0;
 
-  this.serverConfigs = new ServerConfigsCl();
-  this.serverConfigs.fetch();
-
-  if (!(serverConfig = this.getServerConfig())) {
-    this.setServerConfig(
-      this.serverConfigs.create({
-        name: polyglot.t('serverConnectModal.defaultServerName'),
-        default: true
-      }).id
-    );
-  }
-
-  this.connectHeartbeatSocket();
-};
-
-App.prototype.getServerConfig = function() {
-  var config = this.serverConfigs.get(localStorage.activeServer);
-
-  if ((!localStorage.activeServer || !config) && this.serverConfigs.length) {
-    localStorage.activeServer = this.serverConfigs.at(this.serverConfigs.length - 1).id;
-    config = this.serverConfigs.get(localStorage.activeServer);
-  }
-
-  return config;  
-};
-
-App.prototype.setServerConfig = function(id) {
-  if (!this.serverConfigs.get(id)) {
-    throw new Error(`Unable to set the server config. It must be an id of one of the available
-        server configs stored via the ServerConfigs collection.`)
-  }
-
-  localStorage.activeServer = id;
+  // TODO: rather than attach the serverConfigs CL
+  // in main.js, pass in the instance here so the
+  // dependency is more explicit.
 };
 
 App.prototype.connectHeartbeatSocket = function() {
-  var config;
+  var activeServer = this.serverConfigs.getActive();
 
-  if (!(config = this.getServerConfig())) {
-    throw new Error(`No server config is set. Please set one via setServerConfig().`);
+  if (!activeServer) {
+    throw new Error(`No active server set. Please set via the Server Configs collection.`);
   }
 
   clearTimeout(this.heartbeatSocketTimesup);
 
   if (this._heartbeatSocket) {
-    this._heartbeatSocket.connect(config.getHeartbeatSocketUrl());
+    this._heartbeatSocket.connect(activeServer.getHeartbeatSocketUrl());
   } else {
-    this._heartbeatSocket = new Socket(config.getHeartbeatSocketUrl());
+    this._heartbeatSocket = new Socket(activeServer.getHeartbeatSocketUrl());
 
     this._heartbeatSocket.on('close', () => {
       clearTimeout(this._heartbeatSocketTimesup);
@@ -80,26 +46,26 @@ App.prototype.connectHeartbeatSocket = function() {
       this._heartbeatSocket._socket.close(); //turn off for now, until server issues are fixed
       // alert(polyglot.t('errorMessages.serverTimeout'));
     }
-  }, 3000); //wait for 30 seconds, sometimes the server stalls  
+  }, 10000); //wait for 30 seconds, sometimes the server stalls  
 };
 
 App.prototype.getHeartbeatSocket = function() {
   return this._heartbeatSocket;
 };
 
 App.prototype.login = function() {
-  var config;
+  var activeServer = this.serverConfigs.getActive();
 
-  if (!(config = this.getServerConfig())) {
-    throw new Error(`No server config is set. Please set one via setServerConfig().`);
+  if (!activeServer) {
+    throw new Error(`No active server set. Please set via the Server Configs collection.`);
   }
 
   return $.ajax({
-    url: config.getServerBaseUrl() + '/login',
+    url: activeServer.getServerBaseUrl() + '/login',
     method: 'POST',
     data: {
-      username: config.get('username'),
-      password: config.get('password')
+      username: activeServer.get('username'),
+      password: activeServer.get('password')
     },
     timeout: 3000
   });  

js/collections/chatConversationsCl.js

@@ -4,7 +4,7 @@ var Backbone = require('backbone'),
 
 module.exports = Backbone.Collection.extend({
   url: function() {
-    return app.serverConfig.getServerBaseUrl() + '/get_chat_conversations';
+    return app.serverConfigs.getActive().getServerBaseUrl() + '/get_chat_conversations';
   },
 
   model: ChatConversationMd,

js/collections/chatMessagesCl.js

@@ -4,7 +4,7 @@ var Backbone = require('backbone'),
 
 module.exports = Backbone.Collection.extend({
   url: function() {
-    return app.serverConfig.getServerBaseUrl() + '/get_chat_messages';
+    return app.serverConfigs.getActive().getServerBaseUrl() + '/get_chat_messages';
   },
 
   model: ChatMessageMd,

js/collections/notificationsCl.js

@@ -5,7 +5,7 @@ var Backbone = require('backbone'),
 
 module.exports = Backbone.Collection.extend({
   url: function() {
-    return app.serverConfig.getServerBaseUrl() + '/get_notifications';
+    return app.serverConfigs.getActive().getServerBaseUrl() + '/get_notifications';
   },
 
   model: NotificationMd,

js/collections/ratingCl.js

@@ -5,7 +5,7 @@ var __ = require('underscore'),
 
 module.exports = Backbone.Collection.extend({
   url: function() {
-    return app.serverConfig.getServerBaseUrl() + '/get_ratings';
+    return app.serverConfigs.getActive().getServerBaseUrl() + '/get_ratings';
   },
 
   model: RatingMd,

js/collections/serverConfigsCl.js

@@ -5,5 +5,31 @@ var Backbone = require('backbone'),
 module.exports = Backbone.Collection.extend({
   sync: localStorageSync.sync,
   localStorage: new localStorageSync('__serverConfig'),  
-  model: ServerConfigMd
+  model: ServerConfigMd,
+
+  getActive: function() {
+    var config = this.get(localStorage.activeServer);
+
+    if (!config && this.length) {
+      config = this.at(this.length - 1);
+      this.setActive(config.id);
+    }
+
+    return config;  
+  },
+
+  setActive: function(id) {
+    var md;
+
+    if (!(md = this.get(id))) {
+      throw new Error(`Unable to set the active server config. It must be an id of one of the available
+          server configs stored in this collection.`)
+    }
+
+    if (this._active !== id) {
+      this._active = id;
+      localStorage.activeServer = id;
+      this.trigger('activeServerChange', md);
+    }
+  }
 });