homebridge-melcloud-control 4.9.0-beta.9 → 4.9.1

package/CHANGELOG.md

@@ -24,6 +24,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - For plugin < v4.6.0 use Homebridge UI <= v5.5.0
 - For plugin >= v4.6.0 use Homebridge UI >= v5.13.0
 
+# [4.9.1] - (15.04.2026)
+
+## Changes
+
+- fix scene and shedule enable/disable for MELCloud Home
+
+# [4.9.0] - (15.04.2026)
+
+## Changes
+
+- refactor MELCloud Home to use Bearer token for authentication instead of cookies, fix [#240]
+- bump dependencies
+- cleanup
+
 # [4.8.7] - (10.04.2026)
 
 ## Changes

package/index.js

@@ -83,7 +83,7 @@ class MelCloudPlatform {
 										melCloudClass = new MelCloud(account, true);
 										break;
 									case 'melcloudhome':
-										timmers = [{ name: 'connect', sampling: 3300000 }, { name: 'checkDevicesList', sampling: 5000 }];
+										timmers = [{ name: 'checkDevicesList', sampling: 7000 }];
 										melCloudClass = new MelCloudHome(account, true);
 										break;
 									default:

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.9.0-beta.9",
+  "version": "4.9.1",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -40,8 +40,7 @@
     "axios": "^1.15.0",
     "axios-cookiejar-support": "^6.0.5",
     "tough-cookie": "^6.0.1",
-    "express": "^5.2.1",
-    "ws": "^8.20.0"
+    "express": "^5.2.1"
   },
   "keywords": [
     "homebridge",

package/src/constants.js

@@ -22,7 +22,8 @@ export const ApiUrls = {
     },
     Home: {
         UserAgent: "MonitorAndControl.App.Mobile/52 CFNetwork/3860.400.51 Darwin/25.3.0",
-        Base: "https://mobile.bff.melcloudhome.com",
+        Base: "https://melcloudhome.com",
+        BaseMobile: "https://mobile.bff.melcloudhome.com",
         AuthBase: "https://auth.melcloudhome.com",
         MockBase: "http://localhost:8080",
         OauthClientId: "homemobile",
@@ -33,41 +34,42 @@ export const ApiUrls = {
         WebSocket: "wss://ws.melcloudhome.com/?hash=",
         Get: {
             Configuration: "/api/configuration",
-            ListDevices: "/api/user/context",
-            Scenes: "/api/user/scenes",
+            Context: "/context",
+            Scenes: "/monitor/user/scenes",
             TelemetryEnergy: "/telemetry/telemetry/energy/deviceid",
             TelemetryActual: "/telemetry/telemetry/actual/deviceid",
-            ReportTrendSummary: "/report/v1/trendsummary"
+            ReportTrendSummary: "/report/v1/trendsummary",
+            SystemInvites: "/systeminvites"
         },
-    },
-    Post: {
-        ProtectionFrost: "/api/protection/frost", //{"enabled":true,"min":13,"max":16,"units":{"ATA":["deviceid"]}}
-        ProtectionOverheat: "/api/protection/overheat", //{"enabled":true,"min":32,"max":35,"units":{"ATA":["deviceid"]}}
-        HolidayMode: "/api/holidaymode", //{"enabled":true,"startDate":"2025-11-11T17:42:24.913","endDate":"2026-06-01T09:18:00","units":{"ATA":["deviceid"]}}
-        Schedule: "/api/cloudschedule/deviceid", //{"days":[2],"time":"17:59:00","enabled":true,"id":"scheduleid","power":false,"operationMode":null,"setPoint":null,"vaneVerticalDirection":null,"vaneHorizontalDirection":null,"setFanSpeed":null}
-        Scene: "/api/scene", //{"id": "sceneid", "userId": "userid","name": "Poza domem","enabled": false,"icon": "AwayIcon","ataSceneSettings": [{"unitId": "deviceid","ataSettings": { "power": false, "operationMode": "heat","setFanSpeed": "auto","vaneHorizontalDirection": "auto", "vaneVerticalDirection": "auto", "setTemperature": 21,"temperatureIncrementOverride": null,"inStandbyMode": null},"previousSettings": null}],"atwSceneSettings": []}
-    },
-    Put: {
-        Ata: "/api/ataunit/deviceid", //{ power: true,setTemperature: 22, setFanSpeed: "auto", operationMode: "heat", vaneHorizontalDirection: "auto",vaneVerticalDirection: "auto", temperatureIncrementOverride: null, inStandbyMode: null}
-        AtaMobile: "/monitor/ataunit/deviceid",
-        Atw: "/api/atwunit/deviceid",
-        AtwMobile: "/monitor/atwunit/deviceid",
-        Erv: "/api/ervunit/deviceid",
-        ErvMobile: "/monitor/ervunit/deviceid",
-        ScheduleEnableDisable: "/api/cloudschedule/deviceid/enabled", // {"enabled": true}
-        SceneEnableDisable: "/api/scene/sceneid",
-    },
-    Delete: {
-        Schedule: "/api/cloudschedule/deviceid/scheduleid",
-        Scene: "/api/scene/sceneid"
-    },
-    Referers: {
-        GetPutScenes: "https://melcloudhome.com/scenes",
-        PostHolidayMode: "https://melcloudhome.com/ata/deviceid/holidaymode",
-        PostProtectionFrost: "https://melcloudhome.com/ata/deviceid/frostprotection",
-        PostProtectionOverheat: "https://melcloudhome.com/ata/deviceid/overheatprotection",
-        PutDeviceSettings: "https://melcloudhome.com/dashboard",
-        PutScheduleEnabled: "https://melcloudhome.com/ata/deviceid/schedule",
+        Post: {
+            ProtectionFrost: "/monitor/protection/frost", //{"enabled":true,"min":13,"max":16,"units":{"ATA":["deviceid"]}}
+            ProtectionOverheat: "/monitor/protection/overheat", //{"enabled":true,"min":32,"max":35,"units":{"ATA":["deviceid"]}}
+            HolidayMode: "/monitor/holidaymode", //{"enabled":true,"startDate":"2025-11-11T17:42:24.913","endDate":"2026-06-01T09:18:00","units":{"ATA":["deviceid"]}}
+            Schedule: "/monitor/cloudschedule/deviceid", //{"days":[2],"time":"17:59:00","enabled":true,"id":"scheduleid","power":false,"operationMode":null,"setPoint":null,"vaneVerticalDirection":null,"vaneHorizontalDirection":null,"setFanSpeed":null}
+            Scene: "/monitor/scene", //{"id": "sceneid", "userId": "userid","name": "Poza domem","enabled": false,"icon": "AwayIcon","ataSceneSettings": [{"unitId": "deviceid","ataSettings": { "power": false, "operationMode": "heat","setFanSpeed": "auto","vaneHorizontalDirection": "auto", "vaneVerticalDirection": "auto", "setTemperature": 21,"temperatureIncrementOverride": null,"inStandbyMode": null},"previousSettings": null}],"atwSceneSettings": []}
+        },
+        Put: {
+            Ata: "/api/ataunit/deviceid", //{ power: true,setTemperature: 22, setFanSpeed: "auto", operationMode: "heat", vaneHorizontalDirection: "auto",vaneVerticalDirection: "auto", temperatureIncrementOverride: null, inStandbyMode: null}
+            AtaMobile: "/monitor/ataunit/deviceid",
+            Atw: "/api/atwunit/deviceid",
+            AtwMobile: "/monitor/atwunit/deviceid",
+            Erv: "/api/ervunit/deviceid",
+            ErvMobile: "/monitor/ervunit/deviceid",
+            ScheduleEnableDisable: "/monitor/cloudschedule/deviceid/enabled", // {"enabled": true}
+            SceneEnableDisable: "/monitor/scene/sceneid",
+        },
+        Delete: {
+            Schedule: "/api/cloudschedule/deviceid/scheduleid",
+            Scene: "/api/scene/sceneid"
+        },
+        Referers: {
+            GetPutScenes: "https://melcloudhome.com/scenes",
+            PostHolidayMode: "https://melcloudhome.com/ata/deviceid/holidaymode",
+            PostProtectionFrost: "https://melcloudhome.com/ata/deviceid/frostprotection",
+            PostProtectionOverheat: "https://melcloudhome.com/ata/deviceid/overheatprotection",
+            PutDeviceSettings: "https://melcloudhome.com/dashboard",
+            PutScheduleEnabled: "https://melcloudhome.com/ata/deviceid/schedule",
+        }
     }
 };
 
@@ -87,8 +89,8 @@ export const AirConditioner = {
     FanSpeedMapEnumToString: { 0: "Auto", 1: "One", 2: "Two", 3: "Three", 4: "Four", 5: "Five" },
     SetFanSpeedMapStringToEnum: { "Auto": 0, "One": 1, "Two": 2, "Three": 3, "Four": 4, "Five": 5, "0": 0, "1": 1, "2": 2, "3": 3, "4": 4, "5": 5 },
     SetFanSpeedMapEnumToString: { 0: "Auto", 1: "One", 2: "Two", 3: "Three", 4: "Four", 5: "Five" },
-    AktualFanSpeedMapStringToEnum: { "Auto": 0, "One": 1, "Two": 2, "Three": 3, "Four": 4, "Five": 5, "0": 0, "1": 1, "2": 2, "3": 3, "4": 4, "5": 5 },
-    AktualFanSpeedMapEnumToString: { 0: "Quiet", 1: "One", 2: "Two", 3: "Three", 4: "Four", 5: "Five" },
+    AktualFanSpeedMapStringToEnum: { "Auto": 0, "One": 1, "Two": 2, "Three": 3, "Four": 4, "Five": 5, "Off": 6, "0": 0, "1": 1, "2": 2, "3": 3, "4": 4, "5": 5 },
+    AktualFanSpeedMapEnumToString: { 0: "Quiet", 1: "One", 2: "Two", 3: "Three", 4: "Four", 5: "Five", 6: "Off" },
     VaneVerticalDirectionMapStringToEnum: { "Auto": 0, "One": 1, "Two": 2, "Three": 3, "Four": 4, "Five": 5, "Six": 6, "Swing": 7 },
     VaneVerticalDirectionMapEnumToString: { 0: "Auto", 1: "One", 2: "Two", 3: "Three", 4: "Four", 5: "Five", 6: "Six", 7: "Swing" },
     VaneVerticalDirectionMapEnumToEnumWs: { 6: 7 },

package/src/functions.js

@@ -54,126 +54,6 @@ class Functions extends EventEmitter {
         }
     }
 
-    async ensureChromiumInstalled() {
-        try {
-            const { stdout: osOut } = await execPromise('uname -s');
-            const osName = osOut.trim();
-
-            const { stdout: archOut } = await execPromise('uname -m');
-            const rawArch = archOut.trim() || 'unknown';
-
-            let arch;
-            if (/^aarch64|^arm/.test(rawArch)) arch = 'arm';
-            else if (rawArch === 'x86_64' || rawArch === 'amd64') arch = 'x64';
-            else arch = 'x86';
-
-            const isARM = arch === 'arm';
-            const isMac = osName === 'Darwin';
-            const isLinux = osName === 'Linux';
-            const isQnap = fs.existsSync('/etc/config/uLinux.conf') || fs.existsSync('/etc/config/qpkg.conf');
-
-            // Docker detection
-            let isDocker = false;
-            try {
-                await access('/.dockerenv');
-                isDocker = true;
-            } catch { }
-
-            try {
-                const { stdout } = await execPromise('cat /proc/1/cgroup');
-                if (stdout.includes('docker') || stdout.includes('containerd')) isDocker = true;
-            } catch { }
-
-            /* ===================== macOS ===================== */
-            if (isMac) {
-                const macCandidates = ['/Applications/Google Chrome.app/Contents/MacOS/Google Chrome', '/Applications/Chromium.app/Contents/MacOS/Chromium'];
-                for (const path of macCandidates) {
-                    try {
-                        await access(path, fs.constants.X_OK);
-                        return { path, arch, system: 'macOS' };
-                    } catch { }
-                }
-
-                return { path: null, arch, system: 'macOS' };
-            }
-
-            /* ===================== QNAP ===================== */
-            if (isQnap) {
-                const qnapCandidates = ['/opt/bin/chromium', '/opt/bin/chromium-browser'];
-                for (const path of qnapCandidates) {
-                    try {
-                        await access(path, fs.constants.X_OK);
-                        return { path, arch, system: 'Qnap' };
-                    } catch { }
-                }
-
-                try {
-                    await access('/opt/bin/opkg', fs.constants.X_OK);
-                    await execPromise('/opt/bin/opkg update');
-                    await execPromise('opkg install chromium nspr nss libx11 libxcomposite libxdamage libxrandr atk libcups libdrm libgbm alsa-lib');
-                    process.env.LD_LIBRARY_PATH = `/opt/lib:${process.env.LD_LIBRARY_PATH || ''}`;
-                } catch (error) {
-                    if (this.logDebug) this.emit('debug', `Install Chromium for Qnap error: ${error}`);
-                    return { path: null, arch, system: 'Qnap' };
-                }
-
-                for (const path of qnapCandidates) {
-                    try {
-                        await access(path, fs.constants.X_OK);
-                        return { path, arch, system: 'Qnap' };
-                    } catch { }
-                }
-
-                return { path: null, arch, system: 'Qnap' };
-            }
-
-            /* ===================== Linux ===================== */
-            if (isLinux) {
-                const linuxCandidates = ['/usr/bin/google-chrome', '/usr/bin/chromium-browser', '/usr/bin/chromium'];
-
-                // Detect existing browser (ARM + x64)
-                for (const path of linuxCandidates) {
-                    try {
-                        await access(path, fs.constants.X_OK);
-                        return { path, arch, system: isDocker ? 'Linux Docker' : (isARM ? 'Linux ARM' : 'Linux') };
-                    } catch { }
-                }
-
-                // ARM → detect only
-                if (isARM) {
-                    return { path: null, arch, system: 'Linux ARM' };
-                }
-
-                // Docker → install Chrome
-                if (isDocker) {
-                    try {
-                        await execPromise('apt-get update -y');
-                        await execPromise('wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb');
-                        await execPromise('apt-get install -y ./google-chrome-stable_current_amd64.deb');
-                    } catch (error) {
-                        if (this.logDebug) this.emit('debug', `Install Chrome for Docker error: ${error}`);
-                        return { path: null, arch, system: 'Linux Docker' };
-                    }
-
-                    for (const path of linuxCandidates) {
-                        try {
-                            await access(path, fs.constants.X_OK);
-                            return { path, arch, system: 'Linux Docker' };
-                        } catch { }
-                    }
-                }
-
-                return { path: null, arch, system: isDocker ? 'Linux Docker' : 'Linux' };
-            }
-
-            return { path: null, arch, system: 'unknown' };
-        } catch (error) {
-            if (this.logDebug) this.emit('debug', `Chromium detection error: ${error.message}`);
-            return { path: null, arch: 'unknown', system: 'unknown' };
-        }
-    }
-
-
     isValidValue(v) {
         return v !== undefined && v !== null && !(typeof v === 'number' && Number.isNaN(v));
     }

package/src/melcloudata.js

@@ -315,7 +315,7 @@ class MelCloudAta extends EventEmitter {
                             });
 
                             method = 'PUT';
-                            path = ApiUrls.Home.Put.Ata.replace('deviceid', deviceData.DeviceID);
+                            path = ApiUrls.Home.Put.AtaMobile.replace('deviceid', deviceData.DeviceID);
                             break;
                     }
 

