mike/systeminformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

baseboard(), getDefaultNetworkInterface() fix catch error

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2021-08-24 18:08:26 +02:00
parent a1beb0d4a8
commit 43e6c6480c
6 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -77,6 +77,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
| Version | Date | Comment |
| -------------- | -------------- | -------- |
| 5.8.2 | 2021-08-24 | `baseboard()`, `getDefaultNetworkInterface()` fix catch error |
| 5.8.1 | 2021-08-24 | `battery()` fix capacity |
| 5.8.0 | 2021-08-02 | `disksIO()` added waitTime, waitPercent (linux) |
| 5.7.14 | 2021-08-01 | `cpu()` cache calculation fix (linux) |

5
docs/history.html
View File

@ -56,6 +56,11 @@
</tr>
</thead>
<tbody>
<tr>
<th scope="row">5.8.2</th>
<td>2021-08-24</td>
<td><span class="code">baseboard(), getDefaultNetworkInterface()</span> fix catch error</td>
</tr>
<tr>
<th scope="row">5.8.1</th>
<td>2021-08-24</td>

2
docs/index.html
View File

@ -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.8.1</span></div>
<div class="version">New Version: <span id="version">5.8.2</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">

40
lib/network.js
View File

@ -39,29 +39,29 @@ let pathToIp;
function getDefaultNetworkInterface() {
let ifaces = os.networkInterfaces();
let ifacename = '';
let ifacenameFirst = '';
let scopeid = 9999;
// fallback - "first" external interface (sorted by scopeid)
for (let dev in ifaces) {
if ({}.hasOwnProperty.call(ifaces, dev)) {
ifaces[dev].forEach(function (details) {
if (details && details.internal === false) {
ifacenameFirst = ifacenameFirst || dev; // fallback if no scopeid
if (details.scopeid && details.scopeid < scopeid) {
ifacename = dev;
scopeid = details.scopeid;
}
}
});
}
}
ifacename = ifacename || ifacenameFirst || '';
try {
let ifaces = os.networkInterfaces();
let scopeid = 9999;
// fallback - "first" external interface (sorted by scopeid)
for (let dev in ifaces) {
if ({}.hasOwnProperty.call(ifaces, dev)) {
ifaces[dev].forEach(function (details) {
if (details && details.internal === false) {
ifacenameFirst = ifacenameFirst || dev; // fallback if no scopeid
if (details.scopeid && details.scopeid < scopeid) {
ifacename = dev;
scopeid = details.scopeid;
}
}
});
}
}
ifacename = ifacename || ifacenameFirst || '';
if (_windows) {
// https://www.inetdaemon.com/tutorials/internet/ip/routing/default_route.shtml
let defaultIp = '';

7
lib/system.js
View File

@ -615,7 +615,12 @@ function baseboard(callback) {
result.memSlots = util.toInt(util.getValue(lines, 'Number Of Devices')) || null;
// raspberry
const linesRpi = fs.readFileSync('/proc/cpuinfo').toString().split('\n');
let linesRpi = '';
try {
linesRpi = fs.readFileSync('/proc/cpuinfo').toString().split('\n');
} catch (e) {
util.noop();
}
const hardware = util.getValue(linesRpi, 'hardware');
if (hardware.startsWith('BCM')) {
const rpi = util.decodePiCpuinfo(linesRpi);

2
lib/util.js
View File

@ -112,7 +112,7 @@ function getValue(lines, property, separator, trimmed) {
if (trimmed) {
line = line.trim();
}
if (line.startsWith(property) && line.match(property + separator)) {
if (line.startsWith(property)) {
const parts = trimmed ? lines[i].trim().split(separator) : lines[i].split(separator);
if (parts.length >= 2) {
parts.shift();