Bug Fix: When a browser reconnects after losing a WebSocket connection, push a full data update to resync. Ref #302

Author: jhuckaby

htdocs/js/comm.js

@@ -9,6 +9,7 @@ app.comm = {
 	statusTimeoutSec: 60,
 	socket: null,
 	commandQueue: [],
+	attempt: 0,
 
 	init: function() {
 		// connect to server via socket.io
@@ -42,6 +43,7 @@ app.comm = {
 		this.disconnect();
 
 		Debug.trace('comm', "WebSocket Connect: " + url);
+		this.attempt++;
 
 		// custom socket abstraction layer
 		var socket = this.socket = {
@@ -78,7 +80,7 @@ app.comm = {
 			Debug.trace('comm', "WebSocket connected successfully");
 
 			// authenticate websocket now
-			socket.emit( 'authenticate', {} );
+			socket.emit( 'authenticate', { attempt: self.attempt } );
 		};
 
 		socket.ws.onmessage = function (event) {

htdocs/js/pages/PageUtils.class.js

@@ -4609,8 +4609,8 @@ Page.PageUtils = class PageUtils extends Page.Base {
 				break;
 
 				case 'group':
-					pairs.push([ ' ' ]);
-					nice_id = ' ';
+					pairs.push([ '-' ]);
+					nice_id = '-';
 				break;
 			}
 			for (var idy = 0, ley = pairs.length; idy < ley; idy++) {

htdocs/js/pages/Servers.class.js

@@ -212,6 +212,7 @@ Page.Servers = class Servers extends Page.ServerUtils {
 		this.applyTableFilters();
 		this.addPageDescription();
 		this.checkAllSatelliteVersions();
+		this.setupBoxButtonFloater();
 
 		SingleSelect.init( this.div.find('#fe_es_filter') );
 
@@ -2098,6 +2099,8 @@ Page.Servers = class Servers extends Page.ServerUtils {
 			this.raf = false;
 		}
 
+		this.cleanupBoxButtonFloater();
+		
 		this.div.html( '' );
 		return true;
 	}

lib/comm.js

@@ -231,7 +231,7 @@ class Communication {
 
 			case 'authenticate':
 				// user (human) is trying to authenticate
-				this.logComm(9, "Incoming socket auth request from client");
+				this.logComm(9, "Incoming socket auth request from client", data);
 
 				// handle case when we are not master, send back retry command
 				if (!this.master) {
@@ -272,6 +272,34 @@ class Communication {
 
 					self.logComm(6, "User socket has authenticated successfully: " + socket.id, { username: user.username });
 					socket.send( 'login', { version: self.server.__version } );
+					
+					// update essential client data if this is a reconnect
+					if (data.attempt && (data.attempt > 1)) {
+						self.logComm(6, `Socket reconnected (${data.attempt}), sending full client data update`);
+						socket.send( 'update', {
+							activeAlerts: self.activeAlerts,
+							serverCache: self.serverCache,
+							
+							servers: self.servers,
+							groups: self.groups,
+							monitors: self.monitors,
+							alerts: self.alerts,
+							
+							categories: self.categories,
+							channels: self.channels,
+							web_hooks: self.web_hooks,
+							buckets: self.buckets,
+							secrets: self.secrets, // just metadata, no actual secrets in here
+							events: self.events,
+							plugins: self.plugins,
+							tags: self.tags,
+							roles: self.roles,
+							
+							state: self.state,
+							stats: self.stats,
+							masters: self.getMasterPeerData()
+						} );
+					}
 				} ); // loadSession
 			break;