homebridge-enphase-envoy 10.2.2-beta.21 → 10.2.2-beta.24

package/package.json

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

package/src/envoydevice.js

@@ -939,6 +939,28 @@ class EnvoyDevice extends EventEmitter {
                     relay: {},
                     generator: {}
                 },
+                esubsData: {
+                    devices: [],
+                    encharges: {
+                        devices: [],
+                        settings: {},
+                        tariff: {},
+                        tariffRaw: {},
+                        ratedPowerSumKw: null,
+                        realPowerSumKw: null,
+                        phaseA: false,
+                        phaseB: false,
+                        phaseC: false,
+                    },
+                    enpowers: [],
+                    collars: [],
+                    c6CombinerControllers: [],
+                    c6Rgms: [],
+                    counters: {},
+                    secctrl: {},
+                    relay: {},
+                    generator: {}
+                },
             },
             meters: [],
             powerAndEnergy: {
@@ -947,17 +969,23 @@ class EnvoyDevice extends EventEmitter {
                     eim: {},
                     rgm: {},
                     pmu: {},
-                    powerPeak: -100000
                 },
                 consumptionNet: {
-                    powerPeak: -100000
                 },
                 consumptionTotal: {
-                    powerPeak: -100000
                 },
             },
             powerAndEnergyData: {
                 data: [],
+                production: {
+                    powerPeak: -100000
+                },
+                consumptionNet: {
+                    powerPeak: -100000
+                },
+                consumptionTotal: {
+                    powerPeak: -100000
+                },
             },
             liveData: {},
             gridProfile: {},
@@ -3978,7 +4006,7 @@ class EnvoyDevice extends EventEmitter {
                 let sourceMeter, sourceEnergy;
                 let power, powerLevel, powerState, powerPeak, powerPeakDetected;
                 let energyToday, energyLastSevenDays, energyLifetime, energyLifetimeUpload, energyLifetimeWithOffset;
-                const powerPeakStored = this.pv.powerAndEnergy[key].powerPeak;
+                const powerPeakStored = this.pv.powerAndEnergyData[key].powerPeak;
 
                 switch (key) {
                     case 'production': {
@@ -4024,7 +4052,7 @@ class EnvoyDevice extends EventEmitter {
                         break;
                     }
                 }
-                if (this.isValidValue(powerPeak)) this.pv.powerAndEnergy[key].powerPeak = powerPeak;
+                if (this.isValidValue(powerPeak)) this.pv.powerAndEnergyData[key].powerPeak = powerPeak;
 
                 if (!sourceMeter) continue;
                 if (this.logDebug) {
@@ -4316,7 +4344,7 @@ class EnvoyDevice extends EventEmitter {
                 }));
 
                 // Update ensemble
-                this.pv.inventory.esubs.devices = updatedEnsembles.filter(Boolean);
+                this.pv.inventory.esubsData.devices = updatedEnsembles.filter(Boolean);
             }
 
             // Ensemble secctrl
@@ -4385,7 +4413,7 @@ class EnvoyDevice extends EventEmitter {
                     });
                 }
 
-                this.pv.inventory.esubs.secctrl = secctrl;
+                this.pv.inventory.esubsData.secctrl = secctrl;
 
                 // Add to ensemble summary characteristics
                 ensembleSummaryCharacteristics.push(
@@ -4577,7 +4605,7 @@ class EnvoyDevice extends EventEmitter {
                     backupSocLimitAbove100: counterData.backupSocLimitAbove100,
                     apiEcagtGetGenRelayState: counterData.api_ecagtGetGenRelayState,
                 };
-                this.pv.inventory.esubs.counters = counters;
+                this.pv.inventory.esubsData.counters = counters;
 
                 // Add to ensemble summary characteristics
                 if (this.isValidValue(counters.restPowerKw)) ensembleSummaryCharacteristics.push({ type: Characteristic.RestPower, value: counters.restPowerKw });
@@ -4603,7 +4631,7 @@ class EnvoyDevice extends EventEmitter {
                     solarGridModeTranslated: ApiCodes[relayData.Solar_grid_mode] ?? relayData.Solar_grid_mode,
                     solarGridStateBool: relayData.mains_admin_state === 'closed',
                 };
-                this.pv.inventory.esubs.relay = relay;
+                this.pv.inventory.esubsData.relay = relay;
 
                 // encharge grid state sensor
                 if (this.enchargeGridStateActiveSensor) {
@@ -4842,7 +4870,7 @@ class EnvoyDevice extends EventEmitter {
                 }));
 
                 // Filter out nulls and update inventory
