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

package/package.json

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

package/src/melcloudhome.js

@@ -95,7 +95,7 @@ class MelCloudHome extends EventEmitter {
             'Cache-Control': 'no-cache',
         };
 
-        if (this.logDebug) this.emit('debug', `Connecting WebSocket: ${url.slice(0, 60)}...`);
+        if (!this.logDebug) this.emit('debug', `Connecting WebSocket: ${url.slice(0, 60)}...`);
 
         try {
             const ws = new WebSocket(url, { headers });
@@ -107,7 +107,7 @@ class MelCloudHome extends EventEmitter {
             });
 
             ws.on('close', () => {
-                if (this.logDebug) this.emit('debug', 'Web socket closed');
+                if (!this.logDebug) this.emit('debug', 'Web socket closed');
                 this.cleanupSocket();
                 this.scheduleReconnect();
             });
@@ -120,7 +120,7 @@ class MelCloudHome extends EventEmitter {
                     clearTimeout(this.reconnectTimer);
                     this.reconnectTimer = null;
                 }
-                if (this.logDebug) this.emit('debug', 'Web Socket Connected');
+                if (!this.logDebug) this.emit('debug', 'Web Socket Connected');
 
                 // Heartbeat co 30s
                 this.heartbeat = setInterval(() => {
@@ -132,13 +132,13 @@ class MelCloudHome extends EventEmitter {
             });
 
             ws.on('pong', () => {
-                if (this.logDebug) this.emit('debug', 'Web socket received heartbeat');
+                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 incoming message: ${JSON.stringify(parsedMessage, null, 2)}`);
 
                     // Format: array, pierwszy element ma Data.id
                     const messageData = parsedMessage?.[0]?.Data;
@@ -420,21 +420,20 @@ class MelCloudHome extends EventEmitter {
 
     // ── Buduje connectInfo po udanym token exchange ───────────────────────────
 
-    buildConnectInfo(connectInfo, exchangeRes) {
+    async buildConnectInfo(connectInfo, exchangeRes) {
         if (exchangeRes) {
             // ensureClient() tworzy client jeśli nie istnieje.
             // attachTokenInterceptors() dodaje interceptory tylko przy pierwszym wywołaniu.
             this.ensureClient();
             this.attachTokenInterceptors();
             this.emit('client', this.client);
+            await this.connectSocket().catch(err => {
+                if (this.logError) this.emit('error', `Initial WebSocket connect failed: ${err.message}`);
+            });
         }
 
-        this.connectSocket().catch(err => {
-            if (this.logError) this.emit('error', `Initial WebSocket connect failed: ${err.message}`);
-        });
-
         connectInfo.State = exchangeRes;
-        connectInfo.Status = `Connect Success${this.socketConnected ? ', Web Socket Connected' : ''}`;
+        connectInfo.Status = exchangeRes ? `Connect Success ${this.socketConnected ?', Web Socket Connected' : ''}` : 'Connect Failed';
 
         return connectInfo;
     }
@@ -640,7 +639,7 @@ class MelCloudHome extends EventEmitter {
             if (authCode) {
                 if (this.logDebug) this.emit('debug', 'Re-login with existing session (skipping credentials)');
                 const exchangeRes = await this.exchangeCodeForTokens(client, authCode, codeVerifier);
-                return this.buildConnectInfo(connectInfo, exchangeRes);
+                return await this.buildConnectInfo(connectInfo, exchangeRes);
             }
 
             // ── Step 3: Wyślij dane logowania do Cognito ──────────────────────
@@ -773,7 +772,7 @@ class MelCloudHome extends EventEmitter {
 
             // ── Step 6: Wymień kod na tokeny ──────────────────────────────────
             const exchangeRes = await this.exchangeCodeForTokens(client, authCode, codeVerifier);
-            return this.buildConnectInfo(connectInfo, exchangeRes);
+            return await this.buildConnectInfo(connectInfo, exchangeRes);
 
         } catch (error) {
             throw new Error(`Connect error: ${error.message}`);