systeminformation 5.18.3 → 5.18.5

package/lib/cpu.js

@@ -642,12 +642,16 @@ function getCpu() {
             const countCores = util.getValue(lines, 'hw.physicalcpu_max');
             const countThreads = util.getValue(lines, 'hw.ncpu');
             if (os.arch() === 'arm64') {
-              const clusters = execSync('ioreg -c IOPlatformDevice -d 3 -r | grep cluster-type').toString().split('\n');
-              const efficiencyCores = clusters.filter(line => line.indexOf('"E"') >= 0).length;
-              const performanceCores = clusters.filter(line => line.indexOf('"P"') >= 0).length;
               result.socket = 'SOC';
-              result.efficiencyCores = efficiencyCores;
-              result.performanceCores = performanceCores;
+              try {
+                const clusters = execSync('ioreg -c IOPlatformDevice -d 3 -r | grep cluster-type').toString().split('\n');
+                const efficiencyCores = clusters.filter(line => line.indexOf('"E"') >= 0).length;
+                const performanceCores = clusters.filter(line => line.indexOf('"P"') >= 0).length;
+                result.efficiencyCores = efficiencyCores;
+                result.performanceCores = performanceCores;
+              } catch (e) {
+                util.noop();
+              }
             }
             if (countProcessors) {
               result.processors = parseInt(countProcessors) || 1;

package/lib/docker.js

@@ -484,7 +484,7 @@ function dockerContainerStats(containerIDs, callback) {
         containerArray = [];
         dockerContainers().then(allContainers => {
           for (let container of allContainers) {
-            containerArray.push(container.id);
+            containerArray.push(container.id.substring(0, 12));
           }
           if (containerArray.length) {
             dockerContainerStats(containerArray.join(',')).then(result => {
@@ -555,8 +555,8 @@ function dockerContainerStatsSingle(containerID) {
             _docker_socket.getStats(containerID, data => {
               try {
                 let stats = data;
-
                 if (!stats.message) {
+                  if (data.id) { result.id = data.id; }
                   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);

package/lib/graphics.js

@@ -676,10 +676,10 @@ function graphics(callback) {
               const current = obj['DisplayAnyUserSets']['Configs'][0]['DisplayConfig'];
               let i = 0;
               current.forEach((o) => {
-                if (o['CurrentInfo'] && 'OriginX' in o['CurrentInfo'] && result.displays && result.displays[i]) {
+                if (o['CurrentInfo'] && o['CurrentInfo']['OriginX'] !== undefined && result.displays && result.displays[i]) {
                   result.displays[i].positionX = o['CurrentInfo']['OriginX'];
                 }
-                if (o['CurrentInfo'] && 'OriginY' in o['CurrentInfo'] && result.displays && result.displays[i]) {
+                if (o['CurrentInfo'] && o['CurrentInfo']['OriginY'] !== undefined && result.displays && result.displays[i]) {
                   result.displays[i].positionY = o['CurrentInfo']['OriginY'];
                 }
                 i++;
@@ -695,7 +695,7 @@ function graphics(callback) {
                 if ('OriginY' in o && result.displays && result.displays[i]) {
                   result.displays[i].positionY = o['OriginY'];
                 }
-                if (o['Mode'] && 'BitsPerPixel' in o['Mode'] && result.displays && result.displays[i]) {
+                if (o['Mode'] && o['Mode']['BitsPerPixel'] !== undefined && result.displays && result.displays[i]) {
                   result.displays[i].pixelDepth = o['Mode']['BitsPerPixel'];
                 }
                 i++;

package/package.json

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