homebridge-melcloud-control 4.3.0-beta.25 → 4.3.0-beta.27

package/package.json

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

package/src/constants.js

@@ -43,7 +43,8 @@ export const ApiUrlsHome = {
         PutDeviceSettings: "https://melcloudhome.com/dashboard",
         PutScheduleEnabled: "https://melcloudhome.com/ata/deviceid/schedule",
     },
-    Origin: "https://melcloudhome.com"
+    Origin: "https://melcloudhome.com",
+    WebSocketURL: "wss://ws.melcloudhome.com/?hash="
 };
 
 export const DeviceType = [

package/src/melcloudata.js

@@ -84,10 +84,8 @@ class MelCloudAta extends EventEmitter {
         if (this.connecting || this.socketConnected) return;
 
         this.connecting = true;
-        const url = `wss://ws.melcloudhome.com/?hash=${deviceData.WsHeaders.hash}`;
-
         try {
-            const socket = new WebSocket(url, { headers: deviceData.WsHeaders.headers })
+            const socket = new WebSocket(`ApiUrlsHome.WebSocketURL${deviceData.WsHeaders.hash}`, { headers: deviceData.WsHeaders.headers })
                 .on('error', (err) => {
                     if (this.logDebug) this.emit('debug', `Socket error: ${err}`);
                 })
@@ -99,7 +97,7 @@ class MelCloudAta extends EventEmitter {
                     this.socket = socket;
                     this.socketConnected = true;
                     this.connecting = false;
-                    this.reconnectDelay = 1000;            // reset backoff
+                    this.reconnectDelay = 1000;
                     this.emit('success', `Socket Connect Success`);
 
                     // heartbeat
@@ -319,6 +317,11 @@ class MelCloudAta extends EventEmitter {
                             this.headers.Referer = ApiUrlsHome.Referers.GetPutScenes;
                             break;
                         default:
+                            if (!this.socket || this.socket.readyState !== this.socket.OPEN) {
+                                if (this.logDebug) this.emit('debug', `Socket not open, cannot send`);
+                                return false;
+                            }
+
                             if (displayType === 1 && deviceData.Device.OperationMode === 8) {
                                 deviceData.Device.SetTemperature = (deviceData.Device.DefaultCoolingSetTemperature + deviceData.Device.DefaultHeatingSetTemperature) / 2;
 
@@ -344,7 +347,14 @@ class MelCloudAta extends EventEmitter {
                             method = 'PUT';
                             path = ApiUrlsHome.PutAta.replace('deviceid', deviceData.DeviceID);
                             this.headers.Referer = ApiUrlsHome.Referers.PutDeviceSettings;
-                            break
+
+                            try {
+                                this.socket.send(JSON.stringify(payload));
+                                return true;
+                            } catch (err) {
+                                if (this.logDebug) this.emit('debug', `Socket send error: ${err}`);
+                                return false;
+                            }
                     }
 
                     this.headers['Content-Type'] = 'application/json; charset=utf-8';