homebridge-melcloud-control 4.4.1-beta.24 → 4.4.1-beta.26

package/package.json

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

package/src/helper.js

@@ -0,0 +1,70 @@
+class CookieJar {
+    constructor() {
+        this.cookies = [];
+    }
+
+    addFromHeader(setCookie, url) {
+        if (!setCookie) return;
+
+        const urlObj = new URL(url);
+        const headers = Array.isArray(setCookie) ? setCookie : [setCookie];
+
+        for (const header of headers) {
+            const parts = header.split(';').map(p => p.trim());
+            const [name, value] = parts[0].split('=');
+
+            const cookie = {
+                name,
+                value,
+                domain: urlObj.hostname,
+                path: '/',
+                expires: null,
+            };
+
+            for (const part of parts.slice(1)) {
+                const [key, val] = part.split('=').map(v => v?.trim());
+                if (!key) continue;
+
+                switch (key.toLowerCase()) {
+                    case 'domain':
+                        cookie.domain = val;
+                        break;
+                    case 'path':
+                        cookie.path = val || '/';
+                        break;
+                    case 'expires':
+                        cookie.expires = new Date(val);
+                        break;
+                    case 'max-age':
+                        cookie.expires = new Date(Date.now() + Number(val) * 1000);
+                        break;
+                }
+            }
+
+            this.cookies = this.cookies.filter(
+                c => !(c.name === cookie.name && c.domain === cookie.domain && c.path === cookie.path),
+            );
+
+            this.cookies.push(cookie);
+        }
+    }
+
+    headerFor(url) {
+        const urlObj = new URL(url);
+        const now = Date.now();
+
+        const validCookies = this.cookies.filter(cookie => {
+            if (cookie.expires && cookie.expires.getTime() <= now) return false;
+            if (!urlObj.hostname.endsWith(cookie.domain)) return false;
+            if (!urlObj.pathname.startsWith(cookie.path)) return false;
+            return true;
+        });
+
+        return validCookies.length
+            ? validCookies.map(c => `${c.name}=${c.value}`).join('; ')
+            : null;
+    }
+}
+
+
+export default CookieJar

package/src/melcloudhome.js

@@ -9,6 +9,8 @@ import Functions from './functions.js';
 import { ApiUrls, LanguageLocaleMap } from './constants.js';
 const execPromise = promisify(exec);
 
+import CookieJar from './helper.js';
+
 import crypto from 'crypto';
 import { URL } from 'url';
 
@@ -513,7 +515,7 @@ class MelCloudHome extends EventEmitter {
             }).toString();
 
         // STEP 1 – get login page
-        const loginPage = await axiosRequest(authUrl, {
+        const loginPage = await this.axiosRequest(authUrl, {
             headers: { 'User-Agent': userAgent },
         }, jar);
 
@@ -530,7 +532,7 @@ class MelCloudHome extends EventEmitter {
             password,
         }).toString();
 
-        const loginResult = await axiosRequest(loginPage.url, {
+        const loginResult = await this.axiosRequest(loginPage.url, {
             method: 'POST',
             headers: {
                 'User-Agent': userAgent,
@@ -576,61 +578,13 @@ class MelCloudHome extends EventEmitter {
         };
     }
 
-    addFromHeader(setCookie, url) {
-        if (!setCookie) return;
-        const urlObj = new URL(url);
-        const cookies = Array.isArray(setCookie) ? setCookie : [setCookie];
-
-        for (const header of cookies) {
-            const parts = header.split(';').map(p => p.trim());
-            const [name, value] = parts[0].split('=');
-
-            const cookie = {
-                name,
-                value,
-                domain: urlObj.hostname,
-                path: '/',
-                expires: null,
-            };
-
-            for (const part of parts.slice(1)) {
-                const [k, v] = part.split('=');
-                if (!k) continue;
-                const key = k.toLowerCase();
-                if (key === 'domain') cookie.domain = v;
-                if (key === 'path') cookie.path = v;
-                if (key === 'expires') cookie.expires = new Date(v);
-                if (key === 'max-age') cookie.expires = new Date(Date.now() + Number(v) * 1000);
-            }
-
-            this.cookies = this.cookies.filter(
-                c => !(c.name === cookie.name && c.domain === cookie.domain && c.path === cookie.path),
-            );
-            this.cookies.push(cookie);
-        }
-    }
-
-    headerFor(url) {
-        const urlObj = new URL(url);
-        const now = Date.now();
-
-        return this.cookies
-            .filter(c =>
-                (!c.expires || c.expires.getTime() > now) &&
-                urlObj.hostname.endsWith(c.domain) &&
-                urlObj.pathname.startsWith(c.path),
-            )
-            .map(c => `${c.name}=${c.value}`)
-            .join('; ');
-    }
-
     async connect() {
         if (this.logDebug) this.emit('debug', 'Connecting to MELCloud Home');
 
         try {
             const accountInfo = { State: false, Info: '', Account: {}, UseFahrenheit: false };
 
-            const tokens = await loginWithCredentials(this.user, this.passwd);
+            const tokens = await this.loginWithCredentials(this.user, this.passwd);
             this.emit('debug', `Tokens: ${JSON.stringify(tokens, null, 2)}`);
             return accountInfo
         } catch (error) {