systeminformation 5.17.6 → 5.17.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/README.md +1 -1
  2. package/lib/processes.js +2 -2
  3. package/lib/system.js +8 -114
  4. package/package.json +1 -1
package/README.md CHANGED
@@ -1023,7 +1023,7 @@ Solaris, OpenSolaris and registered trademarks of Sun Microsystems, VMware is a
1023
1023
  Virtual Box is a trademark of Oracle Corporation, Xen is a registered trademark of Xen Project,
1024
1024
  QEMU is a trademark of Fabrice Bellard, bochs is a trademark of The Bochs Project, USB and USB Logo
1025
1025
  are trademarks of USB Implementation Forum, Bluetooth and Bluetooth Logo are trademarks of Bluetooth SIG,
1026
- Android is a trademark of Google LLC.
1026
+ Android is a trademark of Google LLC, Parallels is a trademarks of Parallels International GmbH.
1027
1027
 
1028
1028
  All other trademarks are the property of their respective owners.
1029
1029
 
package/lib/processes.js CHANGED
@@ -496,8 +496,8 @@ function calcProcStatWin(procStat, all, _cpu_old) {
496
496
  }
497
497
  return {
498
498
  pid: procStat.pid,
499
- utime: cpuu > 0 ? procStat.utime : 0,
500
- stime: cpus > 0 ? procStat.stime : 0,
499
+ utime: procStat.utime,
500
+ stime: procStat.stime,
501
501
  cpuu: cpuu > 0 ? cpuu : 0,
502
502
  cpus: cpus > 0 ? cpus : 0
503
503
  };
package/lib/system.js CHANGED
@@ -201,115 +201,6 @@ function system(callback) {
201
201
  revision: rPIRevision.revision
202
202
  };
203
203
  }
