systeminformation 5.32.0 → 5.33.1

package/README.md

@@ -163,7 +163,8 @@ si.cpu()
 
 (last 7 major and minor version releases)
 
-- Version 5.32.0: `graphics()` added temperature values (macOS), `dockerContainer()` addes labels
+- Version 5.33.0: `dockerContainer()` added status (healtthy, ...)
+- Version 5.32.0: `graphics()` added temperature values (macOS), `dockerContainers()` added labels
 - Version 5.31.0: `diskLayout()` added smartmontools support (macOS)
 - Version 5.30.0: `processes()` added user (windows) - needed to be reverted
 - Version 5.29.0: `osInfo()` added OS code name (windows)
@@ -831,6 +832,7 @@ Full function reference with examples can be found at
 |                                     | [0].createdAt       | X                                   | X   | X   | X   | X   | creation date time string                                                                                     |
 |                                     | [0].startedAt       | X                                   | X   | X   | X   | X   | creation date time string                                                                                     |
 |                                     | [0].finishedAt      | X                                   | X   | X   | X   | X   | creation date time string                                                                                     |
+|                                     | [0].status          | X                                   | X   | X   | X   | X   | healthy, starting, unhealthy                                                                                  |
 |                                     | [0].state           | X                                   | X   | X   | X   | X   | created, running, exited                                                                                      |
 |                                     | [0].labels          | X                                   | X   | X   | X   | X   | object of labels (key-value pairs)                                                                            |
 |                                     | [0].ports           | X                                   | X   | X   | X   | X   | array of ports                                                                                                |

package/lib/docker.js

@@ -315,6 +315,7 @@ function dockerContainerInspect(containerID, payload) {
               createdAt: data.Created ? data.Created : '',
               startedAt: data.State && data.State.StartedAt ? data.State.StartedAt : '',
               finishedAt: data.State && data.State.FinishedAt && !data.State.FinishedAt.startsWith('0001-01-01') ? data.State.FinishedAt : '',
+              status: data.State && data.State.Health && data.State.Health.Status ? data.State.Health.Status : '',
               state: payload.State,
               restartCount: data.RestartCount || 0,
               platform: data.Platform || '',

package/lib/index.d.ts

@@ -5,7 +5,6 @@
 /// <reference types="node" />
 
 export namespace Systeminformation {
-
   // 1. General
 
   interface TimeData {
@@ -225,7 +224,7 @@ export namespace Systeminformation {
     nvme_pci_vendor?: {
       id: number;
       subsystem_id: number;
-    },
+    };
     nvme_smart_health_information_log?: {
       critical_warning?: number;
       temperature?: number;
@@ -245,11 +244,11 @@ export namespace Systeminformation {
       warning_temp_time?: number;
       critical_comp_time?: number;
       temperature_sensors?: number[];
-    },
+    };
     user_capacity?: {
       blocks: number;
       bytes: number;
-    },
+    };
     logical_block_size?: number;
     temperature: {
       current: number;
@@ -758,6 +757,7 @@ export namespace Systeminformation {
     createdAt: string;
     startedAt: string;
     finishedAt: string;
+    status: string;
     state: string;
     restartCount: number;
     platform: string;
@@ -997,10 +997,7 @@ export function networkInterfaces(): Promise<Systeminformation.NetworkInterfaces
 export function networkInterfaces(defaultString: 'default'): Promise<Systeminformation.NetworkInterfacesData>;
 export function networkInterfaces(rescan: boolean): Promise<Systeminformation.NetworkInterfacesData[]>;
 export function networkInterfaces(
-  cb:
-    | ((data: Systeminformation.NetworkInterfacesData[] | Systeminformation.NetworkInterfacesData) => any)
-    | boolean
-    | string,
+  cb: ((data: Systeminformation.NetworkInterfacesData[] | Systeminformation.NetworkInterfacesData) => any) | boolean | string,
   rescan?: boolean,
   defaultString?: string
 ): Promise<Systeminformation.NetworkInterfacesData[] | Systeminformation.NetworkInterfacesData>;

package/lib/network.js

@@ -1321,17 +1321,18 @@ function networkStatsSingle(iface) {
         if (sections[i].trim() !== '') {
           const lines = sections[i].trim().split('\r\n');
           perfData.push({
-            name: util
-              .getValue(lines, 'Name', ':')
+            name: util.getValue(lines, 'Name', ':').toLowerCase(),
+            desc: util
+              .getValue(lines, 'InterfaceDescription', ':')
               .replace(/[()[\] ]+/g, '')
               .replace(/#|\//g, '_')
               .toLowerCase(),
-            rx_bytes: parseInt(util.getValue(lines, 'BytesReceivedPersec', ':'), 10),
-            rx_errors: parseInt(util.getValue(lines, 'PacketsReceivedErrors', ':'), 10),
-            rx_dropped: parseInt(util.getValue(lines, 'PacketsReceivedDiscarded', ':'), 10),
-            tx_bytes: parseInt(util.getValue(lines, 'BytesSentPersec', ':'), 10),
-            tx_errors: parseInt(util.getValue(lines, 'PacketsOutboundErrors', ':'), 10),
-            tx_dropped: parseInt(util.getValue(lines, 'PacketsOutboundDiscarded', ':'), 10)
+            rx_bytes: parseInt(util.getValue(lines, 'ReceivedBytes', ':'), 10),
+            rx_errors: parseInt(util.getValue(lines, 'ReceivedPacketErrors', ':'), 10),
+            rx_dropped: parseInt(util.getValue(lines, 'ReceivedDiscardedPackets', ':'), 10),
+            tx_bytes: parseInt(util.getValue(lines, 'SentBytes', ':'), 10),
+            tx_errors: parseInt(util.getValue(lines, 'OutboundPacketErrors', ':'), 10),
+            tx_dropped: parseInt(util.getValue(lines, 'OutboundDiscardedPackets', ':'), 10)
           });
         }
       }
@@ -1480,7 +1481,7 @@ function networkStatsSingle(iface) {
           // Performance Data
           util
             .powerShell(
-              'Get-CimInstance Win32_PerfRawData_Tcpip_NetworkInterface | select Name,BytesReceivedPersec,PacketsReceivedErrors,PacketsReceivedDiscarded,BytesSentPersec,PacketsOutboundErrors,PacketsOutboundDiscarded | fl'
+              'Get-NetAdapterStatistics | select Name,InterfaceDescription,ReceivedBytes,ReceivedPacketErrors,ReceivedDiscardedPackets,SentBytes,OutboundPacketErrors,OutboundDiscardedPackets | fl'
             )
             .then((stdout, error) => {
               if (!error) {
@@ -1508,10 +1509,11 @@ function networkStatsSingle(iface) {
                             .replace(/[()[\] ]+/g, '')
                             .replace('#', '_')
                             .toLowerCase()) &&
-                      det.ifaceName
-                        .replace(/[()[\] ]+/g, '')
-                        .replace(/#|\//g, '_')
-                        .toLowerCase() === detail.name
+                      (det.iface.toLowerCase() === detail.name ||
+                        det.ifaceName
+                          .replace(/[()[\] ]+/g, '')
+                          .replace(/#|\//g, '_')
+                          .toLowerCase() === detail.desc)
                     ) {
                       ifaceName = det.iface;
                       rx_bytes = detail.rx_bytes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systeminformation",
-  "version": "5.32.0",
+  "version": "5.33.1",
   "description": "Advanced, lightweight system and OS information library",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",