homebridge-melcloud-control 4.3.0-beta.0 → 4.3.0-beta.10

package/package.json

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

package/src/melcloudata.js

@@ -26,6 +26,7 @@ class MelCloudAta extends EventEmitter {
         //set default values
         this.deviceData = {};
         this.headers = {};
+        this.hash = null;
         this.start = true;
 
         //lock flag
@@ -60,6 +61,7 @@ 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 ?? [];
@@ -73,35 +75,45 @@ class MelCloudAta extends EventEmitter {
                 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';
 
-                const ws = new WebSocket(`wss://ws.melcloudhome.com/?hash=${hash}`, {
-                    headers: {
-                        'Origin': 'https://melcloudhome.com',
-                        'User-Agent': this.headers['User-Agent'],
-                        'Pragma': 'no-cache',
-                        'Cache-Control': 'no-cache'
-                    }
-                });
-                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.start) {
+                    const ws = new WebSocket(`wss://ws.melcloudhome.com/?hash=${devicesData.Hash}`, {
+                        headers: {
+                            'Origin': 'https://melcloudhome.com',
+                            'Pragma': 'no-cache',
+                            'Cache-Control': 'no-cache'
+                        }
                     });
-            }
+                    ws.on('open', () => {
+                        if (!this.logDebug) this.emit('warn', `Connected to MelCloudHome WebSocket`);
+                        this.start = false;
+                    })
+                        .on('close', () => {
+                            if (!this.logDebug) this.emit('warn', `Connection closed`);
+                        })
+                        .on('error', (error) => {
+                            if (!this.logDebug) this.emit('warn', `Connected error: ${error}`);
+                        })
+                        .on('message', (message) => {
+                            if (!this.logDebug) this.emit('warn', `Incoming message:', ${JSON.stringify(message.toString(), null, 2)}`);
+
+                            const messageType = message[0].messageType;
+                            const messageData = message[0].Data;
+                            switch (messageType) {
+                                case 'unitStateChanged':
+                                    const unitId = messageData.id;
+                                    const unitType = messageData.unitType;
+                                    const settings = messageData.settings[0];
+                                    const name = settings.name;
+                                    const value = settings.value;
+                                    if (this.deviceId === unitId) deviceData.Device[name] = value;
+                                    break;
+                            }
+                        });
+                }
 
+            }
+            if (this.logDebug) this.emit('debug', `Device Data: ${JSON.stringify(deviceData, null, 2)}`);
 
             //device
             const serialNumber = deviceData.SerialNumber || '4.0.0';

package/src/melcloudhome.js

@@ -23,6 +23,7 @@ class MelCloudHome extends EventEmitter {
         this.buildingsFile = buildingsFile;
         this.devicesFile = devicesFile;
         this.headers = {};
+        this.hash = null;
 
         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.Hash = this.hash;
 
             await this.functions.saveData(this.devicesFile, devicesList);
             if (this.logDebug) this.emit('debug', `${devicesCount} devices saved`);
@@ -276,6 +278,21 @@ class MelCloudHome extends EventEmitter {
             page.setDefaultTimeout(GLOBAL_TIMEOUT);
             page.setDefaultNavigationTimeout(GLOBAL_TIMEOUT);
 
+            // === CDP session (modern API) ===
+            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');
+                        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) {