porting over old server configs

Author: rmisio

js/languages/en-US.json

@@ -675,6 +675,7 @@
     "password": "Password",
     "saveChanges": "Save Changes",
     "defaultServerName": "default",
+    "portedConnectionName": "ported connection",
     "connectionFailed": "Connection failed to %{serverName}",
     "connectingTo": "Connecting to %{serverName}",
     "connectingToDefault": "Connecting to the default server",

js/main.js

@@ -93,13 +93,41 @@ user.on('change:language', function(md, lang) {
 
 app.serverConfigs = new ServerConfigsCl();
 app.serverConfigs.fetch().done(() => {
+  var oldConfig,
+      defaultConfig;
+
   if (!app.serverConfigs.getActive()) {
-    app.serverConfigs.setActive(
-      app.serverConfigs.serverConfigs.create({
-        name: polyglot.t('serverConnectModal.defaultServerName'),
-        default: true
-      }).id
-    );
+    defaultConfig = app.serverConfigs.create({
+      name: polyglot.t('serverConnectModal.defaultServerName'),
+      default: true
+    })
+
+    // migrate any existing connection from the
+    // old single config set-up (_serverConfig-1)
+    if (oldConfig = localStorage['_serverConfig-1']) {
+      oldConfig = JSON.parse(oldConfig);
+      
+      app.serverConfigs.setActive(
+        app.serverConfigs.create(
+          __.extend(
+            {},
+            __.omit(oldConfig, ['local_username', 'local_password', 'id']),
+            { name: polyglot.t('serverConnectModal.portedConnectionName') }
+          )
+        ).id          
+      );
+
+      if (oldConfig.local_username && oldConfig.local_password) {
+        defaultConfig.save({
+          local_username: oldConfig.local_username,
+          local_password: oldConfig.local_password
+        });
+      }
+
+      localStorage.removeItem('_serverConfig-1');
+    } else {
+      app.serverConfigs.setActive(defaultConfig.id);
+    }
   }  
 });
 
@@ -397,7 +425,7 @@ launchOnboarding = function(guidCreating) {
 
 pageConnectModal.on('cancel', () => {
   removeStartupRetry();
-  app.getHeartbeatSocket().close();
+  app.getHeartbeatSocket().cancel();
   pageConnectModal.remove();
   app.serverConnectModal.open();
 }).render().open();
@@ -430,7 +458,7 @@ app.getHeartbeatSocket().on('close', (startUpRetry = function(e) {
     Date.now() - startTime < startUpConnectMaxTime &&
     startUpConnectMaxRetries
   ) {
-    setTimeout(() => {
+    startUpRetry.timeout = setTimeout(() => {
       startUpConnectMaxRetries--;
       app.connectHeartbeatSocket();
     }, startUpConnectRetryDelay);
@@ -441,8 +469,9 @@ app.getHeartbeatSocket().on('close', (startUpRetry = function(e) {
 }));
 
 removeStartupRetry = function() {
+  clearTimeout(startUpRetry.timeout);
   app.getHeartbeatSocket().off('close', startUpRetry);
-  app.getHeartbeatSocket().on('close', () => {
+  app.getHeartbeatSocket().on('close', (e) => {
     app.serverConnectModal.failConnection(null, app.serverConfigs.getActive())
       .open();    
   });

js/utils/Socket.js

@@ -18,11 +18,11 @@ Socket.prototype.connect = function(url) {
   this.url = url || this.url;
 
   if (this._socket) {
-    this._socket.close();
     this._socket.onopen = null;
     this._socket.onclose = null;
     this._socket.onerror = null;
     this._socket.onmessage = null;
+    this._socket.close();
   }
 
   this._socket = new WebSocket(this.url);
@@ -57,6 +57,18 @@ Socket.prototype.send = function() {
   this._socket.send.apply(this._socket, arguments);
 };
 
+Socket.prototype.cancel = function() {
+  // this will not result in a 'close' event
+  // todo: perhaps we should fire a 'cancel' event?
+  if (this._socket) {
+    this._socket.onopen = null;
+    this._socket.onclose = null;
+    this._socket.onerror = null;
+    this._socket.onmessage = null;
+    this._socket.close();
+  }  
+};
+
 Socket.prototype.getReadyState = function() {
   return this._socket.readyState;
 };