systeminformation 5.15.0 → 5.16.0

package/README.md

@@ -112,6 +112,8 @@ si.cpu()
 
 (last 7 major and minor version releases)
 
+- Version 5.16.0: `fsSize()` added rw property
+- Version 5.15.0: `blockDevices()` added device
 - Version 5.14.0: `blockDevices()` added raid group member (linux)
 - Version 5.13.0: `networkConnections()` added process name (mac OS)
 - Version 5.12.0: `cpu()` added performance and efficiency cores
@@ -489,6 +491,7 @@ Full function reference with examples can be found at [https://systeminformation
 |                     | [0].available         | X     | X   | X   | X   |     | used in bytes                                                            |
 |                     | [0].use               | X     | X   | X   | X   |     | used in %                                                                |
 |                     | [0].mount             | X     | X   | X   | X   |     | mount point                                                              |
+|                     | [0].rw                | X     | X   | X   | X   |     | read and write (false if read only)                                      |
 | si.fsOpenFiles(cb)  | {...}                 | X     | X   | X   |     |     | count max/allocated file descriptors                                     |
 |                     | max                   | X     | X   | X   |     |     | max file descriptors                                                     |
 |                     | allocated             | X     | X   | X   |     |     | current open files count                                                 |

package/lib/filesystem.js

@@ -39,6 +39,7 @@ let _disk_io = {};
 function fsSize(callback) {
 
   let macOsDisks = [];
+  let osMounts = [];
 
   function getmacOsFsType(fs) {
     if (!fs.startsWith('/')) { return 'NFS'; }
@@ -86,6 +87,7 @@ function fsSize(callback) {
           const used = parseInt(((_linux || _freebsd || _openbsd || _netbsd) ? line[3] : line[2])) * 1024;
           const available = parseInt(((_linux || _freebsd || _openbsd || _netbsd) ? line[4] : line[3])) * 1024;
           const use = parseFloat((100.0 * (used / (used + available))).toFixed(2));
+          let rw = osMounts && Object.keys(osMounts).length > 0 ? osMounts[fs] || false : null;
           line.splice(0, (_linux || _freebsd || _openbsd || _netbsd) ? 6 : 5);
           const mount = line.join(' ');
           if (!data.find(el => (el.fs === fs && el.type === fsType))) {
@@ -96,7 +98,8 @@ function fsSize(callback) {
               used,
               available,
               use,
-              mount
+              mount,
+              rw
             });
           }
         }
@@ -110,18 +113,37 @@ function fsSize(callback) {
       let data = [];
       if (_linux || _freebsd || _openbsd || _netbsd || _darwin) {
         let cmd = '';
+        macOsDisks = [];
+        osMounts = {};
         if (_darwin) {
           cmd = 'df -kP';
           try {
             macOsDisks = execSync('diskutil list').toString().split('\n').filter(line => {
               return !line.startsWith('/') && line.indexOf(':') > 0;
             });
+            execSync('mount').toString().split('\n').filter(line => {
+              return line.startsWith('/');
+            }).forEach((line) => {
+              osMounts[line.split(' ')[0]] = line.toLowerCase().indexOf('read-only') === -1;
+            });
           } catch (e) {
-            macOsDisks = [];
+            util.noop();
           }
         }
-        if (_linux) { cmd = 'df -lkPTx squashfs'; }
-        if (_freebsd || _openbsd || _netbsd) { cmd = 'df -lkPT'; }
+        if (_linux) {
+          cmd = 'df -lkPTx squashfs';
+          execSync('cat /proc/mounts').toString().split('\n').filter(line => {
+            return line.startsWith('/');
+          }).forEach((line) => {
+            osMounts[line.split(' ')[0]] = line.toLowerCase().indexOf('rw') >= 0;
+          });
+        }
+        if (_freebsd || _openbsd || _netbsd) {
+          cmd = 'df -lkPT';
+          execSync('mount').toString().split('\n').forEach((line) => {
+            osMounts[line.split(' ')[0]] = line.toLowerCase().indexOf('read-only') === -1;
+          });
+        }
         exec(cmd, { maxBuffer: 1024 * 1024 }, function (error, stdout) {
           let lines = filterLines(stdout);
           data = parseDf(lines);
@@ -151,7 +173,7 @@ function fsSize(callback) {
       if (_windows) {
         try {
           // util.wmic('logicaldisk get Caption,FileSystem,FreeSpace,Size').then((stdout) => {
-          util.powerShell('Get-CimInstance Win32_logicaldisk | select Caption,FileSystem,FreeSpace,Size | fl').then((stdout, error) => {
+          util.powerShell('Get-CimInstance Win32_logicaldisk | select Access,Caption,FileSystem,FreeSpace,Size | fl').then((stdout, error) => {
             if (!error) {
               let devices = stdout.toString().split(/\n\s*\n/);
               devices.forEach(function (device) {
@@ -159,6 +181,8 @@ function fsSize(callback) {
                 const size = util.toInt(util.getValue(lines, 'size', ':'));
                 const free = util.toInt(util.getValue(lines, 'freespace', ':'));
                 const caption = util.getValue(lines, 'caption', ':');
+                const rwValue = util.getValue(lines, 'access', ':');
+                const rw = rwValue ? (util.toInt(rwValue) !== 1) : null;
                 if (size) {
                   data.push({
                     fs: caption,
@@ -167,7 +191,8 @@ function fsSize(callback) {
                     used: size - free,
                     available: free,
                     use: parseFloat(((100.0 * (size - free)) / size).toFixed(2)),
-                    mount: caption
+                    mount: caption,
+                    rw
                   });
                 }
               });

package/lib/index.d.ts

@@ -434,6 +434,7 @@ export namespace Systeminformation {
     available: number;
     use: number;
     mount: string;
+    rw: boolean | null;
   }
 
   interface FsOpenFilesData {
@@ -1010,7 +1011,7 @@ export function audio(cb?: (data: Systeminformation.AudioData[]) => any): Promis
 export function bluetoothDevices(cb?: (data: Systeminformation.BluetoothDeviceData[]) => any): Promise<Systeminformation.BluetoothDeviceData[]>;
 
 export function getStaticData(cb?: (data: Systeminformation.StaticData) => any): Promise<Systeminformation.StaticData>;
-export function getDynamicData(srv?: string, iface?: string, cb?: (data: any) => any): Promise<ysteminformation.DynamicData>;
+export function getDynamicData(srv?: string, iface?: string, cb?: (data: any) => any): Promise<Systeminformation.DynamicData>;
 export function getAllData(srv?: string, iface?: string, cb?: (data: any) => any): Promise<Systeminformation.StaticData & Systeminformation.DynamicData>;
 export function get(valuesObject: any, cb?: (data: any) => any): Promise<any>;
 export function observe(valuesObject: any, interval: number, cb?: (data: any) => any): number;

package/package.json

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