users() fix data check (windows)

CHANGELOG.md

@@ -80,6 +80,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
 
 | Version        | Date           | Comment  |
 | -------------- | -------------- | -------- |
+| 5.9.12         | 2021-11-13     | `users()` fix data check (windows) |
 | 5.9.11         | 2021-11-12     | `fsStats()` fix null result (bsd) |
 | 5.9.10         | 2021-11-11     | `powerShell` transition from `wmic` (windows) |
 | 5.9.9          | 2021-10-27     | `graphics()` fixed screen resolution issue (windows) |

docs/history.html

@@ -57,6 +57,11 @@
                     </tr>
                   </thead>
                   <tbody>
+                    <tr>
+                      <th scope="row">5.9.12</th>
+                      <td>2021-11-13</td>
+                      <td><span class="code">users()</span> fix data check (windows)</td>
+                    </tr>
                     <tr>
                       <th scope="row">5.9.11</th>
                       <td>2021-11-12</td>

docs/index.html

@@ -170,7 +170,7 @@
       <img class="logo" src="assets/logo.png">
       <div class="title">systeminformation</div>
       <div class="subtitle"><span id="typed"></span>&nbsp;</div>
-      <div class="version">New Version: <span id="version">5.9.11</span></div>
+      <div class="version">New Version: <span id="version">5.9.12</span></div>
       <button class="btn btn-light" onclick="location.href='https://github.com/sebhildebrandt/systeminformation'">View on Github <i class=" fab fa-github"></i></button>
     </div>
     <div class="down">

lib/users.js

@@ -297,34 +297,36 @@ function users(callback) {
           util.powerShell(cmd).then(data => {
             // controller + vram
             // let accounts = parseWinAccounts(data[0].split(/\n\s*\n/));
-            data = data.split('#-#-#-#');
+            if (data) {
-            let sessions = parseWinSessions(data[0].split(/\n\s*\n/));
+              data = data.split('#-#-#-#');
-            let loggedons = parseWinLoggedOn(data[1].split(/\n\s*\n/));
+              let sessions = parseWinSessions(data[0].split(/\n\s*\n/));
-            let users = parseWinUsers(data[2].split(/\n\s*\n/));
+              let loggedons = parseWinLoggedOn(data[1].split(/\n\s*\n/));
-            for (let id in loggedons) {
+              let users = parseWinUsers(data[2].split(/\n\s*\n/));
-              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)) {
+                  loggedons[id].dateTime = {}.hasOwnProperty.call(sessions, id) ? sessions[id] : '';
-                    dateTime = loggedons[id].dateTime;
-                  }
                 }
               }
+              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({
+                result.push({
-                user: user.user,
+                  user: user.user,
-                tty: '',
+                  tty: '',
-                date: `${dateTime.substr(0, 4)}-${dateTime.substr(4, 2)}-${dateTime.substr(6, 2)}`,
+                  date: `${dateTime.substr(0, 4)}-${dateTime.substr(4, 2)}-${dateTime.substr(6, 2)}`,
-                time: `${dateTime.substr(8, 2)}:${dateTime.substr(10, 2)}`,
+                  time: `${dateTime.substr(8, 2)}:${dateTime.substr(10, 2)}`,
-                ip: '',
+                  ip: '',
-                command: ''
+                  command: ''
+                });
               });
-            });
+            }
             if (callback) { callback(result); }
             resolve(result);