systeminformation 5.11.19 → 5.11.22

package/lib/filesystem.js

@@ -49,12 +49,17 @@ function fsSize(callback) {
     return 'HFS';
   }
 
+  function isLinuxTmpFs(fs) {
+    const linuxTmpFileSystems = ['rootfs', 'unionfs', 'squashfs', 'cramfs', 'initrd', 'initramfs', 'devtmpfs', 'tmpfs', 'udev', 'devfs', 'specfs', 'type'];
+    return (linuxTmpFileSystems.includes(fs.toLowerCase()));
+  }
+
   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,11 +101,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');
+            if (lines && lines[0] && lines[0].toLowerCase().startsWith('filesystem')) { lines.shift(); }
             data = parseDf(lines);
             if (callback) {
               callback(data);
@@ -110,6 +116,7 @@ function fsSize(callback) {
             exec('df -kPT', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
               if (!error) {
                 let lines = stdout.toString().split('\n');
+                if (lines && lines[0] && lines[0].toLowerCase().startsWith('filesystem')) { lines.shift(); }
                 data = parseDf(lines);
               }
               if (callback) {
@@ -852,7 +859,7 @@ function diskLayout(callback) {
               try {
                 const outJSON = JSON.parse(out);
                 if (outJSON && {}.hasOwnProperty.call(outJSON, 'blockdevices')) {
-                  devices = outJSON.blockdevices.filter(item => { return (item.type === 'disk') && item.size > 0 && (item.model !== null || (item.mountpoint === null && item.label === null && item.fsType === null && item.parttype === null && item.path && item.path.indexOf('/ram') !== 0 && item.path.indexOf('/loop') !== 0 && item['disc-max'] && item['disc-max'] !== 0)); });
+                  devices = outJSON.blockdevices.filter(item => { return (item.type === 'disk') && item.size > 0 && (item.model !== null || (item.mountpoint === null && item.label === null && item.fstype === null && item.parttype === null && item.path && item.path.indexOf('/ram') !== 0 && item.path.indexOf('/loop') !== 0 && item['disc-max'] && item['disc-max'] !== 0)); });
                 }
               } catch (e) {
                 // fallback to older version of lsblk

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/package.json

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