systeminformation 5.22.1 → 5.22.3

package/lib/memory.js

@@ -530,7 +530,7 @@ function memLayout(callback) {
         const FormFactors = 'Unknown|Other|SIP|DIP|ZIP|SOJ|Proprietary|SIMM|DIMM|TSOP|PGA|RIMM|SODIMM|SRIMM|SMD|SSMP|QFP|TQFP|SOIC|LCC|PLCC|BGA|FPBGA|LGA'.split('|');
 
         try {
-          util.powerShell('Get-CimInstance Win32_PhysicalMemory | select DataWidth,TotalWidth,Capacity,BankLabel,MemoryType,SMBIOSMemoryType,ConfiguredClockSpeed,FormFactor,Manufacturer,PartNumber,SerialNumber,ConfiguredVoltage,MinVoltage,MaxVoltage | fl').then((stdout, error) => {
+          util.powerShell('Get-CimInstance Win32_PhysicalMemory | select DataWidth,TotalWidth,Capacity,BankLabel,MemoryType,SMBIOSMemoryType,ConfiguredClockSpeed,FormFactor,Manufacturer,PartNumber,SerialNumber,ConfiguredVoltage,MinVoltage,MaxVoltage,Tag | fl').then((stdout, error) => {
             if (!error) {
               let devices = stdout.toString().split(/\n\s*\n/);
               devices.shift();
@@ -539,10 +539,12 @@ function memLayout(callback) {
                 const dataWidth = util.toInt(util.getValue(lines, 'DataWidth', ':'));
                 const totalWidth = util.toInt(util.getValue(lines, 'TotalWidth', ':'));
                 const size = parseInt(util.getValue(lines, 'Capacity', ':'), 10) || 0;
+                const tag = util.getValue(lines, 'Tag', ':');
+                const tagInt = util.splitByNumber(tag);
                 if (size) {
                   result.push({
                     size,
-                    bank: util.getValue(lines, 'BankLabel', ':'), // BankLabel
+                    bank: util.getValue(lines, 'BankLabel', ':') + (tagInt[1] ? '/' + tagInt[1] : ''), // BankLabel
                     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,

package/lib/system.js

@@ -215,12 +215,14 @@ function system(callback) {
         exec('ioreg -c IOPlatformExpertDevice -d 2', function (error, stdout) {
           if (!error) {
             let lines = stdout.toString().replace(/[<>"]/g, '').split('\n');
+            const model = util.splitByNumber(util.getValue(lines, 'model', '=', true));
+            const version = util.getValue(lines, 'version', '=', true);
             result.manufacturer = util.getValue(lines, 'manufacturer', '=', true);
-            result.model = util.getValue(lines, 'model', '=', true, true);
-            result.version = util.getValue(lines, 'version', '=', true);
+            result.model = version ? util.getValue(lines, 'model', '=', true) : model[0];
+            result.version = version || model[1];
             result.serial = util.getValue(lines, 'ioplatformserialnumber', '=', true);
             result.uuid = util.getValue(lines, 'ioplatformuuid', '=', true).toLowerCase();
-            result.sku = util.getValue(lines, 'board-id', '=', true);
+            result.sku = util.getValue(lines, 'board-id', '=', true) || util.getValue(lines, 'target-sub-type', '=', true);
           }
           if (callback) { callback(result); }
           resolve(result);
@@ -602,6 +604,18 @@ function baseboard(callback) {
 
 exports.baseboard = baseboard;
 
+function macOsChassisType(model) {
+  model = model.toLowerCase();
+  if (model.startsWith('macbookair')) { return 'Notebook'; }
+  if (model.startsWith('macbookpro')) { return 'Laptop'; }
+  if (model.startsWith('macbook')) { return 'Notebook'; }
+  if (model.startsWith('macmini')) { return 'Desktop'; }
+  if (model.startsWith('imac')) { return 'Desktop'; }
+  if (model.startsWith('macstudio')) { return 'Desktop'; }
+  if (model.startsWith('macpro')) { return 'Tower'; }
+  return 'Other';
+}
+
 function chassis(callback) {
   const chassisTypes = ['Other',
     'Unknown',
@@ -680,11 +694,16 @@ function chassis(callback) {
         exec('ioreg -c IOPlatformExpertDevice -d 2', function (error, stdout) {
           if (!error) {
             let lines = stdout.toString().replace(/[<>"]/g, '').split('\n');
+            const model = util.getValue(lines, 'model', '=', true);
+            const modelParts = util.splitByNumber(model);
+            const version = util.getValue(lines, 'version', '=', true);
             result.manufacturer = util.getValue(lines, 'manufacturer', '=', true);
-            result.model = util.getValue(lines, 'model', '=', true);
-            result.version = util.getValue(lines, 'version', '=', true);
+            result.model = version ? util.getValue(lines, 'model', '=', true) : modelParts[0];
+            result.type = macOsChassisType(result.model);
+            result.version = version || model;
             result.serial = util.getValue(lines, 'ioplatformserialnumber', '=', true);
-            result.assetTag = util.getValue(lines, 'board-id', '=', true);
+            result.assetTag = util.getValue(lines, 'board-id', '=', true) || util.getValue(lines, 'target-type', '=', true);
+            result.sku = util.getValue(lines, 'target-sub-type', '=', true);
           }
 
           if (callback) { callback(result); }

package/lib/util.js

@@ -63,6 +63,20 @@ function toInt(value) {
   return result;
 }
 
+function splitByNumber(str) {
+  let numberStarted = false;
+  let num = '';
+  let cpart = '';
+  for (const c of str) {
+    if ((c >= '0' && c <= '9') || numberStarted) {
+      numberStarted = true;
+      num += c;
+    } else {
+      cpart += c;
+    }
+  }
+  return [cpart, num];
+}
 
 const stringReplace = new String().replace;
 const stringToLower = new String().toLowerCase;
@@ -1302,6 +1316,7 @@ function semverCompare(v1, v2) {
 function noop() { }
 
 exports.toInt = toInt;
+exports.splitByNumber = splitByNumber;
 exports.execOptsWin = execOptsWin;
 exports.getCodepage = getCodepage;
 exports.execWin = execWin;

package/package.json

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