systeminformation 5.28.0 → 5.28.2

package/README.md

@@ -185,7 +185,7 @@ si.cpu()
 
 (last 7 major and minor version releases)
 
-- Version 5.28.0: `mem()` added suppurt for macos-temperature-sensor (macOS)
+- Version 5.28.0: `cpuTemperature()` added suppurt for macos-temperature-sensor (macOS)
 - 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
@@ -235,10 +235,10 @@ and above.
 
 I was able to test it on several Debian, Raspbian, Ubuntu distributions as well
 as macOS (Mavericks, Yosemite, El Captain, Sierra, High Sierra, Mojave,
-Catalina, Big Sur) and some Windows 7, Windows 8, Windows 10, FreeBSD, OpenBSD,
-NetBSD and SunOS machines. Not all functions are supported on all operating
-systems. Have a look at the function reference in the docs to get further
-details.
+Catalina, Big Sur, Monterey, Ventura, Sonoma, Sequoia, Tahoe) and some Windows 7,
+Windows 8, Windows 10, Windows 11, FreeBSD, OpenBSD, NetBSD and SunOS machines.
+Not all functions are supported on all operating systems. Have a look at the
+function reference in the docs to get further details.
 
 If you have comments, suggestions & reports, please feel free to contact me!
 
@@ -1018,21 +1018,27 @@ async function cpuData() {
 
 #### macOS - Temperature Sensor
 
-To be able to measure temperature on macOS I created a little additional
-package. Due to some difficulties in NPM with `optionalDependencies` I
+To be able to measure temperature on macOS I created two little additional
+packages. Due to some difficulties in NPM with `optionalDependencies` I
 unfortunately was getting unexpected warnings on other platforms. So I decided
 to drop this optional dependency for macOS - so by default, you will not get
 correct values.
 
-This additional package is now also supporting Apple Silicon M1/M2/M3 machines.
-
 But if you need to detect macOS temperature just run the following additional
 installation command:
 
+For Intel based machines (deprecated lib) install
+
 ```bash
 $ npm install osx-temperature-sensor --save
 ```
 
+For Apple Silicon (ARM) based machines install
+
+```bash
+$ npm install macos-temperature-sensor --save
+```
+
 `systeminformation` will then detect this additional library and return the
 temperature when calling systeminformations standard function `cpuTemperature()`
 
@@ -1163,7 +1169,7 @@ trademark of Fabrice Bellard, bochs is a trademark of The Bochs Project, USB and
 USB Logo are trademarks of USB Implementation Forum, Bluetooth and Bluetooth
 Logo are trademarks of Bluetooth SIG, Android is a trademark of Google LLC,
 Parallels is a trademarks of Parallels International GmbH. Bun is a trademark of
-Codeblog Corp. Deno is a trademark of Deno Land Inc.
+Codeblog Corp. Deno is a trademark of Deno Land Inc. Arm is a trademark of Arm Limited.
 
 All other trademarks are the property of their respective owners.
 

package/lib/graphics.js

@@ -779,7 +779,7 @@ function graphics(callback) {
             try {
               stdout = execSync(
                 'defaults read /Library/Preferences/com.apple.windowserver.plist 2>/dev/null;defaults read /Library/Preferences/com.apple.windowserver.displays.plist 2>/dev/null; echo ""',
-                { maxBuffer: 1024 * 20000 }
+                { maxBuffer: 1024 * 102400 }
               );
               const output = (stdout || '').toString();
               const obj = util.plistReader(output);

package/lib/index.js

@@ -42,12 +42,12 @@ const usb = require('./usb');
 const audio = require('./audio');
 const bluetooth = require('./bluetooth');
 
-let _platform = process.platform;
-const _windows = (_platform === 'win32');
-const _freebsd = (_platform === 'freebsd');
-const _openbsd = (_platform === 'openbsd');
-const _netbsd = (_platform === 'netbsd');
-const _sunos = (_platform === 'sunos');
+const _platform = process.platform;
+const _windows = _platform === 'win32';
+const _freebsd = _platform === 'freebsd';
+const _openbsd = _platform === 'openbsd';
+const _netbsd = _platform === 'netbsd';
+const _sunos = _platform === 'sunos';
 
 // ----------------------------------------------------------------------------------
 // init
@@ -74,11 +74,9 @@ function version() {
 // get static data - they should not change until restarted
 
 function getStaticData(callback) {
-
   return new Promise((resolve) => {
     process.nextTick(() => {
-
-      let data = {};
+      const data = {};
 
       data.version = version();
 
@@ -99,7 +97,7 @@ function getStaticData(callback) {
         audio.audio(),
         bluetooth.bluetoothDevices(),
         usb.usb(),
-        printer.printer(),
+        printer.printer()
       ]).then((res) => {
         data.system = res[0];
         data.bios = res[1];
@@ -118,14 +116,15 @@ function getStaticData(callback) {
         data.bluetooth = res[14];
         data.usb = res[15];
         data.printer = res[16];
-        if (callback) { callback(data); }
+        if (callback) {
+          callback(data);
+        }
         resolve(data);
       });
     });
   });
 }
 
-
 // --------------------------
 // get all dynamic data - e.g. for monitoring agents
 // may take some seconds to get all data
@@ -135,7 +134,6 @@ function getStaticData(callback) {
 // - iface:	define network interface for which you like to monitor network speed e.g. "eth0"
 
 function getDynamicData(srv, iface, callback) {
-
   if (util.isFunction(iface)) {
     callback = iface;
     iface = '';
@@ -147,16 +145,21 @@ function getDynamicData(srv, iface, callback) {
 
   return new Promise((resolve) => {
     process.nextTick(() => {
-
       iface = iface || network.getDefaultNetworkInterface();
       srv = srv || '';
 
       // use closure to track ƒ completion
-      let functionProcessed = (function () {
+      let functionProcessed = (() => {
         let totalFunctions = 15;
-        if (_windows) { totalFunctions = 13; }
-        if (_freebsd || _openbsd || _netbsd) { totalFunctions = 11; }
-        if (_sunos) { totalFunctions = 6; }
+        if (_windows) {
+          totalFunctions = 13;
+        }
+        if (_freebsd || _openbsd || _netbsd) {
+          totalFunctions = 11;
+        }
+        if (_sunos) {
+          totalFunctions = 6;
+        }
 
         return function () {
           if (--totalFunctions === 0) {
@@ -168,7 +171,7 @@ function getDynamicData(srv, iface, callback) {
         };
       })();
 
-      let data = {};
+      const data = {};
 
       // get time
       data.time = osInfo.time();
@@ -286,7 +289,6 @@ function getDynamicData(srv, iface, callback) {
 // - iface:	define network interface for which you like to monitor network speed e.g. "eth0"
 
 function getAllData(srv, iface, callback) {
-
   return new Promise((resolve) => {
     process.nextTick(() => {
       let data = {};
@@ -310,7 +312,9 @@ function getAllData(srv, iface, callback) {
               data[key] = res[key];
             }
           }
-          if (callback) { callback(data); }
+          if (callback) {
+            callback(data);
+          }
           resolve(data);
         });
       });
@@ -322,8 +326,8 @@ function get(valueObject, callback) {
   return new Promise((resolve) => {
     process.nextTick(() => {
       const allPromises = Object.keys(valueObject)
-        .filter(func => ({}.hasOwnProperty.call(exports, func)))
-        .map(func => {
+        .filter((func) => ({}).hasOwnProperty.call(exports, func))
+        .map((func) => {
           const params = valueObject[func].substring(valueObject[func].lastIndexOf('(') + 1, valueObject[func].lastIndexOf(')'));
           let funcWithoutParams = func.indexOf(')') >= 0 ? func.split(')')[1].trim() : func;
           funcWithoutParams = func.indexOf('|') >= 0 ? func.split('|')[0].trim() : funcWithoutParams;
@@ -361,12 +365,12 @@ function get(valueObject, callback) {
                 if (Array.isArray(data[i])) {
                   // result is in an array, go through all elements of array and pick only the right ones
                   const partialArray = [];
-                  data[i].forEach(element => {
+                  data[i].forEach((element) => {
                     let partialRes = {};
                     if (keys.length === 1 && (keys[0] === '*' || keys[0] === 'all')) {
                       partialRes = element;
                     } else {
-                      keys.forEach(k => {
+                      keys.forEach((k) => {
                         if ({}.hasOwnProperty.call(element, k)) {
                           partialRes[k] = element[k];
                         }
@@ -376,11 +380,11 @@ function get(valueObject, callback) {
                     if (filter && filterParts.length === 2) {
                       if ({}.hasOwnProperty.call(partialRes, filterParts[0].trim())) {
                         const val = partialRes[filterParts[0].trim()];
-                        if (typeof val == 'number') {
+                        if (typeof val === 'number') {
                           if (val === parseFloat(filterParts[1].trim())) {
                             partialArray.push(partialRes);
                           }
-                        } else if (typeof val == 'string') {
+                        } else if (typeof val === 'string') {
                           if (val.toLowerCase() === filterParts[1].trim().toLowerCase()) {
                             partialArray.push(partialRes);
                           }
@@ -389,12 +393,11 @@ function get(valueObject, callback) {
                     } else {
                       partialArray.push(partialRes);
                     }
-
                   });
                   result[key] = partialArray;
                 } else {
                   const partialRes = {};
-                  keys.forEach(k => {
+                  keys.forEach((k) => {
                     if ({}.hasOwnProperty.call(data[i], k)) {
                       partialRes[k] = data[i][k];
                     }
@@ -408,7 +411,9 @@ function get(valueObject, callback) {
             i++;
           }
         }
-        if (callback) { callback(result); }
+        if (callback) {
+          callback(result);
+        }
         resolve(result);
       });
     });