DB performance fixes.

db.js

@@ -71,10 +71,12 @@ module.exports.CreateDB = function (parent) {
             // Check if we need to reset indexes
             var indexesByName = {}, indexCount = 0;
             for (var i in indexes) { indexesByName[indexes[i].name] = indexes[i]; indexCount++; }
-            if ((indexCount != 3) || (indexesByName['IdsAndTime1'] == null) || (indexesByName['ExpireTime1'] == null)) {
+            if ((indexCount != 5) || (indexesByName['Username1'] == null) || (indexesByName['DomainNodeTime1'] == null) || (indexesByName['IdsAndTime1'] == null) || (indexesByName['ExpireTime1'] == null)) {
                 // Reset all indexes
                 console.log('Resetting events indexes...');
                 obj.eventsfile.dropIndexes(function (err) {
+                    obj.eventsfile.createIndex({ username: 1 }, { sparse: 1, name: 'Username1' });
+                    obj.eventsfile.createIndex({ domain: 1, nodeid: 1, time: -1 }, { sparse: 1, name: 'DomainNodeTime1' });
                     obj.eventsfile.createIndex({ ids: 1, time: -1 }, { sparse: 1, name: 'IdsAndTime1' });
                     obj.eventsfile.createIndex({ "time": 1 }, { expireAfterSeconds: expireEventsSeconds, name: 'ExpireTime1' });
                 });

meshagent.js

@@ -1017,8 +1017,9 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
                     if ((command.intelamt.uuid != null) && (device.intelamt.uuid != command.intelamt.uuid)) { changes.push('AMT uuid'); device.intelamt.uuid = command.intelamt.uuid; change = 1; log = 1; }
                 }
                 if ((command.users != null) && (device.users != command.users)) { device.users = command.users; change = 1; } // Don't save this to the db.
-                if (mesh.mtype == 2) {
+                if ((mesh.mtype == 2) && (!obj.args.wanonly)) {
-                    if (device.host != obj.remoteaddr) { device.host = obj.remoteaddr; change = 1; log = 1; changes.push('host'); }
+                    // In WAN mode, the hostname of a computer is not important. Don't log hostname changes.
+                    if (device.host != obj.remoteaddr) { device.host = obj.remoteaddr; change = 1; changes.push('host'); }
                     // TODO: Check that the agent has an interface that is the same as the one we got this websocket connection on. Only set if we have a match.
                 }
 

mpsserver.js

@@ -246,10 +246,8 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) {
 
                     // Check the CIRA username, which should be the start of the MeshID.
                     if (usernameLen != 16) { Debug(1, 'MPS:Username length not 16', username, password); SendUserAuthFail(socket); return -1; }
-                    var meshIdStart = '/' + username;
+                    var meshIdStart = '/' + username, mesh = null;
-                    obj.db.GetAllType('mesh', function (err, docs) {
+                    if (obj.parent.webserver.meshes) { for (var i in obj.parent.webserver.meshes) { if (obj.parent.webserver.meshes[i]._id.replace(/\@/g, 'X').replace(/\$/g, 'X').indexOf(meshIdStart) > 0) { mesh = obj.parent.webserver.meshes[i]; break; } } }
-                        var mesh = null;
-                        for (var i in docs) { if (docs[i]._id.replace(/\@/g, 'X').replace(/\$/g, 'X').indexOf(meshIdStart) > 0) { mesh = docs[i]; break; } }
                     if (mesh == null) { Debug(1, 'MPS:Mesh not found', username, password); SendUserAuthFail(socket); return -1; }
 
                     // If this is a agent-less mesh, use the device guid 3 times as ID.
@@ -293,7 +291,7 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) {
                         });
                     } else if (mesh.mtype == 2) { // If this is a agent mesh, search the mesh for this device UUID
                         // Intel AMT GUID (socket.tag.SystemId) will be used to search the node
-                            obj.db.getAmtUuidNode(mesh._id, socket.tag.SystemId, function (err, nodes) {
+                        obj.db.getAmtUuidNode(mesh._id, socket.tag.SystemId, function (err, nodes) { // TODO: May need to optimize this request with indexes
                             if (nodes.length == 0) {
                                 // New CIRA connection for unknown node, disconnect.
                                 console.log('CIRA connection for unknown node. meshid: ' + mesh._id + ', uuid: ' + systemid);
@@ -319,7 +317,6 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) {
                         socket.end();
                         return;
                     }
-                    });
                     return 18 + usernameLen + serviceNameLen + methodNameLen + passwordLen;
                 }
                 case APFProtocol.SERVICE_REQUEST: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.2.8-y",
+  "version": "0.2.8-z",
   "keywords": [
     "Remote Management",
     "Intel AMT",

public/scripts/agent-redir-ws-0.1.0.js

@@ -39,7 +39,7 @@ var CreateAgentRedirect = function (meshserver, module, serverPublicNamePort, au
         obj.socket.onopen = obj.xxOnSocketConnected;
         obj.socket.onmessage = obj.xxOnMessage;
         //obj.socket.onmessage = function (e) { console.log('Websocket data', e.data); obj.xxOnMessage(e); }
-        obj.socket.onerror = function (e) { console.error(e); }
+        obj.socket.onerror = function (e) { /* console.error(e); */ }
         obj.socket.onclose = obj.xxOnSocketClosed;
         obj.xxStateChange(1);
         //obj.meshserver.send({ action: 'msg', type: 'tunnel', nodeid: obj.nodeid, value: url2 });

views/default.handlebars

@@ -1803,7 +1803,7 @@
                         }
                         case 'stopped': { // Server is stopping.
                             // Disconnect
-                            console.log(message.msg);
+                            //console.log(message.msg);
                             break;
                         }
                         default:
@@ -3391,6 +3391,10 @@
         var powerTimeline = null;
         function getCurrentNode() { return currentNode; };
         function gotoDevice(nodeid, panel, refresh, event) {
+
+            // Check if we are allowed to create a new device group
+            if ((userinfo.emailVerified !== true) && (serverinfo.emailcheck == true) && (userinfo.siteadmin != 0xFFFFFFFF)) { setDialogMode(2, "New Device Group", 1, null, "Unable to create a new device group until a email address is verified. This is required for password recovery. Go to the \"My Account\" tab to change and verify an email address."); return; }
+
             if (event && (event.shiftKey == true)) {
                 // Open the device in a different tab
                 window.open(window.location.origin + '?node=' + nodeid.split('/')[2] + '&viewmode=10&hide=16', 'meshcentral:' + nodeid);
@@ -4266,7 +4270,7 @@
         }
 
         function applyDesktopSettings() {
-            var r = '', ops = (features & 512)?[90,70,50,40,30,20,10,5,1]:[50,40,30,20,10,5,1];
+            var r = '', ops = (features & 512)?[90,80,70,60,50,40,30,20,10,5,1]:[60,50,40,30,20,10,5,1];
             for (var i in ops) { r += '<option value=' + ops[i] + '>' + ops[i] + '%</option>'; }
             QH('d7bitmapquality', r);
             d7desktopmode.value = desktopsettings.encoding;
@@ -5580,7 +5584,7 @@
             if (xxdialogMode) return;
 
             // Check if we are allowed to create a new device group
-            if ((userinfo.emailVerified !== true) && (userinfo.email != null) && (serverinfo.emailcheck == true) && (userinfo.siteadmin != 0xFFFFFFFF)) { setDialogMode(2, "New Device Group", 1, null, "Unable to create a new device group until the email address is verified. Go to the \"My Account\" tab to change and verify an email address."); return; }
+            if ((userinfo.emailVerified !== true) && (serverinfo.emailcheck == true) && (userinfo.siteadmin != 0xFFFFFFFF)) { setDialogMode(2, "New Device Group", 1, null, "Unable to create a new device group until a email address is verified. This is required for password recovery. Go to the \"My Account\" tab to change and verify an email address."); return; }
 
             // We are allowed, let's prompt to information
             var x = "Create a new device group using the options below.<br /><br />";