homebridge-enphase-envoy 10.2.3-beta.8 → 10.2.3

package/CHANGELOG.md

@@ -9,6 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - after update to v10.0.0 and above the accessory and bridge need to be removed from the homebridge / Home.app and added again
 
+## [10.2.3] - (15.10.2025)
+
+## Changes
+
+- fix [#215](https://github.com/grzegorz914/homebridge-enphase-envoy/issues/215)
+- epdate EVE Energy monitor
+- other small fixes
+- cleanup
+
 ## [10.2.2] - (12.10.2025)
 
 ## Changes

package/index.js

@@ -98,7 +98,7 @@ class EnvoyPlatform {
             const impulseGenerator = new ImpulseGenerator()
               .on('start', async () => {
                 try {
-                  const envoyDevice = new DeviceClass(api, accessoryName, host, displayType, envoyFirmware7xxTokenGenerationMode, envoyPasswd, envoyToken, envoyTokenInstaller, enlightenUser, enlightenPasswd, envoyIdFile, envoyTokenFile, device, prefDir, energyMeterHistoryFileName)
+                  const envoyDevice = new DeviceClass(api, accessoryName, host, displayType, envoyFirmware7xxTokenGenerationMode, envoyPasswd, envoyToken, envoyTokenInstaller, enlightenUser, enlightenPasswd, envoyIdFile, envoyTokenFile, device, prefDir, energyMeterHistoryFileName, log)
                     .on('devInfo', (info) => logLevel.devInfo && log.info(info))
                     .on('success', (msg) => logLevel.success && log.success(`Device: ${host} ${accessoryName}, ${msg}`))
                     .on('info', (msg) => logLevel.info && log.info(`Device: ${host} ${accessoryName}, ${msg}`))
@@ -133,7 +133,6 @@ class EnvoyPlatform {
   }
 
   configureAccessory(accessory) {
-    accessory.log = this.log;
     this.accessories.push(accessory);
   }
 }

package/package.json

@@ -2,7 +2,7 @@
     "private": false,
     "displayName": "Enphase Envoy",
     "name": "homebridge-enphase-envoy",
-    "version": "10.2.3-beta.8",
+    "version": "10.2.3",
     "description": "Homebridge p7ugin for Photovoltaic Energy System manufactured by Enphase.",
     "license": "MIT",
     "author": "grzegorz914",

package/src/customcharacteristics.js

@@ -2256,7 +2256,7 @@ export default (api) => {
     Service.LiveDataService = LiveDataService;
 
     // EVE electric meter
-    class EveCurrentConsumption extends Characteristic {
+    class EvePower extends Characteristic {
         constructor() {
             super('Power', 'E863F10D-079E-48FF-8F27-9C2605A29F52');
             this.setProps({
@@ -2270,9 +2270,9 @@ export default (api) => {
             this.value = this.getDefaultValue();
         }
     }
-    Characteristic.EveCurrentConsumption = EveCurrentConsumption;
+    Characteristic.EvePower = EvePower;
 
-    class EveTotalConsumption extends Characteristic {
+    class EveEnergyLifetime extends Characteristic {
         constructor() {
             super('Energy', 'E863F10C-079E-48FF-8F27-9C2605A29F52');
             this.setProps({
@@ -2286,7 +2286,7 @@ export default (api) => {
             this.value = this.getDefaultValue();
         }
     }
-    Characteristic.EveTotalConsumption = EveTotalConsumption;
+    Characteristic.EveEnergyLifetime = EveEnergyLifetime;
 
     class EveVoltage extends Characteristic {
         constructor() {
@@ -2324,7 +2324,7 @@ export default (api) => {
         constructor() {
             super('Reset time', 'E863F112-079E-48FF-8F27-9C2605A29F52');
             this.setProps({
-                format: Formats.UInt32,
+                format: Formats.UINT32,
                 perms: [Perms.PAIRED_READ, Perms.PAIRED_WRITE, Perms.NOTIFY]
             });
             this.value = this.getDefaultValue();
@@ -2338,8 +2338,8 @@ export default (api) => {
         constructor(displayName, subtype) {
             super(displayName, 'E863F130-079E-48FF-8F27-9C2605A29F52', subtype);
             // Mandatory Characteristics
-            this.addCharacteristic(Characteristic.EveCurrentConsumption);
-            this.addCharacteristic(Characteristic.EveTotalConsumption);
+            this.addCharacteristic(Characteristic.EvePower);
+            this.addCharacteristic(Characteristic.EveEnergyLifetime);
             // Optional Characteristics
             this.addOptionalCharacteristic(Characteristic.EveVoltage);
             this.addOptionalCharacteristic(Characteristic.EveCurrent);

package/src/energymeter.js

@@ -10,7 +10,7 @@ import fakegato from 'fakegato-history';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class EnergyMeter extends EventEmitter {
-    constructor(api, deviceName, host, displayType, envoyFirmware7xxTokenGenerationMode, envoyPasswd, envoyToken, envoyTokenInstaller, enlightenUser, enlightenPasswd, envoyIdFile, envoyTokenFile, device, prefDir, energyMeterHistoryFileName) {
+    constructor(api, deviceName, host, displayType, envoyFirmware7xxTokenGenerationMode, envoyPasswd, envoyToken, envoyTokenInstaller, enlightenUser, enlightenPasswd, envoyIdFile, envoyTokenFile, device, prefDir, energyMeterHistoryFileName, log) {
         super();
 
         Accessory = api.platformAccessory;
@@ -20,6 +20,7 @@ class EnergyMeter extends EventEmitter {
         AccessoryUUID = api.hap.uuid;
 
         //device configuration
+        this.log = log;
         this.name = deviceName;
         this.host = host;
 
@@ -50,6 +51,7 @@ class EnergyMeter extends EventEmitter {
         this.fakegatoHistory = fakegato(api);
         this.prefDir = prefDir;
         this.energyMeterHistoryFileName = energyMeterHistoryFileName;
+        this.lastReset = 0;
 
         //url
         this.url = envoyFirmware7xxTokenGenerationMode > 0 ? `https://${this.host}` : `http://${this.host}`;
@@ -974,42 +976,43 @@ class EnergyMeter extends EventEmitter {
 
         try {
             const powerAndEnergy = [];
-            const dataArr = [
+            const powerAndEnergyTypeArr = [
                 { type: 'production', state: this.feature.meters.production.enabled },
-                { type: 'consumptionNet', state: this.feature.meters.consumptionNet.enabled },
-                { type: 'consumptionTotal', state: this.feature.meters.consumptionTotal.enabled }
+                { type: 'net-consumption', state: this.feature.meters.consumptionNet.enabled },
+                { type: 'total-consumption', state: this.feature.meters.consumptionTotal.enabled }
             ];
 
-            for (const [index, data] of dataArr.entries()) {
-                const { type: key, state: meterEnabled } = data;
+            for (const [index, data] of powerAndEnergyTypeArr.entries()) {
+                const { type: meterType, state: meterEnabled } = data;
+                if (meterType !== 'production' && !meterEnabled) continue;
 
-                if (key !== 'production' && !meterEnabled) continue;
-
-                let sourceMeter, sourceEnergy, measurementType;
-                let power;
+                const key = MetersKeyMap[meterType];
+                const measurementType = ApiCodes[meterType];
 
+                let sourceMeter, sourceEnergy;
+                let power, energyLifetime;
                 switch (key) {
                     case 'production': {
-                        measurementType = 'Production';
                         const sourcePcu = this.pv.powerAndEnergy[key].pcu;
                         const sourceEim = this.pv.powerAndEnergy[key].eim;
                         sourceMeter = meterEnabled ? this.pv.meters.find(m => m.measurementType === 'production') : sourcePcu;
                         sourceEnergy = meterEnabled ? sourceEim : sourcePcu;
                         power = this.functions.isValidValue(sourceMeter.power) ? sourceMeter.power : null;
+                        energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime / 1000 : null;
                         break;
                     }
                     case 'consumptionNet': {
-                        measurementType = 'Consumption Net';
                         sourceMeter = this.pv.meters.find(m => m.measurementType === 'net-consumption');
                         sourceEnergy = this.pv.powerAndEnergy.consumptionNet;
                         power = this.functions.isValidValue(sourceMeter.power) ? sourceMeter.power : null;
+                        energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime / 1000 : null;
                         break;
                     }
                     case 'consumptionTotal': {
-                        measurementType = 'Consumption Total';
                         sourceMeter = this.pv.meters.find(m => m.measurementType === 'total-consumption');
                         sourceEnergy = this.pv.powerAndEnergy.consumptionTotal;
                         power = this.functions.isValidValue(sourceMeter.power) ? sourceMeter.power : null;
+                        energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime / 1000 : null;
                         break;
                     }
                 }
@@ -1026,12 +1029,20 @@ class EnergyMeter extends EventEmitter {
                         type,
                         measurementType,
                         power,
+                        energyLifetime,
                         gridQualityState: meterEnabled,
                     };
 
+                    // Add to fakegato history
+                    this.fakegatoHistoryService?.addEntry({
+                        time: Math.floor(Date.now() / 1000),
+                        power: power
+                    });
+
                     // Create characteristics energy meter
                     const characteristics = [
-                        { type: Characteristic.EveCurrentConsumption, value: obj.power },
+                        { type: Characteristic.EvePower, value: obj.power },
+                        { type: Characteristic.EveEnergyLifetime, value: obj.energyLifetime },
                     ];
 
                     // Create characteristics energy meter
@@ -1053,12 +1064,6 @@ class EnergyMeter extends EventEmitter {
                         this.energyMeterServices?.[index]?.updateCharacteristic(type, value);
                     };
 
-                    // FakeGato history per energy meter service
-                    this.fakegatoHistoryService?.addEntry({
-                        time: Math.floor(Date.now() / 1000),
-                        power: obj.power
-                    });
-
                     powerAndEnergy.push(obj);
                 }
             }
@@ -1096,6 +1101,7 @@ class EnergyMeter extends EventEmitter {
             const accessoryUUID = AccessoryUUID.generate(envoySerialNumber + 'Energy Meter');
             const accessoryCategory = Categories.SENSOR;
             const accessory = new Accessory(accessoryName, accessoryUUID, accessoryCategory);
+            accessory.log = this.log;
 
             // Accessory Info Service
             if (this.logDebug) this.emit('debug', `Prepare Information Service`);
@@ -1105,30 +1111,33 @@ class EnergyMeter extends EventEmitter {
                 .setCharacteristic(Characteristic.SerialNumber, envoySerialNumber ?? 'Serial Number')
                 .setCharacteristic(Characteristic.FirmwareRevision, this.pv.info.software?.replace(/[a-zA-Z]/g, '') ?? '0');
 
+            // Create FakeGatoHistory
+            if (this.logDebug) this.emit('debug', `Prepare Fakegato Service`);
+            this.fakegatoHistoryService = new this.fakegatoHistory(`energy`, accessory, {
+                storage: 'fs',
+                disableRepeatLastData: true,
+                disableTimer: false,
+                path: this.prefDir,
+                filename: this.energyMeterHistoryFileName
+            })
+            this.fakegatoHistoryService.addEntry({
+                time: Math.floor(Date.now() / 1000),
+                power: this.pv.powerAndEnergy.data[0].power
+            });
+
             // Energy Meter Service
             this.energyMeterServices = [];
             for (const source of this.pv.powerAndEnergy.data) {
                 const measurementType = source.measurementType;
 
-                // Create FakeGatoHistory
-                if (this.logDebug) this.emit('debug', `Prepare Fakegato ${measurementType} Service`);
-                this.fakegatoHistoryService = new this.fakegatoHistory(`energy`, accessory, {
-                    storage: 'fs',
-                    disableRepeatLastData: true,
-                    disableTimer: false
-                })
-                this.fakegatoHistoryService.addEntry({
-                    time: Math.floor(Date.now() / 1000),
-                    power: source.power
-                });
-
                 if (this.logDebug) this.emit('debug', `Prepare Meter ${measurementType} Service`);
                 const energyMeterService = accessory.addService(Service.EvePowerMeter, `Energy Meter ${measurementType}`, `energyMeterService${measurementType}`);
                 energyMeterService.setCharacteristic(Characteristic.ConfiguredName, `Energy Meter ${measurementType}`);
 
                 // Create characteristics
                 const characteristics = [
-                    { type: Characteristic.EveCurrentConsumption, label: 'power', value: source.power, unit: 'W' },
+                    { type: Characteristic.EvePower, label: 'power', value: source.power, unit: 'W' },
+                    { type: Characteristic.EveEnergyLifetime, label: 'energy lifetime', value: source.energyLifetime, unit: 'kWh' },
                 ];
 
                 if (source.gridQualityState) {
@@ -1149,6 +1158,20 @@ class EnergyMeter extends EventEmitter {
                         });
                 }
 
+                energyMeterService.getCharacteristic(Characteristic.EveResetTime)
+                    .onGet(async () => {
+                        const resetTime = this.lastReset;
+                        if (this.logInfo) this.emit('info', `${measurementType}, reset time: ${resetTime}`);
+                        return resetTime;
+                    })
+                    .onSet(async (value) => {
+                        try {
+                            this.lastReset = value;
+                        } catch (error) {
+                            if (this.logWarn) this.emit('warn', `${measurementType}, Reset time error: ${error}`);
+                        }
+                    });
+
                 this.energyMeterServices.push(energyMeterService);
             }