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

batteries() support for multiple batteries (windows)

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2021-05-27 21:02:13 +02:00
parent aec4cf4d88
commit d0d55b1059
1 changed files with 93 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
lib/battery.js
View File

@ -27,6 +27,40 @@ const _openbsd = (_platform === 'openbsd');
const _netbsd = (_platform === 'netbsd'); const _netbsd = (_platform === 'netbsd');
const _sunos = (_platform === 'sunos'); const _sunos = (_platform === 'sunos');
function parseWinBatteryPart(lines, designCapacity, fullChargeCapacity) {
const result = {};
let status = util.getValue(lines, 'BatteryStatus', '=').trim();
// 1 = "Discharging"
// 2 = "On A/C"
// 3 = "Fully Charged"
// 4 = "Low"
// 5 = "Critical"
// 6 = "Charging"
// 7 = "Charging High"
// 8 = "Charging Low"
// 9 = "Charging Critical"
// 10 = "Undefined"
// 11 = "Partially Charged"
if (lines.join('').toLowerCase().indexOf('BatteryStatus') >= 0) {
const statusValue = status ? parseInt(status) : 0;
result.status = statusValue;
result.hasBattery = true;
result.maxCapacity = fullChargeCapacity || parseInt(util.getValue(lines, 'DesignCapacity', '=') || 0);
result.designCapacity = parseInt(util.getValue(lines, 'DesignCapacity', '=') || designCapacity);
result.voltage = parseInt(util.getValue(lines, 'DesignVoltage', '=') || 0) / 1000.0;
result.capacityUnit = 'mWh';
result.percent = parseInt(util.getValue(lines, 'EstimatedChargeRemaining', '=') || 0);
result.currentCapacity = parseInt(result.maxcapacity * result.percent / 100);
result.isCharging = (statusValue >= 6 && statusValue <= 9) || statusValue === 11 || (!(statusValue === 3) && !(statusValue === 1) && result.percent < 100);
result.acConnected = result.ischarging || statusValue === 2;
result.model = util.getValue(lines, 'DeviceID', '=');
} else {
result.status = -1;
}
return result;
}
module.exports = function (callback) { module.exports = function (callback) {
return new Promise((resolve) => { return new Promise((resolve) => {
@ -175,32 +209,65 @@ module.exports = function (callback) {
} }
if (_windows) { if (_windows) {
try { try {
util.wmic('Path Win32_Battery Get BatteryStatus, DesignCapacity, EstimatedChargeRemaining, DesignVoltage, FullChargeCapacity /value').then((stdout) => { const workload = [];
if (stdout) { workload.push(util.wmic('Path Win32_Battery Get /value'));
let lines = stdout.split('\r\n'); workload.push(util.powerShell('(Get-WmiObject -Class BatteryStaticData -Namespace ROOT/WMI).DesignedCapacity'));
let status = util.getValue(lines, 'BatteryStatus', '=').trim(); workload.push(util.powerShell('(Get-WmiObject -Class BatteryFullChargedCapacity -Namespace ROOT/WMI).FullChargedCapacity'));
// 1 = "Discharging" util.promiseAll(
// 2 = "On A/C" workload
// 3 = "Fully Charged" ).then(data => {
// 4 = "Low" if (data) {
// 5 = "Critical" let parts = data.results[0].split(/\n\s*\n/);
// 6 = "Charging" let designCapacities = data.results[1].split('\r\n');
// 7 = "Charging High" let fullChargeCapacities = data.results[2].split('\r\n');
// 8 = "Charging Low" if (parts && parts.length) {
// 9 = "Charging Critical" let first = false;
// 10 = "Undefined" let additionalBatteries = [];
// 11 = "Partially Charged" for (let i = 0; i < parts.length; i++) {
if (status && status != '10') { let lines = parts[i].split('\r\n');
const statusValue = parseInt(status); const designCapacity = designCapacities && designCapacities.length >= (i + 1) && designCapacities[i] ? util.toInt(designCapacities[i]) : 0;
result.hasBattery = true; const fullChargeCapacity = fullChargeCapacities && fullChargeCapacities.length >= (i + 1) && fullChargeCapacities[i] ? util.toInt(fullChargeCapacities[i]) : 0;
result.maxCapacity = parseInt(util.getValue(lines, 'DesignCapacity', '=') || 0); const parsed = parseWinBatteryPart(lines, designCapacity, fullChargeCapacity);
result.designCapacity = parseInt(util.getValue(lines, 'DesignCapacity', '=') || 0); if (!first && parsed.status > 0 && parsed.status !== 10) {
result.voltage = parseInt(util.getValue(lines, 'DesignVoltage', '=') || 0) / 1000.0; result.hasBattery = parsed.hasBattery;
result.capacityUnit = 'mWh'; result.maxCapacity = parsed.maxCapacity;
result.percent = parseInt(util.getValue(lines, 'EstimatedChargeRemaining', '=') || 0); result.designCapacity = parsed.designCapacity;
result.currentCapacity = parseInt(result.maxcapacity * result.percent / 100); result.voltage = parsed.voltage;
result.isCharging = (statusValue >= 6 && statusValue <= 9) || statusValue === 11 || (!(statusValue === 3) && !(statusValue === 1) && result.percent < 100); result.capacityUnit = parsed.capacityUnit;
result.acConnected = result.ischarging || statusValue === 2; result.percent = parsed.percent;
result.currentCapacity = parsed.currentCapacity;
result.isCharging = parsed.isCharging;
result.acConnected = parsed.acConnected;
result.model = parsed.model;
first = true;
} else if (parsed.status !== -1) {
additionalBatteries.push(
{
hasBattery: parsed.hasBattery,
maxCapacity: parsed.maxCapacity,
designCapacity: parsed.designCapacity,
voltage: parsed.voltage,
capacityUnit: parsed.capacityUnit,
percent: parsed.percent,
currentCapacity: parsed.currentCapacity,
isCharging: parsed.isCharging,
timeRemaining: null,
acConnected: parsed.acConnected,
model: parsed.model,
type: '',
manufacturer: '',
serial: ''
}
);
}
}
if (!first && additionalBatteries.length) {
result = additionalBatteries[0];
additionalBatteries.shift();
}
if (additionalBatteries.length) {
result.additionalBatteries = additionalBatteries;
}
} }
} }
if (callback) { callback(result); } if (callback) { callback(result); }