204
-
205
- // if (result.model === 'BCM2835' || result.model === 'BCM2708' || result.model === 'BCM2709' || result.model === 'BCM2835' || result.model === 'BCM2837') {
206
-
207
-
208
- // // Pi 4
209
- // if (['d03114'].indexOf(result.version) >= 0) {
210
- // result.model = result.model + ' - Pi 4 Model B';
211
- // result.version = result.version + ' - Rev. 1.4';
212
- // }
213
- // if (['b03112', 'c03112'].indexOf(result.version) >= 0) {
214
- // result.model = result.model + ' - Pi 4 Model B';
215
- // result.version = result.version + ' - Rev. 1.2';
216
- // }
217
- // if (['a03111', 'b03111', 'c03111'].indexOf(result.version) >= 0) {
218
- // result.model = result.model + ' - Pi 4 Model B';
219
- // result.version = result.version + ' - Rev. 1.1';
220
- // }
221
- // // Pi 3
222
- // if (['a02082', 'a22082', 'a32082', 'a52082'].indexOf(result.version) >= 0) {
223
- // result.model = result.model + ' - Pi 3 Model B';
224
- // result.version = result.version + ' - Rev. 1.2';
225
- // }
226
- // if (['a22083'].indexOf(result.version) >= 0) {
227
- // result.model = result.model + ' - Pi 3 Model B';
228
- // result.version = result.version + ' - Rev. 1.3';
229
- // }
230
- // if (['a020d3'].indexOf(result.version) >= 0) {
231
- // result.model = result.model + ' - Pi 3 Model B+';
232
- // result.version = result.version + ' - Rev. 1.3';
233
- // }
234
- // if (['9020e0'].indexOf(result.version) >= 0) {
235
- // result.model = result.model + ' - Pi 3 Model A+';
236
- // result.version = result.version + ' - Rev. 1.3';
237
- // }
238
- // // Pi 2 Model B
239
- // if (['a01040'].indexOf(result.version) >= 0) {
240
- // result.model = result.model + ' - Pi 2 Model B';
241
- // result.version = result.version + ' - Rev. 1.0';
242
- // }
243
- // if (['a01041', 'a21041'].indexOf(result.version) >= 0) {
244
- // result.model = result.model + ' - Pi 2 Model B';
245
- // result.version = result.version + ' - Rev. 1.1';
246
- // }
247
- // if (['a22042', 'a02042'].indexOf(result.version) >= 0) {
248
- // result.model = result.model + ' - Pi 2 Model B';
249
- // result.version = result.version + ' - Rev. 1.2';
250
- // }
251
-
252
- // // Compute Model
253
- // if (['a02100'].indexOf(result.version) >= 0) {
254
- // result.model = result.model + ' - Pi CM3+';
255
- // result.version = result.version + ' - Rev 1.0';
256
- // }
257
- // if (['a020a0', 'a220a0'].indexOf(result.version) >= 0) {
258
- // result.model = result.model + ' - Pi CM3';
259
- // result.version = result.version + ' - Rev 1.0';
260
- // }
261
- // if (['900061'].indexOf(result.version) >= 0) {
262
- // result.model = result.model + ' - Pi CM';
263
- // result.version = result.version + ' - Rev 1.1';
264
- // }
265
-
266
- // // Pi Zero
267
- // if (['900092', '920092'].indexOf(result.version) >= 0) {
268
- // result.model = result.model + ' - Pi Zero';
269
- // result.version = result.version + ' - Rev 1.2';
270
- // }
271
- // if (['900093', '920093'].indexOf(result.version) >= 0) {
272
- // result.model = result.model + ' - Pi Zero';
273
- // result.version = result.version + ' - Rev 1.3';
274
- // }
275
- // if (['9000c1'].indexOf(result.version) >= 0) {
276
- // result.model = result.model + ' - Pi Zero W';
277
- // result.version = result.version + ' - Rev 1.1';
278
- // }
279
-
280
- // // A, B, A+ B+
281
- // if (['0002', '0003'].indexOf(result.version) >= 0) {
282
- // result.model = result.model + ' - Pi Model B';
283
- // result.version = result.version + ' - Rev 1.0';
284
- // }
285
- // if (['0004', '0005', '0006', '000d', '000e', '000f'].indexOf(result.version) >= 0) {
286
- // result.model = result.model + ' - Pi Model B';
287
- // result.version = result.version + ' - Rev 2.0';
288
- // }
289
- // if (['0007', '0008', '0009'].indexOf(result.version) >= 0) {
290
- // result.model = result.model + ' - Pi Model A';
291
- // result.version = result.version + ' - Rev 2.0';
292
- // }
293
- // if (['0010'].indexOf(result.version) >= 0) {
294
- // result.model = result.model + ' - Pi Model B+';
295
- // result.version = result.version + ' - Rev 1.0';
296
- // }
297
- // if (['0012'].indexOf(result.version) >= 0) {
298
- // result.model = result.model + ' - Pi Model A+';
299
- // result.version = result.version + ' - Rev 1.0';
300
- // }
301
- // if (['0013', '900032'].indexOf(result.version) >= 0) {
302
- // result.model = result.model + ' - Pi Model B+';
303
- // result.version = result.version + ' - Rev 1.2';
304
- // }
305
- // if (['0015', '900021'].indexOf(result.version) >= 0) {
306
- // result.model = result.model + ' - Pi Model A+';
307
- // result.version = result.version + ' - Rev 1.1';
308
- // }
309
- // if (result.model.indexOf('Pi') !== -1 && result.version) { // Pi, Pi Zero
310
- // result.manufacturer = 'Raspberry Pi Foundation';
311
- // }
312
- // }
313
204
  }
314
205
  if (callback) { callback(result); }
315
206
  resolve(result);
