homebridge-melcloud-control 4.1.2-beta.10 → 4.1.2-beta.11

package/package.json

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

package/src/melcloud.js

@@ -235,67 +235,87 @@ class MelCloud extends EventEmitter {
             if (this.logDebug) this.emit('debug', `Buildings list saved`);
 
             const devices = buildingsList.flatMap(building => {
-                // Rekurencyjna funkcja kapitalizująca klucze w całym obiekcie
+                // Rekurencyjna kapitalizacja kluczy w całym obiekcie
                 const capitalizeKeysDeep = obj => {
                     if (Array.isArray(obj)) {
                         return obj.map(item => capitalizeKeysDeep(item));
                     } else if (obj && typeof obj === 'object' && obj.constructor === Object) {
                         return Object.fromEntries(
                             Object.entries(obj).map(([key, value]) => {
-                                const safeKey =
+                                const capitalizedKey =
                                     typeof key === 'string'
                                         ? key.charAt(0).toUpperCase() + key.slice(1)
                                         : key;
-                                return [safeKey, capitalizeKeysDeep(value)];
+                                return [capitalizedKey, capitalizeKeysDeep(value)];
                             })
                         );
                     }
                     return obj;
                 };
 
-                // Funkcja tworząca finalny obiekt Device
-                const createDevice = (device, type) => {
-                    const settingsArray = device.Settings || [];
-
-                    const settingsObject = Object.fromEntries(
-                        settingsArray.map(({ name, value }) => {
-                            let parsedValue = value;
-                            if (value === "True") parsedValue = true;
-                            else if (value === "False") parsedValue = false;
-                            else if (!isNaN(value) && value !== "") parsedValue = Number(value);
-
-                            const key = name.charAt(0).toUpperCase() + name.slice(1);
-                            return [key, parsedValue];
-                        }))
-
+                // Funkcja budująca pojedyncze urządzenie
+                const createDevice = (device, type, headers = {}) => {
+                    if (!device || typeof device !== 'object') return null;
+
+                    // Parsowanie tablicy settings → obiekt
+                    const parsedSettings = Object.fromEntries(
+                        (device.settings || [])
+                            .filter(s => s && typeof s.name === 'string')
+                            .map(({ name, value }) => {
+                                let parsedValue = value;
+                                if (value === 'True') parsedValue = true;
+                                else if (value === 'False') parsedValue = false;
+                                else if (
+                                    typeof value === 'string' &&
+                                    value.trim() !== '' &&
+                                    !isNaN(Number(value))
+                                )
+                                    parsedValue = Number(value);
+
+                                return [name.charAt(0).toUpperCase() + name.slice(1), parsedValue];
+                            })
+                    );
 
-                    // Połącz Capabilities + Settings + DeviceType
+                    // Tworzenie obiektu Device z capabilities + settings
                     const deviceObject = {
-                        ...capitalizeKeysDeep(device.Capabilities || {}),
-                        ...settingsObject,
+                        ...capitalizeKeysDeep(device.capabilities || {}),
+                        ...parsedSettings,
                         DeviceType: type
                     };
 
-                    // Usuń pola, które nie mają trafić do finalnego obiektu
-                    const { Settings, Capabilities, Id, GivenDisplayName, ...rest } = device;
+                    // Usuwamy niepotrzebne pola z oryginału
+                    const {
+                        settings,
+                        capabilities,
+                        id,
+                        givenDisplayName,
+                        ...rest
+                    } = device;
 
-                    // Zwróć gotowy obiekt urządzenia
+                    // Finalny obiekt
                     return {
                         ...capitalizeKeysDeep(rest),
                         Type: type,
-                        DeviceID: Id,
-                        DeviceName: GivenDisplayName,
+                        DeviceID: id,
+                        DeviceName: givenDisplayName,
                         Device: deviceObject,
                         Headers: headers
                     };
                 };
 
-                // Mapowanie urządzeń w budynku
+                // Przykład użycia:
                 return [
-                    ...(building.airToAirUnits || []).map(d => createDevice(capitalizeKeysDeep(d), 0)),
-                    ...(building.airToWaterUnits || []).map(d => createDevice(capitalizeKeysDeep(d), 1)),
-                    ...(building.airToVentilationUnits || []).map(d => createDevice(capitalizeKeysDeep(d), 3))
+                    ...(building.airToAirUnits || []).map(d =>
+                        createDevice(capitalizeKeysDeep(d), 0, headers)
+                    ),
+                    ...(building.airToWaterUnits || []).map(d =>
+                        createDevice(capitalizeKeysDeep(d), 1, headers)
+                    ),
+                    ...(building.airToVentilationUnits || []).map(d =>
+                        createDevice(capitalizeKeysDeep(d), 3, headers)
+                    )
                 ];
+
             });
 
             const devicesCount = devices.length;