-                this.pv.inventory.esubs.encharges.devices = updatedEncharges.filter(Boolean);
+                this.pv.inventory.esubsData.encharges.devices = updatedEncharges.filter(Boolean);
 
                 // Add encharges settings
                 if (enchargesSettingsSupported) {
@@ -4855,7 +4883,7 @@ class EnvoyDevice extends EventEmitter {
                         currentLimit: settingsData.currentLimit,
                         perPhase: settingsData.perPhase
                     };
-                    this.pv.inventory.esubs.encharges.settings = settings;
+                    this.pv.inventory.esubsData.encharges.settings = settings;
 
                     if (this.enchargeStateActiveSensor) {
                         const state = settings.enable;
@@ -4994,13 +5022,13 @@ class EnvoyDevice extends EventEmitter {
                     }
 
                     // Save updated tariff
-                    this.pv.inventory.esubs.encharges.tariff = tariff;
+                    this.pv.inventory.esubsData.encharges.tariff = tariff;
                 }
 
                 // Calculate encharges rated power summary in kW
                 if (enchargesStatusSupported) {
                     const ratedPowerSum = enchargesRatedPowerSummary.length > 0 ? (enchargesRatedPowerSummary.reduce((total, num) => total + num, 0) / enchargesRatedPowerSummary.length) / 1000 : null;
-                    this.pv.inventory.esubs.encharges.ratedPowerSumKw = ratedPowerSum;
+                    this.pv.inventory.esubsData.encharges.ratedPowerSumKw = ratedPowerSum;
 
                     // Add to ensemble summary characteristics
                     ensembleSummaryCharacteristics.push({ type: Characteristic.RatedPower, value: ratedPowerSum });
@@ -5009,7 +5037,7 @@ class EnvoyDevice extends EventEmitter {
                 // Calculate encharges real power summary in kW
                 if (enchargesPowerSupported) {
                     const realPowerSum = enchargesRealPowerSummary.length > 0 ? (enchargesRealPowerSummary.reduce((total, num) => total + num, 0) / enchargesRealPowerSummary.length) / 1000 : null;
-                    this.pv.inventory.esubs.encharges.realPowerSumKw = realPowerSum;
+                    this.pv.inventory.esubsData.encharges.realPowerSumKw = realPowerSum;
 
                     // Add to ensemble summary characteristics
                     ensembleSummaryCharacteristics.push({ type: Characteristic.RealPower, value: realPowerSum });
@@ -5128,7 +5156,7 @@ class EnvoyDevice extends EventEmitter {
                                 };
                             }
 
-                            enpowerData.dryContacts[i] = dryContactData;
+                            this.pv.inventory.esubsData.dryContacts[i] = dryContactData;
                         });
                     }
 
@@ -5190,7 +5218,7 @@ class EnvoyDevice extends EventEmitter {
                 }));
 
                 // Filter out nulls and update inventory
-                this.pv.inventory.esubs.enpowers = updatedEnpowers.filter(Boolean);
+                this.pv.inventory.esubsData.enpowers = updatedEnpowers.filter(Boolean);
             }
 
             // IQ Meter Collars
@@ -5241,7 +5269,7 @@ class EnvoyDevice extends EventEmitter {
                 }));
 
                 // Update collars
-                this.pv.inventory.esubs.collars = updatedCollars.filter(Boolean);
+                this.pv.inventory.esubsData.collars = updatedCollars.filter(Boolean);
             }
 
             // IQ C6 Combiner Controllers
@@ -5283,7 +5311,7 @@ class EnvoyDevice extends EventEmitter {
                 }));
 
                 // Update c6 combiner controllers
-                this.pv.inventory.esubs.c6CombinerControllers = updatedC6CombinerControllers.filter(Boolean);
+                this.pv.inventory.esubsData.c6CombinerControllers = updatedC6CombinerControllers.filter(Boolean);
             }
 
             // IQ C6 Rgm
@@ -5319,7 +5347,7 @@ class EnvoyDevice extends EventEmitter {
                 }));
 
                 // Update C6 rgms
-                this.pv.inventory.esubs.c6Rgms = updatedC6Rgms.filter(Boolean);
+                this.pv.inventory.esubsData.c6Rgms = updatedC6Rgms.filter(Boolean);
             }
 
             // Generators
@@ -5472,7 +5500,7 @@ class EnvoyDevice extends EventEmitter {
                 }
 
                 // Save processed generator data
