homebridge-melcloud-control 4.0.0-beta.307 → 4.0.0-beta.309

package/package.json

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

package/src/melcloud.js

@@ -284,14 +284,27 @@ class MelCloud extends EventEmitter {
     async connectToMelCloudHome() {
         let browser;
         try {
+
+            const melCloudHomeToken = new MelCloudHomeToken({
+                user: this.user,
+                passwd: this.passwd,
+                logWarn: this.logWarn,
+                logError: this.logError,
+            })
+                .on('success', message => this.emit('success', message))
+                .on('warn', warn => this.emit('warn', warn))
+                .on('error', error => this.emit('error', error));
+
+            const data = await melCloudHomeToken.buildAuthorizeUrl();
+            const code = await melCloudHomeToken.loginToMelCloudHome(data.url);
+
+            return false
+
             browser = await puppeteer.launch({
                 headless: true,
                 args: ['--no-sandbox', '--disable-setuid-sandbox']
             });
 
-            const melCloudHomeToken = new MelCloudHomeToken();
-            const data = await melCloudHomeToken.buildAuthorizeUrl();
-
             const page = await browser.newPage();
             await page.goto(data.url, { waitUntil: 'networkidle2' });
 
@@ -301,7 +314,7 @@ class MelCloud extends EventEmitter {
             const button1 = await page.$('input[type="submit"]');
             await Promise.all([button1.click(), page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 10000 })]);
             const html = await page.content();
-            const code = await melCloudHomeToken.extractCodeFromHtml(html);
+            const code1 = await melCloudHomeToken.extractCodeFromHtml(html);
             this.emit('warn', code);
 
             // 5. Wymień code na access_token
@@ -321,7 +334,6 @@ class MelCloud extends EventEmitter {
         }
     }
 
-
     async connectToMelCloudHome1(refresh = false) {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud Home`);
 

package/src/melcloudhometoken.js

@@ -2,6 +2,7 @@ import axios from 'axios';
 import crypto from 'crypto';
 import { wrapper } from 'axios-cookiejar-support';
 import { CookieJar } from 'tough-cookie';
+import EventEmitter from 'events';
 
 const MOBILE_USER_AGENT = 'MonitorAndControl.App.Mobile/35 CFNetwork/3860.100.1 Darwin/25.0.0';
 const CLIENT_ID = 'homemobile';
@@ -10,8 +11,14 @@ const SCOPE = 'openid profile email offline_access IdentityServerApi';
 const TOKEN_ENDPOINT = 'https://auth.melcloudhome.com/connect/token';
 const AUTHORIZE_ENDPOINT = 'https://auth.melcloudhome.com/connect/authorize';
 
-class MelCloudHomeToken {
-    constructor() {
+class MelCloudHomeToken extends EventEmitter {
+    constructor(config) {
+        super();
+        this.user = config.user;
+        this.passwd = config.passwd;
+        this.serialNumber = config.serialNumber;
+        this.logWarn = config.logWarn;
+        this.logError = config.logError;
         const jar = new CookieJar();
         this.client = wrapper(axios.create({ jar, withCredentials: true }));
         this.client.defaults.headers['User-Agent'] = MOBILE_USER_AGENT;
@@ -90,8 +97,7 @@ class MelCloudHomeToken {
                 url: TOKEN_ENDPOINT,
                 headers: {
                     'Content-Type': 'application/x-www-form-urlencoded',
-                    'Content-Length': data.toString().length,
-                    'Authorization': 'Basic aG9tZW1vYmlsZTo='
+                    'Content-Length': data.toString().length
                 },
                 data: data
             });
@@ -107,7 +113,6 @@ class MelCloudHomeToken {
         }
     }
 
-
     async buildAuthorizeUrl() {
         try {
             const pkce = this.generatePKCE();
@@ -120,8 +125,8 @@ class MelCloudHomeToken {
             authUrl.searchParams.set('code_challenge', pkce.challenge);
             authUrl.searchParams.set('code_challenge_method', 'S256');
             authUrl.searchParams.set('state', state);
-            const loginPage = await this.getLoginPage(authUrl.toString());
 
+            const loginPage = await this.getLoginPage(authUrl.toString());
             const data = { codeVerifier: pkce.verifier, url: loginPage.url }
             return data;
         } catch (error) {
@@ -129,6 +134,41 @@ class MelCloudHomeToken {
             throw error;
         }
     }
+
+    async loginToMelCloudHome(url) {
+        try {
+            const form = new URLSearchParams();
+            form.append('user[email]', this.user);
+            form.append('user[password]', this.passwd);
+
+            const response = await axios({
+                method: 'POST',
+                baseURL: url,
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded'
+                },
+                data: form,
+                timeout: 10000
+            });
+
+            this.emit('warn', `No cookie returned from login. Response headers: ${JSON.stringify(response)}`);
+
+            if (response.status !== 200) {
+                if (this.logError) this.emit('error', `Login failed with status code: ${response.status}`);
+                return null;
+            }
+
+            const cookie = response.headers['set-cookie'];
+            if (!cookie) {
+                if (this.logWarn) this.emit('warn', `No cookie returned from login. Response headers: ${JSON.stringify(response.headers)}`);
+                return null;
+            }
+
+            return cookie;
+        } catch (error) {
+            throw new Error(`Login to Enlighten error: ${error}`);
+        }
+    }
 }
 
 export default MelCloudHomeToken;