homebridge-melcloud-control 4.2.3-beta.36 → 4.2.3-beta.37

package/package.json

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

package/src/melcloudhome.js

@@ -62,6 +62,51 @@ class MelCloud extends EventEmitter {
     }
 
     // MELCloud Home
+    async checkScenesList() {
+        try {
+            if (this.logDebug) this.emit('debug', `Scanning for scenes`);
+            const listScenesData = await axios(ApiUrlsHome.GetUserScenes, {
+                method: 'GET',
+                baseURL: ApiUrlsHome.BaseURL,
+                timeout: 25000,
+                headers: this.headers
+            });
+
+            const scenesList = listScenesData.data;
+            if (this.logDebug) this.emit('debug', `Scenes: ${JSON.stringify(scenesList, null, 2)}`);
+
+            const scenes = scenesList.flatMap(scene => {
+                const capitalizeKeysDeep = obj => {
+                    if (Array.isArray(obj)) {
+                        return obj.map(item => capitalizeKeysDeep(item));
+                    }
+
+                    if (obj && typeof obj === 'object') {
+                        return Object.fromEntries(
+                            Object.entries(obj).map(([key, value]) => [
+                                key.charAt(0).toUpperCase() + key.slice(1),
+                                capitalizeKeysDeep(value)
+                            ])
+                        );
+                    }
+
+                    return obj;
+                };
+
+                const allSettings = [
+                    ...(scene.ataSceneSettings || []),
+                    ...(scene.ervSceneSettings || []),
+                    ...(scene.atwSceneSettings || [])
+                ];
+
+                return allSettings.map(setting => capitalizeKeysDeep(setting));
+            });
+            return scenes;
+        } catch (error) {
+            throw new Error(`Check scenes list error: ${error.message}`);
+        }
+    }
+
     async checkDevicesList() {
         try {
             const devicesList = { State: false, Info: null, Devices: [], Scenes: [] }
@@ -77,9 +122,7 @@ class MelCloud extends EventEmitter {
             const buildings = userContext.buildings ?? [];
             const guestBuildings = userContext.guestBuildings ?? [];
             const buildingsList = [...buildings, ...guestBuildings];
-            const scenesList = userContext.scenes;
             if (this.logDebug) this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
-            if (this.logDebug) this.emit('debug', `Scenes: ${JSON.stringify(scenesList, null, 2)}`);
 
             if (!buildingsList) {
                 devicesList.Info = 'No building found'
@@ -166,41 +209,14 @@ class MelCloud extends EventEmitter {
                 ];
             });
 
-            const scenes = scenesList.flatMap(scene => {
-                const capitalizeKeysDeep = obj => {
-                    if (Array.isArray(obj)) {
-                        return obj.map(item => capitalizeKeysDeep(item));
-                    }
-
-                    if (obj && typeof obj === 'object') {
-                        return Object.fromEntries(
-                            Object.entries(obj).map(([key, value]) => [
-                                key.charAt(0).toUpperCase() + key.slice(1),
-                                capitalizeKeysDeep(value)
-                            ])
-                        );
-                    }
-
-                    return obj;
-                };
-
-                // merge ATA + ATW arrays
-                const allSettings = [
-                    ...(scene.ataSceneSettings || []),
-                    ...(scene.ervSceneSettings || []),
-                    ...(scene.atwSceneSettings || [])
-                ];
-
-                return allSettings.map(setting => capitalizeKeysDeep(setting));
-            });
-
-
             const devicesCount = devices.length;
             if (devicesCount === 0) {
                 devicesList.Info = 'No devices found'
                 return devicesList;
             }
 
+            const scenes = this.checkScenesList();
+
             devicesList.State = true;
             devicesList.Info = `Found ${devicesCount} devices`;
             devicesList.Devices = devices;