systeminformation 5.9.7 → 5.9.8

package/lib/users.js

@@ -26,43 +26,43 @@ const _openbsd = (_platform === 'openbsd');
 const _netbsd = (_platform === 'netbsd');
 const _sunos = (_platform === 'sunos');
 
-let _winDateFormat = {
-  dateFormat: '',
-  dateSeperator: '',
-  timeFormat: '',
-  timeSeperator: '',
-  amDesignator: '',
-  pmDesignator: ''
-};
+// 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', ':');
+// 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);
-      }
-    });
-  });
-}
+//             resolve(_winDateFormat);
+//           })
+//           .catch(() => {
+//             resolve(_winDateFormat);
+//           });
+//       } else {
+//         resolve(_winDateFormat);
+//       }
+//     });
+//   });
+// }
 
 function parseUsersLinux(lines, phase) {
   let result = [];
@@ -176,43 +176,43 @@ function parseUsersDarwin(lines) {
   return result;
 }
 
-function parseUsersWin(lines, culture) {
+// function parseUsersWin(lines, culture) {
 
-  let result = [];
-  const header = lines[0];
-  const headerDelimiter = [];
-  if (header) {
-    const start = (header[0] === ' ') ? 1 : 0;
-    headerDelimiter.push(start - 1);
-    let nextSpace = 0;
-    for (let i = start + 1; i < header.length; i++) {
-      if (header[i] === ' ' && ((header[i - 1] === ' ') || (header[i - 1] === '.'))) {
-        nextSpace = i;
-      } else {
-        if (nextSpace) {
-          headerDelimiter.push(nextSpace);
-          nextSpace = 0;
-        }
-      }
-    }
-    for (let i = 1; i < lines.length; i++) {
-      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(), culture) || '';
-        result.push({
-          user: user,
-          tty: tty,
-          date: dateTime.date,
-          time: dateTime.time,
-          ip: '',
-          command: ''
-        });
-      }
-    }
-  }
-  return result;
-}
+//   let result = [];
+//   const header = lines[0];
+//   const headerDelimiter = [];
+//   if (header) {
+//     const start = (header[0] === ' ') ? 1 : 0;
+//     headerDelimiter.push(start - 1);
+//     let nextSpace = 0;
+//     for (let i = start + 1; i < header.length; i++) {
+//       if (header[i] === ' ' && ((header[i - 1] === ' ') || (header[i - 1] === '.'))) {
+//         nextSpace = i;
+//       } else {
+//         if (nextSpace) {
+//           headerDelimiter.push(nextSpace);
+//           nextSpace = 0;
+//         }
+//       }
+//     }
+//     for (let i = 1; i < lines.length; i++) {
+//       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(), culture) || '';
+//         result.push({
+//           user: user,
+//           tty: tty,
+//           date: dateTime.date,
+//           time: dateTime.time,
+//           ip: '',
+//           command: ''
+//         });
+//       }
+//     }
+//   }
+//   return result;
+// }
 
 function users(callback) {
 
@@ -283,21 +283,62 @@ function users(callback) {
       }
       if (_windows) {
         try {
-          util.execWin('query user', util.execOptsWin, function (error, stdout) {
-            if (stdout) {
-              // lines / split
-              let lines = stdout.toString().split('\r\n');
-              getWinCulture()
-                .then(culture => {
-                  result = parseUsersWin(lines, culture);
-                  if (callback) { callback(result); }
-                  resolve(result);
-                });
-            } else {
-              if (callback) { callback(result); }
-              resolve(result);
+          const workload = [];
+          // workload.push(util.powerShell('Get-CimInstance -ClassName Win32_Account | fl *'));
+          workload.push(util.powerShell('Get-WmiObject Win32_LogonSession | fl *'));
+          workload.push(util.powerShell('Get-WmiObject Win32_LoggedOnUser | fl *'));
+          workload.push(util.powerShell('Get-WmiObject Win32_Process -Filter "name=\'explorer.exe\'" | Select @{Name="domain";Expression={$_.GetOwner().Domain}}, @{Name="username";Expression={$_.GetOwner().User}} | fl'));
+          Promise.all(
+            workload
+          ).then(data => {
+            // controller + vram
+            // let accounts = parseWinAccounts(data[0].split(/\n\s*\n/));
+            let sessions = parseWinSessions(data[0].split(/\n\s*\n/));
+            let loggedons = parseWinLoggedOn(data[1].split(/\n\s*\n/));
+            let users = parseWinUsers(data[2].split(/\n\s*\n/));
+            for (let id in loggedons) {
+              if ({}.hasOwnProperty.call(loggedons, id)) {
+                loggedons[id].dateTime = {}.hasOwnProperty.call(sessions, id) ? sessions[id] : '';
+              }
             }
+            users.forEach(user => {
+              let dateTime = '';
+              for (let id in loggedons) {
+                if ({}.hasOwnProperty.call(loggedons, id)) {
+                  if (loggedons[id].user === user.user && (!dateTime || dateTime < loggedons[id].dateTime)) {
+                    dateTime = loggedons[id].dateTime;
+                  }
+                }
+              }
+
+              result.push({
+                user: user.user,
+                tty: '',
+                date: `${dateTime.substr(0, 4)}-${dateTime.substr(4, 2)}-${dateTime.substr(6, 2)}`,
+                time: `${dateTime.substr(8, 2)}:${dateTime.substr(10, 2)}`,
+                ip: '',
+                command: ''
+              });
+            });
+            if (callback) { callback(result); }
+            resolve(result);
+
           });
+          // util.powerShell('query user').then(stdout => {
+          //   if (stdout) {
+          //     // lines / split
+          //     let lines = stdout.toString().split('\r\n');
+          //     getWinCulture()
+          //       .then(culture => {
+          //         result = parseUsersWin(lines, culture);
+          //         if (callback) { callback(result); }
+          //         resolve(result);
+          //       });
+          //   } else {
+          //     if (callback) { callback(result); }
+          //     resolve(result);
+          //   }
+          // });
         } catch (e) {
           if (callback) { callback(result); }
           resolve(result);
@@ -308,4 +349,69 @@ function users(callback) {
   });
 }
 
+// function parseWinAccounts(accountParts) {
+//   const accounts = [];
+//   accountParts.forEach(account => {
+//     const lines = account.split('\r\n');
+//     const name = util.getValue(lines, 'name', ':', true);
+//     const domain = util.getValue(lines, 'domain', ':', true);
+//     accounts.push(`${domain}\${name}`);
+//   });
+//   return accounts;
+// }
+
+function parseWinSessions(sessionParts) {
+  const sessions = {};
+  sessionParts.forEach(session => {
+    const lines = session.split('\r\n');
+    const id = util.getValue(lines, 'LogonId');
+    const starttime = util.getValue(lines, 'starttime');
+    if (id) {
+      sessions[id] = starttime;
+    }
+  });
+  return sessions;
+}
+
+function parseWinUsers(userParts) {
+  const users = [];
+  userParts.forEach(user => {
+    const lines = user.split('\r\n');
+
+    const domain = util.getValue(lines, 'domain', ':', true);
+    const username = util.getValue(lines, 'username', ':', true);
+    if (username) {
+      users.push({
+        domain,
+        user: username
+      });
+    }
+  });
+  return users;
+}
+
+function parseWinLoggedOn(loggedonParts) {
+  const loggedons = {};
+  loggedonParts.forEach(loggedon => {
+    const lines = loggedon.split('\r\n');
+
+    const antecendent = util.getValue(lines, 'antecedent', ':', true);
+    let parts = antecendent.split(',');
+    const domainParts = parts.length > 1 ? parts[0].split('=') : [];
+    const nameParts = parts.length > 1 ? parts[1].split('=') : [];
+    const domain = domainParts.length > 1 ? domainParts[1].replace(/"/g, '') : '';
+    const name = nameParts.length > 1 ? nameParts[1].replace(/"/g, '') : '';
+    const dependent = util.getValue(lines, 'dependent', ':', true);
+    parts = dependent.split('=');
+    const id = parts.length > 1 ? parts[1].replace(/"/g, '') : '';
+    if (id) {
+      loggedons[id] = {
+        domain,
+        user: name
+      };
+    }
+  });
+  return loggedons;
+}
+
 exports.users = users;

package/lib/util.js

@@ -319,14 +319,13 @@ function getWmic() {
   return wmicPath;
 }
 
-function wmic(command, options) {
-  options = options || execOptsWin;
+function wmic(command) {
   return new Promise((resolve) => {
     process.nextTick(() => {
       try {
-        exec(WINDIR + '\\system32\\chcp.com 65001 | ' + getWmic() + ' ' + command, options, function (error, stdout) {
-          resolve(stdout, error);
-        }).stdin.end();
+        powerShell(getWmic() + ' ' + command).then(stdout => {
+          resolve(stdout, '');
+        });
       } catch (e) {
         resolve('', e);
       }
@@ -334,6 +333,21 @@ function wmic(command, options) {
   });
 }
 
+// function wmic(command, options) {
+//   options = options || execOptsWin;
+//   return new Promise((resolve) => {
+//     process.nextTick(() => {
+//       try {
+//         exec(WINDIR + '\\system32\\chcp.com 65001 | ' + getWmic() + ' ' + command, options, function (error, stdout) {
+//           resolve(stdout, error);
+//         }).stdin.end();
+//       } catch (e) {
+//         resolve('', e);
+//       }
+//     });
+//   });
+// }
+
 function getVboxmanage() {
   return _windows ? `"${process.env.VBOX_INSTALL_PATH || process.env.VBOX_MSI_INSTALL_PATH}\\VBoxManage.exe"` : 'vboxmanage';
 }
@@ -341,6 +355,7 @@ function getVboxmanage() {
 function powerShell(cmd) {
 
   let result = '';
+  const toUTF8 = '$OutputEncoding = [System.Console]::OutputEncoding = [System.Console]::InputEncoding = [System.Text.Encoding]::UTF8 ; ';
 
   return new Promise((resolve) => {
     process.nextTick(() => {
@@ -375,7 +390,7 @@ function powerShell(cmd) {
             resolve(result);
           });
           try {
-            child.stdin.write(cmd + os.EOL);
+            child.stdin.write(toUTF8 + cmd + os.EOL);
             child.stdin.write('exit' + os.EOL);
             child.stdin.end();
           } catch (e) {

package/lib/wifi.js

@@ -414,16 +414,15 @@ function wifiNetworks(callback) {
           resolve(result);
         });
       } else if (_windows) {
-        let cmd = 'chcp 65001 && netsh wlan show networks mode=Bssid';
-        exec(cmd, util.execOptsWin, function (error, stdout) {
-
+        let cmd = 'netsh wlan show networks mode=Bssid';
+        util.powerShell(cmd).then((stdout) => {
           const ssidParts = stdout.toString('utf8').split(os.EOL + os.EOL + 'SSID ');
           ssidParts.shift();
 
           ssidParts.forEach(ssidPart => {
             const ssidLines = ssidPart.split(os.EOL);
             if (ssidLines && ssidLines.length >= 8 && ssidLines[0].indexOf(':') >= 0) {
-              const bssidsParts = ssidPart.split('BSSID ');
+              const bssidsParts = ssidPart.split(' BSSID');
               bssidsParts.shift();
 
               bssidsParts.forEach((bssidPart) => {
@@ -571,8 +570,12 @@ function wifiConnections(callback) {
         });
       } else if (_windows) {
         let cmd = 'netsh wlan show interfaces';
-        exec(cmd, util.execOptsWin, function (error, stdout) {
-          const parts = stdout.toString().split(': \r\n\r\n');
+        util.powerShell(cmd).then(function (stdout) {
+          const allLines = stdout.toString().split('\r\n');
+          for (let i = 0; i < allLines.length; i++) {
+            allLines[i] = allLines[i].trim();
+          }
+          const parts = allLines.join('\r\n').split(':\r\n\r\n');
           parts.shift();
           parts.forEach(part => {
             const lines = part.split('\r\n');
@@ -667,8 +670,12 @@ function wifiInterfaces(callback) {
         });
       } else if (_windows) {
         let cmd = 'netsh wlan show interfaces';
-        exec(cmd, util.execOptsWin, function (error, stdout) {
-          const parts = stdout.toString().split(': \r\n\r\n');
+        util.powerShell(cmd).then(function (stdout) {
+          const allLines = stdout.toString().split('\r\n');
+          for (let i = 0; i < allLines.length; i++) {
+            allLines[i] = allLines[i].trim();
+          }
+          const parts = allLines.join('\r\n').split(':\r\n\r\n');
           parts.shift();
           parts.forEach(part => {
             const lines = part.split('\r\n');

package/package.json

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