Added satellite status to userSessions command.
Ylian Saint-Hilaire committed
Apr 11, 2022 at 13:11 UTC
3d3e46f5fa101f4aa6b3b5a93d3f6b96db3f12fd
1 file changed
+5
-3
meshuser.js
+5
-3
@@ -429,7 +429,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
429
}
430
431
// This is a MeshCentral Satellite message
432
- if (event.action == 'satellite') { if ((obj.satelliteFlags & event.satelliteFlags) != 0) { try { ws.send(JSON.stringify(event)); } catch (ex) { } return; } }
432
+ if (event.action == 'satellite') { if ((obj.ws.satelliteFlags & event.satelliteFlags) != 0) { try { ws.send(JSON.stringify(event)); } catch (ex) { } return; } }
433
434
// Because of the device group "Show Self Events Only", we need to do more checks here.
435
if (id.startsWith('mesh/')) {
@@ -4823,7 +4823,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
4823
}
4824
case 'satellite': {
4825
// Command indicates this is a MeshCentral Satellite session and what featues it supports
4826
- if ((command.setFlags != null) && (typeof command.setFlags == 'number')) { obj.satelliteFlags = command.setFlags; }
4826
+ if ((command.setFlags != null) && (typeof command.setFlags == 'number')) { obj.ws.satelliteFlags = command.setFlags; }
4827
if ((command.reqid != null) && (typeof command.satelliteFlags == 'number')) {
4828
const event = { action: 'satelliteResponse', subaction: command.subaction, reqid: command.reqid, response: command.response, satelliteFlags: command.satelliteFlags, nolog: 1 }
4829
if (typeof command.nodeid == 'string') { event.nodeid = command.nodeid; }
@@ -6690,7 +6690,9 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
6690
userSessionCount++;
6691
cmdData.result += (i + ', ' + parent.wssessions[i].length + ' session' + ((parent.wssessions[i].length > 1) ? 's' : '') + '.\r\n');
6692
for (var j in parent.wssessions[i]) {
6693
- cmdData.result += ' ' + parent.wssessions[i][j].clientIp + ' --> ' + parent.wssessions[i][j].sessionId + ((parent.wssessions[i][j].xclosed) ? (', CLOSED-' + parent.wssessions[i][j].xclosed):'') + '\r\n';
6693
+ var extras = "";
6694
+ if (parent.wssessions[i][j].satelliteFlags) { extras += ', Satellite'; }
6695
+ cmdData.result += ' ' + parent.wssessions[i][j].clientIp + ' --> ' + parent.wssessions[i][j].sessionId + extras + ((parent.wssessions[i][j].xclosed) ? (', CLOSED-' + parent.wssessions[i][j].xclosed):'') + '\r\n';
6696
}
6697
}
6698
}