homebridge-melcloud-control 4.9.2-beta.5 → 4.9.2-beta.6

package/package.json

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

package/src/melcloudhome.js

@@ -85,7 +85,7 @@ class MelCloudHome extends EventEmitter {
             if (this.logError) this.emit('error', `connectSocket: cannot get WS hash: ${err.message}`);
             this.connecting = false;
             this.scheduleReconnect();
-            return;
+            return false;
         }
 
         const url = `${ApiUrls.Home.WebSocket}${hash}`;
@@ -104,51 +104,47 @@ class MelCloudHome extends EventEmitter {
             ws.on('error', (error) => {
                 if (this.logError) this.emit('error', `Web socket error: ${error.message}`);
                 try { ws.close(); } catch { /* ignoruj */ }
-            });
-
-            ws.on('close', () => {
-                if (!this.logDebug) this.emit('debug', 'Web socket closed');
-                this.cleanupSocket();
-                this.scheduleReconnect();
-            });
-
-            ws.on('open', () => {
-                this.socketConnected = true;
-                this.connecting = false;
-                this.reconnectDelay = 5_000; // reset backoff po udanym połączeniu
-                if (this.reconnectTimer) {
-                    clearTimeout(this.reconnectTimer);
-                    this.reconnectTimer = null;
-                }
-                if (!this.logDebug) this.emit('debug', 'Web Socket Connected');
-
-                // Heartbeat co 30s
-                this.heartbeat = setInterval(() => {
-                    if (ws.readyState === WebSocket.OPEN) {
-                        if (this.logDebug) this.emit('debug', 'Web socket send heartbeat');
-                        ws.ping();
+            })
+                .on('close', () => {
+                    if (!this.logDebug) this.emit('debug', 'Web socket closed');
+                    this.cleanupSocket();
+                    this.scheduleReconnect();
+                })
+                .on('open', () => {
+                    this.socketConnected = true;
+                    this.connecting = false;
+                    this.reconnectDelay = 5_000; // reset backoff po udanym połączeniu
+                    if (this.reconnectTimer) {
+                        clearTimeout(this.reconnectTimer);
+                        this.reconnectTimer = null;
                     }
-                }, 30_000);
-            });
-
-            ws.on('pong', () => {
-                if (!this.logDebug) this.emit('debug', 'Web socket received heartbeat');
-            });
-
-            ws.on('message', (message) => {
-                try {
-                    const parsedMessage = JSON.parse(message);
-                    if (!this.logDebug) this.emit('debug', `Web socket incoming message: ${JSON.stringify(parsedMessage, null, 2)}`);
+                    if (!this.logDebug) this.emit('debug', 'Web Socket Connected');
+
+                    // Heartbeat co 30s
+                    this.heartbeat = setInterval(() => {
+                        if (ws.readyState === WebSocket.OPEN) {
+                            if (this.logDebug) this.emit('debug', 'Web socket send heartbeat');
+                            ws.ping();
+                        }
+                    }, 30_000);
+                })
+                .on('pong', () => {
+                    if (!this.logDebug) this.emit('debug', 'Web socket received heartbeat');
+                })
+                .on('message', (message) => {
+                    try {
+                        const parsedMessage = JSON.parse(message);
+                        if (!this.logDebug) this.emit('debug', `Web socket incoming message: ${JSON.stringify(parsedMessage, null, 2)}`);
 
-                    // Format: array, pierwszy element ma Data.id
-                    const messageData = parsedMessage?.[0]?.Data;
-                    if (!messageData || parsedMessage.message === 'Forbidden') return;
+                        // Format: array, pierwszy element ma Data.id
+                        const messageData = parsedMessage?.[0]?.Data;
+                        if (!messageData || parsedMessage.message === 'Forbidden') return;
 
-                    this.emit(messageData.id, 'ws', parsedMessage[0]);
-                } catch (err) {
-                    if (this.logError) this.emit('error', `Web socket message parse error: ${err.message}`);
-                }
-            });
+                        this.emit(messageData.id, 'ws', parsedMessage[0]);
+                    } catch (err) {
+                        if (this.logError) this.emit('error', `Web socket message parse error: ${err.message}`);
+                    }
+                });
         } catch (error) {
             if (this.logError) this.emit('error', `Web socket connection failed: ${error.message}`);
             this.cleanupSocket();
@@ -427,13 +423,14 @@ class MelCloudHome extends EventEmitter {
             this.ensureClient();
             this.attachTokenInterceptors();
             this.emit('client', this.client);
-            await this.connectSocket().catch(err => {
+            const webSocket = await this.connectSocket().catch(err => {
                 if (this.logError) this.emit('error', `Initial WebSocket connect failed: ${err.message}`);
             });
+
+            connectInfo.Status = `Connect Success ${webSocket ? ', Web Socket Connected' : ''}`;
         }
 
         connectInfo.State = exchangeRes;
-        connectInfo.Status = exchangeRes ? `Connect Success ${this.socketConnected ?', Web Socket Connected' : ''}` : 'Connect Failed';
 
         return connectInfo;
     }