mike/systeminformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

graphics() fix nvidia-smi candidateDir (windows)

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2025-12-24 07:05:40 +01:00
parent 1a9f434335
commit 140f5d2ddc
7 changed files with 430 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -90,6 +90,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
| Version | Date | Comment | | Version | Date | Comment |
| ------- | ---------- | --------------------------------------------------------------------------------------------------- | | ------- | ---------- | --------------------------------------------------------------------------------------------------- |
| 5.27.17 | 2025-12-24 | `graphics()` fix nvidia-smi candidateDir (windows) |
| 5.27.16 | 2025-12-23 | `cpuTemperature()` fix sensors parsingg AMD (linux) | | 5.27.16 | 2025-12-23 | `cpuTemperature()` fix sensors parsingg AMD (linux) |
| 5.27.15 | 2025-12-22 | Updated docs | | 5.27.15 | 2025-12-22 | Updated docs |
| 5.27.14 | 2025-12-15 | `fsSize()` fix drive sanitation (windows) | | 5.27.14 | 2025-12-15 | `fsSize()` fix drive sanitation (windows) |

5
docs/history.html
View File

@ -57,6 +57,11 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr>
<th scope="row">5.27.17</th>
<td>2025-12-24</td>
<td><span class="code">graphics()</span> fix nvidia-smi candidateDir (windows)</td>
</tr>
<tr> <tr>
<th scope="row">5.27.16</th> <th scope="row">5.27.16</th>
<td>2025-12-23</td> <td>2025-12-23</td>

2
docs/index.html
View File

@ -170,7 +170,7 @@
<img class="logo" src="assets/logo.png" alt="logo"> <img class="logo" src="assets/logo.png" alt="logo">
<div class="title">systeminformation</div> <div class="title">systeminformation</div>
<div class="subtitle"><span id="typed"></span>&nbsp;</div> <div class="subtitle"><span id="typed"></span>&nbsp;</div>
<div class="version">New Version: <span id="version">5.27.16</span></div> <div class="version">New Version: <span id="version">5.27.17</span></div>
<button class="btn btn-light" onclick="location.href='https://github.com/sebhildebrandt/systeminformation'">View on Github <i class=" fab fa-github"></i></button> <button class="btn btn-light" onclick="location.href='https://github.com/sebhildebrandt/systeminformation'">View on Github <i class=" fab fa-github"></i></button>
</div> </div>
<div class="down"> <div class="down">

10
lib/graphics.js
View File

