harperdb 3.1.3 → 3.1.4

package/node_modules/systeminformation/lib/cpu.js

@@ -550,14 +550,14 @@ function getCpu() {
       cpuFlags().then(flags => {
         result.flags = flags;
         result.virtualization = flags.indexOf('vmx') > -1 || flags.indexOf('svm') > -1;
-        // if (_windows) {
-        //   try {
-        //     const systeminfo = execSync('systeminfo', util.execOptsWin).toString();
-        //     result.virtualization = result.virtualization || (systeminfo.indexOf('Virtualization Enabled In Firmware: Yes') !== -1) || (systeminfo.indexOf('Virtualisierung in Firmware aktiviert: Ja') !== -1) || (systeminfo.indexOf('Virtualisation activée dans le microprogramme : Qiu') !== -1);
-        //   } catch (e) {
-        //     util.noop();
-        //   }
-        // }
+        if (_windows) {
+          try {
+            const systeminfo = execSync('systeminfo', util.execOptsWin).toString();
+            result.virtualization = result.virtualization || (systeminfo.indexOf('Virtualization Enabled In Firmware: Yes') !== -1) || (systeminfo.indexOf('Virtualisierung in Firmware aktiviert: Ja') !== -1) || (systeminfo.indexOf('Virtualisation activée dans le microprogramme : Qiu') !== -1);
+          } catch (e) {
+            util.noop();
+          }
+        }
         if (_darwin) {
           exec('sysctl machdep.cpu hw.cpufrequency_max hw.cpufrequency_min hw.packages hw.physicalcpu_max hw.ncpu hw.tbfrequency hw.cpufamily hw.cpusubfamily', function (error, stdout) {
             let lines = stdout.toString().split('\n');
@@ -753,7 +753,6 @@ function getCpu() {
             const workload = [];
             workload.push(util.wmic('cpu get /value'));
             workload.push(util.wmic('path Win32_CacheMemory get CacheType,InstalledSize,Purpose'));
-            workload.push(util.powerShell('Get-ComputerInfo -property "HyperV*"'));
 
             Promise.all(
               workload
@@ -832,10 +831,6 @@ function getCpu() {
                   }
                 }
               });
-              lines = data[2].split('\r\n');
-              result.virtualization = (util.getValue(lines, 'HyperVRequirementVirtualizationFirmwareEnabled').toLowerCase() === 'true');
-              result.virtualization = (util.getValue(lines, 'HyperVisorPresent').toLowerCase() === 'true');
-
               resolve(result);
             });
           } catch (e) {
@@ -1613,3 +1608,5 @@ function fullLoad(callback) {
 }
 
 exports.fullLoad = fullLoad;
+
+

package/node_modules/systeminformation/lib/docker.js

@@ -159,7 +159,7 @@ function dockerImagesInspect(imageID, payload) {
     process.nextTick(() => {
       imageID = imageID || '';
       if (typeof imageID !== 'string') {
-        return resolve();
+        resolve();
       }
       const imageIDSanitized = (util.isPrototypePolluted() ? '' : util.sanitizeShellString(imageID, true)).trim();
       if (imageIDSanitized) {
@@ -307,7 +307,7 @@ function dockerContainerInspect(containerID, payload) {
     process.nextTick(() => {
       containerID = containerID || '';
       if (typeof containerID !== 'string') {
-        return resolve();
+        resolve();
       }
       const containerIdSanitized = (util.isPrototypePolluted() ? '' : util.sanitizeShellString(containerID, true)).trim();
       if (containerIdSanitized) {
@@ -601,7 +601,7 @@ function dockerContainerProcesses(containerID, callback) {
     process.nextTick(() => {
       containerID = containerID || '';
       if (typeof containerID !== 'string') {
-        return resolve(result);
+        resolve(result);
       }
       const containerIdSanitized = (util.isPrototypePolluted() ? '' : util.sanitizeShellString(containerID, true)).trim();
 

package/node_modules/systeminformation/lib/filesystem.js

@@ -13,12 +13,10 @@
 // 8. File System
 // ----------------------------------------------------------------------------------
 
-const util = require('./util');
-const fs = require('fs');
-
 const exec = require('child_process').exec;
 const execSync = require('child_process').execSync;
-const execPromiseSave = util.promisifySave(require('child_process').exec);
+const util = require('./util');
+const fs = require('fs');
 
 let _platform = process.platform;
 
@@ -98,7 +96,7 @@ function fsSize(callback) {
         }
         if (_linux) { cmd = 'df -lkPTx squashfs | grep  -E "^/|^.\\:"'; }
         if (_freebsd || _openbsd || _netbsd) { cmd = 'df -lkPT'; }
-        exec(cmd, { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+        exec(cmd, function (error, stdout) {
           if (!error) {
             let lines = stdout.toString().split('\n');
             data = parseDf(lines);
@@ -107,7 +105,7 @@ function fsSize(callback) {
             }
             resolve(data);
           } else {
-            exec('df -kPT', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+            exec('df -kPT', function (error, stdout) {
               if (!error) {
                 let lines = stdout.toString().split('\n');
                 data = parseDf(lines);
@@ -174,7 +172,7 @@ function fsOpenFiles(callback) {
       };
       if (_freebsd || _openbsd || _netbsd || _darwin) {
         let cmd = 'sysctl -a | grep \'kern.*files\'';
-        exec(cmd, { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+        exec(cmd, function (error, stdout) {
           if (!error) {
             let lines = stdout.toString().split('\n');
             result.max = parseInt(util.getValue(lines, 'kern.maxfiles', ':'), 10);
@@ -353,7 +351,7 @@ function blockDevices(callback) {
       if (_linux) {
         // see https://wiki.ubuntuusers.de/lsblk/
         // exec("lsblk -bo NAME,TYPE,SIZE,FSTYPE,MOUNTPOINT,UUID,ROTA,RO,TRAN,SERIAL,LABEL,MODEL,OWNER,GROUP,MODE,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,SCHED,RQ-SIZE,RA,WSAME", function (error, stdout) {
-        exec('lsblk -bPo NAME,TYPE,SIZE,FSTYPE,MOUNTPOINT,UUID,ROTA,RO,RM,TRAN,SERIAL,LABEL,MODEL,OWNER 2>/dev/null', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+        exec('lsblk -bPo NAME,TYPE,SIZE,FSTYPE,MOUNTPOINT,UUID,ROTA,RO,RM,TRAN,SERIAL,LABEL,MODEL,OWNER 2>/dev/null', function (error, stdout) {
           if (!error) {
             let lines = blkStdoutToObject(stdout).split('\n');
             data = parseBlk(lines);
@@ -362,7 +360,7 @@ function blockDevices(callback) {
             }
             resolve(data);
           } else {
-            exec('lsblk -bPo NAME,TYPE,SIZE,FSTYPE,MOUNTPOINT,UUID,ROTA,RO,RM,LABEL,MODEL,OWNER 2>/dev/null', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+            exec('lsblk -bPo NAME,TYPE,SIZE,FSTYPE,MOUNTPOINT,UUID,ROTA,RO,RM,LABEL,MODEL,OWNER 2>/dev/null', function (error, stdout) {
               if (!error) {
                 let lines = blkStdoutToObject(stdout).split('\n');
                 data = parseBlk(lines);
@@ -376,7 +374,7 @@ function blockDevices(callback) {
         });
       }
       if (_darwin) {
-        exec('diskutil info -all', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+        exec('diskutil info -all', function (error, stdout) {
           if (!error) {
             let lines = stdout.toString().split('\n');
             // parse lines into temp array of devices
@@ -493,7 +491,7 @@ function fsStats(callback) {
   return new Promise((resolve) => {
     process.nextTick(() => {
       if (_windows) {
-        return resolve(null);
+        resolve(null);
       }
 
       let result = {
@@ -511,7 +509,7 @@ function fsStats(callback) {
       if ((_fs_speed && !_fs_speed.ms) || (_fs_speed && _fs_speed.ms && Date.now() - _fs_speed.ms >= 500)) {
         if (_linux) {
           // exec("df -k | grep /dev/", function(error, stdout) {
-          exec('lsblk -r 2>/dev/null | grep /', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+          exec('lsblk -r 2>/dev/null | grep /', function (error, stdout) {
             if (!error) {
               let lines = stdout.toString().split('\n');
               let fs_filter = [];
@@ -523,7 +521,7 @@ function fsStats(callback) {
               });
 
               let output = fs_filter.join('|');
-              exec('cat /proc/diskstats | egrep "' + output + '"', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+              exec('cat /proc/diskstats | egrep "' + output + '"', function (error, stdout) {
                 if (!error) {
                   let lines = stdout.toString().split('\n');
                   lines.forEach(function (line) {
@@ -551,7 +549,7 @@ function fsStats(callback) {
           });
         }
         if (_darwin) {
-          exec('ioreg -c IOBlockStorageDriver -k Statistics -r -w0 | sed -n "/IOBlockStorageDriver/,/Statistics/p" | grep "Statistics" | tr -cd "01234567890,\n"', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+          exec('ioreg -c IOBlockStorageDriver -k Statistics -r -w0 | sed -n "/IOBlockStorageDriver/,/Statistics/p" | grep "Statistics" | tr -cd "01234567890,\n"', function (error, stdout) {
             if (!error) {
               let lines = stdout.toString().split('\n');
               lines.forEach(function (line) {
@@ -635,10 +633,10 @@ function disksIO(callback) {
   return new Promise((resolve) => {
     process.nextTick(() => {
       if (_windows) {
-        return resolve(null);
+        resolve(null);
       }
       if (_sunos) {
-        return resolve(null);
+        resolve(null);
       }
 
       let result = {
@@ -660,7 +658,7 @@ function disksIO(callback) {
           // var cmd = "for mount in `lsblk | grep / | sed 's/[│└─├]//g' | awk '{$1=$1};1' | cut -d ' ' -f 1 | sort -u`; do cat /sys/block/$mount/stat | sed -r 's/ +/;/g' | sed -r 's/^;//'; done";
           let cmd = 'for mount in `lsblk 2>/dev/null | grep " disk " | sed "s/[│└─├]//g" | awk \'{$1=$1};1\' | cut -d " " -f 1 | sort -u`; do cat /sys/block/$mount/stat | sed -r "s/ +/;/g" | sed -r "s/^;//"; done';
 
-          exec(cmd, { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+          exec(cmd, function (error, stdout) {
             if (!error) {
               let lines = stdout.split('\n');
               lines.forEach(function (line) {
@@ -687,7 +685,7 @@ function disksIO(callback) {
           });
         }
         if (_darwin) {
-          exec('ioreg -c IOBlockStorageDriver -k Statistics -r -w0 | sed -n "/IOBlockStorageDriver/,/Statistics/p" | grep "Statistics" | tr -cd "01234567890,\n"', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+          exec('ioreg -c IOBlockStorageDriver -k Statistics -r -w0 | sed -n "/IOBlockStorageDriver/,/Statistics/p" | grep "Statistics" | tr -cd "01234567890,\n"', function (error, stdout) {
             if (!error) {
               let lines = stdout.toString().split('\n');
               lines.forEach(function (line) {
@@ -793,7 +791,7 @@ function diskLayout(callback) {
       if (_linux) {
         let cmdFullSmart = '';
 
-        exec('export LC_ALL=C; lsblk -ablJO 2>/dev/null; unset LC_ALL', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+        exec('export LC_ALL=C; lsblk -ablJO 2>/dev/null; unset LC_ALL', function (error, stdout) {
           if (!error) {
             try {
               const out = stdout.toString().trim();
@@ -853,7 +851,7 @@ function diskLayout(callback) {
           }
           // check S.M.A.R.T. status
           if (cmdFullSmart) {
-            exec(cmdFullSmart, { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+            exec(cmdFullSmart, function (error, stdout) {
               try {
                 const data = JSON.parse(`[${stdout}]`);
                 data.forEach(disk => {
@@ -873,7 +871,7 @@ function diskLayout(callback) {
               } catch (e) {
                 if (cmd) {
                   cmd = cmd + 'printf "\n"';
-                  exec(cmd, { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+                  exec(cmd, function (error, stdout) {
                     let lines = stdout.toString().split('\n');
                     lines.forEach(line => {
                       if (line) {
@@ -915,7 +913,7 @@ function diskLayout(callback) {
         resolve(result);
       }
       if (_darwin) {
-        exec('system_profiler SPSerialATADataType SPNVMeDataType SPUSBDataType', { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+        exec('system_profiler SPSerialATADataType SPNVMeDataType SPUSBDataType', function (error, stdout) {
           if (!error) {
             // split by type:
             let lines = stdout.toString().split('\n');
@@ -1073,7 +1071,7 @@ function diskLayout(callback) {
             }
             if (cmd) {
               cmd = cmd + 'printf "\n"';
-              exec(cmd, { maxBuffer: 1024 * 1024 }, function (error, stdout) {
+              exec(cmd, function (error, stdout) {
                 let lines = stdout.toString().split('\n');
                 lines.forEach(line => {
                   if (line) {
@@ -1116,25 +1114,8 @@ function diskLayout(callback) {
       }
       if (_windows) {
         try {
-          const workload = [];
-          workload.push(util.wmic('diskdrive get /value'));
-          workload.push(util.powerShell('Get-PhysicalDisk | Format-List'));
-          if (util.smartMonToolsInstalled()) {
-            try {
-              const smartDev = JSON.parse(execSync('smartctl --scan -j'));
-              if (smartDev && smartDev.devices && smartDev.devices.length > 0) {
-                smartDev.devices.forEach((dev) => {
-                  workload.push(execPromiseSave(`smartctl -j -a ${dev.name}`, util.execOptsWin));
-                });
-              }
-            } catch (e) {
-              util.noop();
-            }
-          }
-          util.promiseAll(
-            workload
-          ).then(data => {
-            let devices = data.results[0].toString().split(/\n\s*\n/);
+          util.wmic('diskdrive get /value').then((stdout) => {
+            let devices = stdout.toString().split(/\n\s*\n/);
             devices.forEach(function (device) {
               let lines = device.split('\r\n');
               const size = util.getValue(lines, 'Size', '=').trim();
@@ -1144,7 +1125,7 @@ function diskLayout(callback) {
                   device: util.getValue(lines, 'PNPDeviceId', '='),
                   type: device.indexOf('SSD') > -1 ? 'SSD' : 'HD',  // just a starting point ... better: MSFT_PhysicalDisk - Media Type ... see below
                   name: util.getValue(lines, 'Caption', '='),
-                  vendor: getVendorFromModel(util.getValue(lines, 'Caption', '=', true).trim()),
+                  vendor: util.getValue(lines, 'Manufacturer', '='),
                   size: parseInt(size),
                   bytesPerSector: parseInt(util.getValue(lines, 'BytesPerSector', '=')),
                   totalCylinders: parseInt(util.getValue(lines, 'TotalCylinders', '=')),
@@ -1161,51 +1142,43 @@ function diskLayout(callback) {
                 });
               }
             });
-            devices = data.results[1].split(/\n\s*\n/);
-            devices.forEach(function (device) {
-              let lines = device.split('\r\n');
-              const serialNum = util.getValue(lines, 'SerialNumber', ':').trim();
-              const name = util.getValue(lines, 'FriendlyName', ':').trim().replace('Msft ', 'Microsoft');
-              const size = util.getValue(lines, 'Size', ':').trim();
-              const model = util.getValue(lines, 'Model', ':').trim();
-              const interfaceType = util.getValue(lines, 'BusType', ':').trim();
-              let mediaType = util.getValue(lines, 'MediaType', ':').trim();
-              if (mediaType === '3' || mediaType === 'HDD') { mediaType = 'HD'; }
-              if (mediaType === '4') { mediaType = 'SSD'; }
-              if (mediaType === '5') { mediaType = 'SCM'; }
-              if (mediaType === 'Unspecified' && (model.toLowerCase().indexOf('virtual') > -1 || model.toLowerCase().indexOf('vbox') > -1)) { mediaType = 'Virtual'; }
-              if (size) {
-                let i = util.findObjectByKey(result, 'serialNum', serialNum);
-                if (i === -1 || serialNum === '') {
-                  i = util.findObjectByKey(result, 'name', name);
-                }
-                if (i != -1) {
-                  result[i].type = mediaType;
-                  result[i].interfaceType = interfaceType;
-                }
-              }
-            });
-            // S.M.A.R.T
-            data.results.shift();
-            data.results.shift();
-            data.results.forEach((smartStr) => {
-              const smartData = JSON.parse(smartStr);
-              if (smartData.serial_number) {
-                const serialNum = smartData.serial_number;
-                let i = util.findObjectByKey(result, 'serialNum', serialNum);
-                if (i != -1) {
-                  result[i].smartStatus = (smartData.smart_status.passed ? 'Ok' : (smartData.smart_status.passed === false ? 'Predicted Failure' : 'unknown'));
-                  if (smartData.temperature && smartData.temperature.current) {
-                    result[i].temperature = smartData.temperature.current;
+            util.powerShell('Get-PhysicalDisk | Format-List')
+              .then(data => {
+                let devices = data.split(/\n\s*\n/);
+                devices.forEach(function (device) {
+                  let lines = device.split('\r\n');
+                  const serialNum = util.getValue(lines, 'SerialNumber', ':').trim();
+                  const name = util.getValue(lines, 'FriendlyName', ':').trim().replace('Msft ', 'Microsoft');
+                  const size = util.getValue(lines, 'Size', ':').trim();
+                  const model = util.getValue(lines, 'Model', ':').trim();
+                  const interfaceType = util.getValue(lines, 'BusType', ':').trim();
+                  let mediaType = util.getValue(lines, 'MediaType', ':').trim();
+                  if (mediaType === '3' || mediaType === 'HDD') { mediaType = 'HD'; }
+                  if (mediaType === '4') { mediaType = 'SSD'; }
+                  if (mediaType === '5') { mediaType = 'SCM'; }
+                  if (mediaType === 'Unspecified' && (model.toLowerCase().indexOf('virtual') > -1 || model.toLowerCase().indexOf('vbox') > -1)) { mediaType = 'Virtual'; }
+                  if (size) {
+                    let i = util.findObjectByKey(result, 'serialNum', serialNum);
+                    if (i === -1 || serialNum === '') {
+                      i = util.findObjectByKey(result, 'name', name);
+                    }
+                    if (i != -1) {
+                      result[i].type = mediaType;
+                      result[i].interfaceType = interfaceType;
+                    }
                   }
-                  result[i].smartData = smartData;
+                });
+                if (callback) {
+                  callback(result);
                 }
-              }
-            });
-            if (callback) {
-              callback(result);
-            }
-            resolve(result);
+                resolve(result);
+              })
+              .catch(() => {
+                if (callback) {
+                  callback(result);
+                }
+                resolve(result);
+              });
           });
         } catch (e) {
           if (callback) { callback(result); }

package/node_modules/systeminformation/lib/graphics.js

@@ -108,7 +108,7 @@ function graphics(callback) {
             };
           }
           if (Object.keys(currentDisplay).length > 0) {// just changed to Displays
-            if (currentDisplay.resolutionX && currentDisplay.resolutionY) { displays.push(currentDisplay); }
+            displays.push(currentDisplay);
             currentDisplay = {
               vendor: '',
               model: '',
@@ -172,20 +172,10 @@ function graphics(callback) {
         if (4 === level) {       // display controller details level
           if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('resolution') !== -1) {
             let resolution = parts[1].split('x');
-            if (resolution.length > 1) {
-              let xpart = resolution[0];
-              if (xpart.indexOf('(') !== -1) {
-                xpart = xpart.split('(').slice(-1)[0];
-              }
-              let ypart = resolution[1];
-              if (ypart.indexOf(')') !== -1) {
-                ypart = ypart.split(')')[0];
-              }
-              currentDisplay.resolutionX = parseInt(xpart) || 0;
-              currentDisplay.resolutionY = parseInt(ypart) || 0;
-              currentDisplay.currentResX = currentDisplay.resolutionX;
-              currentDisplay.currentResY = currentDisplay.resolutionY;
-            }
+            currentDisplay.resolutionX = (resolution.length > 1 ? parseInt(resolution[0]) : 0);
+            currentDisplay.resolutionY = (resolution.length > 1 ? parseInt(resolution[1]) : 0);
+            currentDisplay.currentResX = currentDisplay.resolutionX;
+            currentDisplay.currentResY = currentDisplay.resolutionY;
           }
           if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('pixeldepth') !== -1) { currentDisplay.pixelDepth = parseInt(parts[1]); } // in BIT
           if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('framebufferdepth') !== -1) { currentDisplay.pixelDepth = parseInt(parts[1]); } // in BIT
@@ -210,7 +200,7 @@ function graphics(callback) {
       controllers.push(currentController);
     }
     if (Object.keys(currentDisplay).length > 0) {// just changed to Displays
-      if (currentDisplay.resolutionX && currentDisplay.resolutionY) { displays.push(currentDisplay); }
+      displays.push(currentDisplay);
     }
     return ({
       controllers: controllers,
@@ -498,6 +488,8 @@ function graphics(callback) {
     return controller;
   }
 
+
+
   function parseLinesLinuxEdid(edid) {
     // parsen EDID
     // --> model
@@ -736,7 +728,7 @@ function graphics(callback) {
               const nvidiaData = nvidiaDevices();
               // 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(({ pciBus }) => pciBus.toLowerCase().endsWith(controller.busAddress.toLowerCase())) || {});
               });
             }
             let cmd = 'clinfo --raw';
@@ -783,7 +775,6 @@ function graphics(callback) {
         try {
           const workload = [];
           workload.push(util.wmic('path win32_VideoController get /value'));
-          workload.push(util.powerShell('gp "HKLM:\\SYSTEM\\ControlSet001\\Control\\Class\\{4d36e968-e325-11ce-bfc1-08002be10318}\\*" -ErrorAction SilentlyContinue | where MatchingDeviceId $null -NE | select MatchingDeviceId,HardwareInformation.qwMemorySize | fl'));
           workload.push(util.wmic('path win32_desktopmonitor get /value'));
           workload.push(util.powerShell('Get-CimInstance -Namespace root\\wmi -ClassName WmiMonitorBasicDisplayParams | fl'));
           workload.push(util.powerShell('Add-Type -AssemblyName System.Windows.Forms; [System.Windows.Forms.Screen]::AllScreens'));
@@ -795,10 +786,10 @@ function graphics(callback) {
           Promise.all(
             workload
           ).then(data => {
-            // controller + vram
+            // controller
             let csections = data[0].split(/\n\s*\n/);
-            let vsections = data[1].split(/\n\s*\n/);
-            result.controllers = parseLinesWindowsControllers(csections, vsections);
+            result.controllers = parseLinesWindowsControllers(csections);
+            // needs to be rewritten ... using no spread operators
             result.controllers = result.controllers.map((controller) => { // match by subDeviceId
               if (controller.vendor.toLowerCase() === 'nvidia') {
                 return mergeControllerNvidia(controller, nvidiaData.find(device => {
@@ -821,27 +812,26 @@ function graphics(callback) {
                 return controller;
               }
             });
-
             // displays
-            let dsections = data[2].split(/\n\s*\n/);
+            let dsections = data[1].split(/\n\s*\n/);
             // result.displays = parseLinesWindowsDisplays(dsections);
             dsections.shift();
             dsections.pop();
 
             // monitor (powershell)
-            let msections = data[3].split('Active ');
+            let msections = data[2].split('Active ');
             msections.shift();
 
             // forms.screens (powershell)
-            let ssections = data[4].split('BitsPerPixel ');
+            let ssections = data[3].split('BitsPerPixel ');
             ssections.shift();
 
             // connection params (powershell) - video type
-            let tsections = data[5].split(/\n\s*\n/);
+            let tsections = data[4].split(/\n\s*\n/);
             tsections.shift();
 
             // monitor ID (powershell) - model / vendor
-            const res = data[6].split(/\r\n/);
+            const res = data[5].split(/\r\n/);
             let isections = [];
             res.forEach(element => {
               const parts = element.split('|');
@@ -897,85 +887,26 @@ function graphics(callback) {
     });
   });
 
-  function parseLinesWindowsControllers(sections, vections) {
-    const memorySizes = {};
-    for (const i in vections) {
-      if ({}.hasOwnProperty.call(vections, i)) {
-        if (vections[i].trim() !== '') {
-          const lines = vections[i].trim().split(os.EOL);
-          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);
-          if (matchingDeviceId) {
-            const quadWordmemorySize = parseInt(util.getValue(lines, 'HardwareInformation.qwMemorySize'));
-            if (!isNaN(quadWordmemorySize)) {
-              let deviceId = matchingDeviceId[1].toUpperCase() + '&' + matchingDeviceId[2].toUpperCase();
-              if (matchingDeviceId[3]) {
-                deviceId += '&' + matchingDeviceId[3].toUpperCase();
-              }
-              if (matchingDeviceId[4]) {
-                deviceId += '&' + matchingDeviceId[4].toUpperCase();
-              }
-              memorySizes[deviceId] = quadWordmemorySize;
-            }
-          }
-        }
-      }
-    }
-
+  function parseLinesWindowsControllers(sections) {
     let controllers = [];
     for (let i in sections) {
       if ({}.hasOwnProperty.call(sections, i)) {
         if (sections[i].trim() !== '') {
+
           let lines = sections[i].trim().split('\r\n');
-          let 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);
+          let pnpDeviceId = util.getValue(lines, 'PNPDeviceID', '=').match(/SUBSYS_[a-fA-F\d]{8}/);
           let subDeviceId = null;
-          let memorySize = null;
           if (pnpDeviceId) {
-            subDeviceId = pnpDeviceId[3];
+            subDeviceId = pnpDeviceId[0];
             if (subDeviceId) {
               subDeviceId = subDeviceId.split('_')[1];
             }
-
-            // Match PCI device identifier (there's an order of increasing generality):
-            // https://docs.microsoft.com/en-us/windows-hardware/drivers/install/identifiers-for-pci-devices
-
-            // 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)) {
-                memorySize = memorySizes[deviceId];
-              }
-            }
-
-            // 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)) {
-                memorySize = memorySizes[deviceId];
-              }
-            }
-
-            // 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)) {
-                memorySize = memorySizes[deviceId];
-              }
-            }
-
-            // PCI\VEN_v(4)&DEV_d(4)
-            if (memorySize == null) {
-              const deviceId = pnpDeviceId[1].toUpperCase() + '&' + pnpDeviceId[2].toUpperCase();
-              if ({}.hasOwnProperty.call(memorySizes, deviceId)) {
-                memorySize = memorySizes[deviceId];
-              }
-            }
           }
-
           controllers.push({
             vendor: util.getValue(lines, 'AdapterCompatibility', '='),
             model: util.getValue(lines, 'name', '='),
             bus: util.getValue(lines, 'PNPDeviceID', '=').startsWith('PCI') ? 'PCI' : '',
-            vram: (memorySize == null ? util.toInt(util.getValue(lines, 'AdapterRAM', '=')) : memorySize) / 1024 / 1024,
+            vram: util.toInt(util.getValue(lines, 'AdapterRAM', '=')) / 1024 / 1024,
             vramDynamic: (util.getValue(lines, 'VideoMemoryType', '=') === '2'),
             subDeviceId
           });