homebridge-melcloud-control 4.0.0-beta.29 → 4.0.0-beta.30

package/index.js

@@ -95,14 +95,10 @@ class MelCloudPlatform {
 									.on('warn', (msg) => logLevel.warn && log.warn(`${accountName}, ${msg}`))
 									.on('error', (msg) => logLevel.error && log.error(`${accountName}, ${msg}`));
 
-								await melCloud.connectHomeCookies();
-								return;
-
-
 								//connect
 								let response;
 								try {
-									response = await melCloud.connect();
+									response = await melCloud.connect('home');
 								} catch (error) {
 									if (logLevel.error) log.error(`${accountName}, Connect error: ${error.message ?? error}`);
 									return;

package/package.json

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

package/src/melcloud.js

@@ -109,7 +109,7 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connect() {
+    async connectMelCloud() {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud`);
 
         try {
@@ -166,14 +166,15 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connectHome(cookieC1, cookieC2) {
+    async connectMelCloudHome() {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud Home`);
 
         try {
-            const c1 = cookieC1.trim();
-            const c2 = cookieC2.trim();
+            const coocies = await this.getCookies();
+            const c1 = coocies.C1.trim();
+            const c2 = coocies.C2.trim();
 
-            const cookieString = [
+            const cookies = [
                 '__Secure-monitorandcontrol=chunks-2',
                 `__Secure-monitorandcontrolC1=${c1}`,
                 `__Secure-monitorandcontrolC2=${c2}`,
@@ -189,7 +190,7 @@ class MelCloud extends EventEmitter {
                 headers: {
                     'Accept': '*/*',
                     'Accept-Language': 'en-US,en;q=0.9',
-                    'Cookie': cookieString,
+                    'Cookie': cookies,
                     'User-Agent': 'homebridge-melcloud-home/0.2.0',
                     'DNT': '1',
                     'Origin': 'https://melcloudhome.com',
@@ -203,7 +204,7 @@ class MelCloud extends EventEmitter {
 
             const response = await axiosInstance.get(ApiUrlsHome.GetUserContext);
             const homeData = response.data;
-            if (this.logDebug) this.emit('debug', `[MELCloudHome] Response data: ${JSON.stringify(homeData, null, 2)}`);
+            if (this.logDebug) this.emit('debug', `MELCloud Home data: ${JSON.stringify(homeData, null, 2)}`);
 
             this.emit('success', `Connect to MELCloud Home Success`);
 
@@ -213,48 +214,13 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async loginToMelcloudHome() {
-        try {
-            const form = new URLSearchParams();
-            form.append('user[email]', this.user);
-            form.append('user[password]', this.passwd);
-
-            const response = await axios({
-                method: 'POST',
-                baseURL: EnphaseUrls.BaseUrl,
-                url: EnphaseUrls.Login,
-                headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded'
-                },
-                data: form,
-                timeout: 10000
-            });
-
-            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}`);
-        }
-    }
-
-    async connectHomeCookies() {
-        const loginUrl = 'https://melcloudhome.com';
+    async getCookies() {
         const browser = await puppeteer.launch({ headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox'] });
         const page = await browser.newPage();
 
         try {
             this.emit('warn', 'Opening login page...');
-            await page.goto(loginUrl, { waitUntil: 'networkidle2' });
+            await page.goto(ApiUrlsHome.BaseURL, { waitUntil: 'networkidle2' });
 
             // Kliknij przycisk logowania
             const buttons = await page.$$('button.btn--blue');
@@ -301,7 +267,7 @@ class MelCloud extends EventEmitter {
 
             if (!c1 || !c2) {
                 await browser.close();
-                throw new Error('❌ Cookies C1/C2 not found after login');
+                throw new Error('Cookies C1/C2 not found after login');
             }
 
             // Zapis do pliku
@@ -310,7 +276,6 @@ class MelCloud extends EventEmitter {
 
             this.emit('warn', 'Login successful.');
             return data;
-
         } catch (err) {
             this.emit('error', `Login failed: ${err.message}`);
             return null;
@@ -319,7 +284,14 @@ class MelCloud extends EventEmitter {
         }
     }
 
-
+    async connect(mode) {
+        switch (mode) {
+            case 'home':
+                return await this.connectMelCloudHome();
+            default:
+                return await this.connectMelCloud();
+        }
+    }
 
     async send(accountInfo) {
         try {