Fixed SMBios fetching problems on some systems.
Ylian Saint-Hilaire committed
Oct 30, 2018 at 13:01 UTC
bc9a45c3a3ffb0ebf7031e5b39e5255e53ea26e9
4 files changed
+80
-13
agents/modules_meshcmd/smbios.js
+36
-6
@@ -143,15 +143,45 @@ function SMBiosTables()
143
});
144
return;
145
}
146
- throw (process.platform + ' not supported');
146
+ if (callback) { callback.apply(this, [null]); return; } else { return (null); }
147
};
148
this.parse = function parse(data) {
149
var r = {};
150
- r.processorInfo = this.processorInfo(data);
151
- r.memoryInfo = this.memoryInfo(data);
152
- r.systemInfo = this.systemInfo(data);
153
- r.systemSlots = this.systemInfo(data);
154
- r.amtInfo = this.amtInfo(data);
150
+ try
151
+ {
152
+ r.processorInfo = this.processorInfo(data);
153
+ }
154
+ catch(e)
155
+ {
156
+ }
157
+ try
158
+ {
159
+ r.memoryInfo = this.memoryInfo(data);
160
+ }
161
+ catch(e)
162
+ {
163
+ }
164
+ try
165
+ {
166
+ r.systemInfo = this.systemInfo(data);
167
+ }
168
+ catch(e)
169
+ {
170
+ }
171
+ try
172
+ {
173
+ r.systemSlots = this.systemInfo(data);
174
+ }
175
+ catch(e)
176
+ {
177
+ }
178
+ try
179
+ {
180
+ r.amtInfo = this.amtInfo(data);
181
+ }
182
+ catch(e)
183
+ {
184
+ }
185
return r;
186
}
187
this.processorInfo = function processorInfo(data) {
agents/modules_meshcore/smbios.js
+36
-6
@@ -143,15 +143,45 @@ function SMBiosTables()
143
});
144
return;
145
}
146
- throw (process.platform + ' not supported');
146
+ if (callback) { callback.apply(this, [null]); return; } else { return (null); }
147
};
148
this.parse = function parse(data) {
149
var r = {};
150
- r.processorInfo = this.processorInfo(data);
151
- r.memoryInfo = this.memoryInfo(data);
152
- r.systemInfo = this.systemInfo(data);
153
- r.systemSlots = this.systemInfo(data);
154
- r.amtInfo = this.amtInfo(data);
150
+ try
151
+ {
152
+ r.processorInfo = this.processorInfo(data);
153
+ }
154
+ catch(e)
155
+ {
156
+ }
157
+ try
158
+ {
159
+ r.memoryInfo = this.memoryInfo(data);
160
+ }
161
+ catch(e)
162
+ {
163
+ }
164
+ try
165
+ {
166
+ r.systemInfo = this.systemInfo(data);
167
+ }
168
+ catch(e)
169
+ {
170
+ }
171
+ try
172
+ {
173
+ r.systemSlots = this.systemInfo(data);
174
+ }
175
+ catch(e)
176
+ {
177
+ }
178
+ try
179
+ {
180
+ r.amtInfo = this.amtInfo(data);
181
+ }
182
+ catch(e)
183
+ {
184
+ }
185
return r;
186
}
187
this.processorInfo = function processorInfo(data) {
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.2.2-l",
3
+ "version": "0.2.2-n",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
views/default.handlebars
+7
@@ -458,6 +458,7 @@
458
<option value=2>Win+L</option>
459
<option value=3>Win+M</option>
460
<option value=4>Shift+Win+M</option>
461
+ <option value=6>Win+R</option>
462
</select>
463
<input id="DeskWD" type=button value="Send" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()">
464
<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 @@
3973
} else {
3974
desktop.m.SendKeyMsgKC([[desktop.m.KeyAction.EXDOWN,0x5B], [desktop.m.KeyAction.EXUP,0x5B]]); // MeshAgent: L-Winkey press, L-Winkey release
3975
}
3976
+ } else if (ks == 6) { // WIN+R
3977
+ if (desktop.contype == 2) {
3978
+ desktop.m.sendkey([[0xffe7, 1], [0x72, 1], [0x72, 0], [0xffe7, 0]]); // Intel AMT: Meta-left down, 'l' press, 'l' release, Meta-left release
3979
+ } else {
3980
+ 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
3981
+ }
3982
}
3983
}
3984