systeminformation 5.31.17 → 5.32.0

package/README.md

@@ -163,6 +163,7 @@ si.cpu()
 
 (last 7 major and minor version releases)
 
+- Version 5.32.0: `graphics()` added temperature values (macOS), `dockerContainer()` addes 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)
@@ -404,14 +405,15 @@ Full function reference with examples can be found at
 |                 | ...[0].external           |       |     | X   |     |     | is external GPU                             |
 |                 | ...[0].cores              |       |     | X   |     |     | Apple silicon only                          |
 |                 | ...[0].metalVersion       |       |     | X   |     |     | Apple Metal Version                         |
+|                 | ...[0].temperatureGpu     | X     |     | X   | X   |     | GPU temperature (see notes below)           |
 |                 | displays[]                | X     |     | X   | X   |     | monitor/display array                       |
 |                 | ...[0].vendor             |       |     |     | X   |     | monitor/display vendor                      |
 |                 | ...[0].vendorId           |       |     | X   |     |     | vendor ID                                   |
 |                 | ...[0].deviceName         |       |     |     | X   |     | e.g. \\\\.\\DISPLAY1                        |
 |                 | ...[0].model              | X     |     | X   | X   |     | monitor/display model                       |
-|                 | ...[0].productionYear     |       |     | X   |     |     | production year                             |
-|                 | ...[0].serial             |       |     | X   |     |     | serial number                               |
-|                 | ...[0].displayId          |       |     | X   |     |     | display ID                                  |
+|                 | ...[0].productionYear     |       |     | X   | X   |     | production year                             |
+|                 | ...[0].serial             |       |     | X   | X   |     | serial number                               |
+|                 | ...[0].displayId          |       |     | X   | X   |     | display ID                                  |
 |                 | ...[0].main               | X     |     | X   | X   |     | true if main monitor                        |
 |                 | ...[0].builtin            | X     |     | X   |     |     | true if built-in monitor                    |
 |                 | ...[0].connection         | X     |     | X   | X   |     | e.g. DisplayPort or HDMI                    |
@@ -422,8 +424,8 @@ Full function reference with examples can be found at
 |                 | ...[0].resolutionY        | X     |     | X   | X   |     | pixel vertical                              |
 |                 | ...[0].currentResX        | X     |     | X   | X   |     | current pixel horizontal                    |
 |                 | ...[0].currentResY        | X     |     | X   | X   |     | current pixel vertical                      |
-|                 | ...[0].positionX          |       |     | X   | X   |     | display position X                          |
-|                 | ...[0].positionY          |       |     | X   | X   |     | display position Y                          |
+|                 | ...[0].positionX          | X     |     | X   | X   |     | display position X                          |
+|                 | ...[0].positionY          | X     |     | X   | X   |     | display position Y                          |
 |                 | ...[0].currentRefreshRate | X     |     | X   | X   |     | current screen refresh rate                 |
 
 #### 7. Operating System
@@ -434,7 +436,7 @@ Full function reference with examples can be found at
 |                       | platform      | X     | X   | X   | X   | X   | 'linux', 'darwin', 'Windows', ...                                                                                                                  |
 |                       | distro        | X     | X   | X   | X   | X   |                                                                                                                                                    |
 |                       | release       | X     | X   | X   | X   | X   |                                                                                                                                                    |
-|                       | codename      | X     |     | X   | X    |     |   |
+|                       | codename      | X     |     | X   | X   |     |                                                                                                                                                    |
 |                       | kernel        | X     | X   | X   | X   | X   | kernel release - same as os.release()                                                                                                              |
 |                       | arch          | X     | X   | X   | X   | X   | same as os.arch()                                                                                                                                  |
 |                       | hostname      | X     | X   | X   | X   | X   | same as os.hostname()                                                                                                                              |
