systeminformation 5.31.16 → 5.32.0

package/lib/graphics.js

@@ -35,6 +35,10 @@ let _resolutionY = 0;
 let _pixelDepth = 0;
 let _refreshRate = 0;
 
+// EnumDisplaySettings (current mode per \\.\DISPLAYn) - per-display refresh rate (issue #853)
+const psCurrentModes =
+  "Add-Type -AssemblyName System.Windows.Forms; if (-not ('SiDevMode' -as [Type])) { Add-Type -TypeDefinition 'using System;using System.Runtime.InteropServices;[StructLayout(LayoutKind.Sequential,CharSet=CharSet.Ansi)]public struct SIDEVMODE{[MarshalAs(UnmanagedType.ByValTStr,SizeConst=32)]public string dmDeviceName;public short dmSpecVersion;public short dmDriverVersion;public short dmSize;public short dmDriverExtra;public int dmFields;public int dmPositionX;public int dmPositionY;public int dmDisplayOrientation;public int dmDisplayFixedOutput;public short dmColor;public short dmDuplex;public short dmYResolution;public short dmTTOption;public short dmCollate;[MarshalAs(UnmanagedType.ByValTStr,SizeConst=32)]public string dmFormName;public short dmLogPixels;public int dmBitsPerPel;public int dmPelsWidth;public int dmPelsHeight;public int dmDisplayFlags;public int dmDisplayFrequency;public int dmICMMethod;public int dmICMIntent;public int dmMediaType;public int dmDitherType;public int dmReserved1;public int dmReserved2;public int dmPanningWidth;public int dmPanningHeight;}public class SiDevMode{[DllImport(\"user32.dll\",CharSet=CharSet.Ansi)]public static extern bool EnumDisplaySettings(string lpszDeviceName,int iModeNum,ref SIDEVMODE lpDevMode);}' }; [System.Windows.Forms.Screen]::AllScreens | ForEach-Object { $dm = New-Object SIDEVMODE; $dm.dmSize = [System.Runtime.InteropServices.Marshal]::SizeOf($dm); if ([SiDevMode]::EnumDisplaySettings($_.DeviceName, -1, [ref]$dm)) { $_.DeviceName + '|' + $dm.dmDisplayFrequency + '|' + $dm.dmBitsPerPel + '|' + $dm.dmPelsWidth + '|' + $dm.dmPelsHeight } }";
+
 const videoTypes = {
   '-2': 'UNINITIALIZED',
   '-1': 'OTHER',
@@ -53,7 +57,8 @@ const videoTypes = {
   13: 'UDI embedded',
   14: 'SDTVDONGLE',
   15: 'MIRACAST',
-  2147483648: 'INTERNAL'
+  2147483648: 'INTERNAL',
+  4294967295: 'RDP'
 };
 
 function getVendorFromModel(model) {
@@ -78,7 +83,7 @@ function getVendorFromModel(model) {
     { pattern: 'APPLE.?', manufacturer: 'Apple' },
     { pattern: 'INTEL.?', manufacturer: 'Intel' },
     { pattern: 'AMD.?', manufacturer: 'AMD' },
-    { pattern: 'NVIDIA.?', manufacturer: 'NVDIA' }
+    { pattern: 'NVIDIA.?', manufacturer: 'NVIDIA' }
   ];
 
   let result = '';
@@ -153,7 +158,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 +212,7 @@ function graphics(callback) {
   }
 
   function parseLinesLinuxControllers(lines) {
-    let controllers = [];
+    const controllers = [];
     let currentController = {
       vendor: '',
       subVendor: '',
@@ -243,14 +248,18 @@ 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');
-          if (vgapos !== -1 || _3dcontrollerpos !== -1) {
+          const _3dcontrollerpos = line.toLowerCase().indexOf('3d controller');
+          const _displaycontrollerpos = line.toLowerCase().indexOf('display controller');
+          if (vgapos !== -1 || _3dcontrollerpos !== -1 || _displaycontrollerpos !== -1) {
             // VGA
             if (_3dcontrollerpos !== -1 && vgapos === -1) {
               vgapos = _3dcontrollerpos;
             }
+            if (_displaycontrollerpos !== -1 && vgapos === -1) {
+              vgapos = _displaycontrollerpos;
+            }
             if (currentController.vendor || currentController.model || currentController.bus || currentController.vram !== null || currentController.vramDynamic) {
               // already a controller found
               controllers.push(currentController);
@@ -269,8 +278,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 +341,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 +350,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 +387,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 +442,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();
@@ -459,7 +477,7 @@ function graphics(callback) {
 
   function nvidiaSmi(options) {
     const nvidiaSmiExe = getNvidiaSmi();
-    options = options || util.execOptsWin;
+    options = Object.assign({}, options || util.execOptsWin);
     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';
@@ -669,11 +687,26 @@ function graphics(callback) {
     let is_current = false;
     let edid_raw = '';
     let start = 0;
+    const applyEdid = () => {
+      const edid_decoded = parseLinesLinuxEdid(edid_raw);
+      currentDisplay.vendor = edid_decoded.vendor;
+      currentDisplay.model = edid_decoded.model;
+      currentDisplay.resolutionX = edid_decoded.resolutionX;
+      currentDisplay.resolutionY = edid_decoded.resolutionY;
+      currentDisplay.sizeX = edid_decoded.sizeX;
+      currentDisplay.sizeY = edid_decoded.sizeY;
+      currentDisplay.pixelDepth = depth;
+      is_edid = false;
+    };
     for (let i = 1; i < lines.length; i++) {
       // start with second line
       if ('' !== lines[i].trim()) {
         if (' ' !== lines[i][0] && '\t' !== lines[i][0] && lines[i].toLowerCase().indexOf(' connected ') !== -1) {
           // first line of new entry
+          if (is_edid && edid_raw) {
+            // pending EDID belongs to the previous display
+            applyEdid();
+          }
           if (
             currentDisplay.model ||
             currentDisplay.main ||
@@ -703,10 +736,15 @@ 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;
+          const geometry = lines[i].match(/\d+x\d+\+(-?\d+)\+(-?\d+)/);
+          if (geometry) {
+            currentDisplay.positionX = util.toInt(geometry[1]);
+            currentDisplay.positionY = util.toInt(geometry[2]);
+          }
         }
 
         // try to read EDID information
@@ -715,19 +753,12 @@ function graphics(callback) {
             edid_raw += lines[i].toLowerCase().trim();
           } else {
             // parsen EDID
-            let edid_decoded = parseLinesLinuxEdid(edid_raw);
-            currentDisplay.vendor = edid_decoded.vendor;
-            currentDisplay.model = edid_decoded.model;
-            currentDisplay.resolutionX = edid_decoded.resolutionX;
-            currentDisplay.resolutionY = edid_decoded.resolutionY;
-            currentDisplay.sizeX = edid_decoded.sizeX;
-            currentDisplay.sizeY = edid_decoded.sizeY;
-            currentDisplay.pixelDepth = depth;
-            is_edid = false;
+            applyEdid();
           }
         }
         if (lines[i].toLowerCase().indexOf('edid:') >= 0) {
           is_edid = true;
+          edid_raw = '';
           start = lines[i].search(/\S|$/);
         }
         if (lines[i].toLowerCase().indexOf('*current') >= 0) {
@@ -750,6 +781,10 @@ function graphics(callback) {
     }
 
     // pushen displays
+    if (is_edid && edid_raw) {
+      // EDID was the last block in the output
+      applyEdid();
+    }
     if (
       currentDisplay.model ||
       currentDisplay.main ||
@@ -782,6 +817,20 @@ function graphics(callback) {
             } catch (e) {
               util.noop();
             }
+            try {
+              // GPU temperature (Apple Silicon) - optional dependency
+              const macosTemp = require('macos-temperature-sensor');
+              const temps = macosTemp.temperature();
+              if (temps && temps.gpu) {
+                result.controllers.forEach((controller) => {
+                  if (controller.bus === 'Built-In') {
+                    controller.temperatureGpu = Math.round(temps.gpu * 100) / 100;
+                  }
+                });
+              }
+            } catch {
+              util.noop();
+            }
             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 ""',
@@ -834,7 +883,7 @@ function graphics(callback) {
           const cmd = "fbset -s 2> /dev/null | grep 'mode \"' ; vcgencmd get_mem gpu 2> /dev/null; tvservice -s 2> /dev/null; tvservice -n 2> /dev/null;";
           exec(cmd, (error, stdout) => {
             const lines = stdout.toString().split('\n');
-            if (lines.length > 3 && lines[0].indexOf('mode "') >= -1 && lines[2].indexOf('0x12000a') > -1) {
+            if (lines.length > 3 && lines[0].indexOf('mode "') >= 0 && lines[2].indexOf('0x12000a') > -1) {
               const parts = lines[0].replace('mode', '').replace(/"/g, '').trim().split('x');
               if (parts.length === 2) {
                 result.displays.push({
@@ -856,12 +905,12 @@ function graphics(callback) {
                 });
               }
             }
-            if (lines.length >= 1 && stdout.toString().indexOf('gpu=') >= -1) {
+            if (lines.length >= 1 && stdout.toString().indexOf('gpu=') >= 0) {
               result.controllers.push({
                 vendor: 'Broadcom',
                 model: util.getRpiGpu(),
                 bus: '',
-                vram: util.getValue(lines, 'gpu', '=').replace('M', ''),
+                vram: parseInt(util.getValue(lines, 'gpu', '=').replace('M', ''), 10) || null,
                 vramDynamic: true
               });
             }
@@ -879,7 +928,7 @@ function graphics(callback) {
               // needs to be rewritten ... using no spread operators
               result.controllers = result.controllers.map((controller) => {
                 // match by busAddress
-                return mergeControllerNvidia(controller, nvidiaData.find((contr) => contr.pciBus.toLowerCase().endsWith(controller.busAddress.toLowerCase())) || {});
+                return mergeControllerNvidia(controller, nvidiaData.find((contr) => contr.pciBus && controller.busAddress && contr.pciBus.toLowerCase().endsWith(controller.busAddress.toLowerCase())) || {});
               });
             }
           }
@@ -941,9 +990,10 @@ function graphics(callback) {
           workload.push(util.powerShell('Get-CimInstance -Namespace root\\wmi -ClassName WmiMonitorConnectionParams | fl'));
           workload.push(
             util.powerShell(
-              'gwmi WmiMonitorID -Namespace root\\wmi | ForEach-Object {(($_.ManufacturerName -notmatch 0 | foreach {[char]$_}) -join "") + "|" + (($_.ProductCodeID -notmatch 0 | foreach {[char]$_}) -join "") + "|" + (($_.UserFriendlyName -notmatch 0 | foreach {[char]$_}) -join "") + "|" + (($_.SerialNumberID -notmatch 0 | foreach {[char]$_}) -join "") + "|" + $_.InstanceName}'
+              'gwmi WmiMonitorID -Namespace root\\wmi | ForEach-Object {(($_.ManufacturerName -notmatch 0 | foreach {[char]$_}) -join "") + "|" + (($_.ProductCodeID -notmatch 0 | foreach {[char]$_}) -join "") + "|" + (($_.UserFriendlyName -notmatch 0 | foreach {[char]$_}) -join "") + "|" + (($_.SerialNumberID -notmatch 0 | foreach {[char]$_}) -join "") + "|" + $_.YearOfManufacture + "|" + $_.InstanceName}'
             )
           );
+          workload.push(util.powerShell(psCurrentModes));
 
           const nvidiaData = nvidiaDevices();
 
@@ -960,7 +1010,7 @@ function graphics(callback) {
                     controller,
                     nvidiaData.find((device) => {
                       let windowsSubDeviceId = (controller.subDeviceId || '').toLowerCase();
-                      const nvidiaSubDeviceIdParts = device.subDeviceId.split('x');
+                      const nvidiaSubDeviceIdParts = (device.subDeviceId || '').split('x');
                       let nvidiaSubDeviceId = nvidiaSubDeviceIdParts.length > 1 ? nvidiaSubDeviceIdParts[1].toLowerCase() : nvidiaSubDeviceIdParts[0].toLowerCase();
                       const lengthDifference = Math.abs(windowsSubDeviceId.length - nvidiaSubDeviceId.length);
                       if (windowsSubDeviceId.length > nvidiaSubDeviceId.length) {
@@ -990,35 +1040,65 @@ function graphics(callback) {
                 dsections.pop();
               }
 
-              // monitor (powershell)
-              const msections = data[3].replace(/\r/g, '').split('Active ');
-              msections.shift();
+              // physical monitors (powershell) - keyed by InstanceName (issue #764)
+              // inactive monitors (attached but not part of the desktop, e.g. "PC screen only") are skipped
+              const monitors = [];
+              data[3].replace(/\r/g, '').split(/\n\s*\n/).forEach((section) => {
+                const lines = section.split('\n');
+                const monitorInstanceName = util.getValue(lines, 'InstanceName').toLowerCase();
+                const monitorActive = util.getValue(lines, 'Active').toLowerCase() !== 'false';
+                if (monitorInstanceName && monitorActive) {
+                  monitors.push({
+                    instanceName: monitorInstanceName,
+                    sizeX: util.getValue(lines, 'MaxHorizontalImageSize'),
+                    sizeY: util.getValue(lines, 'MaxVerticalImageSize')
+                  });
+                }
+              });
 
               // forms.screens (powershell)
               const ssections = data[4].replace(/\r/g, '').split('BitsPerPixel ');
               ssections.shift();
 
-              // connection params (powershell) - video type
-              const tsections = data[5].replace(/\r/g, '').split(/\n\s*\n/);
-              tsections.shift();
+              // connection params (powershell) - video type per InstanceName (issue #764)
+              const connections = Object.create(null);
+              data[5].replace(/\r/g, '').split(/\n\s*\n/).forEach((section) => {
+                const lines = section.split('\n');
+                const connectionInstanceName = util.getValue(lines, 'InstanceName').toLowerCase();
+                if (connectionInstanceName) {
+                  connections[connectionInstanceName] = util.getValue(lines, 'VideoOutputTechnology');
+                }
+              });
 
               // monitor ID (powershell) - model / vendor
               const res = data[6].replace(/\r/g, '').split(/\n/);
               const isections = [];
               res.forEach((element) => {
                 const parts = element.split('|');
-                if (parts.length === 5) {
+                if (parts.length === 6) {
                   isections.push({
                     vendor: parts[0],
                     code: parts[1],
                     model: parts[2],
                     serial: parts[3],
-                    instanceId: parts[4]
+                    productionYear: util.toInt(parts[4]) || null,
+                    instanceId: parts[5]
                   });
                 }
               });
 
-              result.displays = parseLinesWindowsDisplaysPowershell(ssections, msections, dsections, tsections, isections);
+              // current display mode per device name (issue #853)
+              const currentModes = Object.create(null);
+              (data[7] || '').replace(/\r/g, '').split(/\n/).forEach((element) => {
+                const parts = element.split('|');
+                const frequency = parts.length === 5 ? util.toInt(parts[1]) : 0;
+                // dmDisplayFrequency 0/1 means hardware default
+                if (frequency > 1 && parts[0]) {
+                  currentModes[parts[0].trim().toLowerCase()] = frequency;
+                }
+              });
+
+              result.displays = parseLinesWindowsDisplaysPowershell(ssections, monitors, dsections, connections, isections, currentModes);
 
               if (result.displays.length === 1) {
                 if (_resolutionX) {
@@ -1157,7 +1237,7 @@ function graphics(callback) {
     return controllers;
   }
 
-  function parseLinesWindowsDisplaysPowershell(ssections, msections, dsections, tsections, isections) {
+  function parseLinesWindowsDisplaysPowershell(ssections, monitors, dsections, connections, isections, currentModes) {
     const displays = [];
     let vendor = '';
     let model = '';
@@ -1172,40 +1252,34 @@ function graphics(callback) {
       resolutionX = util.toInt(util.getValue(linesDisplay, 'ScreenWidth', ':'));
       resolutionY = util.toInt(util.getValue(linesDisplay, 'ScreenHeight', ':'));
     }
-    for (let i = 0; i < ssections.length; i++) {
-      if (ssections[i].trim() !== '') {
-        ssections[i] = 'BitsPerPixel ' + ssections[i];
-        msections[i] = 'Active ' + msections[i];
-        // tsections can be empty OR undefined on earlier versions of powershell (<=2.0)
-        // Tag connection type as UNKNOWN by default if this information is missing
-        if (tsections.length === 0 || tsections[i] === undefined) {
-          tsections[i] = 'Unknown';
-        }
-        const linesScreen = ssections[i].split('\n');
-        const linesMonitor = msections[i].split('\n');
-
-        const linesConnection = tsections[i].split('\n');
-        const bitsPerPixel = util.getValue(linesScreen, 'BitsPerPixel');
+    // iterate over physical monitors too - mirrored monitors have no own logical screen (issue #940)
+    const count = Math.max(ssections.length, monitors.length);
+    for (let i = 0; i < count; i++) {
+      const hasOwnScreen = i < ssections.length;
+      // mirrored monitors show the same image as the first screen
+      const ssection = hasOwnScreen ? ssections[i] : ssections[0];
+      if (ssection !== undefined && ssection.trim() !== '') {
+        const linesScreen = ('BitsPerPixel ' + ssection).split('\n');
+        // screen <-> monitor correlation stays index based - Forms.Screen exposes no shared key with root\wmi
+        const monitor = monitors[i];
+        const instanceName = monitor ? monitor.instanceName : '';
+        const bitsPerPixel = util.toInt(util.getValue(linesScreen, 'BitsPerPixel')) || null;
         const bounds = util.getValue(linesScreen, 'Bounds').replace('{', '').replace('}', '').replace(/=/g, ':').split(',');
         const primary = util.getValue(linesScreen, 'Primary');
-        const sizeX = util.getValue(linesMonitor, 'MaxHorizontalImageSize');
-        const sizeY = util.getValue(linesMonitor, 'MaxVerticalImageSize');
-        const instanceName = util.getValue(linesMonitor, 'InstanceName').toLowerCase();
-        const videoOutputTechnology = util.getValue(linesConnection, 'VideoOutputTechnology');
+        const sizeX = monitor ? monitor.sizeX : '';
+        const sizeY = monitor ? monitor.sizeY : '';
+        const videoOutputTechnology = instanceName && connections[instanceName] !== undefined ? connections[instanceName] : '';
         const deviceName = util.getValue(linesScreen, 'DeviceName');
-        let displayVendor = '';
-        let displayModel = '';
-        isections.forEach((element) => {
-          if (element.instanceId.toLowerCase().startsWith(instanceName) && vendor.startsWith('(') && model.startsWith('PnP')) {
-            displayVendor = element.vendor;
-            displayModel = element.model;
-          }
-        });
+        // WmiMonitorID data matches per InstanceName - prefer it over the locale-dependent Win32_DesktopMonitor values
+        const isection = instanceName ? isections.find((element) => element.instanceId.toLowerCase().startsWith(instanceName)) : undefined;
         displays.push({
-          vendor: instanceName.startsWith(deviceID) && displayVendor === '' ? vendor : displayVendor,
-          model: instanceName.startsWith(deviceID) && displayModel === '' ? model : displayModel,
+          vendor: (isection && isection.vendor) || (instanceName.startsWith(deviceID) ? vendor : ''),
+          model: (isection && isection.model) || (instanceName.startsWith(deviceID) ? model : ''),
+          serial: (isection && isection.serial) || null,
+          productionYear: isection ? isection.productionYear : null,
+          displayId: instanceName || null,
           deviceName,
-          main: primary.toLowerCase() === 'true',
+          main: hasOwnScreen ? primary.toLowerCase() === 'true' : false,
           builtin: videoOutputTechnology === '2147483648',
           connection: videoOutputTechnology && videoTypes[videoOutputTechnology] ? videoTypes[videoOutputTechnology] : '',
           resolutionX: util.toInt(util.getValue(bounds, 'Width', ':')),
@@ -1216,7 +1290,8 @@ function graphics(callback) {
           currentResX: util.toInt(util.getValue(bounds, 'Width', ':')),
           currentResY: util.toInt(util.getValue(bounds, 'Height', ':')),
           positionX: util.toInt(util.getValue(bounds, 'X', ':')),
-          positionY: util.toInt(util.getValue(bounds, 'Y', ':'))
+          positionY: util.toInt(util.getValue(bounds, 'Y', ':')),
+          currentRefreshRate: currentModes[deviceName.toLowerCase()] || null
         });
       }
     }
@@ -1224,6 +1299,9 @@ function graphics(callback) {
       displays.push({
         vendor,
         model,
+        serial: null,
+        productionYear: null,
+        displayId: null,
         main: true,
         sizeX: null,
         sizeY: null,

package/lib/index.d.ts

@@ -762,6 +762,7 @@ export namespace Systeminformation {
     restartCount: number;
     platform: string;
     driver: string;
+    labels: { [key: string]: string };
     ports: number[];
     mounts: DockerContainerMountData[];
   }

package/lib/index.js

@@ -325,8 +325,10 @@ function getAllData(srv, iface, callback) {
 function get(valueObject, callback) {
   return new Promise((resolve) => {
     process.nextTick(() => {
+      const blocked = ['get', 'getStaticData', 'getDynamicData', 'getAllData', 'observe', 'powerShellStart', 'powerShellRelease'];
+      const isGettable = (key) => ({}).hasOwnProperty.call(exports, key) && typeof exports[key] === 'function' && typeof valueObject[key] === 'string' && blocked.indexOf(key) < 0;
       const allPromises = Object.keys(valueObject)
-        .filter((func) => ({}).hasOwnProperty.call(exports, func))
+        .filter((func) => isGettable(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;
@@ -342,7 +344,7 @@ function get(valueObject, callback) {
         const result = {};
         let i = 0;
         for (let key in valueObject) {
-          if ({}.hasOwnProperty.call(valueObject, key) && {}.hasOwnProperty.call(exports, key) && data.length > i) {
+          if ({}.hasOwnProperty.call(valueObject, key) && isGettable(key) && data.length > i) {
             if (valueObject[key] === '*' || valueObject[key] === 'all') {
               result[key] = data[i];
             } else {

package/lib/memory.js

@@ -401,6 +401,7 @@ function memLayout(callback) {
                     ecc: null,
                     clockSpeed: 0,
                     formFactor: util.getValue(lines, 'Form Factor:'),
+                    manufacturer: '',
                     partNum: '',
                     serialNum: '',
                     voltageConfigured: null,
@@ -490,10 +491,12 @@ function memLayout(callback) {
             devices.forEach((device) => {
               const lines = device.split('\n');
               const bank = (hasBank ? 'BANK ' : 'DIMM') + lines[0].trim().split('/')[0];
-              const size = parseInt(util.getValue(lines, '          Size'));
+              const sizeString = util.getValue(lines, '          Size');
+              const size = parseInt(sizeString);
+              const sizeUnit = sizeString.toLowerCase().indexOf('mb') >= 0 ? 1024 * 1024 : sizeString.toLowerCase().indexOf('tb') >= 0 ? 1024 * 1024 * 1024 * 1024 : 1024 * 1024 * 1024;
               if (size) {
                 result.push({
-                  size: size * 1024 * 1024 * 1024,
+                  size: size * sizeUnit,
                   bank: bank,
                   type: util.getValue(lines, '          Type:'),
                   ecc: eccStatus ? eccStatus === 'enabled' : null,
@@ -586,7 +589,7 @@ function memLayout(callback) {
                     result.push({
                       size,
                       bank: util.getValue(lines, 'BankLabel', ':') + (tagInt[1] ? '/' + tagInt[1] : ''), // BankLabel
-                      type: memoryTypes[parseInt(util.getValue(lines, 'MemoryType', ':'), 10) || parseInt(util.getValue(lines, 'SMBIOSMemoryType', ':'), 10)],
+                      type: memoryTypes[parseInt(util.getValue(lines, 'MemoryType', ':'), 10) || parseInt(util.getValue(lines, 'SMBIOSMemoryType', ':'), 10) || 0],
                       ecc: dataWidth && totalWidth ? totalWidth > dataWidth : false,
                       clockSpeed: parseInt(util.getValue(lines, 'ConfiguredClockSpeed', ':'), 10) || parseInt(util.getValue(lines, 'Speed', ':'), 10) || 0,
                       formFactor: FormFactors[parseInt(util.getValue(lines, 'FormFactor', ':'), 10) || 0],

package/lib/network.js

@@ -546,8 +546,12 @@ function getLinuxIfaceConnectionName(interfaceName) {
   }
 }
 
-function checkLinuxDCHPInterfaces(file) {
+function checkLinuxDCHPInterfaces(file, depth) {
   let result = [];
+  depth = depth || 0;
+  if (depth > 10) {
+    return result;
+  }
   try {
     const content = readFileSync(file, { encoding: 'utf8' });
     const lines = content.split('\n').filter((l) => /iface|source/.test(l));
@@ -561,7 +565,7 @@ function checkLinuxDCHPInterfaces(file) {
       }
       if (line.toLowerCase().includes('source')) {
         const file = line.split(' ')[1];
-        result = result.concat(checkLinuxDCHPInterfaces(file));
+        result = result.concat(checkLinuxDCHPInterfaces(file, depth + 1));
       }
     });
   } catch {
@@ -1426,7 +1430,7 @@ function networkStatsSingle(iface) {
                     rx_errors = rx_errors + parseInt(line[5]);
                   }
                   tx_bytes = tx_bytes + parseInt(line[10]);
-                  if (line[12].trim() !== '-') {
+                  if (line[12] && line[12].trim() !== '-') {
                     tx_dropped = tx_dropped + parseInt(line[12]);
                   }
                   if (line[9].trim() !== '-') {
@@ -1725,10 +1729,10 @@ function networkConnections(callback) {
                   const hasState = states.indexOf(line[5]) >= 0;
                   const connstate = hasState ? line[5] : 'UNKNOWN';
                   let pidField = '';
-                  if (line[line.length - 9].indexOf(':') >= 0) {
+                  if (line[line.length - 9] && line[line.length - 9].indexOf(':') >= 0) {
                     pidField = line[line.length - 9].split(':')[1];
                   } else {
-                    pidField = line[pidPos + (hasState ? 0 : -1)];
+                    pidField = line[pidPos + (hasState ? 0 : -1)] || '';
 
                     if (pidField.indexOf(':') >= 0) {
                       pidField = pidField.split(':')[1];
@@ -1754,6 +1758,11 @@ function networkConnections(callback) {
               }
               resolve(result);
             });
+          } else {
+            if (callback) {
+              callback(result);
+            }
+            resolve(result);
           }
         });
       }
@@ -1844,6 +1853,11 @@ function networkConnections(callback) {
                 callback(result);
               }
               resolve(result);
+            } else {
+              if (callback) {
+                callback(result);
+              }
+              resolve(result);
             }
           });
         } catch {