systeminformation 5.11.20 → 5.11.23

package/lib/cpu.js

@@ -1039,7 +1039,7 @@ function cpuTemperature(callback) {
           util.noop();
         }
 
-        const cmd = 'for mon in /sys/class/hwmon/hwmon*; do for label in "$mon"/temp*_label; do if [ -f $label ]; then value=$(echo $label | rev | cut -c 7- | rev)_input; if [ -f "$value" ]; then echo $(cat "$label")___$(cat "$value");  fi; fi; done; done;';
+        const cmd = 'for mon in /sys/class/hwmon/hwmon*; do for label in "$mon"/temp*_label; do if [ -f $label ]; then value=${label%_*}_input; echo $(cat "$label")___$(cat "$value"); fi; done; done;';
         try {
           exec(cmd, function (error, stdout) {
             stdout = stdout.toString();

package/lib/filesystem.js

@@ -49,12 +49,37 @@ function fsSize(callback) {
     return 'HFS';
   }
 
+  function isLinuxTmpFs(fs) {
+    const linuxTmpFileSystems = ['rootfs', 'unionfs', 'squashfs', 'cramfs', 'initrd', 'initramfs', 'devtmpfs', 'tmpfs', 'udev', 'devfs', 'specfs', 'type', 'appimaged', 'fuse.'];
+    let result = false;
+    linuxTmpFileSystems.forEach(linuxFs => {
+      if (fs.toLowerCase().indexOf(linuxFs) >= 0) result = true;
+    });
+    return result;
+  }
+
+  function filterLines(stdout) {
+    let lines = stdout.toString().split('\n');
+    if (stdout.toString().toLowerCase().indexOf('filesystem')) {
+      let removeLines = 0;
+      for (let i = 0; i < lines.length; i++) {
+        if (line[i] && lines[i].toLowerCase().startsWith('filesystem')) {
+          removeLines = i;
+        }
+      }
+      for (let i = 0; i < removeLines; i++) {
+        lines.shift();
+      }
+    }
+    return lines;
+  }
+
   function parseDf(lines) {
     let data = [];
     lines.forEach(function (line) {
       if (line !== '') {
         line = line.replace(/ +/g, ' ').split(' ');
-        if (line && ((line[0].startsWith('/')) || (line[6] && line[6] === '/') || (line[0].indexOf('/') > 0) || (line[0].indexOf(':') === 1))) {
+        if (line && ((line[0].startsWith('/')) || (line[6] && line[6] === '/') || (line[0].indexOf('/') > 0) || (line[0].indexOf(':') === 1) || !_darwin && !isLinuxTmpFs(line[1]))) {
           const fs = line[0];
           const fsType = ((_linux || _freebsd || _openbsd || _netbsd) ? line[1] : getmacOsFsType(line[0]));
           const size = parseInt(((_linux || _freebsd || _openbsd || _netbsd) ? line[2] : line[1])) * 1024;
@@ -96,12 +121,12 @@ function fsSize(callback) {
             macOsDisks = [];
           }
         }
-        if (_linux) { cmd = 'df -lkPTx squashfs | grep  -E "^/|^.\\:"'; }
+        if (_linux) { cmd = 'df -lkPTx squashfs'; } // cmd = 'df -lkPTx squashfs | grep  -E "^/|^.\\:"';
         if (_freebsd || _openbsd || _netbsd) { cmd = 'df -lkPT'; }
         exec(cmd, { maxBuffer: 1024 * 1024 }, function (error, stdout) {
-          if (!error) {
-            let lines = stdout.toString().split('\n');
-            data = parseDf(lines);
+          let lines = filterLines(stdout);
+          data = parseDf(lines);
+          if (!error || data.length) {
             if (callback) {
               callback(data);
             }
@@ -109,7 +134,7 @@ function fsSize(callback) {
           } else {
             exec('df -kPT', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
               if (!error) {
-                let lines = stdout.toString().split('\n');
+                let lines = filterLines(stdout);
                 data = parseDf(lines);
               }
               if (callback) {

package/lib/graphics.js

@@ -429,7 +429,7 @@ function graphics(callback) {
     }
 
     const gpus = stdout.split('\n').filter(Boolean);
-    const results = gpus.map(gpu => {
+    let results = gpus.map(gpu => {
       const splittedData = gpu.split(', ').map(value => value.includes('N/A') ? undefined : value);
       if (splittedData.length === 16) {
         return {
@@ -450,9 +450,13 @@ function graphics(callback) {
           clockCore: safeParseNumber(splittedData[14]),
           clockMemory: safeParseNumber(splittedData[15]),
         };
+      } else {
+        return {};
       }
     });
-
+    results = results.filter((item) => {
+      return ('pciBus' in item);
+    });
     return results;
   }
 

package/lib/index.d.ts

@@ -7,8 +7,8 @@ export namespace Systeminformation {
   // 1. General
 
   interface TimeData {
-    current: string;
-    uptime: string;
+    current: number;
+    uptime: number;
     timezone: string;
     timezoneName: string;
   }
@@ -988,3 +988,6 @@ export function getDynamicData(srv?: string, iface?: string, cb?: (data: any) =>
 export function getAllData(srv?: string, iface?: string, cb?: (data: any) => any): Promise<any>;
 export function get(valuesObject: any, cb?: (data: any) => any): Promise<any>;
 export function observe(valuesObject: any, interval: number, cb?: (data: any) => any): number;
+
+export function powerShellStart(): void;
+export function powerShellRelease(): void;

package/lib/osinfo.js

@@ -307,6 +307,7 @@ function osInfo(callback) {
           result.codename = (result.release.indexOf('10.15') > -1 ? 'macOS Catalina' : result.codename);
           result.codename = (result.release.startsWith('11.') ? 'macOS Big Sur' : result.codename);
           result.codename = (result.release.startsWith('12.') ? 'macOS Monterey' : result.codename);
+          result.codename = (result.release.startsWith('13.') ? 'macOS Ventura' : result.codename);
           result.uefi = true;
           result.codepage = util.getCodepage();
           if (callback) {

package/lib/processes.js

@@ -88,6 +88,25 @@ function parseTimeUnix(time) {
   return result;
 }
 
+function parseElapsedTime(etime) {
+  let current = new Date();
+  current = new Date(current.getTime() - current.getTimezoneOffset() * 60000);
+
+  const elapsed = etime.split('-');
+
+  const timeIndex = elapsed.length - 1;
+  const days = timeIndex > 0 ? parseInt(elapsed[timeIndex - 1]) : 0;
+
+  const timeStr = elapsed[timeIndex].split(':');
+  const hours = timeStr.length === 3 ? parseInt(timeStr[0] || 0) : 0;
+  const mins = parseInt(timeStr[timeStr.length === 3 ? 1 : 0] || 0);
+  const secs = parseInt(timeStr[timeStr.length === 3 ? 2 : 1] || 0);
+  const ms = (((((days * 24 + hours) * 60) + mins) * 60 + secs) * 1000);
+
+  const res = new Date(current.getTime() - ms);
+  return res.toISOString().substring(0, 10) + ' ' + res.toISOString().substring(11, 19);
+}
+
 // --------------------------
 // PS - services
 // pass a comma separated string with services to check (mysql, apache, postgresql, ...)
@@ -550,7 +569,7 @@ function processes(callback) {
     checkColumn(7);
     const nice = parseInt(line.substring(parsedhead[7].from + offset, parsedhead[7].to + offset2)) || 0;
     checkColumn(8);
-    const started = parseTimeUnix(line.substring(parsedhead[8].from + offset, parsedhead[8].to + offset2).trim());
+    const started = !_sunos ? parseElapsedTime(line.substring(parsedhead[8].from + offset, parsedhead[8].to + offset2).trim()) : parseTimeUnix(line.substring(parsedhead[8].from + offset, parsedhead[8].to + offset2).trim());
     checkColumn(9);
     let state = line.substring(parsedhead[9].from + offset, parsedhead[9].to + offset2).trim();
     state = (state[0] === 'R' ? 'running' : (state[0] === 'S' ? 'sleeping' : (state[0] === 'T' ? 'stopped' : (state[0] === 'W' ? 'paging' : (state[0] === 'X' ? 'dead' : (state[0] === 'Z' ? 'zombie' : ((state[0] === 'D' || state[0] === 'U') ? 'blocked' : 'unknown')))))));
@@ -567,33 +586,48 @@ function processes(callback) {
     if (fullcommand.substr(fullcommand.length - 1) === ']') { fullcommand = fullcommand.slice(0, -1); }
     if (fullcommand.substr(0, 1) === '[') { command = fullcommand.substring(1); }
     else {
-      // try to figure out where parameter starts
-      let firstParamPos = fullcommand.indexOf(' -');
-      let firstParamPathPos = fullcommand.indexOf(' /');
-      firstParamPos = (firstParamPos >= 0 ? firstParamPos : 10000);
-      firstParamPathPos = (firstParamPathPos >= 0 ? firstParamPathPos : 10000);
-      const firstPos = Math.min(firstParamPos, firstParamPathPos);
-      let tmpCommand = fullcommand.substr(0, firstPos);
-      const tmpParams = fullcommand.substr(firstPos);
-      const lastSlashPos = tmpCommand.lastIndexOf('/');
-      if (lastSlashPos >= 0) {
-        cmdPath = tmpCommand.substr(0, lastSlashPos);
-        tmpCommand = tmpCommand.substr(lastSlashPos + 1);
-      }
-
-      if (firstPos === 10000 && tmpCommand.indexOf(' ') > -1) {
-        const parts = tmpCommand.split(' ');
-        if (fs.existsSync(path.join(cmdPath, parts[0]))) {
-          command = parts.shift();
-          params = (parts.join(' ') + ' ' + tmpParams).trim();
+      const p1 = fullcommand.indexOf('(');
+      const p2 = fullcommand.indexOf(')');
+      const p3 = fullcommand.indexOf('/');
+      const p4 = fullcommand.indexOf(':');
+      if (p1 < p2 && p1 < p3 && p3 < p2) {
+        command = fullcommand.split(' ')[0];
+        command = command.replace(/:/g, '');
+      } else {
+        if (p4 > 0 && (p3 === -1 || p3 > 3)) {
+          command = fullcommand.split(' ')[0];
+          command = command.replace(/:/g, '');
         } else {
-          command = tmpCommand.trim();
-          params = tmpParams.trim();
+          // try to figure out where parameter starts
+          let firstParamPos = fullcommand.indexOf(' -');
+          let firstParamPathPos = fullcommand.indexOf(' /');
+          firstParamPos = (firstParamPos >= 0 ? firstParamPos : 10000);
+          firstParamPathPos = (firstParamPathPos >= 0 ? firstParamPathPos : 10000);
+          const firstPos = Math.min(firstParamPos, firstParamPathPos);
+          let tmpCommand = fullcommand.substr(0, firstPos);
+          const tmpParams = fullcommand.substr(firstPos);
+          const lastSlashPos = tmpCommand.lastIndexOf('/');
+          if (lastSlashPos >= 0) {
+            cmdPath = tmpCommand.substr(0, lastSlashPos);
+            tmpCommand = tmpCommand.substr(lastSlashPos + 1);
+          }
+
+          if (firstPos === 10000 && tmpCommand.indexOf(' ') > -1) {
+            const parts = tmpCommand.split(' ');
+            if (fs.existsSync(path.join(cmdPath, parts[0]))) {
+              command = parts.shift();
+              params = (parts.join(' ') + ' ' + tmpParams).trim();
+            } else {
+              command = tmpCommand.trim();
+              params = tmpParams.trim();
+            }
+          } else {
+            command = tmpCommand.trim();
+            params = tmpParams.trim();
+          }
         }
-      } else {
-        command = tmpCommand.trim();
-        params = tmpParams.trim();
       }
+
     }
 
     return ({
@@ -693,9 +727,9 @@ function processes(callback) {
 
       if ((_processes_cpu.ms && Date.now() - _processes_cpu.ms >= 500) || _processes_cpu.ms === 0) {
         if (_linux || _freebsd || _openbsd || _netbsd || _darwin || _sunos) {
-          if (_linux) { cmd = 'export LC_ALL=C; ps -axo pid:11,ppid:11,pcpu:6,pmem:6,pri:5,vsz:11,rss:11,ni:5,lstart:30,state:5,tty:15,user:20,command; unset LC_ALL'; }
-          if (_freebsd || _openbsd || _netbsd) { cmd = 'export LC_ALL=C; ps -axo pid,ppid,pcpu,pmem,pri,vsz,rss,ni,lstart,state,tty,user,command; unset LC_ALL'; }
-          if (_darwin) { cmd = 'ps -axo pid,ppid,pcpu,pmem,pri,vsz=xxx_fake_title,rss=fake_title2,nice,lstart,state,tty,user,command -r'; }
+          if (_linux) { cmd = 'export LC_ALL=C; ps -axo pid:11,ppid:11,pcpu:6,pmem:6,pri:5,vsz:11,rss:11,ni:5,etime:30,state:5,tty:15,user:20,command; unset LC_ALL'; }
+          if (_freebsd || _openbsd || _netbsd) { cmd = 'export LC_ALL=C; ps -axo pid,ppid,pcpu,pmem,pri,vsz,rss,ni,etime,state,tty,user,command; unset LC_ALL'; }
+          if (_darwin) { cmd = 'ps -axo pid,ppid,pcpu,pmem,pri,vsz=temp_title_1,rss=temp_title_2,nice,etime=temp_title_3,state,tty,user,command -r'; }
           if (_sunos) { cmd = 'ps -Ao pid,ppid,pcpu,pmem,pri,vsz,rss,nice,stime,s,tty,user,comm'; }
           exec(cmd, { maxBuffer: 1024 * 20000 }, function (error, stdout) {
             if (!error && stdout.toString().trim()) {

package/lib/system.js

@@ -662,8 +662,10 @@ function baseboard(callback) {
       if (_windows) {
         try {
           const workload = [];
+          const win10plus = parseInt(os.release()) >= 10;
+          const maxCapacityAttribute = win10plus ? 'MaxCapacityEx' : 'MaxCapacity';
           workload.push(util.powerShell('Get-WmiObject Win32_baseboard | select Model,Manufacturer,Product,Version,SerialNumber,PartNumber,SKU | fl'));
-          workload.push(util.powerShell('Get-WmiObject Win32_physicalmemoryarray | select MaxCapacity, MemoryDevices | fl'));
+          workload.push(util.powerShell(`Get-WmiObject Win32_physicalmemoryarray | select ${maxCapacityAttribute}, MemoryDevices | fl`));
           util.promiseAll(
             workload
           ).then(data => {
@@ -683,7 +685,7 @@ function baseboard(callback) {
 
             // memphysical
             lines = data.results[1] ? data.results[1].toString().split('\r\n') : [''];
-            result.memMax = util.toInt(util.getValue(lines, 'MaxCapacity', ':')) || null;
+            result.memMax = util.toInt(util.getValue(lines, maxCapacityAttribute, ':')) * (win10plus ? 1024 : 1) || null;
             result.memSlots = util.toInt(util.getValue(lines, 'MemoryDevices', ':')) || null;
 
             if (callback) { callback(result); }

package/lib/util.js

@@ -396,42 +396,47 @@ function powerShellProceedResults(data) {
 }
 
 function powerShellStart() {
-  _psChild = spawn('powershell.exe', ['-NoLogo', '-InputFormat', 'Text', '-NoExit', '-Command', '-'], {
-    stdio: 'pipe',
-    windowsHide: true,
-    maxBuffer: 1024 * 20000,
-    encoding: 'UTF-8',
-    env: util._extend({}, process.env, { LANG: 'en_US.UTF-8' })
-  });
-  if (_psChild && _psChild.pid) {
-    _psPersistent = true;
-    _psChild.stdout.on('data', function (data) {
-      _psResult = _psResult + data.toString('utf8');
-      if (data.indexOf(_psCmdSeperator) >= 0) {
-        powerShellProceedResults(_psResult);
-        _psResult = '';
-      }
-    });
-    _psChild.stderr.on('data', function () {
-      powerShellProceedResults(_psResult + _psError);
-    });
-    _psChild.on('error', function () {
-      powerShellProceedResults(_psResult + _psError);
-    });
-    _psChild.on('close', function () {
-      _psChild.kill();
+  if (!_psChild) {
+    _psChild = spawn('powershell.exe', ['-NoLogo', '-InputFormat', 'Text', '-NoExit', '-Command', '-'], {
+      stdio: 'pipe',
+      windowsHide: true,
+      maxBuffer: 1024 * 20000,
+      encoding: 'UTF-8',
+      env: util._extend({}, process.env, { LANG: 'en_US.UTF-8' })
     });
+    if (_psChild && _psChild.pid) {
+      _psPersistent = true;
+      _psChild.stdout.on('data', function (data) {
+        _psResult = _psResult + data.toString('utf8');
+        if (data.indexOf(_psCmdSeperator) >= 0) {
+          powerShellProceedResults(_psResult);
+          _psResult = '';
+        }
+      });
+      _psChild.stderr.on('data', function () {
+        powerShellProceedResults(_psResult + _psError);
+      });
+      _psChild.on('error', function () {
+        powerShellProceedResults(_psResult + _psError);
+      });
+      _psChild.on('close', function () {
+        _psChild.kill();
+      });
+    }
   }
 }
 
 function powerShellRelease() {
   try {
-    _psChild.stdin.write('exit' + os.EOL);
-    _psChild.stdin.end();
-    _psPersistent = false;
+    if (_psChild) {
+      _psChild.stdin.write('exit' + os.EOL);
+      _psChild.stdin.end();
+      _psPersistent = false;
+    }
   } catch (e) {
     _psChild.kill();
   }
+  _psChild = null;
 }
 
 function powerShell(cmd) {

package/package.json

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