From 83c01d2cac780183462829f2e5328c4d832ef310 Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Fri, 4 Aug 2023 07:16:26 +0200 Subject: [PATCH] bluetooth() improved parsing, macOS Sonoma detection --- CHANGELOG.md | 1 + README.md | 2 +- docs/history.html | 5 +++++ docs/index.html | 4 ++-- lib/bluetooth.js | 2 ++ lib/osinfo.js | 2 +- 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5e7f463..fb79784b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -82,6 +82,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page. | Version | Date | Comment | | ------- | ---------- | --------------------------------------------------------------------------------------------------- | +| 5.18.11 | 2023-08-04 | `bluetooth()` improved parsing, macOS Sonoma detection | | 5.18.10 | 2023-07-28 | `cpu()` fixed cache sizes, extended sockets (windows) | | 5.18.9 | 2023-07-26 | `fsSize()` fixed missing rw property (windows) | | 5.18.8 | 2023-07-25 | `cpu()` added AMD ZEN 4 base frequencies | diff --git a/README.md b/README.md index eb496631..943ed91f 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ [![MIT license][license-img]][license-url] ## The Systeminformation Project -This is amazing. Started as a small project just for myself, it now has > 15,000 lines of code, > 500 versions published, up to 6 mio downloads per month, > 150 mio downloads overall. #1 NPM ranking for backend packages. Thank you to all who contributed to this project! +This is amazing. Started as a small project just for myself, it now has > 15,000 lines of code, > 600 versions published, up to 6 mio downloads per month, > 150 mio downloads overall. #1 NPM ranking for backend packages. Thank you to all who contributed to this project! ## New Version 5.0 diff --git a/docs/history.html b/docs/history.html index c3e0abe2..7f91d3bb 100644 --- a/docs/history.html +++ b/docs/history.html @@ -57,6 +57,11 @@

Full version history

+ + 5.18.11 + 2023-08-04 + bluetooth() improved parsing + 5.18.10 2023-07-28 diff --git a/docs/index.html b/docs/index.html index 6afe1dff..5d0576a2 100644 --- a/docs/index.html +++ b/docs/index.html @@ -170,7 +170,7 @@
systeminformation
 
-
New Version: 5.18.10
+
New Version: 5.18.11
@@ -212,7 +212,7 @@
Downloads last month
-
634
+
636
Dependents
diff --git a/lib/bluetooth.js b/lib/bluetooth.js index 1c1326f9..f0bf288c 100644 --- a/lib/bluetooth.js +++ b/lib/bluetooth.js @@ -34,6 +34,7 @@ function parseBluetoothType(str) { if (str.indexOf('keyboard') >= 0) { result = 'Keyboard'; } if (str.indexOf('mouse') >= 0) { result = 'Mouse'; } + if (str.indexOf('trackpad') >= 0) { result = 'Trackpad'; } if (str.indexOf('speaker') >= 0) { result = 'Speaker'; } if (str.indexOf('headset') >= 0) { result = 'Headset'; } if (str.indexOf('phone') >= 0) { result = 'Phone'; } @@ -55,6 +56,7 @@ function parseBluetoothManufacturer(str) { if (str.indexOf('imac') >= 0) { result = 'Apple'; } if (str.indexOf('iphone') >= 0) { result = 'Apple'; } if (str.indexOf('magic mouse') >= 0) { result = 'Apple'; } + if (str.indexOf('magic track') >= 0) { result = 'Apple'; } if (str.indexOf('macbook') >= 0) { result = 'Apple'; } // to be continued ... diff --git a/lib/osinfo.js b/lib/osinfo.js index 7f588d59..754593fb 100644 --- a/lib/osinfo.js +++ b/lib/osinfo.js @@ -271,7 +271,7 @@ function osInfo(callback) { exec('sysctl kern.ostype kern.osrelease kern.osrevision kern.hostuuid machdep.bootmethod kern.geom.confxml', function (error, stdout) { let lines = stdout.toString().split('\n'); const distro = util.getValue(lines, 'kern.ostype'); - const logofile = util.getValue(lines, 'kern.ostype'); + const logofile = util.getLogoFile(distro); const release = util.getValue(lines, 'kern.osrelease').split('-')[0]; const serial = util.getValue(lines, 'kern.uuid'); const bootmethod = util.getValue(lines, 'machdep.bootmethod');