homebridge-enphase-envoy 10.2.5-beta.1 → 10.2.5-beta.10

package/package.json

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

package/src/energymeter.js

@@ -25,8 +25,6 @@ class EnergyMeter extends EventEmitter {
         this.envoyFirmware7xxTokenGenerationMode = device.envoyFirmware7xxTokenGenerationMode;
         this.enlightenUser = device.enlightenUser;
         this.enlightenPasswd = device.enlightenPasswd;
-        this.envoyToken = device.envoyToken;
-        this.envoyTokenInstaller = device.envoyTokenInstaller;
         this.energyProductionLifetimeOffset = device.energyProductionLifetimeOffset || 0;
         this.energyConsumptionTotalLifetimeOffset = device.energyConsumptionTotalLifetimeOffset || 0;
         this.energyConsumptionNetLifetimeOffset = device.energyConsumptionNetLifetimeOffset || 0;
@@ -50,7 +48,7 @@ class EnergyMeter extends EventEmitter {
         this.lastReset = 0;
 
         //url
-        this.url = envoyFirmware7xxTokenGenerationMode > 0 ? `https://${this.host}` : `http://${this.host}`;
+        this.url = device.envoyFirmware7xxTokenGenerationMode > 0 ? `https://${this.host}` : `http://${this.host}`;
 
         //supported functions
         this.feature = {
@@ -64,9 +62,9 @@ class EnergyMeter extends EventEmitter {
                 cookie: '',
                 jwtToken: {
                     generation_time: 0,
-                    token: envoyToken,
+                    token: device.envoyToken,
                     expires_at: 0,
-                    installer: this.envoyFirmware7xxTokenGenerationMode === 2 ? this.envoyTokenInstaller : false
+                    installer: this.envoyFirmware7xxTokenGenerationMode === 2 ? device.envoyTokenInstaller : false
                 }
             },
             meters: {
@@ -484,7 +482,7 @@ class EnergyMeter extends EventEmitter {
             const jwt = this.feature.info.jwtToken;
 
             // Create a token-authenticated Axios instance
-            const axiosInstance = this.functions.createAxiosInstance(`Bearer ${jwt.token}`, null);
+            const axiosInstance = this.functions.createAxiosInstance(this.url, `Bearer ${jwt.token}`, null);
 
             // Send validation request
             const response = await axiosInstance.get(ApiUrls.CheckJwt);
@@ -505,7 +503,7 @@ class EnergyMeter extends EventEmitter {
             }
 
             // Replace axios instance with cookie-authenticated one
-            this.axiosInstance = this.functions.createAxiosInstance(null, cookie);
+            this.axiosInstance = this.functions.createAxiosInstance(this.url, null, cookie);
 
             // Update internal state
             this.feature.info.tokenValid = true;
@@ -715,7 +713,7 @@ class EnergyMeter extends EventEmitter {
                 const obj = {
                     type: 'pcu',
                     activeCount: this.feature.inventory.pcus.count,
-                    measurementType: 'Production',
+                    measurementType: 'production',
                     readingTime,
                     power: production.wattsNow,
                     energyToday: production.wattHoursToday,
@@ -746,7 +744,7 @@ class EnergyMeter extends EventEmitter {
             // PCU
             const pcu = {
                 type: 'pcu',
-                measurementType: 'Production',
+                measurementType: 'production',
                 activeCount: this.feature.inventory?.pcus?.count,
                 readingTime,
                 power: data.watts_now_pcu,
@@ -761,7 +759,7 @@ class EnergyMeter extends EventEmitter {
             const eimActive = !!data.there_is_an_active_eim;
             const eim = {
                 type: 'eim',
-                measurementType: 'Production',
+                measurementType: 'production',
                 activeCount: 1,
                 readingTime,
                 active: eimActive,
@@ -777,7 +775,7 @@ class EnergyMeter extends EventEmitter {
             const rgmActive = !!data.there_is_an_active_rgm;
             const rgm = {
                 type: 'rgm',
-                measurementType: 'Production',
+                measurementType: 'production',
                 activeCount: 1,
                 readingTime,
                 active: rgmActive,
@@ -793,7 +791,7 @@ class EnergyMeter extends EventEmitter {
             const pmuActive = !!data.there_is_an_active_pmu;
             const pmu = {
                 type: 'pmu',
-                measurementType: 'Production',
+                measurementType: 'production',
                 activeCount: 1,
                 readingTime,
                 active: pmuActive,
@@ -831,7 +829,7 @@ class EnergyMeter extends EventEmitter {
                         const obj = {
                             type,
                             activeCount: 1,
-                            measurementType: 'Production',
+                            measurementType: 'production',
                             readingTime,
                             power: data.wattsNow,
                             energyToday: data.wattHoursToday,
@@ -851,7 +849,7 @@ class EnergyMeter extends EventEmitter {
                 const obj = {
                     type: 'eim',
                     activeCount: 1,
-                    measurementType: 'Consumption Net',
+                    measurementType: 'net-consumption',
                     readingTime,
                     power: data.wattsNow,
                     energyToday: data.wattHoursToday,
@@ -895,7 +893,7 @@ class EnergyMeter extends EventEmitter {
                     const obj = {
                         type: 'eim',
                         activeCount: 1,
-                        measurementType: ApiCodes[productionEim.measurementType],
+                        measurementType: productionEim.measurementType,
                         readingTime: productionEim.readingTime,
                         power: productionEim.wNow,
                         energyToday,
@@ -915,14 +913,13 @@ class EnergyMeter extends EventEmitter {
             // --- Consumption: EIM ---
             if (keys.includes('consumption') && Array.isArray(data.consumption) && this.feature.meters.consumptionNet.enabled) {
                 for (const item of data.consumption) {
-                    const type = ApiCodes[item.measurementType];
-                    const key = MetersKeyMap[type];
+                    const key = MetersKeyMap[item.measurementType];
                     const energyToday = (item.lines[0]?.whToday || 0) + (item.lines[1]?.whToday || 0) + (item.lines[2]?.whToday || 0);
                     const energyLastSevenDays = (item.lines[0]?.whLastSevenDays || 0) + (item.lines[1]?.whLastSevenDays || 0) + (item.lines[2]?.whLastSevenDays || 0);
                     const energyLifetime = (item.lines[0]?.whLifetime || 0) + (item.lines[1]?.whLifetime || 0) + (item.lines[2]?.whLifetime || 0);
                     const obj = {
                         type: 'eim',
-                        measurementType: type,
+                        measurementType: item.measurementType,
                         activeCount: 1,
                         readingTime: item.readingTime,
                         power: item.wNow,
@@ -1168,7 +1165,7 @@ class EnergyMeter extends EventEmitter {
 
         try {
             // Create axios instance
-            this.axiosInstance = this.functions.createAxiosInstance();
+            this.axiosInstance = this.functions.createAxiosInstance(this.url);
 
             // Get basic PV info
             const getInfo = await this.getInfo();

package/src/envoydata.js

@@ -12,13 +12,11 @@ class EnvoyData extends EventEmitter {
         super();
 
         //device configuration
-        this.host = host;
+        this.host = device.host;
         this.envoyFirmware7xxTokenGenerationMode = device.envoyFirmware7xxTokenGenerationMode;
         this.envoyPasswd = device.envoyPasswd;
         this.enlightenUser = device.enlightenUser;
         this.enlightenPasswd = device.enlightenPasswd;
-        this.envoyToken = device.envoyToken;
-        this.envoyTokenInstaller = device.envoyTokenInstaller;
         this.envoyIdFile = envoyIdFile;
         this.envoyTokenFile = envoyTokenFile;
 
@@ -39,7 +37,7 @@ class EnvoyData extends EventEmitter {
         this.checkTokenRunning = false;
 
         //url
-        this.url = envoyFirmware7xxTokenGenerationMode > 0 ? `https://${this.host}` : `http://${this.host}`;
+        this.url = device.envoyFirmware7xxTokenGenerationMode > 0 ? `https://${this.host}` : `http://${this.host}`;
 
         //supported functions
         this.feature = {
@@ -53,9 +51,9 @@ class EnvoyData extends EventEmitter {
                 cookie: '',
                 jwtToken: {
                     generation_time: 0,
-                    token: envoyToken,
+                    token: device.envoyToken,
                     expires_at: 0,
-                    installer: this.envoyFirmware7xxTokenGenerationMode === 2 ? this.envoyTokenInstaller : false
+                    installer: device.envoyFirmware7xxTokenGenerationMode === 2 ? device.envoyTokenInstaller : false
                 }
             },
             backboneApp: {
@@ -713,7 +711,7 @@ class EnvoyData extends EventEmitter {
             const jwt = this.feature.info.jwtToken;
 
             // Create a token-authenticated Axios instance
-            const axiosInstance = this.functions.createAxiosInstance(`Bearer ${jwt.token}`, null);
+            const axiosInstance = this.functions.createAxiosInstance(this.url, `Bearer ${jwt.token}`, null);
 
             // Send validation request
             const response = await axiosInstance.get(ApiUrls.CheckJwt);
@@ -734,7 +732,7 @@ class EnvoyData extends EventEmitter {
             }
 
             // Replace axios instance with cookie-authenticated one
-            this.axiosInstance = this.functions.createAxiosInstance(null, cookie);
+            this.axiosInstance = this.functions.createAxiosInstance(this.url, null, cookie);
 
             // Update internal state
             this.feature.info.tokenValid = true;
@@ -2732,7 +2730,7 @@ class EnvoyData extends EventEmitter {
 
         try {
             // Create axios instance
-            this.axiosInstance = this.functions.createAxiosInstance();
+            this.axiosInstance = this.functions.createAxiosInstance(this.url);
 
             // Get basic PV info
             const getInfo = await this.getInfo();

package/src/envoydevice.js

@@ -103,9 +103,9 @@ class EnvoyDevice extends EventEmitter {
 
         //system accessoty
         this.systemAccessory = {
-            serviceType: ['', Service.Lightbulb, Service.Fan, Service.HumiditySensor, Service.CarbonMonoxideSensor][displayType],
-            characteristicType: ['', Characteristic.On, Characteristic.On, Characteristic.StatusActive, Characteristic.CarbonMonoxideDetected][displayType],
-            characteristicType1: ['', Characteristic.Brightness, Characteristic.RotationSpeed, Characteristic.CurrentRelativeHumidity, Characteristic.CarbonMonoxideLevel][displayType],
+            serviceType: ['', Service.Lightbulb, Service.Fan, Service.HumiditySensor, Service.CarbonMonoxideSensor][device.displayType],
+            characteristicType: ['', Characteristic.On, Characteristic.On, Characteristic.StatusActive, Characteristic.CarbonMonoxideDetected][device.displayType],
+            characteristicType1: ['', Characteristic.Brightness, Characteristic.RotationSpeed, Characteristic.CurrentRelativeHumidity, Characteristic.CarbonMonoxideLevel][device.displayType],
             state: false,
             level: 0
         }
@@ -361,9 +361,6 @@ class EnvoyDevice extends EventEmitter {
         this.envoyIdFile = envoyIdFile;
         this.envoyTokenFile = envoyTokenFile;
 
-        //url
-        this.url = envoyFirmware7xxTokenGenerationMode > 0 ? `https://${this.host}` : `http://${this.host}`;
-
         //supported functions
         this.feature = {
             productionState: {

package/src/functions.js

@@ -1,4 +1,6 @@
 import { promises as fsPromises } from 'fs';
+import axios from 'axios';
+import { Agent } from 'https';
 import { ApiCodes, TimezoneLocaleMap } from './constants.js';
 
 class Functions {
@@ -112,9 +114,9 @@ class Functions {
         return powerPeakStored;
     }
 
-    createAxiosInstance(authHeader = null, cookie = null) {
+    createAxiosInstance(url, authHeader = null, cookie = null) {
         return axios.create({
-            baseURL: this.url,
+            baseURL: url,
             headers: {
                 Accept: 'application/json',
                 ...(authHeader ? { Authorization: authHeader } : {}),
@@ -122,7 +124,7 @@ class Functions {
             },
             withCredentials: true,
             httpsAgent: new Agent({
-                keepAlive: false,
+                keepAlive: true,
                 rejectUnauthorized: false
             }),
             timeout: 60000