external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

Last Connect improvements, #2939

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2021-07-27 00:13:41 -07:00
parent a5ab48242a
commit e55d04a2c6
38 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

35
meshuser.js
View file

@ -5404,7 +5404,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
'getnetworkinfo': serverCommandGetNetworkInfo,
'getsysinfo': serverCommandGetSysInfo,
'lastconnect': serverCommandLastConnect,
'lastseen': serverCommandLastSeen,
'lastconnects': serverCommandLastConnects,
'meshes': serverCommandMeshes,
'serverconsole': serverCommandServerConsole,
'servererrors': serverCommandServerErrors,
@ -5538,27 +5538,22 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
});
}
function serverCommandLastSeen(command) {
var links = parent.GetAllMeshIdWithRights(user);
var extraids = getUserExtraIds();
db.GetAllTypeNoTypeFieldMeshFiltered(links, extraids, domain.id, 'node', null, (err, docs) => {
if (docs == null) { docs = []; }
function serverCommandLastConnects(command) {
const links = parent.GetAllMeshIdWithRights(user);
const extraids = getUserExtraIds();
db.GetAllTypeNoTypeFieldMeshFiltered(links, extraids, domain.id, 'node', null, function (err, docs) {
if (docs == null) return;
// use associative array to join lastconnects on to users's nodes (left join)
var LCs = {}
for (var i in docs) {
LCs[docs[i]._id] = '';
}
// Create a list of node ids for this user and query them for last device connection time
const ids = []
for (var i in docs) { ids.push('lc' + docs[i]._id); }
db.GetAllType('lastconnect', (err, docs) => {
for (var j in docs) {
var nodeid = docs[j]._id.substring(2);
if (LCs[nodeid] != null) {
LCs[nodeid] = docs[j].time;
}
}
try { ws.send(JSON.stringify({ action: 'lastseen', lastconnects: LCs })); } catch (ex) { }
// Pull list of last connections only for device owned by this user
db.GetAllIdsOfType(ids, domain.id, 'lastconnect', function (err, docs) {
if (docs == null) return;
const response = {};
for (var j in docs) { response[docs[j]._id.substring(2)] = docs[j].time; }
try { ws.send(JSON.stringify({ action: 'lastconnects', lastconnects: response, tag: command.tag })); } catch (ex) { }
});
});
}