systeminformation 5.9.9 → 5.9.13

package/lib/users.js

@@ -283,43 +283,50 @@ function users(callback) {
       }
       if (_windows) {
         try {
-          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 => {
+          // 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 => {
+          let cmd = 'Get-WmiObject Win32_LogonSession | fl *' + '; echo \'#-#-#-#\';';
+          cmd += 'Get-WmiObject Win32_LoggedOnUser | fl *' + '; echo \'#-#-#-#\';';
+          cmd += 'Get-WmiObject Win32_Process -Filter "name=\'explorer.exe\'" | Select @{Name="domain";Expression={$_.GetOwner().Domain}}, @{Name="username";Expression={$_.GetOwner().User}} | fl';
+          util.powerShell(cmd).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 = '';
+            if (data) {
+              data = data.split('#-#-#-#');
+              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)) {
-                  if (loggedons[id].user === user.user && (!dateTime || dateTime < loggedons[id].dateTime)) {
-                    dateTime = loggedons[id].dateTime;
-                  }
+                  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: ''
+                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);
 

package/lib/util.js

@@ -360,7 +360,7 @@ function powerShell(cmd) {
   return new Promise((resolve) => {
     process.nextTick(() => {
       try {
-        const child = spawn('powershell.exe', ['-NoLogo', '-InputFormat', 'Text', '-NoExit', '-ExecutionPolicy', 'Unrestricted', '-Command', '-'], {
+        const child = spawn('powershell.exe', ['-NoLogo', '-NoProfile', '-InputFormat', 'Text', '-NoExit', '-ExecutionPolicy', 'Unrestricted', '-Command', '-'], { // added NoProfile
           stdio: 'pipe',
           windowsHide: true,
           maxBuffer: 1024 * 20000,
@@ -875,6 +875,7 @@ function decodePiCpuinfo(lines) {
     '0f': 'Internal use only',
     '10': 'CM3+',
     '11': '4B',
+    '12': 'Zero 2 W',
     '13': '400',
     '14': 'CM4'
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systeminformation",
-  "version": "5.9.9",
+  "version": "5.9.13",
   "description": "Advanced, lightweight system and OS information library",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",
@@ -93,6 +93,6 @@
     "sunos"
   ],
   "engines": {
-    "node": ">=4.0.0"
+    "node": ">=8.0.0"
   }
 }