homebridge-enphase-envoy 9.14.2-beta.21 → 9.14.2-beta.23

package/package.json

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

package/src/envoydevice.js

@@ -1303,60 +1303,6 @@ class EnvoyDevice extends EventEmitter {
         };
     };
 
-    async getEnvoyDevId() {
-        const debug = this.enableDebugMode ? this.emit('debug', `Requesting envoy dev Id`) : false;
-        try {
-            //read envoy dev id from file
-            try {
-                const response = await this.readData(this.envoyIdFile);
-                const debug = this.enableDebugMode ? this.emit('debug', `Envoy dev Id from file: ${response.toString().length === 9 ? 'Exist' : 'Missing'}`) : false;
-                const envoyDevId = response.toString() ?? '';
-                if (envoyDevId.length === 9) {
-                    this.feature.info.devId = envoyDevId;
-                    return true;
-                }
-            } catch (error) {
-                this.emit('warn', `Read envoy dev Id from file error, trying from device: ${error}`)
-            };
-
-            //read envoy dev id from device
-            const response = await this.axiosInstance(ApiUrls.BackboneApplication);
-            const envoyBackboneApp = response.data;
-            const debug = this.enableDebugMode ? this.emit('debug', `Envoy backbone app:`, envoyBackboneApp) : false;
-
-            //backbone data
-            const keyword = 'envoyDevId:';
-            const startIndex = envoyBackboneApp.indexOf(keyword);
-
-            //check envoy dev Id exist
-            if (startIndex === -1) {
-                this.emit('warn', `Envoy dev Id not found, dont worry all working correct, only the power production control will not be possible`);
-                return null;
-            }
-
-            const substringStartIndex = startIndex + keyword.length;
-            const envoyDevId = envoyBackboneApp.substr(substringStartIndex, 9);
-            if (envoyDevId.length !== 9) {
-                this.emit('warn', `Envoy dev Id: ${envoyDevId} have wrong format, dont worry all working correct, only the power production control will not be possible`);
-                return null;
-            }
-
-            //save dev id
-            try {
-                await this.saveData(this.envoyIdFile, envoyDevId);
-            } catch (error) {
-                this.emit('error', `Save envoy dev Id error: ${error}`);
-            };
-
-            this.feature.info.devId = envoyDevId;
-            this.feature.backboneApp.supported = true;
-            return true;
-        } catch (error) {
-            this.emit('warn', `Get envoy dev Id from device error: ${error}, dont worry all working correct, only the power production control will not be possible`);
-            return null;
-        };
-    };
-
     async updateHome() {
         const debug = this.enableDebugMode ? this.emit('debug', `Requesting home`) : false;
         try {
@@ -1369,7 +1315,7 @@ class EnvoyDevice extends EventEmitter {
             const envoyCommKeys = Object.keys(envoy.comm);
 
             //get supported devices
-            const pcuSupported = envoyCommKeys.includes('pcu');
+            const pcusSupported = envoyCommKeys.includes('pcu');
             const acBatteriesSupported = envoyCommKeys.includes('acb');
             const qRelaysSupported = envoyCommKeys.includes('nsrb');
             const ensemblesSupported = envoyCommKeys.includes('esub');
@@ -4305,6 +4251,60 @@ class EnvoyDevice extends EventEmitter {
         };
     };
 
+    async getEnvoyDevId() {
+        const debug = this.enableDebugMode ? this.emit('debug', `Requesting envoy dev Id`) : false;
+        try {
+            //read envoy dev id from file
+            try {
+                const response = await this.readData(this.envoyIdFile);
+                const debug = this.enableDebugMode ? this.emit('debug', `Envoy dev Id from file: ${response.toString().length === 9 ? 'Exist' : 'Missing'}`) : false;
+                const envoyDevId = response.toString() ?? '';
+                if (envoyDevId.length === 9) {
+                    this.feature.info.devId = envoyDevId;
+                    return true;
+                }
+            } catch (error) {
+                this.emit('warn', `Read envoy dev Id from file error, trying from device: ${error}`)
+            };
+
+            //read envoy dev id from device
+            const response = await this.axiosInstance(ApiUrls.BackboneApplication);
+            const envoyBackboneApp = response.data;
+            const debug = this.enableDebugMode ? this.emit('debug', `Envoy backbone app:`, envoyBackboneApp) : false;
+
+            //backbone data
+            const keyword = 'envoyDevId:';
+            const startIndex = envoyBackboneApp.indexOf(keyword);
+
+            //check envoy dev Id exist
+            if (startIndex === -1) {
+                this.emit('warn', `Envoy dev Id not found, dont worry all working correct, only the power production control will not be possible`);
+                return null;
+            }
+
+            const substringStartIndex = startIndex + keyword.length;
+            const envoyDevId = envoyBackboneApp.substr(substringStartIndex, 9);
+            if (envoyDevId.length !== 9) {
+                this.emit('warn', `Envoy dev Id: ${envoyDevId} have wrong format, dont worry all working correct, only the power production control will not be possible`);
+                return null;
+            }
+
+            //save dev id
+            try {
+                await this.saveData(this.envoyIdFile, envoyDevId);
+            } catch (error) {
+                this.emit('error', `Save envoy dev Id error: ${error}`);
+            };
+
+            this.feature.info.devId = envoyDevId;
+            this.feature.backboneApp.supported = true;
+            return true;
+        } catch (error) {
+            this.emit('warn', `Get envoy dev Id from device error: ${error}, dont worry all working correct, only the power production control will not be possible`);
+            return null;
+        };
+    };
+
     async updateProductionState() {
         const debug = this.enableDebugMode ? this.emit('debug', `Requesting production state`) : false;
         try {
@@ -4372,6 +4372,39 @@ class EnvoyDevice extends EventEmitter {
         };
     };
 
+    async getDeviceInfo() {
+        const debug = this.enableDebugMode ? this.emit('debug', `Requesting device info`) : false;
+
+        //debug objects
+        const debug1 = this.enableDebugMode ? this.emit('debug', `Pv object:`, this.pv) : false;
+
+        //display info
+        this.emit('devInfo', `-------- ${this.name} --------`);
+        this.emit('devInfo', `Manufacturer: Enphase`);
+        this.emit('devInfo', `Model: ${this.pv.info.modelName}`);
+        this.emit('devInfo', `Firmware: ${this.pv.info.software}`);
+        this.emit('devInfo', `SerialNr: ${this.pv.info.serialNumber}`);
+        this.emit('devInfo', `Time: ${this.pv.info.time}`);
+        this.emit('devInfo', `------------------------------`);
+        const displayLog12 = this.feature.inventory.qRelays.installed ? this.emit('devInfo', `Q-Relays: ${this.feature.inventory.qRelays.count}`) : false;
+        const displayLog15 = this.feature.inventory.pcus.installed ? this.emit('devInfo', `Inverters: ${this.feature.inventory.pcus.count}`) : false;
+        const displayLog13 = this.feature.inventory.acBatteries.installed ? this.emit('devInfo', `${this.acBatterieName}: ${this.feature.inventory.acBatteries.count}`) : false;
+        const displayLog14 = this.feature.inventory.qRelays.installed || this.feature.inventory.acBatteries.installed || this.feature.inventory.pcus.installed ? this.emit('devInfo', `--------------------------------`) : false;
+        const displayLog0 = this.feature.meters.installed ? this.emit('devInfo', `Meters: Yes`) : false;
+        const displayLog1 = this.feature.meters.installed && this.feature.meters.production.supported ? this.emit('devInfo', `Production: ${this.feature.meters.production.enabled ? `Enabled` : `Disabled`}`) : false;
+        const displayLog2 = this.feature.meters.installed && this.feature.meters.consumption.supported ? this.emit('devInfo', `Consumption: ${this.feature.meters.consumption.enabled ? `Enabled` : `Disabled`}`) : false;
+        const displayLog3 = this.feature.meters.installed && this.feature.meters.acBatterie.supported ? this.emit('devInfo', `Storage: ${this.feature.meters.acBatterie.enabled ? `Enabled` : `Disabled`}`) : false;
+        const displayLog4 = this.feature.meters.installed ? this.emit('devInfo', `--------------------------------`) : false;
+        const displayLog5 = this.feature.ensembles.installed ? this.emit('devInfo', `Ensemble: Yes`) : false;
+        const displayLog6 = this.feature.enpowers.installed ? this.emit('devInfo', `Enpowers: ${this.feature.enpowers.count}`) : false;
+        const displayLog7 = this.feature.encharges.installed ? this.emit('devInfo', `${this.enchargeName}: ${this.feature.encharges.count}`) : false;
+        const displayLog8 = this.feature.dryContacts.installed ? this.emit('devInfo', `Dry Contacts: ${this.feature.dryContacts.count}`) : false;
+        const displayLog9 = this.feature.generators.installed ? this.emit('devInfo', `Generator: Yes`) : false;
+        const displayLog10 = this.feature.home.wirelessConnections.installed ? this.emit('devInfo', `Wireless Kit: ${this.feature.home.wirelessConnections.count}`) : false;
+        const displayLog11 = this.feature.ensembles.installed || this.feature.enpowers.installed || this.feature.encharges.installed || this.feature.dryContacts.installed || this.feature.home.wirelessConnections.installed || this.feature.generators.installed ? this.emit('devInfo', `--------------------------------`) : false;
+        return true;
+    };
+
     async setProductionState(state) {
         const debug = this.enableDebugMode ? this.emit('debug', `Set production power mode`) : false;
         try {
@@ -4599,39 +4632,6 @@ class EnvoyDevice extends EventEmitter {
         }
     };
 
-    async getDeviceInfo() {
-        const debug = this.enableDebugMode ? this.emit('debug', `Requesting device info`) : false;
-
-        //debug objects
-        const debug1 = this.enableDebugMode ? this.emit('debug', `Pv object:`, this.pv) : false;
-
-        //display info
-        this.emit('devInfo', `-------- ${this.name} --------`);
-        this.emit('devInfo', `Manufacturer: Enphase`);
-        this.emit('devInfo', `Model: ${this.pv.info.modelName}`);
-        this.emit('devInfo', `Firmware: ${this.pv.info.software}`);
-        this.emit('devInfo', `SerialNr: ${this.pv.info.serialNumber}`);
-        this.emit('devInfo', `Time: ${this.pv.info.time}`);
-        this.emit('devInfo', `------------------------------`);
-        const displayLog12 = this.feature.inventory.qRelays.installed ? this.emit('devInfo', `Q-Relays: ${this.feature.inventory.qRelays.count}`) : false;
-        const displayLog15 = this.feature.inventory.pcus.installed ? this.emit('devInfo', `Inverters: ${this.feature.inventory.pcus.count}`) : false;
-        const displayLog13 = this.feature.inventory.acBatteries.installed ? this.emit('devInfo', `${this.acBatterieName}: ${this.feature.inventory.acBatteries.count}`) : false;
-        const displayLog14 = this.feature.inventory.qRelays.installed || this.feature.inventory.acBatteries.installed || this.feature.inventory.pcus.installed ? this.emit('devInfo', `--------------------------------`) : false;
-        const displayLog0 = this.feature.meters.installed ? this.emit('devInfo', `Meters: Yes`) : false;
-        const displayLog1 = this.feature.meters.installed && this.feature.meters.production.supported ? this.emit('devInfo', `Production: ${this.feature.meters.production.enabled ? `Enabled` : `Disabled`}`) : false;
-        const displayLog2 = this.feature.meters.installed && this.feature.meters.consumption.supported ? this.emit('devInfo', `Consumption: ${this.feature.meters.consumption.enabled ? `Enabled` : `Disabled`}`) : false;
-        const displayLog3 = this.feature.meters.installed && this.feature.meters.acBatterie.supported ? this.emit('devInfo', `Storage: ${this.feature.meters.acBatterie.enabled ? `Enabled` : `Disabled`}`) : false;
-        const displayLog4 = this.feature.meters.installed ? this.emit('devInfo', `--------------------------------`) : false;
-        const displayLog5 = this.feature.ensembles.installed ? this.emit('devInfo', `Ensemble: Yes`) : false;
-        const displayLog6 = this.feature.enpowers.installed ? this.emit('devInfo', `Enpowers: ${this.feature.enpowers.count}`) : false;
-        const displayLog7 = this.feature.encharges.installed ? this.emit('devInfo', `${this.enchargeName}: ${this.feature.encharges.count}`) : false;
-        const displayLog8 = this.feature.dryContacts.installed ? this.emit('devInfo', `Dry Contacts: ${this.feature.dryContacts.count}`) : false;
-        const displayLog9 = this.feature.generators.installed ? this.emit('devInfo', `Generator: Yes`) : false;
-        const displayLog10 = this.feature.home.wirelessConnections.installed ? this.emit('devInfo', `Wireless Kit: ${this.feature.home.wirelessConnections.count}`) : false;
-        const displayLog11 = this.feature.ensembles.installed || this.feature.enpowers.installed || this.feature.encharges.installed || this.feature.dryContacts.installed || this.feature.home.wirelessConnections.installed || this.feature.generators.installed ? this.emit('devInfo', `--------------------------------`) : false;
-        return true;
-    };
-
     async externalIntegrations() {
         try {
             //RESTFul server
@@ -7228,12 +7228,12 @@ class EnvoyDevice extends EventEmitter {
 
             //get ensemble data ab FW. >= 7.x.x.
             const refreshEnsemble = tokenValid ? await this.updateEnsembleInventory() : false;
-            const updateEnsembleStatus = refreshEnsemble ? await this.updateEnsembleStatus() : false;
-            const refreshEnchargeSettings = refreshEnsemble ? await this.updateEnchargesSettings() : false;
+            const updateEnsembleStatus = this.feature.ensembles.supported ? await this.updateEnsembleStatus() : false;
+            const refreshEnchargeSettings = this.feature.ensembles.supported ? await this.updateEnchargesSettings() : false;
             const refreshTariffSettings = refreshEnchargeSettings ? await this.updateTariff() : false;
-            const refreshDryContacts = refreshEnsemble ? await this.updateDryContacts() : false;
+            const refreshDryContacts = this.feature.ensembles.supported ? await this.updateDryContacts() : false;
             const updateDryContactsSettings = refreshDryContacts ? await this.updateDryContactsSettings() : false;
-            const refreshGenerator = refreshEnsemble ? await this.updateGenerator() : false;
+            const refreshGenerator = this.feature.ensembles.supported ? await this.updateGenerator() : false;
             const updateGeneratorSettings = refreshGenerator ? await this.updateGeneratorSettings() : false;
 
             //get live data ab FW. >= 7.x.x