systeminformation 5.26.1 → 5.26.2

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 (2) hide show
  1. package/lib/memory.js +23 -38
  2. package/package.json +1 -1
package/lib/memory.js CHANGED
@@ -29,41 +29,33 @@ const _openbsd = (_platform === 'openbsd');
29
29
  const _netbsd = (_platform === 'netbsd');
30
30
  const _sunos = (_platform === 'sunos');
31
31
 
32
- const OSX_RAM_manufacturers = {
33
- '0x014F': 'Transcend Information',
34
- '0x2C00': 'Micron Technology Inc.',
35
- '0x802C': 'Micron Technology Inc.',
36
- '0x80AD': 'Hynix Semiconductor Inc.',
37
- '0x80CE': 'Samsung Electronics Inc.',
38
- '0xAD00': 'Hynix Semiconductor Inc.',
39
- '0xCE00': 'Samsung Electronics Inc.',
40
- '0x02FE': 'Elpida',
41
- '0x5105': 'Qimonda AG i. In.',
42
- '0x8551': 'Qimonda AG i. In.',
43
- '0x859B': 'Crucial',
44
- '0x04CD': 'G-Skill'
45
- };
46
-
47
- const LINUX_RAM_manufacturers = {
48
- '017A': 'Apacer',
32
+ const RAM_manufacturers = {
33
+ '00CE': 'Samsung Electronics Inc',
34
+ '014F': 'Transcend Information',
35
+ '017A': 'Apacer Technology Inc',
49
36
  '0198': 'HyperX',
50
37
  '029E': 'Corsair',
38
+ '02FE': 'Elpida',
51
39
  '04CB': 'A-DATA',
52
- '04CD': 'G-Skill',
40
+ '04CD': 'G-Skill International Enterprise',
53
41
  '059B': 'Crucial',
54
- '00CE': 'Samsung',
55
42
  '1315': 'Crucial',
56
- '014F': 'Transcend Information',
57
43
  '2C00': 'Micron Technology Inc.',
44
+ '5105': 'Qimonda AG i. In.',
58
45
  '802C': 'Micron Technology Inc.',
59
46
  '80AD': 'Hynix Semiconductor Inc.',
60
47
  '80CE': 'Samsung Electronics Inc.',
48
+ '8551': 'Qimonda AG i. In.',
49
+ '859B': 'Crucial',
61
50
  'AD00': 'Hynix Semiconductor Inc.',
62
51
  'CE00': 'Samsung Electronics Inc.',
63
- '02FE': 'Elpida',
64
- '5105': 'Qimonda AG i. In.',
65
- '8551': 'Qimonda AG i. In.',
66
- '859B': 'Crucial'
52
+ 'SAMSUNG': 'Samsung Electronics Inc.',
53
+ 'HYNIX': 'Hynix Semiconductor Inc.',
54
+ 'G-SKILL': 'G-Skill International Enterprise',
55
+ 'TRANSCEND': 'Transcend Information',
56
+ 'APACER': 'Apacer Technology Inc',
57
+ 'MICRON': 'Micron Technology Inc.',
58
+ 'QIMONDA': 'Qimonda AG i. In.',
67
59
  };
68
60
 
69
61
  // _______________________________________________________________________________________
@@ -315,17 +307,10 @@ exports.mem = mem;
315
307
 
316
308
  function memLayout(callback) {
317
309
 
318
- function getManufacturerDarwin(manId) {
319
- if ({}.hasOwnProperty.call(OSX_RAM_manufacturers, manId)) {
320
- return (OSX_RAM_manufacturers[manId]);
321
- }
322
- return manId;
323
- }
324
-
325
- function getManufacturerLinux(manId) {
310
+ function getManufacturer(manId) {
326
311
  const manIdSearch = manId.replace('0x', '').toUpperCase();
327
- if (manIdSearch.length === 4 && {}.hasOwnProperty.call(LINUX_RAM_manufacturers, manIdSearch)) {
328
- return (LINUX_RAM_manufacturers[manIdSearch]);
312
+ if (manIdSearch.length >= 4 && {}.hasOwnProperty.call(RAM_manufacturers, manIdSearch)) {
313
+ return (RAM_manufacturers[manIdSearch]);
329
314
  }
330
315
  return manId;
331
316
  }
@@ -358,7 +343,7 @@ function memLayout(callback) {
358
343
  ecc: dataWidth && totalWidth ? totalWidth > dataWidth : false,
359
344
  clockSpeed: (util.getValue(lines, 'Configured Clock Speed:') ? parseInt(util.getValue(lines, 'Configured Clock Speed:'), 10) : (util.getValue(lines, 'Speed:') ? parseInt(util.getValue(lines, 'Speed:'), 10) : null)),
360
345
  formFactor: util.getValue(lines, 'Form Factor:'),
361
- manufacturer: getManufacturerLinux(util.getValue(lines, 'Manufacturer:')),
346
+ manufacturer: getManufacturer(util.getValue(lines, 'Manufacturer:')),
362
347
  partNum: util.getValue(lines, 'Part Number:'),
363
348
  serialNum: util.getValue(lines, 'Serial Number:'),
364
349
  voltageConfigured: parseFloat(util.getValue(lines, 'Configured Voltage:')) || null,
@@ -470,7 +455,7 @@ function memLayout(callback) {
470
455
  ecc: eccStatus ? eccStatus === 'enabled' : null,
471
456
  clockSpeed: parseInt(util.getValue(lines, ' Speed:'), 10),
472
457
  formFactor: '',
473
- manufacturer: getManufacturerDarwin(util.getValue(lines, ' Manufacturer:')),
458
+ manufacturer: getManufacturer(util.getValue(lines, ' Manufacturer:')),
474
459
  partNum: util.getValue(lines, ' Part Number:'),
475
460
  serialNum: util.getValue(lines, ' Serial Number:'),
476
461
  voltageConfigured: null,
@@ -508,7 +493,7 @@ function memLayout(callback) {
508
493
  ecc: false,
509
494
  clockSpeed: null,
510
495
  formFactor: 'SOC',
511
- manufacturer: getManufacturerDarwin(manufacturerId),
496
+ manufacturer: getManufacturer(manufacturerId),
512
497
  partNum: '',
513
498
  serialNum: '',
514
499
  voltageConfigured: null,
@@ -551,7 +536,7 @@ function memLayout(callback) {
551
536
  ecc: dataWidth && totalWidth ? totalWidth > dataWidth : false,
552
537
  clockSpeed: parseInt(util.getValue(lines, 'ConfiguredClockSpeed', ':'), 10) || parseInt(util.getValue(lines, 'Speed', ':'), 10) || 0,
553
538
  formFactor: FormFactors[parseInt(util.getValue(lines, 'FormFactor', ':'), 10) || 0],
554
- manufacturer: util.getValue(lines, 'Manufacturer', ':'),
539
+ manufacturer: getManufacturer(util.getValue(lines, 'Manufacturer', ':')),
555
540
  partNum: util.getValue(lines, 'PartNumber', ':'),
556
541
  serialNum: util.getValue(lines, 'SerialNumber', ':'),
557
542
  voltageConfigured: (parseInt(util.getValue(lines, 'ConfiguredVoltage', ':'), 10) || 0) / 1000.0,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "systeminformation",
3
- "version": "5.26.1",
3
+ "version": "5.26.2",
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)",