homebridge-melcloud-control 4.4.1-beta.8 → 4.5.0

package/src/melcloudatw.js

@@ -1,6 +1,6 @@
 import EventEmitter from 'events';
 import Functions from './functions.js';
-import { ApiUrls, ApiUrls, HeatPump } from './constants.js';
+import { ApiUrls, HeatPump } from './constants.js';
 
 class MelCloudAtw extends EventEmitter {
     constructor(account, device, defaultTempsFile, accountFile, melcloud) {
@@ -71,7 +71,19 @@ class MelCloudAtw extends EventEmitter {
                                     }
                                 }
 
-                                if (this.logDebug) this.emit('debug', `WS update settings: ${JSON.stringify(deviceData.Device, null, 2)}`);
+                                updateState = true;
+                                break;
+                            case 'atwUnitFrostProtectionTriggered':
+                                deviceData.FrostProtection.Active = messageData.active;
+
+                                //update device settings
+                                for (const [key, value] of Object.entries(settings)) {
+                                    if (!this.functions.isValidValue(value)) continue;
+
+                                    if (key in deviceData.Device) {
+                                        deviceData.Device[key] = value;
+                                    }
+                                }
                                 updateState = true;
                                 break;
                             case 'unitHolidayModeTriggered':
@@ -84,6 +96,10 @@ class MelCloudAtw extends EventEmitter {
                                 deviceData.Rssi = messageData.rssi;
                                 updateState = true;
                                 break;
+                            case 'unitCommunicationRestored':
+                                timestamp = messageData.timestamp;
+                                deviceData.Device.IsConnected = true;
+                                break;
                             default:
                                 if (this.logDebug) this.emit('debug', `Unit ${unitId}, received unknown message type: ${parsedMessage}`);
                                 return;

package/src/melclouderv.js

@@ -1,6 +1,6 @@
 import EventEmitter from 'events';
 import Functions from './functions.js';
-import { ApiUrls, ApiUrls, Ventilation } from './constants.js';
+import { ApiUrls, Ventilation } from './constants.js';
 
 class MelCloudErv extends EventEmitter {
     constructor(account, device, defaultTempsFile, accountFile, melcloud) {
@@ -71,7 +71,19 @@ class MelCloudErv extends EventEmitter {
                                     }
                                 }
 
-                                if (this.logDebug) this.emit('debug', `WS update settings: ${JSON.stringify(deviceData.Device, null, 2)}`);
+                                updateState = true;
+                                break;
+                            case 'ervUnitFrostProtectionTriggered':
+                                deviceData.FrostProtection.Active = messageData.active;
+
+                                //update device settings
+                                for (const [key, value] of Object.entries(settings)) {
+                                    if (!this.functions.isValidValue(value)) continue;
+
+                                    if (key in deviceData.Device) {
+                                        deviceData.Device[key] = value;
+                                    }
+                                }
                                 updateState = true;
                                 break;
                             case 'unitHolidayModeTriggered':
@@ -84,6 +96,10 @@ class MelCloudErv extends EventEmitter {
                                 deviceData.Rssi = messageData.rssi;
                                 updateState = true;
                                 break;
+                            case 'unitCommunicationRestored':
+                                timestamp = messageData.timestamp;
+                                deviceData.Device.IsConnected = true;
+                                break;
                             default:
                                 if (this.logDebug) this.emit('debug', `Unit ${unitId}, received unknown message type: ${parsedMessage}`);
                                 return;

package/src/melcloudhome.js

@@ -77,7 +77,7 @@ class MelCloudHome extends EventEmitter {
     async checkScenesList() {
         try {
             if (this.logDebug) this.emit('debug', `Scanning for scenes`);
-            const listScenesData = await this.client(ApiUrls.Home.Get.UserScenes, { method: 'GET', });
+            const listScenesData = await this.client(ApiUrls.Home.Get.Scenes, { method: 'GET', });
 
             const scenesList = listScenesData.data;
             if (this.logDebug) this.emit('debug', `Scenes: ${JSON.stringify(scenesList, null, 2)}`);
@@ -107,9 +107,9 @@ class MelCloudHome extends EventEmitter {
 
     async checkDevicesList() {
         try {
-            const devicesList = { State: false, Info: null, Devices: [], Scenes: [] }
+            const devicesList = { State: false, Info: null, Buildings: {}, Devices: [], Scenes: [] }
             if (this.logDebug) this.emit('debug', `Scanning for devices`);
-            const listDevicesData = await this.client(ApiUrls.Home.Get.UserContext, { method: 'GET' });
+            const listDevicesData = await this.client(ApiUrls.Home.Get.ListDevices, { method: 'GET' });
 
             const userContext = listDevicesData.data;
             const buildings = userContext.buildings ?? [];
@@ -122,9 +122,6 @@ class MelCloudHome extends EventEmitter {
                 return devicesList;
             }
 
-            await this.functions.saveData(this.buildingsFile, userContext);
-            if (this.logDebug) this.emit('debug', `Buildings list saved`);
-
             const devices = buildingsList.flatMap(building => {
                 // Funkcja kapitalizująca klucze obiektu
                 const capitalizeKeys = obj => Object.fromEntries(Object.entries(obj).map(([key, value]) => [key.charAt(0).toUpperCase() + key.slice(1), value]));
@@ -205,8 +202,13 @@ class MelCloudHome extends EventEmitter {
 
             devicesList.State = true;
             devicesList.Info = `Found ${devicesCount} devices ${scenes.length > 0 ? `and ${scenes.length} scenes` : ''}`;
+            devicesList.Buildings = userContext;
             devicesList.Devices = devices;
             devicesList.Scenes = scenes;
+
+            await this.functions.saveData(this.buildingsFile, devicesList);
+            if (this.logDebug) this.emit('debug', `Buildings list saved`);
+
             this.emit('devicesList', devicesList);
 
             return devicesList;
@@ -223,32 +225,36 @@ class MelCloudHome extends EventEmitter {
         try {
             const accountInfo = { State: false, Info: '', Account: {}, UseFahrenheit: false };
 
-            // Get Chromium path
-            let chromiumPath = await this.functions.ensureChromiumInstalled();
-
-            // Fallback to Puppeteer's bundled Chromium
-            if (!chromiumPath) {
-                try {
-                    const puppeteerPath = puppeteer.executablePath();
-                    if (puppeteerPath && puppeteerPath.length > 0) {
-                        chromiumPath = puppeteerPath;
-                        if (this.logDebug) this.emit('debug', `Using Puppeteer bundled Chromium at ${chromiumPath}`);
-                    } else {
-                        accountInfo.Info = `Puppeteer returned empty Chromium path`;
+            // Get Chromium path from resolver
+            const chromiumInfo = await this.functions.ensureChromiumInstalled();
+            let chromiumPath = chromiumInfo.path;
+            const arch = chromiumInfo.arch;
+            const system = chromiumInfo.system;
+
+            // If path is found, use it
+            if (chromiumPath) {
+                if (!this.logDebug) this.emit('debug', `Using Chromium for ${system} (${arch}) at ${chromiumPath}`);
+            } else {
+                if (arch === 'arm') {
+                    accountInfo.Info = `No Chromium found for ${system} (${arch}). Please install it manually and try again.`;
+                    return accountInfo;
+                } else {
+                    try {
+                        chromiumPath = puppeteer.executablePath();
+                        if (!this.logDebug) this.emit('debug', `Using Puppeteer Chromium for ${system} (${arch}) at ${chromiumPath}`);
+                    } catch (error) {
+                        accountInfo.Info = `No Puppeteer Chromium for ${system} (${arch}), error: ${error.message}`;
                         return accountInfo;
                     }
-                } catch (error) {
-                    accountInfo.Info = `Failed to get Puppeteer Chromium path: ${error.message}`;
-                    return accountInfo;
                 }
             }
 
             // Verify Chromium executable
             try {
                 const { stdout } = await execPromise(`"${chromiumPath}" --version`);
-                if (this.logDebug) this.emit('debug', `Chromium detected: ${stdout.trim()}`);
+                if (!this.logDebug) this.emit('debug', `Chromium for ${system} (${arch}) detected: ${stdout.trim()}`);
             } catch (error) {
-                accountInfo.Info = `Chromium found at ${chromiumPath}, but cannot be executed: ${error.message}`;
+                accountInfo.Info = `Chromium for ${system} (${arch}) found at ${chromiumPath}, but execute error: ${error.message}. Please install it manually and try again.`;
                 return accountInfo;
             }
 
@@ -285,7 +291,7 @@ class MelCloudHome extends EventEmitter {
                         const hash = params.get('hash');
                         if (this.logDebug) this.emit('debug', `Web socket hash detected: ${hash}`);
 
-                        //web socket connection
+                        // Web socket connection
                         if (!this.connecting && !this.socketConnected) {
                             this.connecting = true;
 
@@ -417,7 +423,7 @@ class MelCloudHome extends EventEmitter {
                 baseURL: ApiUrls.Home.Base,
                 timeout: 30000,
                 headers: headers
-            })
+            });
             this.emit('client', this.client);
 
             accountInfo.State = true;