homebridge-enphase-envoy 10.2.6 → 10.2.7-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/src/customcharacteristics.js +1 -1
  3. package/src/energymeter.js +7 -8
  4. package/src/envoydata.js +2 -3
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "private": false,
3
3
  "displayName": "Enphase Envoy",
4
4
  "name": "homebridge-enphase-envoy",
5
- "version": "10.2.6",
5
+ "version": "10.2.7-beta.1",
6
6
  "description": "Homebridge p7ugin for Photovoltaic Energy System manufactured by Enphase.",
7
7
  "license": "MIT",
8
8
  "author": "grzegorz914",
package/src/customcharacteristics.js CHANGED
@@ -2291,7 +2291,7 @@ export default (api) => {
2291
2291
  format: Formats.FLOAT,
2292
2292
  unit: 'W',
2293
2293
  maxValue: 1000000,
2294
- minValue: -1000000,
2294
+ minValue: 0,
2295
2295
  minStep: 0.001,
2296
2296
  perms: [Perms.PAIRED_READ, Perms.NOTIFY]
2297
2297
  });
package/src/energymeter.js CHANGED
@@ -229,9 +229,8 @@ class EnergyMeter extends EventEmitter {
229
229
  const errorString = error.toString();
230
230
  const tokenNotValid = errorString.includes('status code 401');
231
231
  if (tokenNotValid) {
232
- if (this.checkTokenRunning) {
233
- return;
234
- }
232
+ if (this.checkTokenRunning) return;
233
+
235
234
  this.feature.info.jwtToken.token = '';
236
235
  this.feature.tokenValid = false;
237
236
  return;
@@ -968,7 +967,7 @@ class EnergyMeter extends EventEmitter {
968
967
  const sourceEim = this.pv.powerAndEnergy[key].eim;
969
968
  sourceMeter = meterEnabled ? this.pv.meters.find(m => m.measurementType === 'production') : sourcePcu;
970
969
  sourceEnergy = meterEnabled ? sourceEim : sourcePcu;
971
- power = this.functions.isValidValue(sourceMeter.power) ? sourceMeter.power : null;
970
+ power = this.functions.isValidValue(sourceMeter.power) && sourceMeter.power >= 0 ? sourceMeter.power : 0;
972
971
  energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime / 1000 : null;
973
972
  energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyProductionLifetimeOffset : null;
974
973
  break;
@@ -976,7 +975,7 @@ class EnergyMeter extends EventEmitter {
976
975
  case 'consumptionNet': {
977
976
  sourceMeter = this.pv.meters.find(m => m.measurementType === 'net-consumption');
978
977
  sourceEnergy = this.pv.powerAndEnergy.consumptionNet;
979
- power = this.functions.isValidValue(sourceMeter.power) ? sourceMeter.power : null;
978
+ power = this.functions.isValidValue(sourceMeter.power) && sourceMeter.power >= 0 ? sourceMeter.power : 0;
980
979
  energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime / 1000 : null;
981
980
  energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyConsumptionNetLifetimeOffset : null;
982
981
  break;
@@ -984,7 +983,7 @@ class EnergyMeter extends EventEmitter {
984
983
  case 'consumptionTotal': {
985
984
  sourceMeter = this.pv.meters.find(m => m.measurementType === 'total-consumption');
986
985
  sourceEnergy = this.pv.powerAndEnergy.consumptionTotal;
987
- power = this.functions.isValidValue(sourceMeter.power) ? sourceMeter.power : null;
986
+ power = this.functions.isValidValue(sourceMeter.power) && sourceMeter.power >= 0 ? sourceMeter.power : 0;
988
987
  energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime / 1000 : null;
989
988
  energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyConsumptionTotalLifetimeOffset : null;
990
989
  break;
@@ -1010,7 +1009,7 @@ class EnergyMeter extends EventEmitter {
1010
1009
  // Add to fakegato history
1011
1010
  this.fakegatoHistoryService?.addEntry({
1012
1011
  time: Math.floor(Date.now() / 1000),
1013
- power: power
1012
+ power: power ?? 0
1014
1013
  });
1015
1014
 
1016
1015
  // Create characteristics energy meter
@@ -1096,7 +1095,7 @@ class EnergyMeter extends EventEmitter {
1096
1095
  })
1097
1096
  this.fakegatoHistoryService.addEntry({
1098
1097
  time: Math.floor(Date.now() / 1000),
1099
- power: this.pv.powerAndEnergy.data[0].power
1098
+ power: this.pv.powerAndEnergy.data[0].power ?? 0
1100
1099
  });
1101
1100
 
1102
1101
  // Energy Meter Service
package/src/envoydata.js CHANGED
@@ -449,9 +449,8 @@ class EnvoyData extends EventEmitter {
449
449
  const errorString = error.toString();
450
450
  const tokenNotValid = errorString.includes('status code 401');
451
451
  if (tokenNotValid) {
452
- if (this.checkTokenRunning) {
453
- return;
454
- }
452
+ if (this.checkTokenRunning) return;
453
+
455
454
  this.feature.info.jwtToken.token = '';
456
455
  this.feature.info.tokenValid = false;
457
456
  return;