-                this.pv.inventory.esubs.generator = generatorData;
+                this.pv.inventory.esubsData.generator = generatorData;
             }
 
             // Set supported flag
@@ -5504,9 +5532,9 @@ class EnvoyDevice extends EventEmitter {
             }
 
             // Get encharges installed phases
-            const phaseA = this.pv.inventory.esubs.encharges.phaseA;
-            const phaseB = this.pv.inventory.esubs.encharges.phaseB;
-            const phaseC = this.pv.inventory.esubs.encharges.phaseC;
+            const phaseA = this.pv.inventory.esubsData.encharges.phaseA;
+            const phaseB = this.pv.inventory.esubsData.encharges.phaseB;
+            const phaseC = this.pv.inventory.esubsData.encharges.phaseC;
 
             // Extract connection status — aka the heartbeat of the system
             const connection = live.connection ?? {};
@@ -5569,7 +5597,7 @@ class EnvoyDevice extends EventEmitter {
             if (this.feature.meters.production.enabled) activeDevices.push({ type: 'Production', meter: meters.pv });
             if (this.feature.meters.consumptionNet.enabled) activeDevices.push({ type: 'Consumption Net', meter: meters.grid });
             if (this.feature.meters.consumptionTotal.enabled) activeDevices.push({ type: 'Consumption Total', meter: meters.load });
-            if (this.feature.meters.storage.enabled || this.pv.inventory.esubs.encharges.installed) activeDevices.push({ type: 'Storage', meter: meters.storage });
+            if (this.feature.meters.storage.enabled || this.feature.inventory.esubs.encharges.installed) activeDevices.push({ type: 'Storage', meter: meters.storage });
             if (this.feature.meters.generator.enabled) activeDevices.push({ type: 'Generator', meter: meters.generator });
             for (const [index, { type, meter }] of activeDevices.entries()) {
                 if (!meter) {
@@ -6491,8 +6519,8 @@ class EnvoyDevice extends EventEmitter {
                 }
 
                 if (enpowersInstalled) {
-                    const enpowerState = this.pv.inventory.esubs.enpowers[0].mainsAdminStateBool;
-                    characteristics.push({ type: Characteristic.EnpowerGridMode, label: 'enpower grid mode', value: this.pv.inventory.esubs.enpowers[0].enpwrGridModeTranslated });
+                    const enpowerState = this.pv.inventory.esubsData.enpowers[0].mainsAdminStateBool;
+                    characteristics.push({ type: Characteristic.EnpowerGridMode, label: 'enpower grid mode', value: this.pv.inventory.esubsData.enpowers[0].enpwrGridModeTranslated });
                     service.getCharacteristic(Characteristic.EnpowerGridState)
                         .onGet(async () => {
                             const state = enpowerState;
@@ -6522,8 +6550,8 @@ class EnvoyDevice extends EventEmitter {
                 }
 
                 if (generatorInstalled) {
-                    const generatorState = this.pv.inventory.esubs.generator.adminModeOnBool || this.pv.inventory.esubs.generator.adminModeAutoBool;
-                    characteristics.push({ type: Characteristic.GeneratorMode, label: 'generator mode', value: this.pv.inventory.esubs.generator.adminMode });
+                    const generatorState = this.pv.inventory.esubsData.generator.adminModeOnBool || this.pv.inventory.esubsData.generator.adminModeAutoBool;
+                    characteristics.push({ type: Characteristic.GeneratorMode, label: 'generator mode', value: this.pv.inventory.esubsData.generator.adminMode });
                     service.getCharacteristic(Characteristic.State)
                         .onGet(async () => {
                             const state = generatorState
@@ -7219,8 +7247,8 @@ class EnvoyDevice extends EventEmitter {
 
                 //summary
                 if (ensemblesCountersSupported || ensemblesSecCtrlSupported) {
-                    const secctrl = this.pv.inventory.esubs.secctrl;
-                    const counters = this.pv.inventory.esubs.counters;
+                    const secctrl = this.pv.inventory.esubsData.secctrl;
+                    const counters = this.pv.inventory.esubsData.counters;
 
                     if (this.logDebug) this.emit('debug', `Prepare Ensemble Summary Service`);
 
@@ -7270,8 +7298,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.inventory.esubs.ratedPowerSumKw, unit: 'kW' });
-                    if (enchargesPowerSupported) characteristics.push({ type: Characteristic.RealPower, label: 'real power', value: this.pv.inventory.esubs.realPowerSumKw, unit: 'kW' });
+                    if (enchargesStatusSupported) characteristics.push({ type: Characteristic.RatedPower, label: 'rated power', value: this.pv.inventory.esubsData.ratedPowerSumKw, unit: 'kW' });
+                    if (enchargesPowerSupported) characteristics.push({ type: Characteristic.RealPower, label: 'real power', value: this.pv.inventory.esubsData.realPowerSumKw, unit: 'kW' });
 
                     for (const { type, label, value, unit = '', postfix = '' } of characteristics) {
                         if (!this.isValidValue(value)) continue;
@@ -7290,7 +7318,7 @@ class EnvoyDevice extends EventEmitter {
                 if (ensemblesInstalled) {
                     this.ensembleServices = [];
 
-                    for (const ensemble of this.pv.inventory.esubs.devices) {
+                    for (const ensemble of this.pv.inventory.esubsData.devices) {
                         const serialNumber = ensemblesInstalled ? ensemble.serialNumber : ensemble.status.deviceType;
                         if (this.logDebug) this.emit('debug', `Prepare Ensemble ${serialNumber} Service`);
 
@@ -7458,7 +7486,7 @@ class EnvoyDevice extends EventEmitter {
                     this.enchargeServices = [];
                     this.enchargeLevelAndStateServices = [];
 
-                    for (const encharge of this.pv.inventory.esubs.encharges.devices) {
+                    for (const encharge of this.pv.inventory.esubsData.encharges.devices) {
                         const serialNumber = encharge.serialNumber;
 
                         // Backup level and state (individual)
@@ -7591,7 +7619,7 @@ class EnvoyDevice extends EventEmitter {
                         if (this.enchargeProfileActiveControls.length > 0) {
                             if (this.logDebug) this.emit('debug', `Prepare ${enchargeName} Profile Control Services`);
 
-                            const enchargeSettings = this.pv.inventory.esubs.encharges.tariff.storageSettings;
+                            const enchargeSettings = this.pv.inventory.esubsData.encharges.tariff.storageSettings;
                             this.enchargeProfileControlsServices = [];
 
                             for (let i = 0; i < this.enchargeProfileActiveControls.length; i++) {
@@ -7751,7 +7779,7 @@ class EnvoyDevice extends EventEmitter {
                     this.enpowerGridModeSensorServices = [];
 
                     //devices
-                    for (const enpower of this.pv.inventory.esubs.enpowers) {
+                    for (const enpower of this.pv.inventory.esubsData.enpowers) {
                         const serialNumber = enpower.serialNumber;
 
                         if (this.logDebug) this.emit('debug', `Prepare Enpower ${serialNumber} Service`);
@@ -7963,7 +7991,7 @@ class EnvoyDevice extends EventEmitter {
                 if (collarsInstalled) {
                     this.collarServices = [];
 
-                    for (const collar of this.pv.inventory.esubs.collars) {
+                    for (const collar of this.pv.inventory.esubsData.collars) {
                         const serialNumber = collar.serialNumber;
                         if (this.logDebug) this.emit('debug', `Prepare Collar ${serialNumber} Service`);
 
@@ -8000,7 +8028,7 @@ class EnvoyDevice extends EventEmitter {
                 if (c6CombinerControllersInstalled) {
                     this.c6CombinerControllerServices = [];
 
-                    for (const c6CombinerController of this.pv.inventory.esubs.c6CombinerControllers) {
+                    for (const c6CombinerController of this.pv.inventory.esubsData.c6CombinerControllers) {
                         const serialNumber = c6CombinerController.serialNumber;
                         if (this.logDebug) this.emit('debug', `Prepare C6 Combiner Controller ${serialNumber} Service`);
 
@@ -8034,7 +8062,7 @@ class EnvoyDevice extends EventEmitter {
                 if (c6RgmsInstalled) {
                     this.c6RgmServices = [];
 
-                    for (const c6Rgm of this.pv.inventory.esubs.c6Rgms) {
+                    for (const c6Rgm of this.pv.inventory.esubsData.c6Rgms) {
                         const serialNumber = c6Rgm.serialNumber;
                         if (this.logDebug) this.emit('debug', `Prepare C6 Rgm ${serialNumber} Service`);
 
@@ -8065,7 +8093,7 @@ class EnvoyDevice extends EventEmitter {
 
                 //generator
                 if (generatorInstalled) {
-                    const generator = this.pv.inventory.esubs.generator;
+                    const generator = this.pv.inventory.esubsData.generator;
                     const generatorType = generator.type;
 
                     if (this.logDebug) this.emit('debug', `Prepare Generator ${type} Service`);