merge 4.1.4
This commit is contained in:
commit
398b08ea88
10
CHANGELOG.md
10
CHANGELOG.md
@ -30,7 +30,9 @@ For major (breaking) changes - version 3 and 2 see end of page.
|
||||
|
||||
| Version | Date | Comment |
|
||||
| -------------- | -------------- | -------- |
|
||||
| 4.1.2 | 2019-03-22 | updated docs |
|
||||
| 4.1.4 | 2019-03-26 | `networkInterfaces()` speed bug (windows) |
|
||||
| 4.1.3 | 2019-03-24 | wmic path detection (windows) |
|
||||
| 4.1.2 | 2019-03-23 | updated docs |
|
||||
| 4.1.1 | 2019-03-13 | updated typescript typings |
|
||||
| 4.1.0 | 2019-03-13 | `versions()` added pip, pip3 |
|
||||
| 4.0.16 | 2019-03-12 | Happy birthday - 5th aniversary |
|
||||
@ -108,7 +110,7 @@ For major (breaking) changes - version 3 and 2 see end of page.
|
||||
| 3.42.2 | 2018-07-03 | `users()` optimized results if lack of permissions |
|
||||
| 3.42.1 | 2018-07-03 | `versions()` bugfix git version macOS |
|
||||
| 3.42.0 | 2018-06-01 | `processes()` added parent process PID |
|
||||
| 3.41.4 | 2018-05-28 | windows exec WMIC in try catch |
|
||||
| 3.41.4 | 2018-05-28 | windows exec WMIC path detection (windows) in try catch |
|
||||
| 3.41.3 | 2018-05-13 | improved SunOS support `getStaticData()`, `getDynamicData()` |
|
||||
| 3.41.2 | 2018-05-13 | bugfix `system()` and `flags()` Raspberry Pi |
|
||||
| 3.41.1 | 2018-05-11 | updated docs |
|
||||
@ -139,8 +141,8 @@ For major (breaking) changes - version 3 and 2 see end of page.
|
||||
| 3.33.13 | 2018-01-12 | bugfix `memLayout()` (Windows) |
|
||||
| 3.33.12 | 2017-12-25 | fixed typos |
|
||||
| 3.33.11 | 2017-12-17 | updated docs |
|
||||
| 3.33.10 | 2017-12-14 | bugfix WMIC blockDevice parse (Windows 7) |
|
||||
| 3.33.9 | 2017-12-14 | bugfix WMIC not found (Windows) |
|
||||
| 3.33.10 | 2017-12-14 | bugfix WMIC path detection (windows) blockDevice parse (Windows 7) |
|
||||
| 3.33.9 | 2017-12-14 | bugfix WMIC path detection (windows) not found (Windows) |
|
||||
| 3.33.8 | 2017-12-02 | bugfix diskLayout().size (OSX) |
|
||||
| 3.33.7 | 2017-11-28 | bugfix diskLayout().size |
|
||||
| 3.33.6 | 2017-11-16 | bugfix diskLayout().size |
|
||||
|
||||
11
README.md
11
README.md
@ -105,7 +105,6 @@ si.cpu()
|
||||
- Version 3.52.0: `cpu()` added physical cores, processors, socket type
|
||||
- Version 3.51.0: `processLoad()` added for windows
|
||||
- Version 3.50.0: `services()` added possibility to specify ALL services "*" for linux/win
|
||||
- Version 3.49.0: `uuid()` added - os specific uuid (per installation)
|
||||
- ...
|
||||
|
||||
You can find all changes here: [detailed changelog][changelog-url]
|
||||
@ -426,11 +425,11 @@ I also created a nice little command line tool called [mmon][mmon-github-url] (
|
||||
| | [0].ip6 | X | X | X | X | X | ip6 address |
|
||||
| | [0].mac | X | X | X | X | X | MAC address |
|
||||
| | [0].internal | X | X | X | X | X | true if internal interface |
|
||||
| | [0].operstate | X | | | X | | up / down |
|
||||
| | [0].type | X | | | X | | wireless / wired |
|
||||
| | [0].duplex | X | | | | | duplex |
|
||||
| | [0].mtu | X | | | | | maximum transmission unit |
|
||||
| | [0].speed | X | | | X | | speed in MBit / s |
|
||||
| | [0].operstate | X | | X | X | | up / down |
|
||||
| | [0].type | X | | X | X | | wireless / wired |
|
||||
| | [0].duplex | X | | X | | | duplex |
|
||||
| | [0].mtu | X | | X | | | maximum transmission unit |
|
||||
| | [0].speed | X | | X | X | | speed in MBit / s |
|
||||
| | [0].carrierChanges | X | | | | | # changes up/down |
|
||||
| si.networkInterfaceDefault(cb) | : string | X | X | X | X | X | get name of default network interface |
|
||||
| si.networkStats(ifaces,cb) | [{...}] | X | X | X | X | | current network stats of given interfaces<br>iface list: space or comma separated<br>iface parameter is optional<br>defaults to first external network interface,<br />Pass '*' for all interfaces |
|
||||
|
||||
@ -80,6 +80,21 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<th scope="row">4.1.4</th>
|
||||
<td>2019-03-26</td>
|
||||
<td><span class="code">networkInterfaces()</span> speed bug (windows)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">4.1.3</th>
|
||||
<td>2019-03-24</td>
|
||||
<td>wmic path detection (windows)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">4.1.2</th>
|
||||
<td>2019-03-23</td>
|
||||
<td>updated docs</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">4.1.1</th>
|
||||
<td>2019-03-13</td>
|
||||
|
||||
@ -170,7 +170,7 @@
|
||||
<img class="logo" src="assets/logo.png">
|
||||
<div class="title">systeminformation</div>
|
||||
<div class="subtitle"><span id="typed"></span></div>
|
||||
<div class="version">Current Version: <span id="version">4.1.1</span></div>
|
||||
<div class="version">Current Version: <span id="version">4.1.4</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">
|
||||
@ -193,7 +193,7 @@
|
||||
</div>
|
||||
<div class="row number-section">
|
||||
<div class="col-xl-4 col-lg-4 col-md-4 col-12">
|
||||
<div class="numbers">8,215</div>
|
||||
<div class="numbers">8,219</div>
|
||||
<div class="title">Lines of code</div>
|
||||
</div>
|
||||
<div class="col-xl-4 col-lg-4 col-md-4 col-12">
|
||||
@ -201,7 +201,7 @@
|
||||
<div class="title">Downloads last month</div>
|
||||
</div>
|
||||
<div class="col-xl-4 col-lg-4 col-md-4 col-12">
|
||||
<div class="numbers">135</div>
|
||||
<div class="numbers">151</div>
|
||||
<div class="title">Dependends</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -139,7 +139,7 @@
|
||||
<td></td>
|
||||
<td>[0].operstate</td>
|
||||
<td>X</td>
|
||||
<td>X</td>
|
||||
<td></td>
|
||||
<td>X</td>
|
||||
<td>X</td>
|
||||
<td></td>
|
||||
@ -149,7 +149,7 @@
|
||||
<td></td>
|
||||
<td>[0].type</td>
|
||||
<td>X</td>
|
||||
<td>X</td>
|
||||
<td></td>
|
||||
<td>X</td>
|
||||
<td>X</td>
|
||||
<td></td>
|
||||
@ -159,9 +159,9 @@
|
||||
<td></td>
|
||||
<td>[0].duplex</td>
|
||||
<td>X</td>
|
||||
<td></td>
|
||||
<td>X</td>
|
||||
<td>X</td>
|
||||
<td>X</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>duplex (full/half)</td>
|
||||
</tr>
|
||||
@ -169,9 +169,9 @@
|
||||
<td></td>
|
||||
<td>[0].mtu</td>
|
||||
<td>X</td>
|
||||
<td></td>
|
||||
<td>X</td>
|
||||
<td>X</td>
|
||||
<td>X</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>MUT maximum transmission unit</td>
|
||||
</tr>
|
||||
@ -179,7 +179,7 @@
|
||||
<td></td>
|
||||
<td>[0].speed</td>
|
||||
<td>X</td>
|
||||
<td>X</td>
|
||||
<td></td>
|
||||
<td>X</td>
|
||||
<td>X</td>
|
||||
<td></td>
|
||||
@ -189,9 +189,9 @@
|
||||
<td></td>
|
||||
<td>[0].carrierChanges</td>
|
||||
<td>X</td>
|
||||
<td>X</td>
|
||||
<td>X</td>
|
||||
<td>X</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td># changes up/down</td>
|
||||
</tr>
|
||||
|
||||
@ -163,7 +163,7 @@ function parseLinesWindowsNics(sections) {
|
||||
let lines = sections[i].trim().split('\r\n');
|
||||
let netEnabled = util.getValue(lines, 'NetEnabled', '=');
|
||||
if (netEnabled) {
|
||||
const speed = parseInt(util.getValue(lines, 'speed', '=').trim(), 10);
|
||||
const speed = parseInt(util.getValue(lines, 'speed', '=').trim(), 10) / 1000000;
|
||||
nics.push({
|
||||
mac: util.getValue(lines, 'MACAddress', '=').toLowerCase(),
|
||||
name: util.getValue(lines, 'Name', '=').replace(/\]/g, ')').replace(/\[/g, '('),
|
||||
|
||||
10
lib/util.js
10
lib/util.js
@ -221,9 +221,13 @@ function findObjectByKey(array, key, value) {
|
||||
|
||||
function getWmic() {
|
||||
if (os.type() === 'Windows_NT' && !wmic) {
|
||||
if (fs.existsSync(process.env.WINDIR + '\\system32\\wbem\\wmic.exe')) {
|
||||
wmic = process.env.WINDIR + '\\system32\\wbem\\wmic.exe';
|
||||
} else wmic = 'wmic';
|
||||
try {
|
||||
wmic = execSync('WHERE WMIC').toString().trim();
|
||||
} catch (e) {
|
||||
if (fs.existsSync(process.env.WINDIR + '\\system32\\wbem\\wmic.exe')) {
|
||||
wmic = process.env.WINDIR + '\\system32\\wbem\\wmic.exe';
|
||||
} else wmic = 'wmic';
|
||||
}
|
||||
}
|
||||
return wmic;
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "systeminformation",
|
||||
"version": "4.1.1",
|
||||
"version": "4.1.4",
|
||||
"description": "Simple system and OS information library",
|
||||
"license": "MIT",
|
||||
"author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user