homebridge-melcloud-control 4.4.1-beta.37 → 4.4.1-beta.39

package/homebridge-ui/public/index.html

@@ -346,7 +346,7 @@
                     namePrefix: false
                   };
                   deviceInConfig.scenes.push(sceneObj);
-                  newScenes.push(sceneObj);
+                  if (index === 0) newScenes.push(sceneObj);
                 }
               });
             }
@@ -356,9 +356,9 @@
         };
 
         // Execute device handlers
-        account.ataDevices = handleDevices(devicesInMelCloudByType.ata, account.ataDevices, "Air Conditioner", newInMelCloud.ata, newInMelCloud.ataPresets, newInMelCloud.ataSchedules, newInMelCloud.ataScenes);
-        account.atwDevices = handleDevices(devicesInMelCloudByType.atw, account.atwDevices, "Heat Pump", newInMelCloud.atw, newInMelCloud.atwPresets, newInMelCloud.atwSchedules, newInMelCloud.atwScenes);
-        account.ervDevices = handleDevices(devicesInMelCloudByType.erv, account.ervDevices, "Energy Recovery Ventilation", newInMelCloud.erv, newInMelCloud.ervPresets, newInMelCloud.ervSchedules, newInMelCloud.ervScenes);
+        account.ataDevices = handleDevices(devicesInMelCloudByType.ata, account.ataDevices, "Air Conditioner", newInMelCloud.ata, newInMelCloud.ataPresets, newInMelCloud.ataSchedules, newInMelCloud.scenes);
+        account.atwDevices = handleDevices(devicesInMelCloudByType.atw, account.atwDevices, "Heat Pump", newInMelCloud.atw, newInMelCloud.atwPresets, newInMelCloud.atwSchedules, newInMelCloud.scenes);
+        account.ervDevices = handleDevices(devicesInMelCloudByType.erv, account.ervDevices, "Energy Recovery Ventilation", newInMelCloud.erv, newInMelCloud.ervPresets, newInMelCloud.ervSchedules, newInMelCloud.scenes);
 
         // Summary
         const newDevicesCount = newInMelCloud.ata.length + newInMelCloud.atw.length + newInMelCloud.erv.length;

package/package.json

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

package/src/melcloud.js

@@ -54,7 +54,7 @@ class MelCloud 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.Get.ListDevices, { method: 'GET', });
 
@@ -71,9 +71,6 @@ class MelCloud extends EventEmitter {
                 return devicesList;
             }
 
-            await this.functions.saveData(this.buildingsFile, buildingsList);
-            if (this.logDebug) this.emit('debug', `Buildings list saved`);
-
             const devices = [];
             for (const building of buildingsList) {
                 if (!building.Structure) {
@@ -108,7 +105,12 @@ class MelCloud extends EventEmitter {
 
             devicesList.State = true;
             devicesList.Info = `Found ${devicesCount} devices`;
+            devicesList.Buildings = buildingsList;
             devicesList.Devices = devices;
+
+            await this.functions.saveData(this.buildingsFile, devicesList);
+            if (this.logDebug) this.emit('debug', `Buildings list saved`);
+
             this.emit('devicesList', devicesList);
 
             return devicesList;

package/src/melcloudhome.js

@@ -107,7 +107,7 @@ 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.ListDevices, { method: 'GET' });
 
@@ -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;