systeminformation 5.10.4 → 5.11.0

package/README.md

@@ -101,6 +101,7 @@ si.cpu()
 
 (last 7 major and minor version releases)
 
+- Version 5.11.0: `networkInterfaces()` added default property and default parameter
 - Version 5.10.0: basic `android` support
 - Version 5.9.0: `graphics()` added properties (macOS)
 - Version 5.8.0: `disksIO()` added waitTime, waitPercent (linux)
@@ -381,10 +382,10 @@ 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].pmem | X | X | X | X | X | process memory % |
+| | ...[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].mem | 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 |
 | | ...[0].memRss | X | X | X | X | X | process mem resident set size |
@@ -539,9 +540,10 @@ Full function reference with examples can be found at [https://systeminformation
 
 | Function        | Result object | Linux | BSD | Mac | Win | Sun | Comments |
 | --------------- | ------------- | ----- | ------- | --- | --- | --- | -------- |
-| si.networkInterfaces(cb) | [{...}] | X | X | X | X | X | array of network interfaces |
+| si.networkInterfaces(cb) | [{...}] | X | X | X | X | X | array of network interfaces<br>With the 'default' parameter it returns<br>only the default interface |
 | | [0].iface | X | X | X | X | X | interface |
 | | [0].ifaceName | X | X | X | X | X | interface name (differs on Windows) |
+| | [0].default | X | X | X | X | X | true if this is the default interface |
 | | [0].ip4 | X | X | X | X | X | ip4 address |
 | | [0].ip4subnet | X | X | X | X | X | ip4 subnet mask |
 | | [0].ip6 | X | X | X | X | X | ip6 address |

package/lib/network.js

@@ -692,17 +692,29 @@ function testVirtualNic(iface, ifaceName, mac) {
   } else { return false; }
 }
 
-function networkInterfaces(callback, rescan) {
+function networkInterfaces(callback, rescan, defaultString) {
+
+  if (typeof callback === 'string') {
+    defaultString = callback;
+    rescan = true;
+    callback = null;
+  }
 
   if (typeof callback === 'boolean') {
     rescan = callback;
     callback = null;
+    defaultString = '';
   }
   if (typeof rescan === 'undefined') {
     rescan = true;
   }
+  defaultString = defaultString || '';
+  defaultString = '' + defaultString;
+
   return new Promise((resolve) => {
     process.nextTick(() => {
+      const defaultInterface = getDefaultNetworkInterface();
+
       let ifaces = os.networkInterfaces();
 
       let result = [];
@@ -730,6 +742,7 @@ function networkInterfaces(callback, rescan) {
           result.push({
             iface: nic.iface,
             ifaceName: nic.iface,
+            default: nic.iface === defaultInterface,
             ip4: nic.ip4,
             ip4subnet: nic.ip4subnet || '',
             ip6: nic.ip6,
@@ -750,6 +763,14 @@ function networkInterfaces(callback, rescan) {
           });
         });
         _networkInterfaces = result;
+        if (defaultString.toLowerCase().indexOf('default') >= 0) {
+          result = result.filter(item => item.default);
+          if (result.length > 0) {
+            result = result[0];
+          } else {
+            result = [];
+          }
+        }
         if (callback) { callback(result); }
         resolve(result);
       }
@@ -863,6 +884,7 @@ function networkInterfaces(callback, rescan) {
               result.push({
                 iface,
                 ifaceName,
+                default: iface === defaultInterface,
                 ip4,
                 ip4subnet,
                 ip6,
@@ -884,6 +906,14 @@ function networkInterfaces(callback, rescan) {
             }
           }
           _networkInterfaces = result;
+          if (defaultString.toLowerCase().indexOf('default') >= 0) {
+            result = result.filter(item => item.default);
+            if (result.length > 0) {
+              result = result[0];
+            } else {
+              result = [];
+            }
+          }
           if (callback) { callback(result); }
           resolve(result);
         }
@@ -990,6 +1020,7 @@ function networkInterfaces(callback, rescan) {
                 result.push({
                   iface,
                   ifaceName,
+                  default: iface === defaultInterface,
                   ip4,
                   ip4subnet,
                   ip6,
@@ -1011,6 +1042,14 @@ function networkInterfaces(callback, rescan) {
               }
             }
             _networkInterfaces = result;
+            if (defaultString.toLowerCase().indexOf('default') >= 0) {
+              result = result.filter(item => item.default);
+              if (result.length > 0) {
+                result = result[0];
+              } else {
+                result = [];
+              }
+            }
             if (callback) { callback(result); }
             resolve(result);
           });

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) => {
@@ -803,8 +803,10 @@ function processes(callback) {
                 let procs = [];
                 let procStats = [];
                 let list_new = {};
-                let allcpuu = _processes_cpu.all_utime;
-                let allcpus = _processes_cpu.all_stime;
+                let allcpuu = 0;
+                let allcpus = 0;
+                // let allcpuu = _processes_cpu.all_utime;
+                // let allcpus = _processes_cpu.all_stime;
                 for (let i = 0; i < processSections.length; i++) {
                   if (processSections[i].trim() !== '') {
                     let lines = processSections[i].trim().split('\r\n');
@@ -819,6 +821,8 @@ function processes(callback) {
                     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++; }
@@ -970,8 +974,10 @@ function processLoad(proc, callback) {
                 let processSections = stdout.split(/\n\s*\n/);
                 let procStats = [];
                 let list_new = {};
-                let allcpuu = _process_cpu.all_utime;
-                let allcpus = _process_cpu.all_stime;
+                let allcpuu = 0;
+                let allcpus = 0;
+                // let allcpuu = _process_cpu.all_utime;
+                // let allcpus = _process_cpu.all_stime;
 
                 // go through all processes
                 for (let i = 0; i < processSections.length; i++) {
@@ -984,6 +990,8 @@ function processLoad(proc, callback) {
                     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/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.4",
+  "version": "5.11.0",
   "description": "Advanced, lightweight system and OS information library",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",