systeminformation 5.9.10 → 5.9.14

package/lib/cpu.js

@@ -781,7 +781,7 @@ function getCpu() {
           try {
             const workload = [];
             workload.push(util.powerShell('Get-WmiObject Win32_processor | fl *'));
-            workload.push(util.powerShell('Get-WmiObject Win32_CacheMemory | select CacheType,InstalledSize,Purpose | fl *'));
+            workload.push(util.powerShell('Get-WmiObject Win32_CacheMemory | select CacheType,InstalledSize,Level | fl *'));
             // workload.push(util.powerShell('Get-ComputerInfo -property "HyperV*"'));
             workload.push(util.powerShell('(Get-CimInstance Win32_ComputerSystem).HypervisorPresent'));
 
@@ -852,16 +852,21 @@ function getCpu() {
               parts.forEach(function (part) {
                 lines = part.split('\r\n');
                 const cacheType = util.getValue(lines, 'CacheType');
-                const purpose = util.getValue(lines, 'Purpose');
+                const level = util.getValue(lines, 'Level');
                 const installedSize = util.getValue(lines, 'InstalledSize');
                 // L1 Instructions
-                if (purpose === 'L1 Cache' && cacheType === '3') {
+                if (level === '3' && cacheType === '3') {
                   result.cache.l1i = parseInt(installedSize, 10);
                 }
                 // L1 Data
-                if (purpose === 'L1 Cache' && cacheType === '4') {
+                if (level === '3' && cacheType === '4') {
                   result.cache.l1d = parseInt(installedSize, 10);
                 }
+                // L1 all
+                if (level === '3' && cacheType === '5' && !result.cache.l1i && !result.cache.l1d) {
+                  result.cache.l1i = parseInt(installedSize, 10) / 2;
+                  result.cache.l1d = parseInt(installedSize, 10) / 2;
+                }
               });
               // lines = data[2].split('\r\n');
               // result.virtualization = (util.getValue(lines, 'HyperVRequirementVirtualizationFirmwareEnabled').toLowerCase() === 'true');
@@ -1413,21 +1418,26 @@ function cpuCache(callback) {
               if (result.l2) { result.l2 = parseInt(result.l2, 10) * 1024; }
               if (result.l3) { result.l3 = parseInt(result.l3, 10) * 1024; }
             }
-            util.powerShell('Get-WmiObject Win32_CacheMemory | select CacheType,InstalledSize,Purpose | fl ').then((stdout, error) => {
+            util.powerShell('Get-WmiObject Win32_CacheMemory | select CacheType,InstalledSize,Level | fl ').then((stdout, error) => {
               if (!error) {
                 const parts = stdout.split(/\n\s*\n/);
                 parts.forEach(function (part) {
                   const lines = part.split('\r\n');
                   const cacheType = util.getValue(lines, 'CacheType');
-                  const purpose = util.getValue(lines, 'Purpose');
+                  const level = util.getValue(lines, 'Level');
                   const installedSize = util.getValue(lines, 'InstalledSize');
                   // L1 Instructions
-                  if (purpose === 'L1 Cache' && cacheType === '3') {
-                    result.l1i = parseInt(installedSize, 10);
+                  if (level === '3' && cacheType === '3') {
+                    result.cache.l1i = parseInt(installedSize, 10);
                   }
                   // L1 Data
-                  if (purpose === 'L1 Cache' && cacheType === '4') {
-                    result.l1d = parseInt(installedSize, 10);
+                  if (level === '3' && cacheType === '4') {
+                    result.cache.l1d = parseInt(installedSize, 10);
+                  }
+                  // L1 all
+                  if (level === '3' && cacheType === '5' && !result.cache.l1i && !result.cache.l1d) {
+                    result.cache.l1i = parseInt(installedSize, 10) / 2;
+                    result.cache.l1d = parseInt(installedSize, 10) / 2;
                   }
                 });
               }

package/lib/filesystem.js

@@ -497,7 +497,7 @@ function fsStats(callback) {
 
   return new Promise((resolve) => {
     process.nextTick(() => {
-      if (_windows) {
+      if (_windows || _freebsd || _openbsd || _netbsd || _sunos) {
         return resolve(null);
       }
 

package/lib/network.js

@@ -773,7 +773,6 @@ function networkInterfaces(callback, rescan) {
             let mtu = '';
             let speed = null;
             let carrierChanges = 0;
-            let operstate = 'down';
             let dhcp = false;
             let dnsSuffix = '';
             let ieee8021xAuth = '';
@@ -852,7 +851,7 @@ function networkInterfaces(callback, rescan) {
                 speed = isNaN(myspeed) ? null : myspeed;
               }
               carrierChanges = parseInt(util.getValue(lines, 'carrier_changes'), 10);
-              operstate = util.getValue(lines, 'operstate');
+              const operstate = util.getValue(lines, 'operstate');
               type = operstate === 'up' ? (util.getValue(lines, 'wireless').trim() ? 'wireless' : 'wired') : 'unknown';
               if (iface === 'lo' || iface.startsWith('bond')) { type = 'virtual'; }
 

package/lib/osinfo.js

@@ -35,12 +35,11 @@ const _sunos = (_platform === 'sunos');
 
 function time() {
   let t = new Date().toString().split(' ');
-
   return {
     current: Date.now(),
     uptime: os.uptime(),
     timezone: (t.length >= 7) ? t[5] : '',
-    timezoneName: (t.length >= 7) ? t.slice(6).join(' ').replace(/\(/g, '').replace(/\)/g, '') : ''
+    timezoneName: Intl ? Intl.DateTimeFormat().resolvedOptions().timeZone : (t.length >= 7) ? t.slice(6).join(' ').replace(/\(/g, '').replace(/\)/g, '') : ''
   };
 }
 
@@ -596,7 +595,7 @@ function versions(apps, callback) {
         }
         if ({}.hasOwnProperty.call(appsObj.versions, 'git')) {
           if (_darwin) {
-            const gitHomebrewExists = fs.existsSync('/usr/local/Cellar/git');
+            const gitHomebrewExists = fs.existsSync('/usr/local/Cellar/git') || fs.existsSync('/opt/homebrew/bin/git');
             if (util.darwinXcodeExists() || gitHomebrewExists) {
               exec('git --version', function (error, stdout) {
                 if (!error) {
@@ -781,9 +780,14 @@ function versions(apps, callback) {
         }
         if ({}.hasOwnProperty.call(appsObj.versions, 'python')) {
           if (_darwin) {
-            const gitHomebrewExists = fs.existsSync('/usr/local/Cellar/python');
-            if (util.darwinXcodeExists() || gitHomebrewExists) {
-              exec('python -V 2>&1', function (error, stdout) {
+            const stdout = execSync('sw_vers');
+            const lines = stdout.toString().split('\n');
+            const osVersion = util.getValue(lines, 'ProductVersion', ':');
+            const gitHomebrewExists1 = fs.existsSync('/usr/local/Cellar/python');
+            const gitHomebrewExists2 = fs.existsSync('/opt/homebrew/bin/python');
+            if ((util.darwinXcodeExists() && util.semverCompare('12.0.1', osVersion) < 0) || gitHomebrewExists1 || gitHomebrewExists2) {
+              const cmd = gitHomebrewExists1 ? '/usr/local/Cellar/python -V 2>&1' : (gitHomebrewExists2 ? '/opt/homebrew/bin/python -V 2>&1' : 'python -V 2>&1');
+              exec(cmd, function (error, stdout) {
                 if (!error) {
                   const python = stdout.toString().split('\n')[0] || '';
                   appsObj.versions.python = python.toLowerCase().replace('python', '').trim();
@@ -805,7 +809,7 @@ function versions(apps, callback) {
         }
         if ({}.hasOwnProperty.call(appsObj.versions, 'python3')) {
           if (_darwin) {
-            const gitHomebrewExists = fs.existsSync('/usr/local/Cellar/python3');
+            const gitHomebrewExists = fs.existsSync('/usr/local/Cellar/python3') || fs.existsSync('/opt/homebrew/bin/python3');
             if (util.darwinXcodeExists() || gitHomebrewExists) {
               exec('python3 -V 2>&1', function (error, stdout) {
                 if (!error) {
@@ -829,7 +833,7 @@ function versions(apps, callback) {
         }
         if ({}.hasOwnProperty.call(appsObj.versions, 'pip')) {
           if (_darwin) {
-            const gitHomebrewExists = fs.existsSync('/usr/local/Cellar/pip');
+            const gitHomebrewExists = fs.existsSync('/usr/local/Cellar/pip') || fs.existsSync('/opt/homebrew/bin/pip');
             if (util.darwinXcodeExists() || gitHomebrewExists) {
               exec('pip -V 2>&1', function (error, stdout) {
                 if (!error) {
@@ -855,7 +859,7 @@ function versions(apps, callback) {
         }
         if ({}.hasOwnProperty.call(appsObj.versions, 'pip3')) {
           if (_darwin) {
-            const gitHomebrewExists = fs.existsSync('/usr/local/Cellar/pip3');
+            const gitHomebrewExists = fs.existsSync('/usr/local/Cellar/pip3') || fs.existsSync('/opt/homebrew/bin/pip3');
             if (util.darwinXcodeExists() || gitHomebrewExists) {
               exec('pip3 -V 2>&1', function (error, stdout) {
                 if (!error) {

package/lib/users.js

@@ -297,34 +297,36 @@ function users(callback) {
           util.powerShell(cmd).then(data => {
             // controller + vram
             // let accounts = parseWinAccounts(data[0].split(/\n\s*\n/));
-            data = data.split('#-#-#-#');
-            let sessions = parseWinSessions(data[0].split(/\n\s*\n/));
-            let loggedons = parseWinLoggedOn(data[1].split(/\n\s*\n/));
-            let users = parseWinUsers(data[2].split(/\n\s*\n/));
-            for (let id in loggedons) {
-              if ({}.hasOwnProperty.call(loggedons, id)) {
-                loggedons[id].dateTime = {}.hasOwnProperty.call(sessions, id) ? sessions[id] : '';
-              }
-            }
-            users.forEach(user => {
-              let dateTime = '';
+            if (data) {
+              data = data.split('#-#-#-#');
+              let sessions = parseWinSessions(data[0].split(/\n\s*\n/));
+              let loggedons = parseWinLoggedOn(data[1].split(/\n\s*\n/));
+              let users = parseWinUsers(data[2].split(/\n\s*\n/));
               for (let id in loggedons) {
                 if ({}.hasOwnProperty.call(loggedons, id)) {
-                  if (loggedons[id].user === user.user && (!dateTime || dateTime < loggedons[id].dateTime)) {
-                    dateTime = loggedons[id].dateTime;
-                  }
+                  loggedons[id].dateTime = {}.hasOwnProperty.call(sessions, id) ? sessions[id] : '';
                 }
               }
+              users.forEach(user => {
+                let dateTime = '';
+                for (let id in loggedons) {
+                  if ({}.hasOwnProperty.call(loggedons, id)) {
+                    if (loggedons[id].user === user.user && (!dateTime || dateTime < loggedons[id].dateTime)) {
+                      dateTime = loggedons[id].dateTime;
+                    }
+                  }
+                }
 
-              result.push({
-                user: user.user,
-                tty: '',
-                date: `${dateTime.substr(0, 4)}-${dateTime.substr(4, 2)}-${dateTime.substr(6, 2)}`,
-                time: `${dateTime.substr(8, 2)}:${dateTime.substr(10, 2)}`,
-                ip: '',
-                command: ''
+                result.push({
+                  user: user.user,
+                  tty: '',
+                  date: `${dateTime.substr(0, 4)}-${dateTime.substr(4, 2)}-${dateTime.substr(6, 2)}`,
+                  time: `${dateTime.substr(8, 2)}:${dateTime.substr(10, 2)}`,
+                  ip: '',
+                  command: ''
+                });
               });
-            });
+            }
             if (callback) { callback(result); }
             resolve(result);
 

package/lib/util.js

@@ -1089,6 +1089,27 @@ function plistParser(xmlStr) {
   }
 }
 
+function semverCompare(v1, v2) {
+  let res = 0;
+  const parts1 = v1.split('.');
+  const parts2 = v2.split('.');
+  if (parts1[0] < parts2[0]) { res = 1; }
+  else if (parts1[0] > parts2[0]) { res = -1; }
+  else if (parts1[0] === parts2[0] && parts1.length >= 2 && parts2.length >= 2) {
+    if (parts1[1] < parts2[1]) { res = 1; }
+    else if (parts1[1] > parts2[1]) { res = -1; }
+    else if (parts1[1] === parts2[1]) {
+      if (parts1.length >= 3 && parts2.length >= 3) {
+        if (parts1[2] < parts2[2]) { res = 1; }
+        else if (parts1[2] > parts2[2]) { res = -1; }
+      } else if (parts2.length >= 3) {
+        res = 1;
+      }
+    }
+  }
+  return res;
+}
+
 function noop() { }
 
 exports.toInt = toInt;
@@ -1134,3 +1155,4 @@ exports.stringStartWith = stringStartWith;
 exports.mathMin = mathMin;
 exports.WINDIR = WINDIR;
 exports.getFilesInPath = getFilesInPath;
+exports.semverCompare = semverCompare;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systeminformation",
-  "version": "5.9.10",
+  "version": "5.9.14",
   "description": "Advanced, lightweight system and OS information library",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",
@@ -93,6 +93,6 @@
     "sunos"
   ],
   "engines": {
-    "node": ">=4.0.0"
+    "node": ">=8.0.0"
   }
 }