homebridge-melcloud-control 4.4.1-beta.25 → 4.4.1-beta.27

package/package.json

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

package/src/helper.js

@@ -0,0 +1,70 @@
+class CookieJar {
+    constructor() {
+        this.cookies = [];
+    }
+
+    addFromHeader(setCookie, url) {
+        if (!setCookie) return;
+
+        const urlObj = new URL(url);
+        const headers = Array.isArray(setCookie) ? setCookie : [setCookie];
+
+        for (const header of headers) {
+            const parts = header.split(';').map(p => p.trim());
+            const [name, value] = parts[0].split('=');
+
+            const cookie = {
+                name,
+                value,
+                domain: urlObj.hostname,
+                path: '/',
+                expires: null,
+            };
+
+            for (const part of parts.slice(1)) {
+                const [key, val] = part.split('=').map(v => v?.trim());
+                if (!key) continue;
+
+                switch (key.toLowerCase()) {
+                    case 'domain':
+                        cookie.domain = val;
+                        break;
+                    case 'path':
+                        cookie.path = val || '/';
+                        break;
+                    case 'expires':
+                        cookie.expires = new Date(val);
+                        break;
+                    case 'max-age':
+                        cookie.expires = new Date(Date.now() + Number(val) * 1000);
+                        break;
+                }
+            }
+
+            this.cookies = this.cookies.filter(
+                c => !(c.name === cookie.name && c.domain === cookie.domain && c.path === cookie.path),
+            );
+
+            this.cookies.push(cookie);
+        }
+    }
+
+    headerFor(url) {
+        const urlObj = new URL(url);
+        const now = Date.now();
+
+        const validCookies = this.cookies.filter(cookie => {
+            if (cookie.expires && cookie.expires.getTime() <= now) return false;
+            if (!urlObj.hostname.endsWith(cookie.domain)) return false;
+            if (!urlObj.pathname.startsWith(cookie.path)) return false;
+            return true;
+        });
+
+        return validCookies.length
+            ? validCookies.map(c => `${c.name}=${c.value}`).join('; ')
+            : null;
+    }
+}
+
+
+export default CookieJar

package/src/melcloudhome.js

@@ -9,6 +9,8 @@ import Functions from './functions.js';
 import { ApiUrls, LanguageLocaleMap } from './constants.js';
 const execPromise = promisify(exec);
 
+import CookieJar from './helper.js';
+
 import crypto from 'crypto';
 import { URL } from 'url';
 
