homebridge-enphase-envoy 10.3.0 → 10.3.1-beta.0

package/README.md

@@ -24,7 +24,7 @@ The `homebridge-enphase-envoy` plugin integrates Enphase Envoy solar energy moni
 | Package | Installation | Role | Required |
 | --- | --- | --- | --- |
 | [Homebridge](https://github.com/homebridge/homebridge) | [Homebridge Wiki](https://github.com/homebridge/homebridge/wiki) | HomeKit Bridge | Required |
-| [Config UI X](https://github.com/homebridge/homebridge-config-ui-x) | [Config UI X Wiki](https://github.com/homebridge/homebridge-config-ui-x/wiki) | Homebridge Web User Interface | Recommended |
+| [Homebridge UI](https://github.com/homebridge/homebridge-config-ui-x) | [Homebridge UI Wiki](https://github.com/homebridge/homebridge-config-ui-x/wiki) | Homebridge Web User Interface | Recommended |
 | [Enphase Envoy](https://www.npmjs.com/package/homebridge-enphase-envoy) | [Plug-In Wiki](https://github.com/grzegorz914/homebridge-enphase-envoy/wiki) | Homebridge Plug-In | Required |
 
 ## Supported hardware
@@ -90,7 +90,7 @@ The `homebridge-enphase-envoy` plugin integrates Enphase Envoy solar energy moni
 ### Configuration
 
 * Running this plugin as a [Child Bridge](https://github.com/homebridge/homebridge/wiki/Child-Bridges) is **highly recommended**. This prevents Homebridge from crashing if the plugin crashes.
-* Installation and use of [Homebridge Config UI X](https://github.com/homebridge/homebridge-config-ui-x) to configure this plugin is **highly recommended**.
+* Installation and use of [Homebridge UI](https://github.com/homebridge/homebridge-config-ui-x) to configure this plugin is **highly recommended**.
 * The `sample-config.json` can be edited and used as an alternative for advanced users.
 
 <p align="center">

package/package.json

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

package/src/customcharacteristics.js

@@ -1554,22 +1554,6 @@ 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

@@ -412,7 +412,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.inventory.esubs.encharges.power.supported) await this.updateEnsemblePower();
+                if (updateEnsemble && this.feature.ensemble.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();
@@ -2038,20 +2038,19 @@ 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 ?? [];
+            const devices = responseData.devices || [];
             if (devices.length === 0) return false;
 
             // update encharges
             const enchargesRealPowerSummary = [];
             const encharges = this.pv.inventory.esubs.encharges.devices || [];
-            for (const device of devices) {
-                const serialNumber = device.serial_num;
-                const encharge = encharges.find(device => device.serialNumber === serialNumber);
+            for (const encharge of encharges) {
+                const device = devices.find(device => device.serial_num === encharge.serialNumber);
                 if (this.logDebug) this.emit('debug', `Ensemble device power:`, device);
-                if (!encharge) continue;
+                if (!device) continue;
 
                 encharge.power = {
                     serialNumber: device.serial_num,
@@ -2060,8 +2059,8 @@ class EnvoyData extends EventEmitter {
                     soc: device.soc,
                 };
 
-                if (this.functions.isValidValue(encharge.power.realPower)) enchargesRealPowerSummary.push(encharge.power.realPower);
                 this.feature.inventory.esubs.encharges.power.supported = true;
+                if (this.functions.isValidValue(encharge.power.realPower)) enchargesRealPowerSummary.push(encharge.power.realPower);
             }
 
             // Calculate encharges real power summary in kW
@@ -2091,7 +2090,7 @@ class EnvoyData extends EventEmitter {
             const enchargesSettingsSupported = 'enc_settings' in enchargesSettings;
             if (!enchargesSettingsSupported) return false;
 
-            const settings  = {
+            const settings = {
                 enable: enchargesSettings.enc_settings.enable,                 // boolean
                 country: enchargesSettings.enc_settings.country,               // string
                 currentLimit: enchargesSettings.enc_settings.current_limit,    // float
@@ -2772,12 +2771,16 @@ 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();
-                const getEnchargeSettings = this.feature.inventory.esubs.encharges.installed ? await this.updateEnchargesSettings() : false;
-                if (getEnchargeSettings) await this.updateTariff();
+                if (this.feature.inventory.esubs.encharges.installed) {
+                    await this.updateEnsemblePower();
+                    await this.updateEnchargesSettings();
+                    await this.updateTariff();
+                }
 
-                const getDryContacts = this.feature.inventory.esubs.enpowers.installed ? await this.updateDryContacts() : false;
-                if (getDryContacts) await this.updateDryContactsSettings();
+                if (this.feature.inventory.esubs.enpowers.installed) {
+                    await this.updateDryContacts();
+                    await this.updateDryContactsSettings();
+                }
 
                 const getGenerator = await this.updateGenerator();
                 if (getGenerator && this.feature.inventory.esubs.generator.installed) await this.updateGeneratorSettings();

package/src/envoydevice.js

@@ -2257,22 +2257,14 @@ 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;
@@ -3630,7 +3622,7 @@ class EnvoyDevice extends EventEmitter {
                             };
 
                             if (this.logDebug) {
-                                this.emit('debug', `Q-Rela state:`, nsrbData.relay);
+                                this.emit('debug', `Q-Relay state:`, nsrbData.relay);
                                 this.emit('debug', `Q-Relay lines:`, nsrbData.linesCount);
                             }