homebridge-melcloud-control 4.3.11-beta.6 → 4.3.11-beta.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.3.11-beta.6",
+  "version": "4.3.11-beta.8",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/constants.js

@@ -60,7 +60,7 @@ export const AirConditioner = {
     SystemMapEnumToString: { 0: "Air Conditioner Off", 1: "Air Conditioner On", 2: "Air Conditioner Offline" },
     OperationModeMapStringToEnum: { "0": 0, "Heat": 1, "Dry": 2, "Cool": 3, "4": 4, "5": 5, "6": 6, "Fan": 7, "Automatic": 8, "Heat Isee": 9, "Dry Isee": 10, "Cool Isee": 11 },
     OperationModeMapEnumToString: { 0: "0", 1: "Heat", 2: "Dry", 3: "Cool", 4: "4", 5: "5", 6: "6", 7: "Fan", 8: "Automatic", 9: "Heat Isee", 10: "Dry Isee", 11: "Cool Isee" },
-    OperationModeMapEnumToEnumWs: { 0: 0, 1: 1, 2: 2, 3: 3, 4: 7, 5: 8, 6: 9, 7: 10, 8: 11 },
+    OperationModeMapEnumToEnumWs: { 0: 0, 1: 1, 2: 2, 3: 3, 4: 7, 5: 8 },
     FanSpeedMapStringToEnum: { "Auto": 0, "One": 1, "Two": 2, "Three": 3, "Four": 4, "Five": 5, "0": 0, "1": 1, "2": 2, "3": 3, "4": 4, "5": 5 },
     FanSpeedMapEnumToString: { 0: "Auto", 1: "One", 2: "Two", 3: "Three", 4: "Four", 5: "Five" },
     SetFanSpeedMapStringToEnum: { "Auto": 0, "One": 1, "Two": 2, "Three": 3, "Four": 4, "Five": 5, "0": 0, "1": 1, "2": 2, "3": 3, "4": 4, "5": 5 },

package/src/deviceata.js

@@ -1325,7 +1325,7 @@ class DeviceAta extends EventEmitter {
     async start() {
         try {
             //melcloud device
-            this.melCloudAta = new MelCloudAta(this.account, this.device, this.defaultTempsFile, this.accountFile, this.melcloud, this.accountInfo)
+            this.melCloudAta = new MelCloudAta(this.account, this.device, this.defaultTempsFile, this.accountFile, this.melcloud)
                 .on('deviceInfo', (modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion) => {
                     if (this.logDeviceInfo && this.displayDeviceInfo) {
                         this.emit('devInfo', `---- ${this.deviceTypeString}: ${this.deviceName} ----`);

package/src/deviceatw.js

@@ -1567,7 +1567,7 @@ class DeviceAtw extends EventEmitter {
     async start() {
         try {
             //melcloud device
-            this.melCloudAtw = new MelCloudAtw(this.account, this.device, this.defaultTempsFile, this.accountFile, this.melcloud, this.accountInfo)
+            this.melCloudAtw = new MelCloudAtw(this.account, this.device, this.defaultTempsFile, this.accountFile, this.melcloud)
                 .on('deviceInfo', (modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion, supportsHotWaterTank, supportsZone2) => {
                     if (this.logDeviceInfo && this.displayDeviceInfo) {
                         this.emit('devInfo', `---- ${this.deviceTypeString}: ${this.deviceName} ----`);

package/src/deviceerv.js

@@ -1121,7 +1121,7 @@ class DeviceErv extends EventEmitter {
     async start() {
         try {
             //melcloud device
-            this.melCloudErv = new MelCloudErv(this.account, this.device, this.defaultTempsFile, this.accountFile, this.melcloud, this.accountInfo)
+            this.melCloudErv = new MelCloudErv(this.account, this.device, this.defaultTempsFile, this.accountFile, this.melcloud)
                 .on('deviceInfo', (modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion) => {
                     if (this.logDeviceInfo && this.displayDeviceInfo) {
                         this.emit('devInfo', `---- ${this.deviceTypeString}: ${this.deviceName} ----`);

package/src/melcloud.js

@@ -121,7 +121,7 @@ class MelCloud extends EventEmitter {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud`);
 
         try {
-            const accountInfo = { State: false, Info: '', Account: null, UseFahrenheit: false, Headers: {} }
+            const accountInfo = { State: false, Info: '', Account: null, UseFahrenheit: false }
 
             const payload = {
                 Email: this.user,
@@ -163,6 +163,7 @@ class MelCloud extends EventEmitter {
                 'Content-Type': 'application/json'
             };
             this.emit('headers', headers);
+            
             this.headers = headers;
             this.axiosInstance = axios.create({
                 baseURL: ApiUrls.BaseURL,
@@ -174,7 +175,6 @@ class MelCloud extends EventEmitter {
             accountInfo.Info = 'Connect Success';
             accountInfo.UseFahrenheit = loginData.UseFahrenheit;
             accountInfo.Account = account;
-            accountInfo.Headers = headers;
             await this.functions.saveData(this.accountFile, accountInfo);
 
             return accountInfo

package/src/melcloudata.js

@@ -4,7 +4,7 @@ import Functions from './functions.js';
 import { ApiUrls, ApiUrlsHome, AirConditioner } from './constants.js';
 
 class MelCloudAta extends EventEmitter {
-    constructor(account, device, defaultTempsFile, accountFile, melcloud, accountInfo) {
+    constructor(account, device, defaultTempsFile, accountFile, melcloud) {
         super();
         this.accountType = account.type;
         this.logSuccess = account.log?.success;
@@ -24,7 +24,7 @@ class MelCloudAta extends EventEmitter {
 
         //set default values
         this.deviceData = {};
-        this.headers = accountInfo.Headers;
+        this.headers = melcloud.headers;
 
         //handle melcloud events
         let deviceData = null;
@@ -32,7 +32,6 @@ class MelCloudAta extends EventEmitter {
             this.headers = headers;
         }).on('devicesList', async (devicesData) => {
             try {
-                this.emit('debug', `Headers: ${JSON.stringify(melcloud.headers, null, 2)}`);
                 deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
                 if (!deviceData) return;
                 deviceData.Scenes = devicesData.Scenes ?? [];
@@ -325,7 +324,7 @@ class MelCloudAta extends EventEmitter {
                     //sens payload
                     headers['Content-Type'] = 'application/json; charset=utf-8';
                     headers.Origin = ApiUrlsHome.Origin;
-                    if (!this.logDebug) this.emit('debug', `Send data: ${JSON.stringify(payload, null, 2)}`);
+                    if (this.logDebug) this.emit('debug', `Send data: ${JSON.stringify(payload, null, 2)}`);
 
                     await axios(path, {
                         method: method,

package/src/melcloudatw.js

@@ -4,7 +4,7 @@ import Functions from './functions.js';
 import { ApiUrls, ApiUrlsHome, HeatPump } from './constants.js';
 
 class MelCloudAtw extends EventEmitter {
-    constructor(account, device, defaultTempsFile, accountFile, melcloud, accountInfo) {
+    constructor(account, device, defaultTempsFile, accountFile, melcloud) {
         super();
         this.accountType = account.type;
         this.logSuccess = account.log?.success;
@@ -24,7 +24,7 @@ class MelCloudAtw extends EventEmitter {
 
         //set default values
         this.deviceData = {};
-        this.headers = accountInfo.Headers;
+        this.headers = melcloud.headers;
 
         //handle melcloud events
         let deviceData = null;

package/src/melclouderv.js

@@ -4,7 +4,7 @@ import Functions from './functions.js';
 import { ApiUrls, ApiUrlsHome, Ventilation } from './constants.js';
 
 class MelCloudErv extends EventEmitter {
-    constructor(account, device, defaultTempsFile, accountFile, melcloud, accountInfo) {
+    constructor(account, device, defaultTempsFile, accountFile, melcloud) {
         super();
         this.accountType = account.type;
         this.logSuccess = account.log?.success;
@@ -24,7 +24,7 @@ class MelCloudErv extends EventEmitter {
 
         //set default values
         this.deviceData = {};
-        this.headers = accountInfo.Headers;
+        this.headers = melcloud.headers;
 
         //handle melcloud events
         let deviceData = null;

package/src/melcloudhome.js

@@ -202,8 +202,11 @@ class MelCloudHome extends EventEmitter {
             // Get scenes
             let scenes = [];
             try {
-                scenes = await this.checkScenesList();
-                if (this.logDebug) this.emit('debug', `Found ${scenes.length} scenes`);
+                const scenesList = await this.checkScenesList();
+                if (this.logDebug) this.emit('debug', `Found ${scenesList.length} scenes`);
+                if (scenesList.length > 0) {
+                    scenes = scenesList;
+                }
             } catch (error) {
                 if (this.logError) this.emit('error', `Get scenes error: ${error}`);
             }
@@ -270,7 +273,7 @@ class MelCloudHome extends EventEmitter {
 
         let browser;
         try {
-            const accountInfo = { State: false, Info: '', Account: {}, UseFahrenheit: false, Headers: {} };
+            const accountInfo = { State: false, Info: '', Account: {}, UseFahrenheit: false };
             let chromiumPath = await this.functions.ensureChromiumInstalled();
 
             // === Fallback to Puppeteer's built-in Chromium ===
@@ -431,7 +434,6 @@ class MelCloudHome extends EventEmitter {
 
             accountInfo.State = true;
             accountInfo.Info = 'Connect Success';
-            accountInfo.Headers = headers;
             await this.functions.saveData(this.accountFile, accountInfo);
 
             return accountInfo;