@@ -830,6 +832,7 @@ Full function reference with examples can be found at
 |                                     | [0].startedAt       | X                                   | X   | X   | X   | X   | creation date time string                                                                                     |
 |                                     | [0].finishedAt      | X                                   | X   | X   | X   | X   | creation date time string                                                                                     |
 |                                     | [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                                                                                                |
 |                                     | [0].mounts          | X                                   | X   | X   | X   | X   | array of mounts                                                                                               |
 | si.dockerContainerStats(ids, cb)    | [{...}]             | X                                   | X   | X   | X   | X   | statistics for specific containers<br>container IDs: space or comma separated,<br>pass '*' for all containers |
@@ -1021,7 +1024,9 @@ $ npm install macos-temperature-sensor --save
 ```
 
 `systeminformation` will then detect this additional library and return the
-temperature when calling systeminformations standard function `cpuTemperature()`
+temperature when calling systeminformations standard function `cpuTemperature()`.
+On Apple Silicon machines `macos-temperature-sensor` also enables the GPU
+temperature (`temperatureGpu`) in the `graphics()` controllers
 
 #### Windows Temperature, Battery, ...
 

package/lib/audio.js

@@ -103,16 +103,17 @@ function getLinuxAudioPci() {
 }
 
 function parseWinAudioStatus(n) {
+  const num = parseInt(n, 10);
   let status = n;
-  if (n === 1) {
+  if (num === 1) {
     status = 'other';
-  } else if (n === 2) {
+  } else if (num === 2) {
     status = 'unknown';
-  } else if (n === 3) {
+  } else if (num === 3) {
     status = 'enabled';
-  } else if (n === 4) {
+  } else if (num === 4) {
     status = 'disabled';
-  } else if (n === 5) {
+  } else if (num === 5) {
     status = 'not applicable';
   }
   return status;

package/lib/battery.js

@@ -100,8 +100,12 @@ module.exports = (callback) =>
         }
 
         if (acPath) {
-          const file = fs.readFileSync(acPath);
-          acConnected = file.toString().trim() === '1';
+          try {
+            const file = fs.readFileSync(acPath);
+            acConnected = file.toString().trim() === '1';
+          } catch {
+            util.noop();
+          }
         }
 
         if (battery_path) {

package/lib/bluetooth.js

@@ -175,8 +175,12 @@ function bluetoothDevices(callback) {
           const macAddr1 = pathParts.length >= 6 ? pathParts[pathParts.length - 2] : null;
           const macAddr2 = pathParts.length >= 7 ? pathParts[pathParts.length - 3] : null;
           if (filename === 'info') {
-            const infoFile = fs.readFileSync(element, { encoding: 'utf8' }).split('\n');
-            result.push(parseLinuxBluetoothInfo(infoFile, macAddr1, macAddr2));
+            try {
+              const infoFile = fs.readFileSync(element, { encoding: 'utf8' }).split('\n');
+              result.push(parseLinuxBluetoothInfo(infoFile, macAddr1, macAddr2));
+            } catch {
+              util.noop();
+            }
           }
         });
         // determine "connected" with hcitool con

package/lib/cpu.js

@@ -979,8 +979,8 @@ function getCpu() {
               }
             }
             _cpu_speed = result.speed;
-            result.speedMin = Math.round(parseFloat(util.getValue(lines, 'cpu min mhz').replace(/,/g, '.')) / 10.0) / 100;
-            result.speedMax = Math.round(parseFloat(util.getValue(lines, 'cpu max mhz').replace(/,/g, '.')) / 10.0) / 100;
+            result.speedMin = Math.round(parseFloat(util.getValue(lines, 'cpu min mhz').replace(/,/g, '.')) / 10.0) / 100 || result.speedMin;
+            result.speedMax = Math.round(parseFloat(util.getValue(lines, 'cpu max mhz').replace(/,/g, '.')) / 10.0) / 100 || result.speedMax;
 
             result = cpuBrandManufacturer(result);
             result.vendor = cpuManufacturer(util.getValue(lines, 'vendor id'));
@@ -1029,18 +1029,22 @@ function getCpu() {
 
             // Test RISC-V
             if (util.getValue(lines, 'architecture') === 'riscv64') {
-              const linesRiscV = fs.readFileSync('/proc/cpuinfo').toString().split('\n');
-              const uarch = util.getValue(linesRiscV, 'uarch') || '';
-              if (uarch.indexOf(',') > -1) {
-                const split = uarch.split(',');
-                result.manufacturer = cpuManufacturer(split[0]);
-                result.brand = split[1];
+              try {
+                const linesRiscV = fs.readFileSync('/proc/cpuinfo').toString().split('\n');
+                const uarch = util.getValue(linesRiscV, 'uarch') || '';
+                if (uarch.indexOf(',') > -1) {
+                  const split = uarch.split(',');
+                  result.manufacturer = cpuManufacturer(split[0]);
+                  result.brand = split[1];
+                }
+              } catch {
+                util.noop();
               }
             }
 
             // socket type
             let lines2 = [];
-            exec('export LC_ALL=C; dmidecode –t 4 2>/dev/null | grep "Upgrade: Socket"; unset LC_ALL', (error2, stdout2) => {
+            exec('export LC_ALL=C; dmidecode -t 4 2>/dev/null | grep "Upgrade: Socket"; unset LC_ALL', (error2, stdout2) => {
               lines2 = stdout2.toString().split('\n');
               if (lines2 && lines2.length) {
                 result.socket = util.getValue(lines2, 'Upgrade').replace('Socket', '').trim() || result.socket;
@@ -1055,7 +1059,7 @@ function getCpu() {
           if (os.cpus()[0] && os.cpus()[0].model) {
             modelline = os.cpus()[0].model;
           }
-          exec('export LC_ALL=C; dmidecode -t 4; dmidecode -t 7 unset LC_ALL', (error, stdout) => {
+          exec('export LC_ALL=C; dmidecode -t 4; dmidecode -t 7; unset LC_ALL', (error, stdout) => {
             let cache = [];
             if (!error) {
               const data = stdout.toString().split('# dmidecode');
@@ -1077,7 +1081,7 @@ function getCpu() {
             }
             _cpu_speed = result.speed;
             result.speedMin = result.speed;
-            result.speedMax = Math.round(parseFloat(util.getValue(lines, 'max speed').replace(/Mhz/g, '')) / 10.0) / 100;
+            result.speedMax = Math.round(parseFloat(util.getValue(lines, 'max speed').replace(/Mhz/g, '')) / 10.0) / 100 || result.speed;
 
             result = cpuBrandManufacturer(result);
             result.vendor = cpuManufacturer(util.getValue(lines, 'manufacturer'));
@@ -1149,7 +1153,7 @@ function getCpu() {
               result = cpuBrandManufacturer(result);
               result.revision = util.getValue(lines, 'revision', ':');
               result.vendor = util.getValue(lines, 'manufacturer', ':');
-              result.speedMax = Math.round(parseFloat(util.getValue(lines, 'maxclockspeed', ':').replace(/,/g, '.')) / 10.0) / 100;
+              result.speedMax = Math.round(parseFloat(util.getValue(lines, 'maxclockspeed', ':').replace(/,/g, '.')) / 10.0) / 100 || result.speedMax;
               if (result.speed === 0 && (result.brand.indexOf('AMD') > -1 || result.brand.toLowerCase().indexOf('ryzen') > -1)) {
                 result.speed = getAMDSpeed(result.brand);
               }
@@ -1440,28 +1444,28 @@ function cpuTemperature(callback) {
 
                   if (section === 'acpi') {
                     // socket temp
-                    if (firstPart.indexOf('TEMP') !== -1) {
+                    if (firstPart.indexOf('TEMP') !== -1 && temps) {
                       result.socket.push(parseFloat(temps));
                     }
                   } else if (section === 'pch') {
                     // chipset temp
-                    if (firstPart.indexOf('TEMP') !== -1 && !result.chipset) {
+                    if (firstPart.indexOf('TEMP') !== -1 && !result.chipset && temps) {
                       result.chipset = parseFloat(temps);
                     }
                   }
                   // cpu temp
-                  if (firstPart.indexOf('PHYSICAL') !== -1 || firstPart.indexOf('PACKAGE') !== -1 || (section === 'coreAMD' && firstPart.indexOf('TDIE') !== -1)) {
+                  if ((firstPart.indexOf('PHYSICAL') !== -1 || firstPart.indexOf('PACKAGE') !== -1 || (section === 'coreAMD' && firstPart.indexOf('TDIE') !== -1)) && temps) {
                     result.main = parseFloat(temps);
                   }
-                  if (firstPart.indexOf('CORE ') !== -1) {
+                  if (firstPart.indexOf('CORE ') !== -1 && temps) {
                     result.cores.push(parseFloat(temps));
                   }
-                  if (firstPart.indexOf('TDIE') !== -1 && tdieTemp === null) {
+                  if (firstPart.indexOf('TDIE') !== -1 && tdieTemp === null && temps) {
                     tdieTemp = parseFloat(temps);
                   }
 
                   // generic temp value from cpuThermal
-                  if (section === 'cpuThermal' && firstPart.indexOf('TEMP') !== -1 && cpuThermalTemp === null) {
+                  if (section === 'cpuThermal' && firstPart.indexOf('TEMP') !== -1 && cpuThermalTemp === null && temps) {
                     cpuThermalTemp = parseFloat(temps);
                   }
                 });
@@ -1509,7 +1513,7 @@ function cpuTemperature(callback) {
                   exec('/opt/vc/bin/vcgencmd measure_temp', (error, stdout) => {
                     if (!error) {
                       const lines = stdout.toString().split('\n');
-                      if (lines.length > 0 && lines[0].indexOf('=')) {
+                      if (lines.length > 0 && lines[0].indexOf('=') !== -1) {
                         result.main = parseFloat(lines[0].split('=')[1]);
                         result.max = result.main;
                       }
@@ -1863,10 +1867,10 @@ function cpuCache(callback) {
             size = size * (unit === 'kb' ? 1024 : unit === 'mb' ? 1024 * 1024 : unit === 'gb' ? 1024 * 1024 * 1024 : 1);
             if (cacheType) {
               if (cacheType === 'l1') {
-                result.cache[cacheType + 'd'] = size / 2;
-                result.cache[cacheType + 'i'] = size / 2;
+                result[cacheType + 'd'] = size / 2;
+                result[cacheType + 'i'] = size / 2;
               } else {
-                result.cache[cacheType] = size;
+                result[cacheType] = size;
               }
             }
           }
@@ -1883,10 +1887,10 @@ function cpuCache(callback) {
             lines.forEach((line) => {
               let parts = line.split(':');
               if (parts[0].toLowerCase().indexOf('hw.l1icachesize') !== -1) {
-                result.l1d = parseInt(parts[1].trim()) * (parts[1].indexOf('K') !== -1 ? 1024 : 1);
+                result.l1i = parseInt(parts[1].trim()) * (parts[1].indexOf('K') !== -1 ? 1024 : 1);
               }
               if (parts[0].toLowerCase().indexOf('hw.l1dcachesize') !== -1) {
-                result.l1i = parseInt(parts[1].trim()) * (parts[1].indexOf('K') !== -1 ? 1024 : 1);
+                result.l1d = parseInt(parts[1].trim()) * (parts[1].indexOf('K') !== -1 ? 1024 : 1);
               }
               if (parts[0].toLowerCase().indexOf('hw.l2cachesize') !== -1) {
                 result.l2 = parseInt(parts[1].trim()) * (parts[1].indexOf('K') !== -1 ? 1024 : 1);
@@ -2085,14 +2089,15 @@ function getLoad() {
           _cpus[i].loadSteal = _cpus[i].steal - tmpSteal;
           _cpus[i].loadGuest = _cpus[i].guest - tmpGuest;
           cores[i] = {};
-          cores[i].load = (_cpus[i].load / _cpus[i].currentTick) * 100;
-          cores[i].loadUser = (_cpus[i].loadUser / _cpus[i].currentTick) * 100;
-          cores[i].loadSystem = (_cpus[i].loadSystem / _cpus[i].currentTick) * 100;
-          cores[i].loadNice = (_cpus[i].loadNice / _cpus[i].currentTick) * 100;
-          cores[i].loadIdle = (_cpus[i].loadIdle / _cpus[i].currentTick) * 100;
-          cores[i].loadIrq = (_cpus[i].loadIrq / _cpus[i].currentTick) * 100;
-          cores[i].loadSteal = (_cpus[i].loadSteal / _cpus[i].currentTick) * 100;
-          cores[i].loadGuest = (_cpus[i].loadGuest / _cpus[i].currentTick) * 100;
+          const coreTick = _cpus[i].currentTick || 1;
+          cores[i].load = (_cpus[i].load / coreTick) * 100;
+          cores[i].loadUser = (_cpus[i].loadUser / coreTick) * 100;
+          cores[i].loadSystem = (_cpus[i].loadSystem / coreTick) * 100;
+          cores[i].loadNice = (_cpus[i].loadNice / coreTick) * 100;
+          cores[i].loadIdle = (_cpus[i].loadIdle / coreTick) * 100;
+          cores[i].loadIrq = (_cpus[i].loadIrq / coreTick) * 100;
+          cores[i].loadSteal = (_cpus[i].loadSteal / coreTick) * 100;
+          cores[i].loadGuest = (_cpus[i].loadGuest / coreTick) * 100;
           cores[i].rawLoad = _cpus[i].load;
           cores[i].rawLoadUser = _cpus[i].loadUser;
           cores[i].rawLoadSystem = _cpus[i].loadSystem;
@@ -2104,7 +2109,7 @@ function getLoad() {
         }
         const totalTick = totalUser + totalSystem + totalNice + totalIrq + totalSteal + totalGuest + totalIdle;
         const totalLoad = totalUser + totalSystem + totalNice + totalIrq + totalSteal + totalGuest;
-        const currentTick = totalTick - _current_cpu.tick;
+        const currentTick = totalTick - _current_cpu.tick || 1;
         result = {
           avgLoad: avgLoad,
           currentLoad: ((totalLoad - _current_cpu.load) / currentTick) * 100,
@@ -2157,12 +2162,15 @@ function getLoad() {
         const cores = [];
         for (let i = 0; i < _corecount; i++) {
           cores[i] = {};
-          cores[i].load = (_cpus[i].load / _cpus[i].currentTick) * 100;
-          cores[i].loadUser = (_cpus[i].loadUser / _cpus[i].currentTick) * 100;
-          cores[i].loadSystem = (_cpus[i].loadSystem / _cpus[i].currentTick) * 100;
-          cores[i].loadNice = (_cpus[i].loadNice / _cpus[i].currentTick) * 100;
-          cores[i].loadIdle = (_cpus[i].loadIdle / _cpus[i].currentTick) * 100;
-          cores[i].loadIrq = (_cpus[i].loadIrq / _cpus[i].currentTick) * 100;
+          const coreTick = _cpus[i].currentTick || 1;
+          cores[i].load = (_cpus[i].load / coreTick) * 100;
+          cores[i].loadUser = (_cpus[i].loadUser / coreTick) * 100;
+          cores[i].loadSystem = (_cpus[i].loadSystem / coreTick) * 100;
+          cores[i].loadNice = (_cpus[i].loadNice / coreTick) * 100;
+          cores[i].loadIdle = (_cpus[i].loadIdle / coreTick) * 100;
+          cores[i].loadIrq = (_cpus[i].loadIrq / coreTick) * 100;
+          cores[i].loadSteal = (_cpus[i].loadSteal / coreTick) * 100;
+          cores[i].loadGuest = (_cpus[i].loadGuest / coreTick) * 100;
           cores[i].rawLoad = _cpus[i].load;
           cores[i].rawLoadUser = _cpus[i].loadUser;
           cores[i].rawLoadSystem = _cpus[i].loadSystem;

package/lib/docker.js

@@ -19,9 +19,8 @@ const DockerSocket = require('./dockerSocket');
 const _platform = process.platform;
 const _windows = _platform === 'win32';
 
-const _docker_container_stats = {};
+const _docker_cpu_last_read = {};
 let _docker_socket;
-let _docker_last_read = 0;
 
 // --------------------------
 // get containers (parameter all: get also inactive/exited containers)
@@ -123,7 +122,9 @@ function dockerImages(all, callback) {
               if (element.Names && Object.prototype.toString.call(element.Names) === '[object Array]' && element.Names.length > 0) {
                 element.Name = element.Names[0].replace(/^\/|\/$/g, '');
               }
-              workload.push(dockerImagesInspect(element.Id.trim(), element));
+              if (element.Id && typeof element.Id === 'string') {
+                workload.push(dockerImagesInspect(element.Id.trim(), element));
+              }
             });
             if (workload.length) {
               Promise.all(workload).then((data) => {
@@ -165,13 +166,13 @@ function dockerImagesInspect(imageID, payload) {
       if (typeof imageID !== 'string') {
         return resolve();
       }
-      const imageIDSanitized = (util.isPrototypePolluted() ? '' : util.sanitizeShellString(imageID, true)).trim();
+      const imageIDSanitized = util.isPrototypePolluted() ? '' : util.sanitizeImageID(imageID);
       if (imageIDSanitized) {
         if (!_docker_socket) {
           _docker_socket = new DockerSocket();
         }
 
-        _docker_socket.inspectImage(imageIDSanitized.trim(), (data) => {
+        _docker_socket.inspectImage(imageIDSanitized, (data) => {
           try {
             resolve({
               id: payload.Id,
@@ -188,8 +189,8 @@ function dockerImagesInspect(imageID, payload) {
               created: data.Created ? Math.round(new Date(data.Created).getTime() / 1000) : 0,
               containerConfig: data.ContainerConfig ? data.ContainerConfig : {},
               graphDriver: data.GraphDriver ? data.GraphDriver : {},
-              repoDigests: data.RepoDigests ? data.RepoDigests : {},
-              repoTags: data.RepoTags ? data.RepoTags : {},
+              repoDigests: data.RepoDigests ? data.RepoDigests : [],
+              repoTags: data.RepoTags ? data.RepoTags : [],
               config: data.Config ? data.Config : {},
               rootFS: data.RootFS ? data.RootFS : {}
             });
@@ -208,14 +209,7 @@ exports.dockerImages = dockerImages;
 
 function dockerContainers(all, callback) {
   function inContainers(containers, id) {
-    const filtered = containers.filter((obj) => {
-      /**
-       * @namespace
-       * @property {string}  Id
-       */
-      return obj.Id && obj.Id === id;
-    });
-    return filtered.length > 0;
+    return containers.some((obj) => obj.Id && obj.Id.indexOf(id) === 0);
   }
 
   // fallback - if only callback is given
@@ -244,11 +238,11 @@ function dockerContainers(all, callback) {
         try {
           docker_containers = data;
           if (docker_containers && Object.prototype.toString.call(docker_containers) === '[object Array]' && docker_containers.length > 0) {
-            // GC in _docker_container_stats
-            for (let key in _docker_container_stats) {
-              if ({}.hasOwnProperty.call(_docker_container_stats, key)) {
+            // GC in _docker_cpu_last_read
+            for (let key in _docker_cpu_last_read) {
+              if ({}.hasOwnProperty.call(_docker_cpu_last_read, key)) {
                 if (!inContainers(docker_containers, key)) {
-                  delete _docker_container_stats[key];
+                  delete _docker_cpu_last_read[key];
                 }
               }
             }
@@ -257,7 +251,9 @@ function dockerContainers(all, callback) {
               if (element.Names && Object.prototype.toString.call(element.Names) === '[object Array]' && element.Names.length > 0) {
                 element.Name = element.Names[0].replace(/^\/|\/$/g, '');
               }
-              workload.push(dockerContainerInspect(element.Id.trim(), element));
+              if (element.Id && typeof element.Id === 'string') {
+                workload.push(dockerContainerInspect(element.Id.trim(), element));
+              }
             });
             if (workload.length) {
               Promise.all(workload).then((data) => {
@@ -279,14 +275,6 @@ function dockerContainers(all, callback) {
             resolve(result);
           }
         } catch (err) {
-          // GC in _docker_container_stats
-          for (let key in _docker_container_stats) {
-            if ({}.hasOwnProperty.call(_docker_container_stats, key)) {
-              if (!inContainers(docker_containers, key)) {
-                delete _docker_container_stats[key];
-              }
-            }
-          }
           if (callback) {
             callback(result);
           }
@@ -307,13 +295,13 @@ function dockerContainerInspect(containerID, payload) {
       if (typeof containerID !== 'string') {
         return resolve();
       }
-      const containerIdSanitized = (util.isPrototypePolluted() ? '' : util.sanitizeShellString(containerID, true)).trim();
+      const containerIdSanitized = util.isPrototypePolluted() ? '' : util.sanitizeContainerID(containerID);
       if (containerIdSanitized) {
         if (!_docker_socket) {
           _docker_socket = new DockerSocket();
         }
 
-        _docker_socket.getInspect(containerIdSanitized.trim(), (data) => {
+        _docker_socket.getInspect(containerIdSanitized, (data) => {
           try {
             resolve({
               id: payload.Id,
@@ -331,6 +319,7 @@ function dockerContainerInspect(containerID, payload) {
               restartCount: data.RestartCount || 0,
               platform: data.Platform || '',
               driver: data.Driver || '',
+              labels: data.Config && data.Config.Labels ? data.Config.Labels : {},
               ports: payload.Ports,
               mounts: payload.Mounts
               // hostconfig: payload.HostConfig,
@@ -352,7 +341,7 @@ exports.dockerContainers = dockerContainers;
 // --------------------------
 // helper functions for calculation of docker stats
 
-function docker_calcCPUPercent(cpu_stats, precpu_stats) {
+function docker_calcCPUPercent(cpu_stats, precpu_stats, id) {
   /**
    * @namespace
    * @property {object}  cpu_usage
@@ -361,42 +350,47 @@ function docker_calcCPUPercent(cpu_stats, precpu_stats) {
    * @property {object}  cpu_usage
    * @property {Array}  cpu_usage.percpu_usage
    */
+  if (!cpu_stats || !cpu_stats.cpu_usage || !precpu_stats) {
+    return 0;
+  }
+  const precpuTotal = precpu_stats.cpu_usage && precpu_stats.cpu_usage.total_usage ? precpu_stats.cpu_usage.total_usage : 0;
 
   if (!_windows) {
     let cpuPercent = 0.0;
     // calculate the change for the cpu usage of the container in between readings
-    let cpuDelta = cpu_stats.cpu_usage.total_usage - precpu_stats.cpu_usage.total_usage;
+    const cpuDelta = cpu_stats.cpu_usage.total_usage - precpuTotal;
     // calculate the change for the entire system between readings
-    let systemDelta = cpu_stats.system_cpu_usage - precpu_stats.system_cpu_usage;
+    const systemDelta = cpu_stats.system_cpu_usage - (precpu_stats.system_cpu_usage || 0);
 
     if (systemDelta > 0.0 && cpuDelta > 0.0) {
       // calculate the change for the cpu usage of the container in between readings
       if (precpu_stats.online_cpus) {
         cpuPercent = (cpuDelta / systemDelta) * precpu_stats.online_cpus * 100.0;
-      } else {
+      } else if (cpu_stats.cpu_usage.percpu_usage && cpu_stats.cpu_usage.percpu_usage.length) {
         cpuPercent = (cpuDelta / systemDelta) * cpu_stats.cpu_usage.percpu_usage.length * 100.0;
       }
     }
 
     return cpuPercent;
   } else {
-    let nanoSecNow = util.nanoSeconds();
+    const nanoSecNow = util.nanoSeconds();
     let cpuPercent = 0.0;
-    if (_docker_last_read > 0) {
-      let possIntervals = nanoSecNow - _docker_last_read; //  / 100 * os.cpus().length;
-      let intervalsUsed = cpu_stats.cpu_usage.total_usage - precpu_stats.cpu_usage.total_usage;
+    const lastRead = _docker_cpu_last_read[id] || 0;
+    if (lastRead > 0) {
+      const possIntervals = nanoSecNow - lastRead;
+      const intervalsUsed = cpu_stats.cpu_usage.total_usage - precpuTotal;
       if (possIntervals > 0) {
         cpuPercent = (100.0 * intervalsUsed) / possIntervals;
       }
     }
-    _docker_last_read = nanoSecNow;
+    _docker_cpu_last_read[id] = nanoSecNow;
     return cpuPercent;
   }
 }
 
 function docker_calcNetworkIO(networks) {
-  let rx;
-  let wx;
+  let rx = 0;
+  let wx = 0;
   for (let key in networks) {
     // skip loop if the property is from prototype
     if (!{}.hasOwnProperty.call(networks, key)) {
@@ -481,25 +475,16 @@ function dockerContainerStats(containerIDs, callback) {
           Object.setPrototypeOf(containerIDsSanitized, util.stringObj);
         }
 
-        containerIDsSanitized = containerIDs;
-        containerIDsSanitized = containerIDsSanitized.trim();
+        containerIDsSanitized = containerIDs.trim();
         if (containerIDsSanitized !== '*') {
-          containerIDsSanitized = '';
-          const s = (util.isPrototypePolluted() ? '' : util.sanitizeShellString(containerIDs, true)).trim();
-          const l = util.mathMin(s.length, 2000);
-          for (let i = 0; i <= l; i++) {
-            if (s[i] !== undefined) {
-              s[i].__proto__.toLowerCase = util.stringToLower;
-              const sl = s[i].toLowerCase();
-              if (sl && sl[0] && !sl[1]) {
-                containerIDsSanitized = containerIDsSanitized + sl[0];
-              }
-            }
-          }
+          containerIDsSanitized = util.isPrototypePolluted() ? '' : util.sanitizeContainerID(containerIDs);
         }
-
-        containerIDsSanitized = containerIDsSanitized.trim().toLowerCase().replace(/,+/g, '|');
-        containerArray = containerIDsSanitized.split('|');
+        containerArray = containerIDsSanitized
+          .trim()
+          .toLowerCase()
+          .replace(/,+/g, '|')
+          .split('|')
+          .filter((item) => item.trim());
       }
 
       const result = [];
@@ -508,8 +493,10 @@ function dockerContainerStats(containerIDs, callback) {
       if (containerArray.length && containerArray[0].trim() === '*') {
         containerArray = [];
         dockerContainers().then((allContainers) => {
-          for (let container of allContainers) {
-            containerArray.push(container.id.substring(0, 12));
+          for (let container of (allContainers || []).filter(Boolean)) {
+            if (container.id) {
+              containerArray.push(container.id.substring(0, 12));
+            }
           }
           if (containerArray.length) {
             dockerContainerStats(containerArray.join(',')).then((result) => {
@@ -592,7 +579,7 @@ function dockerContainerStatsSingle(containerID) {
                   result.memUsage = stats.memory_stats && stats.memory_stats.usage ? stats.memory_stats.usage : 0;
                   result.memLimit = stats.memory_stats && stats.memory_stats.limit ? stats.memory_stats.limit : 0;
                   result.memPercent = stats.memory_stats && stats.memory_stats.usage && stats.memory_stats.limit ? (stats.memory_stats.usage / stats.memory_stats.limit) * 100.0 : 0;
-                  result.cpuPercent = stats.cpu_stats && stats.precpu_stats ? docker_calcCPUPercent(stats.cpu_stats, stats.precpu_stats) : 0;
+                  result.cpuPercent = stats.cpu_stats && stats.precpu_stats ? docker_calcCPUPercent(stats.cpu_stats, stats.precpu_stats, containerID) : 0;
                   result.pids = stats.pids_stats && stats.pids_stats.current ? stats.pids_stats.current : 0;
                   result.restartCount = dataInspect.RestartCount ? dataInspect.RestartCount : 0;
                   if (stats.networks) {
@@ -636,7 +623,7 @@ function dockerContainerProcesses(containerID, callback) {
       if (typeof containerID !== 'string') {
         return resolve(result);
       }
-      const containerIdSanitized = (util.isPrototypePolluted() ? '' : util.sanitizeShellString(containerID, true)).trim();
+      const containerIdSanitized = util.isPrototypePolluted() ? '' : util.sanitizeContainerID(containerID);
 
       if (containerIdSanitized) {
         if (!_docker_socket) {