Ylianst/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-23 22:13:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed SMBios fetching problems on some systems.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2018-10-30 13:01:44 -07:00
parent 717f00dd50
commit 7141e7f3b8
4 changed files with 80 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
agents/modules_meshcmd/smbios.js
View File

@ -143,15 +143,45 @@ function SMBiosTables()
}); });
return; return;
} }
throw (process.platform + ' not supported'); if (callback) { callback.apply(this, [null]); return; } else { return (null); }
}; };
this.parse = function parse(data) { this.parse = function parse(data) {
var r = {}; var r = {};
try
{
r.processorInfo = this.processorInfo(data); r.processorInfo = this.processorInfo(data);
}
catch(e)
{
}
try
{
r.memoryInfo = this.memoryInfo(data); r.memoryInfo = this.memoryInfo(data);
}
catch(e)
{
}
try
{
r.systemInfo = this.systemInfo(data); r.systemInfo = this.systemInfo(data);
}
catch(e)
{
}
try
{
r.systemSlots = this.systemInfo(data); r.systemSlots = this.systemInfo(data);
}
catch(e)
{
}
try
{
r.amtInfo = this.amtInfo(data); r.amtInfo = this.amtInfo(data);
}
catch(e)
{
}
return r; return r;
} }
this.processorInfo = function processorInfo(data) { this.processorInfo = function processorInfo(data) {

32
agents/modules_meshcore/smbios.js
View File

@ -143,15 +143,45 @@ function SMBiosTables()
}); });
return; return;
} }
throw (process.platform + ' not supported'); if (callback) { callback.apply(this, [null]); return; } else { return (null); }
}; };
this.parse = function parse(data) { this.parse = function parse(data) {
var r = {}; var r = {};
try
{
r.processorInfo = this.processorInfo(data); r.processorInfo = this.processorInfo(data);
}
catch(e)
{
}
try
{
r.memoryInfo = this.memoryInfo(data); r.memoryInfo = this.memoryInfo(data);
}
catch(e)
{
}
try
{
r.systemInfo = this.systemInfo(data); r.systemInfo = this.systemInfo(data);
}
catch(e)
{
}
try
{
r.systemSlots = this.systemInfo(data); r.systemSlots = this.systemInfo(data);
}
catch(e)
{
}
try
{
r.amtInfo = this.amtInfo(data); r.amtInfo = this.amtInfo(data);
}
catch(e)
{
}
return r; return r;
} }
this.processorInfo = function processorInfo(data) { this.processorInfo = function processorInfo(data) {

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "meshcentral", "name": "meshcentral",
"version": "0.2.2-l", "version": "0.2.2-n",
"keywords": [ "keywords": [
"Remote Management", "Remote Management",
"Intel AMT", "Intel AMT",

7
views/default.handlebars
View File

@ -458,6 +458,7 @@
<option value=2>Win+L</option> <option value=2>Win+L</option>
<option value=3>Win+M</option> <option value=3>Win+M</option>
<option value=4>Shift+Win+M</option> <option value=4>Shift+Win+M</option>
<option value=6>Win+R</option>
</select> </select>
<input id="DeskWD" type=button value="Send" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()"> <input id="DeskWD" type=button value="Send" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()">
<input id="DeskCAD" style="margin-left:6px" type="button" value="Ctrl-Alt-Del" onkeypress="return false" onkeydown="return false" onclick="sendCAD()"> <input id="DeskCAD" style="margin-left:6px" type="button" value="Ctrl-Alt-Del" onkeypress="return false" onkeydown="return false" onclick="sendCAD()">
@ -3972,6 +3973,12 @@
} else { } else {
desktop.m.SendKeyMsgKC([[desktop.m.KeyAction.EXDOWN,0x5B], [desktop.m.KeyAction.EXUP,0x5B]]); // MeshAgent: L-Winkey press, L-Winkey release desktop.m.SendKeyMsgKC([[desktop.m.KeyAction.EXDOWN,0x5B], [desktop.m.KeyAction.EXUP,0x5B]]); // MeshAgent: L-Winkey press, L-Winkey release
} }
} else if (ks == 6) { // WIN+R
if (desktop.contype == 2) {
desktop.m.sendkey([[0xffe7, 1], [0x72, 1], [0x72, 0], [0xffe7, 0]]); // Intel AMT: Meta-left down, 'l' press, 'l' release, Meta-left release
} else {
desktop.m.SendKeyMsgKC([[desktop.m.KeyAction.EXDOWN, 0x5B], [desktop.m.KeyAction.DOWN, 82], [desktop.m.KeyAction.UP, 82], [desktop.m.KeyAction.EXUP, 0x5B]]); // MeshAgent: L-Winkey press, 'R' press, 'R' release, L-Winkey release
}
} }
} }