homebridge-melcloud-control 4.3.0-beta.51 → 4.3.0-beta.53

package/package.json

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

package/src/melcloudata.js

@@ -29,7 +29,7 @@ class MelCloudAta extends EventEmitter {
         this.socket = null;
         this.connecting = false;
         this.socketConnected = false;
-        this.reconnectDelay = 1000;
+        this.heartbeat = null;
 
         //lock flag
         this.locks = false;
@@ -69,19 +69,6 @@ class MelCloudAta extends EventEmitter {
         this.socketConnected = false;
     }
 
-    reconnect() {
-        this.cleanupSocket();
-
-        const delay = Math.min(this.reconnectDelay, 30000); // max 30s
-        if (this.logDebug) this.emit('debug', `Reconnect in ${delay}ms`);
-
-        setTimeout(() => {
-            this.reconnectDelay *= 2;
-            this.reconnectDelay = Math.max(1000, this.reconnectDelay);
-            this.connectSocket(deviceData);
-        }, delay);
-    };
-
     async checkState() {
         try {
 
@@ -91,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;
@@ -113,10 +100,11 @@ class MelCloudAta extends EventEmitter {
                         const socket = new WebSocket(url, { headers: devicesData.WsHeaders.headers })
                             .on('error', (error) => {
                                 if (this.logError) this.emit('error', `Socket error: ${error}`);
+                                socket.close();
                             })
                             .on('close', () => {
                                 if (this.logDebug) this.emit('debug', `Socket closed`);
-                                this.reconnect();
+                                this.cleanupSocket();
                             })
                             .on('open', () => {
                                 this.socket = socket;
@@ -151,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;
@@ -175,14 +165,11 @@ class MelCloudAta extends EventEmitter {
                                         return;
                                 }
 
-                                if (updateDeviceState) {
-                                    this.deviceData = deviceData;
-                                    this.emit('deviceState', deviceData);
-                                }
+                                if (updateDeviceState) this.emit('deviceState', deviceData);
                             });
                     } catch (error) {
                         if (this.logError) this.emit('error', `Socket connection failed: ${error}`);
-                        this.reconnect();
+                        this.cleanupSocket();
                     }
                 }
             }