diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d77edd..b3bcca3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ We had to make **several interface changes** to keep systeminformation as consis - `cpu()`: added virtualization if cpu supports virtualization - `cpu()`: now flags are part of this function - `cpuTemperature()` added socket and chipset temp (linux) +- `currentLoad()` added steal and guest time (linux) - `disksIO()` added wait time (linux) - `diskLayout()`: added USB drives (mac OS) - `diskLayout()`: added S.M.R.R.T. (win) @@ -82,6 +83,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page. | Version | Date | Comment | | ------- | ---------- | --------------------------------------------------------------------------------------------------- | +| 5.19.0 | 2023-08-22 | `currentLoad()` added steal and guest time (linux) | | 5.18.15 | 2023-08-10 | `npm` command extended | | 5.18.14 | 2023-08-09 | `fsSIze()` fixed syntax error | | 5.18.13 | 2023-08-08 | `mem()` fixed error handling | diff --git a/README.md b/README.md index f0d5415..24050f3 100644 --- a/README.md +++ b/README.md @@ -128,6 +128,7 @@ si.cpu() (last 7 major and minor version releases) +- Version 5.19.0: `currentLoad()` added steal and guest time (linux) - Version 5.18.0: `fsSize()` added optional drive parameter - Version 5.17.0: `graphics()` added positionX, positionY (mac OS) - Version 5.16.0: `fsSize()` added rw property diff --git a/docs/history.html b/docs/history.html index 49fb468..faba9f6 100644 --- a/docs/history.html +++ b/docs/history.html @@ -57,6 +57,11 @@ + + 5.19.0 + 2023-08-22 + currentLoad() new properties steal and guest time (linux) + 5.18.15 2023-08-10 diff --git a/docs/index.html b/docs/index.html index d69c485..a833865 100644 --- a/docs/index.html +++ b/docs/index.html @@ -170,7 +170,7 @@
systeminformation
 
-
New Version: 5.18.15
+
New Version: 5.19.0
@@ -204,7 +204,7 @@
-
15,577
+
15,642
Lines of code
@@ -212,7 +212,7 @@
Downloads last month
-
637
+
642
Dependents
diff --git a/docs/processes.html b/docs/processes.html index 5f1c511..5a5afd1 100644 --- a/docs/processes.html +++ b/docs/processes.html @@ -145,7 +145,27 @@ X X X - CPU load system in % + CPU load hardware interrupts in % + + + + currentLoadSteal + X + + + + + Time stolen by other OS running in VMs in % + + + + currentLoadGuest + X + + X + X + X + Time spent for running virtual CPU in % @@ -188,6 +208,8 @@ si.currentLoad().then(data => console.log(data)); rawCurrentLoadNice: 0, rawCurrentLoadIdle: 7740, rawCurrentLoadIrq: 0, + rawCurrentLoadSteal: 0, + rawCurrentLoadGuest: 0, cpus: [ { load: 13.725490196078432, @@ -196,12 +218,16 @@ si.currentLoad().then(data => console.log(data)); loadNice: 0, loadIdle: 86.27450980392157, loadIrq: 0, + loadSteal: 0, + loadGuest: 0, rawLoad: 140, rawLoadUser: 80, rawLoadSystem: 60, rawLoadNice: 0, rawLoadIdle: 880, rawLoadIrq: 0 + rawLoadSteal: 0 + rawLoadGuest: 0 }, ... ] @@ -769,4 +795,4 @@ si.services('mysql, postgres').then(data => console.log(data)); - \ No newline at end of file + diff --git a/lib/index.d.ts b/lib/index.d.ts index 634f6fe..86ba6d8 100644 --- a/lib/index.d.ts +++ b/lib/index.d.ts @@ -591,12 +591,16 @@ export namespace Systeminformation { currentLoadNice: number; currentLoadIdle: number; currentLoadIrq: number; + currentLoadSteal: number; + currentLoadGuest: number; rawCurrentLoad: number; rawCurrentLoadUser: number; rawCurrentLoadSystem: number; rawCurrentLoadNice: number; rawCurrentLoadIdle: number; rawCurrentLoadIrq: number; + rawCurrentLoadSteal: number; + rawCurrentLoadGuest: number; cpus: CurrentLoadCpuData[]; } @@ -607,12 +611,16 @@ export namespace Systeminformation { loadNice: number; loadIdle: number; loadIrq: number; + loadSteal: number; + loadGuest: number; rawLoad: number; rawLoadUser: number; rawLoadSystem: number; rawLoadNice: number; rawLoadIdle: number; rawLoadIrq: number; + rawLoadSteal: number; + rawLoadGuest: number; } interface ProcessesData { diff --git a/lib/wifi.js b/lib/wifi.js index dcb18e1..e0270ce 100644 --- a/lib/wifi.js +++ b/lib/wifi.js @@ -345,6 +345,7 @@ function parseWifiDarwin(wifiObj) { const signalLevel = wifiItem.RSSI; let security = []; let wpaFlags = []; + let ssid = wifiItem.SSID_STR || ''; if (wifiItem.WPA_IE) { security.push('WPA'); if (wifiItem.WPA_IE.IE_KEY_WPA_UCIPHERS) { @@ -365,9 +366,12 @@ function parseWifiDarwin(wifiObj) { }); } } + // if (wifiItem.SSID) { + // ssid = Buffer.from(wifiItem.SSID, 'base64').toString('utf8'); + // } result.push({ - ssid: wifiItem.SSID_STR, - bssid: wifiItem.BSSID, + ssid, + bssid: wifiItem.BSSID || '', mode: '', channel: wifiItem.CHANNEL, frequency: wifiFrequencyFromChannel(wifiItem.CHANNEL),