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

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.1",
     "description": "Homebridge plugin for Photovoltaic Energy System manufactured by Enphase.",
     "license": "MIT",
     "author": "grzegorz914",

package/src/envoydevice.js

@@ -602,12 +602,24 @@ class EnvoyDevice extends EventEmitter {
         this.envoyTokenFile = envoyTokenFile;
         this.envoyInstallerPasswordFile = envoyInstallerPasswordFile;
         this.startPrepareAccessory = true;
-        this.getJwtTokenRunning = false;
-        this.validateToken = false;
+        this.checkJwtTokenRunning = false;
+        this.cookie = '';
+        this.newCookie = '';
 
         //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 +876,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.checkJwtTokenRunning = !tokenNotValid;
             };
         }).on('updateMeters', async () => {
             try {
@@ -872,6 +887,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.checkJwtTokenRunning = !tokenNotValid;
             };
         }).on('updateMicroinvertersStatus', async () => {
             try {
@@ -879,6 +897,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.checkJwtTokenRunning = !tokenNotValid;
             };
         }).on('updateProduction', async () => {
             try {
@@ -887,6 +908,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.checkJwtTokenRunning = !tokenNotValid;
             };
         }).on('updateEnsemble', async () => {
             try {
@@ -901,6 +925,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.checkJwtTokenRunning = !tokenNotValid;
             };
         }).on('updateLiveData', async () => {
             try {
@@ -908,6 +935,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.checkJwtTokenRunning = !tokenNotValid;
             };
         }).on('state', (state) => {
             const emitState = state ? this.emit('success', `Impulse generator started.`) : this.emit('warn', `Impulse generator stopped.`);
@@ -962,20 +992,9 @@ 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;
+            const checkJwtToken = this.envoyFirmware7xx ? this.envoyFirmware7xxTokenGenerationMode === 0 ? await this.checkJwtToken() : true : false;
 
             //update grid profile
             await this.updateGridProfile();
@@ -999,17 +1018,17 @@ class EnvoyDevice extends EventEmitter {
             const updateMetersReading = this.refreshMeters ? await this.updateMetersReading() : false;
 
             //acces with envoy password
-            this.refreshMicroinverters = getJwtToken || calculateEnvoyPassword ? await this.updateMicroinvertersStatus() : false;
+            this.refreshMicroinverters = checkJwtToken || calculateEnvoyPassword ? await this.updateMicroinvertersStatus() : false;
 
             //get production and production ct
             this.refreshProduction = await this.updateProduction();
             const updateProductionCt = this.refreshProduction ? await this.updateProductionCt() : false;
 
             //access with installer password and envoy dev id
-            const updatePowerProductionState = envoyDevIdExist && (getJwtToken || calculateInstallerPassword) ? await this.updateProductionPowerState() : false;
+            const updatePowerProductionState = envoyDevIdExist && (checkJwtToken || calculateInstallerPassword) ? await this.updateProductionPowerState() : false;
 
             //get ensemble data only FW. >= 7.x.x.
-            this.refreshEnsemble = getJwtToken ? await this.updateEnsembleInventory() : false;
+            this.refreshEnsemble = checkJwtToken ? await this.updateEnsembleInventory() : false;
             const updateEnsembleStatus = this.refreshEnsemble ? await this.updateEnsembleStatus() : false;
             const updateEnchargeSettings = this.refreshEnsemble ? await this.updateEnchargesSettings() : false;
             const updateTariffSettings = this.refreshEnsemble ? await this.updateTariff() : false;
@@ -1019,8 +1038,8 @@ class EnvoyDevice extends EventEmitter {
             const updateGeneratorSettings = updateGenerator ? await this.updateGeneratorSettings() : false;
 
             //get plc communication level
-            const updateCommLevel = this.supportPlcLevel && (getJwtToken || calculateInstallerPassword) ? await this.updateCommLevel() : false;
-            this.refreshLiveData = getJwtToken ? await this.updateLiveData() : false;
+            const updateCommLevel = this.supportPlcLevel && (checkJwtToken || calculateInstallerPassword) ? await this.updateCommLevel() : false;
+            this.refreshLiveData = checkJwtToken ? await this.updateLiveData() : false;
 
             //connect to deice success
             this.emit('success', `Connect Success.`)
@@ -1049,19 +1068,47 @@ class EnvoyDevice extends EventEmitter {
         };
     };
 
-    async getJwtToken() {
-        const debug = this.enableDebugMode ? this.emit('debug', `Requesting JWT token.`) : false;
+    async checkJwtToken() {
+        const debug = this.enableDebugMode ? this.emit('debug', `Requesting check JWT token.`) : false;
 
         if (!this.envoyFirmware7xx || (this.envoyFirmware7xx && this.envoyFirmware7xxTokenGenerationMode === 1)) {
             return true;
         };
 
-        if (this.getJwtTokenRunning) {
+        if (this.checkJwtTokenRunning) {
             return false;
         };
 
         try {
-            this.getJwtTokenRunning = true;
+            this.checkJwtTokenRunning = true;
+
+            //read token from file
+            const data = await this.readData(this.tokenFile);
+            const parsedData = JSON.parse(data);
+            parsedData.token ? parsedData : null;
+            const tokenIsValid = parsedData && Math.floor(Date.now() / 1000) + 60 <= parsedData.expires_at;
+
+            if (tokenIsValid && (this.cookie === this.newCookie)) {
+                return true;
+            }
+
+            this.emit('warn', `JWT Token expired or not valid, refreshing.`);
+            await new Promise(resolve => setTimeout(resolve, 30000));
+            const getToken = await this.getJwtToken();
+            const validateToken = getToken ? await this.validateJwtToken() : false;
+
+            this.checkJwtTokenRunning = false;
+            return validateToken;
+        } catch (error) {
+            this.checkJwtTokenRunning = false;
+            throw new Error(`Chack JWT token error: ${error.message || error}`);
+        };
+    };
+
+    async getJwtToken() {
+        const debug = this.enableDebugMode ? this.emit('debug', `Requesting JWT token.`) : false;
+
+        try {
             const envoyToken = new EnvoyToken({
                 user: this.enlightenUser,
                 passwd: this.enlightenPassword,
@@ -1069,14 +1116,17 @@ class EnvoyDevice extends EventEmitter {
                 tokenFile: this.envoyTokenFile
             }).on('success', (message) => {
                 this.emit('success', message);
-                this.validateToken = true;
             }).on('warn', (message) => {
                 this.emit('warn', message);
             }).on('error', (error) => {
                 throw new Error(error.message || error);
             });
 
-            const tokenData = await envoyToken.checkToken();
+            const tokenData = await envoyToken.refreshToken();
+            if (!tokenData) {
+                return false;
+            }
+
             const updatedTokenData = {
                 ...tokenData,
                 token: 'removed'
@@ -1084,26 +1134,21 @@ class EnvoyDevice extends EventEmitter {
             const debug = this.enableDebugMode ? this.emit('debug', `JWT token:`, updatedTokenData) : false;
             this.jwtToken = tokenData;
 
-            //validate new token
-            const validateToken = this.validateToken ? await this.validateJwtToken() : false;
-            this.validateToken = validateToken ? false : this.validateToken;
-
             //restFul
             const restFul = this.restFulConnected ? this.restFul.update('token', tokenData) : false;
 
             //mqtt
             const mqtt = this.mqttConnected ? this.mqtt.emit('publish', 'Token', tokenData) : false;
 
-            this.getJwtTokenRunning = false;
             return true;
         } catch (error) {
-            this.getJwtTokenRunning = this.getJwtTokenRunning ? false : this.getJwtTokenRunning;
             throw new Error(`Get JWT token error: ${error.message || error}`);
         };
     };
 
     async validateJwtToken() {
         const debug = this.enableDebugMode ? this.emit('debug', `Requesting validate JWT token.`) : false;
+
         try {
             const axiosInstanceToken = axios.create({
                 method: 'GET',
@@ -1122,7 +1167,7 @@ class EnvoyDevice extends EventEmitter {
 
             const response = await axiosInstanceToken(CONSTANTS.ApiUrls.CheckJwt);
             const debug = this.enableDebugMode ? this.emit('debug', `JWT token: Valid`) : false;
-            const cookie = response.headers['set-cookie'];
+            this.newCookie = response.headers['set-cookie'];
 
             //create axios instance get with cookie
             this.axiosInstance = axios.create({
@@ -1130,7 +1175,7 @@ class EnvoyDevice extends EventEmitter {
                 baseURL: this.url,
                 headers: {
                     Accept: 'application/json',
-                    Cookie: cookie
+                    Cookie: this.newCookie
                 },
                 withCredentials: true,
                 httpsAgent: new https.Agent({
@@ -1139,7 +1184,8 @@ class EnvoyDevice extends EventEmitter {
                 }),
                 timeout: 20000
             });
-            this.cookie = cookie;
+
+            this.cookie = this.newCookie;
             this.emit('success', `JWT Token valid: ${new Date(this.jwtToken.expires_at * 1000).toLocaleString()}`);
 
             return true;

package/src/envoytoken.js

@@ -14,32 +14,23 @@ class EnvoyToken extends EventEmitter {
         this.tokenFile = config.tokenFile;
     };
 
-    async checkToken() {
+    async refreshToken() {
         try {
-            const data = await this.readData(this.tokenFile);
-            const parsedData = JSON.parse(data);
-            parsedData.token ? parsedData : null;
-            const tokenIsValid = parsedData && Math.floor(Date.now() / 1000) + 12 <= parsedData.expires_at;
+            const cookie = await this.loginToEnlighten();
+            const tokenData = await this.getToken(cookie);
 
-            if (tokenIsValid) {
-                return parsedData;
-            } else {
-                this.emit('warn', `JWT Token expired, refreshing.`);
-                await new Promise(resolve => setTimeout(resolve, 15000));
-                const newToken = await this.refreshToken();
-                return newToken;
+            if (!tokenData.token) {
+                this.emit('warn', `Token missing in response: ${JSON.stringify(tokenData)}`);
+                return false;
             }
-        } catch (error) {
-            this.emit('error', `Check token error: ${error}`);
-        }
-    }
 
-    async refreshToken() {
-        try {
-            const cookie = await this.loginToEnlighten();
-            const newToken = await this.getToken(cookie);
+            //save token
+            await this.saveData(this.tokenFile, tokenData);
+
+            //emit success
             this.emit('success', `JWT Token refresh success.`);
-            return newToken;
+
+            return tokenData;
         } catch (error) {
             this.emit('error', `Refresh token error: ${error}`);
         }
@@ -90,13 +81,6 @@ class EnvoyToken extends EventEmitter {
 
             const response = await axiosInstance(CONSTANTS.EnphaseUrls.EntrezAuthToken);
             const tokenData = response.data;
-            if (!tokenData.token) {
-                this.emit('error', `Token missing in response: ${JSON.stringify(tokenData)}`);
-                return;
-            }
-
-            tokenData.expires_at = tokenData.expires_at || Math.floor(Date.now() / 1000) + 3600; // Assume 1 hour expiry if not provided
-            await this.saveData(this.tokenFile, tokenData);
             return tokenData;
         } catch (error) {
             this.emit('error', `Get token error: ${error.message ?? error}`);