MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-02-03 18:05:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improved device timeline

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2019-06-18 09:28:21 -07:00
parent aba9dc4e88
commit 3b6a805c7c
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
meshuser.js
View File

@ -424,34 +424,20 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
if ((err == null) && (docs != null) && (docs.length > 0)) { if ((err == null) && (docs != null) && (docs.length > 0)) {
var timeline = [], time = null, previousPower; var timeline = [], time = null, previousPower;
for (i in docs) { for (i in docs) {
var doc = docs[i]; var doc = docs[i], j = parseInt(i);
// Skip all starting power 0 events.
if ((time == null) && (doc.power == 0) && ((doc.oldPower == null) || (doc.oldPower == 0))) { continue; }
doc.time = Date.parse(doc.time); doc.time = Date.parse(doc.time);
if (time == null) { if (time == null) { // First element
// First element // Skip all starting power 0 events.
if ((doc.power == 0) && ((doc.oldPower == null) || (doc.oldPower == 0))) continue;
time = doc.time;
if (doc.oldPower) { timeline.push(doc.oldPower, time / 1000, doc.power); } else { timeline.push(0, time / 1000, doc.power); }
} else if (previousPower != doc.power) { // Delta element
// If this event is of a short duration (2 minutes or less), skip it.
if ((docs.length > (j + 1)) && ((Date.parse(docs[j + 1].time) - doc.time) < 120000)) continue;
timeline.push((doc.time - time) / 1000, doc.power);
time = doc.time; time = doc.time;
if (doc.oldPower) { timeline.push(doc.oldPower); } else { timeline.push(0); }
timeline.push(time / 1000);
timeline.push(doc.power);
previousPower = doc.power;
} else {
// Delta element
if ((previousPower != doc.power) && ((doc.time - time) > 60000)) { // To boost speed, small blocks get approximated.
// Create a new timeline
timeline.push((doc.time - time) / 1000);
timeline.push(doc.power);
time = doc.time;
previousPower = doc.power;
} else {
// Merge with previous timeline
timeline[timeline.length - 2] += ((doc.time - time) / 1000);
timeline[timeline.length - 1] = doc.power;
previousPower = doc.power;
}
} }
previousPower = doc.power;
} }
try { ws.send(JSON.stringify({ action: 'powertimeline', nodeid: command.nodeid, timeline: timeline, tag: command.tag })); } catch (ex) { } try { ws.send(JSON.stringify({ action: 'powertimeline', nodeid: command.nodeid, timeline: timeline, tag: command.tag })); } catch (ex) { }
} else { } else {

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "meshcentral", "name": "meshcentral",
"version": "0.3.6-p", "version": "0.3.6-r",
"keywords": [ "keywords": [
"Remote Management", "Remote Management",
"Intel AMT", "Intel AMT",