systeminformation 5.26.1 → 5.27.0

package/README.md

@@ -31,9 +31,9 @@
 ## The Systeminformation Project
 
 This is amazing. Started as a small project just for myself, it now has > 17,000
-lines of code, > 650 versions published, up to 8 mio downloads per month, > 330
-mio downloads overall. #1 NPM ranking for backend packages. Thank you to all who
-contributed to this project!
+lines of code, > 650 versions published, up to 8 mio downloads per month, > 350
+mio downloads overall. Top 10 NPM ranking for backend packages. Thank you to all
+who contributed to this project!
 
 > **Upcoming Version 6** ⭐️⭐️⭐️
 >
@@ -163,6 +163,7 @@ si.cpu()
 
 (last 7 major and minor version releases)
 
+- Version 5.27.0: `mem()` added reclaimable memory
 - Version 5.26.0: `getStatic()`, `getAll()` added usb, audio, bluetooth, printer
 - Version 5.25.0: `versions()` added homebrew
 - Version 5.24.0: `versions()` added bun and deno
@@ -338,6 +339,7 @@ Full function reference with examples can be found at
 |                  | buffers               | X     |     |     |     |     | used by buffers                        |
 |                  | cached                | X     |     |     |     |     | used by cache                          |
 |                  | slab                  | X     |     |     |     |     | used by slab                           |
+|                  | reclaimable           | X     |     | X   |     |     | reclaimable (SReclaimable)             |
 |                  | available             | X     | X   | X   | X   | X   | potentially available (total - active) |
 |                  | swaptotal             | X     | X   | X   | X   | X   |                                        |
 |                  | swapused              | X     | X   | X   | X   | X   |                                        |

package/lib/filesystem.js

