systeminformation 5.9.1 → 5.9.2

package/CHANGELOG.md

@@ -77,6 +77,7 @@ 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 |

package/README.md

@@ -287,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/graphics.js

@@ -68,17 +68,17 @@ 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: 'INTEL.+', manufacturer: 'Intel' },
-    { pattern: 'AMD.+', manufacturer: 'AMD' },
-    { pattern: 'NVIDIA.+', manufacturer: 'NVDIA' },
+    { 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 = '';
@@ -125,6 +125,11 @@ function getMetalVersion(id) {
     '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] || '';
 }
@@ -139,16 +144,16 @@ function graphics(callback) {
     try {
       graphicsArr.forEach(function (item) {
         // controllers
-        const bus = ((item.sppci_bus || '').indexOf('builtin') ? 'Built-In' : ((item.sppci_bus || '').indexOf('pcie') ? 'PCIE' : ''));
-        const vram = (parseInt((item._spdisplays_vram || ''), 10) || 0) * (((item._spdisplays_vram || '').indexOf('GB') > -1) ? 1024 : 1);
-        const vramDyn = (parseInt((item.spdisplays_vram_shares || ''), 10) || 0) * (((item.spdisplays_vram_shares || '').indexOf('GB') > -1) ? 1024 : 1);
+        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 || 0,
+          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'),
@@ -159,7 +164,7 @@ function graphics(callback) {
         // displays
         if (item.spdisplays_ndrvs && item.spdisplays_ndrvs.length) {
           item.spdisplays_ndrvs.forEach(function (displayItem) {
-            const connectionType = displayItem['spdisplays_connection_type'];
+            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');
@@ -172,9 +177,9 @@ function graphics(callback) {
               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' : true,
-              builtin: (displayItem['spdisplays_display_type'] || '').indexOf('built-in') >= 0,
-              connection: ((connectionType.indexOf('_internal')) ? 'Internal' : ((connectionType.indexOf('_displayport')) ? 'Display Port' : ((connectionType.indexOf('_hdmi')) ? 'HDMI' : ''))),
+              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: (pixelDepthString === 'CGSThirtyBitColor' ? 30 : (pixelDepthString === 'CGSThirtytwoBitColor' ? 32 : (pixelDepthString === 'CGSTwentyfourBitColor' ? 24 : ''))),

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/package.json

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