systeminformation 5.28.0 → 5.28.1

package/README.md

@@ -185,7 +185,7 @@ si.cpu()
 
 (last 7 major and minor version releases)
 
-- Version 5.28.0: `mem()` added suppurt for macos-temperature-sensor (macOS)
+- Version 5.28.0: `couPemperature()` added suppurt for macos-temperature-sensor (macOS)
 - Version 5.27.0: `mem()` added reclaimable memory
 - Version 5.26.0: `getStatic()`, `getAll()` added usb, audio, bluetooth, printer
 - Version 5.25.0: `versions()` added homebrew

package/lib/graphics.js

@@ -779,7 +779,7 @@ function graphics(callback) {
             try {
               stdout = execSync(
                 'defaults read /Library/Preferences/com.apple.windowserver.plist 2>/dev/null;defaults read /Library/Preferences/com.apple.windowserver.displays.plist 2>/dev/null; echo ""',
-                { maxBuffer: 1024 * 20000 }
+                { maxBuffer: 1024 * 102400 }
               );
               const output = (stdout || '').toString();
               const obj = util.plistReader(output);

package/lib/network.js

@@ -524,12 +524,12 @@ function parseLinesDarwinNics(sections) {
 function getDarwinNics() {
   const cmd = '/sbin/ifconfig -v';
   try {
-    const lines = execSync(cmd, { maxBuffer: 1024 * 20000 })
+    const lines = execSync(cmd, { maxBuffer: 1024 * 102400 })
       .toString()
       .split('\n');
     const nsections = splitSectionsNics(lines);
     return parseLinesDarwinNics(nsections);
-  } catch (e) {
+  } catch {
     return [];
   }
 }
@@ -543,7 +543,7 @@ function getLinuxIfaceConnectionName(interfaceName) {
     const connectionNameLines = resultFormat.split(' ').slice(3);
     const connectionName = connectionNameLines.join(' ');
     return connectionName !== '--' ? connectionName : '';
-  } catch (e) {
+  } catch {
     return '';
   }
 }
@@ -566,7 +566,7 @@ function checkLinuxDCHPInterfaces(file) {
         result = result.concat(checkLinuxDCHPInterfaces(file));
       }
     });
-  } catch (e) {
+  } catch {
     util.noop();
   }
   return result;
@@ -580,12 +580,12 @@ function getLinuxDHCPNics() {
     const lines = execSync(cmd, util.execOptsLinux).toString().split('\n');
     const nsections = splitSectionsNics(lines);
     result = parseLinuxDHCPNics(nsections);
-  } catch (e) {
+  } catch {
     util.noop();
   }
   try {
     result = checkLinuxDCHPInterfaces('/etc/network/interfaces');
-  } catch (e) {
+  } catch {
     util.noop();
   }
   return result;
@@ -632,7 +632,7 @@ function getLinuxIfaceDHCPstatus(iface, connectionName, DHCPNics) {
           break;
       }
       return result;
