systeminformation 6.0.0-beta.20 → 6.0.0-beta.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/docker.js +4 -5
- package/dist/linux/disks-io.js +1 -1
- package/dist/linux/fs-stats.js +5 -2
- package/dist/observe.d.ts +1 -1
- package/dist/observe.js +5 -1
- package/package.json +1 -1
package/dist/docker.js
CHANGED
|
@@ -505,9 +505,9 @@ const dockerAll = async () => {
|
|
|
505
505
|
await (0, common_1.nextTick)();
|
|
506
506
|
const result = await (0, exports.dockerContainers)(true);
|
|
507
507
|
if (result && Object.prototype.toString.call(result) === '[object Array]' && result.length > 0) {
|
|
508
|
-
result.
|
|
508
|
+
await Promise.all(result.map(async (element) => {
|
|
509
509
|
const res = await (0, exports.dockerContainerStats)(element.id);
|
|
510
|
-
if (res) {
|
|
510
|
+
if (res && res[0]) {
|
|
511
511
|
element.memUsage = res[0].memUsage;
|
|
512
512
|
element.memLimit = res[0].memLimit;
|
|
513
513
|
element.memPercent = res[0].memPercent;
|
|
@@ -520,9 +520,8 @@ const dockerAll = async () => {
|
|
|
520
520
|
element.memoryStats = res[0].memoryStats;
|
|
521
521
|
element.networks = res[0].networks;
|
|
522
522
|
}
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
});
|
|
523
|
+
element.processes = await (0, exports.dockerContainerProcesses)(element.id);
|
|
524
|
+
}));
|
|
526
525
|
return result;
|
|
527
526
|
}
|
|
528
527
|
else {
|
package/dist/linux/disks-io.js
CHANGED
|
@@ -18,7 +18,7 @@ const disksIO = async () => {
|
|
|
18
18
|
let wWaitTime = 0;
|
|
19
19
|
let tWaitTime = 0;
|
|
20
20
|
try {
|
|
21
|
-
const disks = (await (0, promises_1.readdir)('/sys/block')).filter((dev) => !/^(loop|ram|dm-|md|sr|fd|nbd)/.test(dev) && (0, security_1.isSafePathSegment)(dev));
|
|
21
|
+
const disks = (await (0, promises_1.readdir)('/sys/block')).filter((dev) => !/^(loop|ram|zram|dm-|md|sr|fd|nbd|zd)/.test(dev) && (0, security_1.isSafePathSegment)(dev));
|
|
22
22
|
const lines = await Promise.all(disks.map((dev) => (0, files_1.readSysfs)(`/sys/block/${dev}/stat`)));
|
|
23
23
|
lines.forEach(function (line) {
|
|
24
24
|
if (!line) {
|
package/dist/linux/fs-stats.js
CHANGED
|
@@ -17,8 +17,11 @@ const fsStats = async () => {
|
|
|
17
17
|
let rx = 0;
|
|
18
18
|
let wx = 0;
|
|
19
19
|
try {
|
|
20
|
-
({ stdout } = await (0, exec_1.exec)('lsblk -
|
|
21
|
-
const lines = stdout
|
|
20
|
+
({ stdout } = await (0, exec_1.exec)('lsblk -rno KNAME,FSTYPE,MOUNTPOINT 2>/dev/null', const_1.execOptsLinux));
|
|
21
|
+
const lines = stdout
|
|
22
|
+
.toString()
|
|
23
|
+
.split('\n')
|
|
24
|
+
.filter((line) => (line.indexOf('/') >= 0 || / zfs_member( |$)/.test(line)) && !/^zd\d/.test(line));
|
|
22
25
|
const fs_filter = [];
|
|
23
26
|
lines.forEach((line) => {
|
|
24
27
|
if (line !== '') {
|
package/dist/observe.d.ts
CHANGED
package/dist/observe.js
CHANGED
|
@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.observe = void 0;
|
|
4
4
|
const get_1 = require("./get");
|
|
5
5
|
const observe = (valueObject, interval, callback) => {
|
|
6
|
+
if (typeof callback !== 'function') {
|
|
7
|
+
return undefined;
|
|
8
|
+
}
|
|
9
|
+
const ms = Math.min(Math.max(Number(interval) || 0, 500), 2147483647);
|
|
6
10
|
let _data = null;
|
|
7
11
|
return setInterval(() => {
|
|
8
12
|
(0, get_1.get)(valueObject).then((data) => {
|
|
@@ -11,6 +15,6 @@ const observe = (valueObject, interval, callback) => {
|
|
|
11
15
|
callback(data);
|
|
12
16
|
}
|
|
13
17
|
});
|
|
14
|
-
},
|
|
18
|
+
}, ms);
|
|
15
19
|
};
|
|
16
20
|
exports.observe = observe;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "systeminformation",
|
|
3
|
-
"version": "6.0.0-beta.
|
|
3
|
+
"version": "6.0.0-beta.22",
|
|
4
4
|
"description": "Advanced, lightweight system and OS information library",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",
|