systeminformation 4.23.1 → 4.23.5

package/CHANGELOG.md

@@ -30,6 +30,10 @@ For major (breaking) changes - version 3 and 2 see end of page.
 
 | Version        | Date           | Comment  |
 | -------------- | -------------- | -------- |
+| 4.23.5         | 2020-04-20     | updated docs |
+| 4.23.4         | 2020-04-20     | `users()` optimized parseDateTime function |
+| 4.23.3         | 2020-04-09     | recactored to avoid `cat` |
+| 4.23.2         | 2020-04-08     | `cpu()` fixed getting base frequency for AMD Ryzen |
 | 4.23.1         | 2020-03-11     | `diskLayout()` optimized detection linux |
 | 4.23.0         | 2020-03-08     | `versions()` added param to specify which program/lib versions to detect |
 | 4.22.7         | 2020-03-08     | `diskLayout()` fixed linux |

package/README.md

@@ -30,7 +30,7 @@
   [![Sponsoring][sponsor-badge]][sponsor-url]
   [![MIT license][license-img]][license-url]
 
-This is amazing. Started as a small project just for myself, it now has > 9,000 lines of code, > 300 versions published, up to 1 mio downloads per month, > 6 mio downloads overall. Thank you to all who contributed to this project!
+This is amazing. Started as a small project just for myself, it now has > 9,000 lines of code, > 300 versions published, > 1 mio downloads per month, > 9 mio downloads overall. Thank you to all who contributed to this project!
 
 ## New Version 4.0
 

package/lib/battery.js

