homebridge-melcloud-control 4.0.0-beta.323 → 4.0.0-beta.325

package/package.json

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

package/src/melcloud.js

@@ -296,39 +296,12 @@ class MelCloud extends EventEmitter {
                 .on('error', error => this.emit('error', error));
 
             const data = await melCloudHomeToken.buildAuthorizeUrl();
-            const code = await melCloudHomeToken.loginToMelCloudHome(data.url);
-            const token = await melCloudHomeToken.getTokens(code, data.codeVerifier);
+            const cookies = await melCloudHomeToken.loginToMelCloudHome(data.url);
 
-            return false
-
-            browser = await puppeteer.launch({
-                headless: true,
-                args: ['--no-sandbox', '--disable-setuid-sandbox']
-            });
-
-            const page = await browser.newPage();
-            await page.goto(data.url, { waitUntil: 'networkidle2' });
-
-            await page.waitForSelector('input[name="username"]', { timeout: 5000 });
-            await page.type('input[name="username"]', this.user, { delay: 50 });
-            await page.type('input[name="password"]', this.passwd, { delay: 50 });
-            const button1 = await page.$('input[type="submit"]');
-            await Promise.all([button1.click(), page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 10000 })]);
-            const html = await page.content();
-            const code1 = await melCloudHomeToken.extractCodeFromHtml(html);
-            this.emit('warn', code);
-
-            // 5. Wymień code na access_token
-            const tokenResponse = await melCloudHomeToken.getTokens(code, data.codeVerifier);
-            const tokenData = await tokenResponse.json();
-            this.emit('debug', `Token: ${JSON.stringify(tokenData, null, 2)}`);
-            const accountInfo = {
-                accessToken: tokenData.access_token,
-                refreshToken: tokenData.refresh_token,
-                expiresIn: tokenData.expires_in
-            };
+            const accountInfo = { ContextKey: cookies, UseFahrenheit: false };
+            this.contextKey = contextKey;
 
-            return accountInfo;
+            return accountInfo
         } catch (error) {
             if (browser) await browser.close().catch(() => { });
             throw error;

package/src/melcloudhometoken.js

@@ -93,7 +93,8 @@ class MelCloudHomeToken extends EventEmitter {
                 code_verifier: codeVerifier,
             }).toString(), {
                 headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded'
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                    'Authorization': 'Basic aG9tZW1vYmlsZTo='
                 }
             });
 
@@ -105,7 +106,6 @@ class MelCloudHomeToken extends EventEmitter {
         }
     }
 
-
     async loginToMelCloudHome(url) {
         try {
             // Step 1: Pobierz stronę logowania, żeby uzyskać sesję + token _csrf
@@ -119,25 +119,6 @@ class MelCloudHomeToken extends EventEmitter {
 
             const cookies = getResp.headers['set-cookie'] || [];
             const dom = new JSDOM(getResp.data);
-            const formAction = dom.window.document.querySelector('form[action]')?.getAttribute('action');
-            if (!formAction) {
-                if (this.logWarn) this.emit('warn', `Login form not found in HTML`);
-                return null;
-            }
-
-            const formUrl = new URL(formAction, 'https://auth.melcloudhome.com'); // absolutny URL
-            const clientId = formUrl.searchParams.get('client_id');
-            const redirectUri = formUrl.searchParams.get('redirect_uri');
-
-            if (!clientId || !redirectUri) {
-                if (this.logWarn) this.emit('warn', `client_id or redirect_uri missing in login form`);
-                return null;
-            }
-
-            // Zapisz do this.* żeby użyć później w exchangeCodeForToken()
-            this.clientId = clientId;
-            this.redirectUri = redirectUri;
-
             const csrf = dom.window.document.querySelector('input[name="_csrf"]')?.value;
             if (!csrf) {
                 if (this.logWarn) this.emit('warn', `CSRF token not found`);
@@ -164,6 +145,12 @@ class MelCloudHomeToken extends EventEmitter {
                 validateStatus: status => [200, 302, 400].includes(status),
             });
 
+            const cookie = response.headers['set-cookie'];
+            if (cookie) {
+                if (this.logWarn) this.emit('warn', `Cookie returned from login. Response headers: ${JSON.stringify(response.headers)}`);
+                return cookie;
+            }
+
             if (response.status === 302 && response.headers.location) {
                 // Login success — mamy redirect z "code="
                 const redirectUrl = response.headers.location;