homebridge-enphase-envoy 10.3.1-beta.1 → 10.3.1-beta.11

package/config.schema.json

@@ -1432,8 +1432,7 @@
                         ]
                       }
                     ],
-                    "description": "Accessory type for Home app",
-                    "required": true
+                    "description": "Accessory type for Home app"
                   },
                   "name": {
                     "title": "Accessory name",
@@ -3066,7 +3065,6 @@
                         ]
                       }
                     ],
-                    "required": true,
                     "condition": {
                       "functionBody": "return model.devices[arrayIndices[0]].generatorModeControls[arrayIndices[1]].displayType > 0;"
                     }

package/package.json

@@ -2,7 +2,7 @@
     "private": false,
     "displayName": "Enphase Envoy",
     "name": "homebridge-enphase-envoy",
-    "version": "10.3.1-beta.1",
+    "version": "10.3.1-beta.11",
     "description": "Homebridge p7ugin for Photovoltaic Energy System manufactured by Enphase.",
     "license": "MIT",
     "author": "grzegorz914",
@@ -36,7 +36,7 @@
     },
     "dependencies": {
         "async-mqtt": "^2.6.3",
-        "axios": "^1.12.2",
+        "axios": "^1.13.1",
         "express": "^5.1.0",
         "fast-xml-parser": "^5.3.0",
         "fakegato-history": "^0.6.7"

package/src/constants.js

@@ -174,13 +174,10 @@ export const ApiCodes = {
     "ENCHG_STATE_DISCHARGING": "Encharge state discharging",
     "ENCHG_STATE_IDLE": "Encharge state idle",
     "ENCHG_STATE_READY": "Encharge state ready",
-    "ENCMN_MDE_BMU_READY": "Encharge BMU ready",
     "ENCMN_MDE_ENCHARGE_READY": "Encharge mode ready",
     "ENCMN_MDE_ON_GRID": "Encharge mode on grid",
     "ENCMN_MDE_OFF_GRID": "Encharge mode off grid",
-    "ENCMN_MDE_PCU_READY": "Encharge Microinverter ready",
     "ENCMN_C6_CC_READY": "C6 Combiner Controller ready",
-    "ENCMN_C6_RGM_DEV_CONNECTED": "C6 Revenue Grade Meter connected",
     "ENPOWER": "Enpower",
     "ENS_DEVICE_STATE_READY": "Ensemble state ready",
     "ENPWR_STATE_GRIDMODE_CONFIRM": "Enpower state grid mode confirm",
@@ -205,7 +202,6 @@ export const ApiCodes = {
     "check-wiring": "Check Wiring",
     "close": "Close",
     "closed": "Closed",
-    "configured": "Configured",
     "connected": "Connected",
     "consumption": "Consumption Net",
     "discharging": "Discharging",

package/src/customcharacteristics.js

@@ -1554,6 +1554,22 @@ export default (api) => {
     }
     Characteristic.EncAggSoc = EncAggSoc;
 
+    class EncAggRatedPower extends Characteristic {
+        constructor() {
+            super('ENC rated power', '00000208-000B-1000-8000-0026BB765291');
+            this.setProps({
+                format: Formats.FLOAT,
+                unit: 'kW',
+                maxValue: 1000,
+                minValue: -1000,
+                minStep: 0.001,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY]
+            });
+            this.value = this.getDefaultValue();
+        }
+    }
+    Characteristic.EncAggRatedPower = EncAggRatedPower;
+
     class EncAggBackupEnergy extends Characteristic {
         constructor() {
             super('ENC backup energy', '00000209-000B-1000-8000-0026BB765291');

package/src/envoydata.js

@@ -338,6 +338,7 @@ class EnvoyData extends EventEmitter {
                         devices: [],
                         settings: {},
                         tariff: {},
+                        tariffRaw: {},
                         ratedPowerSumKw: null,
                         realPowerSumKw: null,
                         phaseA: false,
@@ -412,7 +413,7 @@ class EnvoyData extends EventEmitter {
             .on('updateEnsemble', () => this.handleWithLock('updateEnsemble', async () => {
                 const updateEnsemble = this.feature.ensemble.inventory.supported ? await this.updateEnsembleInventory() : false;
                 if (updateEnsemble && this.feature.ensemble.status.supported) await this.updateEnsembleStatus();
-                if (updateEnsemble && this.feature.ensemble.power.supported) await this.updateEnsemblePower();
+                if (updateEnsemble && this.feature.inventory.esubs.encharges.power.supported) await this.updateEnsemblePower();
 
                 const updateEnchargeSettings = updateEnsemble && this.feature.inventory.esubs.encharges.settings.supported ? await this.updateEnchargesSettings() : false;
                 if (updateEnchargeSettings && this.feature.inventory.esubs.encharges.tariff.supported) await this.updateTariff();
@@ -587,13 +588,12 @@ class EnvoyData extends EventEmitter {
             // Load token from file on startup, only if mode is 1
             if (this.envoyFirmware7xxTokenGenerationMode === 1 && start) {
                 try {
-                    const data = await this.functions.readData(this.envoyTokenFile);
+                    const data = await this.functions.readData(this.envoyTokenFile, true);
                     try {
-                        const parsedData = JSON.parse(data);
-                        const fileTokenExist = parsedData.token ? 'Exist' : 'Missing';
+                        const fileTokenExist = data.token ? 'Exist' : 'Missing';
                         if (this.logDebug) this.emit('debug', `Token from file: ${fileTokenExist}`);
-                        if (parsedData.token) {
-                            this.feature.info.jwtToken = parsedData;
+                        if (data.token) {
+                            this.feature.info.jwtToken = data;
                         }
                     } catch (error) {
                         if (this.logWarn) this.emit('warn', `Token parse error: ${error}`);
@@ -1962,7 +1962,7 @@ class EnvoyData extends EventEmitter {
                 };
 
                 // Calculate encharges rated power summary in kW
-                this.pv.inventory.esubs.encharges.ratedPowerSumKw = enchargesRatedPowerSummary.length > 0 ? enchargesRatedPowerSummary.reduce((total, num) => total + num, 0) / 1000 : null;
+                this.pv.inventory.esubs.encharges.ratedPowerSumKw = enchargesRatedPowerSummary.length > 0 ? (enchargesRatedPowerSummary.reduce((total, num) => total + num, 0) / enchargesRatedPowerSummary.length) / 1000 : null;
             }
 
             // Update enpowers statuses if installed
@@ -2038,17 +2038,18 @@ class EnvoyData extends EventEmitter {
 
         try {
             const response = await this.axiosInstance.get(ApiUrls.EnsemblePower);
-            const responseData = response.data ?? {};
+            const responseData = response.data;
             if (this.logDebug) this.emit('debug', `Ensemble power response:`, responseData);
 
-            const devices = responseData.devices || [];
-            if (devices.length === 0) return false;
+            const devices = responseData.devices ?? [];
+            if (!devices.length === 0) return false;
 
             // update encharges
             const enchargesRealPowerSummary = [];
             const encharges = this.pv.inventory.esubs.encharges.devices || [];
-            for (const encharge of encharges) {
-                const device = devices.find(device => device.serial_num === encharge.serialNumber);
+            for (const device of devices) {
+                const serialNumber = device.serial_num;
+                const encharge = encharges.find(device => device.serialNumber === serialNumber);
                 if (this.logDebug) this.emit('debug', `Ensemble device power:`, device);
                 if (!device) continue;
 
@@ -2059,12 +2060,12 @@ class EnvoyData extends EventEmitter {
                     soc: device.soc,
                 };
 
-                this.feature.inventory.esubs.encharges.power.supported = true;
                 if (this.functions.isValidValue(encharge.power.realPower)) enchargesRealPowerSummary.push(encharge.power.realPower);
+                this.feature.inventory.esubs.encharges.power.supported = true;
             }
 
             // Calculate encharges real power summary in kW
-            this.pv.inventory.esubs.encharges.realPowerSumKw = enchargesRealPowerSummary.length > 0 ? enchargesRealPowerSummary.reduce((total, num) => total + num, 0) / 1000000 : null;
+            this.pv.inventory.esubs.encharges.realPowerSumKw = enchargesRealPowerSummary.length > 0 ? (enchargesRealPowerSummary.reduce((total, num) => total + num, 0) / enchargesRealPowerSummary.length) / 1000 : null;
 
             // ensemble power supported
             this.feature.ensemble.power.supported = true;
@@ -2090,14 +2091,15 @@ class EnvoyData extends EventEmitter {
             const enchargesSettingsSupported = 'enc_settings' in enchargesSettings;
             if (!enchargesSettingsSupported) return false;
 
-            const settings = {
-                enable: enchargesSettings.enc_settings.enable,                 // boolean
-                country: enchargesSettings.enc_settings.country,               // string
-                currentLimit: enchargesSettings.enc_settings.current_limit,    // float
-                perPhase: enchargesSettings.enc_settings.per_phase             // boolean
+            const settings = enchargesSettings.enc_settings;
+            const encharges = this.pv.inventory.esubs.encharges;
+            encharges.settings = {
+                enable: settings.enable,                 // boolean
+                country: settings.country,               // string
+                currentLimit: settings.current_limit,    // float
+                perPhase: settings.per_phase             // boolean
             };
 
-            this.pv.inventory.esubs.encharges.settings = settings;
             this.feature.inventory.esubs.encharges.settings.supported = true;
 
             // RESTFul and MQTT update
@@ -2116,11 +2118,12 @@ class EnvoyData extends EventEmitter {
         try {
             const response = await this.axiosInstance.get(ApiUrls.TariffSettingsGetPut);
             const tariffSettings = response.data;
+
             if (this.logDebug) this.emit('debug', 'Tariff:', tariffSettings);
 
             const enchargesTariffSupported = 'tariff' in tariffSettings;
             if (!enchargesTariffSupported) return false;
-
+            this.pv.inventory.esubs.encharges.tariffRaw = tariffSettings;
             this.pv.inventory.esubs.encharges.tariff = tariffSettings;
             this.feature.inventory.esubs.encharges.tariff.supported = true;
 
@@ -2545,7 +2548,7 @@ class EnvoyData extends EventEmitter {
         if (this.logDebug) this.emit('debug', `Requesting set encharge settings`);
 
         try {
-            const tariff = this.pv.inventory.esubs.encharges.tariff.tariff;
+            const tariff = this.pv.inventory.esubs.encharges.tariffRaw.tariff;
             tariff.storage_settings.mode = profile;
             tariff.storage_settings.reserved_soc = reservedSoc;
             tariff.storage_settings.charge_from_grid = chargeFromGrid;
@@ -2771,16 +2774,12 @@ class EnvoyData extends EventEmitter {
             const getEnsemble = tokenRequired && this.feature.inventory.esubs.supported ? await this.updateEnsembleInventory() : false;
             if (getEnsemble) {
                 await this.updateEnsembleStatus();
-                if (this.feature.inventory.esubs.encharges.installed) {
-                    await this.updateEnsemblePower();
-                    await this.updateEnchargesSettings();
-                    await this.updateTariff();
-                }
+                if (this.feature.inventory.esubs.encharges.installed) await this.updateEnsemblePower();
+                const getEnchargeSettings = this.feature.inventory.esubs.encharges.installed ? await this.updateEnchargesSettings() : false;
+                if (getEnchargeSettings) await this.updateTariff();
 
-                if (this.feature.inventory.esubs.enpowers.installed) {
-                    await this.updateDryContacts();
-                    await this.updateDryContactsSettings();
-                }
+                const getDryContacts = this.feature.inventory.esubs.enpowers.installed ? await this.updateDryContacts() : false;
+                if (getDryContacts) await this.updateDryContactsSettings();
 
                 const getGenerator = await this.updateGenerator();
                 if (getGenerator && this.feature.inventory.esubs.generator.installed) await this.updateGeneratorSettings();

package/src/envoydevice.js

@@ -1988,8 +1988,8 @@ class EnvoyDevice extends EventEmitter {
                                 }
 
                                 if (ensemblesCountersSupported) characteristics.push({ type: Characteristic.RestPower, label: 'rest power', value: counters.restPowerKw, unit: 'kW' });
-                                if (enchargesStatusSupported) characteristics.push({ type: Characteristic.RatedPower, label: 'rated power', value: this.pv.inventoryData.esubs.encharges.ratedPowerSumKw, unit: 'kW' });
-                                if (enchargesPowerSupported) characteristics.push({ type: Characteristic.RealPower, label: 'real power', value: this.pv.inventoryData.esubs.encharges.realPowerSumKw, unit: 'kW' });
+                                if (enchargesStatusSupported) characteristics.push({ type: Characteristic.RatedPower, label: 'rated power', value: this.pv.inventoryData.esubs.ratedPowerSumKw, unit: 'kW' });
+                                if (enchargesPowerSupported) characteristics.push({ type: Characteristic.RealPower, label: 'real power', value: this.pv.inventoryData.esubs.realPowerSumKw, unit: 'kW' });
 
                                 for (const { type, label, value, unit = '', postfix = '' } of characteristics) {
                                     if (!this.functions.isValidValue(value)) continue;
@@ -2257,14 +2257,22 @@ class EnvoyDevice extends EventEmitter {
                                         { type: Characteristic.ReadingTime, label: 'reading time', value: encharge.readingTime },
                                     ];
 
-                                    if (gridProfileSupported) characteristics.push({ type: Characteristic.GridProfile, label: 'grid profile', value: encharge.gridProfile });
+                                    if (gridProfileSupported) {
+                                        characteristics.push(
+                                            { type: Characteristic.GridProfile, label: 'grid profile', value: encharge.gridProfile }
+                                        );
+                                    }
+
                                     if (enchargesStatusSupported && encharge.status) {
                                         characteristics.push(
                                             { type: Characteristic.CommInterface, label: 'comm interface', value: encharge.status.commInterfaceStr },
                                             { type: Characteristic.RatedPower, label: 'rated power', value: encharge.status.ratedPowerKw, unit: 'kW' }
                                         );
                                     }
-                                    if (enchargesPowerSupported && encharge.power) characteristics.push({ type: Characteristic.RealPower, label: 'real power', value: encharge.power.realPowerKw, unit: 'kW' });
+
+                                    if (enchargesPowerSupported && encharge.power) {
+                                        characteristics.push({ type: Characteristic.RealPower, label: 'real power', value: encharge.power.realPowerKw, unit: 'kW' });
+                                    }
 
                                     for (const { type, label, value, unit = '', postfix = '' } of characteristics) {
                                         if (!this.functions.isValidValue(value)) continue;
@@ -2391,23 +2399,24 @@ class EnvoyDevice extends EventEmitter {
                                         if (this.logDebug) this.emit('debug', `Prepare ${enchargeName} Profile Sensor Services`);
 
                                         this.enchargeProfileSensorsServices = [];
+
                                         for (let i = 0; i < this.enchargeProfileSensors.length; i++) {
                                             const sensor = this.enchargeProfileSensors[i];
                                             const { namePrefix, name, serviceType, characteristicType } = sensor;
                                             const serviceName = namePrefix ? `${accessoryName} ${name}` : name;
 
-                                            const sensorService = accessory.addService(serviceType, serviceName, `enchargeProfileSensorService${i}`);
-                                            sensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
-                                            sensorService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
+                                            const service = accessory.addService(serviceType, serviceName, `enchargeProfileSensorService${i}`);
+                                            service.addOptionalCharacteristic(Characteristic.ConfiguredName);
+                                            service.setCharacteristic(Characteristic.ConfiguredName, serviceName);
 
-                                            sensorService.getCharacteristic(characteristicType)
+                                            service.getCharacteristic(characteristicType)
                                                 .onGet(async () => {
                                                     const currentState = sensor.state;
                                                     if (this.logInfo) this.emit('info', `${enchargeName} profile: ${name}, state: ${currentState ? 'Active' : 'Not Active'}`);
                                                     return currentState;
                                                 });
 
-                                            this.enchargeProfileSensorsServices.push(sensorService);
+                                            this.enchargeProfileSensorsServices.push(service);
                                         }
                                     }
                                 }
@@ -2686,7 +2695,7 @@ class EnvoyDevice extends EventEmitter {
                                         { type: Characteristic.AdminState, label: 'admin state', value: collar.adminStateStr },
                                         { type: Characteristic.Status, label: 'status', value: collar.deviceStatus },
                                         { type: Characteristic.MidState, label: 'mid state', value: collar.midState },
-                                        { type: Characteristic.GridState, label: 'grid state', value: collar.gridState },
+                                        { type: Characteristic.GridState, label: 'mid state', value: collar.gridState },
                                         { type: Characteristic.Communicating, label: 'communicating', value: collar.communicating, postfix: collar.communicating ? 'Yes' : 'No' },
                                         { type: Characteristic.Temperature, label: 'temperature', value: collar.temperature, unit: '°C' },
                                         { type: Characteristic.ReadingTime, label: 'reading time', value: collar.readingTime }
@@ -3518,16 +3527,10 @@ class EnvoyDevice extends EventEmitter {
                                     powerPeak: pcu.powerPeak,
                                 });
 
-                                if (this.logInfo) {
-                                    this.emit('info', `Microinverter, ${pcuData.serialNumber}, power: ${pcuData.power} W`);
-                                    this.emit('info', `Microinverter, ${pcuData.serialNumber}, phase: ${pcuData.phase}`);
-                                }
-
                                 // Add characteristics
                                 characteristics.push(
                                     { type: Characteristic.PowerW, value: pcuData.power },
-                                    { type: Characteristic.PowerPeakW, value: pcuData.powerPeak }
-                                );
+                                    { type: Characteristic.PowerPeakW, value: pcuData.powerPeak });
                             }
 
                             // Add detailed info if supported
@@ -3627,9 +3630,9 @@ class EnvoyDevice extends EventEmitter {
                                 plcLevel: nsrb.plcLevel,
                             };
 
-                            if (this.logInfo) {
-                                this.emit('info', `Q-Relay, ${nsrbData.serialNumber}, state: ${nsrbData.relay}`);
-                                this.emit('info', `Q-Relay, ${nsrbData.serialNumber}, lines: ${nsrbData.linesCount}`);
+                            if (this.logDebug) {
+                                this.emit('debug', `Q-Rela state:`, nsrbData.relay);
+                                this.emit('debug', `Q-Relay lines:`, nsrbData.linesCount);
                             }
 
                             // Create characteristics
@@ -4332,10 +4335,10 @@ class EnvoyDevice extends EventEmitter {
                             // Add to ensemble summary characteristics if live data not supported
                             if (!this.feature.liveData.supported || !this.feature.meters.storage.enabled) {
                                 ensembleSummaryCharacteristics.push(
-                                    { type: Characteristic.AggSoc, value: secctrl.aggSoc },
                                     { type: Characteristic.AggMaxEnergy, value: secctrl.aggMaxEnergyKw },
-                                    { type: Characteristic.EncAggSoc, value: secctrl.encAggSoc },
-                                    { type: Characteristic.EncAggBackupEnergy, value: secctrl.encAggBackupEnergy });
+                                    { type: Characteristic.EncAggBackupEnergy, value: secctrl.encAggBackupEnergy },
+                                    { type: Characteristic.AggSoc, value: secctrl.aggSoc },
+                                    { type: Characteristic.encAggSoc, value: secctrl.encAggSoc });
                             }
 
                             if (phaseA) {
@@ -4833,8 +4836,8 @@ class EnvoyDevice extends EventEmitter {
                                 const info = tariffData.tariff ?? {};
                                 const tariff = {};
                                 tariff.info = {
-                                    currencyCode: info.currency.code,
-                                    logger: info.logger,
+                                    currencyCode: info.currency.code ?? '',
+                                    logger: info.logger ?? '',
                                     date: this.functions.formatTimestamp(info.date, this.pv.homeData.timeZone),
                                 };
 
@@ -4842,7 +4845,7 @@ class EnvoyDevice extends EventEmitter {
                                 const s = info.storage_settings ?? {};
                                 tariff.storageSettings = {
                                     mode: s.mode,
-                                    operationModeSubType: s.operation_mode_sub_type,
+                                    operationModeSubType: s.operation_mode_sub_type ?? '',
                                     reservedSoc: s.reserved_soc,
                                     veryLowSoc: s.very_low_soc,
                                     chargeFromGrid: !!s.charge_from_grid,
@@ -4889,16 +4892,16 @@ class EnvoyDevice extends EventEmitter {
                                 // Schedule
                                 const sched = tariffData.schedule ?? {};
                                 tariff.schedule = {
-                                    fileName: sched.filename,
-                                    source: sched.source,
+                                    fileName: sched.filename ?? '',
+                                    source: sched.source ?? '',
                                     date: this.functions.formatTimestamp(sched.date, this.pv.homeData.timeZone),
-                                    version: sched.version,
+                                    version: sched.version ?? '',
                                     reservedSoc: sched.reserved_soc,
                                     veryLowSoc: sched.very_low_soc,
                                     chargeFromGrid: !!sched.charge_from_grid,
-                                    battMode: sched.batt_mode,
-                                    batteryMode: sched.battery_mode,
-                                    operationModeSubType: sched.operation_mode_sub_type,
+                                    battMode: sched.batt_mode ?? '',
+                                    batteryMode: sched.battery_mode ?? '',
+                                    operationModeSubType: sched.operation_mode_sub_type ?? '',
                                     override: !!sched.override,
                                     overrideBackupSoc: sched.override_backup_soc,
                                     overrideChgDischargeRate: sched.override_chg_discharge_rate,
@@ -5071,8 +5074,8 @@ class EnvoyDevice extends EventEmitter {
                                                 gridActionBool: settings.gridAction !== 'none',
                                                 microGridAction: settings.microGridAction,
                                                 genAction: settings.genAction,
-                                                essentialStartTime: settings.essentialStartTime,
-                                                essentialEndTime: settings.essentialEndTime,
+                                                essentialStartTime: settings.essentialStartTime ?? '',
+                                                essentialEndTime: settings.essentialEndTime ?? '',
                                                 priority: settings.priority,
                                                 blackSStart: settings.blackSStart,
                                                 override: settings.override ?? 'false',
@@ -5590,8 +5593,8 @@ class EnvoyDevice extends EventEmitter {
 
                                     // Agg Energy and Soc
                                     const characteristics = [
-                                        { type: Characteristic.AggSoc, value: percentFullSum, valueKey: 'aggSoc' },
                                         { type: Characteristic.AggMaxEnergy, value: energySumKw, valueKey: 'aggMaxEnergyKw' },
+                                        { type: Characteristic.AggSoc, value: percentFullSum, valueKey: 'aggSoc' },
                                     ];
 
                                     // Update storage summary services
@@ -5660,8 +5663,8 @@ class EnvoyDevice extends EventEmitter {
                                     // Update ensemble summary service
                                     if (this.feature.inventory.esubs.secctrl.supported) {
                                         const characteristics = [
-                                            { type: Characteristic.EncAggSoc, value: percentFullSumEnc, valueKey: 'encAggSoc' },
                                             { type: Characteristic.EncAggBackupEnergy, value: energySumEncKw, valueKey: 'encAggBackupEnergy' },
+                                            { type: Characteristic.EncAggSoc, value: percentFullSumEnc, valueKey: 'encAggSoc' },
                                         ];
 
                                         // Update storage summary services

package/src/functions.js

@@ -17,12 +17,33 @@ class Functions {
         }
     }
 
-    async readData(path) {
+    async readData(path, parseJson = false) {
         try {
-            const data = await fsPromises.readFile(path);
+            const data = await fsPromises.readFile(path, 'utf8');
+
+            if (parseJson) {
+                if (!data.trim()) {
+                    // Empty file when expecting JSON
+                    return null;
+                }
+                try {
+                    return JSON.parse(data);
+                } catch (jsonError) {
+                    throw new Error(`JSON parse error in file "${path}": ${jsonError.message}`);
+                }
+            }
+
+            // For non-JSON, just return file content (can be empty string)
             return data;
         } catch (error) {
-            throw new Error(`Read data error: ${error}`);
+            if (error.code === 'ENOENT') {
+                // File does not exist
+                return null;
+            }
+            // Preserve original error details
+            const wrappedError = new Error(`Read data error for "${path}": ${error.message}`);
+            wrappedError.original = error;
+            throw wrappedError;
         }
     }