systeminformation 5.24.5 → 5.24.7

package/README.md

@@ -1186,7 +1186,7 @@ All other trademarks are the property of their respective owners.
 [daviddm-url]: https://david-dm.org/sebhildebrandt/systeminformation
 [issues-img]: https://img.shields.io/github/issues/sebhildebrandt/systeminformation.svg?style=flat-square
 [issues-url]: https://github.com/sebhildebrandt/systeminformation/issues
-[closed-issues-img]: https://img.shields.io/github/issues-closed-raw/sebhildebrandt/systeminformation.svg?style=flat-square&color=brightgreen
+[closed-issues-img]: https://img.shields.io/github/issues-search?query=repo%3Asebhildebrandt/systeminformation+is%3Aclosed&style=flat-square&color=brightgreen&label=Issues+closed
 [closed-issues-url]: https://github.com/sebhildebrandt/systeminformation/issues?q=is%3Aissue+is%3Aclosed
 [new-issue]: https://github.com/sebhildebrandt/systeminformation/issues/new/choose
 [mmon-npm-url]: https://npmjs.org/package/mmon

package/lib/cpu.js

@@ -737,6 +737,7 @@ function getCpu() {
             }
             modelline = util.getValue(lines, 'model name') || modelline;
             modelline = util.getValue(lines, 'bios model name') || modelline;
+            modelline = util.cleanString(modelline);
             const modellineParts = modelline.split('@');
             result.brand = modellineParts[0].trim();
             result.speed = modellineParts[1] ? parseFloat(modellineParts[1].trim()) : 0;

package/lib/index.js

@@ -55,6 +55,7 @@ const _sunos = (_platform === 'sunos');
 
 if (_windows) {
   util.getCodepage();
+  util.getPowershell();
 }
 
 // ----------------------------------------------------------------------------------

package/lib/system.js

@@ -221,7 +221,7 @@ function system(callback) {
             // const version = util.getValue(lines, 'version', '=', true);
             result.manufacturer = util.getValue(lines, 'manufacturer', '=', true);
             result.model = model.key;
-            result.type = macOsChassisType(model.model);
+            result.type = macOsChassisType(model.version);
             result.version = model.version;
             result.serial = util.getValue(lines, 'ioplatformserialnumber', '=', true);
             result.uuid = util.getValue(lines, 'ioplatformuuid', '=', true).toLowerCase();
@@ -607,13 +607,13 @@ 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'; }
+  if (model.indexOf('macbookair') >= 0 || model.indexOf('macbook air') >= 0) { return 'Notebook'; }
+  if (model.indexOf('macbookpro') >= 0 || model.indexOf('macbook pro') >= 0) { return 'Notebook'; }
+  if (model.indexOf('macbook') >= 0) { return 'Notebook'; }
+  if (model.indexOf('macmini') >= 0 || model.indexOf('mac mini') >= 0) { return 'Desktop'; }
+  if (model.indexOf('imac') >= 0) { return 'Desktop'; }
+  if (model.indexOf('macstudio') >= 0 || model.indexOf('mac studio') >= 0) { return 'Desktop'; }
+  if (model.indexOf('macpro') >= 0 || model.indexOf('mac pro') >= 0) { return 'Tower'; }
   return 'Other';
 }
 

package/lib/util.js

@@ -42,6 +42,7 @@ let _psChild;
 let _psResult = '';
 let _psCmds = [];
 let _psPersistent = false;
+let _powerShell = '';
 const _psToUTF8 = '$OutputEncoding = [System.Console]::OutputEncoding = [System.Console]::InputEncoding = [System.Text.Encoding]::UTF8 ; ';
 const _psCmdStart = '--###START###--';
 const _psError = '--ERROR--';
@@ -332,6 +333,16 @@ function findObjectByKey(array, key, value) {
   return -1;
 }
 
+function getPowershell() {
+  _powerShell = 'powershell.exe';
+  if (_windows) {
+    const defaultPath = `${WINDIR}\\system32\\WindowsPowerShell\\v1.0\\powershell.exe`;
+    if (fs.existsSync(defaultPath)) {
+      _powerShell = defaultPath;
+    }
+  }
+}
+
 function getWmic() {
   if (os.type() === 'Windows_NT' && !wmicPath) {
     wmicPath = WINDIR + '\\system32\\wbem\\wmic.exe';
@@ -401,7 +412,7 @@ function powerShellProceedResults(data) {
 
 function powerShellStart() {
   if (!_psChild) {
-    _psChild = spawn('powershell.exe', ['-NoProfile', '-NoLogo', '-InputFormat', 'Text', '-NoExit', '-Command', '-'], {
+    _psChild = spawn(_powerShell, ['-NoProfile', '-NoLogo', '-InputFormat', 'Text', '-NoExit', '-Command', '-'], {
       stdio: 'pipe',
       windowsHide: true,
       maxBuffer: 1024 * 20000,
@@ -479,7 +490,7 @@ function powerShell(cmd) {
     return new Promise((resolve) => {
       process.nextTick(() => {
         try {
-          const child = spawn('powershell.exe', ['-NoProfile', '-NoLogo', '-InputFormat', 'Text', '-NoExit', '-ExecutionPolicy', 'Unrestricted', '-Command', '-'], {
+          const child = spawn(_powerShell, ['-NoProfile', '-NoLogo', '-InputFormat', 'Text', '-NoExit', '-ExecutionPolicy', 'Unrestricted', '-Command', '-'], {
             stdio: 'pipe',
             windowsHide: true,
             maxBuffer: 1024 * 20000,
@@ -2535,6 +2546,9 @@ function checkWebsite(url, timeout = 5000) {
   });
 };
 
+function cleanString(str) {
+  return str.replace(/To Be Filled By O.E.M./g, '');
+}
 function noop() { }
 
 exports.toInt = toInt;
@@ -2591,3 +2605,5 @@ exports.getFilesInPath = getFilesInPath;
 exports.semverCompare = semverCompare;
 exports.getAppleModel = getAppleModel;
 exports.checkWebsite = checkWebsite;
+exports.cleanString = cleanString;
+exports.getPowershell = getPowershell;

package/package.json

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