@ -147,7 +147,7 @@ function graphics(callback) {
displays: [] displays: []
}; };
try { try {
graphicsArr.forEach( (item) => { graphicsArr.forEach((item) => {
// controllers // controllers
const bus = (item.sppci_bus || '').indexOf('builtin') > -1 ? 'Built-In' : (item.sppci_bus || '').indexOf('pcie') > -1 ? 'PCIe' : ''; 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 vram = (parseInt(item.spdisplays_vram || '', 10) || 0) * ((item.spdisplays_vram || '').indexOf('GB') > -1 ? 1024 : 1);
@ -168,7 +168,7 @@ function graphics(callback) {
// displays // displays
if (item.spdisplays_ndrvs && item.spdisplays_ndrvs.length) { if (item.spdisplays_ndrvs && item.spdisplays_ndrvs.length) {
item.spdisplays_ndrvs.forEach( (displayItem) => { item.spdisplays_ndrvs.forEach((displayItem) => {
const connectionType = displayItem['spdisplays_connection_type'] || ''; const connectionType = displayItem['spdisplays_connection_type'] || '';
const currentResolutionParts = (displayItem['_spdisplays_resolution'] || '').split('@'); const currentResolutionParts = (displayItem['_spdisplays_resolution'] || '').split('@');
const currentResolution = currentResolutionParts[0].split('x'); const currentResolution = currentResolutionParts[0].split('x');
@ -457,12 +457,12 @@ function graphics(callback) {
if (nvidiaSmiExe) { if (nvidiaSmiExe) {
const nvidiaSmiOpts = 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'; '--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 + (_linux ? ' 2>/dev/null' : ''); const cmd = nvidiaSmiExe + ' ' + nvidiaSmiOpts;
if (_linux) { if (_linux) {
options.stdio = ['pipe', 'pipe', 'ignore']; options.stdio = ['pipe', 'pipe', 'ignore'];
} }
try { try {
const sanitized = util.sanitizeShellString(cmd); const sanitized = util.sanitizeShellString(cmd) + (_linux ? ' 2>/dev/null' : '');
const res = execSync(sanitized, options).toString(); const res = execSync(sanitized, options).toString();
return res; return res;
} catch { } catch {
@ -863,7 +863,7 @@ function graphics(callback) {
} }
// } else { // } else {
const cmd = 'lspci -vvv 2>/dev/null'; const cmd = 'lspci -vvv 2>/dev/null';
exec(cmd, (error, stdout) => { exec(cmd, (error, stdout) => {
if (!error) { if (!error) {
const lines = stdout.toString().split('\n'); const lines = stdout.toString().split('\n');
if (result.controllers.length === 0) { if (result.controllers.length === 0) {

389
lib/system.js
View File

@ -21,21 +21,19 @@ const exec = require('child_process').exec;
const execSync = require('child_process').execSync; const execSync = require('child_process').execSync;
const execPromise = util.promisify(require('child_process').exec); const execPromise = util.promisify(require('child_process').exec);
let _platform = process.platform; const _platform = process.platform;
const _linux = (_platform === 'linux' || _platform === 'android'); const _linux = _platform === 'linux' || _platform === 'android';
const _darwin = (_platform === 'darwin'); const _darwin = _platform === 'darwin';
const _windows = (_platform === 'win32'); const _windows = _platform === 'win32';
const _freebsd = (_platform === 'freebsd'); const _freebsd = _platform === 'freebsd';
const _openbsd = (_platform === 'openbsd'); const _openbsd = _platform === 'openbsd';
const _netbsd = (_platform === 'netbsd'); const _netbsd = _platform === 'netbsd';
const _sunos = (_platform === 'sunos'); const _sunos = _platform === 'sunos';
function system(callback) { function system(callback) {
return new Promise((resolve) => { return new Promise((resolve) => {
process.nextTick(() => { process.nextTick(() => {
let result = { let result = {
manufacturer: '', manufacturer: '',
model: 'Computer', model: 'Computer',
@ -47,13 +45,13 @@ function system(callback) {
}; };
if (_linux || _freebsd || _openbsd || _netbsd) { if (_linux || _freebsd || _openbsd || _netbsd) {
exec('export LC_ALL=C; dmidecode -t system 2>/dev/null; unset LC_ALL', function (error, stdout) { exec('export LC_ALL=C; dmidecode -t system 2>/dev/null; unset LC_ALL', (error, stdout) => {
let lines = stdout.toString().split('\n'); let lines = stdout.toString().split('\n');
result.manufacturer = cleanDefaults(util.getValue(lines, 'manufacturer')); result.manufacturer = cleanDefaults(util.getValue(lines, 'manufacturer'));
result.model = cleanDefaults(util.getValue(lines, 'product name')); result.model = cleanDefaults(util.getValue(lines, 'product name'));
result.version = cleanDefaults(util.getValue(lines, 'version')); result.version = cleanDefaults(util.getValue(lines, 'version'));
result.serial = cleanDefaults(util.getValue(lines, 'serial number')); result.serial = cleanDefaults(util.getValue(lines, 'serial number'));
result.uuid = cleanDefaults((util.getValue(lines, 'uuid'))).toLowerCase(); result.uuid = cleanDefaults(util.getValue(lines, 'uuid')).toLowerCase();
result.sku = cleanDefaults(util.getValue(lines, 'sku number')); result.sku = cleanDefaults(util.getValue(lines, 'sku number'));
// Non-Root values // Non-Root values
const cmd = `echo -n "product_name: "; cat /sys/devices/virtual/dmi/id/product_name 2>/dev/null; echo; const cmd = `echo -n "product_name: "; cat /sys/devices/virtual/dmi/id/product_name 2>/dev/null; echo;
@ -68,17 +66,34 @@ function system(callback) {
result.version = cleanDefaults(result.version === '' ? util.getValue(lines, 'product_version') : result.version); result.version = cleanDefaults(result.version === '' ? util.getValue(lines, 'product_version') : result.version);
result.serial = cleanDefaults(result.serial === '' ? util.getValue(lines, 'product_serial') : result.serial); result.serial = cleanDefaults(result.serial === '' ? util.getValue(lines, 'product_serial') : result.serial);
result.uuid = cleanDefaults(result.uuid === '' ? util.getValue(lines, 'product_uuid').toLowerCase() : result.uuid); result.uuid = cleanDefaults(result.uuid === '' ? util.getValue(lines, 'product_uuid').toLowerCase() : result.uuid);
} catch (e) { } catch {
util.noop(); util.noop();
} }
if (!result.serial) { result.serial = '-'; } if (!result.serial) {
if (!result.manufacturer) { result.manufacturer = ''; } result.serial = '-';
if (!result.model) { result.model = 'Computer'; } }
if (!result.version) { result.version = ''; } if (!result.manufacturer) {
if (!result.sku) { result.sku = '-'; } result.manufacturer = '';
}
if (!result.model) {
result.model = 'Computer';
}
if (!result.version) {
result.version = '';
}
if (!result.sku) {
result.sku = '-';
}
// detect virtual (1) // detect virtual (1)
if (result.model.toLowerCase() === 'virtualbox' || result.model.toLowerCase() === 'kvm' || result.model.toLowerCase() === 'virtual machine' || result.model.toLowerCase() === 'bochs' || result.model.toLowerCase().startsWith('vmware') || result.model.toLowerCase().startsWith('droplet')) { if (
result.model.toLowerCase() === 'virtualbox' ||
result.model.toLowerCase() === 'kvm' ||
result.model.toLowerCase() === 'virtual machine' ||
result.model.toLowerCase() === 'bochs' ||
result.model.toLowerCase().startsWith('vmware') ||
result.model.toLowerCase().startsWith('droplet')
) {
result.virtual = true; result.virtual = true;
switch (result.model.toLowerCase()) { switch (result.model.toLowerCase()) {
case 'virtualbox': case 'virtualbox':
@ -117,7 +132,7 @@ function system(callback) {
result.virtual = true; result.virtual = true;
result.virtualHost = 'VirtualBox'; result.virtualHost = 'VirtualBox';
} }
} catch (e) { } catch {
util.noop(); util.noop();
} }
} }
@ -133,7 +148,7 @@ function system(callback) {
if (!result.model || result.model === 'Computer') { if (!result.model || result.model === 'Computer') {
result.model = util.getValue(lines, 'hw.model', ':').trim(); result.model = util.getValue(lines, 'hw.model', ':').trim();
} }
} catch (e) { } catch {
util.noop(); util.noop();
} }
} }
@ -163,7 +178,7 @@ function system(callback) {
result.virtualHost = 'bochs'; result.virtualHost = 'bochs';
break; break;
} }
} catch (e) { } catch {
util.noop(); util.noop();
} }
} }
@ -174,9 +189,11 @@ function system(callback) {
try { try {
const stdout = execSync('dmesg 2>/dev/null | grep -iE "virtual|hypervisor" | grep -iE "vmware|qemu|kvm|xen" | grep -viE "Nested Virtualization|/virtual/"'); const stdout = execSync('dmesg 2>/dev/null | grep -iE "virtual|hypervisor" | grep -iE "vmware|qemu|kvm|xen" | grep -viE "Nested Virtualization|/virtual/"');
// detect virtual machines // detect virtual machines
let lines = stdout.toString().split('\n'); const lines = stdout.toString().split('\n');
if (lines.length > 0) { if (lines.length > 0) {
if (result.model === 'Computer') { result.model = 'Virtual machine'; } if (result.model === 'Computer') {
result.model = 'Virtual machine';
}
result.virtual = true; result.virtual = true;
if (stdout.toString().toLowerCase().indexOf('vmware') >= 0 && !result.virtualHost) { if (stdout.toString().toLowerCase().indexOf('vmware') >= 0 && !result.virtualHost) {
result.virtualHost = 'VMware'; result.virtualHost = 'VMware';
@ -191,13 +208,13 @@ function system(callback) {
result.virtualHost = 'KVM'; result.virtualHost = 'KVM';
} }
} }
} catch (e) { } catch {
util.noop(); util.noop();
} }
if (result.manufacturer === '' && result.model === 'Computer' && result.version === '') { if (result.manufacturer === '' && result.model === 'Computer' && result.version === '') {
// Check Raspberry Pi // Check Raspberry Pi
fs.readFile('/proc/cpuinfo', function (error, stdout) { fs.readFile('/proc/cpuinfo', (error, stdout) => {
if (!error) { if (!error) {
let lines = stdout.toString().split('\n'); let lines = stdout.toString().split('\n');
result.model = util.getValue(lines, 'hardware', ':', true).toUpperCase(); result.model = util.getValue(lines, 'hardware', ':', true).toUpperCase();
@ -219,23 +236,25 @@ function system(callback) {
}; };
} }
} }
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
}); });
} else { } else {
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
} }
}); });
} }
if (_darwin) { if (_darwin) {
exec('ioreg -c IOPlatformExpertDevice -d 2', function (error, stdout) { exec('ioreg -c IOPlatformExpertDevice -d 2', (error, stdout) => {
if (!error) { if (!error) {
let lines = stdout.toString().replace(/[<>"]/g, '').split('\n'); const lines = stdout.toString().replace(/[<>"]/g, '').split('\n');
const model = util.getAppleModel(util.getValue(lines, 'model', '=', true)); const model = util.getAppleModel(util.getValue(lines, 'model', '=', true));
// const modelParts = util.splitByNumber(model);
// const version = util.getValue(lines, 'version', '=', true);
result.manufacturer = util.getValue(lines, 'manufacturer', '=', true); result.manufacturer = util.getValue(lines, 'manufacturer', '=', true);
result.model = model.key; result.model = model.key;
result.type = macOsChassisType(model.version); result.type = macOsChassisType(model.version);
@ -244,19 +263,23 @@ function system(callback) {
result.uuid = util.getValue(lines, 'ioplatformuuid', '=', true).toLowerCase(); result.uuid = util.getValue(lines, 'ioplatformuuid', '=', true).toLowerCase();
result.sku = util.getValue(lines, 'board-id', '=', true) || util.getValue(lines, 'target-sub-type', '=', true); result.sku = util.getValue(lines, 'board-id', '=', true) || util.getValue(lines, 'target-sub-type', '=', true);
} }
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
}); });
} }
if (_sunos) { if (_sunos) {
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
} }
if (_windows) { if (_windows) {
try { try {
util.powerShell('Get-CimInstance Win32_ComputerSystemProduct | select Name,Vendor,Version,IdentifyingNumber,UUID | fl').then((stdout, error) => { util.powerShell('Get-CimInstance Win32_ComputerSystemProduct | select Name,Vendor,Version,IdentifyingNumber,UUID | fl').then((stdout, error) => {
if (!error) { if (!error) {
let lines = stdout.split('\r\n'); const lines = stdout.split('\r\n');
result.manufacturer = util.getValue(lines, 'vendor', ':'); result.manufacturer = util.getValue(lines, 'vendor', ':');
result.model = util.getValue(lines, 'name', ':'); result.model = util.getValue(lines, 'name', ':');
result.version = util.getValue(lines, 'version', ':'); result.version = util.getValue(lines, 'version', ':');
@ -264,33 +287,68 @@ function system(callback) {
result.uuid = util.getValue(lines, 'uuid', ':').toLowerCase(); result.uuid = util.getValue(lines, 'uuid', ':').toLowerCase();
// detect virtual (1) // detect virtual (1)
const model = result.model.toLowerCase(); const model = result.model.toLowerCase();
if (model === 'virtualbox' || model === 'kvm' || model === 'virtual machine' || model === 'bochs' || model.startsWith('vmware') || model.startsWith('qemu') || model.startsWith('parallels')) { if (
model === 'virtualbox' ||
model === 'kvm' ||
model === 'virtual machine' ||
model === 'bochs' ||
model.startsWith('vmware') ||
model.startsWith('qemu') ||
model.startsWith('parallels')
) {
result.virtual = true; result.virtual = true;
if (model.startsWith('virtualbox')) { result.virtualHost = 'VirtualBox'; } if (model.startsWith('virtualbox')) {
if (model.startsWith('vmware')) { result.virtualHost = 'VMware'; } result.virtualHost = 'VirtualBox';
if (model.startsWith('kvm')) { result.virtualHost = 'KVM'; } }
if (model.startsWith('bochs')) { result.virtualHost = 'bochs'; } if (model.startsWith('vmware')) {
if (model.startsWith('qemu')) { result.virtualHost = 'KVM'; } result.virtualHost = 'VMware';
if (model.startsWith('parallels')) { result.virtualHost = 'Parallels'; } }
if (model.startsWith('kvm')) {
result.virtualHost = 'KVM';
}
if (model.startsWith('bochs')) {
result.virtualHost = 'bochs';
}
if (model.startsWith('qemu')) {
result.virtualHost = 'KVM';
}
if (model.startsWith('parallels')) {
result.virtualHost = 'Parallels';
}
} }
const manufacturer = result.manufacturer.toLowerCase(); const manufacturer = result.manufacturer.toLowerCase();
if (manufacturer.startsWith('vmware') || manufacturer.startsWith('qemu') || manufacturer === 'xen' || manufacturer.startsWith('parallels')) { if (manufacturer.startsWith('vmware') || manufacturer.startsWith('qemu') || manufacturer === 'xen' || manufacturer.startsWith('parallels')) {
result.virtual = true; result.virtual = true;
if (manufacturer.startsWith('vmware')) { result.virtualHost = 'VMware'; } if (manufacturer.startsWith('vmware')) {
if (manufacturer.startsWith('xen')) { result.virtualHost = 'Xen'; } result.virtualHost = 'VMware';
if (manufacturer.startsWith('qemu')) { result.virtualHost = 'KVM'; } }
if (manufacturer.startsWith('parallels')) { result.virtualHost = 'Parallels'; } if (manufacturer.startsWith('xen')) {
result.virtualHost = 'Xen';
}
if (manufacturer.startsWith('qemu')) {
result.virtualHost = 'KVM';
}
if (manufacturer.startsWith('parallels')) {
result.virtualHost = 'Parallels';
}
} }
util.powerShell('Get-CimInstance MS_Systeminformation -Namespace "root/wmi" | select systemsku | fl ').then((stdout, error) => { util.powerShell('Get-CimInstance MS_Systeminformation -Namespace "root/wmi" | select systemsku | fl ').then((stdout, error) => {
if (!error) { if (!error) {
let lines = stdout.split('\r\n'); const lines = stdout.split('\r\n');
result.sku = util.getValue(lines, 'systemsku', ':'); result.sku = util.getValue(lines, 'systemsku', ':');
} }
if (!result.virtual) { if (!result.virtual) {
util.powerShell('Get-CimInstance Win32_bios | select Version, SerialNumber, SMBIOSBIOSVersion').then((stdout, error) => { util.powerShell('Get-CimInstance Win32_bios | select Version, SerialNumber, SMBIOSBIOSVersion').then((stdout, error) => {
if (!error) { if (!error) {
let lines = stdout.toString(); let lines = stdout.toString();
if (lines.indexOf('VRTUAL') >= 0 || lines.indexOf('A M I ') >= 0 || lines.indexOf('VirtualBox') >= 0 || lines.indexOf('VMWare') >= 0 || lines.indexOf('Xen') >= 0 || lines.indexOf('Parallels') >= 0) { if (
lines.indexOf('VRTUAL') >= 0 ||
lines.indexOf('A M I ') >= 0 ||
lines.indexOf('VirtualBox') >= 0 ||
lines.indexOf('VMWare') >= 0 ||
lines.indexOf('Xen') >= 0 ||
lines.indexOf('Parallels') >= 0
) {
result.virtual = true; result.virtual = true;
if (lines.indexOf('VirtualBox') >= 0 && !result.virtualHost) { if (lines.indexOf('VirtualBox') >= 0 && !result.virtualHost) {
result.virtualHost = 'VirtualBox'; result.virtualHost = 'VirtualBox';
@ -311,25 +369,35 @@ function system(callback) {
result.virtualHost = 'Parallels'; result.virtualHost = 'Parallels';
} }
} }
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
} else { } else {
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
} }
}); });
} else { } else {
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
} }
}); });
} else { } else {
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
} }
}); });
} catch (e) { } catch {
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
} }
} }
@ -347,15 +415,13 @@ function cleanDefaults(s) {
return ''; return '';
} }
function bios(callback) { function bios(callback) {
return new Promise((resolve) => { return new Promise((resolve) => {
process.nextTick(() => { process.nextTick(() => {
let result = { let result = {
vendor: '', vendor: '',
version: '', version: '',
releaseDate: '', releaseDate: '',
revision: '', revision: ''
}; };
let cmd = ''; let cmd = '';
if (_linux || _freebsd || _openbsd || _netbsd) { if (_linux || _freebsd || _openbsd || _netbsd) {
@ -364,7 +430,7 @@ function bios(callback) {
} else { } else {
cmd = 'export LC_ALL=C; dmidecode -t bios 2>/dev/null; unset LC_ALL'; cmd = 'export LC_ALL=C; dmidecode -t bios 2>/dev/null; unset LC_ALL';
} }
exec(cmd, function (error, stdout) { exec(cmd, (error, stdout) => {
let lines = stdout.toString().split('\n'); let lines = stdout.toString().split('\n');
result.vendor = util.getValue(lines, 'Vendor'); result.vendor = util.getValue(lines, 'Vendor');
result.version = util.getValue(lines, 'Version'); result.version = util.getValue(lines, 'Version');
@ -378,7 +444,7 @@ function bios(callback) {
} }
if (lines.length && stdout.toString().indexOf('Characteristics:') >= 0) { if (lines.length && stdout.toString().indexOf('Characteristics:') >= 0) {
const features = []; const features = [];
lines.forEach(line => { lines.forEach((line) => {
if (line.indexOf(' is supported') >= 0) { if (line.indexOf(' is supported') >= 0) {
const feature = line.split(' is supported')[0].trim(); const feature = line.split(' is supported')[0].trim();
features.push(feature); features.push(feature);
@ -399,62 +465,75 @@ function bios(callback) {
} catch (e) { } catch (e) {
util.noop(); util.noop();
} }
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
}); });
} }
if (_darwin) { if (_darwin) {
result.vendor = 'Apple Inc.'; result.vendor = 'Apple Inc.';
exec( exec('system_profiler SPHardwareDataType -json', (error, stdout) => {
'system_profiler SPHardwareDataType -json', function (error, stdout) { try {
try { const hardwareData = JSON.parse(stdout.toString());
const hardwareData = JSON.parse(stdout.toString()); if (hardwareData && hardwareData.SPHardwareDataType && hardwareData.SPHardwareDataType.length) {
if (hardwareData && hardwareData.SPHardwareDataType && hardwareData.SPHardwareDataType.length) { let bootRomVersion = hardwareData.SPHardwareDataType[0].boot_rom_version;
let bootRomVersion = hardwareData.SPHardwareDataType[0].boot_rom_version; bootRomVersion = bootRomVersion ? bootRomVersion.split('(')[0].trim() : null;
bootRomVersion = bootRomVersion ? bootRomVersion.split('(')[0].trim() : null; result.version = bootRomVersion;
result.version = bootRomVersion;
}
} catch (e) {
util.noop();
} }
if (callback) { callback(result); } } catch (e) {
resolve(result); util.noop();
}); }
if (callback) {
callback(result);
}
resolve(result);
});
} }
if (_sunos) { if (_sunos) {
result.vendor = 'Sun Microsystems'; result.vendor = 'Sun Microsystems';
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
} }
if (_windows) { if (_windows) {
try { try {
util.powerShell('Get-CimInstance Win32_bios | select Description,Version,Manufacturer,@{n="ReleaseDate";e={$_.ReleaseDate.ToString("yyyy-MM-dd")}},BuildNumber,SerialNumber,SMBIOSBIOSVersion | fl').then((stdout, error) => { util
if (!error) { .powerShell(
let lines = stdout.toString().split('\r\n'); 'Get-CimInstance Win32_bios | select Description,Version,Manufacturer,@{n="ReleaseDate";e={$_.ReleaseDate.ToString("yyyy-MM-dd")}},BuildNumber,SerialNumber,SMBIOSBIOSVersion | fl'
const description = util.getValue(lines, 'description', ':'); )
const version = util.getValue(lines, 'SMBIOSBIOSVersion', ':'); .then((stdout, error) => {
if (description.indexOf(' Version ') !== -1) { if (!error) {
// ... Phoenix ROM BIOS PLUS Version 1.10 A04 let lines = stdout.toString().split('\r\n');
result.vendor = description.split(' Version ')[0].trim(); const description = util.getValue(lines, 'description', ':');
result.version = description.split(' Version ')[1].trim(); const version = util.getValue(lines, 'SMBIOSBIOSVersion', ':');
} else if (description.indexOf(' Ver: ') !== -1) { if (description.indexOf(' Version ') !== -1) {
// ... BIOS Date: 06/27/16 17:50:16 Ver: 1.4.5 // ... Phoenix ROM BIOS PLUS Version 1.10 A04
result.vendor = util.getValue(lines, 'manufacturer', ':'); result.vendor = description.split(' Version ')[0].trim();
result.version = description.split(' Ver: ')[1].trim(); result.version = description.split(' Version ')[1].trim();
} else { } else if (description.indexOf(' Ver: ') !== -1) {
result.vendor = util.getValue(lines, 'manufacturer', ':'); // ... BIOS Date: 06/27/16 17:50:16 Ver: 1.4.5
result.version = version || util.getValue(lines, 'version', ':'); result.vendor = util.getValue(lines, 'manufacturer', ':');
result.version = description.split(' Ver: ')[1].trim();
} else {
result.vendor = util.getValue(lines, 'manufacturer', ':');
result.version = version || util.getValue(lines, 'version', ':');
}
result.releaseDate = util.getValue(lines, 'releasedate', ':');
result.revision = util.getValue(lines, 'buildnumber', ':');
result.serial = cleanDefaults(util.getValue(lines, 'serialnumber', ':'));
} }
result.releaseDate = util.getValue(lines, 'releasedate', ':');
result.revision = util.getValue(lines, 'buildnumber', ':');
result.serial = cleanDefaults(util.getValue(lines, 'serialnumber', ':'));
}
if (callback) { callback(result); } if (callback) {
resolve(result); callback(result);
}); }
resolve(result);
});
} catch (e) { } catch (e) {
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
} }
} }
@ -465,11 +544,9 @@ function bios(callback) {
exports.bios = bios; exports.bios = bios;
function baseboard(callback) { function baseboard(callback) {
return new Promise((resolve) => { return new Promise((resolve) => {
process.nextTick(() => { process.nextTick(() => {
const result = {
let result = {
manufacturer: '', manufacturer: '',
model: '', model: '',
version: '', version: '',
@ -489,9 +566,7 @@ function baseboard(callback) {
const workload = []; const workload = [];
workload.push(execPromise(cmd)); workload.push(execPromise(cmd));
workload.push(execPromise('export LC_ALL=C; dmidecode -t memory 2>/dev/null')); workload.push(execPromise('export LC_ALL=C; dmidecode -t memory 2>/dev/null'));
util.promiseAll( util.promiseAll(workload).then((data) => {
workload
).then((data) => {
let lines = data.results[0] ? data.results[0].toString().split('\n') : ['']; let lines = data.results[0] ? data.results[0].toString().split('\n') : [''];
result.manufacturer = cleanDefaults(util.getValue(lines, 'Manufacturer')); result.manufacturer = cleanDefaults(util.getValue(lines, 'Manufacturer'));
result.model = cleanDefaults(util.getValue(lines, 'Product Name')); result.model = cleanDefaults(util.getValue(lines, 'Product Name'));
@ -511,7 +586,7 @@ function baseboard(callback) {
result.version = cleanDefaults(!result.version ? util.getValue(lines, 'board_version') : result.version); result.version = cleanDefaults(!result.version ? util.getValue(lines, 'board_version') : result.version);
result.serial = cleanDefaults(!result.serial ? util.getValue(lines, 'board_serial') : result.serial); result.serial = cleanDefaults(!result.serial ? util.getValue(lines, 'board_serial') : result.serial);
result.assetTag = cleanDefaults(!result.assetTag ? util.getValue(lines, 'board_asset_tag') : result.assetTag); result.assetTag = cleanDefaults(!result.assetTag ? util.getValue(lines, 'board_asset_tag') : result.assetTag);
} catch (e) { } catch {
util.noop(); util.noop();
} }
@ -531,7 +606,9 @@ function baseboard(callback) {
result.memSlots = 0; result.memSlots = 0;
} }
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
}); });
} }
@ -539,10 +616,8 @@ function baseboard(callback) {
const workload = []; const workload = [];
workload.push(execPromise('ioreg -c IOPlatformExpertDevice -d 2')); workload.push(execPromise('ioreg -c IOPlatformExpertDevice -d 2'));
workload.push(execPromise('system_profiler SPMemoryDataType')); workload.push(execPromise('system_profiler SPMemoryDataType'));
util.promiseAll( util.promiseAll(workload).then((data) => {
workload const lines = data.results[0] ? data.results[0].toString().replace(/[<>"]/g, '').split('\n') : [''];
).then((data) => {
let lines = data.results[0] ? data.results[0].toString().replace(/[<>"]/g, '').split('\n') : [''];
result.manufacturer = util.getValue(lines, 'manufacturer', '=', true); result.manufacturer = util.getValue(lines, 'manufacturer', '=', true);
result.model = util.getValue(lines, 'model', '=', true); result.model = util.getValue(lines, 'model', '=', true);
result.version = util.getValue(lines, 'version', '=', true); result.version = util.getValue(lines, 'version', '=', true);
@ -562,12 +637,16 @@ function baseboard(callback) {
result.memMax = os.totalmem(); result.memMax = os.totalmem();
} }
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
}); });
} }
if (_sunos) { if (_sunos) {
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
} }
if (_windows) { if (_windows) {
@ -577,9 +656,7 @@ function baseboard(callback) {
const maxCapacityAttribute = win10plus ? 'MaxCapacityEx' : 'MaxCapacity'; const maxCapacityAttribute = win10plus ? 'MaxCapacityEx' : 'MaxCapacity';
workload.push(util.powerShell('Get-CimInstance Win32_baseboard | select Model,Manufacturer,Product,Version,SerialNumber,PartNumber,SKU | fl')); workload.push(util.powerShell('Get-CimInstance Win32_baseboard | select Model,Manufacturer,Product,Version,SerialNumber,PartNumber,SKU | fl'));
workload.push(util.powerShell(`Get-CimInstance Win32_physicalmemoryarray | select ${maxCapacityAttribute}, MemoryDevices | fl`)); workload.push(util.powerShell(`Get-CimInstance Win32_physicalmemoryarray | select ${maxCapacityAttribute}, MemoryDevices | fl`));
util.promiseAll( util.promiseAll(workload).then((data) => {
workload
).then((data) => {
let lines = data.results[0] ? data.results[0].toString().split('\r\n') : ['']; let lines = data.results[0] ? data.results[0].toString().split('\r\n') : [''];
result.manufacturer = cleanDefaults(util.getValue(lines, 'manufacturer', ':')); result.manufacturer = cleanDefaults(util.getValue(lines, 'manufacturer', ':'));
@ -599,11 +676,15 @@ function baseboard(callback) {
result.memMax = util.toInt(util.getValue(lines, maxCapacityAttribute, ':')) * (win10plus ? 1024 : 1) || null; result.memMax = util.toInt(util.getValue(lines, maxCapacityAttribute, ':')) * (win10plus ? 1024 : 1) || null;
result.memSlots = util.toInt(util.getValue(lines, 'MemoryDevices', ':')) || null; result.memSlots = util.toInt(util.getValue(lines, 'MemoryDevices', ':')) || null;
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
}); });
} catch (e) { } catch {
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
} }
} }
@ -615,18 +696,33 @@ exports.baseboard = baseboard;
function macOsChassisType(model) { function macOsChassisType(model) {
model = model.toLowerCase(); model = model.toLowerCase();
if (model.indexOf('macbookair') >= 0 || model.indexOf('macbook air') >= 0) { return 'Notebook'; } if (model.indexOf('macbookair') >= 0 || model.indexOf('macbook air') >= 0) {
if (model.indexOf('macbookpro') >= 0 || model.indexOf('macbook pro') >= 0) { return 'Notebook'; } return 'Notebook';
if (model.indexOf('macbook') >= 0) { return 'Notebook'; } }
if (model.indexOf('macmini') >= 0 || model.indexOf('mac mini') >= 0) { return 'Desktop'; } if (model.indexOf('macbookpro') >= 0 || model.indexOf('macbook pro') >= 0) {
if (model.indexOf('imac') >= 0) { return 'Desktop'; } return 'Notebook';
if (model.indexOf('macstudio') >= 0 || model.indexOf('mac studio') >= 0) { return 'Desktop'; } }
if (model.indexOf('macpro') >= 0 || model.indexOf('mac pro') >= 0) { return 'Tower'; } if (model.indexOf('macbook') >= 0) {
return 'Notebook';
}
if (model.indexOf('macmini') >= 0 || model.indexOf('mac mini') >= 0) {
return 'Desktop';
}
if (model.indexOf('imac') >= 0) {
return 'Desktop';
}
if (model.indexOf('macstudio') >= 0 || model.indexOf('mac studio') >= 0) {
return 'Desktop';
}
if (model.indexOf('macpro') >= 0 || model.indexOf('mac pro') >= 0) {
return 'Tower';
}
return 'Other'; return 'Other';
} }
function chassis(callback) { function chassis(callback) {
const chassisTypes = ['Other', const chassisTypes = [
'Other',
'Unknown', 'Unknown',
'Desktop', 'Desktop',
'Low Profile Desktop', 'Low Profile Desktop',
@ -661,12 +757,11 @@ function chassis(callback) {
'IoT Gateway ', 'IoT Gateway ',
'Embedded PC', 'Embedded PC',
'Mini PC', 'Mini PC',
'Stick PC', 'Stick PC'
]; ];
return new Promise((resolve) => { return new Promise((resolve) => {
process.nextTick(() => { process.nextTick(() => {
let result = { let result = {
manufacturer: '', manufacturer: '',
model: '', model: '',
@ -674,7 +769,7 @@ function chassis(callback) {
version: '', version: '',
serial: '-', serial: '-',
assetTag: '-', assetTag: '-',
sku: '', sku: ''
}; };
if (_linux || _freebsd || _openbsd || _netbsd) { if (_linux || _freebsd || _openbsd || _netbsd) {
const cmd = `echo -n "chassis_asset_tag: "; cat /sys/devices/virtual/dmi/id/chassis_asset_tag 2>/dev/null; echo; const cmd = `echo -n "chassis_asset_tag: "; cat /sys/devices/virtual/dmi/id/chassis_asset_tag 2>/dev/null; echo;
@ -682,26 +777,26 @@ function chassis(callback) {
echo -n "chassis_type: "; cat /sys/devices/virtual/dmi/id/chassis_type 2>/dev/null; echo; echo -n "chassis_type: "; cat /sys/devices/virtual/dmi/id/chassis_type 2>/dev/null; echo;
echo -n "chassis_vendor: "; cat /sys/devices/virtual/dmi/id/chassis_vendor 2>/dev/null; echo; echo -n "chassis_vendor: "; cat /sys/devices/virtual/dmi/id/chassis_vendor 2>/dev/null; echo;
echo -n "chassis_version: "; cat /sys/devices/virtual/dmi/id/chassis_version 2>/dev/null; echo;`; echo -n "chassis_version: "; cat /sys/devices/virtual/dmi/id/chassis_version 2>/dev/null; echo;`;
exec(cmd, function (error, stdout) { exec(cmd, (error, stdout) => {
let lines = stdout.toString().split('\n'); let lines = stdout.toString().split('\n');
result.manufacturer = cleanDefaults(util.getValue(lines, 'chassis_vendor')); result.manufacturer = cleanDefaults(util.getValue(lines, 'chassis_vendor'));
const ctype = parseInt(util.getValue(lines, 'chassis_type').replace(/\D/g, '')); const ctype = parseInt(util.getValue(lines, 'chassis_type').replace(/\D/g, ''));
result.type = cleanDefaults((ctype && !isNaN(ctype) && ctype < chassisTypes.length) ? chassisTypes[ctype - 1] : ''); result.type = cleanDefaults(ctype && !isNaN(ctype) && ctype < chassisTypes.length ? chassisTypes[ctype - 1] : '');
result.version = cleanDefaults(util.getValue(lines, 'chassis_version')); result.version = cleanDefaults(util.getValue(lines, 'chassis_version'));
result.serial = cleanDefaults(util.getValue(lines, 'chassis_serial')); result.serial = cleanDefaults(util.getValue(lines, 'chassis_serial'));
result.assetTag = cleanDefaults(util.getValue(lines, 'chassis_asset_tag')); result.assetTag = cleanDefaults(util.getValue(lines, 'chassis_asset_tag'));
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
}); });
} }
if (_darwin) { if (_darwin) {
exec('ioreg -c IOPlatformExpertDevice -d 2', function (error, stdout) { exec('ioreg -c IOPlatformExpertDevice -d 2', (error, stdout) => {
if (!error) { if (!error) {
let lines = stdout.toString().replace(/[<>"]/g, '').split('\n'); const lines = stdout.toString().replace(/[<>"]/g, '').split('\n');
const model = util.getAppleModel(util.getValue(lines, 'model', '=', true)); const model = util.getAppleModel(util.getValue(lines, 'model', '=', true));
// const modelParts = util.splitByNumber(model);
// const version = util.getValue(lines, 'version', '=', true);
result.manufacturer = util.getValue(lines, 'manufacturer', '=', true); result.manufacturer = util.getValue(lines, 'manufacturer', '=', true);
result.model = model.key; result.model = model.key;
result.type = macOsChassisType(model.model); result.type = macOsChassisType(model.model);
@ -711,12 +806,16 @@ function chassis(callback) {
result.sku = util.getValue(lines, 'target-sub-type', '=', true); result.sku = util.getValue(lines, 'target-sub-type', '=', true);
} }
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
}); });
} }
if (_sunos) { if (_sunos) {
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
} }
if (_windows) { if (_windows) {
@ -728,7 +827,7 @@ function chassis(callback) {
result.manufacturer = cleanDefaults(util.getValue(lines, 'manufacturer', ':')); result.manufacturer = cleanDefaults(util.getValue(lines, 'manufacturer', ':'));
result.model = cleanDefaults(util.getValue(lines, 'model', ':')); result.model = cleanDefaults(util.getValue(lines, 'model', ':'));
const ctype = parseInt(util.getValue(lines, 'ChassisTypes', ':').replace(/\D/g, '')); const ctype = parseInt(util.getValue(lines, 'ChassisTypes', ':').replace(/\D/g, ''));
result.type = (ctype && !isNaN(ctype) && ctype < chassisTypes.length) ? chassisTypes[ctype - 1] : ''; result.type = ctype && !isNaN(ctype) && ctype < chassisTypes.length ? chassisTypes[ctype - 1] : '';
result.version = cleanDefaults(util.getValue(lines, 'version', ':')); result.version = cleanDefaults(util.getValue(lines, 'version', ':'));
result.serial = cleanDefaults(util.getValue(lines, 'serialnumber', ':')); result.serial = cleanDefaults(util.getValue(lines, 'serialnumber', ':'));
result.assetTag = cleanDefaults(util.getValue(lines, 'partnumber', ':')); result.assetTag = cleanDefaults(util.getValue(lines, 'partnumber', ':'));
@ -738,11 +837,15 @@ function chassis(callback) {
result.sku = cleanDefaults(util.getValue(lines, 'sku', ':')); result.sku = cleanDefaults(util.getValue(lines, 'sku', ':'));
} }
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
}); });
} catch (e) { } catch {
if (callback) { callback(result); } if (callback) {
callback(result);
}
resolve(result); resolve(result);
} }
} }

103
lib/util.js
View File

@ -101,11 +101,11 @@ function isFunction(functionToCheck) {
} }
function unique(obj) { function unique(obj) {
let uniques = []; const uniques = [];
let stringify = {}; const stringify = {};
for (let i = 0; i < obj.length; i++) { for (let i = 0; i < obj.length; i++) {
let keys = Object.keys(obj[i]); let keys = Object.keys(obj[i]);
keys.sort(function (a, b) { keys.sort((a, b) => {
return a - b; return a - b;
}); });
let str = ''; let str = '';
@ -122,10 +122,10 @@ function unique(obj) {
} }
function sortByKey(array, keys) { function sortByKey(array, keys) {
return array.sort(function (a, b) { return array.sort((a, b) => {
let x = ''; let x = '';
let y = ''; let y = '';
keys.forEach(function (key) { keys.forEach((key) => {
x = x + a[key]; x = x + a[key];
y = y + b[key]; y = y + b[key];
}); });
@ -159,6 +159,7 @@ function getValue(lines, property, separator, trimmed, lineMatch) {
return true; return true;
} }
} }
return false;
}); });
return result; return result;
} }
@ -195,8 +196,8 @@ function parseTime(t, pmDesignator) {
t = t.toUpperCase(); t = t.toUpperCase();
let hour = 0; let hour = 0;
let min = 0; let min = 0;
let splitter = detectSplit(t); const splitter = detectSplit(t);
let parts = t.split(splitter); const parts = t.split(splitter);
if (parts.length >= 2) { if (parts.length >= 2) {
if (parts[2]) { if (parts[2]) {
parts[1] += parts[2]; parts[1] += parts[2];
@ -222,8 +223,8 @@ function parseDateTime(dt, culture) {
time: '' time: ''
}; };
culture = culture || {}; culture = culture || {};
let dateFormat = (culture.dateFormat || '').toLowerCase(); const dateFormat = (culture.dateFormat || '').toLowerCase();
let pmDesignator = culture.pmDesignator || ''; const pmDesignator = culture.pmDesignator || '';
const parts = dt.split(' '); const parts = dt.split(' ');
if (parts[0]) { if (parts[0]) {
@ -283,7 +284,7 @@ function parseDateTime(dt, culture) {
} }
if (parts[1]) { if (parts[1]) {
parts.shift(); parts.shift();
let time = parts.join(' '); const time = parts.join(' ');
result.time = parseTime(time, pmDesignator); result.time = parseTime(time, pmDesignator);
} }
return result; return result;
@ -294,7 +295,7 @@ function parseHead(head, rights) {
let count = 1; let count = 1;
let from = 0; let from = 0;
let to = 0; let to = 0;
let result = []; const result = [];
for (let i = 0; i < head.length; i++) { for (let i = 0; i < head.length; i++) {
if (count <= rights) { if (count <= rights) {
if (/\s/.test(head[i]) && !space) { if (/\s/.test(head[i]) && !space) {
@ -441,20 +442,20 @@ function powerShellStart() {
}); });
if (_psChild && _psChild.pid) { if (_psChild && _psChild.pid) {
_psPersistent = true; _psPersistent = true;
_psChild.stdout.on('data', function (data) { _psChild.stdout.on('data', (data) => {
_psResult = _psResult + data.toString('utf8'); _psResult = _psResult + data.toString('utf8');
if (data.indexOf(_psCmdSeperator) >= 0) { if (data.indexOf(_psCmdSeperator) >= 0) {
powerShellProceedResults(_psResult); powerShellProceedResults(_psResult);
_psResult = ''; _psResult = '';
} }
}); });
_psChild.stderr.on('data', function () { _psChild.stderr.on('data', () => {
powerShellProceedResults(_psResult + _psError); powerShellProceedResults(_psResult + _psError);
}); });
_psChild.on('error', function () { _psChild.on('error', () => {
powerShellProceedResults(_psResult + _psError); powerShellProceedResults(_psResult + _psError);
}); });
_psChild.on('close', function () { _psChild.on('close', () => {
if (_psChild) { if (_psChild) {
_psChild.kill(); _psChild.kill();
} }
@ -521,24 +522,24 @@ function powerShell(cmd) {
}); });
if (child && !child.pid) { if (child && !child.pid) {
child.on('error', function () { child.on('error', () => {
resolve(result); resolve(result);
}); });
} }
if (child && child.pid) { if (child && child.pid) {
child.stdout.on('data', function (data) { child.stdout.on('data', (data) => {
result = result + data.toString('utf8'); result = result + data.toString('utf8');
}); });
child.stderr.on('data', function () { child.stderr.on('data', () => {
child.kill(); child.kill();
resolve(result); resolve(result);
}); });
child.on('close', function () { child.on('close', () => {
child.kill(); child.kill();
resolve(result); resolve(result);
}); });
child.on('error', function () { child.on('error', () => {
child.kill(); child.kill();
resolve(result); resolve(result);
}); });
@ -571,26 +572,26 @@ function execSafe(cmd, args, options) {
const child = spawn(cmd, args, options); const child = spawn(cmd, args, options);
if (child && !child.pid) { if (child && !child.pid) {
child.on('error', function () { child.on('error', () => {
resolve(result); resolve(result);
}); });
} }
if (child && child.pid) { if (child && child.pid) {
child.stdout.on('data', function (data) { child.stdout.on('data', (data) => {
result += data.toString(); result += data.toString();
}); });
child.on('close', function () { child.on('close', () => {
child.kill(); child.kill();
resolve(result); resolve(result);
}); });
child.on('error', function () { child.on('error', () => {
child.kill(); child.kill();
resolve(result); resolve(result);
}); });
} else { } else {
resolve(result); resolve(result);
} }
} catch (e) { } catch {
resolve(result); resolve(result);
} }
}); });
@ -605,7 +606,7 @@ function getCodepage() {
const lines = stdout.toString().split('\r\n'); const lines = stdout.toString().split('\r\n');
const parts = lines[0].split(':'); const parts = lines[0].split(':');
codepage = parts.length > 1 ? parts[1].replace('.', '').trim() : ''; codepage = parts.length > 1 ? parts[1].replace('.', '').trim() : '';
} catch (err) { } catch {
codepage = '437'; codepage = '437';
} }
} }
@ -621,7 +622,7 @@ function getCodepage() {
if (!codepage) { if (!codepage) {
codepage = 'UTF-8'; codepage = 'UTF-8';
} }
} catch (err) { } catch {
codepage = 'UTF-8'; codepage = 'UTF-8';
} }
} }
@ -642,7 +643,7 @@ function smartMonToolsInstalled() {
} else { } else {
_smartMonToolsInstalled = false; _smartMonToolsInstalled = false;
} }
} catch (e) { } catch {
_smartMonToolsInstalled = false; _smartMonToolsInstalled = false;
} }
} }
@ -650,7 +651,7 @@ function smartMonToolsInstalled() {
try { try {
const pathArray = execSync('which smartctl 2>/dev/null', execOptsLinux).toString().split('\r\n'); const pathArray = execSync('which smartctl 2>/dev/null', execOptsLinux).toString().split('\r\n');
_smartMonToolsInstalled = pathArray.length > 0; _smartMonToolsInstalled = pathArray.length > 0;
} catch (e) { } catch {
util.noop(); util.noop();
} }
} }
@ -669,7 +670,7 @@ function isRaspberry(cpuinfo) {
try { try {
cpuinfo = fs.readFileSync('/proc/cpuinfo', { encoding: 'utf8' }).toString().split('\n'); cpuinfo = fs.readFileSync('/proc/cpuinfo', { encoding: 'utf8' }).toString().split('\n');
_rpi_cpuinfo = cpuinfo; _rpi_cpuinfo = cpuinfo;
} catch (e) { } catch {
return false; return false;
} }
} }
@ -683,7 +684,7 @@ function isRaspbian() {
let osrelease = []; let osrelease = [];
try { try {
osrelease = fs.readFileSync('/etc/os-release', { encoding: 'utf8' }).toString().split('\n'); osrelease = fs.readFileSync('/etc/os-release', { encoding: 'utf8' }).toString().split('\n');
} catch (e) { } catch {
return false; return false;
} }
const id = getValue(osrelease, 'id', '='); const id = getValue(osrelease, 'id', '=');
@ -696,7 +697,7 @@ function execWin(cmd, opts, callback) {
opts = execOptsWin; opts = execOptsWin;
} }
let newCmd = 'chcp 65001 > nul && cmd /C ' + cmd + ' && chcp ' + codepage + ' > nul'; let newCmd = 'chcp 65001 > nul && cmd /C ' + cmd + ' && chcp ' + codepage + ' > nul';
exec(newCmd, opts, function (error, stdout) { exec(newCmd, opts, (error, stdout) => {
callback(error, stdout); callback(error, stdout);
}); });
} }
@ -849,7 +850,7 @@ function isPrototypePolluted() {
const s1 = st[i]; const s1 = st[i];
try { try {
s1.__proto__.toLowerCase = stringToLower; s1.__proto__.toLowerCase = stringToLower;
} catch (e) { } catch {
Object.setPrototypeOf(st, stringObj); Object.setPrototypeOf(st, stringObj);
} }
const s2 = stl ? stl[i] : ''; const s2 = stl ? stl[i] : '';
@ -878,14 +879,14 @@ function getFilesInPath(source) {
function getDirectories(source) { function getDirectories(source) {
return readdirSync(source) return readdirSync(source)
.map(function (name) { .map((name) => {
return join(source, name); return join(source, name);
}) })
.filter(isDirectory); .filter(isDirectory);
} }
function getFiles(source) { function getFiles(source) {
return readdirSync(source) return readdirSync(source)
.map(function (name) { .map((name) => {
return join(source, name); return join(source, name);
}) })
.filter(isFile); .filter(isFile);
@ -893,16 +894,16 @@ function getFilesInPath(source) {
function getFilesRecursively(source) { function getFilesRecursively(source) {
try { try {
let dirs = getDirectories(source); const dirs = getDirectories(source);
let files = dirs const files = dirs
.map(function (dir) { .map((dir) => {
return getFilesRecursively(dir); return getFilesRecursively(dir);
}) })
.reduce(function (a, b) { .reduce((a, b) => {
return a.concat(b); return a.concat(b);
}, []); }, []);
return files.concat(getFiles(source)); return files.concat(getFiles(source));
} catch (e) { } catch {
return []; return [];
} }
} }
@ -1159,8 +1160,8 @@ function promiseAll(promises) {
const results = []; const results = [];
// Execute all wrapped Promises // Execute all wrapped Promises
return Promise.all(resolvingPromises).then(function (items) { return Promise.all(resolvingPromises).then((items) => {
items.forEach(function (payload) { items.forEach((payload) => {
if (payload[1]) { if (payload[1]) {
errors.push(payload[1]); errors.push(payload[1]);
results.push(null); results.push(null);
@ -1178,10 +1179,10 @@ function promiseAll(promises) {
} }
function promisify(nodeStyleFunction) { function promisify(nodeStyleFunction) {
return function () { return () => {
const args = Array.prototype.slice.call(arguments); const args = Array.prototype.slice.call(arguments);
return new Promise(function (resolve, reject) { return new Promise((resolve, reject) => {
args.push(function (err, data) { args.push((err, data) => {
if (err) { if (err) {
reject(err); reject(err);
} else { } else {
@ -1194,10 +1195,10 @@ function promisify(nodeStyleFunction) {
} }
function promisifySave(nodeStyleFunction) { function promisifySave(nodeStyleFunction) {
return function () { return () => {
const args = Array.prototype.slice.call(arguments); const args = Array.prototype.slice.call(arguments);
return new Promise(function (resolve) { return new Promise((resolve) => {
args.push(function (err, data) { args.push((err, data) => {
resolve(data); resolve(data);
}); });
nodeStyleFunction.apply(null, args); nodeStyleFunction.apply(null, args);
@ -1210,7 +1211,7 @@ function linuxVersion() {
if (_linux) { if (_linux) {
try { try {
result = execSync('uname -v', execOptsLinux).toString(); result = execSync('uname -v', execOptsLinux).toString();
} catch (e) { } catch {
result = ''; result = '';
} }
} }
@ -2617,7 +2618,7 @@ function checkWebsite(url, timeout = 5000) {
const t = Date.now(); const t = Date.now();
return new Promise((resolve) => { return new Promise((resolve) => {
const request = http const request = http
.get(url, function (res) { .get(url, (res) => {
res.on('data', () => {}); res.on('data', () => {});
res.on('end', () => { res.on('end', () => {
resolve({ resolve({
@ -2628,7 +2629,7 @@ function checkWebsite(url, timeout = 5000) {
}); });
}); });
}) })
.on('error', function (e) { .on('error', (e) => {
resolve({ resolve({
url, url,
statusCode: 404, statusCode: 404,

249
lib/wifi.js
View File

@ -20,15 +20,19 @@ const util = require('./util');
let _platform = process.platform; let _platform = process.platform;
const _linux = (_platform === 'linux' || _platform === 'android'); const _linux = _platform === 'linux' || _platform === 'android';
const _darwin = (_platform === 'darwin'); const _darwin = _platform === 'darwin';
const _windows = (_platform === 'win32'); const _windows = _platform === 'win32';
function wifiDBFromQuality(quality) { function wifiDBFromQuality(quality) {
const qual = parseFloat(quality); const qual = parseFloat(quality);
if (qual < 0) { return 0; } if (qual < 0) {
if (qual >= 100) { return -50; } return 0;
return (qual / 2 - 100); }
if (qual >= 100) {
return -50;
}
return qual / 2 - 100;
} }
function wifiQualityFromDB(db) { function wifiQualityFromDB(db) {
@ -120,7 +124,9 @@ function wifiChannelFromFrequencs(frequency) {
let channel = 0; let channel = 0;
for (let key in _wifi_frequencies) { for (let key in _wifi_frequencies) {
if ({}.hasOwnProperty.call(_wifi_frequencies, key)) { if ({}.hasOwnProperty.call(_wifi_frequencies, key)) {
if (_wifi_frequencies[key] === frequency) { channel = util.toInt(key); } if (_wifi_frequencies[key] === frequency) {
channel = util.toInt(key);
}
} }
} }
return channel; return channel;
@ -130,10 +136,14 @@ function ifaceListLinux() {
const result = []; const result = [];
const cmd = 'iw dev 2>/dev/null'; const cmd = 'iw dev 2>/dev/null';
try { try {
const all = execSync(cmd, util.execOptsLinux).toString().split('\n').map(line => line.trim()).join('\n'); const all = execSync(cmd, util.execOptsLinux)
.toString()
.split('\n')
.map((line) => line.trim())
.join('\n');
const parts = all.split('\nInterface '); const parts = all.split('\nInterface ');
parts.shift(); parts.shift();
parts.forEach(ifaceDetails => { parts.forEach((ifaceDetails) => {
const lines = ifaceDetails.split('\n'); const lines = ifaceDetails.split('\n');
const iface = lines[0]; const iface = lines[0];
const id = util.toInt(util.getValue(lines, 'ifindex', ' ')); const id = util.toInt(util.getValue(lines, 'ifindex', ' '));
@ -152,7 +162,7 @@ function ifaceListLinux() {
const all = execSync('nmcli -t -f general,wifi-properties,wired-properties,interface-flags,capabilities,nsp device show 2>/dev/null', util.execOptsLinux).toString(); const all = execSync('nmcli -t -f general,wifi-properties,wired-properties,interface-flags,capabilities,nsp device show 2>/dev/null', util.execOptsLinux).toString();
const parts = all.split('\n\n'); const parts = all.split('\n\n');
let i = 1; let i = 1;
parts.forEach(ifaceDetails => { parts.forEach((ifaceDetails) => {
const lines = ifaceDetails.split('\n'); const lines = ifaceDetails.split('\n');
const iface = util.getValue(lines, 'GENERAL.DEVICE'); const iface = util.getValue(lines, 'GENERAL.DEVICE');
const type = util.getValue(lines, 'GENERAL.TYPE'); const type = util.getValue(lines, 'GENERAL.TYPE');
@ -239,7 +249,7 @@ function getWifiNetworkListNmi() {
const stdout = execSync(cmd, util.execOptsLinux); const stdout = execSync(cmd, util.execOptsLinux);
const parts = stdout.toString().split('ACTIVE:'); const parts = stdout.toString().split('ACTIVE:');
parts.shift(); parts.shift();
parts.forEach(part => { parts.forEach((part) => {
part = 'ACTIVE:' + part; part = 'ACTIVE:' + part;
const lines = part.split(os.EOL); const lines = part.split(os.EOL);
const channel = util.getValue(lines, 'CHAN'); const channel = util.getValue(lines, 'CHAN');
@ -271,13 +281,15 @@ function getWifiNetworkListIw(iface) {
const result = []; const result = [];
try { try {
let iwlistParts = execSync(`export LC_ALL=C; iwlist ${iface} scan 2>&1; unset LC_ALL`, util.execOptsLinux).toString().split(' Cell '); let iwlistParts = execSync(`export LC_ALL=C; iwlist ${iface} scan 2>&1; unset LC_ALL`, util.execOptsLinux).toString().split(' Cell ');
if (iwlistParts[0].indexOf('resource busy') >= 0) { return -1; } if (iwlistParts[0].indexOf('resource busy') >= 0) {
return -1;
}
if (iwlistParts.length > 1) { if (iwlistParts.length > 1) {
iwlistParts.shift(); iwlistParts.shift();
iwlistParts.forEach(element => { iwlistParts.forEach((element) => {
const lines = element.split('\n'); const lines = element.split('\n');
const channel = util.getValue(lines, 'channel', ':', true); const channel = util.getValue(lines, 'channel', ':', true);
const address = (lines && lines.length && lines[0].indexOf('Address:') >= 0 ? lines[0].split('Address:')[1].trim().toLowerCase() : ''); const address = lines && lines.length && lines[0].indexOf('Address:') >= 0 ? lines[0].split('Address:')[1].trim().toLowerCase() : '';
const mode = util.getValue(lines, 'mode', ':', true); const mode = util.getValue(lines, 'mode', ':', true);
const frequency = util.getValue(lines, 'frequency', ':', true); const frequency = util.getValue(lines, 'frequency', ':', true);
const qualityString = util.getValue(lines, 'Quality', '=', true); const qualityString = util.getValue(lines, 'Quality', '=', true);
@ -290,11 +302,15 @@ function getWifiNetworkListIw(iface) {
const isWpa = element.indexOf(' WPA ') >= 0; const isWpa = element.indexOf(' WPA ') >= 0;
const isWpa2 = element.indexOf('WPA2 ') >= 0; const isWpa2 = element.indexOf('WPA2 ') >= 0;
const security = []; const security = [];
if (isWpa) { security.push('WPA'); } if (isWpa) {
if (isWpa2) { security.push('WPA2'); } security.push('WPA');
}
if (isWpa2) {
security.push('WPA2');
}
const wpaFlags = []; const wpaFlags = [];
let wpaFlag = ''; let wpaFlag = '';
lines.forEach(function (line) { lines.forEach((line) => {
const l = line.trim().toLowerCase(); const l = line.trim().toLowerCase();
if (l.indexOf('group cipher') >= 0) { if (l.indexOf('group cipher') >= 0) {
if (wpaFlag) { if (wpaFlag) {
@ -308,16 +324,23 @@ function getWifiNetworkListIw(iface) {
if (l.indexOf('pairwise cipher') >= 0) { if (l.indexOf('pairwise cipher') >= 0) {
const parts = l.split(':'); const parts = l.split(':');
if (parts.length > 1) { if (parts.length > 1) {
if (parts[1].indexOf('tkip')) { wpaFlag = (wpaFlag ? 'TKIP/' + wpaFlag : 'TKIP'); } if (parts[1].indexOf('tkip')) {
else if (parts[1].indexOf('ccmp')) { wpaFlag = (wpaFlag ? 'CCMP/' + wpaFlag : 'CCMP'); } wpaFlag = wpaFlag ? 'TKIP/' + wpaFlag : 'TKIP';
else if (parts[1].indexOf('proprietary')) { wpaFlag = (wpaFlag ? 'PROP/' + wpaFlag : 'PROP'); } } else if (parts[1].indexOf('ccmp')) {
wpaFlag = wpaFlag ? 'CCMP/' + wpaFlag : 'CCMP';
} else if (parts[1].indexOf('proprietary')) {
wpaFlag = wpaFlag ? 'PROP/' + wpaFlag : 'PROP';
}
} }
} }
if (l.indexOf('authentication suites') >= 0) { if (l.indexOf('authentication suites') >= 0) {
const parts = l.split(':'); const parts = l.split(':');
if (parts.length > 1) { if (parts.length > 1) {
if (parts[1].indexOf('802.1x')) { wpaFlag = (wpaFlag ? '802.1x/' + wpaFlag : '802.1x'); } if (parts[1].indexOf('802.1x')) {
else if (parts[1].indexOf('psk')) { wpaFlag = (wpaFlag ? 'PSK/' + wpaFlag : 'PSK'); } wpaFlag = wpaFlag ? '802.1x/' + wpaFlag : '802.1x';
} else if (parts[1].indexOf('psk')) {
wpaFlag = wpaFlag ? 'PSK/' + wpaFlag : 'PSK';
}
} }
} }
}); });
@ -345,66 +368,13 @@ function getWifiNetworkListIw(iface) {
} }
} }
function parseWifiDarwinXX(wifiObj) {
const result = [];
if (wifiObj) {
wifiObj.forEach(function (wifiItem) {
const signalLevel = wifiItem.RSSI;
let security = [];
let wpaFlags = [];
let ssid = wifiItem.SSID_STR || '';
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'); }
});
}
}
if (wifiItem.SSID && ssid === '') {
try {
ssid = Buffer.from(wifiItem.SSID, 'base64').toString('utf8');
} catch (err) {
util.noop();
}
}
result.push({
ssid,
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 parseWifiDarwin(wifiStr) { function parseWifiDarwin(wifiStr) {
const result = []; const result = [];
try { try {
let wifiObj = JSON.parse(wifiStr); let wifiObj = JSON.parse(wifiStr);
wifiObj = wifiObj.SPAirPortDataType[0].spairport_airport_interfaces[0].spairport_airport_other_local_wireless_networks; wifiObj = wifiObj.SPAirPortDataType[0].spairport_airport_interfaces[0].spairport_airport_other_local_wireless_networks;
wifiObj.forEach(function (wifiItem) { wifiObj.forEach((wifiItem) => {
const security = [];
let security = [];
const sm = wifiItem.spairport_security_mode || ''; const sm = wifiItem.spairport_security_mode || '';
if (sm === 'spairport_security_mode_wep') { if (sm === 'spairport_security_mode_wep') {
security.push('WEP'); security.push('WEP');
@ -437,7 +407,7 @@ function parseWifiDarwin(wifiStr) {
} catch (e) { } catch (e) {
return result; return result;
} }
}; }
function wifiNetworks(callback) { function wifiNetworks(callback) {
return new Promise((resolve) => { return new Promise((resolve) => {
process.nextTick(() => { process.nextTick(() => {
@ -448,7 +418,7 @@ function wifiNetworks(callback) {
try { try {
const iwconfigParts = execSync('export LC_ALL=C; iwconfig 2>/dev/null; unset LC_ALL', util.execOptsLinux).toString().split('\n\n'); const iwconfigParts = execSync('export LC_ALL=C; iwconfig 2>/dev/null; unset LC_ALL', util.execOptsLinux).toString().split('\n\n');
let iface = ''; let iface = '';
iwconfigParts.forEach(element => { iwconfigParts.forEach((element) => {
if (element.indexOf('no wireless') === -1 && element.trim() !== '') { if (element.indexOf('no wireless') === -1 && element.trim() !== '') {
iface = element.split(' ')[0]; iface = element.split(' ')[0];
} }
@ -467,9 +437,11 @@ function wifiNetworks(callback) {
const res = getWifiNetworkListIw(ifaceSanitized); const res = getWifiNetworkListIw(ifaceSanitized);
if (res === -1) { if (res === -1) {
// try again after 4 secs // try again after 4 secs
setTimeout(function (iface) { setTimeout((iface) => {
const res = getWifiNetworkListIw(iface); const res = getWifiNetworkListIw(iface);
if (res != -1) { result = res; } if (res !== -1) {
result = res;
}
if (callback) { if (callback) {
callback(result); callback(result);
} }
@ -501,8 +473,8 @@ function wifiNetworks(callback) {
resolve(result); resolve(result);
} }
} else if (_darwin) { } else if (_darwin) {
let cmd = 'system_profiler SPAirPortDataType -json 2>/dev/null'; const cmd = 'system_profiler SPAirPortDataType -json 2>/dev/null';
exec(cmd, { maxBuffer: 1024 * 40000 }, function (error, stdout) { exec(cmd, { maxBuffer: 1024 * 40000 }, (error, stdout) => {
result = parseWifiDarwin(stdout.toString()); result = parseWifiDarwin(stdout.toString());
if (callback) { if (callback) {
callback(result); callback(result);
@ -510,12 +482,12 @@ function wifiNetworks(callback) {
resolve(result); resolve(result);
}); });
} else if (_windows) { } else if (_windows) {
let cmd = 'netsh wlan show networks mode=Bssid'; const cmd = 'netsh wlan show networks mode=Bssid';
util.powerShell(cmd).then((stdout) => { util.powerShell(cmd).then((stdout) => {
const ssidParts = stdout.toString('utf8').split(os.EOL + os.EOL + 'SSID '); const ssidParts = stdout.toString('utf8').split(os.EOL + os.EOL + 'SSID ');
ssidParts.shift(); ssidParts.shift();
ssidParts.forEach(ssidPart => { ssidParts.forEach((ssidPart) => {
const ssidLines = ssidPart.split(os.EOL); const ssidLines = ssidPart.split(os.EOL);
if (ssidLines && ssidLines.length >= 8 && ssidLines[0].indexOf(':') >= 0) { if (ssidLines && ssidLines.length >= 8 && ssidLines[0].indexOf(':') >= 0) {
const bssidsParts = ssidPart.split(' BSSID'); const bssidsParts = ssidPart.split(' BSSID');
@ -565,29 +537,46 @@ exports.wifiNetworks = wifiNetworks;
function getVendor(model) { function getVendor(model) {
model = model.toLowerCase(); model = model.toLowerCase();
let result = ''; let result = '';
if (model.indexOf('intel') >= 0) { result = 'Intel'; } if (model.indexOf('intel') >= 0) {
else if (model.indexOf('realtek') >= 0) { result = 'Realtek'; } result = 'Intel';
else if (model.indexOf('qualcom') >= 0) { result = 'Qualcom'; } } else if (model.indexOf('realtek') >= 0) {
else if (model.indexOf('broadcom') >= 0) { result = 'Broadcom'; } result = 'Realtek';
else if (model.indexOf('cavium') >= 0) { result = 'Cavium'; } } else if (model.indexOf('qualcom') >= 0) {
else if (model.indexOf('cisco') >= 0) { result = 'Cisco'; } result = 'Qualcom';
else if (model.indexOf('marvel') >= 0) { result = 'Marvel'; } } else if (model.indexOf('broadcom') >= 0) {
else if (model.indexOf('zyxel') >= 0) { result = 'Zyxel'; } result = 'Broadcom';
else if (model.indexOf('melanox') >= 0) { result = 'Melanox'; } } else if (model.indexOf('cavium') >= 0) {
else if (model.indexOf('d-link') >= 0) { result = 'D-Link'; } result = 'Cavium';
else if (model.indexOf('tp-link') >= 0) { result = 'TP-Link'; } } else if (model.indexOf('cisco') >= 0) {
else if (model.indexOf('asus') >= 0) { result = 'Asus'; } result = 'Cisco';
else if (model.indexOf('linksys') >= 0) { result = 'Linksys'; } } else if (model.indexOf('marvel') >= 0) {
result = 'Marvel';
} else if (model.indexOf('zyxel') >= 0) {
result = 'Zyxel';
} else if (model.indexOf('melanox') >= 0) {
result = 'Melanox';
} else if (model.indexOf('d-link') >= 0) {
result = 'D-Link';
} else if (model.indexOf('tp-link') >= 0) {
result = 'TP-Link';
} else if (model.indexOf('asus') >= 0) {
result = 'Asus';
} else if (model.indexOf('linksys') >= 0) {
result = 'Linksys';
}
return result; return result;
} }
function formatBssid(s) { function formatBssid(s) {
s = s.replace(/</g, '').replace(/>/g, '').match(/.{1,2}/g) || []; s =
s
.replace(/</g, '')
.replace(/>/g, '')
.match(/.{1,2}/g) || [];
return s.join(':'); return s.join(':');
} }
function wifiConnections(callback) { function wifiConnections(callback) {
return new Promise((resolve) => { return new Promise((resolve) => {
process.nextTick(() => { process.nextTick(() => {
const result = []; const result = [];
@ -595,7 +584,7 @@ function wifiConnections(callback) {
if (_linux) { if (_linux) {
const ifaces = ifaceListLinux(); const ifaces = ifaceListLinux();
const networkList = getWifiNetworkListNmi(); const networkList = getWifiNetworkListNmi();
ifaces.forEach(ifaceDetail => { ifaces.forEach((ifaceDetail) => {
let ifaceSanitized = ''; let ifaceSanitized = '';
const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(ifaceDetail.iface, true); const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(ifaceDetail.iface, true);
const ll = util.mathMin(s.length, 2000); const ll = util.mathMin(s.length, 2000);
@ -609,7 +598,7 @@ function wifiConnections(callback) {
const nmiDetails = nmiDeviceLinux(ifaceSanitized); const nmiDetails = nmiDeviceLinux(ifaceSanitized);
const wpaDetails = wpaConnectionLinux(ifaceSanitized); const wpaDetails = wpaConnectionLinux(ifaceSanitized);
const ssid = nmiDetails.ssid || wpaDetails.ssid; const ssid = nmiDetails.ssid || wpaDetails.ssid;
const network = networkList.filter(nw => nw.ssid === ssid); const network = networkList.filter((nw) => nw.ssid === ssid);
let ssidSanitized = ''; let ssidSanitized = '';
const t = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(ssid, true); const t = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(ssid, true);
const l = util.mathMin(t.length, 32); const l = util.mathMin(t.length, 32);
@ -620,8 +609,8 @@ function wifiConnections(callback) {
} }
const nmiConnection = nmiConnectionLinux(ssidSanitized); const nmiConnection = nmiConnectionLinux(ssidSanitized);
const channel = network && network.length && network[0].channel ? network[0].channel : (wpaDetails.channel ? wpaDetails.channel : null); const channel = network && network.length && network[0].channel ? network[0].channel : wpaDetails.channel ? wpaDetails.channel : null;
const bssid = network && network.length && network[0].bssid ? network[0].bssid : (wpaDetails.bssid ? wpaDetails.bssid : null); const bssid = network && network.length && network[0].bssid ? network[0].bssid : wpaDetails.bssid ? wpaDetails.bssid : null;
const signalLevel = network && network.length && network[0].signalLevel ? network[0].signalLevel : null; const signalLevel = network && network.length && network[0].signalLevel ? network[0].signalLevel : null;
if (ssid && bssid) { if (ssid && bssid) {
result.push({ result.push({
@ -629,11 +618,11 @@ function wifiConnections(callback) {
iface: ifaceDetail.iface, iface: ifaceDetail.iface,
model: nmiDetails.product, model: nmiDetails.product,
ssid, ssid,
bssid: network && network.length && network[0].bssid ? network[0].bssid : (wpaDetails.bssid ? wpaDetails.bssid : null), bssid: network && network.length && network[0].bssid ? network[0].bssid : wpaDetails.bssid ? wpaDetails.bssid : null,
channel, channel,
frequency: channel ? wifiFrequencyFromChannel(channel) : null, frequency: channel ? wifiFrequencyFromChannel(channel) : null,
type: nmiConnection.type ? nmiConnection.type : '802.11', type: nmiConnection.type ? nmiConnection.type : '802.11',
security: nmiConnection.security ? nmiConnection.security : (wpaDetails.security ? wpaDetails.security : null), security: nmiConnection.security ? nmiConnection.security : wpaDetails.security ? wpaDetails.security : null,
signalLevel, signalLevel,
quality: wifiQualityFromDB(signalLevel), quality: wifiQualityFromDB(signalLevel),
txRate: null txRate: null
@ -645,13 +634,14 @@ function wifiConnections(callback) {
} }
resolve(result); resolve(result);
} else if (_darwin) { } else if (_darwin) {
let cmd = 'system_profiler SPNetworkDataType SPAirPortDataType -xml 2>/dev/null; echo "######" ; ioreg -n AppleBCMWLANSkywalkInterface -r 2>/dev/null'; const cmd = 'system_profiler SPNetworkDataType SPAirPortDataType -xml 2>/dev/null; echo "######" ; ioreg -n AppleBCMWLANSkywalkInterface -r 2>/dev/null';
exec(cmd, function (error, stdout) { exec(cmd, (error, stdout) => {
try { try {
const parts = stdout.toString().split('######'); const parts = stdout.toString().split('######');
const profilerObj = util.plistParser(parts[0]); const profilerObj = util.plistParser(parts[0]);
const networkObj = profilerObj[0]._SPCommandLineArguments.indexOf('SPNetworkDataType') >= 0 ? profilerObj[0]._items : profilerObj[1]._items; const networkObj = profilerObj[0]._SPCommandLineArguments.indexOf('SPNetworkDataType') >= 0 ? profilerObj[0]._items : profilerObj[1]._items;
const airportObj = profilerObj[0]._SPCommandLineArguments.indexOf('SPAirPortDataType') >= 0 ? profilerObj[0]._items[0].spairport_airport_interfaces : profilerObj[1]._items[0].spairport_airport_interfaces; const airportObj =
profilerObj[0]._SPCommandLineArguments.indexOf('SPAirPortDataType') >= 0 ? profilerObj[0]._items[0].spairport_airport_interfaces : profilerObj[1]._items[0].spairport_airport_interfaces;
// parts[1] : ioreg // parts[1] : ioreg
let lines3 = []; let lines3 = [];
@ -659,13 +649,15 @@ function wifiConnections(callback) {
lines3 = parts[1].split(' | {')[1].split(' | }')[0].replace(/ \| /g, '').replace(/"/g, '').split('\n'); lines3 = parts[1].split(' | {')[1].split(' | }')[0].replace(/ \| /g, '').replace(/"/g, '').split('\n');
} }
const networkWifiObj = networkObj.find((item) => { return item._name === 'Wi-Fi'; }); const networkWifiObj = networkObj.find((item) => {
return item._name === 'Wi-Fi';
});
const airportWifiObj = airportObj[0].spairport_current_network_information; const airportWifiObj = airportObj[0].spairport_current_network_information;
const channel = parseInt(('' + airportWifiObj.spairport_network_channel).split(' ')[0]) || 0; const channel = parseInt(('' + airportWifiObj.spairport_network_channel).split(' ')[0], 10) || 0;
const signalLevel = airportWifiObj.spairport_signal_noise || null; const signalLevel = airportWifiObj.spairport_signal_noise || null;
let security = []; const security = [];
const sm = airportWifiObj.spairport_security_mode || ''; const sm = airportWifiObj.spairport_security_mode || '';
if (sm === 'spairport_security_mode_wep') { if (sm === 'spairport_security_mode_wep') {
security.push('WEP'); security.push('WEP');
@ -683,7 +675,7 @@ function wifiConnections(callback) {
id: networkWifiObj._name || 'Wi-Fi', id: networkWifiObj._name || 'Wi-Fi',
iface: networkWifiObj.interface || '', iface: networkWifiObj.interface || '',
model: networkWifiObj.hardware || '', model: networkWifiObj.hardware || '',
ssid: airportWifiObj._name || '', ssid: (airportWifiObj._name || '').replace('&lt;', '<').replace('&gt;', '>'),
bssid: airportWifiObj.spairport_network_bssid || '', bssid: airportWifiObj.spairport_network_bssid || '',
channel, channel,
frequency: channel ? wifiFrequencyFromChannel(channel) : null, frequency: channel ? wifiFrequencyFromChannel(channel) : null,
@ -691,10 +683,9 @@ function wifiConnections(callback) {
security, security,
signalLevel: signalLevel ? parseInt(signalLevel, 10) : null, signalLevel: signalLevel ? parseInt(signalLevel, 10) : null,
quality: wifiQualityFromDB(signalLevel), quality: wifiQualityFromDB(signalLevel),
txRate: airportWifiObj.spairport_network_rate || null, txRate: airportWifiObj.spairport_network_rate || null
}); });
} catch {
} catch (e) {
util.noop(); util.noop();
} }
if (callback) { if (callback) {
@ -703,15 +694,15 @@ function wifiConnections(callback) {
resolve(result); resolve(result);
}); });
} else if (_windows) { } else if (_windows) {
let cmd = 'netsh wlan show interfaces'; const cmd = 'netsh wlan show interfaces';
util.powerShell(cmd).then(function (stdout) { util.powerShell(cmd).then((stdout) => {
const allLines = stdout.toString().split('\r\n'); const allLines = stdout.toString().split('\r\n');
for (let i = 0; i < allLines.length; i++) { for (let i = 0; i < allLines.length; i++) {
allLines[i] = allLines[i].trim(); allLines[i] = allLines[i].trim();
} }
const parts = allLines.join('\r\n').split(':\r\n\r\n'); const parts = allLines.join('\r\n').split(':\r\n\r\n');
parts.shift(); parts.shift();
parts.forEach(part => { parts.forEach((part) => {
const lines = part.split('\r\n'); const lines = part.split('\r\n');
if (lines.length >= 5) { if (lines.length >= 5) {
const iface = lines[0].indexOf(':') >= 0 ? lines[0].split(':')[1].trim() : ''; const iface = lines[0].indexOf(':') >= 0 ? lines[0].split(':')[1].trim() : '';
@ -724,7 +715,8 @@ function wifiConnections(callback) {
const type = util.getValue(lines, 'Radio type', ':', true) || util.getValue(lines, 'Type de radio', ':', true) || util.getValue(lines, 'Funktyp', ':', true) || null; const type = util.getValue(lines, 'Radio type', ':', true) || util.getValue(lines, 'Type de radio', ':', true) || util.getValue(lines, 'Funktyp', ':', true) || null;
const security = util.getValue(lines, 'authentication', ':', true) || util.getValue(lines, 'Authentification', ':', true) || util.getValue(lines, 'Authentifizierung', ':', true) || null; const security = util.getValue(lines, 'authentication', ':', true) || util.getValue(lines, 'Authentification', ':', true) || util.getValue(lines, 'Authentifizierung', ':', true) || null;
const channel = util.getValue(lines, 'Channel', ':', true) || util.getValue(lines, 'Canal', ':', true) || util.getValue(lines, 'Kanal', ':', true) || null; const channel = util.getValue(lines, 'Channel', ':', true) || util.getValue(lines, 'Canal', ':', true) || util.getValue(lines, 'Kanal', ':', true) || null;
const txRate = util.getValue(lines, 'Transmit rate (mbps)', ':', true) || util.getValue(lines, 'Transmission (mbit/s)', ':', true) || util.getValue(lines, 'Empfangsrate (MBit/s)', ':', true) || null; const txRate =
util.getValue(lines, 'Transmit rate (mbps)', ':', true) || util.getValue(lines, 'Transmission (mbit/s)', ':', true) || util.getValue(lines, 'Empfangsrate (MBit/s)', ':', true) || null;
if (model && id && ssid && bssid) { if (model && id && ssid && bssid) {
result.push({ result.push({
id, id,
@ -761,21 +753,20 @@ function wifiConnections(callback) {
exports.wifiConnections = wifiConnections; exports.wifiConnections = wifiConnections;
function wifiInterfaces(callback) { function wifiInterfaces(callback) {
return new Promise((resolve) => { return new Promise((resolve) => {
process.nextTick(() => { process.nextTick(() => {
const result = []; const result = [];
if (_linux) { if (_linux) {
const ifaces = ifaceListLinux(); const ifaces = ifaceListLinux();
ifaces.forEach(ifaceDetail => { ifaces.forEach((ifaceDetail) => {
const nmiDetails = nmiDeviceLinux(ifaceDetail.iface); const nmiDetails = nmiDeviceLinux(ifaceDetail.iface);
result.push({ result.push({
id: ifaceDetail.id, id: ifaceDetail.id,
iface: ifaceDetail.iface, iface: ifaceDetail.iface,
model: nmiDetails.product ? nmiDetails.product : null, model: nmiDetails.product ? nmiDetails.product : null,
vendor: nmiDetails.vendor ? nmiDetails.vendor : null, vendor: nmiDetails.vendor ? nmiDetails.vendor : null,
mac: ifaceDetail.mac, mac: ifaceDetail.mac
}); });
}); });
if (callback) { if (callback) {
@ -783,8 +774,8 @@ function wifiInterfaces(callback) {
} }
resolve(result); resolve(result);
} else if (_darwin) { } else if (_darwin) {
let cmd = 'system_profiler SPNetworkDataType'; const cmd = 'system_profiler SPNetworkDataType';
exec(cmd, function (error, stdout) { exec(cmd, (error, stdout) => {
const parts1 = stdout.toString().split('\n\n Wi-Fi:\n\n'); const parts1 = stdout.toString().split('\n\n Wi-Fi:\n\n');
if (parts1.length > 1) { if (parts1.length > 1) {
const lines = parts1[1].split('\n\n')[0].split('\n'); const lines = parts1[1].split('\n\n')[0].split('\n');
@ -805,15 +796,15 @@ function wifiInterfaces(callback) {
resolve(result); resolve(result);
}); });
} else if (_windows) { } else if (_windows) {
let cmd = 'netsh wlan show interfaces'; const cmd = 'netsh wlan show interfaces';
util.powerShell(cmd).then(function (stdout) { util.powerShell(cmd).then((stdout) => {
const allLines = stdout.toString().split('\r\n'); const allLines = stdout.toString().split('\r\n');
for (let i = 0; i < allLines.length; i++) { for (let i = 0; i < allLines.length; i++) {
allLines[i] = allLines[i].trim(); allLines[i] = allLines[i].trim();
} }
const parts = allLines.join('\r\n').split(':\r\n\r\n'); const parts = allLines.join('\r\n').split(':\r\n\r\n');
parts.shift(); parts.shift();
parts.forEach(part => { parts.forEach((part) => {
const lines = part.split('\r\n'); const lines = part.split('\r\n');
if (lines.length >= 5) { if (lines.length >= 5) {
const iface = lines[0].indexOf(':') >= 0 ? lines[0].split(':')[1].trim() : ''; const iface = lines[0].indexOf(':') >= 0 ? lines[0].split(':')[1].trim() : '';
@ -829,7 +820,7 @@ function wifiInterfaces(callback) {
iface, iface,
model, model,
vendor, vendor,
mac, mac
}); });
} }
} }