homebridge-enphase-envoy 9.4.2 → 9.4.3-beta.0

package/package.json

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

package/src/envoydevice.js

@@ -608,6 +608,17 @@ class EnvoyDevice extends EventEmitter {
         //url
         this.url = this.envoyFirmware7xx ? `https://${this.host}` : `http://${this.host}`;
 
+        //create axios instance
+        this.axiosInstance = axios.create({
+            method: 'GET',
+            baseURL: this.url,
+            withCredentials: true,
+            headers: {
+                Accept: 'application/json'
+            },
+            timeout: 25000
+        });
+
         //envoy dev id
         this.envoyDevId = '';
 
@@ -864,6 +875,9 @@ class EnvoyDevice extends EventEmitter {
                 const updateInventory = updateHome ? await this.updateInventory() : false;
             } catch (error) {
                 this.emit('error', `Impulse generator: ${error}`);
+                const errorString = error.toString();
+                const tokenNotValid = errorString.includes('status code 401');
+                this.validateToken = tokenNotValid;
             };
         }).on('updateMeters', async () => {
             try {
@@ -872,6 +886,9 @@ class EnvoyDevice extends EventEmitter {
                 const updateMetersReading = updateMeters ? await this.updateMetersReading() : false;
             } catch (error) {
                 this.emit('error', `Impulse generator: ${error}`);
+                const errorString = error.toString();
+                const tokenNotValid = errorString.includes('status code 401');
+                this.validateToken = tokenNotValid;
             };
         }).on('updateMicroinvertersStatus', async () => {
             try {
@@ -879,6 +896,9 @@ class EnvoyDevice extends EventEmitter {
                 const updateMicroinvertersStatus = !tokenValid ? false : await this.updateMicroinvertersStatus();
             } catch (error) {
                 this.emit('error', `Impulse generator: ${error}`);
+                const errorString = error.toString();
+                const tokenNotValid = errorString.includes('status code 401');
+                this.validateToken = tokenNotValid;
             };
         }).on('updateProduction', async () => {
             try {
@@ -887,6 +907,9 @@ class EnvoyDevice extends EventEmitter {
                 const updateProductionCt = updateProduction ? await this.updateProductionCt() : false;
             } catch (error) {
                 this.emit('error', `Impulse generator: ${error}`);
+                const errorString = error.toString();
+                const tokenNotValid = errorString.includes('status code 401');
+                this.validateToken = tokenNotValid;
             };
         }).on('updateEnsemble', async () => {
             try {
@@ -901,6 +924,9 @@ class EnvoyDevice extends EventEmitter {
                 const updateGeneratorSettings = updateGenerator ? await this.updateGeneratorSettings() : false;
             } catch (error) {
                 this.emit('error', `Impulse generator: ${error}`);
+                const errorString = error.toString();
+                const tokenNotValid = errorString.includes('status code 401');
+                this.validateToken = tokenNotValid;
             };
         }).on('updateLiveData', async () => {
             try {
@@ -908,6 +934,9 @@ class EnvoyDevice extends EventEmitter {
                 const updateLiveData = !tokenValid ? false : await this.updateLiveData();
             } catch (error) {
                 this.emit('error', `Impulse generator: ${error}`);
+                const errorString = error.toString();
+                const tokenNotValid = errorString.includes('status code 401');
+                this.validateToken = tokenNotValid;
             };
         }).on('state', (state) => {
             const emitState = state ? this.emit('success', `Impulse generator started.`) : this.emit('warn', `Impulse generator stopped.`);
@@ -962,17 +991,6 @@ class EnvoyDevice extends EventEmitter {
             this.refreshEnsemble = false;
             this.refreshLiveData = false;
 
-            //create axios instance
-            this.axiosInstance = axios.create({
-                method: 'GET',
-                baseURL: this.url,
-                withCredentials: true,
-                headers: {
-                    Accept: 'application/json'
-                },
-                timeout: 25000
-            });
-
             //get and validate jwt token
             this.validateToken = true;
             const getJwtToken = this.envoyFirmware7xx ? this.envoyFirmware7xxTokenGenerationMode === 0 ? await this.getJwtToken() : true : false;