systeminformation 5.16.3 → 5.16.5

package/lib/internet.js

@@ -158,24 +158,20 @@ function inetLatency(host, callback) {
         return resolve(null);
       }
       let params;
-      let filt;
       if (_linux || _freebsd || _openbsd || _netbsd || _darwin) {
         if (_linux) {
           params = ['-c', '2', '-w', '3', hostSanitized];
-          filt = 'rtt';
         }
         if (_freebsd || _openbsd || _netbsd) {
           params = ['-c', '2', '-t', '3', hostSanitized];
-          filt = 'round-trip';
         }
         if (_darwin) {
           params = ['-c2', '-t3', hostSanitized];
-          filt = 'avg';
         }
         util.execSafe('ping', params).then((stdout) => {
           let result = null;
           if (stdout) {
-            const lines = stdout.split('\n').filter(line => line.indexOf(filt) >= 0).join('\n');
+            const lines = stdout.split('\n').filter((line) => (line.indexOf('rtt') >= 0 || line.indexOf('round-trip') >= 0 || line.indexOf('avg') >= 0)).join('\n');
 
             const line = lines.split('=');
             if (line.length > 1) {

package/lib/processes.js

@@ -655,7 +655,7 @@ function processes(callback) {
     function formatDateTime(time) {
       const month = ('0' + (time.getMonth() + 1).toString()).substr(-2);
       const year = time.getFullYear().toString();
-      const day = ('0' + time.getDay().toString()).substr(-2);
+      const day = ('0' + time.getDate().toString()).substr(-2);
       const hours = time.getHours().toString();
       const mins = time.getMinutes().toString();
       const secs = ('0' + time.getSeconds().toString()).substr(-2);
@@ -663,6 +663,21 @@ function processes(callback) {
       return (year + '-' + month + '-' + day + ' ' + hours + ':' + mins + ':' + secs);
     }
 
+    function parseElapsed(etime) {
+      let started = '';
+      if (etime.indexOf('d') >= 0) {
+        const elapsed_parts = etime.split('d');
+        started = formatDateTime(new Date(Date.now() - (elapsed_parts[0] * 24 + elapsed_parts[1] * 1) * 60 * 60 * 1000));
+      } else if (etime.indexOf('h') >= 0) {
+        const elapsed_parts = etime.split('h');
+        started = formatDateTime(new Date(Date.now() - (elapsed_parts[0] * 60 + elapsed_parts[1] * 1) * 60 * 1000));
+      } else if (etime.indexOf(':') >= 0) {
+        const elapsed_parts = etime.split(':');
+        started = formatDateTime(new Date(Date.now() - (elapsed_parts.length > 1 ? (elapsed_parts[0] * 60 + elapsed_parts[1]) * 1000 : elapsed_parts[0] * 1000)));
+      }
+      return started;
+    }
+
     let result = [];
     lines.forEach(function (line) {
       if (line.trim() !== '') {
@@ -670,8 +685,7 @@ function processes(callback) {
         const parts = line.split(' ');
         const command = parts.slice(9).join(' ');
         const pmem = parseFloat((1.0 * parseInt(parts[3]) * 1024 / os.totalmem()).toFixed(1));
-        const elapsed_parts = parts[5].split(':');
-        const started = formatDateTime(new Date(Date.now() - (elapsed_parts.length > 1 ? (elapsed_parts[0] * 60 + elapsed_parts[1]) * 1000 : elapsed_parts[0] * 1000)));
+        const started = parseElapsed(parts[5]);
 
         result.push({
           pid: parseInt(parts[0]),

package/package.json

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