@@ -575,7 +575,7 @@ function blockDevices(callback) {
       if (_linux) {
         // see https://wiki.ubuntuusers.de/lsblk/
         // exec("lsblk -bo NAME,TYPE,SIZE,FSTYPE,MOUNTPOINT,UUID,ROTA,RO,TRAN,SERIAL,LABEL,MODEL,OWNER,GROUP,MODE,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,SCHED,RQ-SIZE,RA,WSAME", function (error, stdout) {
-        exec('lsblk -bPo NAME,TYPE,SIZE,FSTYPE,MOUNTPOINT,UUID,ROTA,RO,RM,TRAN,SERIAL,LABEL,MODEL,OWNER 2>/dev/null', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+        const procLsblk1 = exec('lsblk -bPo NAME,TYPE,SIZE,FSTYPE,MOUNTPOINT,UUID,ROTA,RO,RM,TRAN,SERIAL,LABEL,MODEL,OWNER 2>/dev/null', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
           if (!error) {
             let lines = blkStdoutToObject(stdout).split('\n');
             data = parseBlk(lines);
@@ -586,7 +586,7 @@ function blockDevices(callback) {
             }
             resolve(data);
           } else {
-            exec('lsblk -bPo NAME,TYPE,SIZE,FSTYPE,MOUNTPOINT,UUID,ROTA,RO,RM,LABEL,MODEL,OWNER 2>/dev/null', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+            const procLsblk2 = exec('lsblk -bPo NAME,TYPE,SIZE,FSTYPE,MOUNTPOINT,UUID,ROTA,RO,RM,LABEL,MODEL,OWNER 2>/dev/null', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
               if (!error) {
                 let lines = blkStdoutToObject(stdout).split('\n');
                 data = parseBlk(lines);
@@ -597,11 +597,23 @@ function blockDevices(callback) {
               }
               resolve(data);
             });
+            procLsblk2.on('error', function () {
+              if (callback) {
+                callback(data);
+              }
+              resolve(data);
+            });
+          }
+        });
+        procLsblk1.on('error', function () {
+          if (callback) {
+            callback(data);
           }
+          resolve(data);
         });
       }
       if (_darwin) {
-        exec('diskutil info -all', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+        const procDskutil = exec('diskutil info -all', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
           if (!error) {
             let lines = stdout.toString().split('\n');
             // parse lines into temp array of devices
@@ -613,6 +625,12 @@ function blockDevices(callback) {
           }
           resolve(data);
         });
+        procDskutil.on('error', function () {
+          if (callback) {
+            callback(data);
+          }
+          resolve(data);
+        });
       }
       if (_sunos) {
         if (callback) { callback(data); }
@@ -747,7 +765,7 @@ function fsStats(callback) {
       if ((_fs_speed && !_fs_speed.ms) || (_fs_speed && _fs_speed.ms && Date.now() - _fs_speed.ms >= 500)) {
         if (_linux) {
           // exec("df -k | grep /dev/", function(error, stdout) {
-          exec('lsblk -r 2>/dev/null | grep /', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+          const procLsblk = exec('lsblk -r 2>/dev/null | grep /', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
             if (!error) {
               let lines = stdout.toString().split('\n');
               let fs_filter = [];
@@ -759,7 +777,7 @@ function fsStats(callback) {
               });
 
               let output = fs_filter.join('|');
-              exec('cat /proc/diskstats | egrep "' + output + '"', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+              const procCat = exec('cat /proc/diskstats | egrep "' + output + '"', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
                 if (!error) {
                   let lines = stdout.toString().split('\n');
                   lines.forEach(function (line) {
@@ -778,6 +796,12 @@ function fsStats(callback) {
                 }
                 resolve(result);
               });
+              procCat.on('error', function () {
+                if (callback) {
+                  callback(result);
+                }
+                resolve(result);
+              });
             } else {
               if (callback) {
                 callback(result);
@@ -785,9 +809,16 @@ function fsStats(callback) {
               resolve(result);
             }
           });
+          procLsblk.on('error', function () {
+            if (callback) {
+              callback(result);
+            }
+            resolve(result);
+          });
+
         }
         if (_darwin) {
-          exec('ioreg -c IOBlockStorageDriver -k Statistics -r -w0 | sed -n "/IOBlockStorageDriver/,/Statistics/p" | grep "Statistics" | tr -cd "01234567890,\n"', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+          const procIoreg = exec('ioreg -c IOBlockStorageDriver -k Statistics -r -w0 | sed -n "/IOBlockStorageDriver/,/Statistics/p" | grep "Statistics" | tr -cd "01234567890,\n"', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
             if (!error) {
               let lines = stdout.toString().split('\n');
               lines.forEach(function (line) {
@@ -806,6 +837,12 @@ function fsStats(callback) {
             }
             resolve(result);
           });
+          procIoreg.on('error', function () {
+            if (callback) {
+              callback(result);
+            }
+            resolve(result);
+          });
         }
       } else {
         result.ms = _fs_speed.last_ms;

package/lib/index.d.ts

@@ -123,6 +123,7 @@ export namespace Systeminformation {
     buffers: number;
     cached: number;
     slab: number;
+    reclaimable: number;
     swaptotal: number;
     swapused: number;
     swapfree: number;

package/lib/memory.js

@@ -29,41 +29,34 @@ const _openbsd = (_platform === 'openbsd');
 const _netbsd = (_platform === 'netbsd');
 const _sunos = (_platform === 'sunos');
 
-const OSX_RAM_manufacturers = {
-  '0x014F': 'Transcend Information',
-  '0x2C00': 'Micron Technology Inc.',
-  '0x802C': 'Micron Technology Inc.',
-  '0x80AD': 'Hynix Semiconductor Inc.',
-  '0x80CE': 'Samsung Electronics Inc.',
-  '0xAD00': 'Hynix Semiconductor Inc.',
-  '0xCE00': 'Samsung Electronics Inc.',
-  '0x02FE': 'Elpida',
-  '0x5105': 'Qimonda AG i. In.',
-  '0x8551': 'Qimonda AG i. In.',
-  '0x859B': 'Crucial',
-  '0x04CD': 'G-Skill'
-};
-
-const LINUX_RAM_manufacturers = {
-  '017A': 'Apacer',
+const RAM_manufacturers = {
+  '00CE': 'Samsung Electronics Inc',
+  '014F': 'Transcend Information Inc.',
+  '017A': 'Apacer Technology Inc.',
   '0198': 'HyperX',
   '029E': 'Corsair',
+  '02FE': 'Elpida',
   '04CB': 'A-DATA',
-  '04CD': 'G-Skill',
+  '04CD': 'G.Skill International Enterprise',
   '059B': 'Crucial',
-  '00CE': 'Samsung',
   '1315': 'Crucial',
-  '014F': 'Transcend Information',
   '2C00': 'Micron Technology Inc.',
+  '5105': 'Qimonda AG i. In.',
   '802C': 'Micron Technology Inc.',
   '80AD': 'Hynix Semiconductor Inc.',
   '80CE': 'Samsung Electronics Inc.',
+  '8551': 'Qimonda AG i. In.',
+  '859B': 'Crucial',
   'AD00': 'Hynix Semiconductor Inc.',
   'CE00': 'Samsung Electronics Inc.',
-  '02FE': 'Elpida',
-  '5105': 'Qimonda AG i. In.',
-  '8551': 'Qimonda AG i. In.',
-  '859B': 'Crucial'
+  'SAMSUNG': 'Samsung Electronics Inc.',
+  'HYNIX': 'Hynix Semiconductor Inc.',
+  'G-SKILL': 'G-Skill International Enterprise',
+  'G.SKILL': 'G-Skill International Enterprise',
+  'TRANSCEND': 'Transcend Information',
+  'APACER': 'Apacer Technology Inc',
+  'MICRON': 'Micron Technology Inc.',
+  'QIMONDA': 'Qimonda AG i. In.',
 };
 
 // _______________________________________________________________________________________
@@ -159,6 +152,7 @@ function mem(callback) {
         cached: 0,
         slab: 0,
         buffcache: 0,
+        reclaimable: 0,
 
         swaptotal: 0,
         swapused: 0,
@@ -199,6 +193,8 @@ function mem(callback) {
               result.writeback = result.writeback ? result.writeback * 1024 : 0;
               result.dirty = parseInt(util.getValue(lines, 'dirty'), 10);
               result.dirty = result.dirty ? result.dirty * 1024 : 0;
+              result.reclaimable = parseInt(util.getValue(lines, 'sreclaimable'), 10);
+              result.reclaimable = result.reclaimable ? result.reclaimable * 1024 : 0;
             }
             if (callback) { callback(result); }
             resolve(result);
@@ -250,11 +246,11 @@ function mem(callback) {
           util.noop();
         }
         try {
-          exec('vm_stat 2>/dev/null | grep "Pages active"', function (error, stdout) {
+          exec('vm_stat 2>/dev/null | egrep "Pages active|Pages inactive"', function (error, stdout) {
             if (!error) {
               let lines = stdout.toString().split('\n');
-
-              result.active = parseInt(lines[0].split(':')[1], 10) * pageSize;
+              result.active = (parseInt(util.getValue(lines, 'Pages active'), 10) || 0) * pageSize;
+              result.reclaimable = (parseInt(util.getValue(lines, 'Pages inactive'), 10) || 0) * pageSize;
               result.buffcache = result.used - result.active;
               result.available = result.free + result.buffcache;
             }
@@ -315,17 +311,10 @@ exports.mem = mem;
 
 function memLayout(callback) {
 
-  function getManufacturerDarwin(manId) {
-    if ({}.hasOwnProperty.call(OSX_RAM_manufacturers, manId)) {
-      return (OSX_RAM_manufacturers[manId]);
-    }
-    return manId;
-  }
-
-  function getManufacturerLinux(manId) {
+  function getManufacturer(manId) {
     const manIdSearch = manId.replace('0x', '').toUpperCase();
-    if (manIdSearch.length === 4 && {}.hasOwnProperty.call(LINUX_RAM_manufacturers, manIdSearch)) {
-      return (LINUX_RAM_manufacturers[manIdSearch]);
+    if (manIdSearch.length >= 4 && {}.hasOwnProperty.call(RAM_manufacturers, manIdSearch)) {
+      return (RAM_manufacturers[manIdSearch]);
     }
     return manId;
   }
@@ -358,7 +347,7 @@ function memLayout(callback) {
                   ecc: dataWidth && totalWidth ? totalWidth > dataWidth : false,
                   clockSpeed: (util.getValue(lines, 'Configured Clock Speed:') ? parseInt(util.getValue(lines, 'Configured Clock Speed:'), 10) : (util.getValue(lines, 'Speed:') ? parseInt(util.getValue(lines, 'Speed:'), 10) : null)),
                   formFactor: util.getValue(lines, 'Form Factor:'),
-                  manufacturer: getManufacturerLinux(util.getValue(lines, 'Manufacturer:')),
+                  manufacturer: getManufacturer(util.getValue(lines, 'Manufacturer:')),
                   partNum: util.getValue(lines, 'Part Number:'),
                   serialNum: util.getValue(lines, 'Serial Number:'),
                   voltageConfigured: parseFloat(util.getValue(lines, 'Configured Voltage:')) || null,
@@ -470,7 +459,7 @@ function memLayout(callback) {
                   ecc: eccStatus ? eccStatus === 'enabled' : null,
                   clockSpeed: parseInt(util.getValue(lines, '          Speed:'), 10),
                   formFactor: '',
-                  manufacturer: getManufacturerDarwin(util.getValue(lines, '          Manufacturer:')),
+                  manufacturer: getManufacturer(util.getValue(lines, '          Manufacturer:')),
                   partNum: util.getValue(lines, '          Part Number:'),
                   serialNum: util.getValue(lines, '          Serial Number:'),
                   voltageConfigured: null,
@@ -508,7 +497,7 @@ function memLayout(callback) {
                 ecc: false,
                 clockSpeed: null,
                 formFactor: 'SOC',
-                manufacturer: getManufacturerDarwin(manufacturerId),
+                manufacturer: getManufacturer(manufacturerId),
                 partNum: '',
                 serialNum: '',
                 voltageConfigured: null,
@@ -551,7 +540,7 @@ function memLayout(callback) {
                     ecc: dataWidth && totalWidth ? totalWidth > dataWidth : false,
                     clockSpeed: parseInt(util.getValue(lines, 'ConfiguredClockSpeed', ':'), 10) || parseInt(util.getValue(lines, 'Speed', ':'), 10) || 0,
                     formFactor: FormFactors[parseInt(util.getValue(lines, 'FormFactor', ':'), 10) || 0],
-                    manufacturer: util.getValue(lines, 'Manufacturer', ':'),
+                    manufacturer: getManufacturer(util.getValue(lines, 'Manufacturer', ':')),
                     partNum: util.getValue(lines, 'PartNumber', ':'),
                     serialNum: util.getValue(lines, 'SerialNumber', ':'),
                     voltageConfigured: (parseInt(util.getValue(lines, 'ConfiguredVoltage', ':'), 10) || 0) / 1000.0,

package/package.json

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