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

MeshCtrl.js fixes and improvements.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2021-03-11 11:51:07 -08:00
parent b68afcde6a
commit eb2eaac703
1 changed files with 87 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
meshctrl.js
View File

@ -1356,9 +1356,10 @@ function serverConnect() {
break; break;
} }
case 'deviceinfo': { case 'deviceinfo': {
settings.deviceinfocount = 3; settings.deviceinfocount = 4;
ws.send(JSON.stringify({ action: 'getnetworkinfo', nodeid: args.id, nodeinfo: true, responseid: 'meshctrl' })); ws.send(JSON.stringify({ action: 'nodes' }));
ws.send(JSON.stringify({ action: 'lastconnect', nodeid: args.id, nodeinfo: true, responseid: 'meshctrl' })); ws.send(JSON.stringify({ action: 'getnetworkinfo', nodeid: args.id, responseid: 'meshctrl' }));
ws.send(JSON.stringify({ action: 'lastconnect', nodeid: args.id, responseid: 'meshctrl' }));
ws.send(JSON.stringify({ action: 'getsysinfo', nodeid: args.id, nodeinfo: true, responseid: 'meshctrl' })); ws.send(JSON.stringify({ action: 'getsysinfo', nodeid: args.id, nodeinfo: true, responseid: 'meshctrl' }));
break; break;
} }
@ -1641,27 +1642,22 @@ function serverConnect() {
} }
case 'getsysinfo': { // DEVICEINFO case 'getsysinfo': { // DEVICEINFO
if (settings.cmd == 'deviceinfo') { if (settings.cmd == 'deviceinfo') {
if (data.result) { settings.sysinfo = (data.result) ? null : data;
console.log(data.result); if (--settings.deviceinfocount == 0) { displayDeviceInfo(settings.sysinfo, settings.lastconnect, settings.networking, settings.nodes); process.exit(); }
process.exit();
} else {
settings.sysinfo = data;
if (--settings.deviceinfocount == 0) { displayDeviceInfo(settings.sysinfo, settings.lastconnect, settings.networking); process.exit(); }
}
} }
break; break;
} }
case 'lastconnect': { case 'lastconnect': {
if (settings.cmd == 'deviceinfo') { if (settings.cmd == 'deviceinfo') {
settings.lastconnect = (data.result)?null:data; settings.lastconnect = (data.result) ? null : data;
if (--settings.deviceinfocount == 0) { displayDeviceInfo(settings.sysinfo, settings.lastconnect, settings.networking); process.exit(); } if (--settings.deviceinfocount == 0) { displayDeviceInfo(settings.sysinfo, settings.lastconnect, settings.networking, settings.nodes); process.exit(); }
} }
break; break;
} }
case 'getnetworkinfo': { case 'getnetworkinfo': {
if (settings.cmd == 'deviceinfo') { if (settings.cmd == 'deviceinfo') {
settings.networking = (data.result) ? null : data; settings.networking = (data.result) ? null : data;
if (--settings.deviceinfocount == 0) { displayDeviceInfo(settings.sysinfo, settings.lastconnect, settings.networking); process.exit(); } if (--settings.deviceinfocount == 0) { displayDeviceInfo(settings.sysinfo, settings.lastconnect, settings.networking, settings.nodes); process.exit(); }
} }
break; break;
} }
@ -1791,6 +1787,10 @@ function serverConnect() {
break; break;
} }
case 'nodes': { case 'nodes': {
if (settings.cmd == 'deviceinfo') {
settings.nodes = (data.result) ? null : data;
if (--settings.deviceinfocount == 0) { displayDeviceInfo(settings.sysinfo, settings.lastconnect, settings.networking, settings.nodes); process.exit(); }
}
if ((settings.cmd == 'listdevices') && (data.responseid == 'meshctrl')) { if ((settings.cmd == 'listdevices') && (data.responseid == 'meshctrl')) {
if ((data.result != null) && (data.result != 'ok')) { if ((data.result != null) && (data.result != 'ok')) {
console.log(data.result); console.log(data.result);
@ -2075,18 +2075,37 @@ function csvFormatArray(x) {
return y.join(','); return y.join(',');
} }
function displayDeviceInfo(sysinfo, lastconnect, network) { function displayDeviceInfo(sysinfo, lastconnect, network, nodes) {
var node = sysinfo.node; //console.log('displayDeviceInfo', sysinfo, lastconnect, network, nodes);
var hardware = sysinfo.hardware;
// Fetch the node information
var node = null;;
if (sysinfo != null && (sysinfo.node != null)) {
// Node information came with system information
node = sysinfo.node;
} else {
// This device does not have system information, get node information from the nodes list.
for (var m in nodes.nodes) {
for (var n in nodes.nodes[m]) {
if (nodes.nodes[m][n]._id.indexOf(args.id) >= 0) { node = nodes.nodes[m][n]; }
}
}
}
if (node == null) {
console.log("Invalid device id");
process.exit(); return;
}
var info = {}; var info = {};
if (network != null) { sysinfo.netif = network.netif; } //if (network != null) { sysinfo.netif = network.netif; }
if (lastconnect != null) { node.lastconnect = lastconnect.time; node.lastaddr = lastconnect.addr; } if (lastconnect != null) { node.lastconnect = lastconnect.time; node.lastaddr = lastconnect.addr; }
if (args.raw) { console.log(JSON.stringify(sysinfo, ' ', 2)); return; } if (args.raw) { console.log(JSON.stringify(sysinfo, ' ', 2)); return; }
// General // General
var output = {}, outputCount = 0; var output = {}, outputCount = 0;
if (node.rname) { output["Server Name"] = node.name; outputCount++; } if (node.name) { output["Server Name"] = node.name; outputCount++; }
if (node.rname) { output["Computer Name"] = node.rname; outputCount++; }
if (node.host != null) { output["Hostname"] = node.host; outputCount++; } if (node.host != null) { output["Hostname"] = node.host; outputCount++; }
if (node.ip != null) { output["IP Address"] = node.ip; outputCount++; } if (node.ip != null) { output["IP Address"] = node.ip; outputCount++; }
if (node.desc != null) { output["Description"] = node.desc; outputCount++; } if (node.desc != null) { output["Description"] = node.desc; outputCount++; }
@ -2106,14 +2125,19 @@ function displayDeviceInfo(sysinfo, lastconnect, network) {
} }
output["AntiVirus"] = av; outputCount++; output["AntiVirus"] = av; outputCount++;
} }
if (typeof node.wsc == 'object') {
output["WindowsSecurityCenter"] = node.wsc; outputCount++;
}
if (outputCount > 0) { info["General"] = output; } if (outputCount > 0) { info["General"] = output; }
// Operating System // Operating System
if ((hardware.windows && hardware.windows.osinfo) || node.osdesc) { var hardware = null;
if ((sysinfo != null) && (sysinfo.hardware != null)) { hardware = sysinfo.hardware; }
if ((hardware && hardware.windows && hardware.windows.osinfo) || node.osdesc) {
var output = {}, outputCount = 0; var output = {}, outputCount = 0;
if (node.rname) { output["Name"] = node.rname; outputCount++; } if (node.rname) { output["Name"] = node.rname; outputCount++; }
if (node.osdesc) { output["Version"] = node.osdesc; outputCount++; } if (node.osdesc) { output["Version"] = node.osdesc; outputCount++; }
if (hardware.windows && hardware.windows.osinfo) { var m = hardware.windows.osinfo; if (m.OSArchitecture) { output["Architecture"] = m.OSArchitecture; outputCount++; } } if (hardware && hardware.windows && hardware.windows.osinfo) { var m = hardware.windows.osinfo; if (m.OSArchitecture) { output["Architecture"] = m.OSArchitecture; outputCount++; } }
if (outputCount > 0) { info["Operating System"] = output; } if (outputCount > 0) { info["Operating System"] = output; }
} }
@ -2180,6 +2204,7 @@ function displayDeviceInfo(sysinfo, lastconnect, network) {
if (outputCount > 0) { info["Intel Active Management Technology (Intel AMT)"] = output; } if (outputCount > 0) { info["Intel Active Management Technology (Intel AMT)"] = output; }
} }
if (hardware != null) {
if (hardware.identifiers) { if (hardware.identifiers) {
var output = {}, outputCount = 0, ident = hardware.identifiers; var output = {}, outputCount = 0, ident = hardware.identifiers;
// BIOS // BIOS
@ -2229,6 +2254,7 @@ function displayDeviceInfo(sysinfo, lastconnect, network) {
} }
} }
} }
}
// Display everything // Display everything
if (args.json) { if (args.json) {