From 29ebfddcb112b7e2da296e3b53f7564941028531 Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Mon, 19 Nov 2018 14:20:35 +0100 Subject: [PATCH 1/4] uuid() object - os specific uuid --- README.md | 3 ++- lib/osinfo.js | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 366ddfb..e170292 100644 --- a/README.md +++ b/README.md @@ -244,7 +244,8 @@ I also created a nice little command line tool called [mmon][mmon-github-url] ( | | serial | | X | X | X | | OS/Host serial number | | | build | | | X | X | | OS build version | | | codepage | X | X | X | X | | OS build version | -| si.uuid(cb) | : string | X | X | X | X| | device ID (based on OS install) | +| si.uuid(cb) | {...} | X | X | X | X | X | object of several UUIDs | +| | os | X | X | X | X | | os specific UUID | | si.versions(cb) | {...} | X | X | X | X | X | version information (kernel, ssl, node, ...) | | si.shell(cb) | : string | X | X | X | | | standard shell | | si.users(cb) | [{...}] | X | X | X | X | X | array of users online | diff --git a/lib/osinfo.js b/lib/osinfo.js index 59ccd58..b17eb07 100644 --- a/lib/osinfo.js +++ b/lib/osinfo.js @@ -505,14 +505,16 @@ function uuid(callback) { return new Promise((resolve) => { process.nextTick(() => { - let result = ''; + let result = { + os: '' + }; let parts; if (_darwin) { exec('ioreg -rd1 -c IOPlatformExpertDevice | grep IOPlatformUUID', function (error, stdout) { if (!error) { parts = stdout.toString().split('\n')[0].replace(/"/g, '').split('='); - result = parts.length > 1 ? parts[1].trim().toLowerCase() : ''; + result.os = parts.length > 1 ? parts[1].trim().toLowerCase() : ''; } if (callback) { callback(result); @@ -523,7 +525,7 @@ function uuid(callback) { if (_linux) { exec('( cat /var/lib/dbus/machine-id /etc/machine-id 2> /dev/null || hostname ) | head -n 1 || :', function (error, stdout) { if (!error) { - result = stdout.toString().split('\n')[0].trim().toLowerCase(); + result.os = stdout.toString().split('\n')[0].trim().toLowerCase(); } if (callback) { callback(result); @@ -534,7 +536,7 @@ function uuid(callback) { if (_freebsd || _openbsd) { exec('kenv -q smbios.system.uuid', function (error, stdout) { if (!error) { - result = stdout.toString().split('\n')[0].trim().toLowerCase(); + result.os = stdout.toString().split('\n')[0].trim().toLowerCase(); } if (callback) { callback(result); @@ -545,7 +547,8 @@ function uuid(callback) { if (_windows) { exec('%windir%\\System32\\reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Cryptography" /v MachineGuid', util.execOptsWin, function (error, stdout) { if (!error) { - result = stdout.toString().split('\n')[0].split('REG_SZ')[1].replace(/\r+|\n+|\s+/ig, '').toLowerCase(); + parts = stdout.toString().split('\n\r')[0].split('REG_SZ'); + result.os = parts.length > 1 ? parts[1].replace(/\r+|\n+|\s+/ig, '').toLowerCase() : ''; } if (callback) { callback(result); From b2f54a43746cabe526fbf4e634f38bffa56649ee Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Mon, 19 Nov 2018 14:20:46 +0100 Subject: [PATCH 2/4] 3.49.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index afb98ef..352dde5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "systeminformation", - "version": "3.48.4", + "version": "3.49.0", "description": "Simple system and OS information library", "license": "MIT", "author": "Sebastian Hildebrandt (https://plus-innovations.com)", From 0bade091f545aecce74df6a643e57f0a75a44a67 Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Mon, 19 Nov 2018 15:35:52 +0100 Subject: [PATCH 3/4] cpu().brand removed extra spaces, tabs --- CHANGELOG.md | 1 + lib/cpu.js | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ceea04..b7f6492 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -100,6 +100,7 @@ Other changes | Version | Date | Comment | | -------------- | -------------- | -------- | +| 3.49.1 | 2018-11-19 | `cpu().brand` removed extra spaces, tabs | | 3.49.0 | 2018-11-19 | added system `uuid()` (os specific), `versions()` added postgresql | | 3.48.4 | 2018-11-18 | windows: garbled output because of codepage | | 3.48.3 | 2018-11-18 | `dockerContainerStats()` fixed issue `cpu_percent` win | diff --git a/lib/cpu.js b/lib/cpu.js index 7506533..6177fef 100644 --- a/lib/cpu.js +++ b/lib/cpu.js @@ -115,10 +115,10 @@ const AMDBaseFrequencies = { }; function cpuBrandManufacturer(res) { - res.brand = res.brand.replace(/\(R\)+/g, '®'); - res.brand = res.brand.replace(/\(TM\)+/g, '™'); - res.brand = res.brand.replace(/\(C\)+/g, '©'); - res.brand = res.brand.replace(/CPU+/g, '').trim(); + res.brand = res.brand.replace(/\(R\)+/g, '®').replace(/\s+/g, ' ').trim(); + res.brand = res.brand.replace(/\(TM\)+/g, '™').replace(/\s+/g, ' ').trim(); + res.brand = res.brand.replace(/\(C\)+/g, '©').replace(/\s+/g, ' ').trim(); + res.brand = res.brand.replace(/CPU+/g, '').replace(/\s+/g, ' ').trim(); res.manufacturer = res.brand.split(' ')[0]; let parts = res.brand.split(' '); From b2b7ac87f6d97f828b4b829ca1ceb7fee0dce87e Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Mon, 19 Nov 2018 15:35:58 +0100 Subject: [PATCH 4/4] 3.49.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 352dde5..141c848 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "systeminformation", - "version": "3.49.0", + "version": "3.49.1", "description": "Simple system and OS information library", "license": "MIT", "author": "Sebastian Hildebrandt (https://plus-innovations.com)",