homebridge-enphase-envoy 9.3.4-beta.2 → 9.3.4-beta.4

package/index.js

@@ -114,17 +114,12 @@ class EnvoyPlatform {
           .on('error', async (error) => {
             envoyDevice.impulseGenerator.stop();
             const tokenNotValid = envoyFirmware7xx && error.includes('status code 401');
-            const displayError = tokenNotValid ? log.warn(`Device: ${host} ${deviceName}, JWT token not valid, refreshing.`) : log.error(`Device: ${host} ${deviceName}, ${error}, trying again in 20s.`);
+            const tokenExpired = envoyFirmware7xx && error.includes('JWT token expired');
+            const displayError = tokenNotValid ? log.warn(`Device: ${host} ${deviceName}, JWT token not valid, refreshing.`) : tokenExpired ? log.warn(`Device: ${host} ${deviceName}, ${error}, refreshing.`) : log.error(`Device: ${host} ${deviceName}, ${error}, trying again.`);
 
-            await new Promise(resolve => setTimeout(resolve, 20000));
-            envoyDevice.start();
-          })
-          .on('tokenExpired', async () => {
-            envoyDevice.impulseGenerator.stop();
-            log.warn(`Device: ${host} ${deviceName}, JWT token expired, refreshing in 20s.`);
 
-            //start read data
-            await new Promise(resolve => setTimeout(resolve, 20000))
+            //wait 20s and try again
+            await new Promise(resolve => setTimeout(resolve, 20000));
             envoyDevice.start();
           });
       }

package/package.json

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

package/src/envoydevice.js

@@ -1032,7 +1032,7 @@ class EnvoyDevice extends EventEmitter {
 
         try {
             const tokenExpired = this.envoyFirmware7xx ? this.envoyFirmware7xxTokenGenerationMode === 0 ? (Math.floor(new Date().getTime() / 1000) > this.jwtToken.expires_at) : false : false;
-            const refreshToken = tokenExpired ? this.emit('tokenExpired') : false;
+            const refreshToken = tokenExpired ? this.emit('error', 'JWT token expired') : false;
             return tokenExpired;
         } catch (error) {
             throw new Error(`Requesting check JWT token error: ${error}`);

package/src/restful.js

@@ -30,7 +30,7 @@ class RestFul extends EventEmitter {
             microinverters: 'This data is not available in your system.',
             powerMode: 'This data is not available in your system.',
             plcLevel: 'This data is not available in your system.',
-            datasampling: 'This data is not available in your system.'
+            dataSampling: 'This data is not available in your system.'
         };
 
         this.connect();