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

package/CHANGELOG.md

@@ -9,12 +9,19 @@ 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.5] - (17.10.2025)
+
+## Changes
+
+- update EVE Energy Meter
+- cleanup
+
 ## [10.2.3] - (15.10.2025)
 
 ## Changes
 
 - fix [#215](https://github.com/grzegorz914/homebridge-enphase-envoy/issues/215)
-- epdate EVE Energy monitor
+- update EVE Energy Meter
 - other small fixes
 - cleanup
 

package/index.js

@@ -90,6 +90,7 @@ class EnvoyPlatform {
         }
 
         try {
+          const url = envoyFirmware7xxTokenGenerationMode > 0 ? `https://${host}` : `http://${host}`;
           const devicesClass = device.energyMeter ? [EnvoyDevice, EnergyMeter] : [EnvoyDevice];
           for (const [index, DeviceClass] of devicesClass.entries()) {
             const accessoryName = index === 0 ? deviceName : 'Energy Meter';
@@ -98,7 +99,7 @@ class EnvoyPlatform {
             const impulseGenerator = new ImpulseGenerator()
               .on('start', async () => {
                 try {
-                  const envoyDevice = new DeviceClass(api, log, device, envoyIdFile, envoyTokenFile, prefDir, energyMeterHistoryFileName)
+                  const envoyDevice = new DeviceClass(api, log, url, accessoryName, device, envoyIdFile, envoyTokenFile, prefDir, energyMeterHistoryFileName)
                     .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}`))
@@ -111,7 +112,7 @@ class EnvoyPlatform {
                     api.publishExternalAccessories(PluginName, [accessory]);
                     if (logLevel.success) log.success(`Device: ${host} ${accessoryName}, Published as external accessory.`);
 
-                    await impulseGenerator.stop();
+                    await impulseGenerator.state(false);
                     await envoyDevice.startStopImpulseGenerator(true);
                   }
                 } catch (error) {

package/package.json

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

package/src/energymeter.js

@@ -8,7 +8,7 @@ import fakegato from 'fakegato-history';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class EnergyMeter extends EventEmitter {
-    constructor(api, log, device, envoyIdFile, envoyTokenFile, prefDir, energyMeterHistoryFileName) {
+    constructor(api, log, url, deviceName, device, envoyIdFile, envoyTokenFile, prefDir, energyMeterHistoryFileName) {
         super();
 
         Accessory = api.platformAccessory;
@@ -19,7 +19,8 @@ class EnergyMeter extends EventEmitter {
 
         //device configuration
         this.log = log;
-        this.name = device.ame;
+        this.url = url;
+        this.name = deviceName;
         this.host = device.host;
 
         this.envoyFirmware7xxTokenGenerationMode = device.envoyFirmware7xxTokenGenerationMode;
@@ -47,9 +48,6 @@ class EnergyMeter extends EventEmitter {
         this.energyMeterHistoryFileName = energyMeterHistoryFileName;
         this.lastReset = 0;
 
-        //url
-        this.url = device.envoyFirmware7xxTokenGenerationMode > 0 ? `https://${this.host}` : `http://${this.host}`;
-
         //supported functions
         this.feature = {
             info: {
@@ -713,7 +711,7 @@ class EnergyMeter extends EventEmitter {
                 const obj = {
                     type: 'pcu',
                     activeCount: this.feature.inventory.pcus.count,
-                    measurementType: 'Production',
+                    measurementType: 'production',
                     readingTime,
                     power: production.wattsNow,
                     energyToday: production.wattHoursToday,
@@ -744,7 +742,7 @@ class EnergyMeter extends EventEmitter {
             // PCU
             const pcu = {
                 type: 'pcu',
-                measurementType: 'Production',
+                measurementType: 'production',
                 activeCount: this.feature.inventory?.pcus?.count,
                 readingTime,
                 power: data.watts_now_pcu,
@@ -759,7 +757,7 @@ class EnergyMeter extends EventEmitter {
             const eimActive = !!data.there_is_an_active_eim;
             const eim = {
                 type: 'eim',
-                measurementType: 'Production',
+                measurementType: 'production',
                 activeCount: 1,
                 readingTime,
                 active: eimActive,
@@ -775,7 +773,7 @@ class EnergyMeter extends EventEmitter {
             const rgmActive = !!data.there_is_an_active_rgm;
             const rgm = {
                 type: 'rgm',
-                measurementType: 'Production',
+                measurementType: 'production',
                 activeCount: 1,
                 readingTime,
                 active: rgmActive,
@@ -791,7 +789,7 @@ class EnergyMeter extends EventEmitter {
             const pmuActive = !!data.there_is_an_active_pmu;
             const pmu = {
                 type: 'pmu',
-                measurementType: 'Production',
+                measurementType: 'production',
                 activeCount: 1,
                 readingTime,
                 active: pmuActive,
@@ -829,7 +827,7 @@ class EnergyMeter extends EventEmitter {
                         const obj = {
                             type,
                             activeCount: 1,
-                            measurementType: 'Production',
+                            measurementType: 'production',
                             readingTime,
                             power: data.wattsNow,
                             energyToday: data.wattHoursToday,
@@ -849,7 +847,7 @@ class EnergyMeter extends EventEmitter {
                 const obj = {
                     type: 'eim',
                     activeCount: 1,
-                    measurementType: 'Consumption Net',
+                    measurementType: 'net-consumption',
                     readingTime,
                     power: data.wattsNow,
                     energyToday: data.wattHoursToday,
@@ -893,7 +891,7 @@ class EnergyMeter extends EventEmitter {
                     const obj = {
                         type: 'eim',
                         activeCount: 1,
-                        measurementType: ApiCodes[productionEim.measurementType],
+                        measurementType: productionEim.measurementType,
                         readingTime: productionEim.readingTime,
                         power: productionEim.wNow,
                         energyToday,
@@ -913,14 +911,13 @@ class EnergyMeter extends EventEmitter {
             // --- Consumption: EIM ---
             if (keys.includes('consumption') && Array.isArray(data.consumption) && this.feature.meters.consumptionNet.enabled) {
                 for (const item of data.consumption) {
-                    const type = ApiCodes[item.measurementType];
-                    const key = MetersKeyMap[type];
+                    const key = MetersKeyMap[item.measurementType];
                     const energyToday = (item.lines[0]?.whToday || 0) + (item.lines[1]?.whToday || 0) + (item.lines[2]?.whToday || 0);
                     const energyLastSevenDays = (item.lines[0]?.whLastSevenDays || 0) + (item.lines[1]?.whLastSevenDays || 0) + (item.lines[2]?.whLastSevenDays || 0);
                     const energyLifetime = (item.lines[0]?.whLifetime || 0) + (item.lines[1]?.whLifetime || 0) + (item.lines[2]?.whLifetime || 0);
                     const obj = {
                         type: 'eim',
-                        measurementType: type,
+                        measurementType: item.measurementType,
                         activeCount: 1,
                         readingTime: item.readingTime,
                         power: item.wNow,
@@ -965,7 +962,7 @@ class EnergyMeter extends EventEmitter {
                 const key = MetersKeyMap[meterType];
                 const measurementType = ApiCodes[meterType];
 
-                let sourceMeter, sourceEnergy;
+                let sourceMeter, sourceEnergy, energyLifetimeWithOffset;
                 let power, energyLifetime;
                 switch (key) {
                     case 'production': {
@@ -1076,7 +1073,7 @@ class EnergyMeter extends EventEmitter {
             if (this.logDebug) this.emit('debug', `Prepare accessory`);
 
             const envoySerialNumber = this.pv.info.serialNumber;
-            const accessoryName = this.name;
+            const accessoryName = `${this.name} ${this.pv.powerAndEnergy.data[0].measurementType}`;
             const accessoryUUID = AccessoryUUID.generate(envoySerialNumber + 'Energy Meter');
             const accessoryCategory = Categories.SENSOR;
             const accessory = new Accessory(accessoryName, accessoryUUID, accessoryCategory);
@@ -1091,7 +1088,7 @@ class EnergyMeter extends EventEmitter {
                 .setCharacteristic(Characteristic.FirmwareRevision, this.pv.info.software?.replace(/[a-zA-Z]/g, '') ?? '0');
 
             // Create FakeGatoHistory
-            if (this.logDebug) this.emit('debug', `Prepare Fakegato Service`);
+            if (this.logDebug) this.emit('debug', `Prepare Fakegato ${this.pv.powerAndEnergy.data[0].measurementType} Service`);
             this.fakegatoHistoryService = new this.fakegatoHistory(`energy`, accessory, {
                 storage: 'fs',
                 disableRepeatLastData: true,
@@ -1109,7 +1106,7 @@ class EnergyMeter extends EventEmitter {
             for (const source of this.pv.powerAndEnergy.data) {
                 const measurementType = source.measurementType;
 
-                if (this.logDebug) this.emit('debug', `Prepare Meter ${measurementType} Service`);
+                if (this.logDebug) this.emit('debug', `Prepare Energy Meter ${measurementType} Service`);
                 const energyMeterService = accessory.addService(Service.EvePowerMeter, `Energy Meter ${measurementType}`, `energyMeterService${measurementType}`);
                 energyMeterService.setCharacteristic(Characteristic.ConfiguredName, `Energy Meter ${measurementType}`);
 

package/src/envoydata.js

@@ -8,17 +8,16 @@ import Functions from './functions.js';
 import { ApiUrls, PartNumbers, Authorization, ApiCodes, MetersKeyMap } from './constants.js';
 
 class EnvoyData extends EventEmitter {
-    constructor(device, envoyIdFile, envoyTokenFile) {
+    constructor(url, device, envoyIdFile, envoyTokenFile) {
         super();
 
         //device configuration
+        this.url = url;
         this.host = device.host;
         this.envoyFirmware7xxTokenGenerationMode = device.envoyFirmware7xxTokenGenerationMode;
         this.envoyPasswd = device.envoyPasswd;
         this.enlightenUser = device.enlightenUser;
         this.enlightenPasswd = device.enlightenPasswd;
-        this.envoyToken = device.envoyToken;
-        this.envoyTokenInstaller = device.envoyTokenInstaller;
         this.envoyIdFile = envoyIdFile;
         this.envoyTokenFile = envoyTokenFile;
 
@@ -38,9 +37,6 @@ class EnvoyData extends EventEmitter {
         this.functions = new Functions();
         this.checkTokenRunning = false;
 
-        //url
-        this.url = device.envoyFirmware7xxTokenGenerationMode > 0 ? `https://${this.host}` : `http://${this.host}`;
-
         //supported functions
         this.feature = {
             info: {
@@ -53,9 +49,9 @@ class EnvoyData extends EventEmitter {
                 cookie: '',
                 jwtToken: {
                     generation_time: 0,
-                    token: envoyToken,
+                    token: device.envoyToken,
                     expires_at: 0,
-                    installer: this.envoyFirmware7xxTokenGenerationMode === 2 ? this.envoyTokenInstaller : false
+                    installer: device.envoyFirmware7xxTokenGenerationMode === 2 ? device.envoyTokenInstaller : false
                 }
             },
             backboneApp: {

package/src/envoydevice.js

@@ -7,7 +7,7 @@ import { PartNumbers, ApiCodes, MetersKeyMap, DeviceTypeMap, LedStatus } from '.
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class EnvoyDevice extends EventEmitter {
-    constructor(api, log, device, envoyIdFile, envoyTokenFile) {
+    constructor(api, log, url, deviceName, device, envoyIdFile, envoyTokenFile) {
         super();
 
         Accessory = api.platformAccessory;
@@ -17,8 +17,9 @@ class EnvoyDevice extends EventEmitter {
         AccessoryUUID = api.hap.uuid;
 
         //device configuration
+        this.url = url;
         this.device = device;
-        this.name = device.ame;
+        this.name = deviceName;
         this.host = device.host;
         this.displayType = device.displayType;
 
@@ -2959,7 +2960,7 @@ class EnvoyDevice extends EventEmitter {
 
         try {
             // Envoy Data
-            this.envoyData = new EnvoyData(this.device, this.envoyIdFile, this.envoyTokenFile)
+            this.envoyData = new EnvoyData(this.url, this.device, this.envoyIdFile, this.envoyTokenFile)
                 .on('deviceInfo', (feature, info, timeZone) => {
                     this.feature = Object.assign(this.feature, feature);
                     this.pv.info = info;