Added traffic delta functions.
Ylian Saint-Hilaire committed
May 5, 2021 at 14:15 UTC
56d0f2aafc4844420e42aba331668ac333bb0453
3 files changed
+36
-2
MeshCentralServer.njsproj
-1
@@ -572,7 +572,6 @@
572
<Content Include="views\player.handlebars" />
573
<Content Include="views\sharing.handlebars" />
574
<Content Include="views\ssh.handlebars" />
575
- <Content Include="views\terminal.handlebars" />
575
<Content Include="views\terms-mobile.handlebars" />
576
<Content Include="views\terms.handlebars" />
577
<Content Include="views\xterm.handlebars" />
meshuser.js
+19
-1
@@ -905,7 +905,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
905
906
switch (cmd) {
907
case 'help': {
908
- var fin = '', f = '', availcommands = 'help,maintenance,info,versions,resetserver,usersessions,closeusersessions,tasklimiter,setmaxtasks,cores,migrationagents,agentstats,agentissues,webstats,trafficstats,mpsstats,swarmstats,acceleratorsstats,updatecheck,serverupdate,nodeconfig,heapdump,relays,autobackup,backupconfig,dupagents,dispatchtable,badlogins,showpaths,le,lecheck,leevents,dbstats,dbcounters,sms,amtacm,certhashes,watchdog,amtmanager,amtpasswords,certexpire';
908
+ var fin = '', f = '', availcommands = 'help,maintenance,info,versions,resetserver,usersessions,closeusersessions,tasklimiter,setmaxtasks,cores,migrationagents,agentstats,agentissues,webstats,trafficstats,trafficdelta,mpsstats,swarmstats,acceleratorsstats,updatecheck,serverupdate,nodeconfig,heapdump,relays,autobackup,backupconfig,dupagents,dispatchtable,badlogins,showpaths,le,lecheck,leevents,dbstats,dbcounters,sms,amtacm,certhashes,watchdog,amtmanager,amtpasswords,certexpire';
909
if (parent.parent.config.settings.heapdump === true) { availcommands += ',heapdump'; }
910
availcommands = availcommands.split(',').sort();
911
while (availcommands.length > 0) { if (f.length > 80) { fin += (f + ',\r\n'); f = ''; } f += (((f != '') ? ', ' : ' ') + availcommands.shift()); }
@@ -1120,6 +1120,14 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
1120
}
1121
break;
1122
}
1123
+ case 'trafficdelta': {
1124
+ const stats = parent.getTrafficDelta(obj.trafficStats);
1125
+ obj.trafficStats = stats.current;
1126
+ for (var i in stats.delta) {
1127
+ if (typeof stats.delta[i] == 'object') { r += (i + ': ' + JSON.stringify(stats.delta[i]) + '\r\n'); } else { r += (i + ': ' + stats.delta[i] + '\r\n'); }
1128
+ }
1129
+ break;
1130
+ }
1131
case 'watchdog': {
1132
if (parent.parent.watchdog == null) {
1133
r = 'Server watchdog not active.';
@@ -5823,6 +5831,16 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
5831
});
5832
break;
5833
}
5834
+ case 'trafficstats': {
5835
+ try { ws.send(JSON.stringify({ action: 'trafficstats', stats: parent.getTrafficStats() })); } catch (ex) { }
5836
+ break;
5837
+ }
5838
+ case 'trafficdelta': {
5839
+ const stats = parent.getTrafficDelta(obj.trafficStats);
5840
+ obj.trafficStats = stats.current;
5841
+ try { ws.send(JSON.stringify({ action: 'trafficdelta', delta: stats.delta })); } catch (ex) { }
5842
+ break;
5843
+ }
5844
case 'getDeviceDetails': {
5845
if (common.validateStrArray(command.nodeids, 1) == false) break; // Check nodeids
5846
if (common.validateString(command.type, 3, 4) == false) break; // Check type
webserver.js
+17
@@ -361,7 +361,24 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
361
CIRAIn: 0,
362
CIRAOut: 0
363
}
364
+ obj.trafficStats.time = Date.now();
365
obj.getTrafficStats = function () { return obj.trafficStats; }
366
+ obj.getTrafficDelta = function (oldTraffic) { // Return the difference between the old and new data along with the delta time.
367
+ const data = obj.common.Clone(obj.trafficStats);
368
+ data.time = Date.now();
369
+ const delta = calcDelta(oldTraffic ? oldTraffic : {}, data);
370
+ if (oldTraffic && oldTraffic.time) { delta.delta = (data.time - oldTraffic.time); }
371
+ delta.time = data.time;
372
+ return { current: data, delta: delta }
373
+ }
374
+ function calcDelta(oldData, newData) { // Recursive function that computes the difference of all numbers
375
+ const r = {};
376
+ for (var i in newData) {
377
+ if (typeof newData[i] == 'object') { r[i] = calcDelta(oldData[i] ? oldData[i] : {}, newData[i]); }
378
+ if (typeof newData[i] == 'number') { if (typeof oldData[i] == 'number') { r[i] = (newData[i] - oldData[i]); } else { r[i] = newData[i]; } }
379
+ }
380
+ return r;
381
+ }
382
383
// Keep a record of the last agent issues.
384
obj.getAgentIssues = function () { return obj.agentIssues; }