@@ -31,8 +33,6 @@ class MelCloudHome extends EventEmitter {
         this.socketConnected = false;
         this.heartbeat = null;
 
-        this.cookies = [];
-
         this.functions = new Functions(this.logWarn, this.logError, this.logDebug)
             .on('warn', warn => this.emit('warn', warn))
             .on('error', error => this.emit('error', error))
@@ -447,53 +447,93 @@ class MelCloudHome extends EventEmitter {
     }
 
 
-    async axiosRequest(url, options, jar, maxRedirects = 10) {
+    async axiosRequest(url, options, jar, maxRedirects = 15) {
         let currentUrl = url;
+        let previousUrl = null;
+        let method = options.method || 'GET';
+        let body = options.body;
 
         for (let i = 0; i < maxRedirects; i++) {
+            const cookieHeader = jar.headerFor(currentUrl);
+
+            const headers = {
+                'User-Agent': options.headers?.['User-Agent'],
+                'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+                'Accept-Language': 'en-US,en;q=0.9',
+                'Accept-Encoding': 'identity',
+                ...(previousUrl ? { Referer: previousUrl } : {}),
+                ...(cookieHeader ? { Cookie: cookieHeader } : {}),
+                ...options.headers,
+            };
+
             const response = await axios({
                 url: currentUrl,
-                method: options.method || 'GET',
-                data: options.body,
-                headers: {
-                    ...options.headers,
-                    ...(jar.headerFor(currentUrl) && { Cookie: jar.headerFor(currentUrl) }),
-                },
-                validateStatus: () => true,
+                method,
+                data: body,
+                headers,
                 maxRedirects: 0,
+                validateStatus: () => true,
                 responseType: 'text',
             });
 
             jar.addFromHeader(response.headers['set-cookie'], currentUrl);
 
+            /* ========= HTTP REDIRECT ========= */
             if ([301, 302, 303, 307, 308].includes(response.status)) {
                 const location = response.headers.location;
                 if (!location) break;
 
+                // SUCCESS: app redirect
                 if (location.startsWith('melcloudhome://')) {
                     return { url: location, data: response.data };
                 }
 
+                previousUrl = currentUrl;
                 currentUrl = location.startsWith('http')
                     ? location
                     : new URL(location, currentUrl).toString();
 
-                options.method = 'GET';
-                options.body = undefined;
+                method = 'GET';
+                body = undefined;
                 continue;
             }
 
-            return { url: currentUrl, data: response.data };
+            /* ========= META REFRESH ========= */
+            const metaMatch = response.data?.match(
+                /<meta[^>]+http-equiv=["']?refresh["']?[^>]+content=["']?\d+;\s*url=([^"'>]+)["']?/i
+            );
+
+            if (metaMatch) {
+                const redirectPath = metaMatch[1]
+                    .replace(/&amp;/g, '&')
+                    .replace(/&#x2F;/g, '/');
+
+                previousUrl = currentUrl;
+                currentUrl = redirectPath.startsWith('http')
+                    ? redirectPath
+                    : new URL(redirectPath, currentUrl).toString();
+
+                method = 'GET';
+                body = undefined;
+                continue;
+            }
+
+            /* ========= FINAL RESPONSE ========= */
+            return {
+                url: currentUrl,
+                data: response.data,
+                headers: response.headers,
+            };
         }
 
-        throw new Error('Too many redirects');
+        throw new Error('OAuth flow aborted: too many redirects');
     }
 
+
     async loginWithCredentials(email, password) {
         const jar = new CookieJar();
 
-        const userAgent =
-            'Mozilla/5.0 (iPhone; CPU iPhone OS 18_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.1 Mobile Safari/604.1';
+        const userAgent = 'Mozilla/5.0 (iPhone; CPU iPhone OS 18_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.1 Mobile Safari/604.1';
 
         const codeVerifier = crypto.randomBytes(32).toString('base64url');
         const codeChallenge = crypto
@@ -501,8 +541,7 @@ class MelCloudHome extends EventEmitter {
             .update(codeVerifier)
             .digest('base64url');
 
-        const authUrl =
-            'https://auth.melcloudhome.com/connect/authorize?' +
+        const authUrl = 'https://auth.melcloudhome.com/connect/authorize?' +
             new URLSearchParams({
                 client_id: 'homemobile',
                 redirect_uri: 'melcloudhome://',
@@ -517,9 +556,7 @@ class MelCloudHome extends EventEmitter {
             headers: { 'User-Agent': userAgent },
         }, jar);
 
-        const csrfMatch =
-            loginPage.data.match(/name="(_csrf|__RequestVerificationToken)".*?value="([^"]+)"/);
-
+        const csrfMatch = loginPage.data.match(/name="(_csrf|__RequestVerificationToken)".*?value="([^"]+)"/);
         if (!csrfMatch) throw new Error('CSRF token not found');
         const csrfToken = csrfMatch[2];
 
@@ -548,8 +585,7 @@ class MelCloudHome extends EventEmitter {
         if (!code) throw new Error('Authorization code missing');
 
         // STEP 3 – exchange token
-        const tokenResponse = await axios.post(
-            'https://auth.melcloudhome.com/connect/token',
+        const tokenResponse = await axios.post('https://auth.melcloudhome.com/connect/token',
             new URLSearchParams({
                 grant_type: 'authorization_code',
                 client_id: 'homemobile',
@@ -576,54 +612,6 @@ class MelCloudHome extends EventEmitter {
         };
     }
 
-    addFromHeader(setCookie, url) {
-        if (!setCookie) return;
-        const urlObj = new URL(url);
-        const cookies = Array.isArray(setCookie) ? setCookie : [setCookie];
-
-        for (const header of cookies) {
-            const parts = header.split(';').map(p => p.trim());
-            const [name, value] = parts[0].split('=');
-
-            const cookie = {
-                name,
-                value,
-                domain: urlObj.hostname,
-                path: '/',
-                expires: null,
-            };
-
-            for (const part of parts.slice(1)) {
-                const [k, v] = part.split('=');
-                if (!k) continue;
-                const key = k.toLowerCase();
-                if (key === 'domain') cookie.domain = v;
-                if (key === 'path') cookie.path = v;
-                if (key === 'expires') cookie.expires = new Date(v);
-                if (key === 'max-age') cookie.expires = new Date(Date.now() + Number(v) * 1000);
-            }
-
-            this.cookies = this.cookies.filter(
-                c => !(c.name === cookie.name && c.domain === cookie.domain && c.path === cookie.path),
-            );
-            this.cookies.push(cookie);
-        }
-    }
-
-    headerFor(url) {
-        const urlObj = new URL(url);
-        const now = Date.now();
-
-        return this.cookies
-            .filter(c =>
-                (!c.expires || c.expires.getTime() > now) &&
-                urlObj.hostname.endsWith(c.domain) &&
-                urlObj.pathname.startsWith(c.path),
-            )
-            .map(c => `${c.name}=${c.value}`)
-            .join('; ');
-    }
-
     async connect() {
         if (this.logDebug) this.emit('debug', 'Connecting to MELCloud Home');