homebridge-melcloud-control 4.3.0-beta.6 → 4.3.0-beta.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.3.0-beta.6",
+  "version": "4.3.0-beta.8",
   "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 ?? [];
@@ -75,9 +77,7 @@ class MelCloudAta extends EventEmitter {
                 deviceData.Device.DefaultCoolingSetTemperature = temps?.defaultCoolingSetTemperature ?? 24;
 
                 if (this.start) {
-                    const hash = '2db32d6f-c19c-4b1f-a0dd-1915420a5152';
-
-                    const ws = new WebSocket(`wss://ws.melcloudhome.com/?hash=${hash}`, {
+                    const ws = new WebSocket(`wss://ws.melcloudhome.com/?hash=${this.hash}`, {
                         headers: {
                             'Origin': 'https://melcloudhome.com',
                             'Pragma': 'no-cache',

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) {
@@ -313,17 +330,6 @@ class MelCloudHome extends EventEmitter {
             }
             await Promise.race([Promise.all([submitButton.click(), page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT / 3 })]), new Promise(r => setTimeout(r, GLOBAL_TIMEOUT / 3))]);
 
-            // Nasłuchuj WebSocketów
-            let melcloudHash = null;
-            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}`);
-                }
-            });
-
             // Extract cookies
             let c1 = null, c2 = null;
             const start = Date.now();