diff --git a/CHANGELOG.md b/CHANGELOG.md index ebea8e3..0d7c37e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ For major (breaking) changes - version 3 and 2 see end of page. | Version | Date | Comment | | -------------- | -------------- | -------- | +| 5.0.5 | 2020-01-27 | `networkInterfaces()` type detection improved (win) | | 5.0.4 | 2020-01-27 | `cpu()` improved manufacturer decoding (linux) | | 5.0.3 | 2020-01-27 | `cpu()` fix virtualization, `wifi()` fix raspberry | | 5.0.2 | 2020-01-26 | updated typescript typings | diff --git a/docs/changes.html b/docs/changes.html index 65b6e1d..853ee25 100644 --- a/docs/changes.html +++ b/docs/changes.html @@ -169,16 +169,18 @@
  • cpu(): extended socket list (win)
  • cpu(): added virtualization if cpu supports virtualization
  • cpu(): now flags are part of this function
    • -
  • graphics(): extended nvidia-smi parsing
    • -
  • system(): better Raspberry PI detection
    • -
  • system(): added virtual and virtualHost (if system is virtual instance)
  • fsSize(): added available
  • fsSize(): improved calculation of used
    • +
  • getData(): support for passing parameters and filters (see section General / getData)
    • +
  • graphics(): extended nvidia-smi parsing
    • +
  • networkInterfaces(): type detection improved (win - wireless)
    • +
  • memoryLayout(): extended manufacturer list (decoding)
  • osInfo(): better fqdn (win)
    • +
  • system(): better Raspberry PI detection
    • +
  • system(): added virtual and virtualHost (if system is virtual instance)
  • uuid(): better value support
  • uuid(): added MACs
  • uuid(): better Raspberry Pi hardware ID
    • -
  • getData(): support for passing parameters and filters (see section General / getData)
  • Apple M1 Silicon extended support (now everything supported except of cpu temperature)
  • updated TypeScript definitions
    • diff --git a/docs/history.html b/docs/history.html index 29155e4..1a3edf4 100644 --- a/docs/history.html +++ b/docs/history.html @@ -56,12 +56,16 @@ + + 5.0.5 + 2020-01-27 + networkInterfaces() type detection improved (win) + 5.0.4 2020-01-27 memoryLayout() improved manufacturer decoding (linux) - 5.0.3 2020-01-27 diff --git a/docs/index.html b/docs/index.html index 18de2da..aa7cb37 100644 --- a/docs/index.html +++ b/docs/index.html @@ -170,7 +170,7 @@
    systeminformation
     
    -
    New Version: 5.0.4
    +
    New Version: 5.0.5
    @@ -209,7 +209,7 @@
    Downloads last month
    -
    376
    +
    377
    Dependents
    diff --git a/lib/network.js b/lib/network.js index 8dad672..4482d31 100644 --- a/lib/network.js +++ b/lib/network.js @@ -219,17 +219,21 @@ function parseLinesWindowsNics(sections, nconfigsections) { let lines = sections[i].trim().split('\r\n'); let linesNicConfig = nconfigsections[i].trim().split('\r\n'); let netEnabled = util.getValue(lines, 'NetEnabled', '='); - + let adapterType = util.getValue(lines, 'AdapterTypeID', '=') === '9' ? 'wireless' : 'wired'; + let ifacename = util.getValue(lines, 'Name', '=').replace(/\]/g, ')').replace(/\[/g, '('); + if (ifacename.toLowerCase().indexOf('wi-fi') >= 0 || ifacename.toLowerCase().indexOf('wireless') >= 0) { + adapterType = 'wireless'; + } if (netEnabled !== '') { const speed = parseInt(util.getValue(lines, 'speed', '=').trim(), 10) / 1000000; nics.push({ mac: util.getValue(lines, 'MACAddress', '=').toLowerCase(), dhcp: util.getValue(linesNicConfig, 'dhcpEnabled', '=').toLowerCase(), - name: util.getValue(lines, 'Name', '=').replace(/\]/g, ')').replace(/\[/g, '('), + name: ifacename, netEnabled: netEnabled === 'TRUE', speed: isNaN(speed) ? null : speed, operstate: util.getValue(lines, 'NetConnectionStatus', '=') === '2' ? 'up' : 'down', - type: util.getValue(lines, 'AdapterTypeID', '=') === '9' ? 'wireless' : 'wired' + type: adapterType }); } }