homebridge-melcloud-control 4.0.0-beta.388 → 4.0.0-beta.389

package/package.json

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

package/src/melcloudhometoken.js

@@ -71,6 +71,95 @@ class MelCloudHomeToken extends EventEmitter {
         }
     }
 
+    async extractCodeFromResponse(data, headers, followRedirect) {
+        return new Promise(async (resolve, reject) => {
+            try {
+                const locationHeader = headers['location'] || headers['Location'];
+
+                // 1️⃣ Location header
+                if (locationHeader && locationHeader.startsWith('melcloudhome://')) {
+                    const match = locationHeader.match(/[?&]code=([^&]+)/);
+                    if (match) {
+                        this.emit('warn', `Found code in Location header: ${match[1]}`);
+                        resolve(match[1]);
+                        return;
+                    }
+                }
+
+                // 2️⃣ form_post HTML
+                const formCodeMatch = data.match(/name="code"\s+value="([^"]+)"/);
+                const formStateMatch = data.match(/name="state"\s+value="([^"]+)"/);
+                const formActionMatch = data.match(/action="([^"]+)"/);
+
+                if (formCodeMatch && formStateMatch && formActionMatch) {
+                    this.emit('warn', 'Found form_post response, submitting to callback endpoint...');
+                    try {
+                        const code = await this.submitFormPost(formActionMatch[1], formCodeMatch[1], formStateMatch[1]);
+                        this.emit('warn', `submitFormPost returned code: ${code}`);
+                        resolve(code);
+                        return;
+                    } catch (err) {
+                        this.emit('warn', `submitFormPost failed: ${err}`);
+                        reject(err);
+                        return;
+                    }
+                }
+
+                // 3️⃣ JS redirect w body
+                const bodyCodeMatch = data.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
+                if (bodyCodeMatch) {
+                    this.emit('warn', `Found code in response body: ${bodyCodeMatch[1]}`);
+                    resolve(bodyCodeMatch[1]);
+                    return;
+                }
+
+                // 4️⃣ Follow redirect
+                if (locationHeader && ['301', '302', '303'].includes(headers['status'] || '')) {
+                    this.emit('warn', `Following redirect to ${locationHeader}`);
+                    try {
+                        const code = await followRedirect(locationHeader);
+                        resolve(code);
+                        return;
+                    } catch (err) {
+                        this.emit('warn', `Follow redirect failed: ${err}`);
+                        reject(err);
+                        return;
+                    }
+                }
+
+                this.emit('warn', 'Authorization code not found in response');
+                reject(new Error('Authorization code not found'));
+            } catch (error) {
+                this.emit('warn', `extractCodeFromResponse error: ${error}`);
+                reject(error);
+            }
+        });
+    }
+
+    // submitFormPost w JS
+    async submitFormPost(actionUrl, code, state) {
+        const formData = new URLSearchParams({ code, state });
+        this.emit('warn', `Submitting form_post to ${actionUrl}`);
+        const res = await this.client.post(actionUrl, formData.toString(), {
+            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+            maxRedirects: 0,
+            validateStatus: status => [200, 302, 303].includes(status),
+        });
+
+        const location = res.headers['location'];
+        if (location) {
+            const match = location.match(/[?&]code=([^&]+)/);
+            if (match) {
+                this.emit('warn', `Form post redirect returned code: ${match[1]}`);
+                return match[1];
+            }
+        }
+
+        this.emit('warn', 'Code not found after form_post submission');
+        throw new Error('Code not found after form_post submission');
+    }
+
+
     async loginToMelCloudHome(url) {
         try {
             // Step 1: Pobierz stronę logowania, żeby uzyskać sesję + token _csrf
@@ -112,19 +201,30 @@ class MelCloudHomeToken extends EventEmitter {
             });
 
             if (response.status === 400) if (this.logWarn) this.emit('warn', `Login failed (bad request or invalid credentials: ${response.data}`);
-            if (response.status === 302 && response.headers.location.startsWith('melcloudhome://')) {
-                // Login success — mamy redirect z "code="
-                const redirectUrl = response.headers.location;
-                if (this.logWarn) this.emit('warn', `Redirect URL: ${getResp}`);
-                if (this.logWarn) this.emit('warn', `Response headers: ${getResp.headers}`);
-
-                const match = redirectUrl.match(/[?&]code=([^&]+)/);
-                if (match) {
-                    const code = match[1];
-                    if (this.logWarn) this.emit('warn', `Redirect URL found code: ${code}`);
-                    return code;
-                } else {
-                    if (this.logWarn) this.emit('warn', `Redirect URL found, but no "code=" param: ${redirectUrl}`);
+            if (response.status === 302 || response.status === 200) {
+                // Zamiast szukać ręcznie, używamy extractCodeFromResponse
+                try {
+                    const code = await this.extractCodeFromResponse(
+                        response.data,          // treść odpowiedzi (HTML lub body)
+                        response.headers,       // nagłówki
+                        async (url) => {        // followRedirect
+                            const r = await this.client.get(url, {
+                                maxRedirects: 0,
+                                validateStatus: status => [200, 302, 303].includes(status)
+                            });
+                            return this.extractCodeFromResponse(r.data, r.headers, async (u) => this.extractCodeFromResponse(r.data, r.headers, followRedirect));
+                        }
+                    );
+
+                    if (code) {
+                        if (this.logWarn) this.emit('warn', `Authorization code obtained: ${code}`);
+                        return code;
+                    } else {
+                        if (this.logWarn) this.emit('warn', 'Authorization code not found in response');
+                        return null;
+                    }
+                } catch (err) {
+                    if (this.logWarn) this.emit('warn', `extractCodeFromResponse error: ${err}`);
                     return null;
                 }
             }