homebridge-melcloud-control 4.3.0-beta.4 → 4.3.0-beta.40

package/index.js

@@ -194,7 +194,7 @@ class MelCloudPlatform {
 
 										//start impulse generators\
 										await configuredDevice.startStopImpulseGenerator(true, [{ name: 'checkState', sampling: deviceRefreshInterval }]);
-										const timmers = accountType === 'melcloudhome' ? [{ name: 'connect', sampling: 3000000 }, { name: 'checkDevicesList', sampling: 3000 }] : [{ name: 'checkDevicesList', sampling: refreshInterval }];
+										const timmers = accountType === 'melcloudhome' ? [{ name: 'connect', sampling: 3600000 }, { name: 'checkDevicesList', sampling: 3000 }] : [{ name: 'checkDevicesList', sampling: refreshInterval }];
 										await melCloud.impulseGenerator.state(true, timmers, false);
 
 										//stop impulse generator

package/package.json

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

package/src/constants.js

@@ -12,6 +12,7 @@ export const ApiUrls = {
     SetAta: "/Device/SetAta",
     SetAtw: "/Device/SetAtw",
     SetErv: "/Device/SetErv",
+    GetRefreshUnit: "/Device/RequestRefresh?id=deviceid",
     UpdateApplicationOptions: "/User/UpdateApplicationOptions",
     HolidayModeUpdate: "/HolidayMode/Update",
     EnergyCostReport: "/EnergyCost/Report",
@@ -42,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/deviceata.js

@@ -1079,7 +1079,7 @@ class DeviceAta extends EventEmitter {
                     //control
                     if (button.displayType > 3) {
                         if (this.logDebug) this.emit('debug', `Prepare button control ${name} service`);
-                        const buttonControlService = new serviceType(serviceName, `buttonControlService${deviceId} ${i}`);
+                        const buttonControlService = new Service.Switch(serviceName, `buttonControlService${deviceId} ${i}`);
                         buttonControlService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                         buttonControlService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                         buttonControlService.getCharacteristic(Characteristic.On)

package/src/deviceatw.js

@@ -1346,7 +1346,7 @@ class DeviceAtw extends EventEmitter {
                     //control
                     if (button.displayType > 3) {
                         if (this.logDebug) this.emit('debug', `Prepare button control ${name} service`);
-                        const buttonControlService = new serviceType(serviceName1, `buttonControlService${deviceId} ${i}`);
+                        const buttonControlService = new Service.Switch(serviceName1, `buttonControlService${deviceId} ${i}`);
                         buttonControlService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                         buttonControlService.setCharacteristic(Characteristic.ConfiguredName, serviceName1);
                         buttonControlService.getCharacteristic(Characteristic.On)

package/src/deviceerv.js

@@ -1006,7 +1006,7 @@ class DeviceErv extends EventEmitter {
                     //control
                     if (button.displayType > 3) {
                         if (this.logDebug) this.emit('debug', `Prepare button control ${name} service`);
-                        const buttonControlService = new serviceType(serviceName1, `buttonControlService${deviceId} ${i}`);
+                        const buttonControlService = new Service.Switch(serviceName1, `buttonControlService${deviceId} ${i}`);
                         buttonControlService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                         buttonControlService.setCharacteristic(Characteristic.ConfiguredName, serviceName1);
                         buttonControlService.getCharacteristic(Characteristic.On)

package/src/melcloudata.js

@@ -26,7 +26,10 @@ class MelCloudAta extends EventEmitter {
         //set default values
         this.deviceData = {};
         this.headers = {};
-        this.start = true;
+        this.socket = null;
+        this.connecting = false;
+        this.socketConnected = false;
+        this.reconnectDelay = 1000;
 
         //lock flag
         this.locks = false;
@@ -52,6 +55,33 @@ class MelCloudAta extends EventEmitter {
         }
     }
 
+    cleanupSocket() {
+        if (this.heartbeat) {
+            clearInterval(this.heartbeat);
+            this.heartbeat = null;
+        }
+
+        if (this.socket) {
+            try { this.socket.close(); } catch { }
+            this.socket = null;
+        }
+
+        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 {
 
@@ -67,40 +97,84 @@ class MelCloudAta extends EventEmitter {
                 deviceData.Device.ActualFanSpeed = AirConditioner.FanSpeedMapStringToEnum[deviceData.Device.ActualFanSpeed] ?? deviceData.Device.ActualFanSpeed;
                 deviceData.Device.SetFanSpeed = AirConditioner.FanSpeedMapStringToEnum[deviceData.Device.SetFanSpeed] ?? deviceData.Device.SetFanSpeed;
                 deviceData.Device.VaneVerticalDirection = AirConditioner.VaneVerticalDirectionMapStringToEnum[deviceData.Device.VaneVerticalDirection] ?? deviceData.Device.VaneVerticalDirection;
-                deviceData.Device.VaneHorizontalDirection = AirConditioner.VaneHorizontalDirectionMapStringToEnum[deviceData.Device.VaneHorizontalDirection] ?? deviceData.Device.VaneHorizontalDirection;
+                deviceData.Device.VaneHorizontalDirection = AirConditioner.VaneHorizontalDirectionMapStringToEnum[deviceData.Device.VaneHorizontalDirection] ?? deviceData.Device.VaneHorizontalDirection
 
                 //read default temps
                 const temps = await this.functions.readData(this.defaultTempsFile, true);
                 deviceData.Device.DefaultHeatingSetTemperature = temps?.defaultHeatingSetTemperature ?? 20;
                 deviceData.Device.DefaultCoolingSetTemperature = temps?.defaultCoolingSetTemperature ?? 24;
-            }
-            if (this.logDebug) this.emit('debug', `Device Data: ${JSON.stringify(deviceData, null, 2)}`);
 
-            if (this.start) {
-                const hash = '2db32d6f-c19c-4b1f-a0dd-1915420a5152';
+                if (!this.connecting && !this.socketConnected) {
+                    this.connecting = true;
+
+                    const url = `${ApiUrlsHome.WebSocketURL}${devicesData.WsHeaders.hash}`;
+                    try {
+                        const socket = new WebSocket(url, { headers: devicesData.WsHeaders.headers })
+                            .on('error', (error) => {
+                                if (this.logError) this.emit('error', `Socket error: ${error}`);
+                            })
+                            .on('close', () => {
+                                if (this.logDebug) this.emit('debug', `Socket closed`);
+                                this.reconnect();
+                            })
+                            .on('open', () => {
+                                this.socket = socket;
+                                this.socketConnected = true;
+                                this.connecting = false;
+                                this.emit('success', `Socket Connect Success`);
+
+                                // heartbeat
+                                this.heartbeat = setInterval(() => {
+                                    if (socket.readyState === socket.OPEN) {
+                                        if (!this.logDebug) this.emit('warn', `Socket send heartbeat`);
+                                        socket.ping();
+                                    }
+                                }, 30000);
+                            })
+                            .on('pong', () => {
+                                if (!this.logDebug) this.emit('warn', `Socket received heartbeat`);
+                            })
+                            .on('message', (message) => {
+                                const parsedMessage = JSON.parse(message);
+                                if (!this.logDebug) this.emit('warn', `Incoming message: ${JSON.stringify(parsedMessage, null, 2)}`);
+
+                                const messageData = parsedMessage?.[0]?.Data;
+                                const unitId = messageData?.id;
+
+                                switch (unitId) {
+                                    case this.deviceId:
+                                        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];
+                                                }));
+
+                                                Object.assign(deviceData.Device, settings);
 
-                const ws = new WebSocket(`wss://ws.melcloudhome.com/?hash=${hash}`, {
-                    headers: {
-                        'Origin': 'https://melcloudhome.com',
-                        'Pragma': 'no-cache',
-                        'Cache-Control': 'no-cache'
+                                                this.emit('deviceState', deviceData);
+                                                break;
+                                            case 'unitWiFiChanged':
+                                                const state = Object.fromEntries(messageData.settings.map(s => [s.name, s.value]));
+                                                Object.assign(deviceData.Device, state);
+
+                                                this.emit('deviceState', deviceData);
+                                                break;
+                                        }
+                                        break;
+                                }
+                            });
+                    } catch (error) {
+                        if (this.logError) this.emit('error', `Socket connection failed: ${error}`);
+                        this.reconnect();
                     }
-                });
-                ws.on('open', () => {
-                    if (!this.logDebug) this.emit('warn', `Connected to MelCloudHome WebSocket`);
-                    this.start = false;
-                })
-                    .on('message', (data) => {
-                        if (!this.logDebug) this.emit('warn', `Incoming message:', ${data.toString()}`);
-                    })
-                    .on('close', () => {
-                        if (!this.logDebug) this.emit('warn', `Connection closed`);
-                    })
-                    .on('error', (error) => {
-                        if (!this.logDebug) this.emit('warn', `Connected error: ${error}`);
-                    });
+                }
             }
-
+            if (this.logDebug) this.emit('debug', `Device Data: ${JSON.stringify(deviceData, null, 2)}`);
 
             //device
             const serialNumber = deviceData.SerialNumber || '4.0.0';
@@ -163,6 +237,7 @@ class MelCloudAta extends EventEmitter {
             let method = null
             let payload = {};
             let path = '';
+            let updateState = true;
             switch (accountType) {
                 case "melcloud":
                     switch (flag) {
@@ -207,7 +282,7 @@ class MelCloudAta extends EventEmitter {
                         headers: this.headers,
                         data: payload
                     });
-                    this.updateData(deviceData);
+                    this.updateData(deviceData, updateState);
                     return true;
                 case "melcloudhome":
                     switch (flag) {
@@ -281,7 +356,8 @@ class MelCloudAta extends EventEmitter {
                             method = 'PUT';
                             path = ApiUrlsHome.PutAta.replace('deviceid', deviceData.DeviceID);
                             this.headers.Referer = ApiUrlsHome.Referers.PutDeviceSettings;
-                            break
+                            updateState = false;
+                            break;
                     }
 
                     this.headers['Content-Type'] = 'application/json; charset=utf-8';
@@ -295,7 +371,7 @@ class MelCloudAta extends EventEmitter {
                         data: payload
                     });
 
-                    this.updateData(deviceData);
+                    this.updateData(deviceData, updateState);
                     return true;
                 default:
                     return;
@@ -306,9 +382,9 @@ class MelCloudAta extends EventEmitter {
         }
     }
 
-    updateData(deviceData) {
+    updateData(deviceData, updateState = true) {
         this.locks = true;
-        this.emit('deviceState', deviceData);
+        if (updateState) this.emit('deviceState', deviceData);
 
         setTimeout(() => {
             this.locks = false

package/src/melcloudhome.js

@@ -23,6 +23,7 @@ class MelCloudHome extends EventEmitter {
         this.buildingsFile = buildingsFile;
         this.devicesFile = devicesFile;
         this.headers = {};
+        this.wsHeaders = {};
 
         this.functions = new Functions(this.logWarn, this.logError, this.logDebug)
             .on('warn', warn => this.emit('warn', warn))
@@ -208,6 +209,7 @@ class MelCloudHome extends EventEmitter {
             devicesList.Devices = devices;
             devicesList.Scenes = scenes;
             devicesList.Headers = this.headers;
+            devicesList.WsHeaders = this.wsHeaders;
 
             await this.functions.saveData(this.devicesFile, devicesList);
             if (this.logDebug) this.emit('debug', `${devicesCount} devices saved`);
@@ -273,21 +275,25 @@ class MelCloudHome extends EventEmitter {
             const page = await browser.newPage();
             page.on('error', error => this.emit('error', `Page crashed: ${error.message}`));
             page.on('pageerror', error => this.emit('error', `Browser error: ${error.message}`));
-            // Zmienna na znaleziony hash
-            let melcloudHash = null;
-
-            // Nasłuchuj WebSocketów
-            page.on('request', req => {
-                if (req.url().startsWith('wss://ws.melcloudhome.com/?hash=')) {
-                    const url = req.url();
-                    const params = new URL(url).searchParams;
-                    melcloudHash = params.get('hash');
-                    if (!this.logDebug) this.emit('warn', `FOUND HASH: ${melcloudHash}`);
-                }
-            });
             page.setDefaultTimeout(GLOBAL_TIMEOUT);
             page.setDefaultNavigationTimeout(GLOBAL_TIMEOUT);
 
+            // === CDP session ===
+            let hash = null;
+            const client = await page.createCDPSession();
+            await client.send('Network.enable')
+            client.on('Network.webSocketCreated', ({ url }) => {
+                try {
+                    if (url.startsWith('wss://ws.melcloudhome.com/?hash=')) {
+                        const params = new URL(url).searchParams;
+                        hash = params.get('hash');
+                        if (this.logDebug) this.emit('debug', `MelCloudHome WS hash detected: ${melcloudHash}`);
+                    }
+                } catch (err) {
+                    this.emit('error', `CDP WebSocketCreated handler error: ${err.message}`);
+                }
+            });
+
             try {
                 await page.goto(ApiUrlsHome.BaseURL, { waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT });
             } catch (error) {
@@ -368,6 +374,16 @@ class MelCloudHome extends EventEmitter {
                 headers: headers
             })
 
+            this.wsHeaders = {
+                hash: hash,
+                headers: {
+                    'Origin': ApiUrlsHome.BaseURL,
+                    'Pragma': 'no-cache',
+                    'Cache-Control': 'no-cache'
+                }
+            };
+
+
             accountInfo.State = true;
             accountInfo.Info = 'Connect to MELCloud Home Success';
             await this.functions.saveData(this.accountFile, accountInfo);