Bug Fix: Server group assignments were not correctly being passed to xySat when autoGroup was set.

Author: jhuckaby

lib/comm.js

@@ -196,22 +196,22 @@ class Communication {
 				delete socket.server.nonce; // no longer needed
 
 				// join the network
-				this.addServer(socket.server);
+				this.addServer(socket.server, function() {
+					// make sure server has vital data
+					socket.send('joined', {
+						config: Tools.mergeHashes( { airgap: self.config.get('airgap') }, self.config.getPath('satellite.config') ),
+						masterData: self.masterData,
+						groups: socket.server.groups, // in case it was auto-assigned by hostname
+						plugins: Tools.findObjects( self.plugins, { type: 'event' } ),
+						commands: self.getCommandsWithSecrets(),
+						numServers: Tools.numKeys(self.servers)
+					});
+				});
 
 				// socket is auth'ed
 				this.logComm(6, "Server socket has authenticated successfully: " + socket.id);
 				socket.auth = true;
 				socket.type = 'server';
-				
-				// make sure server has vital data
-				socket.send('joined', {
-					config: Tools.mergeHashes( { airgap: this.config.get('airgap') }, this.config.getPath('satellite.config') ),
-					masterData: this.masterData,
-					groups: socket.server.groups, // in case it was auto-assigned by hostname
-					plugins: Tools.findObjects( this.plugins, { type: 'event' } ),
-					commands: this.getCommandsWithSecrets(),
-					numServers: Tools.numKeys(this.servers)
-				});
 			break;
 
 			case 'authenticate':

lib/server.js

@@ -37,7 +37,7 @@ class ServerManager {
 		return true;
 	}
 
-	addServer(server) {
+	addServer(server, callback) {
 		// add server to network, or update for reconnect
 		var self = this;
 
@@ -135,6 +135,8 @@ class ServerManager {
 				}
 				self.emit('serverAdded', server);
 			}); // unbase.insert
+			
+			callback();
 		}); // unbase.get
 	}