@@ -696,6 +704,7 @@
var debugmode = false;
var attemptWebRTC = ((features & 128) != 0);
var StatusStrs = ["Disconnected", "Connecting...", "Setup...", "Connected", "Intel® AMT Connected"];
+ var agentsStr = ["Unknown", "Windows 32bit console", "Windows 64bit console", "Windows 32bit service", "Windows 64bit service", "Linux 32bit", "Linux 64bit", "MIPS", "XENx86", "Android ARM", "Linux ARM", "MacOS 32bit", "Android x86", "PogoPlug ARM", "Android APK", "Linux Poky x86-32bit", "MacOS 64bit", "ChromeOS", "Linux Poky x86-64bit", "Linux NoKVM x86-32bit", "Linux NoKVM x86-64bit", "Windows MinCore console", "Windows MinCore service", "NodeJS", "ARM-Linaro", "ARMv6l / ARMv7l", "ARMv8 64bit", "ARMv6l / ARMv7l / NoKVM", "Unknown", "Unknown", "FreeBSD x86-64"];
var files;
var passRequirements = '{{{passRequirements}}}';
if (passRequirements != '') { passRequirements = JSON.parse(decodeURIComponent(passRequirements)); }
@@ -898,6 +907,20 @@
if (currentNode._id == message.nodeid) { drawDeviceTimeline(); }
break;
}
+ case 'getsysinfo': {
+ if (message.nodeid != powerTimelineReq) break;
+ if (message.noinfo === true) {
+ updateDeviceDetails(getNodeFromId(message.nodeid));
+ } else {
+ updateDeviceDetails(getNodeFromId(message.nodeid), message.hardware);
+ }
+ break;
+ }
+ case 'getnetworkinfo': {
+ if (currentNode._id != message.nodeid) return;
+ updateDeviceDetails(getNodeFromId(message.nodeid), null, message);
+ break;
+ }
case 'otpauth-request': {
if ((xxdialogMode == 2) && (xxdialogTag == 'otpauth-request')) {
var secret = message.secret;
@@ -1255,6 +1278,13 @@
//addNotification(n);
break;
}
+ case 'sysinfohash': {
+ // If the sysinfo document has changed and we are looking at it, request an update.
+ if ((currentNode != null) && (message.event.nodeid == powerTimelineReq)) {
+ meshserver.send({ action: 'getsysinfo', nodeid: message.event.nodeid });
+ }
+ break;
+ }
case 'devicesessions': {
// List of sessions for a given device
var node = getNodeFromId(message.event.nodeid);
@@ -2211,7 +2241,6 @@
}
// Attribute: Mesh Agent
- var agentsStr = ["Unknown", "Windows 32bit console", "Windows 64bit console", "Windows 32bit service", "Windows 64bit service", "Linux 32bit", "Linux 64bit", "MIPS", "XENx86", "Android ARM", "Linux ARM", "MacOS 32bit", "Android x86", "PogoPlug ARM", "Android APK", "Linux Poky x86-32bit", "MacOS 64bit", "ChromeOS", "Linux Poky x86-64bit", "Linux NoKVM x86-32bit", "Linux NoKVM x86-64bit", "Windows MinCore console", "Windows MinCore service", "NodeJS", "ARM-Linaro", "ARMv6l / ARMv7l", "ARMv8 64bit", "ARMv6l / ARMv7l / NoKVM", "Unknown", "Unknown", "FreeBSD x86-64"];
if ((node.agent != null) && (node.agent.id != null) && (node.agent.ver != null)) {
var str = '';
if (node.agent.id <= agentsStr.length) { str = agentsStr[node.agent.id]; } else { str = agentsStr[0]; }
@@ -2289,7 +2318,7 @@
x += '
';
// Show action button, only show if we have permissions 4, 8, 64
- if ((meshrights & 76) != 0) { x += '
'; }
+ if ((meshrights & 76) != 0) { x += '
'; }
//x += '
';
//if ((connectivity & 1) && (meshrights & 8) && (node.agent.id < 5)) { x += '
'; }
QH('p10html', x);
@@ -2321,7 +2350,14 @@
QH('MainComputerImage', '
');
// Request the power timeline
- if ((powerTimelineNode != currentNode._id) && (powerTimelineReq != currentNode._id)) { QH('p10html2', ''); powerTimelineReq = currentNode._id; meshserver.send({ action: 'powertimeline', nodeid: currentNode._id }); }
+ if ((powerTimelineNode != currentNode._id) && (powerTimelineReq != currentNode._id)) {
+ QH('p10html2', '');
+ powerTimelineReq = currentNode._id;
+ meshserver.send({ action: 'powertimeline', nodeid: currentNode._id });
+ meshserver.send({ action: 'getsysinfo', nodeid: currentNode._id });
+ meshserver.send({ action: 'getnetworkinfo', nodeid: currentNode._id });
+ QH('p10detailshtml', '');
+ }
}
setupDesktop(); // Always refresh the desktop, even if we are on the same device, we need to do some canvas switching.
if (!panel) panel = 10;
@@ -2347,16 +2383,18 @@
QV('p10general', currentDevicePanel == 0);
QV('p10desktop', currentDevicePanel == 1); // Show if we have remote control rights or desktop view only rights
QV('p10files', currentDevicePanel == 2);
+ QV('p10details', currentDevicePanel == 3);
var menus = [];
- if (currentDevicePanel != 0) { menus.push({ n: 'General', f: 'setupDeviceMenu(0)' }); }
+ if (currentDevicePanel != 0) { menus.push({ n: "General", f: 'setupDeviceMenu(0)' }); }
if ((currentDevicePanel != 1) &&
(currentNode != null) &&
((meshrights & 8) || (meshrights & 256)) && ((meshrights == 0xFFFFFFFF) || ((meshrights & 65536) == 0)) &&
(((currentNode.agent == null) && ((typeof currentNode.intelamt.sku !== 'number') || ((currentNode.intelamt.sku & 8) != 0))) || (currentNode.agent && (currentNode.agent.caps & 1)))
- ) { menus.push({ n: 'Desktop', f: 'setupDeviceMenu(1)' }); }
+ ) { menus.push({ n: "Desktop", f: 'setupDeviceMenu(1)' }); }
- if ((currentDevicePanel != 2) && (currentNode != null) && (meshrights & 8) && ((meshrights == 0xFFFFFFFF) || ((meshrights & 1024) == 0)) && ((currentNode.mtype == 2) && (currentNode.agent.caps & 4))) { menus.push({ n: 'Files', f: 'setupDeviceMenu(2)' }); }
+ if ((currentDevicePanel != 2) && (currentNode != null) && (meshrights & 8) && ((meshrights == 0xFFFFFFFF) || ((meshrights & 1024) == 0)) && ((currentNode.mtype == 2) && (currentNode.agent.caps & 4))) { menus.push({ n: "Files", f: 'setupDeviceMenu(2)' }); }
+ if ((currentDevicePanel != 3) && (currentNode != null)) { menus.push({ n: "Details", f: 'setupDeviceMenu(3)' }); }
updateFooterMenu(menus);
}
@@ -2432,7 +2470,7 @@
++count;
date = new Date(date.getTime() - (1000 * 60 * 60 * 24)); // Substract one day
}
- QH('p10html2', '
');
+ QH('p10html2', '
| ' + "Day" + ' | ' + "Power State" + ' |
|---|
' + x + '
');
}
// Return a color for the given power state
@@ -3426,6 +3464,197 @@
Q('d2progressBar').value = end;
}
}
+ //
+ // DEVICE DETAILS
+ //
+
+ var DeviceDetailsHardware = null;
+ var DeviceDetailsNetwork = null;
+ var DeviceDetailsNodeId = null;
+ function updateDeviceDetails(node, hardware, network) {
+ if (currentNode == null) return;
+ if (node == null) { node = currentNode; }
+ if (currentNode._id != node._id) return;
+ if (DeviceDetailsNodeId != node._id) { DeviceDetailsHardware = null; DeviceDetailsNetwork = null; DeviceDetailsNodeId = node._id; }
+ if (hardware != null) { DeviceDetailsHardware = hardware; }
+ if (network != null) { DeviceDetailsNetwork = network; }
+ hardware = DeviceDetailsHardware;
+ network = DeviceDetailsNetwork;
+ if (hardware == null) { hardware = {}; }
+ if (network == null) { network = {}; }
+ var sections = [], s = {};
+
+ // Operating System
+ if ((hardware.windows && hardware.windows.osinfo) || node.osdesc) {
+ var x = '';
+ if (node.rname) { x += addDetailItem("Name", EscapeHtml(node.rname), s); }
+ if (node.osdesc) { x += addDetailItem("Version", EscapeHtml(node.osdesc), s); }
+ if (hardware.windows && hardware.windows.osinfo) {
+ var m = hardware.windows.osinfo;
+ if (m.OSArchitecture) { x += addDetailItem("Architecture", EscapeHtml(m.OSArchitecture), s); }
+ }
+ if (x != '') { sections.push({ name: "Operating System", html: x, img: 'software32.png' }); }
+ }
+
+ // MeshAgent
+ if (node.agent) {
+ var x = '';
+ if ((node.agent != null) && (node.agent.id != null) && (node.agent.ver != null)) {
+ var str = '';
+ if (node.agent.id <= agentsStr.length) { str = agentsStr[node.agent.id]; } else { str = agentsStr[0]; }
+ if (node.agent.ver != 0) { str += ' v' + node.agent.ver; }
+ x += addDetailItem("Mesh Agent", str);
+ }
+ if ((node.conn & 1) != 0) {
+ x += addDetailItem("Last agent connection", "Connected now");
+ } else {
+ if (node.lastconnect) { x += addDetailItem("Last agent connection", printDateTime(new Date(node.lastconnect))); }
+ }
+ if (node.lastaddr) {
+ var splitip = node.lastaddr.split(':');
+ if (splitip.length > 2) {
+ // IPv6
+ x += addDetailItem("Last agent address", node.lastaddr);
+ } else {
+ // IPv4
+ if (isPrivateIP(node.lastaddr)) {
+ x += addDetailItem("Last agent address", splitip[0]);
+ } else {
+ x += addDetailItem("Last agent address", '
' + splitip[0] + '');
+ }
+ }
+ }
+ if (x != '') { sections.push({ name: "Mesh Agent", html: x, img: 'meshagent32.png' }); }
+ }
+
+ // Networking
+ if (network.netif != null) {
+ var x = '';
+ x += '
';
+ for (var i in network.netif) {
+ var m = network.netif[i];
+ x += '';
+ x += ' ' + EscapeHtml(m.name + (m.dnssuffix ? (', ' + m.dnssuffix) : '')) + ' ';
+ if (m.desc) { x += addDetailItem("Description", EscapeHtml(m.desc).split('(R)').join('®')); }
+ //if (m.dnssuffix) { x += addDetailItem("DNS Suffix", m.dnssuffix); }
+ if (m.mac) {
+ if (m.gatewaymac) {
+ x += addDetailItem("MAC Layer", format("MAC: {0}, Gateway: {1}", EscapeHtml(m.mac), EscapeHtml(m.gatewaymac)));
+ } else {
+ x += addDetailItem("MAC Layer", format("MAC: {0}", m.mac));
+ }
+ }
+ if (m.v4addr && (m.v4addr != '0.0.0.0')) {
+ if (m.v4gateway && m.v4mask) {
+ x += addDetailItem("IPv4 Layer", format("IP: {0}, Mask: {1}, Gateway: {2}", EscapeHtml(m.v4addr), EscapeHtml(m.v4mask), EscapeHtml(m.v4gateway)));
+ } else {
+ x += addDetailItem("IPv4 Layer", format("IP: {0}", EscapeHtml(m.v4addr)));
+ }
+ }
+ x += ' |
';
+ if (x != '') { sections.push({ name: "Networking", html: x, img: 'networking32.png' }); }
+ }
+
+ // Attribute: Intel AMT
+ if (node.intelamt != null) {
+ var x = '';
+ x += addDetailItem("Version", (node.intelamt.ver) ? ('v' + node.intelamt.ver) : ('
' + "Unknown" + ''), s);
+ var provisioningStates = { 0: nobreak("Not Activated (Pre)"), 1: nobreak("Not Activated (In)"), 2: nobreak("Activated") };
+ var provisioningMode = '';
+ if ((node.intelamt.state == 2) && node.intelamt.flags) { if (node.intelamt.flags & 2) { provisioningMode = (', ' + "Client Control Mode (CCM)"); } else if (node.intelamt.flags & 4) { provisioningMode = (', ' + "Admin Control Mode (ACM)"); } }
+ x += addDetailItem("Provisioning State", ((node.intelamt.state) ? (provisioningStates[node.intelamt.state]) : ('
' + "Unknown" + '')) + provisioningMode, s);
+ x += addDetailItem("Security", (node.intelamt.tls == 1) ? "Secured using TLS" : "TLS is not setup", s);
+ x += addDetailItem("Admin Credentials", (node.intelamt.user == null || node.intelamt.user == '') ? "Not Known" : "Known", s);
+ if (x != '') { sections.push({ name: "Intel® Active Management Technology (Intel® AMT)", html: x, img: 'amt32.png' }); }
+ }
+
+ if (hardware.identifiers) {
+ var x = '', ident = hardware.identifiers;
+ // BIOS
+ if (ident.bios_vendor) { x += addDetailItem("Vendor", EscapeHtml(ident.bios_vendor), s); }
+ if (ident.bios_version) { x += addDetailItem("Version", EscapeHtml(ident.bios_version), s); }
+ if (x != '') { sections.push({ name: "BIOS", html: x, img: 'chip32.png' }); }
+
+ // Motherboard
+ x = '';
+ if (ident.board_vendor) { x += addDetailItem("Vendor", EscapeHtml(ident.board_vendor), s); }
+ if (ident.board_name) { x += addDetailItem("Name", EscapeHtml(ident.board_name), s); }
+ if (ident.board_serial && (ident.board_serial != '')) { x += addDetailItem("Serial", EscapeHtml(ident.board_serial), s); }
+ if (ident.board_version) { x += addDetailItem("Version", EscapeHtml(ident.board_version), s); }
+ if (ident.product_uuid) { x += addDetailItem("Identifier", EscapeHtml(ident.product_uuid), s); }
+ if (ident.cpu_name) { x += addDetailItem("CPU", EscapeHtml(ident.cpu_name).split('(TM)').join('™').split('(R)').join('®'), s); }
+ if (ident.gpu_name) { for (var i in ident.gpu_name) { x += addDetailItem("GPU", EscapeHtml(ident.gpu_name[i]).split('(TM)').join('™').split('(R)').join('®'), s); } }
+ if (x != '') { sections.push({ name: "Motherboard", html: x, img: 'motherboard32.png' }); }
+ }
+
+ if (hardware.windows) {
+ if (hardware.windows.memory) {
+ var x = '';
+ // Sort Memory
+ hardware.windows.memory.sort(function (a, b) { if (a.BankLabel > b.BankLabel) return 1; if (a.BankLabel < b.BankLabel) return -1; return 0; });
+
+ x += '
';
+ for (var i in hardware.windows.memory) {
+ var m = hardware.windows.memory[i];
+ x += '';
+ x += ' ' + EscapeHtml(m.BankLabel) + ' ';
+ if (m.Capacity) { x += addDetailItem("Capacity / Speed", format("{0} Mb, {1} Mhz", (m.Capacity / 1024 / 1024), m.Speed), s); }
+ if (m.PartNumber) { x += addDetailItem("Part Number", EscapeHtml((m.Manufacturer && m.Manufacturer != 'Undefined') ? (m.Manufacturer + ', ') : '') + EscapeHtml(m.PartNumber), s); }
+ x += ' |
';
+
+ if (x != '') { sections.push({ name: "Memory", html: x, img: 'ram32.png' }); }
+ }
+ }
+
+ // Storage
+ if (hardware.identifiers && ident.storage_devices) {
+ var x = '';
+ // Sort Storage
+ ident.storage_devices.sort(function (a, b) { if (a.Caption > b.Caption) return 1; if (a.Caption < b.Caption) return -1; return 0; });
+
+ x += '
';
+ for (var i in ident.storage_devices) {
+ var m = ident.storage_devices[i];
+ if (m.Size) {
+ x += '';
+ x += ' ' + EscapeHtml(m.Caption) + ' ';
+ if (m.Model && (m.Model != m.Caption)) { x += addDetailItem("Model", EscapeHtml(m.Model), s); }
+ if (m.Size) {
+ if ((typeof m.Size == 'string') && (parseInt(m.Size) == m.Size)) { m.Size = parseInt(m.Size); }
+ if (typeof m.Size == 'number') { x += addDetailItem("Capacity", format("{0} Mb", Math.floor(m.Size / 1024 / 1024)), s); }
+ if (typeof m.Size == 'string') { x += addDetailItem("Capacity", EscapeHtml(m.Size), s); }
+ }
+ x += ' |
';
+
+ if (x != '') { sections.push({ name: "Storage", html: x, img: 'storage32.png' }); }
+ }
+
+ // Render the sections
+ var x = '';
+ for (var i in sections) {
+ if (sections[i].img == null) {
+ x += '
' + sections[i].name + '
' + sections[i].html + '
';
+ } else {
+ x += '
';
+ x += ' | '; // height=12
+ x += '' + sections[i].name + ' ' + sections[i].html + ' | ';
+ x += '
';
+ }
+ }
+
+ if (x == '') {
+ QH('p10detailshtml', "No information for this device.");
+ } else {
+ QH('p10detailshtml', x);
+ }
+ }
//
// MY MESHS
@@ -3861,6 +4090,7 @@
function format(format) { var args = Array.prototype.slice.call(arguments, 1); return format.replace(/{(\d+)}/g, function (match, number) { return typeof args[number] != 'undefined' ? args[number] : match; }); };
function nobreak(x) { return x.split(' ').join(' '); }
function getUserName(userid) { if (users && users[userid] != null) return users[userid].name; return userid.split('/')[2]; }
+ function addDetailItem(title, value, state) { return '
| ' + nobreak(title) + ' | ' + value + ' |
'; }
diff --git a/views/default.handlebars b/views/default.handlebars
index 7ab60cc3..90ddfc61 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -1937,7 +1937,6 @@
}
case 'getsysinfo': {
if (message.nodeid != powerTimelineReq) break;
- //console.log('getsysinfo', message); // ***********************
if (message.noinfo === true) {
updateDeviceDetails(getNodeFromId(message.nodeid));
} else {