systeminformation 5.9.14 → 5.9.18

package/lib/util.js

@@ -37,6 +37,17 @@ let _smartMonToolsInstalled = null;
 
 const WINDIR = process.env.WINDIR || 'C:\\Windows';
 
+// powerShell
+let _psChild;
+let _psResult = '';
+let _psCmds = [];
+let _psPersistent = false;
+const _psToUTF8 = '$OutputEncoding = [System.Console]::OutputEncoding = [System.Console]::InputEncoding = [System.Text.Encoding]::UTF8 ; ';
+const _psCmdStart = '--###START###--';
+const _psError = '--ERROR--';
+const _psCmdSeperator = '--###ENDCMD###--';
+const _psIdSeperator = '--##ID##--';
+
 const execOptsWin = {
   windowsHide: true,
   maxBuffer: 1024 * 20000,
@@ -352,59 +363,157 @@ function getVboxmanage() {
   return _windows ? `"${process.env.VBOX_INSTALL_PATH || process.env.VBOX_MSI_INSTALL_PATH}\\VBoxManage.exe"` : 'vboxmanage';
 }
 
-function powerShell(cmd) {
+function powerShellProceedResults(data) {
+  let id = '';
+  let parts;
+  let res = '';
+  // startID
+  if (data.indexOf(_psCmdStart) >= 0) {
+    parts = data.split(_psCmdStart);
+    const parts2 = parts[1].split(_psIdSeperator);
+    id = parts2[0];
+    if (parts2.length > 1) {
+      data = parts2.slice(1).join(_psIdSeperator);
+    }
+  }
+  // result;
+  if (data.indexOf(_psCmdSeperator) >= 0) {
+    parts = data.split(_psCmdSeperator);
+    res = parts[0];
+  }
+  let remove = -1;
+  for (let i = 0; i < _psCmds.length; i++) {
+    if (_psCmds[i].id === id) {
+      remove = i;
+      // console.log(`----- TIME  : ${(new Date() - _psCmds[i].start) * 0.001} s`);
 
-  let result = '';
-  const toUTF8 = '$OutputEncoding = [System.Console]::OutputEncoding = [System.Console]::InputEncoding = [System.Text.Encoding]::UTF8 ; ';
+      _psCmds[i].callback(res);
+    }
+  }
+  if (remove >= 0) {
+    _psCmds.splice(remove, 1);
+  }
+}
 
-  return new Promise((resolve) => {
-    process.nextTick(() => {
-      try {
-        const child = spawn('powershell.exe', ['-NoLogo', '-NoProfile', '-InputFormat', 'Text', '-NoExit', '-ExecutionPolicy', 'Unrestricted', '-Command', '-'], { // added NoProfile
-          stdio: 'pipe',
-          windowsHide: true,
-          maxBuffer: 1024 * 20000,
-          encoding: 'UTF-8',
-          env: util._extend({}, process.env, { LANG: 'en_US.UTF-8' })
-        });
+function powerShellStart() {
+  _psChild = spawn('powershell.exe', ['-NoLogo', '-InputFormat', 'Text', '-NoExit', '-ExecutionPolicy', 'Unrestricted', '-Command', '-'], {
+    stdio: 'pipe',
+    windowsHide: true,
+    maxBuffer: 1024 * 20000,
+    encoding: 'UTF-8',
+    env: util._extend({}, process.env, { LANG: 'en_US.UTF-8' })
+  });
+  if (_psChild && _psChild.pid) {
+    _psPersistent = true;
+    _psChild.stdout.on('data', function (data) {
+      _psResult = _psResult + data.toString('utf8');
+      if (data.indexOf(_psCmdSeperator) >= 0) {
+        powerShellProceedResults(_psResult);
+        _psResult = '';
+      }
+    });
+    _psChild.stderr.on('data', function () {
+      powerShellProceedResults(_psResult + _psError);
+    });
+    _psChild.on('error', function () {
+      powerShellProceedResults(_psResult + _psError);
+    });
+    _psChild.on('close', function () {
+      _psChild.kill();
+    });
+  }
+}
 
-        if (child && !child.pid) {
-          child.on('error', function () {
-            resolve(result);
-          });
+function powerShellRelease() {
+  try {
+    _psChild.stdin.write('exit' + os.EOL);
+    _psChild.stdin.end();
+    _psPersistent = false;
+  } catch (e) {
+    _psChild.kill();
+  }
+}
+
+function powerShell(cmd) {
+
+  if (_psPersistent) {
+    const id = Math.random().toString(36).substr(2, 10);
+    return new Promise((resolve) => {
+      process.nextTick(() => {
+        function callback(data) {
+          resolve(data);
         }
-        if (child && child.pid) {
-          child.stdout.on('data', function (data) {
-            result = result + data.toString('utf8');
-          });
-          child.stderr.on('data', function () {
-            child.kill();
-            resolve(result);
-          });
-          child.on('close', function () {
-            child.kill();
-            resolve(result);
-          });
-          child.on('error', function () {
-            child.kill();
-            resolve(result);
+        _psCmds.push({
+          id,
+          cmd,
+          callback,
+          start: new Date()
+        });
+        try {
+          if (_psChild && _psChild.pid) {
+            _psChild.stdin.write(_psToUTF8 + 'echo ' + _psCmdStart + id + _psIdSeperator + '; ' + os.EOL + cmd + os.EOL + 'echo ' + _psCmdSeperator + os.EOL);
+          }
+        } catch (e) {
+          resolve('');
+        }
+      });
+    });
+
+  } else {
+    let result = '';
+
+    return new Promise((resolve) => {
+      process.nextTick(() => {
+        try {
+          // const start = new Date();
+          const child = spawn('powershell.exe', ['-NoLogo', '-InputFormat', 'Text', '-NoExit', '-ExecutionPolicy', 'Unrestricted', '-Command', '-'], {
+            stdio: 'pipe',
+            windowsHide: true,
+            maxBuffer: 1024 * 20000,
+            encoding: 'UTF-8',
+            env: util._extend({}, process.env, { LANG: 'en_US.UTF-8' })
           });
-          try {
-            child.stdin.write(toUTF8 + cmd + os.EOL);
-            child.stdin.write('exit' + os.EOL);
-            child.stdin.end();
-          } catch (e) {
-            child.kill();
+
+          if (child && !child.pid) {
+            child.on('error', function () {
+              resolve(result);
+            });
+          }
+          if (child && child.pid) {
+            child.stdout.on('data', function (data) {
+              result = result + data.toString('utf8');
+            });
+            child.stderr.on('data', function () {
+              child.kill();
+              resolve(result);
+            });
+            child.on('close', function () {
+              child.kill();
+              // console.log(`----- TIME  : ${(new Date() - start) * 0.001} s`);
+
+              resolve(result);
+            });
+            child.on('error', function () {
+              child.kill();
+              resolve(result);
+            });
+            try {
+              child.stdin.write(_psToUTF8 + cmd + os.EOL);
+              child.stdin.write('exit' + os.EOL);
+              child.stdin.end();
+            } catch (e) {
+              child.kill();
+              resolve(result);
+            }
+          } else {
             resolve(result);
           }
-        } else {
+        } catch (e) {
           resolve(result);
         }
-      } catch (e) {
-        resolve(result);
-      }
+      });
     });
-  });
+  }
 }
 
 function execSafe(cmd, args, options) {
@@ -1002,91 +1111,98 @@ function linuxVersion() {
 }
 
 function plistParser(xmlStr) {
-  const tags = ['array', 'dict', 'key', 'string', 'integer', 'date', 'real', 'data'];
-
-  function getNextTagPos() {
-    let result = {
-      pos: 999999,
-      tag: ''
-    };
-    tags.forEach((tag) => {
-      const ii = xmlStr.indexOf(`<${tag}>`);
-      if (ii !== -1 && ii < result.pos) {
-        result = {
-          pos: ii,
-          tag
-        };
-      }
-    });
-    return result;
-  }
+  const tags = ['array', 'dict', 'key', 'string', 'integer', 'date', 'real', 'data', 'boolean', 'arrayEmpty'];
+  const startStr = '<plist version';
 
-  function getNextClosingTagPos(tag) {
-    return xmlStr.indexOf(`</${tag}>`);
+  let pos = xmlStr.indexOf(startStr);
+  let len = xmlStr.length;
+  while (xmlStr[pos] !== '>' && pos < len) {
+    pos++;
   }
 
-  function parseXmlTree(isArray, closingTag) {
-    // start parsing
-    let obj = {};
-    let arr = [];
-    let cpos = getNextTagPos();
-    let key = '';
-    let valueStr = null;
-
-    while (cpos.pos >= 0 && cpos.tag) {
-      let nextTagPos = getNextTagPos();
-      // let nextClosePos = getNextClosingTagPos(cpos.tag);
-      let nextClosePosBlock = closingTag ? getNextClosingTagPos(closingTag) : 999999;
-      if (nextClosePosBlock <= nextTagPos.pos) {
-        return (isArray ? arr : obj);
+  let depth = 0;
+  let inTagStart = false;
+  let inTagContent = false;
+  let inTagEnd = false;
+  let metaData = [{ tagStart: '', tagEnd: '', tagContent: '', key: '', data: null }];
+  let c = '';
+  let cn = xmlStr[pos];
+
+  while (pos < len) {
+    c = cn;
+    if (pos + 1 < len) { cn = xmlStr[pos + 1]; }
+    if (c === '<') {
+      inTagContent = false;
+      if (cn === '/') { inTagEnd = true; }
+      else if (metaData[depth].tagStart) {
+        metaData[depth].tagContent = '';
+        if (!metaData[depth].data) { metaData[depth].data = metaData[depth].tagStart === 'array' ? [] : {}; }
+        depth++;
+        metaData.push({ tagStart: '', tagEnd: '', tagContent: '', key: null, data: null });
+        inTagStart = true;
+        inTagContent = false;
       }
-      xmlStr = xmlStr.substring((cpos.pos + cpos.tag.length + 2));
-      if (cpos.tag === 'array') {
-        const res = parseXmlTree(true, cpos.tag);
-        if (key) {
-          obj[key] = res;
-        } else {
-          obj = res;
+      else if (!inTagStart) { inTagStart = true; }
+    } else if (c === '>') {
+      if (metaData[depth].tagStart === 'true/') { inTagStart = false; inTagEnd = true; metaData[depth].tagStart = ''; metaData[depth].tagEnd = '/boolean'; metaData[depth].data = true; }
+      if (metaData[depth].tagStart === 'false/') { inTagStart = false; inTagEnd = true; metaData[depth].tagStart = ''; metaData[depth].tagEnd = '/boolean'; metaData[depth].data = false; }
+      if (metaData[depth].tagStart === 'array/') { inTagStart = false; inTagEnd = true; metaData[depth].tagStart = ''; metaData[depth].tagEnd = '/arrayEmpty'; metaData[depth].data = []; }
+      if (inTagContent) { inTagContent = false; }
+      if (inTagStart) {
+        inTagStart = false;
+        inTagContent = true;
+        if (metaData[depth].tagStart === 'array') {
+          metaData[depth].data = [];
         }
-      } else if (cpos.tag === 'dict') {
-        const res = parseXmlTree(false, cpos.tag);
-        if (!isArray) {
-          obj[key] = res;
-        } else {
-          arr.push(res);
+        if (metaData[depth].tagStart === 'dict') {
+          metaData[depth].data = {};
         }
-        xmlStr = xmlStr.substring((cpos.pos + cpos.tag.length + 3));
-      } else {
-        let nextTagPos = getNextTagPos();
-        let nextClosePos = getNextClosingTagPos(cpos.tag);
-        // nextClosePosBlock = closingTag ? getNextClosingTagPos(closingTag) : 999999;
-        if (nextClosePos < nextTagPos.pos) {
-          if (cpos.tag === 'key') {
-            key = xmlStr.substring(0, nextClosePos);
-            xmlStr = xmlStr.substring(key.length + cpos.tag.length + 3); // key done
-          } else {
-            valueStr = xmlStr.substring(0, nextClosePos).replace(/\t/g, '');
-            if (cpos.tag === 'string') { if (!isArray) { obj[key] = valueStr; } else { arr.push(valueStr); } }
-            if (cpos.tag === 'integer') { if (!isArray) { obj[key] = parseInt(valueStr); } else { arr.push(parseInt(valueStr)); } }
-            if (cpos.tag === 'date') { if (!isArray) { obj[key] = valueStr; } else { arr.push(valueStr); } }
-            if (cpos.tag === 'data') { if (!isArray) { obj[key] = valueStr; } else { arr.push(valueStr); } }
-            if (cpos.tag === 'real') { if (!isArray) { obj[key] = parseFloat(valueStr); } else { arr.push(parseFloat(valueStr)); } }
-
-            key = '';
-            xmlStr = xmlStr.substring(valueStr.length + cpos.tag.length + 3); // property done
+      }
+      if (inTagEnd) {
+        inTagEnd = false;
+        if (metaData[depth].tagEnd && tags.indexOf(metaData[depth].tagEnd.substr(1)) >= 0) {
+          if (metaData[depth].tagEnd === '/dict' || metaData[depth].tagEnd === '/array') {
+            if (depth > 1 && metaData[depth - 2].tagStart === 'array') {
+              metaData[depth - 2].data.push(metaData[depth - 1].data);
+            }
+            if (depth > 1 && metaData[depth - 2].tagStart === 'dict') {
+              metaData[depth - 2].data[metaData[depth - 1].key] = metaData[depth - 1].data;
+            }
+            depth--;
+            metaData.pop();
+            metaData[depth].tagContent = '';
+            metaData[depth].tagStart = '';
+            metaData[depth].tagEnd = '';
+          }
+          else {
+            if (metaData[depth].tagEnd === '/key' && metaData[depth].tagContent) {
+              metaData[depth].key = metaData[depth].tagContent;
+            } else {
+              if (metaData[depth].tagEnd === '/real' && metaData[depth].tagContent) { metaData[depth].data = parseFloat(metaData[depth].tagContent) || 0; }
+              if (metaData[depth].tagEnd === '/integer' && metaData[depth].tagContent) { metaData[depth].data = parseInt(metaData[depth].tagContent) || 0; }
+              if (metaData[depth].tagEnd === '/string' && metaData[depth].tagContent) { metaData[depth].data = metaData[depth].tagContent || ''; }
+              if (metaData[depth].tagEnd === '/boolean') { metaData[depth].data = metaData[depth].tagContent || false; }
+              if (metaData[depth].tagEnd === '/arrayEmpty') { metaData[depth].data = metaData[depth].tagContent || []; }
+              if (depth > 0 && metaData[depth - 1].tagStart === 'array') { metaData[depth - 1].data.push(metaData[depth].data); }
+              if (depth > 0 && metaData[depth - 1].tagStart === 'dict') { metaData[depth - 1].data[metaData[depth].key] = metaData[depth].data; }
+            }
+            metaData[depth].tagContent = '';
+            metaData[depth].tagStart = '';
+            metaData[depth].tagEnd = '';
           }
         }
+        metaData[depth].tagEnd = '';
+        inTagStart = false;
+        inTagContent = false;
       }
-      cpos = getNextTagPos();
+    } else {
+      if (inTagStart) { metaData[depth].tagStart += c; }
+      if (inTagEnd) { metaData[depth].tagEnd += c; }
+      if (inTagContent) { metaData[depth].tagContent += c; }
     }
-    return (isArray ? arr : obj);
-  }
-  try {
-    const result = parseXmlTree(false, '');
-    return result;
-  } catch (e) {
-    return {};
+    pos++;
   }
+  return metaData[0].data;
 }
 
 function semverCompare(v1, v2) {
@@ -1130,6 +1246,8 @@ exports.wmic = wmic;
 exports.darwinXcodeExists = darwinXcodeExists;
 exports.getVboxmanage = getVboxmanage;
 exports.powerShell = powerShell;
+exports.powerShellStart = powerShellStart;
+exports.powerShellRelease = powerShellRelease;
 exports.execSafe = execSafe;
 exports.nanoSeconds = nanoSeconds;
 exports.countUniqueLines = countUniqueLines;

package/lib/wifi.js

@@ -315,8 +315,74 @@ function getWifiNetworkListIw(iface) {
   }
 }
 
-function wifiNetworks(callback) {
+/*
+                    ssid: line.substring(parsedhead[0].from, parsedhead[0].to).trim(),
+                    bssid: line.substring(parsedhead[1].from, parsedhead[1].to).trim().toLowerCase(),
+                    mode: '',
+                    channel,
+                    frequency: wifiFrequencyFromChannel(channel),
+                    signalLevel: signalLevel ? parseInt(signalLevel, 10) : null,
+                    quality: wifiQualityFromDB(signalLevel),
+                    security,
+                    wpaFlags,
+                    rsnFlags: []
 
+                  const securityAll = line.substring(parsedhead[6].from, 1000).trim().split(' ');
+                  let security = [];
+                  let wpaFlags = [];
+                  securityAll.forEach(securitySingle => {
+                    if (securitySingle.indexOf('(') > 0) {
+                      const parts = securitySingle.split('(');
+                      security.push(parts[0]);
+                      wpaFlags = wpaFlags.concat(parts[1].replace(')', '').split(','));
+                    }
+                  });
+
+*/
+function parseWifiDarwin(wifiObj) {
+  const result = [];
+  if (wifiObj) {
+    wifiObj.forEach(function (wifiItem) {
+      const signalLevel = wifiItem.RSSI;
+      let security = [];
+      let wpaFlags = [];
+      if (wifiItem.WPA_IE) {
+        security.push('WPA');
+        if (wifiItem.WPA_IE.IE_KEY_WPA_UCIPHERS) {
+          wifiItem.WPA_IE.IE_KEY_WPA_UCIPHERS.forEach(function (ciphers) {
+            if (ciphers === 0 && wpaFlags.indexOf('unknown/TKIP') === -1) { wpaFlags.push('unknown/TKIP'); }
+            if (ciphers === 2 && wpaFlags.indexOf('PSK/TKIP') === -1) { wpaFlags.push('PSK/TKIP'); }
+            if (ciphers === 4 && wpaFlags.indexOf('PSK/AES') === -1) { wpaFlags.push('PSK/AES'); }
+          });
+        }
+      }
+      if (wifiItem.RSN_IE) {
+        security.push('WPA2');
+        if (wifiItem.RSN_IE.IE_KEY_RSN_UCIPHERS) {
+          wifiItem.RSN_IE.IE_KEY_RSN_UCIPHERS.forEach(function (ciphers) {
+            if (ciphers === 0 && wpaFlags.indexOf('unknown/TKIP') === -1) { wpaFlags.push('unknown/TKIP'); }
+            if (ciphers === 2 && wpaFlags.indexOf('TKIP/TKIP') === -1) { wpaFlags.push('TKIP/TKIP'); }
+            if (ciphers === 4 && wpaFlags.indexOf('PSK/AES') === -1) { wpaFlags.push('PSK/AES'); }
+          });
+        }
+      }
+      result.push({
+        ssid: wifiItem.SSID_STR,
+        bssid: wifiItem.BSSID,
+        mode: '',
+        channel: wifiItem.CHANNEL,
+        frequency: wifiFrequencyFromChannel(wifiItem.CHANNEL),
+        signalLevel: signalLevel ? parseInt(signalLevel, 10) : null,
+        quality: wifiQualityFromDB(signalLevel),
+        security,
+        wpaFlags,
+        rsnFlags: []
+      });
+    });
+  }
+  return result;
+}
+function wifiNetworks(callback) {
   return new Promise((resolve) => {
     process.nextTick(() => {
       let result = [];
@@ -369,45 +435,10 @@ function wifiNetworks(callback) {
           resolve(result);
         }
       } else if (_darwin) {
-        let cmd = '/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -s';
-        exec(cmd, { maxBuffer: 1024 * 20000 }, function (error, stdout) {
-          const lines = stdout.toString().split(os.EOL);
-          if (lines && lines.length > 1) {
-            const parsedhead = util.parseHead(lines[0], 1);
-            if (parsedhead.length >= 7) {
-              lines.shift();
-              lines.forEach(line => {
-                if (line.trim()) {
-                  const channelStr = line.substring(parsedhead[3].from, parsedhead[3].to).trim();
-                  const channel = channelStr ? parseInt(channelStr, 10) : null;
-                  const signalLevel = line.substring(parsedhead[2].from, parsedhead[2].to).trim();
-                  const securityAll = line.substring(parsedhead[6].from, 1000).trim().split(' ');
-                  let security = [];
-                  let wpaFlags = [];
-                  securityAll.forEach(securitySingle => {
-                    if (securitySingle.indexOf('(') > 0) {
-                      const parts = securitySingle.split('(');
-                      security.push(parts[0]);
-                      wpaFlags = wpaFlags.concat(parts[1].replace(')', '').split(','));
-                    }
-                  });
-                  wpaFlags = Array.from(new Set(wpaFlags));
-                  result.push({
-                    ssid: line.substring(parsedhead[0].from, parsedhead[0].to).trim(),
-                    bssid: line.substring(parsedhead[1].from, parsedhead[1].to).trim().toLowerCase(),
-                    mode: '',
-                    channel,
-                    frequency: wifiFrequencyFromChannel(channel),
-                    signalLevel: signalLevel ? parseInt(signalLevel, 10) : null,
-                    quality: wifiQualityFromDB(signalLevel),
-                    security,
-                    wpaFlags,
-                    rsnFlags: []
-                  });
-                }
-              });
-            }
-          }
+        let cmd = '/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -s -x';
+        exec(cmd, { maxBuffer: 1024 * 40000 }, function (error, stdout) {
+          const output = stdout.toString();
+          result = parseWifiDarwin(util.plistParser(output));
           if (callback) {
             callback(result);
           }
@@ -544,7 +575,7 @@ function wifiConnections(callback) {
                 const noise = util.toInt(util.getValue(lines2, 'agrCtlNoise', ':', true));
                 const signalLevel = rssi - noise;
                 // const signal = wifiQualityFromDB(signalLevel);
-                if (ssid && bssid) {
+                if (ssid || bssid) {
                   result.push({
                     id: 'Wi-Fi',
                     iface,

package/package.json

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