systeminformation 5.31.9 → 5.31.11

package/lib/graphics.js

@@ -337,9 +337,17 @@ function graphics(callback) {
             currentController.bus = 'Onboard';
           }
           if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('region') !== -1 && parts[1].toLowerCase().indexOf('memory') !== -1) {
-            let memparts = parts[1].split('=');
-            if (memparts.length > 1) {
-              currentController.vram = parseInt(memparts[1]);
+            const sizeMatch = parts[1].match(/size=(\d+)([KMG])?/i);
+            if (sizeMatch) {
+              let vram = parseInt(sizeMatch[1], 10);
+              const unit = (sizeMatch[2] || '').toUpperCase();
+              if (unit === 'G') { vram *= 1024; }
+              else if (unit === 'K') { vram = Math.round(vram / 1024); }
+              else if (unit === '') { vram = Math.round(vram / 1024 / 1024); } // bytes
+              // keep the largest memory region (the actual framebuffer aperture)
+              if (currentController.vram === null || vram > currentController.vram) {
+                currentController.vram = vram;
+              }
             }
           }
         }

package/lib/memory.js

@@ -258,13 +258,19 @@ function mem(callback) {
           util.noop();
         }
         try {
-          exec('vm_stat 2>/dev/null | egrep "Pages active|Pages inactive"', (error, stdout) => {
+          exec('vm_stat 2>/dev/null | egrep "Pages active|Pages inactive|Pages speculative|Pages wired down|Pages occupied by compressor|Pages purgeable|File-backed pages|Anonymous pages"', (error, stdout) => {
             if (!error) {
               let lines = stdout.toString().split('\n');
-              result.active = (parseInt(util.getValue(lines, 'Pages active'), 10) || 0) * pageSize;
+              const wired = (parseInt(util.getValue(lines, 'Pages wired down'), 10) || 0) * pageSize;
+              const compressed = (parseInt(util.getValue(lines, 'Pages occupied by compressor'), 10) || 0) * pageSize; 
+              const purgeable = (parseInt(util.getValue(lines, 'Pages purgeable'), 10) || 0) * pageSize;
+              const anonymous = (parseInt(util.getValue(lines, 'Anonymous pages'), 10) || 0) * pageSize;
+
+              result.active = anonymous - purgeable + wired + compressed;
               result.reclaimable = (parseInt(util.getValue(lines, 'Pages inactive'), 10) || 0) * pageSize;
               result.buffcache = result.used - result.active;
               result.available = result.free + result.buffcache;
+
             }
             exec('sysctl -n vm.swapusage 2>/dev/null', (error, stdout) => {
               if (!error) {

package/package.json

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