@@ -343,7 +234,6 @@ function system(callback) {
343
234
  try {
344
235
  util.powerShell('Get-CimInstance Win32_ComputerSystemProduct | select Name,Vendor,Version,IdentifyingNumber,UUID | fl').then((stdout, error) => {
345
236
  if (!error) {
346
- // let lines = stdout.split('\r\n').filter(line => line.trim() !== '').filter((line, idx) => idx > 0)[0].trim().split(/\s\s+/);
347
237
  let lines = stdout.split('\r\n');
348
238
  result.manufacturer = util.getValue(lines, 'vendor', ':');
349
239
  result.model = util.getValue(lines, 'name', ':');
@@ -352,20 +242,22 @@ function system(callback) {
352
242
  result.uuid = util.getValue(lines, 'uuid', ':').toLowerCase();
353
243
  // detect virtual (1)
354
244
  const model = result.model.toLowerCase();
355
- if (model === 'virtualbox' || model === 'kvm' || model === 'virtual machine' || model === 'bochs' || model.startsWith('vmware') || model.startsWith('qemu')) {
245
+ if (model === 'virtualbox' || model === 'kvm' || model === 'virtual machine' || model === 'bochs' || model.startsWith('vmware') || model.startsWith('qemu') || model.startsWith('parallels')) {
356
246
  result.virtual = true;
357
247
  if (model.startsWith('virtualbox')) { result.virtualHost = 'VirtualBox'; }
358
248
  if (model.startsWith('vmware')) { result.virtualHost = 'VMware'; }
359
249
  if (model.startsWith('kvm')) { result.virtualHost = 'KVM'; }
360
250
  if (model.startsWith('bochs')) { result.virtualHost = 'bochs'; }
361
251
  if (model.startsWith('qemu')) { result.virtualHost = 'KVM'; }
252
+ if (model.startsWith('parallels')) { result.virtualHost = 'Parallels'; }
362
253
  }
363
254
  const manufacturer = result.manufacturer.toLowerCase();
364
- if (manufacturer.startsWith('vmware') || manufacturer.startsWith('qemu') || manufacturer === 'xen') {
255
+ if (manufacturer.startsWith('vmware') || manufacturer.startsWith('qemu') || manufacturer === 'xen' || manufacturer.startsWith('parallels')) {
365
256
  result.virtual = true;
366
257
  if (manufacturer.startsWith('vmware')) { result.virtualHost = 'VMware'; }
367
258
  if (manufacturer.startsWith('xen')) { result.virtualHost = 'Xen'; }
368
259
  if (manufacturer.startsWith('qemu')) { result.virtualHost = 'KVM'; }
260
+ if (manufacturer.startsWith('parallels')) { result.virtualHost = 'Parallels'; }
369
261
  }
370
262
  util.powerShell('Get-CimInstance MS_Systeminformation -Namespace "root/wmi" | select systemsku | fl ').then((stdout, error) => {
371
263
  if (!error) {
@@ -376,7 +268,7 @@ function system(callback) {
376
268
  util.powerShell('Get-CimInstance Win32_bios | select Version, SerialNumber, SMBIOSBIOSVersion').then((stdout, error) => {
377
269
  if (!error) {
378
270
  let lines = stdout.toString();
379
- if (lines.indexOf('VRTUAL') >= 0 || lines.indexOf('A M I ') >= 0 || lines.indexOf('VirtualBox') >= 0 || lines.indexOf('VMWare') >= 0 || lines.indexOf('Xen') >= 0) {
271
+ if (lines.indexOf('VRTUAL') >= 0 || lines.indexOf('A M I ') >= 0 || lines.indexOf('VirtualBox') >= 0 || lines.indexOf('VMWare') >= 0 || lines.indexOf('Xen') >= 0 || lines.indexOf('Parallels') >= 0) {
380
272
  result.virtual = true;
381
273
  if (lines.indexOf('VirtualBox') >= 0 && !result.virtualHost) {
382
274
  result.virtualHost = 'VirtualBox';
@@ -393,6 +285,9 @@ function system(callback) {
393
285
  if (lines.indexOf('A M I') >= 0 && !result.virtualHost) {
394
286
  result.virtualHost = 'Virtual PC';
395
287
  }
288
+ if (lines.indexOf('Parallels') >= 0 && !result.virtualHost) {
289
+ result.virtualHost = 'Parallels';
290
+ }
396
291
  }
397
292
  if (callback) { callback(result); }
398
293
  resolve(result);
@@ -823,4 +718,3 @@ function chassis(callback) {
823
718
  }
824
719
 
825
720
  exports.chassis = chassis;
826
-
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "systeminformation",
3
- "version": "5.17.6",
3
+ "version": "5.17.8",
4
4
  "description": "Advanced, lightweight system and OS information library",
5
5
  "license": "MIT",
6
6
  "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",