From 3b6a805c7c07d84949e6f90c30ab850ee2cd5814 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Tue, 18 Jun 2019 09:28:21 -0700
Subject: [PATCH] Improved device timeline

---
 meshuser.js  | 36 +++++++++++-------------------------
 package.json |  2 +-
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/meshuser.js b/meshuser.js
index 0bb1cb03..053525e6 100644
--- a/meshuser.js
+++ b/meshuser.js
@@ -424,34 +424,20 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                         if ((err == null) && (docs != null) && (docs.length > 0)) {
                             var timeline = [], time = null, previousPower;
                             for (i in docs) {
-                                var doc = docs[i];
-
-                                // Skip all starting power 0 events.
-                                if ((time == null) && (doc.power == 0) && ((doc.oldPower == null) || (doc.oldPower == 0))) { continue; }
-
+                                var doc = docs[i], j = parseInt(i);
                                 doc.time = Date.parse(doc.time);
-                                if (time == null) {
-                                    // First element
+                                if (time == null) { // 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;
-                                    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) { }
                         } else {
diff --git a/package.json b/package.json
index f4870999..a5c8a87b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.3.6-p",
+  "version": "0.3.6-r",
   "keywords": [
     "Remote Management",
     "Intel AMT",