homebridge-enphase-envoy 10.2.5-beta.3 → 10.2.5-beta.5

package/package.json

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

package/src/energymeter.js

@@ -482,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);
@@ -503,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;
@@ -1166,7 +1166,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

@@ -713,7 +713,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 +734,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 +2732,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

@@ -362,7 +362,7 @@ class EnvoyDevice extends EventEmitter {
         this.envoyTokenFile = envoyTokenFile;
 
         //url
-        this.url = config.envoyFirmware7xxTokenGenerationMode > 0 ? `https://${this.host}` : `http://${this.host}`;
+        this.url = device.envoyFirmware7xxTokenGenerationMode > 0 ? `https://${this.host}` : `http://${this.host}`;
 
         //supported functions
         this.feature = {

package/src/functions.js

@@ -1,4 +1,5 @@
 import { promises as fsPromises } from 'fs';
+import axios from 'axios';
 import { ApiCodes, TimezoneLocaleMap } from './constants.js';
 
 class Functions {
@@ -112,9 +113,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 } : {}),