systeminformation 5.10.2 → 5.10.6

package/README.md

@@ -381,9 +381,9 @@ Full function reference with examples can be found at [https://systeminformation
 | | ...[0].pid | X | X | X | X | X | process PID |
 | | ...[0].parentPid | X | X | X | X | X | parent process PID |
 | | ...[0].name | X | X | X | X | X | process name |
-| | ...[0].pcpu | X | X | X | X | X | process % CPU usage |
-| | ...[0].pcpuu | X | X |  | X |   | process % CPU usage (user) |
-| | ...[0].pcpus | X | X |  | X |   | process % CPU usage (system) |
+| | ...[0].cpu | X | X | X | X | X | process % CPU usage |
+| | ...[0].cpuu | X | X |  | X |   | process % CPU usage (user) |
+| | ...[0].cpus | X | X |  | X |   | process % CPU usage (system) |
 | | ...[0].pmem | X | X | X | X | X | process memory % |
 | | ...[0].priority | X | X | X | X | X | process priotity |
 | | ...[0].memVsz | X | X | X | X | X | process virtual memory size |

package/lib/battery.js

@@ -244,13 +244,13 @@ module.exports = function (callback) {
                   batteries[batteries.length - 1].push(parts[i]);
                 }
               }
-              let designCapacities = data.results[1].split('\r\n');
-              let fullChargeCapacities = data.results[2].split('\r\n');
+              let designCapacities = data.results[1].split('\r\n').filter(e => e);
+              let fullChargeCapacities = data.results[2].split('\r\n').filter(e => e);
               if (batteries.length) {
                 let first = false;
                 let additionalBatteries = [];
                 for (let i = 0; i < batteries.length; i++) {
-                  let lines = batteries[i];
+                  let lines = batteries[i][0].split('\r\n');
                   const designedCapacity = designCapacities && designCapacities.length >= (i + 1) && designCapacities[i] ? util.toInt(designCapacities[i]) : 0;
                   const fullChargeCapacity = fullChargeCapacities && fullChargeCapacities.length >= (i + 1) && fullChargeCapacities[i] ? util.toInt(fullChargeCapacities[i]) : 0;
                   const parsed = parseWinBatteryPart(lines, designedCapacity, fullChargeCapacity);

package/lib/processes.js

@@ -324,13 +324,13 @@ function services(srv, callback) {
         }
         if (_windows) {
           try {
-            let wincommand = "Get-WmiObject Win32_Service";
+            let wincommand = 'Get-WmiObject Win32_Service';
             if (srvs[0] !== '*') {
               wincommand += ' -Filter "';
               for (let i = 0; i < srvs.length; i++) {
                 wincommand += `Name='${srvs[i]}' or `;
               }
-              wincommand = `${wincommand.slice(0,-4)}"`;
+              wincommand = `${wincommand.slice(0, -4)}"`;
             }
             wincommand += ' | fl *';
             util.powerShell(wincommand).then((stdout, error) => {
@@ -817,8 +817,8 @@ function processes(callback) {
                     let utime = parseInt(util.getValue(lines, 'UserModeTime', ':', true), 10);
                     let stime = parseInt(util.getValue(lines, 'KernelModeTime', ':', true), 10);
                     let memw = parseInt(util.getValue(lines, 'WorkingSetSize', ':', true), 10);
-                    allcpuu = allcpuu + utime;
-                    allcpus = allcpus + stime;
+                    allcpuu += utime - (_processes_cpu.list[pid] ? _processes_cpu.list[pid].utime : 0);
+                    allcpus += stime - (_processes_cpu.list[pid] ? _processes_cpu.list[pid].stime : 0);
                     result.all++;
                     if (!statusValue) { result.unknown++; }
                     if (statusValue === '3') { result.running++; }
@@ -982,8 +982,8 @@ function processLoad(proc, callback) {
                     let utime = parseInt(util.getValue(lines, 'UserModeTime', ':', true), 10);
                     let stime = parseInt(util.getValue(lines, 'KernelModeTime', ':', true), 10);
                     let mem = parseInt(util.getValue(lines, 'WorkingSetSize', ':', true), 10);
-                    allcpuu = allcpuu + utime;
-                    allcpus = allcpus + stime;
+                    allcpuu += utime - (_process_cpu.list[pid] ? _process_cpu.list[pid].utime : 0);
+                    allcpus += stime - (_process_cpu.list[pid] ? _process_cpu.list[pid].stime : 0);
 
                     procStats.push({
                       pid: pid,

package/lib/system.js

@@ -353,33 +353,21 @@ function system(callback) {
               result.serial = util.getValue(lines, 'identifyingnumber', ':');
               result.uuid = util.getValue(lines, 'uuid', ':').toLowerCase();
               // detect virtual (1)
-              if (result.model.toLowerCase() === 'virtualbox' || result.model.toLowerCase() === 'kvm' || result.model.toLowerCase() === 'virtual machine' || result.model.toLowerCase() === 'bochs' || result.model.toLowerCase().startsWith('vmware')) {
+              const model = result.model.toLowerCase();
+              if (model === 'virtualbox' || model === 'kvm' || model === 'virtual machine' || model === 'bochs' || model.startsWith('vmware') || model.startsWith('qemu')) {
                 result.virtual = true;
-                switch (result.model.toLowerCase()) {
-                  case 'virtualbox':
-                    result.virtualHost = 'VirtualBox';
-                    break;
-                  case 'vmware':
-                    result.virtualHost = 'VMware';
-                    break;
-                  case 'kvm':
-                    result.virtualHost = 'KVM';
-                    break;
-                  case 'bochs':
-                    result.virtualHost = 'bochs';
-                    break;
-                }
+                if (model.startsWith('virtualbox')) { result.virtualHost = 'VirtualBox'; }
+                if (model.startsWith('vmware')) { result.virtualHost = 'VMware'; }
+                if (model.startsWith('kvm')) { result.virtualHost = 'KVM'; }
+                if (model.startsWith('bochs')) { result.virtualHost = 'bochs'; }
+                if (model.startsWith('qemu')) { result.virtualHost = 'KVM'; }
               }
-              if (result.manufacturer.toLowerCase().startsWith('vmware') || result.manufacturer.toLowerCase() === 'xen') {
+              const manufacturer = result.manufacturer.toLowerCase();
+              if (manufacturer.startsWith('vmware') || manufacturer.startsWith('qemu') || manufacturer === 'xen') {
                 result.virtual = true;
-                switch (result.manufacturer.toLowerCase()) {
-                  case 'vmware':
-                    result.virtualHost = 'VMware';
-                    break;
-                  case 'xen':
-                    result.virtualHost = 'Xen';
-                    break;
-                }
+                if (manufacturer.startsWith('vmware')) { result.virtualHost = 'VMware'; }
+                if (manufacturer.startsWith('xen')) { result.virtualHost = 'Xen'; }
+                if (manufacturer.startsWith('qemu')) { result.virtualHost = 'KVM'; }
               }
               util.powerShell('Get-WmiObject MS_Systeminformation -Namespace "root/wmi" | fl *').then((stdout, error) => {
                 if (!error) {

package/lib/usb.js

@@ -263,7 +263,7 @@ function usb(callback) {
         });
       }
       if (_windows) {
-        util.powerShell('Get-WmiObject CIM_LogicalDevice | where { $_.Description -match "^USB"}').then((stdout, error) => {
+        util.powerShell('Get-WmiObject CIM_LogicalDevice | where { $_.Description -match "USB"}').then((stdout, error) => {
           if (!error) {
             const parts = stdout.toString().split(/\n\s*\n/);
             for (let i = 0; i < parts.length; i++) {

package/lib/users.js

@@ -176,44 +176,6 @@ function parseUsersDarwin(lines) {
   return result;
 }
 
-// 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;
-// }
-
 function users(callback) {
 
   return new Promise((resolve) => {
@@ -293,7 +255,8 @@ function users(callback) {
           // ).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';
+          cmd += 'Get-WmiObject Win32_Process -Filter "name=\'explorer.exe\'" | Select @{Name="sessionid";Expression={$_.SessionId}}, @{Name="domain";Expression={$_.GetOwner().Domain}}, @{Name="username";Expression={$_.GetOwner().User}} | fl' + '; echo \'#-#-#-#\';';
+          cmd += 'query user';
           util.powerShell(cmd).then(data => {
             // controller + vram
             // let accounts = parseWinAccounts(data[0].split(/\n\s*\n/));
@@ -301,7 +264,8 @@ function users(callback) {
               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/));
+              let queryUser = parseWinUsersQuery(data[3].split('\r\n'));
+              let users = parseWinUsers(data[2].split(/\n\s*\n/), queryUser);
               for (let id in loggedons) {
                 if ({}.hasOwnProperty.call(loggedons, id)) {
                   loggedons[id].dateTime = {}.hasOwnProperty.call(sessions, id) ? sessions[id] : '';
@@ -319,7 +283,7 @@ function users(callback) {
 
                 result.push({
                   user: user.user,
-                  tty: '',
+                  tty: 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: '',
@@ -380,17 +344,36 @@ function parseWinSessions(sessionParts) {
   return sessions;
 }
 
-function parseWinUsers(userParts) {
+function fuzzyMatch(name1, name2) {
+  name1 = name1.toLowerCase();
+  name2 = name2.toLowerCase();
+  let eq = 0;
+  let len = name1.length;
+  if (name2.length > len) { len = name2.length; }
+
+  for (let i = 0; i < len; i++) {
+    const c1 = name1[i] || '';
+    const c2 = name2[i] || '';
+    if (c1 === c2) { eq++; }
+  }
+  return (len > 10 ? eq / len > 0.9 : (len > 0 ? eq / len > 0.8 : false));
+}
+
+function parseWinUsers(userParts, userQuery) {
   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);
+    const sessionid = util.getValue(lines, 'sessionid', ':', true);
+
     if (username) {
+      const quser = userQuery.filter(item => fuzzyMatch(item.user, username));
       users.push({
         domain,
-        user: username
+        user: username,
+        tty: quser && quser[0] && quser[0].tty ? quser[0].tty : sessionid
       });
     }
   });
@@ -421,4 +404,38 @@ function parseWinLoggedOn(loggedonParts) {
   return loggedons;
 }
 
+function parseWinUsersQuery(lines) {
+  lines = lines.filter(item => item);
+  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,
+        });
+      }
+    }
+  }
+  return result;
+}
+
 exports.users = users;

package/package.json

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