homebridge-melcloud-control 4.3.0-beta.22 → 4.3.0-beta.24

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: '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.22",
+  "version": "4.3.0-beta.24",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/melcloudata.js

@@ -26,7 +26,6 @@ class MelCloudAta extends EventEmitter {
         //set default values
         this.deviceData = {};
         this.headers = {};
-        this.hash = null;
         this.socket = null;
         this.socketConnected = false;
 
@@ -71,7 +70,6 @@ class MelCloudAta extends EventEmitter {
             if (!devicesData) return;
 
             this.headers = devicesData.Headers;
-            this.hash = devicesData.Hash;
             const deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
             if (this.accountType === 'melcloudhome') {
                 deviceData.Scenes = devicesData.Scenes ?? [];
@@ -82,13 +80,7 @@ class MelCloudAta extends EventEmitter {
                 deviceData.Device.VaneHorizontalDirection = AirConditioner.VaneHorizontalDirectionMapStringToEnum[deviceData.Device.VaneHorizontalDirection] ?? deviceData.Device.VaneHorizontalDirection;
 
                 if (!this.socketConnected) {
-                    const socket = new WebSocket(`wss://ws.melcloudhome.com/?hash=${devicesData.Hash}`, {
-                        headers: {
-                            'Origin': ApiUrlsHome.BaseURL,
-                            'Pragma': 'no-cache',
-                            'Cache-Control': 'no-cache'
-                        }
-                    })
+                    const socket = new WebSocket(`wss://ws.melcloudhome.com/?hash=${devicesData.WsHeaders.hash}`, { headers: devicesData.WsHeaders.headers })
                         .on('error', (error) => {
                             if (this.logDebug) this.emit('debug', `Socket error: ${error}`);
                             socket.close();
@@ -116,7 +108,6 @@ class MelCloudAta extends EventEmitter {
                         })
                         .on('message', (message) => {
                             const parsedMessage = JSON.parse(message);
-                            const messageType = parsedMessage[0].messageType;
                             const messageData = parsedMessage[0].Data;
                             const unitId = messageData.id;
                             const unitType = messageData.unitType;
@@ -125,12 +116,23 @@ class MelCloudAta extends EventEmitter {
 
                             switch (unitId) {
                                 case this.deviceId:
-                                    const settings = Object.fromEntries(messageData.settings.map(s => [s.name, s.value]));
-                                    if (!this.logDebug) this.emit('warn', `Settings:', ${settings}`);
-                                    Object.assign(deviceData.Device, settings);
-
-                                    //emit state
-                                    this.emit('deviceState', deviceData);
+                                    const messageType = parsedMessage[0].messageType;
+                                    switch (messageType) {
+                                        case 'unitStateChanged':
+                                            const settings = Object.fromEntries(messageData.settings.map(s => [s.name, s.value]));
+                                            Object.assign(deviceData.Device, settings);
+
+                                            //emit state
+                                            this.emit('deviceState', deviceData);
+                                            break;
+                                        case 'unitWiFiChanged':
+                                            const state = Object.fromEntries(messageData.settings.map(s => [s.name, s.value]));
+                                            Object.assign(deviceData.Device, state);
+
+                                            //emit state
+                                            this.emit('deviceState', deviceData);
+                                            break;
+                                    }
                                     break;
                             }
                         });

package/src/melcloudhome.js

@@ -23,7 +23,7 @@ class MelCloudHome extends EventEmitter {
         this.buildingsFile = buildingsFile;
         this.devicesFile = devicesFile;
         this.headers = {};
-        this.hash = null;
+        this.wsHeaders = {};
 
         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.Hash = this.hash;
+            devicesList.WsHeaders = this.wsHeaders;
 
             await this.functions.saveData(this.devicesFile, devicesList);
             if (this.logDebug) this.emit('debug', `${devicesCount} devices saved`);
@@ -279,13 +279,14 @@ class MelCloudHome extends EventEmitter {
             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;
-                        this.hash = params.get('hash');
+                        hash = params.get('hash');
                         if (this.logDebug) this.emit('debug', `MelCloudHome WS hash detected: ${melcloudHash}`);
                     }
                 } catch (err) {
@@ -373,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);