systeminformation 5.11.22 → 5.11.25

package/lib/cpu.js

@@ -1039,7 +1039,7 @@ function cpuTemperature(callback) {
           util.noop();
         }
 
-        const cmd = 'for mon in /sys/class/hwmon/hwmon*; do for label in "$mon"/temp*_label; do if [ -f $label ]; then value=$(echo $label | rev | cut -c 7- | rev)_input; if [ -f "$value" ]; then echo $(cat "$label")___$(cat "$value");  fi; fi; done; done;';
+        const cmd = 'for mon in /sys/class/hwmon/hwmon*; do for label in "$mon"/temp*_label; do if [ -f $label ]; then value=${label%_*}_input; echo $(cat "$label")___$(cat "$value"); fi; done; done;';
         try {
           exec(cmd, function (error, stdout) {
             stdout = stdout.toString();

package/lib/filesystem.js

@@ -50,8 +50,28 @@ function fsSize(callback) {
   }
 
   function isLinuxTmpFs(fs) {
-    const linuxTmpFileSystems = ['rootfs', 'unionfs', 'squashfs', 'cramfs', 'initrd', 'initramfs', 'devtmpfs', 'tmpfs', 'udev', 'devfs', 'specfs', 'type'];
-    return (linuxTmpFileSystems.includes(fs.toLowerCase()));
+    const linuxTmpFileSystems = ['rootfs', 'unionfs', 'squashfs', 'cramfs', 'initrd', 'initramfs', 'devtmpfs', 'tmpfs', 'udev', 'devfs', 'specfs', 'type', 'appimaged'];
+    let result = false;
+    linuxTmpFileSystems.forEach(linuxFs => {
+      if (fs.toLowerCase().indexOf(linuxFs) >= 0) result = true;
+    });
+    return result;
+  }
+
+  function filterLines(stdout) {
+    let lines = stdout.toString().split('\n');
+    if (stdout.toString().toLowerCase().indexOf('filesystem')) {
+      let removeLines = 0;
+      for (let i = 0; i < lines.length; i++) {
+        if (lines[i] && lines[i].toLowerCase().startsWith('filesystem')) {
+          removeLines = i;
+        }
+      }
+      for (let i = 0; i < removeLines; i++) {
+        lines.shift();
+      }
+    }
+    return lines;
   }
 
   function parseDf(lines) {
@@ -104,10 +124,9 @@ function fsSize(callback) {
         if (_linux) { cmd = 'df -lkPTx squashfs'; } // cmd = 'df -lkPTx squashfs | grep  -E "^/|^.\\:"';
         if (_freebsd || _openbsd || _netbsd) { cmd = 'df -lkPT'; }
         exec(cmd, { maxBuffer: 1024 * 1024 }, function (error, stdout) {
-          if (!error) {
-            let lines = stdout.toString().split('\n');
-            if (lines && lines[0] && lines[0].toLowerCase().startsWith('filesystem')) { lines.shift(); }
-            data = parseDf(lines);
+          let lines = filterLines(stdout);
+          data = parseDf(lines);
+          if (!error || data.length) {
             if (callback) {
               callback(data);
             }
@@ -115,8 +134,7 @@ function fsSize(callback) {
           } else {
             exec('df -kPT', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
               if (!error) {
-                let lines = stdout.toString().split('\n');
-                if (lines && lines[0] && lines[0].toLowerCase().startsWith('filesystem')) { lines.shift(); }
+                let lines = filterLines(stdout);
                 data = parseDf(lines);
               }
               if (callback) {

package/lib/graphics.js

@@ -429,7 +429,7 @@ function graphics(callback) {
     }
 
     const gpus = stdout.split('\n').filter(Boolean);
-    const results = gpus.map(gpu => {
+    let results = gpus.map(gpu => {
       const splittedData = gpu.split(', ').map(value => value.includes('N/A') ? undefined : value);
       if (splittedData.length === 16) {
         return {
@@ -450,9 +450,13 @@ function graphics(callback) {
           clockCore: safeParseNumber(splittedData[14]),
           clockMemory: safeParseNumber(splittedData[15]),
         };
+      } else {
+        return {};
       }
     });
-
+    results = results.filter((item) => {
+      return ('pciBus' in item);
+    });
     return results;
   }
 

package/lib/index.d.ts

@@ -7,8 +7,8 @@ export namespace Systeminformation {
   // 1. General
 
   interface TimeData {
-    current: string;
-    uptime: string;
+    current: number;
+    uptime: number;
     timezone: string;
     timezoneName: string;
   }
@@ -988,3 +988,6 @@ export function getDynamicData(srv?: string, iface?: string, cb?: (data: any) =>
 export function getAllData(srv?: string, iface?: string, cb?: (data: any) => any): Promise<any>;
 export function get(valuesObject: any, cb?: (data: any) => any): Promise<any>;
 export function observe(valuesObject: any, interval: number, cb?: (data: any) => any): number;
+
+export function powerShellStart(): void;
+export function powerShellRelease(): void;

package/lib/osinfo.js

@@ -307,6 +307,7 @@ function osInfo(callback) {
           result.codename = (result.release.indexOf('10.15') > -1 ? 'macOS Catalina' : result.codename);
           result.codename = (result.release.startsWith('11.') ? 'macOS Big Sur' : result.codename);
           result.codename = (result.release.startsWith('12.') ? 'macOS Monterey' : result.codename);
+          result.codename = (result.release.startsWith('13.') ? 'macOS Ventura' : result.codename);
           result.uefi = true;
           result.codepage = util.getCodepage();
           if (callback) {

package/lib/system.js

@@ -662,8 +662,10 @@ function baseboard(callback) {
       if (_windows) {
         try {
           const workload = [];
+          const win10plus = parseInt(os.release()) >= 10;
+          const maxCapacityAttribute = win10plus ? 'MaxCapacityEx' : 'MaxCapacity';
           workload.push(util.powerShell('Get-WmiObject Win32_baseboard | select Model,Manufacturer,Product,Version,SerialNumber,PartNumber,SKU | fl'));
-          workload.push(util.powerShell('Get-WmiObject Win32_physicalmemoryarray | select MaxCapacity, MemoryDevices | fl'));
+          workload.push(util.powerShell(`Get-WmiObject Win32_physicalmemoryarray | select ${maxCapacityAttribute}, MemoryDevices | fl`));
           util.promiseAll(
             workload
           ).then(data => {
@@ -683,7 +685,7 @@ function baseboard(callback) {
 
             // memphysical
             lines = data.results[1] ? data.results[1].toString().split('\r\n') : [''];
-            result.memMax = util.toInt(util.getValue(lines, 'MaxCapacity', ':')) || null;
+            result.memMax = util.toInt(util.getValue(lines, maxCapacityAttribute, ':')) * (win10plus ? 1024 : 1) || null;
             result.memSlots = util.toInt(util.getValue(lines, 'MemoryDevices', ':')) || null;
 
             if (callback) { callback(result); }

package/lib/util.js

@@ -396,42 +396,47 @@ function powerShellProceedResults(data) {
 }
 
 function powerShellStart() {
-  _psChild = spawn('powershell.exe', ['-NoLogo', '-InputFormat', 'Text', '-NoExit', '-Command', '-'], {
-    stdio: 'pipe',
-    windowsHide: true,
-    maxBuffer: 1024 * 20000,
-    encoding: 'UTF-8',
-    env: util._extend({}, process.env, { LANG: 'en_US.UTF-8' })
-  });
-  if (_psChild && _psChild.pid) {
-    _psPersistent = true;
-    _psChild.stdout.on('data', function (data) {
-      _psResult = _psResult + data.toString('utf8');
-      if (data.indexOf(_psCmdSeperator) >= 0) {
-        powerShellProceedResults(_psResult);
-        _psResult = '';
-      }
-    });
-    _psChild.stderr.on('data', function () {
-      powerShellProceedResults(_psResult + _psError);
-    });
-    _psChild.on('error', function () {
-      powerShellProceedResults(_psResult + _psError);
-    });
-    _psChild.on('close', function () {
-      _psChild.kill();
+  if (!_psChild) {
+    _psChild = spawn('powershell.exe', ['-NoLogo', '-InputFormat', 'Text', '-NoExit', '-Command', '-'], {
+      stdio: 'pipe',
+      windowsHide: true,
+      maxBuffer: 1024 * 20000,
+      encoding: 'UTF-8',
+      env: util._extend({}, process.env, { LANG: 'en_US.UTF-8' })
     });
+    if (_psChild && _psChild.pid) {
+      _psPersistent = true;
+      _psChild.stdout.on('data', function (data) {
+        _psResult = _psResult + data.toString('utf8');
+        if (data.indexOf(_psCmdSeperator) >= 0) {
+          powerShellProceedResults(_psResult);
+          _psResult = '';
+        }
+      });
+      _psChild.stderr.on('data', function () {
+        powerShellProceedResults(_psResult + _psError);
+      });
+      _psChild.on('error', function () {
+        powerShellProceedResults(_psResult + _psError);
+      });
+      _psChild.on('close', function () {
+        _psChild.kill();
+      });
+    }
   }
 }
 
 function powerShellRelease() {
   try {
-    _psChild.stdin.write('exit' + os.EOL);
-    _psChild.stdin.end();
-    _psPersistent = false;
+    if (_psChild) {
+      _psChild.stdin.write('exit' + os.EOL);
+      _psChild.stdin.end();
+      _psPersistent = false;
+    }
   } catch (e) {
     _psChild.kill();
   }
+  _psChild = null;
 }
 
 function powerShell(cmd) {

package/package.json

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