systeminformation 5.31.16 → 5.31.17

package/lib/cpu.js

@@ -2201,12 +2201,27 @@ function getLoad() {
 function currentLoad(callback) {
   return new Promise((resolve) => {
     process.nextTick(() => {
-      getLoad().then((result) => {
-        if (callback) {
-          callback(result);
-        }
-        resolve(result);
-      });
+      if (_current_cpu.ms === 0) {
+        // no baseline yet (first call): prime the counters, then measure over a
+        // short interval instead of returning the average load since boot
+        getLoad().then(() => {
+          setTimeout(() => {
+            getLoad().then((result) => {
+              if (callback) {
+                callback(result);
+              }
+              resolve(result);
+            });
+          }, 500);
+        });
+      } else {
+        getLoad().then((result) => {
+          if (callback) {
+            callback(result);
+          }
+          resolve(result);
+        });
+      }
     });
   });
 }

package/lib/filesystem.js

@@ -88,19 +88,23 @@ function fsSize(drive, callback) {
 
   function parseDf(lines) {
     const data = [];
+    // filesystem (first column) and mount point (last column) may contain spaces:
+    // anchor parsing on the numeric columns in between (blocks, used, available, capacity)
+    const dfWithType = /^(.+?)\s+(\S+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(?:\d+%|-)\s+(.+)$/;
+    const dfNoType = /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(?:\d+%|-)\s+(.+)$/;
+    const hasType = _linux || _freebsd || _openbsd || _netbsd;
     lines.forEach((line) => {
       if (line !== '') {
-        line = line.replace(/ +/g, ' ').split(' ');
-        if (line && (line[0].startsWith('/') || (line[6] && line[6] === '/') || line[0].indexOf('/') > 0 || line[0].indexOf(':') === 1 || (!_darwin && !isLinuxTmpFs(line[1])))) {
-          const fs = line[0];
-          const fsType = _linux || _freebsd || _openbsd || _netbsd ? line[1] : getmacOsFsType(line[0]);
-          const size = parseInt(_linux || _freebsd || _openbsd || _netbsd ? line[2] : line[1], 10) * 1024;
-          const used = parseInt(_linux || _freebsd || _openbsd || _netbsd ? line[3] : line[2], 10) * 1024;
-          const available = parseInt(_linux || _freebsd || _openbsd || _netbsd ? line[4] : line[3], 10) * 1024;
+        const parts = line.trim().match(hasType ? dfWithType : dfNoType);
+        if (parts && (parts[1].startsWith('/') || parts[hasType ? 6 : 5] === '/' || parts[1].indexOf('/') > 0 || parts[1].indexOf(':') === 1 || (!_darwin && !isLinuxTmpFs(parts[2])))) {
+          const fs = parts[1];
+          const fsType = hasType ? parts[2] : getmacOsFsType(parts[1]);
+          const size = parseInt(parts[hasType ? 3 : 2], 10) * 1024;
+          const used = parseInt(parts[hasType ? 4 : 3], 10) * 1024;
+          const available = parseInt(parts[hasType ? 5 : 4], 10) * 1024;
           const use = parseFloat((100.0 * (used / (used + available))).toFixed(2));
           const rw = osMounts && Object.keys(osMounts).length > 0 ? osMounts[fs] || false : null;
-          line.splice(0, _linux || _freebsd || _openbsd || _netbsd ? 6 : 5);
-          const mount = line.join(' ');
+          const mount = parts[hasType ? 6 : 5];
           if (!data.find((el) => el.fs === fs && el.type === fsType && el.mount === mount)) {
             data.push({
               fs,
@@ -158,9 +162,11 @@ function fsSize(drive, callback) {
                 return line.startsWith('/');
               })
               .forEach((line) => {
-                osMounts[line.split(' ')[0]] = osMounts[line.split(' ')[0]] || false;
+                // /proc/mounts escapes spaces as \040
+                const fs = line.split(' ')[0].replace(/\\040/g, ' ');
+                osMounts[fs] = osMounts[fs] || false;
                 if (line.toLowerCase().indexOf('/snap/') === -1) {
-                  osMounts[line.split(' ')[0]] = line.toLowerCase().indexOf('rw,') >= 0 || line.toLowerCase().indexOf(' rw ') >= 0;
+                  osMounts[fs] = line.toLowerCase().indexOf('rw,') >= 0 || line.toLowerCase().indexOf(' rw ') >= 0;
                 }
               });
           } catch {

package/lib/graphics.js

@@ -153,7 +153,7 @@ function graphics(callback) {
         const bus = (item.sppci_bus || '').indexOf('builtin') > -1 ? 'Built-In' : (item.sppci_bus || '').indexOf('pcie') > -1 ? 'PCIe' : '';
         const vram = (parseInt(item.spdisplays_vram || '', 10) || 0) * ((item.spdisplays_vram || '').indexOf('GB') > -1 ? 1024 : 1);
         const vramDyn = (parseInt(item.spdisplays_vram_shared || '', 10) || 0) * ((item.spdisplays_vram_shared || '').indexOf('GB') > -1 ? 1024 : 1);
-        let metalVersion = getMetalVersion(item.spdisplays_metal || item.spdisplays_metalfamily || '');
+        const metalVersion = getMetalVersion(item.spdisplays_metal || item.spdisplays_metalfamily || '');
         res.controllers.push({
           vendor: getVendorFromModel(item.spdisplays_vendor || '') || item.spdisplays_vendor || '',
           model: item.sppci_model || '',
@@ -207,7 +207,7 @@ function graphics(callback) {
   }
 
   function parseLinesLinuxControllers(lines) {
-    let controllers = [];
+    const controllers = [];
     let currentController = {
       vendor: '',
       subVendor: '',
@@ -243,9 +243,9 @@ function graphics(callback) {
       if ('' !== line.trim()) {
         if (' ' !== line[0] && '\t' !== line[0]) {
           // first line of new entry
-          let isExternal = pciIDs.indexOf(line.split(' ')[0]) >= 0;
+          const isExternal = pciIDs.indexOf(line.split(' ')[0]) >= 0;
           let vgapos = line.toLowerCase().indexOf(' vga ');
-          let _3dcontrollerpos = line.toLowerCase().indexOf('3d controller');
+          const _3dcontrollerpos = line.toLowerCase().indexOf('3d controller');
           if (vgapos !== -1 || _3dcontrollerpos !== -1) {
             // VGA
             if (_3dcontrollerpos !== -1 && vgapos === -1) {
@@ -269,8 +269,8 @@ function graphics(callback) {
               currentController.busAddress = pciIDCandidate;
             }
             isGraphicsController = true;
-            let endpos = line.search(/\[[0-9a-f]{4}:[0-9a-f]{4}]|$/);
-            let parts = line.substr(vgapos, endpos - vgapos).split(':');
+            const endpos = line.search(/\[[0-9a-f]{4}:[0-9a-f]{4}]|$/);
+            const parts = line.substr(vgapos, endpos - vgapos).split(':');
             currentController.busAddress = line.substr(0, vgapos).trim();
             if (parts.length > 1) {
               parts[1] = parts[1].trim();
@@ -332,7 +332,7 @@ function graphics(callback) {
         }
         if (isGraphicsController) {
           // within VGA details
-          let parts = line.split(':');
+          const parts = line.split(':');
           if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('devicename') !== -1 && parts[1].toLowerCase().indexOf('onboard') !== -1) {
             currentController.bus = 'Onboard';
           }
@@ -341,9 +341,13 @@ function graphics(callback) {
             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
+              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;
@@ -374,7 +378,7 @@ function graphics(callback) {
       }
       return devices;
     }, {});
-    for (let deviceId in devices) {
+    for (const deviceId in devices) {
       const device = devices[deviceId];
       if (device['CL_DEVICE_TYPE'] === 'CL_DEVICE_TYPE_GPU') {
         let busAddress;
@@ -429,24 +433,29 @@ function graphics(callback) {
 
     if (_windows) {
       try {
-        const basePath = path.join(util.WINDIR, 'System32', 'DriverStore', 'FileRepository');
-        // find all directories that have an nvidia-smi.exe file with date
-        const candidates = fs
-          .readdirSync(basePath, { withFileTypes: true })
-          .filter((dir) => dir.isDirectory())
-          .map((dir) => {
-            const nvidiaSmiPath = path.join(basePath, dir.name, 'nvidia-smi.exe');
-            try {
-              const stats = fs.statSync(nvidiaSmiPath);
-              return { path: nvidiaSmiPath, ctime: stats.ctimeMs };
-            } catch {
-              return null;
-            }
-          })
-          .filter(Boolean);
-        if (candidates.length > 0) {
-          // take the most recent
-          _nvidiaSmiPath = candidates.reduce((prev, curr) => (curr.ctime > prev.ctime ? curr : prev)).path;
+        const systemSmiPath = path.join(util.WINDIR, 'System32', 'nvidia-smi.exe');
+        if (fs.existsSync(systemSmiPath)) {
+          _nvidiaSmiPath = systemSmiPath;
+        } else {
+          const basePath = path.join(util.WINDIR, 'System32', 'DriverStore', 'FileRepository');
+          // find all directories that have an nvidia-smi.exe file with date
+          const candidates = fs
+            .readdirSync(basePath, { withFileTypes: true })
+            .filter((dir) => dir.isDirectory())
+            .map((dir) => {
+              const nvidiaSmiPath = path.join(basePath, dir.name, 'nvidia-smi.exe');
+              try {
+                const stats = fs.statSync(nvidiaSmiPath);
+                return { path: nvidiaSmiPath, ctime: stats.ctimeMs };
+              } catch {
+                return null;
+              }
+            })
+            .filter(Boolean);
+          if (candidates.length > 0) {
+            // take the most recent
+            _nvidiaSmiPath = candidates.reduce((prev, curr) => (curr.ctime > prev.ctime ? curr : prev)).path;
+          }
         }
       } catch {
         util.noop();
@@ -703,7 +712,7 @@ function graphics(callback) {
               currentRefreshRate: null
             };
           }
-          let parts = lines[i].split(' ');
+          const parts = lines[i].split(' ');
           currentDisplay.connection = parts[0];
           currentDisplay.main = lines[i].toLowerCase().indexOf(' primary ') >= 0;
           currentDisplay.builtin = parts[0].toLowerCase().indexOf('edp') >= 0;
@@ -715,7 +724,7 @@ function graphics(callback) {
             edid_raw += lines[i].toLowerCase().trim();
           } else {
             // parsen EDID
-            let edid_decoded = parseLinesLinuxEdid(edid_raw);
+            const edid_decoded = parseLinesLinuxEdid(edid_raw);
             currentDisplay.vendor = edid_decoded.vendor;
             currentDisplay.model = edid_decoded.model;
             currentDisplay.resolutionX = edid_decoded.resolutionX;
@@ -1068,7 +1077,7 @@ function graphics(callback) {
   function parseLinesWindowsControllers(sections, vections) {
     const memorySizes = {};
     for (const i in vections) {
-      if ({}.hasOwnProperty.call(vections, i)) {
+      if (Object.hasOwn(vections, i)) {
         if (vections[i].trim() !== '') {
           const lines = vections[i].trim().split('\n');
           const matchingDeviceId = util.getValue(lines, 'MatchingDeviceId').match(/PCI\\(VEN_[0-9A-F]{4})&(DEV_[0-9A-F]{4})(?:&(SUBSYS_[0-9A-F]{8}))?(?:&(REV_[0-9A-F]{2}))?/i);
@@ -1091,7 +1100,7 @@ function graphics(callback) {
 
     const controllers = [];
     for (const i in sections) {
-      if ({}.hasOwnProperty.call(sections, i)) {
+      if (Object.hasOwn(sections, i)) {
         if (sections[i].trim() !== '') {
           const lines = sections[i].trim().split('\n');
           const pnpDeviceId = util.getValue(lines, 'PNPDeviceID', ':').match(/PCI\\(VEN_[0-9A-F]{4})&(DEV_[0-9A-F]{4})(?:&(SUBSYS_[0-9A-F]{8}))?(?:&(REV_[0-9A-F]{2}))?/i);
@@ -1109,7 +1118,7 @@ function graphics(callback) {
             // PCI\VEN_v(4)&DEV_d(4)&SUBSYS_s(4)n(4)&REV_r(2)
             if (memorySize == null && pnpDeviceId[3] && pnpDeviceId[4]) {
               const deviceId = pnpDeviceId[1].toUpperCase() + '&' + pnpDeviceId[2].toUpperCase() + '&' + pnpDeviceId[3].toUpperCase() + '&' + pnpDeviceId[4].toUpperCase();
-              if ({}.hasOwnProperty.call(memorySizes, deviceId)) {
+              if (Object.hasOwn(memorySizes, deviceId)) {
                 memorySize = memorySizes[deviceId];
               }
             }
@@ -1117,7 +1126,7 @@ function graphics(callback) {
             // PCI\VEN_v(4)&DEV_d(4)&SUBSYS_s(4)n(4)
             if (memorySize == null && pnpDeviceId[3]) {
               const deviceId = pnpDeviceId[1].toUpperCase() + '&' + pnpDeviceId[2].toUpperCase() + '&' + pnpDeviceId[3].toUpperCase();
-              if ({}.hasOwnProperty.call(memorySizes, deviceId)) {
+              if (Object.hasOwn(memorySizes, deviceId)) {
                 memorySize = memorySizes[deviceId];
               }
             }
@@ -1125,7 +1134,7 @@ function graphics(callback) {
             // PCI\VEN_v(4)&DEV_d(4)&REV_r(2)
             if (memorySize == null && pnpDeviceId[4]) {
               const deviceId = pnpDeviceId[1].toUpperCase() + '&' + pnpDeviceId[2].toUpperCase() + '&' + pnpDeviceId[4].toUpperCase();
-              if ({}.hasOwnProperty.call(memorySizes, deviceId)) {
+              if (Object.hasOwn(memorySizes, deviceId)) {
                 memorySize = memorySizes[deviceId];
               }
             }
@@ -1133,7 +1142,7 @@ function graphics(callback) {
             // PCI\VEN_v(4)&DEV_d(4)
             if (memorySize == null) {
               const deviceId = pnpDeviceId[1].toUpperCase() + '&' + pnpDeviceId[2].toUpperCase();
-              if ({}.hasOwnProperty.call(memorySizes, deviceId)) {
+              if (Object.hasOwn(memorySizes, deviceId)) {
                 memorySize = memorySizes[deviceId];
               }
             }

package/lib/wifi.js

@@ -1,4 +1,3 @@
-'use strict';
 // @ts-check
 // ==================================================================================
 // wifi.js
@@ -18,7 +17,7 @@ const exec = require('child_process').exec;
 const execSync = require('child_process').execSync;
 const util = require('./util');
 
-let _platform = process.platform;
+const _platform = process.platform;
 
 const _linux = _platform === 'linux' || _platform === 'android';
 const _darwin = _platform === 'darwin';
@@ -117,13 +116,13 @@ const _wifi_frequencies = {
 };
 
 function wifiFrequencyFromChannel(channel) {
-  return {}.hasOwnProperty.call(_wifi_frequencies, channel) ? _wifi_frequencies[channel] : null;
+  return Object.hasOwn(_wifi_frequencies, channel) ? _wifi_frequencies[channel] : null;
 }
 
 function wifiChannelFromFrequencs(frequency) {
   let channel = 0;
-  for (let key in _wifi_frequencies) {
-    if ({}.hasOwnProperty.call(_wifi_frequencies, key)) {
+  for (const key in _wifi_frequencies) {
+    if (Object.hasOwn(_wifi_frequencies, key)) {
       if (_wifi_frequencies[key] === frequency) {
         channel = util.toInt(key);
       }
@@ -190,30 +189,33 @@ function nmiDeviceLinux(iface) {
   try {
     const lines = execSync(cmd, util.execOptsLinux).toString().split('\n');
     const ssid = util.getValue(lines, 'GENERAL.CONNECTION');
+    const uuid = util.getValue(lines, 'GENERAL.CON-UUID');
     return {
       iface,
       type: util.getValue(lines, 'GENERAL.TYPE'),
       vendor: util.getValue(lines, 'GENERAL.VENDOR'),
       product: util.getValue(lines, 'GENERAL.PRODUCT'),
       mac: util.getValue(lines, 'GENERAL.HWADDR').toLowerCase(),
-      ssid: ssid !== '--' ? ssid : null
+      ssid: ssid !== '--' ? ssid : null,
+      uuid: uuid !== '--' ? uuid : null
     };
   } catch {
     return {};
   }
 }
 
-function nmiConnectionLinux(ssid) {
-  const ssidSanitized = sanitizeShellString(ssid, true);
-  if (!ssidSanitized) {
+function nmiConnectionLinux(uuid) {
+  // query by connection UUID instead of SSID: profile names may differ from the SSID
+  if (!uuid || !/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(uuid)) {
     return {};
   }
-  const cmd = `nmcli -t connection show ${ssidSanitized} 2>/dev/null`;
+  const cmd = `nmcli -t connection show ${uuid} 2>/dev/null`;
   try {
     const lines = execSync(cmd, util.execOptsLinux).toString().split('\n');
+    const ssid = util.getValue(lines, '802-11-wireless.ssid');
     const bssid = util.getValue(lines, '802-11-wireless.seen-bssids').toLowerCase();
     return {
-      ssid: ssid !== '--' ? ssid : null,
+      ssid: ssid || null,
       uuid: util.getValue(lines, 'connection.uuid'),
       type: util.getValue(lines, 'connection.type'),
       autoconnect: util.getValue(lines, 'connection.autoconnect') === 'yes',
@@ -284,7 +286,9 @@ function getWifiNetworkListNmi() {
 function getWifiNetworkListIw(iface) {
   const result = [];
   try {
-    let iwlistParts = execSync(`export LC_ALL=C; iwlist ${util.sanitizeString(iface, true)} scan 2>&1; unset LC_ALL`, util.execOptsLinux).toString().split('        Cell ');
+    const iwlistParts = execSync(`export LC_ALL=C; iwlist ${util.sanitizeString(iface, true)} scan 2>&1; unset LC_ALL`, util.execOptsLinux)
+      .toString()
+      .split('        Cell ');
     if (iwlistParts[0].indexOf('resource busy') >= 0) {
       return -1;
     }
@@ -585,11 +589,9 @@ function wifiConnections(callback) {
 
           const nmiDetails = nmiDeviceLinux(ifaceSanitized);
           const wpaDetails = wpaConnectionLinux(ifaceSanitized);
-          const ssid = nmiDetails.ssid || wpaDetails.ssid;
+          const nmiConnection = nmiConnectionLinux(nmiDetails.uuid);
+          const ssid = nmiConnection.ssid || nmiDetails.ssid || wpaDetails.ssid;
           const network = networkList.filter((nw) => nw.ssid === ssid);
-          const ssidSanitized = util.sanitizeString(ssid, true);
-
-          const nmiConnection = nmiConnectionLinux(ssidSanitized);
           const channel = network && network.length && network[0].channel ? network[0].channel : wpaDetails.channel ? wpaDetails.channel : null;
           const bssid = network && network.length && network[0].bssid ? network[0].bssid : wpaDetails.bssid ? wpaDetails.bssid : null;
           const signalLevel = network && network.length && network[0].signalLevel ? network[0].signalLevel : null;

package/package.json

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