systeminformation 5.30.5 → 5.30.6

package/lib/graphics.js

@@ -14,11 +14,12 @@
 // ----------------------------------------------------------------------------------
 
 const fs = require('fs');
+const path = require('path');
 const exec = require('child_process').exec;
 const execSync = require('child_process').execSync;
 const util = require('./util');
 
-let _platform = process.platform;
+const _platform = process.platform;
 let _nvidiaSmiPath = '';
 
 const _linux = _platform === 'linux' || _platform === 'android';
@@ -225,10 +226,8 @@ function graphics(callback) {
       for (let i = 0; i < pciIDs.length; i++) {
         pciIDs[i] = pciIDs[i].replace('Bus Address:', '').replace('0000:', '').trim();
       }
-      pciIDs = pciIDs.filter(function (el) {
-        return el != null && el;
-      });
-    } catch (e) {
+      pciIDs = pciIDs.filter((el) => el != null && el);
+    } catch {
       util.noop();
     }
     let i = 1;
@@ -422,25 +421,24 @@ function graphics(callback) {
 
     if (_windows) {
       try {
-        const basePath = util.WINDIR + String.raw`\System32\DriverStore\FileRepository`;
-        // find all directories that have an nvidia-smi.exe file
-
-        const candidateDirs = fs.readdirSync(basePath).filter((dir) => {
-          if (fs.statSync([basePath, dir].join('/')).isDirectory()) {
-            return fs.readdirSync([basePath, dir].join('/')).includes('nvidia-smi.exe');
-          } else {
-            return false;
-          }
-        });
-        // use the directory with the most recently created nvidia-smi.exe file
-        const targetDir = candidateDirs.reduce((prevDir, currentDir) => {
-          const previousNvidiaSmi = fs.statSync([basePath, prevDir, 'nvidia-smi.exe'].join('/'));
-          const currentNvidiaSmi = fs.statSync([basePath, currentDir, 'nvidia-smi.exe'].join('/'));
-          return previousNvidiaSmi.ctimeMs > currentNvidiaSmi.ctimeMs ? prevDir : currentDir;
-        });
-
-        if (targetDir) {
-          _nvidiaSmiPath = [basePath, targetDir, 'nvidia-smi.exe'].join('/');
+        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();
@@ -457,12 +455,12 @@ function graphics(callback) {
     if (nvidiaSmiExe) {
       const nvidiaSmiOpts =
         '--query-gpu=driver_version,pci.sub_device_id,name,pci.bus_id,fan.speed,memory.total,memory.used,memory.free,utilization.gpu,utilization.memory,temperature.gpu,temperature.memory,power.draw,power.limit,clocks.gr,clocks.mem --format=csv,noheader,nounits';
-      const cmd = nvidiaSmiExe + ' ' + nvidiaSmiOpts;
+      const cmd = `"${nvidiaSmiExe}" ${nvidiaSmiOpts}`;
       if (_linux) {
         options.stdio = ['pipe', 'pipe', 'ignore'];
       }
       try {
-        const sanitized = util.sanitizeShellString(cmd) + (_linux ? '  2>/dev/null' : '') + (_windows ? '  2> nul' : '');
+        const sanitized = cmd + (_linux ? '  2>/dev/null' : '') + (_windows ? '  2> nul' : '');
         const res = execSync(sanitized, options).toString();
         return res;
       } catch {

package/package.json

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