-    } catch (e) {
+    } catch {
       return DHCPNics.indexOf(iface) >= 0;
     }
   } else {
@@ -648,7 +648,7 @@ function getDarwinIfaceDHCPstatus(iface) {
     if (lines.length && lines[0].startsWith('lease_time')) {
       result = true;
     }
-  } catch (e) {
+  } catch {
     util.noop();
   }
   return result;
@@ -662,7 +662,7 @@ function getLinuxIfaceDNSsuffix(connectionName) {
       const resultFormat = result.replace(/\s+/g, ' ').trim();
       const dnsSuffix = resultFormat.split(' ').slice(1).toString();
       return dnsSuffix === '--' ? 'Not defined' : dnsSuffix;
-    } catch (e) {
+    } catch {
       return 'Unknown';
     }
   } else {
@@ -679,7 +679,7 @@ function getLinuxIfaceIEEE8021xAuth(connectionName) {
       const authenticationProtocol = resultFormat.split(' ').slice(1).toString();
 
       return authenticationProtocol === '--' ? '' : authenticationProtocol;
-    } catch (e) {
+    } catch {
       return 'Not defined';
     }
   } else {
@@ -785,16 +785,44 @@ function networkInterfaces(callback, rescan, defaultString) {
           nics = getDarwinNics();
 
           nics.forEach((nic) => {
+            let ip4link = '';
+            let ip4linksubnet = '';
+            let ip6link = '';
+            let ip6linksubnet = '';
+            nic.ip4 = '';
+            nic.ip6 = '';
             if ({}.hasOwnProperty.call(ifaces, nic.iface)) {
               ifaces[nic.iface].forEach((details) => {
                 if (details.family === 'IPv4' || details.family === 4) {
-                  nic.ip4subnet = details.netmask;
+                  if (!nic.ip4 && !nic.ip4.match(/^169.254/i)) {
+                    nic.ip4 = details.address;
+                    nic.ip4subnet = details.netmask;
+                  }
+                  if (nic.ip4.match(/^169.254/i)) {
+                    ip4link = details.address;
+                    ip4linksubnet = details.netmask;
+                  }
                 }
                 if (details.family === 'IPv6' || details.family === 6) {
-                  nic.ip6subnet = details.netmask;
+                  if (!nic.ip6 && !nic.ip6.match(/^fe80::/i)) {
+                    nic.ip6 = details.address;
+                    nic.ip6subnet = details.netmask;
+                  }
+                  if (nic.ip6.match(/^fe80::/i)) {
+                    ip6link = details.address;
+                    ip6linksubnet = details.netmask;
+                  }
                 }
               });
             }
+            if (!nic.ip4 && ip4link) {
+              nic.ip4 = ip4link;
+              nic.ip4subnet = ip4linksubnet;
+            }
+            if (!nic.ip6 && ip6link) {
+              nic.ip6 = ip6link;
+              nic.ip6subnet = ip6linksubnet;
+            }
 
             let ifaceSanitized = '';
             const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(nic.iface);
@@ -872,18 +900,33 @@ function networkInterfaces(callback, rescan, defaultString) {
             let ieee8021xState = '';
             let type = '';
 
+            let ip4link = '';
+            let ip4linksubnet = '';
+            let ip6link = '';
+            let ip6linksubnet = '';
+
             if ({}.hasOwnProperty.call(ifaces, dev)) {
-              let ifaceName = dev;
-              ifaces[dev].forEach(function (details) {
+              const ifaceName = dev;
+              ifaces[dev].forEach((details) => {
                 if (details.family === 'IPv4' || details.family === 4) {
-                  ip4 = details.address;
-                  ip4subnet = details.netmask;
+                  if (!ip4 && !ip4.match(/^169.254/i)) {
+                    ip4 = details.address;
+                    ip4subnet = details.netmask;
+                  }
+                  if (ip4.match(/^169.254/i)) {
+                    ip4link = details.address;
+                    ip4linksubnet = details.netmask;
+                  }
                 }
                 if (details.family === 'IPv6' || details.family === 6) {
-                  if (!ip6 || ip6.match(/^fe80::/i)) {
+                  if (!ip6 && !ip6.match(/^fe80::/i)) {
                     ip6 = details.address;
                     ip6subnet = details.netmask;
                   }
+                  if (ip6.match(/^fe80::/i)) {
+                    ip6link = details.address;
+                    ip6linksubnet = details.netmask;
+                  }
                 }
                 mac = details.mac;
                 // fallback due to https://github.com/nodejs/node/issues/13581 (node 8.1 - node 8.2)
@@ -895,7 +938,15 @@ function networkInterfaces(callback, rescan, defaultString) {
                   mac = _mac[dev] || '';
                 }
               });
-              let iface = dev.split(':')[0].trim().toLowerCase();
+              if (!ip4 && ip4link) {
+                ip4 = ip4link;
+                ip4subnet = ip4linksubnet;
+              }
+              if (!ip6 && ip6link) {
+                ip6 = ip6link;
+                ip6subnet = ip6linksubnet;
+              }
+              const iface = dev.split(':')[0].trim().toLowerCase();
               let ifaceSanitized = '';
               const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(iface);
               const l = util.mathMin(s.length, 2000);
@@ -1234,7 +1285,7 @@ function networkStats(ifaces, callback) {
           ifaces.__proto__.substring = util.stringSubstring;
           ifaces.__proto__.trim = util.stringTrim;
           ifaces.__proto__.startsWith = util.stringStartWith;
-        } catch (e) {
+        } catch {
           Object.setPrototypeOf(ifaces, util.stringObj);
         }
 
@@ -1551,7 +1602,7 @@ function networkConnections(callback) {
           cmd =
             'export LC_ALL=C; netstat -na | grep "ESTABLISHED\\|SYN_SENT\\|SYN_RECV\\|FIN_WAIT1\\|FIN_WAIT2\\|TIME_WAIT\\|CLOSE\\|CLOSE_WAIT\\|LAST_ACK\\|LISTEN\\|CLOSING\\|UNKNOWN"; unset LC_ALL';
         }
-        exec(cmd, { maxBuffer: 1024 * 20000 }, function (error, stdout) {
+        exec(cmd, { maxBuffer: 1024 * 102400 }, function (error, stdout) {
           let lines = stdout.toString().split('\n');
           if (!error && (lines.length > 1 || lines[0] !== '')) {
             lines.forEach(function (line) {
@@ -1596,7 +1647,7 @@ function networkConnections(callback) {
             resolve(result);
           } else {
             cmd = 'ss -tunap | grep "ESTAB\\|SYN-SENT\\|SYN-RECV\\|FIN-WAIT1\\|FIN-WAIT2\\|TIME-WAIT\\|CLOSE\\|CLOSE-WAIT\\|LAST-ACK\\|LISTEN\\|CLOSING"';
-            exec(cmd, { maxBuffer: 1024 * 20000 }, function (error, stdout) {
+            exec(cmd, { maxBuffer: 1024 * 102400 }, function (error, stdout) {
               if (!error) {
                 let lines = stdout.toString().split('\n');
                 lines.forEach(function (line) {
@@ -1660,9 +1711,9 @@ function networkConnections(callback) {
       if (_darwin) {
         let cmd = 'netstat -natvln | head -n2; netstat -natvln | grep "tcp4\\|tcp6\\|udp4\\|udp6"';
         const states = 'ESTABLISHED|SYN_SENT|SYN_RECV|FIN_WAIT1|FIN_WAIT_1|FIN_WAIT2|FIN_WAIT_2|TIME_WAIT|CLOSE|CLOSE_WAIT|LAST_ACK|LISTEN|CLOSING|UNKNOWN'.split('|');
-        exec(cmd, { maxBuffer: 1024 * 20000 }, function (error, stdout) {
+        exec(cmd, { maxBuffer: 1024 * 102400 }, function (error, stdout) {
           if (!error) {
-            exec('ps -axo pid,command', { maxBuffer: 1024 * 20000 }, function (err2, stdout2) {
+            exec('ps -axo pid,command', { maxBuffer: 1024 * 102400 }, function (err2, stdout2) {
               let processes = stdout2.toString().split('\n');
               processes = processes.map((line) => {
                 return line.trim().replace(/ +/g, ' ');
@@ -1821,7 +1872,7 @@ function networkConnections(callback) {
               resolve(result);
             }
           });
-        } catch (e) {
+        } catch {
           if (callback) {
             callback(result);
           }
@@ -1841,7 +1892,7 @@ function networkGatewayDefault(callback) {
       if (_linux || _freebsd || _openbsd || _netbsd) {
         let cmd = 'ip route get 1';
         try {
-          exec(cmd, { maxBuffer: 1024 * 20000 }, function (error, stdout) {
+          exec(cmd, { maxBuffer: 1024 * 102400 }, function (error, stdout) {
             if (!error) {
               let lines = stdout.toString().split('\n');
               const line = lines && lines[0] ? lines[0] : '';
@@ -1861,7 +1912,7 @@ function networkGatewayDefault(callback) {
               resolve(result);
             }
           });
-        } catch (e) {
+        } catch {
           if (callback) {
             callback(result);
           }
@@ -1871,7 +1922,7 @@ function networkGatewayDefault(callback) {
       if (_darwin) {
         let cmd = 'route -n get default';
         try {
-          exec(cmd, { maxBuffer: 1024 * 20000 }, function (error, stdout) {
+          exec(cmd, { maxBuffer: 1024 * 102400 }, function (error, stdout) {
             if (!error) {
               const lines = stdout
                 .toString()
@@ -1881,7 +1932,7 @@ function networkGatewayDefault(callback) {
             }
             if (!result) {
               cmd = "netstat -rn | awk '/default/ {print $2}'";
-              exec(cmd, { maxBuffer: 1024 * 20000 }, function (error, stdout) {
+              exec(cmd, { maxBuffer: 1024 * 102400 }, function (error, stdout) {
                 const lines = stdout
                   .toString()
                   .split('\n')
@@ -1901,7 +1952,7 @@ function networkGatewayDefault(callback) {
               resolve(result);
             }
           });
-        } catch (e) {
+        } catch {
           if (callback) {
             callback(result);
           }
@@ -1953,7 +2004,7 @@ function networkGatewayDefault(callback) {
               resolve(result);
             }
           });
-        } catch (e) {
+        } catch {
           if (callback) {
             callback(result);
           }