homebridge-enphase-envoy 10.2.7-beta.0 → 10.2.7-beta.2

package/index.js

@@ -91,41 +91,38 @@ class EnvoyPlatform {
 
         try {
           const url = envoyFirmware7xxTokenGenerationMode > 0 ? `https://${host}` : `http://${host}`;
-          const devicesClass = device.energyMeter ? [EnvoyDevice, EnergyMeter] : [EnvoyDevice];
-          for (const [index, DeviceClass] of devicesClass.entries()) {
-            const accessoryName = index === 0 ? deviceName : 'Energy Meter';
-
-            // create impulse generator
-            const impulseGenerator = new ImpulseGenerator()
-              .on('start', async () => {
-                try {
-                  const envoyDevice = new DeviceClass(api, log, url, accessoryName, device, envoyIdFile, envoyTokenFile, prefDir, energyMeterHistoryFileName)
-                    .on('devInfo', (info) => logLevel.devInfo && log.info(info))
-                    .on('success', (msg) => logLevel.success && log.success(`Device: ${host} ${accessoryName}, ${msg}`))
-                    .on('info', (msg) => logLevel.info && log.info(`Device: ${host} ${accessoryName}, ${msg}`))
-                    .on('debug', (msg, data) => logLevel.debug && log.info(`Device: ${host} ${accessoryName}, debug: ${data ? `${msg} ${JSON.stringify(data, null, 2)}` : msg}`))
-                    .on('warn', (msg) => logLevel.warn && log.warn(`Device: ${host} ${accessoryName}, ${msg}`))
-                    .on('error', (msg) => logLevel.error && log.error(`Device: ${host} ${accessoryName}, ${msg}`));
-
-                  const accessory = await envoyDevice.start();
-                  if (accessory) {
-                    api.publishExternalAccessories(PluginName, [accessory]);
-                    if (logLevel.success) log.success(`Device: ${host} ${accessoryName}, Published as external accessory.`);
-
-                    await impulseGenerator.state(false);
-                    await envoyDevice.startStopImpulseGenerator(true);
-                  }
-                } catch (error) {
-                  if (logLevel.error) log.error(`Device: ${host} ${accessoryName}, Start impulse generator error: ${error}, retrying.`);
+
+          // create impulse generator
+          const impulseGenerator = new ImpulseGenerator()
+            .on('start', async () => {
+              try {
+                const envoyDevice = new EnvoyDevice(api, log, url, deviceName, device, envoyIdFile, envoyTokenFile, prefDir, energyMeterHistoryFileName)
+                  .on('devInfo', (info) => logLevel.devInfo && log.info(info))
+                  .on('success', (msg) => logLevel.success && log.success(`Device: ${host} ${deviceName}, ${msg}`))
+                  .on('info', (msg) => logLevel.info && log.info(`Device: ${host} ${deviceName}, ${msg}`))
+                  .on('debug', (msg, data) => logLevel.debug && log.info(`Device: ${host} ${deviceName}, debug: ${data ? `${msg} ${JSON.stringify(data, null, 2)}` : msg}`))
+                  .on('warn', (msg) => logLevel.warn && log.warn(`Device: ${host} ${deviceName}, ${msg}`))
+                  .on('error', (msg) => logLevel.error && log.error(`Device: ${host} ${deviceName}, ${msg}`));
+
+                const accessory = await envoyDevice.start();
+                if (accessory) {
+                  api.publishExternalAccessories(PluginName, accessory);
+                  if (logLevel.success) log.success(`Device: ${host} ${deviceName}, Published as external accessory.`);
+
+                  await impulseGenerator.state(false);
+                  await envoyDevice.startStopImpulseGenerator(true);
                 }
-              })
-              .on('state', state => {
-                if (logLevel.debug) log.info(`Device: ${host} ${accessoryName}, Start impulse generator ${state ? 'started' : 'stopped'}.`);
-              });
-
-            // start impulse generator
-            await impulseGenerator.state(true, [{ name: 'start', sampling: 120000 }]);
-          }
+              } catch (error) {
+                if (logLevel.error) log.error(`Device: ${host} ${deviceName}, Start impulse generator error: ${error}, retrying.`);
+              }
+            })
+            .on('state', state => {
+              if (logLevel.debug) log.info(`Device: ${host} ${deviceName}, Start impulse generator ${state ? 'started' : 'stopped'}.`);
+            });
+
+          // start impulse generator
+          await impulseGenerator.state(true, [{ name: 'start', sampling: 120000 }]);
+
         } catch (error) {
           if (logLevel.error) log.error(`Device: ${host} ${deviceName}, Did finish launching error: ${error}`);
         }

package/package.json

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

package/src/digestauth.js

@@ -16,14 +16,10 @@ class DigestAuth {
             return await axios.request(url, options);
         } catch (error) {
             const resError = error.response;
-            if (!resError || resError.status !== 401) {
-                throw new Error(`Digest authentication response error: ${resError ? resError.status : 'Unknown error'}`);
-            }
+            if (!resError || resError.status !== 401) throw new Error(`Digest authentication response error: ${resError ? resError.status : 'Unknown error'}`);
 
             const resHeaders = resError.headers["www-authenticate"];
-            if (!resHeaders || !resHeaders.includes('nonce')) {
-                throw new Error(`Digest authentication headers error: ${resHeaders || 'Header not found'}`);
-            }
+            if (!resHeaders || !resHeaders.includes('nonce')) throw new Error(`Digest authentication headers error: ${resHeaders || 'Header not found'}`);
 
             try {
                 const authDetails = {};

package/src/energymeter.js

@@ -229,9 +229,8 @@ class EnergyMeter extends EventEmitter {
         const errorString = error.toString();
         const tokenNotValid = errorString.includes('status code 401');
         if (tokenNotValid) {
-            if (this.checkTokenRunning) {
-                return;
-            }
+            if (this.checkTokenRunning) return;
+
             this.feature.info.jwtToken.token = '';
             this.feature.tokenValid = false;
             return;
@@ -968,7 +967,7 @@ class EnergyMeter extends EventEmitter {
                         const sourceEim = this.pv.powerAndEnergy[key].eim;
                         sourceMeter = meterEnabled ? this.pv.meters.find(m => m.measurementType === 'production') : sourcePcu;
                         sourceEnergy = meterEnabled ? sourceEim : sourcePcu;
-                        power = this.functions.isValidValue(sourceMeter.power) && sourceMeter.power >=0? sourceMeter.power : 0;
+                        power = this.functions.isValidValue(sourceMeter.power) && sourceMeter.power >= 0 ? sourceMeter.power : 0;
                         energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime / 1000 : null;
                         energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyProductionLifetimeOffset : null;
                         break;
@@ -976,7 +975,7 @@ class EnergyMeter extends EventEmitter {
                     case 'consumptionNet': {
                         sourceMeter = this.pv.meters.find(m => m.measurementType === 'net-consumption');
                         sourceEnergy = this.pv.powerAndEnergy.consumptionNet;
-                        power = this.functions.isValidValue(sourceMeter.power) ? sourceMeter.power : null;
+                        power = this.functions.isValidValue(sourceMeter.power) && sourceMeter.power >= 0 ? sourceMeter.power : 0;
                         energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime / 1000 : null;
                         energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyConsumptionNetLifetimeOffset : null;
                         break;
@@ -984,7 +983,7 @@ class EnergyMeter extends EventEmitter {
                     case 'consumptionTotal': {
                         sourceMeter = this.pv.meters.find(m => m.measurementType === 'total-consumption');
                         sourceEnergy = this.pv.powerAndEnergy.consumptionTotal;
-                        power = this.functions.isValidValue(sourceMeter.power) ? sourceMeter.power : null;
+                        power = this.functions.isValidValue(sourceMeter.power) && sourceMeter.power >= 0 ? sourceMeter.power : 0;
                         energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime / 1000 : null;
                         energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyConsumptionTotalLifetimeOffset : null;
                         break;
@@ -1010,7 +1009,7 @@ class EnergyMeter extends EventEmitter {
                     // Add to fakegato history
                     this.fakegatoHistoryService?.addEntry({
                         time: Math.floor(Date.now() / 1000),
-                        power: power
+                        power: power ?? 0
                     });
 
                     // Create characteristics energy meter
@@ -1096,7 +1095,7 @@ class EnergyMeter extends EventEmitter {
             })
             this.fakegatoHistoryService.addEntry({
                 time: Math.floor(Date.now() / 1000),
-                power: this.pv.powerAndEnergy.data[0].power
+                power: this.pv.powerAndEnergy.data[0].power ?? 0
             });
 
             // Energy Meter Service

package/src/envoydata.js

@@ -449,9 +449,8 @@ class EnvoyData extends EventEmitter {
         const errorString = error.toString();
         const tokenNotValid = errorString.includes('status code 401');
         if (tokenNotValid) {
-            if (this.checkTokenRunning) {
-                return;
-            }
+            if (this.checkTokenRunning) return;
+            
             this.feature.info.jwtToken.token = '';
             this.feature.info.tokenValid = false;
             return;