homebridge-melcloud-control 4.0.0-beta.535 → 4.0.0-beta.537

package/index.js

@@ -199,7 +199,7 @@ class MelCloudPlatform {
 										if (logLevel.success) log.success(`${accountName}, ${deviceTypeText}, ${deviceName}, Published as external accessory.`);
 
 										//start impulse generators\
-										const timmers = accountType === 'melcloudhome' ? [{ name: 'connect', sampling: 3300000 }, { name: 'checkDevicesList', sampling: deviceRefreshInterval }] : [{ name: 'checkDevicesList', sampling: refreshInterval }];
+										const timmers = accountType === 'melcloudhome' ? [{ name: 'connect', sampling: 3000000 }, { name: 'checkDevicesList', sampling: deviceRefreshInterval }] : [{ name: 'checkDevicesList', sampling: refreshInterval }];
 										await melCloud.impulseGenerator.state(true, timmers, false);
 										await configuredDevice.startStopImpulseGenerator(true, [{ name: 'checkState', sampling: deviceRefreshInterval }]);
 

package/package.json

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

package/src/melcloud.js

@@ -344,8 +344,47 @@ class MelCloud extends EventEmitter {
                 ]
             });
 
-            const context = await browser.createIncognitoBrowserContext();
-            const page = await context.newPage();
+            try {
+                // go to about:blank to ensure a clean origin
+                await page.goto('about:blank');
+
+                // prefer context-based clear if available
+                const pageContext = (typeof page.browserContext === 'function') ? page.browserContext() : (page.context ? page.context() : null);
+
+                if (pageContext && typeof pageContext.clearCookies === 'function') {
+                    // modern API in some puppeteer versions
+                    await pageContext.clearCookies();
+                } else {
+                    // try CDP directly (works in most environments)
+                    if (page._client && typeof page._client === 'function') {
+                        const client = await page._client();
+                        if (client && client.send) {
+                            await client.send('Network.clearBrowserCookies');
+                        } else if (page._client && page._client.send) {
+                            // some versions expose _client directly as object
+                            await page._client.send('Network.clearBrowserCookies');
+                        } else {
+                            // fallback to deleting cookies returned by page.cookies()
+                            const cookies = await page.cookies();
+                            if (cookies && cookies.length) {
+                                await page.deleteCookie(...cookies).catch(() => { });
+                            }
+                        }
+                    } else if (page._client && page._client.send) {
+                        // older shape where _client is object
+                        await page._client.send('Network.clearBrowserCookies');
+                    } else {
+                        // final fallback
+                        const cookies = await page.cookies();
+                        if (cookies && cookies.length) {
+                            await page.deleteCookie(...cookies).catch(() => { });
+                        }
+                    }
+                }
+            } catch (clearErr) {
+                // nie przerywamy procesu logowania jeśli clear cookies nie zadziała, logujemy tylko warn
+                this.emit('warn', `Failed to clear cookies cleanly: ${clearErr.message}`);
+            }
             page.setDefaultTimeout(GLOBAL_TIMEOUT);
             page.setDefaultNavigationTimeout(GLOBAL_TIMEOUT);
 
@@ -402,6 +441,7 @@ class MelCloud extends EventEmitter {
 
             this.emit('warn', `Found submit button ${submitButton}`);
             await Promise.race([Promise.all([submitButton.click(), page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT / 4 })]), new Promise(r => setTimeout(r, GLOBAL_TIMEOUT / 3))]);
+            await new Promise(r => setTimeout(r, 2000));
 
             this.emit('warn', `Looking for cookies...`);
             // Extract cookies
@@ -438,15 +478,8 @@ class MelCloud extends EventEmitter {
             throw new Error(`Connect error: ${error.message}`);
         } finally {
             if (browser) {
-                try {
-                    const contexts = browser.browserContexts();
-                    for (const ctx of contexts) {
-                        await ctx.close().catch(() => { });
-                    }
-                    await browser.close();
-                } catch (closeErr) {
-                    this.emit('error', `Failed to close Puppeteer: ${closeErr.message}`);
-                }
+                try { await browser.close(); }
+                catch (closeErr) { this.emit('error', `Failed to close Puppeteer: ${closeErr.message}`); }
             }
         }
     }