systeminformation 5.8.8 → 5.9.2

package/CHANGELOG.md

@@ -77,6 +77,10 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
 
 | Version        | Date           | Comment  |
 | -------------- | -------------- | -------- |
+| 5.9.2          | 2021-09-16     | `graohics()` (macOS),  `memLayout()` (win) improvements |
+| 5.9.1          | 2021-09-15     | `diskLayout()` fix size (macOS) |
+| 5.9.0          | 2021-09-15     | `graphics()` new XML parser, added properties (macOS) |
+| 5.8.9          | 2021-09-13     | `battery()` fix linux |
 | 5.8.8          | 2021-09-11     | `wifiConnections()`, `wifiInterfaces()`, `wifiNetworks()` fix windows |
 | 5.8.7          | 2021-09-01     | `processes()` fix alpine linux |
 | 5.8.6          | 2021-08-26     | `cpu()` improved detection (win) |

package/README.md

@@ -95,14 +95,13 @@ si.cpu()
   .catch(error => console.error(error));
 ```
 
-**Callback, Promises, Async / Await**
-
 ## News and Changes
 
 ### Latest Activity
 
 (last 7 major and minor version releases)
 
+- Version 5.9.0: `graphics()` added properties (macOS)
 - Version 5.8.0: `disksIO()` added waitTime, waitPercent (linux)
 - Version 5.7.0: `diskLayout()` added S.M.A.R.T for Windows (if installed)
 - Version 5.6.0: `cpuTemperature()` added added socket and chipset temp (linux)
@@ -288,20 +287,29 @@ Full function reference with examples can be found at [https://systeminformation
 | --------------- | ------------- | ----- | ------- | --- | --- | --- | -------- |
 | si.graphics(cb) | {...} | X |  | X | X |  | arrays of graphics controllers and displays |
 | | controllers[]| X |  | X | X |  | graphics controllers array |
-| | ...[0].model | X |  | X | X |  | graphics controller model |
 | | ...[0].vendor | X |  | X | X |  | e.g. ATI |
-| | ...[0].deviceName |  |  |   | X |  | e.g. \\\\.\\DISPLAY1 |
+| | ...[0].vendorId |  |  | X | |  | vendor ID |
+| | ...[0].model | X |  | X | X |  | graphics controller model |
+| | ...[0].deviceId |  |  | X | |  | device ID |
 | | ...[0].bus | X |  | X | X |  | on which bus (e.g. PCIe) |
 | | ...[0].vram | X |  | X | X |  | VRAM size (in MB) |
 | | ...[0].vramDynamic | X |  | X | X |  | true if dynamicly allocated ram |
+| | ...[0].external |  |  | X | |  | is external GPU |
+| | ...[0].cores |  |  | X | |  | Apple silicon only |
+| | ...[0].metalVersion |  |  | X | |  | Apple Metal Version |
 | | displays[] | X |  | X | X |  | monitor/display array |
 | | ...[0].vendor |  |  |  | X |  | monitor/display vendor |
+| | ...[0].vendorId |  |  | X | |  | vendor ID |
+| | ...[0].deviceName |  |  |   | X |  | e.g. \\\\.\\DISPLAY1 |
 | | ...[0].model | X |  | X | X |  | monitor/display model |
+| | ...[0].productionYear |  |  | X | |  | production year |
+| | ...[0].serial |  |  | X | |  | serial number |
+| | ...[0].displayId |  |  | X | |  | display ID |
 | | ...[0].main | X |  | X | X|  | true if main monitor |
 | | ...[0].builtin | X |  | X |  |  | true if built in monitor |
 | | ...[0].connection | X |  | X | X |  | e.g. DisplayPort or HDMI |
-| | ...[0].sizeX | X |  | X | X |  | size in mm horizontal |
-| | ...[0].sizeY | X |  | X | X |  | size in mm vertical |
+| | ...[0].sizeX | X |  | | X |  | size in mm horizontal |
+| | ...[0].sizeY | X |  | | X |  | size in mm vertical |
 | | ...[0].pixelDepth | X |  | X | X |  | color depth in bits |
 | | ...[0].resolutionX | X |  | X | X |  | pixel horizontal |
 | | ...[0].resolutionY | X |  | X | X |  | pixel vertical |

package/lib/battery.js

@@ -114,12 +114,13 @@ module.exports = function (callback) {
               result.voltage = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_VOLTAGE_NOW', '='), 10) / 1000000.0;
               result.capacityUnit = result.voltage ? 'mWh' : 'mAh';
               result.cycleCount = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_CYCLE_COUNT', '='), 10);
-              result.maxCapacity = Math.round(parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_CHARGE_FULL', '='), 10) / 1000.0 * (result.voltage || 1));
-              result.designedCapacity = Math.round(parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_CHARGE_FULL_DESIGN', '='), 10) / 1000.0 * (result.voltage || 1));
+              result.maxCapacity = Math.round(parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_CHARGE_FULL', '=', true, true), 10) / 1000.0 * (result.voltage || 1));
+              const desingedMinVoltage = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_VOLTAGE_MIN_DESIGN', '='), 10) / 1000000.0;
+              result.designedCapacity = Math.round(parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_CHARGE_FULL_DESIGN', '=', true, true), 10) / 1000.0 * (desingedMinVoltage || result.voltage || 1));
               result.currentCapacity = Math.round(parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_CHARGE_NOW', '='), 10) / 1000.0 * (result.voltage || 1));
               if (!result.maxCapacity) {
-                result.maxCapacity = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_ENERGY_FULL', '='), 10) / 1000.0;
-                result.designedCapacity = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_ENERGY_FULL_DESIGN', '='), 10) / 1000.0 | result.maxCapacity;
+                result.maxCapacity = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_ENERGY_FULL', '=', true, true), 10) / 1000.0;
+                result.designedCapacity = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_ENERGY_FULL_DESIGN', true, true, '='), 10) / 1000.0 | result.maxCapacity;
                 result.currentCapacity = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_ENERGY_NOW', '='), 10) / 1000.0;
               }
               const percent = util.getValue(lines, 'POWER_SUPPLY_CAPACITY', '=');

package/lib/filesystem.js

@@ -989,7 +989,7 @@ function diskLayout(callback) {
                 if (sizeStr) {
                   let sizeValue = 0;
                   if (sizeStr.indexOf('(') >= 0) {
-                    sizeValue = parseInt(sizeStr.match(/\(([^)]+)\)/)[1].replace(/\./g, '').replace(/,/g, ''));
+                    sizeValue = parseInt(sizeStr.match(/\(([^)]+)\)/)[1].replace(/\./g, '').replace(/,/g, '').replace(/\s/g, ''));
                   }
                   if (!sizeValue) {
                     sizeValue = parseInt(sizeStr);
@@ -1037,7 +1037,7 @@ function diskLayout(callback) {
                 if (sizeStr) {
                   let sizeValue = 0;
                   if (sizeStr.indexOf('(') >= 0) {
-                    sizeValue = parseInt(sizeStr.match(/\(([^)]+)\)/)[1].replace(/\./g, '').replace(/,/g, ''));
+                    sizeValue = parseInt(sizeStr.match(/\(([^)]+)\)/)[1].replace(/\./g, '').replace(/,/g, '').replace(/\s/g, ''));
                   }
                   if (!sizeValue) {
                     sizeValue = parseInt(sizeStr);
@@ -1082,7 +1082,7 @@ function diskLayout(callback) {
                 if (sizeStr) {
                   let sizeValue = 0;
                   if (sizeStr.indexOf('(') >= 0) {
-                    sizeValue = parseInt(sizeStr.match(/\(([^)]+)\)/)[1].replace(/\./g, '').replace(/,/g, ''));
+                    sizeValue = parseInt(sizeStr.match(/\(([^)]+)\)/)[1].replace(/\./g, '').replace(/,/g, '').replace(/\s/g, ''));
                   }
                   if (!sizeValue) {
                     sizeValue = parseInt(sizeStr);

package/lib/graphics.js

@@ -57,7 +57,7 @@ const videoTypes = {
 };
 
 function getVendorFromModel(model) {
-  const diskManufacturers = [
+  const manufacturers = [
     { pattern: '^LG.+', manufacturer: 'LG' },
     { pattern: '^BENQ.+', manufacturer: 'BenQ' },
     { pattern: '^ASUS.+', manufacturer: 'Asus' },
@@ -68,20 +68,23 @@ function getVendorFromModel(model) {
     { pattern: '^ACER.+', manufacturer: 'Acer' },
     { pattern: '^AOC.+', manufacturer: 'AOC Monitors' },
     { pattern: '^HP.+', manufacturer: 'HP' },
-    { pattern: '^EIZO.+', manufacturer: 'Eizo' },
-    { pattern: '^PHILIPS.+', manufacturer: 'Philips' },
-    { pattern: '^IIYAMA.+', manufacturer: 'Iiyama' },
-    { pattern: '^SHARP.+', manufacturer: 'Sharp' },
-    { pattern: '^NEC.+', manufacturer: 'NEC' },
-    { pattern: '^LENOVO.+', manufacturer: 'Lenovo' },
-    { pattern: 'COMPAQ.+', manufacturer: 'Compaq' },
-    { pattern: 'APPLE.+', manufacturer: 'Apple' },
+    { pattern: '^EIZO.?', manufacturer: 'Eizo' },
+    { pattern: '^PHILIPS.?', manufacturer: 'Philips' },
+    { pattern: '^IIYAMA.?', manufacturer: 'Iiyama' },
+    { pattern: '^SHARP.?', manufacturer: 'Sharp' },
+    { pattern: '^NEC.?', manufacturer: 'NEC' },
+    { pattern: '^LENOVO.?', manufacturer: 'Lenovo' },
+    { pattern: 'COMPAQ.?', manufacturer: 'Compaq' },
+    { pattern: 'APPLE.?', manufacturer: 'Apple' },
+    { pattern: 'INTEL.?', manufacturer: 'Intel' },
+    { pattern: 'AMD.?', manufacturer: 'AMD' },
+    { pattern: 'NVIDIA.?', manufacturer: 'NVDIA' },
   ];
 
   let result = '';
   if (model) {
     model = model.toUpperCase();
-    diskManufacturers.forEach((manufacturer) => {
+    manufacturers.forEach((manufacturer) => {
       const re = RegExp(manufacturer.pattern);
       if (re.test(model)) { result = manufacturer.manufacturer; }
     });
@@ -89,166 +92,113 @@ function getVendorFromModel(model) {
   return result;
 }
 
+function getVendorFromId(id) {
+  const vendors = {
+    '610': 'Apple',
+    '1e6d': 'LG',
+    '10ac': 'DELL',
+    '4dd9': 'Sony',
+    '38a3': 'NEC',
+  };
+  return vendors[id] || '';
+}
+
+function vendorToId(str) {
+  let result = '';
+  str = (str || '').toLowerCase();
+  if (str.indexOf('apple') >= 0) { result = '0x05ac'; }
+  else if (str.indexOf('nvidia') >= 0) { result = '0x10de'; }
+  else if (str.indexOf('intel') >= 0) { result = '0x8086'; }
+  else if (str.indexOf('ati') >= 0 || str.indexOf('amd') >= 0) { result = '0x1002'; }
+
+  return result;
+}
+
+function getMetalVersion(id) {
+  const families = {
+    'spdisplays_mtlgpufamilymac1': 'mac1',
+    'spdisplays_mtlgpufamilymac2': 'mac2',
+    'spdisplays_mtlgpufamilyapple1': 'apple1',
+    'spdisplays_mtlgpufamilyapple2': 'apple2',
+    'spdisplays_mtlgpufamilyapple3': 'apple3',
+    'spdisplays_mtlgpufamilyapple4': 'apple4',
+    'spdisplays_mtlgpufamilyapple5': 'apple5',
+    'spdisplays_mtlgpufamilyapple6': 'apple6',
+    'spdisplays_mtlgpufamilyapple7': 'apple7',
+    'spdisplays_metalfeaturesetfamily11': 'family1_v1',
+    'spdisplays_metalfeaturesetfamily12': 'family1_v2',
+    'spdisplays_metalfeaturesetfamily13': 'family1_v3',
+    'spdisplays_metalfeaturesetfamily14': 'family1_v4',
+    'spdisplays_metalfeaturesetfamily21': 'family2_v1'
+  };
+  return families[id] || '';
+}
+
 function graphics(callback) {
 
-  function parseLinesDarwin(lines) {
-    let starts = [];
-    let level = -1;
-    let lastlevel = -1;
-    let controllers = [];
-    let displays = [];
-    let currentController = {
-      vendor: '',
-      model: '',
-      bus: '',
-      vram: null,
-      vramDynamic: false
+  function parseLinesDarwin(graphicsArr) {
+    const res = {
+      controllers: [],
+      displays: []
     };
-    let currentDisplay = {
-      vendor: '',
-      model: '',
-      deviceName: '',
-      main: false,
-      builtin: false,
-      connection: '',
-      sizeX: null,
-      sizeY: null,
-      pixelDepth: null,
-      resolutionX: null,
-      resolutionY: null,
-      currentResX: null,
-      currentResY: null,
-      positionX: 0,
-      positionY: 0,
-      currentRefreshRate: null
-    };
-    for (let i = 0; i < lines.length; i++) {
-      if ('' !== lines[i].trim()) {
-        let start = lines[i].search(/\S|$/);
-        if (-1 === starts.indexOf(start)) {
-          starts.push(start);
-        }
-        level = starts.indexOf(start);
-        if (level < lastlevel) {
-          if (Object.keys(currentController).length > 0 && (currentController.vendor || currentController.model)) {// just changed to Displays
-            controllers.push(currentController);
-            currentController = {
-              vendor: '',
-              model: '',
-              bus: '',
-              vram: null,
-              vramDynamic: false
-            };
-          }
-          if (Object.keys(currentDisplay).length > 0) {// just changed to Displays
-            if (currentDisplay.resolutionX && currentDisplay.resolutionY) { displays.push(currentDisplay); }
-            currentDisplay = {
-              vendor: '',
-              model: '',
-              deviceName: '',
-              main: false,
-              builtin: false,
-              connection: '',
+    try {
+      graphicsArr.forEach(function (item) {
+        // controllers
+        const bus = ((item.sppci_bus || '').indexOf('builtin') > -1 ? 'Built-In' : ((item.sppci_bus || '').indexOf('pcie') > -1 ? 'PCIe' : ''));
+        const vram = (parseInt((item.spdisplays_vram || ''), 10) || 0) * (((item.spdisplays_vram || '').indexOf('GB') > -1) ? 1024 : 1);
+        const vramDyn = (parseInt((item.spdisplays_vram_shared || ''), 10) || 0) * (((item.spdisplays_vram_shared || '').indexOf('GB') > -1) ? 1024 : 1);
+        let metalVersion = getMetalVersion(item.spdisplays_metal || item.spdisplays_metalfamily || '');
+        res.controllers.push({
+          vendor: getVendorFromModel(item.spdisplays_vendor || '') || item.spdisplays_vendor || '',
+          model: item.sppci_model || '',
+          bus,
+          vramDynamic: bus === 'Built-In',
+          vram: vram || vramDyn || null,
+          deviceId: item['spdisplays_device-id'] || '',
+          vendorId: item['spdisplays_vendor-id'] || vendorToId((item['spdisplays_vendor'] || '') + (item.sppci_model || '')),
+          external: (item.sppci_device_type === 'spdisplays_egpu'),
+          cores: item['sppci_cores'] || null,
+          metalVersion
+        });
+
+        // displays
+        if (item.spdisplays_ndrvs && item.spdisplays_ndrvs.length) {
+          item.spdisplays_ndrvs.forEach(function (displayItem) {
+            const connectionType = displayItem['spdisplays_connection_type'] || '';
+            const currentResolutionParts = (displayItem['_spdisplays_resolution'] || '').split('@');
+            const currentResolution = currentResolutionParts[0].split('x');
+            const pixelParts = (displayItem['_spdisplays_pixels'] || '').split('x');
+            const pixelDepthString = displayItem['spdisplays_depth'] || '';
+            const serial = displayItem['_spdisplays_display-serial-number'] || displayItem['_spdisplays_display-serial-number2'] || null;
+            res.displays.push({
+              vendor: getVendorFromId(displayItem['_spdisplays_display-vendor-id'] || '') || getVendorFromModel(displayItem['_name'] || ''),
+              vendorId: displayItem['_spdisplays_display-vendor-id'] || '',
+              model: displayItem['_name'] || '',
+              productionYear: displayItem['_spdisplays_display-year'] || null,
+              serial: serial !== '0' ? serial : null,
+              displayId: displayItem['_spdisplays_displayID'] || null,
+              main: displayItem['spdisplays_main'] ? displayItem['spdisplays_main'] === 'spdisplays_yes' : false,
+              builtin: (displayItem['spdisplays_display_type'] || '').indexOf('built-in') > -1,
+              connection: ((connectionType.indexOf('_internal') > -1) ? 'Internal' : ((connectionType.indexOf('_displayport') > -1) ? 'Display Port' : ((connectionType.indexOf('_hdmi') > -1) ? 'HDMI' : null))),
               sizeX: null,
               sizeY: null,
-              pixelDepth: null,
-              resolutionX: null,
-              resolutionY: null,
-              currentResX: null,
-              currentResY: null,
+              pixelDepth: (pixelDepthString === 'CGSThirtyBitColor' ? 30 : (pixelDepthString === 'CGSThirtytwoBitColor' ? 32 : (pixelDepthString === 'CGSTwentyfourBitColor' ? 24 : ''))),
+              resolutionX: pixelParts.length > 1 ? parseInt(pixelParts[0], 10) : null,
+              resolutionY: pixelParts.length > 1 ? parseInt(pixelParts[1], 10) : null,
+              currentResX: currentResolution.length > 1 ? parseInt(currentResolution[0], 10) : null,
+              currentResY: currentResolution.length > 1 ? parseInt(currentResolution[1], 10) : null,
               positionX: 0,
               positionY: 0,
-              currentRefreshRate: null
-            };
-          }
-        }
-        lastlevel = level;
-        let parts = lines[i].split(':');
-        if (2 === level) {       // grafics controller level
-          if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('chipsetmodel') !== -1) { currentController.model = parts[1].trim(); }
-          if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('vendor') !== -1) { currentController.vendor = parts[1].split('(')[0].trim(); }
-          if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('vram(total)') !== -1) {
-            currentController.vram = parseInt(parts[1]);    // in MB
-            if (parts[1].toLowerCase().indexOf('gb') !== -1) {
-              currentController.vram = currentController.vram * 1024;
-            }
-            currentController.vramDynamic = false;
-          }
-          if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('vram(dynamic,max)') !== -1) {
-            currentController.vram = parseInt(parts[1]);    // in MB
-            if (parts[1].toLowerCase().indexOf('gb') !== -1) {
-              currentController.vram = currentController.vram * 1024;
-            }
-            currentController.vramDynamic = true;
-          }
-          if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('bus') !== -1) {
-            currentController.bus = parts[1].trim();
-            if (currentController.bus.toLowerCase() === 'built-in') {
-              currentController.vramDynamic = true;
-            }
-          }
-        }
-        if (3 === level) {       // display controller level
-          if (parts.length > 1 && '' === parts[1]) {
-            currentDisplay.vendor = getVendorFromModel(parts[0].trim());
-            currentDisplay.model = parts[0].trim();
-            currentDisplay.main = false;
-            currentDisplay.builtin = false;
-            currentDisplay.connection = '';
-            currentDisplay.sizeX = null;
-            currentDisplay.sizeY = null;
-            currentDisplay.positionX = 0;
-            currentDisplay.positionY = 0;
-            currentDisplay.pixelDepth = null;
-          }
-        }
-        if (4 === level) {       // display controller details level
-          if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('resolution') !== -1) {
-            let resolution = parts[1].split('x');
-            if (resolution.length > 1) {
-              let xpart = resolution[0];
-              if (xpart.indexOf('(') !== -1) {
-                xpart = xpart.split('(').slice(-1)[0];
-              }
-              let ypart = resolution[1];
-              if (ypart.indexOf(')') !== -1) {
-                ypart = ypart.split(')')[0];
-              }
-              currentDisplay.resolutionX = parseInt(xpart) || 0;
-              currentDisplay.resolutionY = parseInt(ypart) || 0;
-              currentDisplay.currentResX = currentDisplay.resolutionX;
-              currentDisplay.currentResY = currentDisplay.resolutionY;
-            }
-          }
-          if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('pixeldepth') !== -1) { currentDisplay.pixelDepth = parseInt(parts[1]); } // in BIT
-          if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('framebufferdepth') !== -1) { currentDisplay.pixelDepth = parseInt(parts[1]); } // in BIT
-          if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('maindisplay') !== -1 && parts[1].replace(/ +/g, '').toLowerCase() === 'yes') { currentDisplay.main = true; }
-          if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('built-in') !== -1 && parts[1].replace(/ +/g, '').toLowerCase() === 'yes') {
-            currentDisplay.vendor = 'Apple';
-            currentDisplay.builtin = true;
-            currentDisplay.connection = '';
-          }
-          if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('connectiontype') !== -1) {
-            currentDisplay.builtin = false;
-            currentDisplay.connection = parts[1].trim();
-            if (currentDisplay.connection === 'Internal') {
-              currentDisplay.vendor = 'Apple';
-              currentDisplay.builtin = true;
-            }
-          }
+              currentRefreshRate: currentResolutionParts.length > 1 ? parseInt(currentResolutionParts[1], 10) : null,
+
+            });
+          });
         }
-      }
-    }
-    if (Object.keys(currentController).length > 0 && (currentController.vendor || currentController.model)) {// just changed to Displays
-      controllers.push(currentController);
-    }
-    if (Object.keys(currentDisplay).length > 0) {// just changed to Displays
-      if (currentDisplay.resolutionX && currentDisplay.resolutionY) { displays.push(currentDisplay); }
+      });
+      return res;
+    } catch (e) {
+      return res;
     }
-    return ({
-      controllers: controllers,
-      displays: displays
-    });
   }
 
   function parseLinesLinuxControllers(lines) {
@@ -706,11 +656,15 @@ function graphics(callback) {
         displays: []
       };
       if (_darwin) {
-        let cmd = 'system_profiler SPDisplaysDataType';
+        let cmd = 'system_profiler -xml -detailLevel full SPDisplaysDataType';
         exec(cmd, function (error, stdout) {
           if (!error) {
-            let lines = stdout.toString().split('\n');
-            result = parseLinesDarwin(lines);
+            try {
+              let output = stdout.toString();
+              result = parseLinesDarwin(util.plistParser(output)[0]._items);
+            } catch (e) {
+              util.noop();
+            }
           }
           if (callback) {
             callback(result);

package/lib/index.d.ts

@@ -151,16 +151,16 @@ export namespace Systeminformation {
       info_name: string;
       type: string;
       protocol: string;
-    }
+    };
     model_family?: string,
     model_name?: string,
     serial_number?: string,
     firmware_version?: string,
     smart_status: {
       passed: boolean;
-    }
+    };
     trim?: {
-      supported: boolean
+      supported: boolean;
     },
     ata_smart_attributes?: {
       revision: number;
@@ -181,7 +181,7 @@ export namespace Systeminformation {
           event_count: boolean;
           auto_keep: boolean;
         };
-        raw: { value: number; string: string }
+        raw: { value: number; string: string; };
       }[];
     };
     ata_smart_error_log?: {
@@ -209,10 +209,10 @@ export namespace Systeminformation {
         error_count_total: number;
         error_count_outdated: number;
       };
-    }
+    };
     nvme_pci_vendor?: {
       id: number,
-      subsystem_id: number
+      subsystem_id: number;
     },
     nvme_smart_health_information_log?: {
       critical_warning?: number,
@@ -232,11 +232,11 @@ export namespace Systeminformation {
       num_err_log_entries?: number,
       warning_temp_time?: number,
       critical_comp_time?: number,
-      temperature_sensors?: number[]
+      temperature_sensors?: number[];
     },
     user_capacity?: {
       blocks: number,
-      bytes: number
+      bytes: number;
     },
     logical_block_size?: number,
     temperature: {
@@ -294,11 +294,16 @@ export namespace Systeminformation {
 
   interface GraphicsControllerData {
     vendor: string;
+    vendorId?: string;
     model: string;
+    deviceId?: string;
     bus: string;
     busAddress?: string;
     vram: number;
     vramDynamic: boolean;
+    external?: boolean;
+    cores?: number;
+    metalVersion?: string;
     subDeviceId?: string;
     driverVersion?: string;
     name?: string;

package/lib/memory.js

@@ -508,7 +508,7 @@ function memLayout(callback) {
                 result.push({
                   size: parseInt(util.getValue(lines, 'Capacity', '='), 10) || 0,
                   bank: util.getValue(lines, 'abel', '='), // BankLabel
-                  type: memoryTypes[parseInt(util.getValue(lines, 'MemoryType', '='), 10)],
+                  type: memoryTypes[parseInt(util.getValue(lines, 'MemoryType', '='), 10) || parseInt(util.getValue(lines, 'SMBIOSMemoryType', '='), 10)],
                   ecc: dataWidth && totalWidth ? totalWidth > dataWidth : false,
                   clockSpeed: parseInt(util.getValue(lines, 'ConfiguredClockSpeed', '='), 10) || parseInt(util.getValue(lines, 'Speed', '='), 10) || 0,
                   formFactor: FormFactors[parseInt(util.getValue(lines, 'FormFactor', '='), 10) || 0],

package/lib/util.js

@@ -103,16 +103,17 @@ function cores() {
   return _cores;
 }
 
-function getValue(lines, property, separator, trimmed) {
+function getValue(lines, property, separator, trimmed, lineMatch) {
   separator = separator || ':';
   property = property.toLowerCase();
   trimmed = trimmed || false;
+  lineMatch = lineMatch || false;
   for (let i = 0; i < lines.length; i++) {
     let line = lines[i].toLowerCase().replace(/\t/g, '');
     if (trimmed) {
       line = line.trim();
     }
-    if (line.startsWith(property)) {
+    if (line.startsWith(property) && (lineMatch ? (line.match(property + separator)) : true)) {
       const parts = trimmed ? lines[i].trim().split(separator) : lines[i].split(separator);
       if (parts.length >= 2) {
         parts.shift();
@@ -984,6 +985,94 @@ function linuxVersion() {
   return result;
 }
 
+function plistParser(xmlStr) {
+  const tags = ['array', 'dict', 'key', 'string', 'integer', 'date', 'real', 'data'];
+
+  function getNextTagPos() {
+    let result = {
+      pos: 999999,
+      tag: ''
+    };
+    tags.forEach((tag) => {
+      const ii = xmlStr.indexOf(`<${tag}>`);
+      if (ii !== -1 && ii < result.pos) {
+        result = {
+          pos: ii,
+          tag
+        };
+      }
+    });
+    return result;
+  }
+
+  function getNextClosingTagPos(tag) {
+    return xmlStr.indexOf(`</${tag}>`);
+  }
+
+  function parseXmlTree(isArray, closingTag) {
+    // start parsing
+    let obj = {};
+    let arr = [];
+    let cpos = getNextTagPos();
+    let key = '';
+    let valueStr = null;
+
+    while (cpos.pos >= 0 && cpos.tag) {
+      let nextTagPos = getNextTagPos();
+      // let nextClosePos = getNextClosingTagPos(cpos.tag);
+      let nextClosePosBlock = closingTag ? getNextClosingTagPos(closingTag) : 999999;
+      if (nextClosePosBlock <= nextTagPos.pos) {
+        return (isArray ? arr : obj);
+      }
+      xmlStr = xmlStr.substring((cpos.pos + cpos.tag.length + 2));
+      if (cpos.tag === 'array') {
+        const res = parseXmlTree(true, cpos.tag);
+        if (key) {
+          obj[key] = res;
+        } else {
+          obj = res;
+        }
+      } else if (cpos.tag === 'dict') {
+        const res = parseXmlTree(false, cpos.tag);
+        if (!isArray) {
+          obj[key] = res;
+        } else {
+          arr.push(res);
+        }
+        xmlStr = xmlStr.substring((cpos.pos + cpos.tag.length + 3));
+      } else {
+        let nextTagPos = getNextTagPos();
+        let nextClosePos = getNextClosingTagPos(cpos.tag);
+        // nextClosePosBlock = closingTag ? getNextClosingTagPos(closingTag) : 999999;
+        if (nextClosePos < nextTagPos.pos) {
+          if (cpos.tag === 'key') {
+            key = xmlStr.substring(0, nextClosePos);
+            xmlStr = xmlStr.substring(key.length + cpos.tag.length + 3); // key done
+          } else {
+            valueStr = xmlStr.substring(0, nextClosePos).replace(/\t/g, '');
+            if (cpos.tag === 'string') { if (!isArray) { obj[key] = valueStr; } else { arr.push(valueStr); } }
+            if (cpos.tag === 'integer') { if (!isArray) { obj[key] = parseInt(valueStr); } else { arr.push(parseInt(valueStr)); } }
+            if (cpos.tag === 'date') { if (!isArray) { obj[key] = valueStr; } else { arr.push(valueStr); } }
+            if (cpos.tag === 'data') { if (!isArray) { obj[key] = valueStr; } else { arr.push(valueStr); } }
+            if (cpos.tag === 'real') { if (!isArray) { obj[key] = parseFloat(valueStr); } else { arr.push(parseFloat(valueStr)); } }
+
+            key = '';
+            xmlStr = xmlStr.substring(valueStr.length + cpos.tag.length + 3); // property done
+          }
+        }
+      }
+      cpos = getNextTagPos();
+    }
+    return (isArray ? arr : obj);
+  }
+  try {
+    const result = parseXmlTree(false, '');
+    return result;
+  } catch (e) {
+    return {};
+  }
+}
+
 function noop() { }
 
 exports.toInt = toInt;
@@ -1019,6 +1108,7 @@ exports.promisify = promisify;
 exports.promisifySave = promisifySave;
 exports.smartMonToolsInstalled = smartMonToolsInstalled;
 exports.linuxVersion = linuxVersion;
+exports.plistParser = plistParser;
 exports.stringReplace = stringReplace;
 exports.stringToLower = stringToLower;
 exports.stringToString = stringToString;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systeminformation",
-  "version": "5.8.8",
+  "version": "5.9.2",
   "description": "Simple system and OS information library",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",