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

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.12",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/melcloud.js

@@ -235,26 +235,45 @@ 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
-                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 =
-                                    typeof key === 'string'
-                                        ? key.charAt(0).toUpperCase() + key.slice(1)
-                                        : key;
-                                return [safeKey, capitalizeKeysDeep(value)];
-                            })
-                        );
+                // Funkcja kapitalizująca klucze obiektu
+                const capitalizeKeys = obj =>
+                    Object.fromEntries(
+                        Object.entries(obj).map(([key, value]) => [
+                            key.charAt(0).toUpperCase() + key.slice(1),
+                            value
+                        ])
+                    );
+
+                // Funkcja kapitalizująca tylko wybrane zagnieżdżone obiekty/tablice
+                const capitalizeNestedFields = device => {
+                    const copy = { ...device };
+
+                    if (copy.frostProtection && typeof copy.frostProtection === 'object') {
+                        copy.FrostProtection = capitalizeKeys(copy.frostProtection);
+                        delete copy.frostProtection;
                     }
-                    return obj;
+
+                    if (copy.overheatProtection && typeof copy.overheatProtection === 'object') {
+                        copy.OverheatProtection = capitalizeKeys(copy.overheatProtection);
+                        delete copy.overheatProtection;
+                    }
+
+                    if (copy.holidayMode && typeof copy.holidayMode === 'object') {
+                        copy.HolidayMode = capitalizeKeys(copy.holidayMode);
+                        delete copy.holidayMode;
+                    }
+
+                    if (Array.isArray(copy.schedule)) {
+                        copy.Schedule = copy.schedule.map(item => capitalizeKeys(item));
+                        delete copy.schedule;
+                    }
+
+                    return copy;
                 };
 
                 // Funkcja tworząca finalny obiekt Device
                 const createDevice = (device, type) => {
+                    // Settings już kapitalizowane w nazwach
                     const settingsArray = device.Settings || [];
 
                     const settingsObject = Object.fromEntries(
@@ -266,22 +285,21 @@ class MelCloud extends EventEmitter {
 
                             const key = name.charAt(0).toUpperCase() + name.slice(1);
                             return [key, parsedValue];
-                        }))
-
+                        })
+                    );
 
-                    // Połącz Capabilities + Settings + DeviceType
+                    // Scal Capabilities + Settings + DeviceType w Device
                     const deviceObject = {
-                        ...capitalizeKeysDeep(device.Capabilities || {}),
+                        ...capitalizeKeys(device.Capabilities || {}),
                         ...settingsObject,
                         DeviceType: type
                     };
 
-                    // Usuń pola, które nie mają trafić do finalnego obiektu
+                    // Usuń stare pola Settings i Capabilities
                     const { Settings, Capabilities, Id, GivenDisplayName, ...rest } = device;
 
-                    // Zwróć gotowy obiekt urządzenia
                     return {
-                        ...capitalizeKeysDeep(rest),
+                        ...capitalizeNestedFields(rest),
                         Type: type,
                         DeviceID: Id,
                         DeviceName: GivenDisplayName,
@@ -290,11 +308,10 @@ class MelCloud extends EventEmitter {
                     };
                 };
 
-                // Mapowanie urządzeń w budynku
                 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(capitalizeKeys(d), 0)),
+                    ...(building.airToWaterUnits || []).map(d => createDevice(capitalizeKeys(d), 1)),
+                    ...(building.airToVentilationUnits || []).map(d => createDevice(capitalizeKeys(d), 3))
                 ];
             });