homebridge-melcloud-control 4.0.0-beta.303 → 4.0.0-beta.305

package/package.json

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

package/src/melcloudhometoken.js

@@ -15,11 +15,13 @@ class MelCloudHomeToken {
         const jar = new CookieJar();
         this.client = wrapper(axios.create({ jar, withCredentials: true }));
         this.client.defaults.headers['User-Agent'] = MOBILE_USER_AGENT;
+        this.verifier;
     }
 
     generatePKCE() {
         const verifier = crypto.randomBytes(32).toString('base64url');
         const challenge = crypto.createHash('sha256').update(verifier).digest('base64url');
+        this.verifier = verifier;
         return { verifier, challenge };
     }
 
@@ -76,31 +78,35 @@ class MelCloudHomeToken {
     }
 
     async getTokens(code) {
-        const pkce = this.generatePKCE();
-        const tokenData = new URLSearchParams({
-            grant_type: 'authorization_code',
-            code: code,
-            redirect_uri: REDIRECT_URI,
-            client_id: CLIENT_ID,
-            code_verifier: pkce.verifier,
-        });
-
-        const res = await axios(TOKEN_ENDPOINT, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-                'Content-Length': tokenData.toString().length,
-                'Authorization': 'Basic aG9tZW1vYmlsZTo='
-            },
-            data: tokenData,
-            timeout: 10000
-        });
-        console.log(res);
-        if (res.status !== 200) {
-            throw new Error(`Token exchange failed: ${res.status} ${res.statusText}`);
-        }
+        try {
+            const data = new URLSearchParams({
+                grant_type: 'authorization_code',
+                code: code,
+                redirect_uri: REDIRECT_URI,
+                client_id: CLIENT_ID,
+                code_verifier: this.verifier,
+            });
+
+            const res = await axios({
+                method: 'POST',
+                url: TOKEN_ENDPOINT,
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                    'Content-Length': tokenData.toString().length,
+                    'Authorization': 'Basic aG9tZW1vYmlsZTo='
+                },
+                data: data
+            });
+            console.log(res);
+            if (res.status !== 200) {
+                throw new Error(`Token exchange failed: ${res.status} ${res.statusText}`);
+            }
 
-        return res.data;
+            return res.data;
+        } catch (error) {
+            console.error('Failed to obtain OAuth tokens:', error);
+            throw error;
+        }
     }
 
 
@@ -120,7 +126,7 @@ class MelCloudHomeToken {
 
             return loginPage.url;
         } catch (error) {
-            console.error('Failed to obtain OAuth tokens:', error);
+            console.error('Failed to obtain OAuth link:', error);
             throw error;
         }
     }