systeminformation 5.30.0 → 5.30.1

package/lib/network.js

@@ -425,8 +425,9 @@ function getWindowsIEEE8021x(connectionType, iface, ifaces) {
             ifaceSanitized = ifaceSanitized + s[i];
           }
         }
-        i8021xState = execSync(`netsh wlan show profiles "${ifaceSanitized}" | findstr "802.1X"`, util.execOptsWin);
-        i8021xProtocol = execSync(`netsh wlan show profiles "${ifaceSanitized}" | findstr "EAP"`, util.execOptsWin);
+        const profiles = execSync(`netsh wlan show profiles "${ifaceSanitized}"`, util.execOptsWin).split('\r\n');
+        i8021xState = (profiles.find((l) => l.indexOf('802.1X') >= 0) || '').trim();
+        i8021xProtocol = (profiles.find((l) => l.indexOf('EAP') >= 0) || '').trim();
       }
 
       if (i8021xState.includes(':') && i8021xProtocol.includes(':')) {

package/lib/users.js

@@ -26,9 +26,22 @@ const _openbsd = _platform === 'openbsd';
 const _netbsd = _platform === 'netbsd';
 const _sunos = _platform === 'sunos';
 
+function parseDate(dtMon, dtDay) {
+  let dt = new Date().toISOString().slice(0, 10);
+  try {
+    dt = '' + new Date().getFullYear() + '-' + ('0' + ('JANFEBMARAPRMAYJUNJULAUGSEPOCTNOVDEC'.indexOf(dtMon.toUpperCase()) / 3 + 1)).slice(-2) + '-' + ('0' + dtDay).slice(-2);
+    if (new Date(dt) > new Date()) {
+      dt = '' + (new Date().getFullYear() - 1) + '-' + ('0' + ('JANFEBMARAPRMAYJUNJULAUGSEPOCTNOVDEC'.indexOf(dtMon.toUpperCase()) / 3 + 1)).slice(-2) + '-' + ('0' + dtDay).slice(-2);
+    }
+  } catch {
+    util.noop();
+  }
+  return dt;
+}
+
 function parseUsersLinux(lines, phase) {
   const result = [];
-  const result_who = [];
+  let result_who = [];
   const result_w = {};
   let w_first = true;
   let w_header = [];
@@ -36,21 +49,29 @@ function parseUsersLinux(lines, phase) {
   let who_line = {};
 
   let is_whopart = true;
+  let is_whoerror = false;
   lines.forEach((line) => {
     if (line === '---') {
       is_whopart = false;
     } else {
       const l = line.replace(/ +/g, ' ').split(' ');
-
       // who part
       if (is_whopart) {
-        result_who.push({
-          user: l[0],
-          tty: l[1],
-          date: l[2],
-          time: l[3],
-          ip: l && l.length > 4 ? l[4].replace(/\(/g, '').replace(/\)/g, '') : ''
-        });
+        if (line.toLowerCase().indexOf('unexpected') >= 0 || line.toLowerCase().indexOf('unrecognized') >= 0) {
+          is_whoerror = true;
+          result_who = [];
+        }
+        if (!is_whoerror) {
+          const timePos = l && l.length > 4 && l[4].indexOf(':') > 0 ? 4 : 3;
+          result_who.push({
+            user: l[0],
+            tty: l[1],
+            date: timePos === 4 ? parseDate(l[2], l[3]) : l[2],
+            time: l[timePos],
+            ip: l && l.length > timePos + 1 ? l[timePos + 1].replace(/\(/g, '').replace(/\)/g, '') : '',
+            command: ''
+          });
+        }
       } else {
         // w part
         if (w_first) {
@@ -116,18 +137,10 @@ function parseUsersDarwin(lines) {
 
       // who part
       if (is_whopart) {
-        let dt = '' + new Date().getFullYear() + '-' + ('0' + ('JANFEBMARAPRMAYJUNJULAUGSEPOCTNOVDEC'.indexOf(l[2].toUpperCase()) / 3 + 1)).slice(-2) + '-' + ('0' + l[3]).slice(-2);
-        try {
-          if (new Date(dt) > new Date()) {
-            dt = '' + (new Date().getFullYear() - 1) + '-' + ('0' + ('JANFEBMARAPRMAYJUNJULAUGSEPOCTNOVDEC'.indexOf(l[2].toUpperCase()) / 3 + 1)).slice(-2) + '-' + ('0' + l[3]).slice(-2);
-          }
-        } catch {
-          util.noop();
-        }
         result_who.push({
           user: l[0],
           tty: l[1],
-          date: dt,
+          date: parseDate(l[2], l[3]),
           time: l[4]
         });
       } else {

package/package.json

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