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

package/index.js

@@ -112,6 +112,7 @@ class MelCloudPlatform {
 								}
 								if (logLevel.debug) log.info(melCloudDevicesData.Status);
 
+
 								//filter configured devices
 								const devicesIds = (melCloudDevicesData.Devices ?? []).map(d => String(d.DeviceID));
 								const ataDevices = (account.ataDevices || []).filter(d => (d.displayType ?? 0) > 0 && devicesIds.includes(d.id));

package/package.json

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

package/src/melcloudhome.js

@@ -40,6 +40,15 @@ class MelCloudHome extends EventEmitter {
         // Flaga zapobiegająca wielokrotnemu dodaniu interceptorów
         this.interceptorsAttached = false;
 
+        // WebSocket state
+        this.socket = null;
+        this.socketConnected = false;
+        this.connecting = false;
+        this.heartbeat = null;
+        this.reconnectTimer = null;
+        this.reconnectDelay = 5_000;  // ms, rośnie wykładniczo do reconnectDelayMax
+        this.reconnectDelayMax = 300_000; // 5 minut
+
         if (pluginStart) {
             this.impulseGenerator = new ImpulseGenerator()
                 .on('checkDevicesList', async () => {
@@ -53,44 +62,6 @@ class MelCloudHome extends EventEmitter {
 
     // ── WebSocket ─────────────────────────────────────────────────────────────
 
-    // Pobiera hash do URL WebSocket.
-    // Sprawdza kolejno: /api/configuration → /api/user/context → access token jako fallback.
-    // Gdy znajdziesz właściwe źródło, uproszcz tę metodę.
-    async fetchWsHash() {
-        // Próba 1: /api/configuration
-        try {
-            const resp = await this.client.get(ApiUrls.Home.Get.Config);
-            const hash = resp.data?.wsHash ?? resp.data?.webSocketHash ?? resp.data?.hash ?? null;
-            if (hash) {
-                if (!this.logDebug) this.emit('debug', `WS hash from configuration: ${hash}`);
-                return hash;
-            }
-            if (!this.logDebug) this.emit('debug', `Configuration response (no hash found): ${JSON.stringify(resp.data)}`);
-        } catch (err) {
-            if (!this.logDebug) this.emit('debug', `fetchWsHash: configuration failed: ${err.message}`);
-        }
-
-        // Próba 2: /api/user/context (buildingsList może zawierać hash)
-        try {
-            const resp = await this.client.get(ApiUrls.Home.Get.Context);
-            const hash = resp.data?.wsHash ?? resp.data?.webSocketHash ?? resp.data?.hash ?? null;
-            if (hash) {
-                if (!this.logDebug) this.emit('debug', `WS hash from context: ${hash}`);
-                return hash;
-            }
-        } catch (err) {
-            if (!this.logDebug) this.emit('debug', `fetchWsHash: context failed: ${err.message}`);
-        }
-
-        // Fallback: access token (JWT) — niektóre implementacje używają go bezpośrednio
-        if (this.accessToken) {
-            if (!this.logDebug) this.emit('debug', 'fetchWsHash: falling back to access token as hash');
-            return this.accessToken;
-        }
-
-        throw new Error('Unable to obtain WebSocket hash — update fetchWsHash() when source is known');
-    }
-
     cleanupSocket() {
         if (this.heartbeat) {
             clearInterval(this.heartbeat);
@@ -108,11 +79,12 @@ class MelCloudHome extends EventEmitter {
 
         let hash;
         try {
-            hash = await this.fetchWsHash();
+            const resp = await this.client.get(ApiUrls.Home.Get.Context);
+            hash = resp.data.id ?? null;
         } catch (err) {
-            if (!this.logError) this.emit('error', `connectSocket: cannot get WS hash: ${err.message}`);
+            if (this.logError) this.emit('error', `connectSocket: cannot get WS hash: ${err.message}`);
             this.connecting = false;
-            this._scheduleReconnect();
+            this.scheduleReconnect();
             return;
         }
 
@@ -123,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 });
@@ -137,16 +109,16 @@ class MelCloudHome extends EventEmitter {
             ws.on('close', () => {
                 if (this.logDebug) this.emit('debug', 'Web socket closed');
                 this.cleanupSocket();
-                this._scheduleReconnect();
+                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;
+                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');
 
@@ -177,26 +149,25 @@ class MelCloudHome extends EventEmitter {
                     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();
-            this._scheduleReconnect();
+            this.scheduleReconnect();
         }
     }
 
     // Wykładniczy backoff: 5s → 10s → 20s → ... → max 5 minut
-    _scheduleReconnect() {
-        if (this._reconnectTimer) return; // już zaplanowany
+    scheduleReconnect() {
+        if (this.reconnectTimer) return; // już zaplanowany
 
-        if (this.logDebug) this.emit('debug', `Web socket reconnecting in ${this._reconnectDelay / 1000}s...`);
+        if (this.logDebug) this.emit('debug', `Web socket reconnecting in ${this.reconnectDelay / 1000}s...`);
 
-        this._reconnectTimer = setTimeout(async () => {
-            this._reconnectTimer = null;
+        this.reconnectTimer = setTimeout(async () => {
+            this.reconnectTimer = null;
             await this.connectSocket();
-        }, this._reconnectDelay);
+        }, this.reconnectDelay);
 
-        this._reconnectDelay = Math.min(this._reconnectDelay * 2, this._reconnectDelayMax);
+        this.reconnectDelay = Math.min(this.reconnectDelay * 2, this.reconnectDelayMax);
     }
 
     // ── Utils ─────────────────────────────────────────────────────────────────
@@ -458,12 +429,13 @@ class MelCloudHome extends EventEmitter {
             this.emit('client', this.client);
         }
 
-        connectInfo.State = exchangeRes;
-        connectInfo.Status = exchangeRes ? 'Connect Success' : 'Connect Failed at token exchange';
         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' : ''}`;
+
         return connectInfo;
     }