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

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.6",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/melcloudata.js

@@ -73,34 +73,34 @@ 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';
+                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',
-                        '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}`);
+                    const ws = new WebSocket(`wss://ws.melcloudhome.com/?hash=${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('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';

package/src/melcloudhome.js

@@ -273,18 +273,6 @@ 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);
 
@@ -325,6 +313,17 @@ 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();