package/src/melcloudatw.js

@@ -265,7 +265,7 @@ class MelCloudAtw extends EventEmitter {
                             });
 
                             method = 'PUT';
-                            path = ApiUrls.Home.Put.Atw.replace('deviceid', deviceData.DeviceID);
+                            path = ApiUrls.Home.Put.AtwMobile.replace('deviceid', deviceData.DeviceID);
                             break
                     }
 

package/src/melclouderv.js

@@ -280,7 +280,7 @@ class MelCloudErv extends EventEmitter {
                             });
 
                             method = 'PUT';
-                            path = ApiUrls.Home.Put.Erv.replace('deviceid', deviceData.DeviceID);
+                            path = ApiUrls.Home.Put.ErvMobile.replace('deviceid', deviceData.DeviceID);
                             break
                     }
 

package/src/melcloudhome.js

@@ -1,6 +1,5 @@
 import axios from 'axios';
 import crypto from 'crypto';
-import WebSocket from 'ws';
 import EventEmitter from 'events';
 import ImpulseGenerator from './impulsegenerator.js';
 import Functions from './functions.js';
@@ -21,10 +20,6 @@ class MelCloudHome extends EventEmitter {
         this.logError = account.log?.error;
         this.logDebug = account.log?.debug;
 
-        this.client = null;
-        this.socketConnected = false;
-        this.heartbeat = null;
-
         this.functions = new Functions(this.logWarn, this.logError, this.logDebug)
             .on('warn', warn => this.emit('warn', warn))
             .on('error', error => this.emit('error', error))
@@ -32,102 +27,54 @@ class MelCloudHome extends EventEmitter {
 
         this.pacer = new RequestPacer();
 
-        // axios auth client and token state
-        this.authClient = null;
-        this._accessToken = null;   // podkreślnik — unika konfliktu z getterami
-        this._refreshToken = null;
-        this._tokenExpiry = 0;      // Unix timestamp (sekundy)
-        this._authenticated = false;
+        // Axios clients
+        this.authClient = null; // cookie-jar client używany tylko podczas auth flow
+        this.client = null; // API client używany do requestów po zalogowaniu
 
-        if (pluginStart) {
-            this.locks = {
-                connect: false,
-                checkDevicesList: false,
-            };
+        // Token state
+        this.accessToken = null;
+        this.refreshToken = null;
+        this.tokenExpiry = 0; // Unix timestamp (sekundy)
 
+        // Flaga zapobiegająca wielokrotnemu dodaniu interceptorów
+        this._interceptorsAttached = false;
+
+        if (pluginStart) {
             this.impulseGenerator = new ImpulseGenerator()
-                .on('connect', () => this.handleWithLock('connect', async () => {
-                    await this.connect();
-                }))
-                .on('checkDevicesList', () => this.handleWithLock('checkDevicesList', async () => {
+                .on('checkDevicesList', async () => {
                     await this.checkDevicesList();
-                }))
+                })
                 .on('state', (state) => {
                     this.emit(state ? 'success' : 'warn', `Impulse generator ${state ? 'started' : 'stopped'}`);
                 });
         }
     }
 
-    // ── Lock helper ───────────────────────────────────────────────────────────
-
-    async handleWithLock(lockKey, fn) {
-        if (this.locks[lockKey]) return;
-        this.locks[lockKey] = true;
-        try {
-            await fn();
-        } catch (error) {
-            this.emit('error', `Impulse generator error: ${error}`);
-        } finally {
-            this.locks[lockKey] = false;
-        }
-    }
+    // ── Utils ─────────────────────────────────────────────────────────────────
 
-    cleanupSocket() {
-        if (this.heartbeat) {
-            clearInterval(this.heartbeat);
-            this.heartbeat = null;
+    capitalizeKeysDeep(obj) {
+        if (Array.isArray(obj)) return obj.map(item => this.capitalizeKeysDeep(item));
+        if (obj && typeof obj === 'object') {
+            return Object.fromEntries(
+                Object.entries(obj).map(([k, v]) => [
+                    k.charAt(0).toUpperCase() + k.slice(1),
+                    this.capitalizeKeysDeep(v),
+                ])
+            );
         }
-        this.socketConnected = false;
-    }
-
-    // ── Pacer helper ──────────────────────────────────────────────────────────
-
-    pace(fn) {
-        return this.pacer.run(fn);
-    }
-
-    // ── Token gettery (nie kolidują z polami instancji) ───────────────────────
-
-    get accessToken() { return this._accessToken; }
-    get refreshToken() { return this._refreshToken; }
-
-    get isTokenExpired() {
-        if (!this._accessToken) return true;
-        return Date.now() / 1000 >= this._tokenExpiry - 60;
-    }
-
-    get isAuthenticated() {
-        return this._authenticated && !this.isTokenExpired;
-    }
-
-    // ── Token persistence ─────────────────────────────────────────────────────
-
-    restoreTokens(accessToken, refreshToken, tokenExpiry) {
-        this._accessToken = accessToken;
-        this._refreshToken = refreshToken;
-        this._tokenExpiry = tokenExpiry;
-        if (accessToken && refreshToken) this._authenticated = true;
-    }
-
-    getTokenSnapshot() {
-        return {
-            access_token: this._accessToken,
-            refresh_token: this._refreshToken,
-            token_expiry: this._tokenExpiry,
-        };
+        return obj;
     }
 
-    // ── PKCE ──────────────────────────────────────────────────────────────────
+    // ── Token state ───────────────────────────────────────────────────────────
 
-    generatePkce() {
-        const verifier = crypto.randomBytes(32).toString('base64url');
-        const challenge = crypto.createHash('sha256').update(verifier).digest('base64url');
-        return { verifier, challenge };
+    isTokenExpired() {
+        if (!this.accessToken) return true;
+        return Date.now() / 1000 >= this.tokenExpiry - 60;
     }
 
-    // ── Axios client z cookie jar ─────────────────────────────────────────────
+    // ── Axios clients ─────────────────────────────────────────────────────────
 
-    ensureClient() {
+    ensureAuthClient() {
         if (this.authClient) return this.authClient;
 
         const jar = new CookieJar();
@@ -136,8 +83,8 @@ class MelCloudHome extends EventEmitter {
                 jar,
                 timeout: 30_000,
                 headers: {
-                    'User-Agent': ApiUrls.Home.UserAgent,
                     Accept: 'application/json',
+                    'User-Agent': ApiUrls.Home.UserAgent,
                 },
                 maxRedirects: 5,
                 validateStatus: () => true,
@@ -148,6 +95,35 @@ class MelCloudHome extends EventEmitter {
         return instance;
     }
 
+    ensureClient() {
+        if (this.client) return this.client;
+
+        this.client = axios.create({
+            baseURL: ApiUrls.Home.BaseMobile,
+            timeout: 30_000,
+            headers: {
+                Accept: 'application/json',
+                'User-Agent': ApiUrls.Home.UserAgent,
+            },
+        });
+
+        return this.client;
+    }
+
+    // ── Pacer helper ──────────────────────────────────────────────────────────
+
+    pace(fn) {
+        return this.pacer.run(fn);
+    }
+
+    // ── PKCE ──────────────────────────────────────────────────────────────────
+
+    generatePkce() {
+        const verifier = crypto.randomBytes(32).toString('base64url');
+        const challenge = crypto.createHash('sha256').update(verifier).digest('base64url');
+        return { verifier, challenge };
+    }
+
     // ── CSRF token ────────────────────────────────────────────────────────────
 
     extractCsrfToken(html) {
@@ -221,10 +197,9 @@ class MelCloudHome extends EventEmitter {
         if (resp.status >= 500) throw new Error(`Token exchange server error: HTTP ${resp.status}`);
         if (resp.status !== 200) throw new Error(`Token exchange failed: HTTP ${resp.status}`);
 
-        this._accessToken = resp.data.access_token;
-        this._refreshToken = resp.data.refresh_token ?? this._refreshToken;
-        this._tokenExpiry = Date.now() / 1000 + (resp.data.expires_in ?? 3600);
-        this._authenticated = true;
+        this.accessToken = resp.data.access_token;
+        this.refreshToken = resp.data.refresh_token ?? this.refreshToken;
+        this.tokenExpiry = Date.now() / 1000 + (resp.data.expires_in ?? 3600);
 
         if (this.logDebug) this.emit('debug', 'Authentication successful');
         return true;
@@ -233,16 +208,16 @@ class MelCloudHome extends EventEmitter {
     // ── Token refresh ─────────────────────────────────────────────────────────
 
     async refreshAccessToken() {
-        if (!this._refreshToken) throw new Error('No refresh token available');
+        if (!this.refreshToken) throw new Error('No refresh token available');
 
-        const client = this.ensureClient();
+        const client = this.ensureAuthClient();
 
         const resp = await this.pace(() =>
             client.post(
                 `${ApiUrls.Home.AuthBase}/connect/token`,
                 new URLSearchParams({
                     grant_type: 'refresh_token',
-                    refresh_token: this._refreshToken,
+                    refresh_token: this.refreshToken,
                     client_id: ApiUrls.Home.OauthClientId,
                 }),
                 { headers: { 'User-Agent': ApiUrls.Home.UserAgent } }
@@ -250,19 +225,207 @@ class MelCloudHome extends EventEmitter {
         );
 
         if (resp.status !== 200) {
-            this._authenticated = false;
-            this._accessToken = null;
-            this._refreshToken = null;
+            this.accessToken = null;
+            this.refreshToken = null;
             throw new Error('Refresh token rejected');
         }
 
-        this._accessToken = resp.data.access_token;
-        this._refreshToken = resp.data.refresh_token ?? this._refreshToken;
-        this._tokenExpiry = Date.now() / 1000 + (resp.data.expires_in ?? 3600);
-        this._authenticated = true;
+        this.accessToken = resp.data.access_token;
+        this.refreshToken = resp.data.refresh_token ?? this.refreshToken;
+        this.tokenExpiry = Date.now() / 1000 + (resp.data.expires_in ?? 3600);
         return true;
     }
 
+    // ── Auto-refresh: refresh token lub pełne logowanie od nowa ──────────────
+
+    async refreshOrRelogin() {
+        if (this.refreshToken) {
+            try {
+                await this.refreshAccessToken();
+                if (this.logDebug) this.emit('debug', 'Token refreshed successfully');
+                return;
+            } catch (err) {
+                if (this.logDebug) this.emit('debug', `Refresh token rejected (${err.message}), falling back to full re-login`);
+            }
+        }
+
+        if (this.logDebug) this.emit('debug', 'Performing full re-login');
+        await this.connect();
+    }
+
+    // ── Interceptory do automatycznego odświeżania tokena ─────────────────────
+
+    attachTokenInterceptors() {
+        if (this._interceptorsAttached) return;
+        this._interceptorsAttached = true;
+
+        const apiClient = this.ensureClient();
+
+        // Request interceptor — dokłada aktualny token przed każdym requestem.
+        // Jeśli token wygasł, odświeża go najpierw.
+        apiClient.interceptors.request.use(async (config) => {
+            if (this.isTokenExpired()) {
+                if (this.logDebug) this.emit('debug', 'Token expired or missing — refreshing before request');
+                await this.refreshOrRelogin();
+            }
+            config.headers['Authorization'] = `Bearer ${this.accessToken}`;
+            return config;
+        });
+
+        // Response interceptor — obsługuje 401 który może przyjść mimo świeżego tokena
+        // (np. token odwołany po stronie serwera). Ponawia request dokładnie raz.
+        apiClient.interceptors.response.use(
+            response => response,
+            async (error) => {
+                const originalRequest = error.config;
+
+                if (error.response?.status === 401 && !originalRequest._retried) {
+                    originalRequest._retried = true;
+                    if (this.logDebug) this.emit('debug', 'Got 401 — refreshing token and retrying request');
+
+                    try {
+                        await this.refreshOrRelogin();
+                        originalRequest.headers['Authorization'] = `Bearer ${this.accessToken}`;
+                        return apiClient(originalRequest);
+                    } catch (refreshError) {
+                        this.emit('error', `Token refresh failed: ${refreshError.message}`);
+                        return Promise.reject(refreshError);
+                    }
+                }
+
+                return Promise.reject(error);
+            }
+        );
+    }
+
+    // ── Buduje connectInfo po udanym token exchange ───────────────────────────
+
+    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);
+        }
+
+        connectInfo.State = exchangeRes;
+        connectInfo.Status = exchangeRes ? 'Connect Success' : 'Connect Failed at token exchange';
+
+        return connectInfo;
+    }
+
+    // ── Scenes & Devices ──────────────────────────────────────────────────────
+
+    async checkScenesList() {
+        try {
+            if (this.logDebug) this.emit('debug', 'Scanning for scenes');
+
+            const resp = await this.client.get(ApiUrls.Home.Get.Scenes);
+            const scenesList = resp.data;
+
+            if (this.logDebug) this.emit('debug', `Scenes: ${JSON.stringify(scenesList, null, 2)}`);
+
+            return this.capitalizeKeysDeep(scenesList);
+        } catch (error) {
+            throw new Error(`Check scenes list error: ${error.message}`);
+        }
+    }
+
+    async checkDevicesList() {
+        try {
+            const result = { State: false, Status: null, Buildings: {}, Devices: [], Scenes: [] };
+            if (this.logDebug) this.emit('debug', 'Scanning for devices');
+
+            const resp = await this.client.get(ApiUrls.Home.Get.Context);
+            const userContext = resp.data;
+            //if (this.logDebug) this.emit('debug', `User Context: ${JSON.stringify(userContext, null, 2)}`);
+
+            const buildings = userContext.buildings ?? [];
+            const guestBuildings = userContext.guestBuildings ?? [];
+            const buildingsList = [...buildings, ...guestBuildings];
+
+            if (this.logDebug) this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
+
+            if (buildingsList.length === 0) {
+                result.Status = 'No buildings found';
+                return result;
+            }
+
+            const capitalizeKeys = obj => Object.fromEntries(
+                Object.entries(obj).map(([k, v]) => [k.charAt(0).toUpperCase() + k.slice(1), v])
+            );
+
+            const createDevice = (device, type) => {
+                const settingsObject = Object.fromEntries(
+                    (device.Settings || []).map(({ name, value }) => [
+                        name.charAt(0).toUpperCase() + name.slice(1),
+                        this.functions.convertValue(value),
+                    ])
+                );
+
+                const deviceObject = {
+                    ...capitalizeKeys(device.Capabilities || {}),
+                    ...settingsObject,
+                    DeviceType: type,
+                    FirmwareAppVersion: device.ConnectedInterfaceIdentifier,
+                    IsConnected: device.IsConnected,
+                };
+
+                if (device.FrostProtection) device.FrostProtection = capitalizeKeys(device.FrostProtection);
+                if (device.OverheatProtection) device.OverheatProtection = capitalizeKeys(device.OverheatProtection);
+                if (device.HolidayMode) device.HolidayMode = capitalizeKeys(device.HolidayMode);
+                if (Array.isArray(device.Schedule)) device.Schedule = device.Schedule.map(s => this.capitalizeKeysDeep(s));
+
+                const { Settings, Capabilities, Id, GivenDisplayName, ...rest } = device;
+
+                return {
+                    ...rest,
+                    Type: type,
+                    DeviceID: Id,
+                    DeviceName: GivenDisplayName,
+                    SerialNumber: Id,
+                    Device: deviceObject,
+                };
+            };
+
+            const devices = buildingsList.flatMap(building => [
+                ...(building.airToAirUnits || []).map(d => createDevice(capitalizeKeys(d), 0)),
+                ...(building.airToWaterUnits || []).map(d => createDevice(capitalizeKeys(d), 1)),
+                ...(building.airToVentilationUnits || []).map(d => createDevice(capitalizeKeys(d), 3)),
+            ]);
+
+            if (devices.length === 0) {
+                result.Status = 'No devices found';
+                return result;
+            }
+
+            // Sceny
+            let scenes = [];
+            try {
+                scenes = await this.checkScenesList();
+                if (this.logDebug) this.emit('debug', `Found ${scenes.length} scenes`);
+            } catch (error) {
+                if (this.logError) this.emit('error', `Get scenes error: ${error}`);
+            }
+
+            result.State = true;
+            result.Status = `Found ${devices.length} devices${scenes.length > 0 ? ` and ${scenes.length} scenes` : ''}`;
+            result.Buildings = userContext;
+            result.Devices = devices;
+            result.Scenes = scenes;
+
+            for (const deviceData of result.Devices) {
+                deviceData.Scenes = result.Scenes;
+                this.emit(deviceData.DeviceID, 'request', deviceData);
+            }
+
+            return result;
+        } catch (error) {
+            throw new Error(`Check devices list error: ${error.message}`);
+        }
+    }
+
     // ── Connect ───────────────────────────────────────────────────────────────
 
     async connect() {
@@ -271,7 +434,7 @@ class MelCloudHome extends EventEmitter {
         try {
             const connectInfo = { State: false, Status: '', Account: {}, UseFahrenheit: false };
 
-            const client = this.ensureClient();
+            const client = this.ensureAuthClient();
             const { verifier: codeVerifier, challenge: codeChallenge } = this.generatePkce();
             const state = crypto.randomBytes(16).toString('base64url');
 
@@ -333,7 +496,7 @@ class MelCloudHome extends EventEmitter {
                 cognitoLoginUrl = finalUrl;
                 if (this.logDebug) this.emit('debug', 'Cognito login page OK');
             } else {
-                // Fast path: istniejąca sesja
+                // Fast path: istniejąca sesja — kod dostępny od razu
                 const codeMatch = /code=([^&"' ]+)/.exec(finalUrl) || /code=([^&"' ]+)/.exec(body);
                 if (codeMatch) {
                     authCode = codeMatch[1];
@@ -352,9 +515,8 @@ class MelCloudHome extends EventEmitter {
             // Fast-path: pomiń etap logowania
             if (authCode) {
                 if (this.logDebug) this.emit('debug', 'Re-login with existing session (skipping credentials)');
-                // WAŻNE: await — bez niego exchangeRes to Promise, nie boolean
                 const exchangeRes = await this.exchangeCodeForTokens(client, authCode, codeVerifier);
-                return this._buildConnectInfo(connectInfo, exchangeRes);
+                return this.buildConnectInfo(connectInfo, exchangeRes);
             }
 
             // ── Step 3: Wyślij dane logowania do Cognito ──────────────────────
@@ -362,11 +524,8 @@ class MelCloudHome extends EventEmitter {
 
             const cognitoHostname = new URL(cognitoLoginUrl).hostname;
 
-            // maxRedirects: 0 — Cognito używa response_mode=form_post, więc po udanym
-            // logowaniu robi POST do auth.melcloudhome.com/signin-oidc-meu (nie GET redirect).
-            // Axios nie potrafi tego obsłużyć automatycznie — musimy przechwycić
-            // odpowiedź Cognito (302 z Location) zanim axios spróbuje podążyć za nią
-            // i dostanie 500 z IdentityServera.
+            // maxRedirects: 0 — Cognito używa response_mode=form_post.
+            // Przechwytujemy 302 zanim axios podąży za nim do IdentityServera (→ 500).
             const credResp = await this.pace(() =>
                 client.post(
                     cognitoLoginUrl,
@@ -383,7 +542,7 @@ class MelCloudHome extends EventEmitter {
                             Origin: `https://${cognitoHostname}`,
                             Referer: cognitoLoginUrl,
                         },
-                        maxRedirects: 0, // przechwytujemy redirect zanim trafi do IdentityServera
+                        maxRedirects: 0,
                     }
                 )
             );
@@ -393,18 +552,13 @@ class MelCloudHome extends EventEmitter {
                 this.emit('debug', `Step 3 response location: ${credResp.headers?.location ?? '(none)'}`);
             }
 
-            // Cognito przy złym haśle wraca na stronę logowania (200 lub 302 na /login)
-            if (credResp.status === 200) {
-                // Zostaliśmy na stronie Cognito — złe hasło
-                throw new Error('Authentication failed: Invalid username or password');
-            }
-
+            // status 200 = zostaliśmy na stronie Cognito → złe hasło
+            if (credResp.status === 200) throw new Error('Authentication failed: Invalid username or password');
             if (credResp.status >= 500) throw new Error(`Cognito server error: HTTP ${credResp.status}`);
 
-            // ── Step 4: Podążaj za redirectem z Cognito → IdentityServer ─────────
-            // Cognito odpowiada 302 z Location: https://auth.melcloudhome.com/signin-oidc-meu?...
-            // Musimy samodzielnie wysłać GET do tego URL (IdentityServer przetworzy callback
-            // i przekieruje dalej do melcloudhome:// z auth code).
+            // ── Step 4: POST do signin-oidc-meu (emulacja form_post z Cognito) ──
+            // Cognito normalnie robi POST z code+state w body do IdentityServera.
+            // My dostaliśmy 302 z tymi parametrami w query — wysyłamy je jako POST body.
             if (this.logDebug) this.emit('debug', 'Step 4: Follow Cognito → IdentityServer redirect');
 
             const cognitoRedirectLocation = credResp.headers?.location ?? '';
@@ -412,10 +566,6 @@ class MelCloudHome extends EventEmitter {
 
             if (this.logDebug) this.emit('debug', `Step 4 location: ${cognitoRedirectLocation}`);
 
-            // signin-oidc-meu to endpoint IdentityServera obsługujący callback z Cognito.
-            // Cognito normalnie robi tam form_post (POST z code i state w body),
-            // ale my dostaliśmy 302 z parametrami w query stringu — wysyłamy więc POST
-            // z tymi samymi parametrami w body (tak jak zrobiłoby to Cognito).
             const signinParsed = new URL(cognitoRedirectLocation);
             const signinBase = `${signinParsed.protocol}//${signinParsed.host}${signinParsed.pathname}`;
             const signinParams = new URLSearchParams(signinParsed.search);
@@ -437,201 +587,73 @@ class MelCloudHome extends EventEmitter {
                 this.emit('debug', `Step 4 signin location: ${signinResp.headers?.location ?? '(none)'}`);
             }
 
-            // ── Step 5: Wyciągnij auth code z redirectu melcloudhome:// ───────────
-            if (this.logDebug) this.emit('debug', 'Step 5: Extract auth code from redirect');
+            // ── Step 5: Podążaj za łańcuchem redirectów aż do auth code ──────────
+            // IdentityServer przekierowuje przez kilka etapów:
+            // /ExternalLogin/Callback → /connect/authorize/callback → melcloudhome://
+            if (this.logDebug) this.emit('debug', 'Step 5: Following redirect chain to auth code');
 
-            const signinLocation = signinResp.headers?.location ?? '';
-            const signinBody = typeof signinResp.data === 'string' ? signinResp.data : '';
+            let currentResp = signinResp;
+            const MAX_HOPS = 6;
 
-            // Przypadek A: bezpośredni redirect na melcloudhome://
-            let codeMatch = /code=([^&"' ]+)/.exec(signinLocation);
+            for (let hop = 0; hop < MAX_HOPS; hop++) {
+                const hopStatus = currentResp.status;
+                const hopLocation = currentResp.headers?.location ?? '';
+                const hopBody = typeof currentResp.data === 'string' ? currentResp.data : '';
 
-            // Przypadek B: IdentityServer przekierowuje do /connect/authorize/callback
-            if (!codeMatch) {
-                const callbackMatch = /\/connect\/authorize\/callback\?([^"' ]+)/.exec(signinLocation)
-                    || /\/connect\/authorize\/callback\?([^"' ]+)/.exec(signinBody);
+                if (this.logDebug) this.emit('debug', `Step 5 hop ${hop}: status=${hopStatus} location=${hopLocation || '(none)'}`);
 
-                if (callbackMatch) {
-                    if (this.logDebug) this.emit('debug', 'Step 5: Following authorize/callback');
-                    authCode = await this.followCallbackForCode(client, callbackMatch[1]);
-                } else {
-                    // Przypadek C: kod bezpośrednio w body (np. form hidden field)
-                    codeMatch = /code=([^&"' ]+)/.exec(signinBody);
-                    if (!codeMatch) throw new Error(`Failed to extract auth code. signin status=${signinResp.status}, location=${signinLocation}`);
-                    authCode = codeMatch[1];
+                // A: melcloudhome:// z code=
+                if (hopLocation.startsWith('melcloudhome://')) {
+                    const m = /code=([^&"' ]+)/.exec(hopLocation);
+                    if (m) { authCode = m[1]; break; }
                 }
-            } else {
-                authCode = codeMatch[1];
-            }
-
-            if (this.logDebug) this.emit('debug', `Got auth code: ${authCode.slice(0, 20)}...`);
-
-            // ── Step 6: Wymień kod na tokeny (WAŻNE: await!) ──────────────────
-            const exchangeRes = await this.exchangeCodeForTokens(client, authCode, codeVerifier);
-            return this._buildConnectInfo(connectInfo, exchangeRes);
-
-        } catch (error) {
-            throw new Error(`Connect error: ${error.message}`);
-        }
-    }
-
-    // ── Buduje connectInfo i tworzy właściwy client API ───────────────────────
-
-    _buildConnectInfo(connectInfo, exchangeRes) {
-        if (exchangeRes) {
-            this.client = axios.create({
-                baseURL: ApiUrls.Home.Base,
-                timeout: 30_000,
-                headers: {
-                    Accept: 'application/json',
-                    'User-Agent': ApiUrls.Home.UserAgent,
-                    Authorization: `Bearer ${this._accessToken}`,
-                },
-            });
-
-            this.emit('client', this.client);
-        }
-
-        connectInfo.State = exchangeRes;
-        connectInfo.Status = exchangeRes
-            ? `Connect Success${this.socketConnected ? ', Web Socket Connected' : ''}`
-            : 'Connect Failed at token exchange';
-
-        return connectInfo;
-    }
-
-    // ── Scenes & Devices ──────────────────────────────────────────────────────
-
-    async checkScenesList() {
-        try {
-            if (this.logDebug) this.emit('debug', 'Scanning for scenes');
-
-            const resp = await this.client.get(ApiUrls.Home.Get.Scenes);
-            const scenesList = resp.data;
-
-            if (this.logDebug) this.emit('debug', `Scenes: ${JSON.stringify(scenesList, null, 2)}`);
-
-            return this._capitalizeKeysDeep(scenesList);
-        } catch (error) {
-            throw new Error(`Check scenes list error: ${error.message}`);
-        }
-    }
-
-    async checkDevicesList() {
-        try {
-            const result = { State: false, Status: null, Buildings: {}, Devices: [], Scenes: [] };
-            if (this.logDebug) this.emit('debug', 'Scanning for devices');
 
-            const resp = await this.client.get(ApiUrls.Home.Get.ListDevices);
-            const userContext = resp.data;
-
-            const buildings = userContext.buildings ?? [];
-            const guestBuildings = userContext.guestBuildings ?? [];
-            const buildingsList = [...buildings, ...guestBuildings];
-
-            if (this.logDebug) this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
-
-            if (buildingsList.length === 0) {
-                result.Status = 'No buildings found';
-                return result;
-            }
-
-            const devices = buildingsList.flatMap(building => {
-                const capitalizeKeys = obj => Object.fromEntries(
-                    Object.entries(obj).map(([k, v]) => [k.charAt(0).toUpperCase() + k.slice(1), v])
-                );
+                // B: /connect/authorize/callback w location lub body
+                const cbMatch = /\/connect\/authorize\/callback\?([^"' ]+)/.exec(hopLocation)
+                    || /\/connect\/authorize\/callback\?([^"' ]+)/.exec(hopBody);
+                if (cbMatch) {
+                    if (this.logDebug) this.emit('debug', 'Step 5: delegating to followCallbackForCode');
+                    authCode = await this.followCallbackForCode(client, cbMatch[1]);
+                    break;
+                }
 
-                const createDevice = (device, type) => {
-                    const settingsObject = Object.fromEntries(
-                        (device.Settings || []).map(({ name, value }) => [
-                            name.charAt(0).toUpperCase() + name.slice(1),
-                            this.functions.convertValue(value),
-                        ])
+                // C: code= bezpośrednio w location
+                const codeInLocation = /code=([^&"' ]+)/.exec(hopLocation);
+                if (codeInLocation) { authCode = codeInLocation[1]; break; }
+
+                // D: code= w body
+                const codeInBody = /code=([^&"' ]+)/.exec(hopBody);
+                if (codeInBody) { authCode = codeInBody[1]; break; }
+
+                // Zwykły redirect — podążaj dalej
+                if ((hopStatus === 301 || hopStatus === 302 || hopStatus === 303) && hopLocation) {
+                    const nextUrl = hopLocation.startsWith('http')
+                        ? hopLocation
+                        : `${ApiUrls.Home.AuthBase}${hopLocation}`;
+
+                    currentResp = await this.pace(() =>
+                        client.get(nextUrl, {
+                            headers: { 'User-Agent': ApiUrls.Home.UserAgent },
+                            maxRedirects: 0,
+                        })
                     );
+                    continue;
+                }
 
-                    const deviceObject = {
-                        ...capitalizeKeys(device.Capabilities || {}),
-                        ...settingsObject,
-                        DeviceType: type,
-                        FirmwareAppVersion: device.ConnectedInterfaceIdentifier,
-                        IsConnected: device.IsConnected,
-                    };
-
-                    if (device.FrostProtection) device.FrostProtection = capitalizeKeys(device.FrostProtection);
-                    if (device.OverheatProtection) device.OverheatProtection = capitalizeKeys(device.OverheatProtection);
-                    if (device.HolidayMode) device.HolidayMode = capitalizeKeys(device.HolidayMode);
-                    if (Array.isArray(device.Schedule)) device.Schedule = device.Schedule.map(s => this._capitalizeKeysDeep(s));
-
-                    const { Settings, Capabilities, Id, GivenDisplayName, ...rest } = device;
-
-                    return {
-                        ...rest,
-                        Type: type,
-                        DeviceID: Id,
-                        DeviceName: GivenDisplayName,
-                        SerialNumber: Id,
-                        Device: deviceObject,
-                    };
-                };
-
-                return [
-                    ...(building.airToAirUnits || []).map(d => createDevice(capitalizeKeys(d), 0)),
-                    ...(building.airToWaterUnits || []).map(d => createDevice(capitalizeKeys(d), 1)),
-                    ...(building.airToVentilationUnits || []).map(d => createDevice(capitalizeKeys(d), 3)),
-                ];
-            });
-
-            if (devices.length === 0) {
-                result.Status = 'No devices found';
-                return result;
+                throw new Error(`Unexpected response in redirect chain: status=${hopStatus}, location=${hopLocation}`);
             }
 
-            // Sceny
-            let scenes = [];
-            try {
-                scenes = await this.checkScenesList();
-                if (this.logDebug) this.emit('debug', `Found ${scenes.length} scenes`);
-            } catch (error) {
-                if (this.logError) this.emit('error', `Get scenes error: ${error}`);
-            }
+            if (!authCode) throw new Error('Failed to extract auth code after redirect chain');
 
-            result.State = true;
-            result.Status = `Found ${devices.length} devices${scenes.length > 0 ? ` and ${scenes.length} scenes` : ''}`;
-            result.Buildings = userContext;
-            result.Devices = devices;
-            result.Scenes = scenes;
+            if (this.logDebug) this.emit('debug', `Got auth code: ${authCode.slice(0, 20)}...`);
 
-            for (const deviceData of result.Devices) {
-                deviceData.Scenes = result.Scenes;
-                this.emit(deviceData.DeviceID, 'request', deviceData);
-            }
+            // ── Step 6: Wymień kod na tokeny ──────────────────────────────────
+            const exchangeRes = await this.exchangeCodeForTokens(client, authCode, codeVerifier);
+            return this.buildConnectInfo(connectInfo, exchangeRes);
 
-            return result;
         } catch (error) {
-            throw new Error(`Check devices list error: ${error.message}`);
-        }
-    }
-
-    // ── Utils ─────────────────────────────────────────────────────────────────
-
-    _capitalizeKeysDeep(obj) {
-        if (Array.isArray(obj)) return obj.map(item => this._capitalizeKeysDeep(item));
-        if (obj && typeof obj === 'object') {
-            return Object.fromEntries(
-                Object.entries(obj).map(([k, v]) => [
-                    k.charAt(0).toUpperCase() + k.slice(1),
-                    this._capitalizeKeysDeep(v),
-                ])
-            );
+            throw new Error(`Connect error: ${error.message}`);
         }
-        return obj;
-    }
-
-    logout() {
-        this._authenticated = false;
-        this._accessToken = null;
-        this._refreshToken = null;
-        this._tokenExpiry = 0;
     }
 }