homebridge-melcloud-control 4.3.0-beta.52 → 4.3.0-beta.54

package/package.json

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

package/src/melcloudata.js

@@ -30,7 +30,6 @@ class MelCloudAta extends EventEmitter {
         this.connecting = false;
         this.socketConnected = false;
         this.heartbeat = null;
-        this.reconnectDelay = 1000;
 
         //lock flag
         this.locks = false;
@@ -79,9 +78,9 @@ class MelCloudAta extends EventEmitter {
 
             this.headers = devicesData.Headers;
             const deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
+            deviceData.Scenes = devicesData.Scenes ?? [];
 
             if (this.accountType === 'melcloudhome') {
-                deviceData.Scenes = devicesData.Scenes ?? [];
                 deviceData.Device.OperationMode = AirConditioner.OperationModeMapStringToEnum[deviceData.Device.OperationMode] ?? deviceData.Device.OperationMode;
                 deviceData.Device.ActualFanSpeed = AirConditioner.FanSpeedMapStringToEnum[deviceData.Device.ActualFanSpeed] ?? deviceData.Device.ActualFanSpeed;
                 deviceData.Device.SetFanSpeed = AirConditioner.FanSpeedMapStringToEnum[deviceData.Device.SetFanSpeed] ?? deviceData.Device.SetFanSpeed;
@@ -96,9 +95,9 @@ class MelCloudAta extends EventEmitter {
                 if (!this.connecting && !this.socketConnected) {
                     this.connecting = true;
 
-                    const url = `${ApiUrlsHome.WebSocketURL}${devicesData.WsHeaders.hash}`;
+                    const url = `${ApiUrlsHome.WebSocketURL}${devicesData.WebSocketOptions.Hash}`;
                     try {
-                        const socket = new WebSocket(url, { headers: devicesData.WsHeaders.headers })
+                        const socket = new WebSocket(url, { headers: devicesData.WebSocketOptions.Headers })
                             .on('error', (error) => {
                                 if (this.logError) this.emit('error', `Socket error: ${error}`);
                                 socket.close();
@@ -140,13 +139,15 @@ class MelCloudAta extends EventEmitter {
                                         const messageType = parsedMessage[0].messageType;
                                         switch (messageType) {
                                             case 'unitStateChanged':
-                                                const settings = Object.fromEntries(messageData.settings.map(({ name, value }) => {
-                                                    let parsedValue = value;
-                                                    if (value === "True") parsedValue = true;
-                                                    else if (value === "False") parsedValue = false;
-                                                    else if (!isNaN(value) && value !== "") parsedValue = Number(value);
-                                                    return [name, parsedValue];
-                                                }));
+                                                const settings = Object.fromEntries(
+                                                    messageData.settings.map(({ name, value }) => {
+                                                        let parsedValue = value;
+                                                        if (value === "True") parsedValue = true;
+                                                        else if (value === "False") parsedValue = false;
+                                                        else if (!isNaN(value) && value !== "") parsedValue = Number(value);
+                                                        return [name, parsedValue];
+                                                    })
+                                                );
                                                 Object.assign(deviceData.Device, settings);
                                                 updateDeviceState = true;
                                                 break;

package/src/melcloudhome.js

@@ -23,7 +23,7 @@ class MelCloudHome extends EventEmitter {
         this.buildingsFile = buildingsFile;
         this.devicesFile = devicesFile;
         this.headers = {};
-        this.wsHeaders = {};
+        this.webSocketOptions = {};
 
         this.functions = new Functions(this.logWarn, this.logError, this.logDebug)
             .on('warn', warn => this.emit('warn', warn))
@@ -209,7 +209,7 @@ class MelCloudHome extends EventEmitter {
             devicesList.Devices = devices;
             devicesList.Scenes = scenes;
             devicesList.Headers = this.headers;
-            devicesList.WsHeaders = this.wsHeaders;
+            devicesList.WebSocketOptions = this.webSocketOptions;
 
             await this.functions.saveData(this.devicesFile, devicesList);
             if (this.logDebug) this.emit('debug', `${devicesCount} devices saved`);
@@ -374,9 +374,9 @@ class MelCloudHome extends EventEmitter {
                 headers: headers
             })
 
-            this.wsHeaders = {
-                hash: hash,
-                headers: {
+            this.webSocketOptions = {
+                Hash: hash,
+                Headers: {
                     'Origin': ApiUrlsHome.BaseURL,
                     'Pragma': 'no-cache',
                     'Cache-Control': 'no-cache'