homebridge-melcloud-control 4.0.0-beta.340 → 4.0.0-beta.342

package/package.json

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

package/src/melcloudhometoken.js

@@ -84,28 +84,72 @@ class MelCloudHomeToken extends EventEmitter {
         }
     }
 
+    async axiosRequestWithRedirects(url, options = {}, body, redirectCount = 0) {
+        if (redirectCount > 10) {
+            throw new Error('Too many redirects');
+        }
+
+        try {
+            const method = (options.method || 'GET').toUpperCase();
+            const headers = options.headers || {};
+
+            const response = await axios({
+                url,
+                method,
+                headers,
+                data: body,
+                maxRedirects: 0, // wyłączamy automatyczne redirecty
+                validateStatus: status => status >= 200 && status < 400,
+            });
+
+            // Ręczne follow dla 301/302
+            if ([301, 302].includes(response.status)) {
+                const location = response.headers.location;
+                if (!location) throw new Error('Redirect status without Location header');
+
+                const redirectUrl = location.startsWith('http') ? location : new URL(location, url).toString();
+
+                // Przy POST zachowujemy body i headers
+                return axiosRequestWithRedirects(redirectUrl, options, body, redirectCount + 1);
+            }
+
+            // Zwracamy odpowiedź jako string
+            if (typeof response.data === 'string') {
+                return response.data;
+            } else {
+                return JSON.stringify(response.data);
+            }
+        } catch (err) {
+            throw new Error(`Axios request failed: ${err.message || err}`);
+        }
+    }
+
+
     async getTokens(code, codeVerifier) {
         try {
+
             const tokenData = new URLSearchParams({
                 grant_type: 'authorization_code',
                 code: code,
                 redirect_uri: REDIRECT_URI,
                 client_id: CLIENT_ID,
                 code_verifier: codeVerifier,
-            });
+            }).toString();
 
-            const tokenResponse = await axios.post(TOKEN_ENDPOINT, tokenData.toString(), {
+            const response = await axiosRequestWithRedirects(TOKEN_ENDPOINT, {
+                method: 'POST',
                 headers: {
                     'Content-Type': 'application/x-www-form-urlencoded',
                     'Authorization': 'Basic aG9tZW1vYmlsZTo=',
                 },
-            });
+            }, tokenData);
+
 
-            const tokens = tokenResponse.data;
-            this.emit('warn', `Token ${JSON.stringify(tokens)}`);
+            const tokens = response;
+            this.emit('warn', `Token ${JSON.stringify(response)}`);
             return tokens;
         } catch (error) {
-            throw new Error(`Failed to obtain OAuth token: ${error.response?.data || error}`);
+            throw new Error(`Failed to obtain OAuth token: ${error}`);
         }
     }