@@ -57,7 +57,7 @@ module.exports = function (callback) {
           battery_path = '/sys/class/power_supply/BAT0/';
         }
         if (battery_path) {
-          exec('cat ' + battery_path + 'uevent', function (error, stdout) {
+          fs.readFile(battery_path + 'uevent', function (error, stdout) {
             if (!error) {
               let lines = stdout.toString().split('\n');
 
@@ -67,7 +67,7 @@ module.exports = function (callback) {
               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;
+              result.designedcapacity = Math.round(parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_CHARGE_FULL_DESIGN', '='), 10) / 1000.0 / (result.voltage || 1)) | result.maxcapacity;
               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;
@@ -100,6 +100,9 @@ module.exports = function (callback) {
               result.serial = util.getValue(lines, 'POWER_SUPPLY_SERIAL_NUMBER', '=');
               if (callback) { callback(result); }
               resolve(result);
+            } else {
+              if (callback) { callback(result); }
+              resolve(result);
             }
           });
         } else {

package/lib/cpu.js

@@ -232,7 +232,7 @@ const AMDBaseFrequencies = {
   '7351P': '2.4',
   '2300X': '3.5',
   '2500X': '3.6',
-  '2600': '3.1',
+  '2600': '3.4',
   '2600E': '3.1',
   '2600X': '3.6',
   '2700': '3.2',
@@ -452,7 +452,7 @@ function getCpu() {
           modelline = util.getValue(lines, 'model name') || modelline;
           result.brand = modelline.split('@')[0].trim();
           result.speed = modelline.split('@')[1] ? parseFloat(modelline.split('@')[1].trim()).toFixed(2) : '0.00';
-          if (result.speed === '0.00' && result.brand.indexOf('AMD') > -1) {
+          if (result.speed === '0.00' && (result.brand.indexOf('AMD') > -1 || result.brand.toLowerCase().indexOf('ryzen') > -1)) {
             result.speed = getAMDSpeed(result.brand);
           }
           if (result.speed === '0.00') {
@@ -517,7 +517,7 @@ function getCpu() {
           }
           result.brand = modelline.split('@')[0].trim();
           result.speed = modelline.split('@')[1] ? parseFloat(modelline.split('@')[1].trim()).toFixed(2) : '0.00';
-          if (result.speed === '0.00' && result.brand.indexOf('AMD') > -1) {
+          if (result.speed === '0.00' && (result.brand.indexOf('AMD') > -1 || result.brand.toLowerCase().indexOf('ryzen') > -1)) {
             result.speed = getAMDSpeed(result.brand);
           }
           if (result.speed === '0.00') {
@@ -582,12 +582,11 @@ function getCpu() {
               let name = util.getValue(lines, 'name', '=') || '';
               if (name.indexOf('@') >= 0) {
                 result.brand = name.split('@')[0].trim();
-                result.speed = name.split('@')[1].trim();
-                result.speed = parseFloat(result.speed.replace(/GHz+/g, '').trim()).toFixed(2);
+                result.speed = name.split('@')[1] ? parseFloat(name.split('@')[1].trim()).toFixed(2) : '0.00';
                 _cpu_speed = result.speed;
               } else {
                 result.brand = name.trim();
-                result.speed = 0;
+                result.speed = '0.00';
               }
               result = cpuBrandManufacturer(result);
               result.revision = util.getValue(lines, 'revision', '=');
@@ -600,7 +599,7 @@ function getCpu() {
               result.vendor = util.getValue(lines, 'manufacturer', '=');
               result.speedmax = Math.round(parseFloat(util.getValue(lines, 'maxclockspeed', '=').replace(/,/g, '.')) / 10.0) / 100;
               result.speedmax = result.speedmax ? parseFloat(result.speedmax).toFixed(2) : '';
-              if (!result.speed && result.brand.indexOf('AMD') > -1) {
+              if (result.speed === '0.00' && (result.brand.indexOf('AMD') > -1 || result.brand.toLowerCase().indexOf('ryzen') > -1)) {
                 result.speed = getAMDSpeed(result.brand);
               }
               if (result.speed === '0.00') {
@@ -781,7 +780,7 @@ function cpuTemperature(callback) {
           } else {
             fs.stat('/sys/class/thermal/thermal_zone0/temp', function (err) {
               if (err === null) {
-                exec('cat /sys/class/thermal/thermal_zone0/temp', function (error, stdout) {
+                fs.readFile('/sys/class/thermal/thermal_zone0/temp', function (error, stdout) {
                   if (!error) {
                     let lines = stdout.toString().split('\n');
                     if (lines.length > 0) {
@@ -929,7 +928,7 @@ function cpuFlags(callback) {
             });
           }
           if (!result) {
-            exec('cat /proc/cpuinfo', function (error, stdout) {
+            fs.readFile('/proc/cpuinfo', function (error, stdout) {
               if (!error) {
                 let lines = stdout.toString().split('\n');
                 result = util.getValue(lines, 'features', ':', true).toLowerCase();

package/lib/filesystem.js

@@ -16,6 +16,7 @@
 const exec = require('child_process').exec;
 const execSync = require('child_process').execSync;
 const util = require('./util');
+const fs = require('fs');
 
 let _platform = process.platform;
 
@@ -159,8 +160,7 @@ function fsOpenFiles(callback) {
         });
       }
       if (_linux) {
-        let cmd = 'cat /proc/sys/fs/file-nr';
-        exec(cmd, function (error, stdout) {
+        fs.readFile('/proc/sys/fs/file-nr', function (error, stdout) {
           if (!error) {
             let lines = stdout.toString().split('\n');
             if (lines[0]) {

package/lib/memory.js

@@ -17,6 +17,7 @@ const os = require('os');
 const exec = require('child_process').exec;
 const execSync = require('child_process').execSync;
 const util = require('./util');
+const fs = require('fs');
 
 let _platform = process.platform;
 
@@ -143,7 +144,7 @@ function mem(callback) {
       };
 
       if (_linux) {
-        exec('export LC_ALL=C; cat /proc/meminfo 2>/dev/null ; unset LC_ALL', function (error, stdout) {
+        fs.readFile('/proc/meminfo', function (error, stdout) {
           if (!error) {
             const lines = stdout.toString().split('\n');
             result.total = parseInt(util.getValue(lines, 'memtotal'), 10);

package/lib/network.js

@@ -198,7 +198,7 @@ function parseLinesWindowsNics(sections, nconfigsections) {
         let linesNicConfig = nconfigsections[i].trim().split('\r\n');
         let netEnabled = util.getValue(lines, 'NetEnabled', '=');
 
-        if (netEnabled) {
+        if (netEnabled !== '') {
           const speed = parseInt(util.getValue(lines, 'speed', '=').trim(), 10) / 1000000;
           nics.push({
             mac: util.getValue(lines, 'MACAddress', '=').toLowerCase(),
@@ -560,13 +560,13 @@ function getLinuxIfaceDHCPstatus(iface, connectionName, DHCPNics) {
 
       let dhcStatus = resultFormat.split(' ').slice(1).toString();
       switch (dhcStatus) {
-        case 'auto':
-          result = true;
-          break;
+      case 'auto':
+        result = true;
+        break;
 
-        default:
-          result = false;
-          break;
+      default:
+        result = false;
+        break;
       }
       return result;
     } catch (e) {
@@ -656,6 +656,24 @@ function networkInterfaces(callback) {
   return new Promise((resolve) => {
     process.nextTick(() => {
       let ifaces = os.networkInterfaces();
+      if (_windows) {
+        getWindowsNics().forEach(nic => {
+          let found = false;
+          Object.keys(ifaces).forEach(key => {
+            if (!found) {
+              ifaces[key].forEach(value => {
+                if (Object.keys(value).indexOf('mac') >= 0) {
+                  found = value['mac'] === nic.mac;
+                }
+              });
+            }
+          });
+
+          if (!found) {
+            ifaces[nic.name] = [{ mac: nic.mac }];
+          }
+        });
+      }
       let result = [];
       let nics = [];
       let dnsSuffixes = [];

package/lib/osinfo.js

@@ -391,7 +391,7 @@ function versions(apps, callback) {
       return {
         versions: versionObject,
         counter: 26
-      }
+      };
     }
     if (!Array.isArray(apps)) {
       apps = apps.trim().toLowerCase().replace(/,+/g, '|').replace(/ /g, '|');
@@ -399,7 +399,7 @@ function versions(apps, callback) {
       const result = {
         versions: {},
         counter: 0
-      }
+      };
       apps.forEach(el => {
         if (el) {
           for (let key in versionObject) {
@@ -807,8 +807,8 @@ function versions(apps, callback) {
           });
         }
       } catch (e) {
-        if (callback) { callback(result); }
-        resolve(result);
+        if (callback) { callback(appsObj.versions); }
+        resolve(appsObj.versions);
       }
     });
   });

package/lib/system.js

@@ -88,7 +88,7 @@ function system(callback) {
 
               if (result.manufacturer === '' && result.model === 'Computer' && result.version === '') {
                 // Check Raspberry Pi
-                exec('cat /proc/cpuinfo', function (error, stdout) {
+                fs.readFile('/proc/cpuinfo', function (error, stdout) {
                   if (!error) {
                     let lines = stdout.toString().split('\n');
                     result.model = util.getValue(lines, 'hardware', ':', true).toUpperCase();

package/lib/users.js

@@ -26,9 +26,44 @@ const _openbsd = (_platform === 'openbsd');
 const _netbsd = (_platform === 'netbsd');
 const _sunos = (_platform === 'sunos');
 
+let _winDateFormat = {
+  dateFormat: '',
+  dateSeperator: '',
+  timeFormat: '',
+  timeSeperator: '',
+  amDesignator: '',
+  pmDesignator: ''
+};
+
 // --------------------------
 // array of users online = sessions
 
+function getWinCulture() {
+  return new Promise((resolve) => {
+    process.nextTick(() => {
+      if (!_winDateFormat.dateFormat) {
+        util.powerShell('(get-culture).DateTimeFormat')
+          .then(data => {
+            let lines = data.toString().split('\r\n');
+            _winDateFormat.dateFormat = util.getValue(lines, 'ShortDatePattern', ':');
+            _winDateFormat.dateSeperator = util.getValue(lines, 'DateSeparator', ':');
+            _winDateFormat.timeFormat = util.getValue(lines, 'ShortTimePattern', ':');
+            _winDateFormat.timeSeperator = util.getValue(lines, 'TimeSeparator', ':');
+            _winDateFormat.amDesignator = util.getValue(lines, 'AMDesignator', ':');
+            _winDateFormat.pmDesignator = util.getValue(lines, 'PMDesignator', ':');
+
+            resolve(_winDateFormat);
+          })
+          .catch(() => {
+            resolve(_winDateFormat);
+          });
+      } else {
+        resolve(_winDateFormat);
+      }
+    });
+  });
+}
+
 function parseUsersLinux(lines, phase) {
   let result = [];
   let result_who = [];
@@ -141,7 +176,7 @@ function parseUsersDarwin(lines) {
   return result;
 }
 
-function parseUsersWin(lines) {
+function parseUsersWin(lines, culture) {
 
   let result = [];
   const header = lines[0];
@@ -164,7 +199,7 @@ function parseUsersWin(lines) {
       if (lines[i].trim()) {
         const user = lines[i].substring(headerDelimiter[0] + 1, headerDelimiter[1]).trim() || '';
         const tty = lines[i].substring(headerDelimiter[1] + 1, headerDelimiter[2] - 2).trim() || '';
-        const dateTime = util.parseDateTime(lines[i].substring(headerDelimiter[5] + 1, 2000).trim()) || '';
+        const dateTime = util.parseDateTime(lines[i].substring(headerDelimiter[5] + 1, 2000).trim(), culture) || '';
         result.push({
           user: user,
           tty: tty,
@@ -252,10 +287,16 @@ function users(callback) {
             if (stdout) {
               // lines / split
               let lines = stdout.toString().split('\r\n');
-              result = parseUsersWin(lines);
+              getWinCulture()
+                .then(culture => {
+                  result = parseUsersWin(lines, culture);
+                  if (callback) { callback(result); }
+                  resolve(result);
+                });
+            } else {
+              if (callback) { callback(result); }
+              resolve(result);
             }
-            if (callback) { callback(result); }
-            resolve(result);
           });
         } catch (e) {
           if (callback) { callback(result); }

package/lib/util.js

@@ -119,45 +119,51 @@ function decodeEscapeSequence(str, base) {
   });
 }
 
-function parseTime(t) {
+function detectSplit(str) {
+  let seperator = '';
+  let part = 0;
+  str.split('').forEach(element => {
+    if (element >= '0' && element <= '9') {
+      if (part === 1) { part++; }
+    } else {
+      if (part === 0) { part++; }
+      if (part === 1) {
+        seperator += element;
+      }
+    }
+  });
+  return seperator;
+}
+
+function parseTime(t, pmDesignator) {
+  pmDesignator = pmDesignator || '';
   t = t.toUpperCase();
   let hour = 0;
   let min = 0;
-  let parts = t.split(':');
+  let splitter = detectSplit(t);
+  let parts = t.split(splitter);
   if (parts.length >= 2) {
-    let isPM = (parts[1] && (parts[1].toLowerCase().indexOf('pm') > -1) || (parts[1].toLowerCase().indexOf('p.m.') > -1) || (parts[1].toLowerCase().indexOf('p. m.') > -1));
-    hour = parseInt(parts[0], 10);
-    min = parseInt(parts[1], 10);
-    hour = isPM && hour < 12 ? hour + 12 : hour;
-    return ('0' + hour).substr(-2) + ':' + ('0' + min).substr(-2);
-  }
-  parts = t.split('.');
-  if (parts.length >= 2) {
-    let isPM = (parts[1] && (parts[1].toLowerCase().indexOf('pm') > -1) || (parts[1].toLowerCase().indexOf('p.m.') > -1) || (parts[1].toLowerCase().indexOf('p. m.') > -1) || (parts[1].toLowerCase().indexOf('n') > -1) || (parts[1].toLowerCase().indexOf('ch') > -1) || (parts[1].toLowerCase().indexOf('ös') > -1));
+    if (parts[2]) {
+      parts[1] += parts[2];
+    }
+    let isPM = (parts[1] && (parts[1].toLowerCase().indexOf('pm') > -1) || (parts[1].toLowerCase().indexOf('p.m.') > -1) || (parts[1].toLowerCase().indexOf('p. m.') > -1) || (parts[1].toLowerCase().indexOf('n') > -1) || (parts[1].toLowerCase().indexOf('ch') > -1) || (parts[1].toLowerCase().indexOf('ös') > -1) || (pmDesignator && parts[1].toLowerCase().indexOf(pmDesignator) > -1));
     hour = parseInt(parts[0], 10);
     min = parseInt(parts[1], 10);
     hour = isPM && hour < 12 ? hour + 12 : hour;
     return ('0' + hour).substr(-2) + ':' + ('0' + min).substr(-2);
   }
-  parts = t.split(' ');
-  if (parts.length >= 2) {
-    let isPM = ((t.toLowerCase().indexOf('pm') > -1) || (t.toLowerCase().indexOf('p.m.') > -1) || (t.toLowerCase().indexOf('p. m.') > -1) || (t.toLowerCase().indexOf('n') > -1) || (t.toLowerCase().indexOf('ch') > -1) || (t.toLowerCase().indexOf('ös') > -1));
-    hour = parseInt(parts[0], 10);
-    if (parts[1] === 'h' && parts[2]) {
-      min = parseInt(parts[2], 10);
-    } else {
-      min = parseInt(parts[1], 10);
-    }
-    hour = isPM && hour < 12 ? hour + 12 : hour;
-    return ('0' + hour).substr(-2) + ':' + ('0' + min).substr(-2);
-  }
 }
 
-function parseDateTime(dt) {
+function parseDateTime(dt, culture) {
   const result = {
     date: '',
     time: ''
   };
+  culture = culture || {};
+  let dateFormat = (culture.dateFormat || '').toLowerCase();
+  let timeFormat = (culture.timeFormat || '');
+  let pmDesignator = (culture.pmDesignator || '');
+
   const parts = dt.split(' ');
   if (parts[0]) {
     if (parts[0].indexOf('/') >= 0) {
@@ -168,12 +174,17 @@ function parseDateTime(dt) {
           // Dateformat: yyyy/mm/dd
           result.date = dtparts[0] + '-' + ('0' + dtparts[1]).substr(-2) + '-' + ('0' + dtparts[2]).substr(-2);
         } else if (dtparts[2].length === 2) {
-          // Dateformat: dd/mm/yy
-          result.date = '20' + dtparts[2] + '-' + ('0' + dtparts[1]).substr(-2) + '-' + ('0' + dtparts[0]).substr(-2);
+          if ((dateFormat.indexOf('/d/') > -1 || dateFormat.indexOf('/dd/') > -1)) {
+            // Dateformat: mm/dd/yy
+            result.date = '20' + dtparts[2] + '-' + ('0' + dtparts[1]).substr(-2) + '-' + ('0' + dtparts[0]).substr(-2);
+          } else {
+            // Dateformat: dd/mm/yy
+            result.date = '20' + dtparts[2] + '-' + ('0' + dtparts[1]).substr(-2) + '-' + ('0' + dtparts[0]).substr(-2);
+          }
         } else {
           // Dateformat: mm/dd/yyyy or dd/mm/yyyy
           const isEN = ((dt.toLowerCase().indexOf('pm') > -1) || (dt.toLowerCase().indexOf('p.m.') > -1) || (dt.toLowerCase().indexOf('p. m.') > -1) || (dt.toLowerCase().indexOf('am') > -1) || (dt.toLowerCase().indexOf('a.m.') > -1) || (dt.toLowerCase().indexOf('a. m.') > -1));
-          if (isEN) {
+          if ((isEN || dateFormat.indexOf('/d/') > -1 || dateFormat.indexOf('/dd/') > -1) && dateFormat.indexOf('dd/') !== 0) {
             // Dateformat: mm/dd/yyyy
             result.date = dtparts[2] + '-' + ('0' + dtparts[0]).substr(-2) + '-' + ('0' + dtparts[1]).substr(-2);
           } else {
@@ -184,10 +195,15 @@ function parseDateTime(dt) {
       }
     }
     if (parts[0].indexOf('.') >= 0) {
-      // Dateformat: dd.mm.yyyy
       const dtparts = parts[0].split('.');
       if (dtparts.length === 3) {
-        result.date = dtparts[2] + '-' + ('0' + dtparts[1]).substr(-2) + '-' + ('0' + dtparts[0]).substr(-2);
+        if (dateFormat.indexOf('.d.') > -1 || dateFormat.indexOf('.dd.') > -1) {
+          // Dateformat: mm.dd.yyyy
+          result.date = dtparts[2] + '-' + ('0' + dtparts[0]).substr(-2) + '-' + ('0' + dtparts[1]).substr(-2);
+        } else {
+          // Dateformat: dd.mm.yyyy
+          result.date = dtparts[2] + '-' + ('0' + dtparts[1]).substr(-2) + '-' + ('0' + dtparts[0]).substr(-2);
+        }
       }
     }
     if (parts[0].indexOf('-') >= 0) {
@@ -201,7 +217,7 @@ function parseDateTime(dt) {
   if (parts[1]) {
     parts.shift();
     let time = parts.join(' ');
-    result.time = parseTime(time);
+    result.time = parseTime(time, pmDesignator);
   }
   return result;
 }

package/package.json

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