From 5723e81e8185f5840ca638f9ee5a8b54cc14cc92 Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Tue, 11 Feb 2020 00:05:11 +0100 Subject: [PATCH 1/6] networkConnections() fixed linux (debian) issue --- CHANGELOG.md | 1 + docs/history.html | 5 +++++ docs/index.html | 4 ++-- lib/network.js | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72b8522..c347228 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ For major (breaking) changes - version 3 and 2 see end of page. | Version | Date | Comment | | -------------- | -------------- | -------- | +| 4.21.2 | 2020-02-11 | `networkConnections()` fixed linux (debian) issue | | 4.21.1 | 2020-01-31 | `networkGatewayDefault()` fixed windows 7 issue | | 4.21.0 | 2020-01-27 | `npx` compatibility | | 4.20.1 | 2020-01-26 | `battery()` code refactoring, cleanup, updated docs | diff --git a/docs/history.html b/docs/history.html index 8eab5a7..974c0f3 100644 --- a/docs/history.html +++ b/docs/history.html @@ -83,6 +83,11 @@ + + 4.21.2 + 2020-01-31 + networkConnections() fixed linux (debian) issue + 4.21.1 2020-01-31 diff --git a/docs/index.html b/docs/index.html index f4d271d..b85b05b 100644 --- a/docs/index.html +++ b/docs/index.html @@ -168,7 +168,7 @@
systeminformation
-
Current Version: 4.21.1
+
Current Version: 4.21.2
@@ -206,7 +206,7 @@
Downloads last month
-
244
+
248
Dependends
diff --git a/lib/network.js b/lib/network.js index 0ebc31d..c0ba7da 100644 --- a/lib/network.js +++ b/lib/network.js @@ -1132,8 +1132,8 @@ function networkConnections(callback) { let cmd = 'export LC_ALL=C; netstat -tunap | grep "ESTABLISHED\\|SYN_SENT\\|SYN_RECV\\|FIN_WAIT1\\|FIN_WAIT2\\|TIME_WAIT\\|CLOSE\\|CLOSE_WAIT\\|LAST_ACK\\|LISTEN\\|CLOSING\\|UNKNOWN"; unset LC_ALL'; if (_freebsd || _openbsd || _netbsd) cmd = 'export LC_ALL=C; netstat -na | grep "ESTABLISHED\\|SYN_SENT\\|SYN_RECV\\|FIN_WAIT1\\|FIN_WAIT2\\|TIME_WAIT\\|CLOSE\\|CLOSE_WAIT\\|LAST_ACK\\|LISTEN\\|CLOSING\\|UNKNOWN"; unset LC_ALL'; exec(cmd, { maxBuffer: 1024 * 20000 }, function (error, stdout) { - if (!error) { - let lines = stdout.toString().split('\n'); + let lines = stdout.toString().split('\n'); + if (!error && (lines.length > 1 || lines[0] != '')) { lines.forEach(function (line) { line = line.replace(/ +/g, ' ').split(' '); if (line.length >= 7) { From 04fdf5112ed2d89bda9c6291bf44b57a1af421d7 Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Tue, 11 Feb 2020 00:05:53 +0100 Subject: [PATCH 2/6] 4.21.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 06ca58e..c135996 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "systeminformation", - "version": "4.21.1", + "version": "4.21.2", "description": "Simple system and OS information library", "license": "MIT", "author": "Sebastian Hildebrandt (https://plus-innovations.com)", From 58721f8a889dae60f1a95e6ccf2b86acf52b8100 Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Tue, 11 Feb 2020 00:49:26 +0100 Subject: [PATCH 3/6] updated docs - examples --- docs/battery.html | 2 +- docs/cpu.html | 79 +++++++++++++++++++++++++++++++++++++++++++++ docs/memory.html | 60 ++++++++++++++++++++++++++++++++++ docs/styles.css | 19 ++++++++++- docs/styles.css.map | 2 +- docs/styles.scss | 18 ++++++++++- docs/system.html | 64 ++++++++++++++++++++++++++++++++++++ 7 files changed, 240 insertions(+), 4 deletions(-) diff --git a/docs/battery.html b/docs/battery.html index 1bdea16..843afcd 100644 --- a/docs/battery.html +++ b/docs/battery.html @@ -225,7 +225,7 @@ battery serial - +
Example
diff --git a/docs/cpu.html b/docs/cpu.html index 3c44a5b..bf7aed0 100644 --- a/docs/cpu.html +++ b/docs/cpu.html @@ -285,6 +285,35 @@ L3 size + + + +
Example
+ 
const si = require('systeminformation');
+si.cpu().then(data => console.log(data));
+ 
+{
+    manufacturer: 'Intel®',
+    brand: 'Core™ i9-9900',
+    vendor: 'GenuineIntel',
+    family: '6',
+    model: '158',
+    stepping: '13',
+    revision: '',
+    voltage: '',
+    speed: '3.10',
+    speedmin: '0.80',
+    speedmax: '5.00',
+    governor: 'powersave',
+    cores: 16,
+    physicalCores: 8,
+    processors: 1,
+    socket: 'LGA1151',
+    cache: { l1d: 262144, l1i: 262144, l2: 2, l3: 16 },
+    flags: 'fpu vme de pse ...'
+}
+
+ si.cpuFlags(cb) : string @@ -295,6 +324,16 @@ CPU flags + + + +
Example
+ 
const si = require('systeminformation');
+si.cpuFlags().then(data => console.log(data));
+ 
+fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge
+
+ si.cpuCache(cb) {...} @@ -345,6 +384,16 @@ L3 size + + + +
Example
+ 
const si = require('systeminformation');
+si.cpuCache().then(data => console.log(data));
+
+{ l1d: 262144, l1i: 262144, l2: 2, l3: 16 }
+
+ si.cpuCurrentspeed(cb) {...} @@ -395,6 +444,26 @@ X CPU speed per core (array) + + + +
Example
+ 
const si = require('systeminformation');
+si.cpuCurrentspeed().then(data => console.log(data));
+
+{
+  min: 0.86,
+  max: 1.77,
+  avg: 1.49,
+  cores: [
+    1.59, 1.71, 1.62, 1.57,
+    1.66, 1.77, 1.74, 1.75,
+    1.49, 1.51, 1.52, 1.59,
+    1.56, 1.03, 0.86, 0.86
+  ]
+}
+
+ si.cpuTemperature(cb) {...} @@ -435,6 +504,16 @@ max temperature + + + +
Example
+ 
const si = require('systeminformation');
+si.cpuCurrentspeed().then(data => console.log(data));
+
+{ main: 42, cores: [], max: 42 }
+
+

Known issues

diff --git a/docs/memory.html b/docs/memory.html index ccbb123..dee6dee 100644 --- a/docs/memory.html +++ b/docs/memory.html @@ -195,6 +195,29 @@ X + + + +
Example
+ 
const si = require('systeminformation');
+si.mem().then(data => console.log(data));
+
+{
+  total: 67092135936,
+  free: 65769291776,
+  used: 1322844160,
+  active: 1032495104,
+  available: 66059640832,
+  buffers: 63213568,
+  cached: 800124928,
+  slab: 268804096,
+  buffcache: 1132142592,
+  swaptotal: 8589930496,
+  swapused: 0,
+  swapfree: 8589930496
+}
+
+ si.memLayout(cb) [{...}] @@ -315,6 +338,43 @@ voltage max + + + +
Example
+ 
const si = require('systeminformation');
+si.memLayout().then(data => console.log(data));
+
+[
+  {
+    size: 34359738368,
+    bank: 'BANK 0',
+    type: 'DDR4',
+    clockSpeed: 2667,
+    formFactor: 'SODIMM',
+    manufacturer: '029E',
+    partNum: 'CMSX64.....',
+    serialNum: '00000000',
+    voltageConfigured: 1.2,
+    voltageMin: 1.2,
+    voltageMax: 1.2
+  },
+  {
+    size: 34359738368,
+    bank: 'BANK 2',
+    type: 'DDR4',
+    clockSpeed: 2667,
+    formFactor: 'SODIMM',
+    manufacturer: '029E',
+    partNum: 'CMSX64.....',
+    serialNum: '00000000',
+    voltageConfigured: 1.2,
+    voltageMin: 1.2,
+    voltageMax: 1.2
+  }
+]
+
+ diff --git a/docs/styles.css b/docs/styles.css index d910cdb..2f223bc 100644 --- a/docs/styles.css +++ b/docs/styles.css @@ -586,10 +586,27 @@ pre { text-align: left; } -.example { +.example td:first-child { + background-color: #fff !important; +} + +.example td:last-child { + background-color: #f8faff !important; +} + +.example h5 { + padding-top: 5px; + padding-left: 10px; +} + +.example pre { background-color: unset; } +.example pre .js { + background-color: #f0f0f4; +} + footer { background-color: #eee; margin-top: 30px; diff --git a/docs/styles.css.map b/docs/styles.css.map index 995b81d..50a28d4 100644 --- a/docs/styles.css.map +++ b/docs/styles.css.map @@ -1,6 +1,6 @@ { "version": 3, - "mappings": "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", + "mappings": "AAAA,AAAA,IAAI,CAAC;EACD,WAAW,EAAE,6IAA6I;EAC1J,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,IAAI;CACnB;;AACD,AAAA,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;EACX,WAAW,EAAE,6IAA6I;EAC1J,WAAW,EAAE,GAAG;CACnB;;AACD,AAAA,OAAO,CAAC;EACJ,UAAU,EAAE,MAAM;CACrB;;AACD,AAAA,cAAc,CAAC;EACX,UAAU,EAAE,8BAA8B;EAC1C,gBAAgB,EAAE,OAAO;EAAE,gDAAgD;EAC3E,gBAAgB,EAAE,yCAAyC;EAAE,oCAAoC;EAEjG,uBAAuB,EAAE,KAAK;EAC9B,oBAAoB,EAAE,KAAK;EAC3B,eAAe,EAAE,KAAK;EACtB,kBAAkB,EAAE,KAAK;EACzB,MAAM,EAAE,KAAK;EACb,MAAM,EAAE,0BAA0B;EAClC,OAAO,EAAE,IAAI;EACb,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,MAAM;EACvB,UAAU,EAAE,MAAM;EAGlB,cAAc,EAAE,MAAM;CAqGzB;;AAtHD,AAkBI,cAlBU,CAkBV,UAAU,CAAC;EACT,UAAU,EAAE,MAAM;EAClB,UAAU,EAAE,MAAM;EAClB,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,MAAM;EACvB,cAAc,EAAE,MAAM;EACtB,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,CAAC;CACb;;AA1BL,AA2BI,cA3BU,CA2BV,MAAM,CAAC;EACH,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,IAAI;EACjB,SAAS,EAAE,MAAM;EACjB,aAAa,EAAE,IAAI;CAUtB;;AATG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EAhChD,AA2BI,cA3BU,CA2BV,MAAM,CAAC;IAMC,SAAS,EAAE,MAAM;GAQxB;;;AANG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EAnChD,AA2BI,cA3BU,CA2BV,MAAM,CAAC;IASC,SAAS,EAAE,MAAM;GAKxB;;;AAHG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,MAAM;EAtCjD,AA2BI,cA3BU,CA2BV,MAAM,CAAC;IAYC,SAAS,EAAE,IAAI;GAEtB;;;AAzCL,AA0CI,cA1CU,CA0CV,KAAK,CAAC;EACF,KAAK,EAAE,KAAK;CAUf;;AATG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EA5ChD,AA0CI,cA1CU,CA0CV,KAAK,CAAC;IAGE,KAAK,EAAE,KAAK;GAQnB;;;AANG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EA/ChD,AA0CI,cA1CU,CA0CV,KAAK,CAAC;IAME,KAAK,EAAE,KAAK;GAKnB;;;AAHG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,MAAM;EAlDjD,AA0CI,cA1CU,CA0CV,KAAK,CAAC;IASE,KAAK,EAAE,KAAK;GAEnB;;;AArDL,AAsDI,cAtDU,CAsDV,SAAS,CAAC;EACN,UAAU,EAAE,MAAM;EAClB,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,OAAO;CAarB;;AAZG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EA1DhD,AAsDI,cAtDU,CAsDV,SAAS,CAAC;IAKF,SAAS,EAAE,MAAM;GAWxB;;;AATG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EA7DhD,AAsDI,cAtDU,CAsDV,SAAS,CAAC;IAQF,SAAS,EAAE,IAAI;GAQtB;;;AANG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EAhEhD,AAsDI,cAtDU,CAsDV,SAAS,CAAC;IAWF,SAAS,EAAE,MAAM;GAKxB;;;AAHG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,MAAM;EAnEjD,AAsDI,cAtDU,CAsDV,SAAS,CAAC;IAcF,SAAS,EAAE,MAAM;GAExB;;;AAtEL,AAuEI,cAvEU,CAuEV,KAAK,GAAG,CAAC,CAAC;EACN,UAAU,EAAE,MAAM;EAClB,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,MAAM;CAiBpB;;AA3FL,AA2EQ,cA3EM,CAuEV,KAAK,GAAG,CAAC,AAIJ,MAAM,CAAC;EACJ,KAAK,EAAE,IAAI;EACX,eAAe,EAAE,IAAI;CACxB;;AACD,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EA/EhD,AAuEI,cAvEU,CAuEV,KAAK,GAAG,CAAC,CAAC;IASF,SAAS,EAAE,MAAM;GAWxB;;;AATG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EAlFhD,AAuEI,cAvEU,CAuEV,KAAK,GAAG,CAAC,CAAC;IAYF,SAAS,EAAE,IAAI;GAQtB;;;AANG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EArFhD,AAuEI,cAvEU,CAuEV,KAAK,GAAG,CAAC,CAAC;IAeF,SAAS,EAAE,IAAI;GAKtB;;;AAHG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,MAAM;EAxFjD,AAuEI,cAvEU,CAuEV,KAAK,GAAG,CAAC,CAAC;IAkBF,SAAS,EAAE,MAAM;GAExB;;;AA3FL,AA4FI,cA5FU,CA4FV,QAAQ,CAAC;EACL,UAAU,EAAE,MAAM;EAClB,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,KAAK;CAUnB;;AATG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EAjGhD,AA4FI,cA5FU,CA4FV,QAAQ,CAAC;IAMD,SAAS,EAAE,KAAK;GAQvB;;;AANG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EApGhD,AA4FI,cA5FU,CA4FV,QAAQ,CAAC;IASD,SAAS,EAAE,IAAI;GAKtB;;;AAHG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,MAAM;EAvGjD,AA4FI,cA5FU,CA4FV,QAAQ,CAAC;IAYD,SAAS,EAAE,MAAM;GAExB;;;AA1GL,AA2GI,cA3GU,CA2GV,KAAK,CAAC;EACJ,UAAU,EAAE,MAAM;EAClB,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,MAAM;EACjB,WAAW,EAAE,CAAC;EACd,aAAa,EAAE,IAAI;EACnB,MAAM,EAAE,OAAO;CAIhB;;AArHL,AAkHM,cAlHQ,CA2GV,KAAK,CAOH,MAAM,CAAC;EACL,SAAS,EAAE,IAAI;CAChB;;AAWP,AAAA,IAAI,CAAC;EACD,UAAU,EAAE,8BAA8B;EAC1C,gBAAgB,EAAE,OAAO;EAAE,gDAAgD;EAC3E,gBAAgB,EAAE,yCAAyC;EAAE,oCAAoC;EACjG,uBAAuB,EAAE,KAAK;EAC9B,oBAAoB,EAAE,KAAK;EAC3B,eAAe,EAAE,KAAK;EACtB,kBAAkB,EAAE,KAAK;EACzB,MAAM,EAAE,IAAI;EACZ,QAAQ,EAAE,QAAQ;CA+CrB;;AAxDD,AAUI,IAVA,CAUA,KAAK,CAAC;EACF,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,IAAI;CACnB;;AAbL,AAcI,IAdA,CAcA,MAAM,CAAC;EACH,OAAO,EAAE,IAAI;EACb,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,MAAM;EACjB,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,IAAI;CAOnB;;AANG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EApBhD,AAcI,IAdA,CAcA,MAAM,CAAC;IAOC,OAAO,EAAE,YAAY;GAK5B;;;AAHG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,MAAM;EAvBjD,AAcI,IAdA,CAcA,MAAM,CAAC;IAUC,SAAS,EAAE,MAAM;GAExB;;;AA1BL,AA2BI,IA3BA,CA2BA,KAAK,CAAC;EACF,UAAU,EAAE,IAAI;CAenB;;AA3CL,AA8BQ,IA9BJ,CA2BA,KAAK,CAGD,CAAC,CAAC;EACE,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,IAAI;EAChB,SAAS,EAAE,MAAM;CASpB;;AARG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,MAAM;EAlCrD,AA8BQ,IA9BJ,CA2BA,KAAK,CAGD,CAAC,CAAC;IAKM,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,MAAM;GAMxB;;;AA1CT,AAsCY,IAtCR,CA2BA,KAAK,CAGD,CAAC,AAQI,MAAM,CAAC;EACJ,KAAK,EAAE,IAAI;EACX,eAAe,EAAE,IAAI;CACxB;;AAzCb,AA4CI,IA5CA,CA4CA,OAAO,CAAC;EACN,OAAO,EAAE,IAAI;CAId;;AAHC,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EA9C9C,AA4CI,IA5CA,CA4CA,OAAO,CAAC;IAGJ,OAAO,EAAE,YAAY;GAExB;;;AAjDL,AAkDI,IAlDA,CAkDA,OAAO,CAAC;EACN,OAAO,EAAE,YAAY;CAItB;;AAHC,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EApD9C,AAkDI,IAlDA,CAkDA,OAAO,CAAC;IAGJ,OAAO,EAAE,IAAI;GAEhB;;;AAEL,AAAA,SAAS,CAAC;EACN,UAAU,EAAE,MAAM;EAClB,KAAK,EAAE,IAAI;CAgCd;;AAlCD,AAGI,SAHK,CAGL,MAAM,CAAC;EACL,OAAO,EAAE,QAAQ;CA6BlB;;AA5BC,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EAL9C,AAGI,SAHK,CAGL,MAAM,CAAC;IAGH,OAAO,EAAE,SAAS;GA2BrB;;;AAjCL,AAQM,SARG,CAGL,MAAM,CAKJ,MAAM,CAAC;EACH,OAAO,EAAE,KAAK;EACd,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,IAAI;CAUd;;AATG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EAZlD,AAQM,SARG,CAGL,MAAM,CAKJ,MAAM,CAAC;IAKC,SAAS,EAAE,MAAM;GAQxB;;;AANG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EAflD,AAQM,SARG,CAGL,MAAM,CAKJ,MAAM,CAAC;IAQC,SAAS,EAAE,IAAI;GAKtB;;;AAHG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,MAAM;EAlBnD,AAQM,SARG,CAGL,MAAM,CAKJ,MAAM,CAAC;IAWC,SAAS,EAAE,IAAI;GAEtB;;;AArBP,AAsBM,SAtBG,CAGL,MAAM,CAmBJ,UAAU,CAAC;EACP,SAAS,EAAE,MAAM;CACpB;;AAxBP,AA0BM,SA1BG,CAGL,MAAM,AAuBH,MAAM,CAAC;EACJ,UAAU,EAAE,OAAO;EACnB,KAAK,EAAE,OAAiB;CAI3B;;AAhCP,AA6BU,SA7BD,CAGL,MAAM,AAuBH,MAAM,CAGH,MAAM,CAAC;EACL,KAAK,EAAE,OAAiB;CACzB;;AAIX,AACI,cADU,CACV,MAAM,CAAC;EACH,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,IAAI;EACjB,SAAS,EAAE,IAAI;CAalB;;AAZG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EALhD,AACI,cADU,CACV,MAAM,CAAC;IAKC,SAAS,EAAE,MAAM;GAWxB;;;AATG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EARhD,AACI,cADU,CACV,MAAM,CAAC;IAQC,UAAU,EAAE,IAAI;IAChB,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,MAAM;GAMxB;;;AAJG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,MAAM;EAbjD,AACI,cADU,CACV,MAAM,CAAC;IAaC,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,IAAI;GAEtB;;;AAjBL,AAkBI,cAlBU,CAkBV,YAAY,CAAC;EACT,UAAU,EAAE,MAAM;EAClB,SAAS,EAAE,MAAM;CAapB;;AAZG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EArBhD,AAkBI,cAlBU,CAkBV,YAAY,CAAC;IAIL,SAAS,EAAE,MAAM;GAWxB;;;AATG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EAxBhD,AAkBI,cAlBU,CAkBV,YAAY,CAAC;IAOL,UAAU,EAAE,IAAI;IAChB,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,MAAM;GAMxB;;;AAJG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,MAAM;EA7BjD,AAkBI,cAlBU,CAkBV,YAAY,CAAC;IAYL,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,IAAI;GAEtB;;;AAjCL,AAkCI,cAlCU,CAkCV,SAAS,CAAC;EACN,UAAU,EAAE,MAAM;EAClB,SAAS,EAAE,KAAK;CAWnB;;AAVG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EArChD,AAkCI,cAlCU,CAkCV,SAAS,CAAC;IAIF,SAAS,EAAE,IAAI;GAStB;;;AAPG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EAxChD,AAkCI,cAlCU,CAkCV,SAAS,CAAC;IAOF,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,MAAM;GAKxB;;;AAHG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,MAAM;EA5CjD,AAkCI,cAlCU,CAkCV,SAAS,CAAC;IAWF,SAAS,EAAE,MAAM;GAExB;;;AA/CL,AAgDI,cAhDU,CAgDV,SAAS,CAAC;EACN,UAAU,EAAE,MAAM;CACrB;;AAlDL,AAmDI,cAnDU,CAmDV,KAAK,CAAC;EACF,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,IAAI;CAIpB;;AAHG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EAtDhD,AAmDI,cAnDU,CAmDV,KAAK,CAAC;IAIE,UAAU,EAAE,IAAI;GAEvB;;;AAzDL,AA0DI,cA1DU,CA0DV,EAAE,CAAC;EACC,UAAU,EAAE,IAAI;EAChB,aAAa,EAAE,GAAG;EAClB,MAAM,EAAE,cAAc;CACzB;;AAEL,AAAA,MAAM,CAAC;EACL,MAAM,EAAE,UAAU;CAWnB;;AAZD,AAEE,MAFI,CAEJ,KAAK,EAFP,MAAM,CAEG,SAAS,EAFlB,MAAM,CAEc,MAAM,EAF1B,MAAM,CAEsB,YAAY,EAFxC,MAAM,CAEoC,SAAS,CAAC;EAC9C,UAAU,EAAE,MAAM;CACrB;;AAJH,AAKE,MALI,CAKJ,CAAC,CAAC;EACE,eAAe,EAAE,IAAI;CAKxB;;AAXH,AAOM,MAPA,CAKJ,CAAC,AAEI,MAAM,CAAC;EACJ,eAAe,EAAE,IAAI;EACrB,KAAK,EAAE,OAAiB;CAC3B;;AAGP,AACI,KADC,CACD,KAAK,EADT,KAAK,CACM,SAAS,EADpB,KAAK,CACiB,MAAM,EAD5B,KAAK,CACyB,YAAY,CAAC,SAAS,CAAC;EAC7C,UAAU,EAAE,IAAI;CACnB;;AAEL,AAAA,MAAM,CAAC;EACH,UAAU,EAAE,IAAI;CACnB;;AACD,AAAA,EAAE,CAAC;EACC,UAAU,EAAE,IAAI;CACnB;;AACD,AAAA,eAAe,CAAC;EACZ,UAAU,EAAE,IAAI;EAChB,UAAU,EAAE,MAAM;CAoBrB;;AAtBD,AAGI,eAHW,CAGX,QAAQ,CAAC;EACL,SAAS,EAAE,IAAI;CAOlB;;AANG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EALhD,AAGI,eAHW,CAGX,QAAQ,CAAC;IAGD,SAAS,EAAE,MAAM;GAKxB;;;AAHG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EARhD,AAGI,eAHW,CAGX,QAAQ,CAAC;IAMD,SAAS,EAAE,MAAM;GAExB;;;AAXL,AAYI,eAZW,CAYX,MAAM,CAAC;EACH,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,IAAI;CAOlB;;AANG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EAfhD,AAYI,eAZW,CAYX,MAAM,CAAC;IAIC,SAAS,EAAE,MAAM;GAKxB;;;AAHG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EAlBhD,AAYI,eAZW,CAYX,MAAM,CAAC;IAOC,SAAS,EAAE,MAAM;GAExB;;;AAEL,AAAA,KAAK,CAAC;EACF,OAAO,EAAE,IAAI;CAuChB;;AAtCG,MAAM,MAAM,MAAM,MAAM,SAAS,EAAE,KAAK;EAF5C,AAAA,KAAK,CAAC;IAGE,UAAU,EAAE,IAAI;IAChB,OAAO,EAAE,YAAY;GAoC5B;;;AAxCD,AAMI,KANC,CAMD,MAAM,CAAC;EACH,MAAM,EAAE,YAAY;EACpB,KAAK,EAAE,IAAI;CASd;;AAjBL,AASQ,KATH,CAMD,MAAM,CAGF,CAAC,CAAC;EACA,KAAK,EAAE,IAAI;EACX,KAAK,EAAE,IAAI;EACX,eAAe,EAAE,IAAI;CAItB;;AAhBT,AAaU,KAbL,CAMD,MAAM,CAGF,CAAC,AAIE,MAAM,CAAC;EACJ,KAAK,EAAE,OAAiB;CAC3B;;AAfX,AAkBI,KAlBC,CAkBD,EAAE,CAAC;EACC,MAAM,EAAE,KAAK;CAChB;;AApBL,AAqBI,KArBC,CAqBD,EAAE,CAAC;EACC,eAAe,EAAE,IAAI;EACrB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;CAeb;;AAvCL,AAyBQ,KAzBH,CAqBD,EAAE,CAIE,EAAE,CAAC;EACC,OAAO,EAAE,KAAK;CAYjB;;AAtCT,AA2BY,KA3BP,CAqBD,EAAE,CAIE,EAAE,CAEE,CAAC,CAAC;EACE,KAAK,EAAE,IAAI;EACX,KAAK,EAAE,IAAI;EACX,eAAe,EAAE,IAAI;CAIxB;;AAlCb,AA+BgB,KA/BX,CAqBD,EAAE,CAIE,EAAE,CAEE,CAAC,AAII,MAAM,CAAC;EACJ,KAAK,EAAE,OAAiB;CAC3B;;AAjCjB,AAmCY,KAnCP,CAqBD,EAAE,CAIE,EAAE,AAUG,OAAO,GAAG,CAAC,CAAC;EACT,KAAK,EAAE,OAAiB;CAC3B;;AAIb,AAAA,KAAK,CAAC;EACF,WAAW,EAAE,sDAAsD;EACnE,sBAAsB,EAAE,WAAW;EACnC,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,MAAM;EAClB,YAAY,EAAE,MAAM;EACpB,WAAW,EAAE,GAAG;EAChB,OAAO,EAAE,YAAY;EACrB,gBAAgB,EAAE,IAAI;EACtB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,KAAK;CACjB;;AACD,AAAA,GAAG,CAAC;EACA,OAAO,EAAE,iBAAiB;EAC1B,WAAW,EAAE,sDAAsD;EACnE,sBAAsB,EAAE,WAAW;EACnC,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,MAAM;EAClB,YAAY,EAAE,MAAM;EACpB,WAAW,EAAE,GAAG;EAChB,WAAW,EAAE,IAAI;EACjB,gBAAgB,EAAE,IAAI;EACtB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,IAAI;CACnB;;AACD,AACI,QADI,CACJ,EAAE,AAAA,YAAY,CAAC;EACb,gBAAgB,EAAE,eAAe;CAClC;;AAHL,AAII,QAJI,CAIJ,EAAE,AAAA,WAAW,CAAC;EACZ,gBAAgB,EAAE,kBAAkB;CACrC;;AANL,AAOI,QAPI,CAOJ,EAAE,CAAC;EACD,WAAW,EAAE,GAAG;EAChB,YAAY,EAAE,IAAI;CACnB;;AAVL,AAWI,QAXI,CAWJ,GAAG,CAAC;EACF,gBAAgB,EAAE,KAAK;CAKxB;;AAjBL,AAaM,QAbE,CAWJ,GAAG,CAED,GAAG,CAAC;EACF,gBAAgB,EAAE,OAAO;CAE1B;;AAGP,AAAA,MAAM,CAAC;EACH,gBAAgB,EAAE,IAAI;EACtB,UAAU,EAAE,IAAI;EAChB,WAAW,EAAE,IAAI;EACjB,cAAc,EAAE,IAAI;EACpB,QAAQ,EAAE,QAAQ;CAIrB;;AATD,AAMI,MANE,CAMF,CAAC,CAAC;EACE,KAAK,EAAE,IAAI;CACd", "sources": [ "styles.scss" ], diff --git a/docs/styles.scss b/docs/styles.scss index 1f0ebd1..b63d3fc 100644 --- a/docs/styles.scss +++ b/docs/styles.scss @@ -407,7 +407,23 @@ pre { text-align: left; } .example { - background-color: unset; + td:first-child { + background-color: #fff !important; + } + td:last-child { + background-color: #f8faff !important; + } + h5 { + padding-top: 5px; + padding-left: 10px; + } + pre { + background-color: unset; + .js { + background-color: #f0f0f4; + + } + } } footer { background-color: #eee; diff --git a/docs/system.html b/docs/system.html index ab3160f..2a29dbd 100644 --- a/docs/system.html +++ b/docs/system.html @@ -135,6 +135,23 @@ SKU number + + + +
Example
+ 
const si = require('systeminformation');
+si.system().then(data => console.log(data));
+
+{
+  manufacturer: 'Apple Inc.',
+  model: 'MacBookPro13,2',
+  version: '1.0',
+  serial: 'C01xxxxxxxx',
+  uuid: 'F87654-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+  sku: 'Mac-99878xxxx...'
+}
+
+ si.bios(cb) {...} @@ -185,6 +202,20 @@ revision + + + +
Example
+ 
const si = require('systeminformation');
+si.bios().then(data => console.log(data));
+
+{
+  vendor: 'American Megatrends Inc.',
+  version: 'P4.20',
+  releaseDate: '2019-09-05',
+  revision: '5.13'
+}
+ si.baseboard(cb) {...} @@ -245,6 +276,21 @@ asset tag + + + +
Example
+ 
const si = require('systeminformation');
+si.baseboard().then(data => console.log(data));
+
+{
+  manufacturer: 'ASRock',
+  model: 'H310M-STX',
+  version: '',
+  serial: 'C80-xxxxxxxxxxx',
+  assetTag: ''
+}
+ si.chassis(cb) {...} @@ -325,6 +371,24 @@ SKU number + + + +
Example
+ 
const si = require('systeminformation');
+si.chassis().then(data => console.log(data));
+
+{
+  manufacturer: 'Apple Inc.',
+  model: 'MacBookPro13,2',
+  type: '',
+  version: '1.0',
+  serial: 'C01xxxxxxxx',
+  assetTag: 'Mac-99878xxxx...',
+  sku: ''
+}
+
+ From 1d1bf0a7c9f570423037452d39fc8b5732549d30 Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Sat, 15 Feb 2020 22:19:24 +0100 Subject: [PATCH 4/6] updated docs --- README.md | 4 +++ docs/battery.html | 3 +- docs/cpu.html | 3 +- docs/graphics.html | 38 ++++++++++++++++++++ docs/index.html | 3 +- docs/os.html | 89 ++++++++++++++++++++++++++++++++++++++++++++++ docs/system.html | 5 ++- package.json | 4 +++ 8 files changed, 141 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a65c4c2..d286a6f 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ [![Code Quality: Javascript][lgtm-badge]][lgtm-badge-url] [![Total alerts][lgtm-alerts]][lgtm-alerts-url] [![Caretaker][caretaker-image]][caretaker-url] + [![Sponsoring][sponsor-badge]][sponsor-url] [![MIT license][license-img]][license-url] This is amazing. Started as a small project just for myself, it now has > 9,000 lines of code, > 250 versions published, up to 1 mio downloads per month, > 4 mio downloads overall. Thank you to all who contributed to this project! @@ -850,6 +851,9 @@ All other trademarks are the property of their respective owners. [lgtm-alerts]: https://img.shields.io/lgtm/alerts/g/sebhildebrandt/systeminformation.svg?style=flat-square [lgtm-alerts-url]: https://lgtm.com/projects/g/sebhildebrandt/systeminformation/alerts +[sponsor-badge]: https://img.shields.io/badge/-Buy%20me%20a%20coffee-blue?style=flat-square +[sponsor-url]: https://www.buymeacoffee.com/systeminfo + [license-url]: https://github.com/sebhildebrandt/systeminformation/blob/master/LICENSE [license-img]: https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square [npmjs-license]: https://img.shields.io/npm/l/systeminformation.svg?style=flat-square diff --git a/docs/battery.html b/docs/battery.html index 843afcd..b7f4f0a 100644 --- a/docs/battery.html +++ b/docs/battery.html @@ -248,8 +248,7 @@ si.battery().then(data => console.log(data)); model: '', manufacturer: 'Apple', serial: 'F9Y19860Y9AH9XBAX' -} - +} diff --git a/docs/cpu.html b/docs/cpu.html index bf7aed0..27b5edd 100644 --- a/docs/cpu.html +++ b/docs/cpu.html @@ -311,8 +311,7 @@ si.cpu().then(data => console.log(data)); socket: 'LGA1151', cache: { l1d: 262144, l1i: 262144, l2: 2, l3: 16 }, flags: 'fpu vme de pse ...' -} - +} si.cpuFlags(cb) diff --git a/docs/graphics.html b/docs/graphics.html index abbde72..91e6d19 100644 --- a/docs/graphics.html +++ b/docs/graphics.html @@ -295,6 +295,44 @@ current refresh rate + + + +
Example
+ 
const si = require('systeminformation');
+si.graphics().then(data => console.log(data));
+ 
+{
+  controllers: [
+    {
+      vendor: 'Intel',
+      model: 'Intel Iris Plus Graphics 655',
+      bus: 'Built-In',
+      vram: 1536,
+      vramDynamic: true
+    }
+  ],
+  displays: [
+    {
+      vendor: '',
+      model: 'Color LCD',
+      main: true,
+      builtin: false,
+      connection: 'Internal',
+      sizex: -1,
+      sizey: -1,
+      pixeldepth: 24,
+      resolutionx: 2560,
+      resolutiony: 1600,
+      currentResX: 2560,
+      currentResY: 1600,
+      positionX: 0,
+      positionY: 0,
+      currentRefreshRate: -1
+    }
+  ]
+}
+ diff --git a/docs/index.html b/docs/index.html index b85b05b..0bafd8a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -172,7 +172,8 @@
- Read Documentation
+ +
Read Documentation
diff --git a/docs/os.html b/docs/os.html index ca1b442..2cf23c5 100644 --- a/docs/os.html +++ b/docs/os.html @@ -205,6 +205,29 @@ OS uses UEFI on startup + + + +
Example
+ 
const si = require('systeminformation');
+si.osInfo().then(data => console.log(data));
+ 
+{
+  platform: 'darwin',
+  distro: 'Mac OS X',
+  release: '10.15.3',
+  codename: 'macOS Catalina',
+  kernel: '19.3.0',
+  arch: 'x64',
+  hostname: 'hostname.local',
+  codepage: 'UTF-8',
+  logofile: 'apple',
+  serial: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX',
+  build: '19D76',
+  servicepack: '',
+  uefi: true
+}
+ si.uuid(cb) {...} @@ -525,6 +548,46 @@ X virtualbox version + + + +
Example
+ 
const si = require('systeminformation');
+si.versions().then(data => console.log(data));
+ 
+{
+  kernel: '19.3.0',
+  openssl: '1.1.1d',
+  systemOpenssl: '2.8.3',
+  systemOpensslLib: 'LibreSSL',
+  node: '13.8.0',
+  v8: '7.9.317.25-node.28',
+  npm: '6.13.6',
+  yarn: '',
+  pm2: '',
+  gulp: '',
+  grunt: '',
+  git: '2.21.1',
+  tsc: '3.7.5',
+  mysql: 'gpl)',
+  redis: '',
+  mongodb: '',
+  apache: '2.4.41 (Unix)',
+  nginx: '',
+  php: '7.3.11',
+  docker: '19.03.5',
+  postfix: '3.2.2',
+  postgresql: '12.1',
+  perl: '5.18.4',
+  python: '2.7.16',
+  python3: '3.7.3',
+  pip: '',
+  pip3: '19.0.3',
+  java: '',
+  gcc: '4.2.1',
+  virtualbox: ''
+}
+ si.users(cb) [{...}] @@ -595,6 +658,32 @@ X last command or shell + + + +
Example
+ 
const si = require('systeminformation');
+si.users().then(data => console.log(data));
+ 
+[
+  {
+    user: 'yourname',
+    tty: 'ttys006',
+    date: '2020-02-01',
+    time: '21:20',
+    ip: '',
+    command: 'w -ih'
+  },
+  {
+    user: 'othername',
+    tty: 'ttys008',
+    date: '2020-02-01',
+    time: '21:20',
+    ip: '',
+    command: '-bash'
+  }
+]
+ diff --git a/docs/system.html b/docs/system.html index 2a29dbd..f76a6e2 100644 --- a/docs/system.html +++ b/docs/system.html @@ -289,7 +289,7 @@ si.baseboard().then(data => console.log(data)); version: '', serial: 'C80-xxxxxxxxxxx', assetTag: '' -} +} si.chassis(cb) @@ -386,8 +386,7 @@ si.chassis().then(data => console.log(data)); serial: 'C01xxxxxxxx', assetTag: 'Mac-99878xxxx...', sku: '' -} - +} diff --git a/package.json b/package.json index c135996..59aadd9 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,10 @@ "type": "git", "url": "https://github.com/sebhildebrandt/systeminformation.git" }, + "funding": { + "type": "Buy me a coffee", + "url": "https://www.buymeacoffee.com/systeminfo" + }, "os": [ "darwin", "linux", From 3c0052beccc779dcc966aadfd57fee7f119faefb Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Sun, 16 Feb 2020 17:58:27 +0100 Subject: [PATCH 5/6] versions() fixed mysql version (macOS), services() pid as integer --- CHANGELOG.md | 1 + README.md | 2 +- docs/history.html | 7 ++- docs/index.html | 2 +- docs/processes.html | 128 +++++++++++++++++++++++++++++++++++++++++++- lib/osinfo.js | 14 +++-- lib/processes.js | 5 +- 7 files changed, 151 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c347228..d492634 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ For major (breaking) changes - version 3 and 2 see end of page. | Version | Date | Comment | | -------------- | -------------- | -------- | +| 4.21.3 | 2020-02-16 | `versions()` fixed mysql version (macOS) | | 4.21.2 | 2020-02-11 | `networkConnections()` fixed linux (debian) issue | | 4.21.1 | 2020-01-31 | `networkGatewayDefault()` fixed windows 7 issue | | 4.21.0 | 2020-01-27 | `npx` compatibility | diff --git a/README.md b/README.md index d286a6f..f1c5649 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ [![Sponsoring][sponsor-badge]][sponsor-url] [![MIT license][license-img]][license-url] -This is amazing. Started as a small project just for myself, it now has > 9,000 lines of code, > 250 versions published, up to 1 mio downloads per month, > 4 mio downloads overall. Thank you to all who contributed to this project! +This is amazing. Started as a small project just for myself, it now has > 9,000 lines of code, > 250 versions published, up to 1 mio downloads per month, > 5 mio downloads overall. Thank you to all who contributed to this project! ## New Version 4.0 diff --git a/docs/history.html b/docs/history.html index 974c0f3..d2af45c 100644 --- a/docs/history.html +++ b/docs/history.html @@ -83,9 +83,14 @@ + + 4.21.3 + 2020-02-16 + versions() fixed versions mysql (macOS) + 4.21.2 - 2020-01-31 + 2020-02-11 networkConnections() fixed linux (debian) issue diff --git a/docs/index.html b/docs/index.html index 0bafd8a..f29e218 100644 --- a/docs/index.html +++ b/docs/index.html @@ -168,7 +168,7 @@
systeminformation
-
Current Version: 4.21.2
+
Current Version: 4.21.3
diff --git a/docs/processes.html b/docs/processes.html index d5c734c..41a5748 100644 --- a/docs/processes.html +++ b/docs/processes.html @@ -165,6 +165,46 @@ X current loads per CPU in % + raw ticks + + + +
Example
+ 
const si = require('systeminformation');
+si.currentLoad().then(data => console.log(data));
+
+{
+  avgload: 0.23,
+  currentload: 4.326328800988875,
+  currentload_user: 2.595797280593325,
+  currentload_system: 1.73053152039555,
+  currentload_nice: 0,
+  currentload_idle: 95.67367119901112,
+  currentload_irq: 0,
+  raw_currentload: 350,
+  raw_currentload_user: 210,
+  raw_currentload_system: 140,
+  raw_currentload_nice: 0,
+  raw_currentload_idle: 7740,
+  raw_currentload_irq: 0,
+  cpus: [
+    {
+      load: 13.725490196078432,
+      load_user: 7.8431372549019605,
+      load_system: 5.88235294117647,
+      load_nice: 0,
+      load_idle: 86.27450980392157,
+      load_irq: 0,
+      raw_load: 140,
+      raw_load_user: 80,
+      raw_load_system: 60,
+      raw_load_nice: 0,
+      raw_load_idle: 880,
+      raw_load_irq: 0
+    },
+    ...
+  ]
+}
+ si.fullLoad(cb) : integer @@ -425,8 +465,46 @@ X process path + + + +
Example
+ 
const si = require('systeminformation');
+si.processes().then(data => console.log(data));
+
+{
+  all: 258,
+  running: 1,
+  blocked: 0,
+  sleeping: 157,
+  unknown: 0,
+  list: [
+    {
+      pid: 1,
+      parentPid: 0,
+      name: 'init',
+      pcpu: 0.04504576931569955,
+      pcpuu: 0.04084113255431208,
+      pcpus: 0.00420463676138747,
+      pmem: 0,
+      priority: 19,
+      mem_vsz: 166144,
+      mem_rss: 10684,
+      nice: 0,
+      started: '2020-02-08 10:18:15',
+      state: 'sleeping',
+      tty: '',
+      user: 'root',
+      command: 'init',
+      params: '',
+      path: '/sbin'
+    },
+    ...
+  ]
+}
+ - si.processLoad('apache2',cb) + si.processLoad('nginx',cb) {...} X X @@ -485,6 +563,28 @@ process % MEM + + + +
Example
+ 
const si = require('systeminformation');
+si.processLoad('nginx').then(data => console.log(data));
+
+{
+  proc: 'nginx',
+  pid: 11267,
+  pids: [
+    11251, 11252, 11253,
+    11254, 11255, 11256,
+    11257, 11258, 11259,
+    11260, 11261, 11262,
+    11263, 11264, 11265,
+    11266, 11267
+  ],
+  cpu: 0.01,
+  mem: 0
+}
+ si.services('mysql, apache2', cb) [{...}] @@ -555,6 +655,32 @@ process % MEM + + + +
Example
+ 
const si = require('systeminformation');
+si.services('mysql, postgres').then(data => console.log(data));
+
+[
+  {
+    name: 'mysql',
+    running: true,
+    startmode: '',
+    pids: [ 152 ],
+    pcpu: 0.3,
+    pmem: 0
+  },
+  {
+    name: 'postgres',
+    running: true,
+    startmode: '',
+    pids: [ 1087, 1873 ],
+    pcpu: 0,
+    pmem: 0
+  },
+]
+

Getting correct stats values

diff --git a/lib/osinfo.js b/lib/osinfo.js index bc3814a..45b6625 100644 --- a/lib/osinfo.js +++ b/lib/osinfo.js @@ -492,9 +492,17 @@ function versions(callback) { exec('mysql -V', function (error, stdout) { if (!error) { let mysql = stdout.toString().split('\n')[0] || ''; - mysql = (mysql.toLowerCase().split(',')[0] || '').trim(); - const parts = mysql.split(' '); - result.mysql = (parts[parts.length - 1] || '').trim(); + mysql = mysql.toLowerCase(); + if (mysql.indexOf(',') > -1) { + mysql = (mysql.split(',')[0] || '').trim(); + const parts = mysql.split(' '); + result.mysql = (parts[parts.length - 1] || '').trim(); + } else { + if (mysql.indexOf(' ver ') > -1) { + mysql = mysql.split(' ver ')[1]; + result.mysql = mysql.split(' ')[0]; + } + } } functionProcessed(); }); diff --git a/lib/processes.js b/lib/processes.js index 0249b14..2938e5a 100644 --- a/lib/processes.js +++ b/lib/processes.js @@ -135,7 +135,10 @@ function services(srv, callback) { let singleSrv = allSrv.filter(item => { return item.name === srv; }); const pids = []; for (const p of ps) { - pids.push(p.trim().split(' ')[2]); + const pid = p.trim().split(' ')[2]; + if (pid) { + pids.push(parseInt(pid, 10)); + } } result.push({ name: srv, From 56d5ac7fa51393c2dbfa23ea45780f684d18f838 Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Sun, 16 Feb 2020 17:58:35 +0100 Subject: [PATCH 6/6] 4.21.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 59aadd9..51e883c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "systeminformation", - "version": "4.21.2", + "version": "4.21.3", "description": "Simple system and OS information library", "license": "MIT", "author": "Sebastian Hildebrandt (https://plus-innovations.com)",