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

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.1.2-beta.11",
+  "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,87 +235,84 @@ class MelCloud extends EventEmitter {
             if (this.logDebug) this.emit('debug', `Buildings list saved`);
 
             const devices = buildingsList.flatMap(building => {
-                // 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 capitalizedKey =
-                                    typeof key === 'string'
-                                        ? key.charAt(0).toUpperCase() + key.slice(1)
-                                        : key;
-                                return [capitalizedKey, 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 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];
-                            })
+                // Funkcja tworząca finalny obiekt Device
+                const createDevice = (device, type) => {
+                    // Settings już kapitalizowane w nazwach
+                    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];
+                        })
                     );
 
-                    // Tworzenie obiektu Device z capabilities + settings
+                    // Scal Capabilities + Settings + DeviceType w Device
                     const deviceObject = {
-                        ...capitalizeKeysDeep(device.capabilities || {}),
-                        ...parsedSettings,
+                        ...capitalizeKeys(device.Capabilities || {}),
+                        ...settingsObject,
                         DeviceType: type
                     };
 
-                    // Usuwamy niepotrzebne pola z oryginału
-                    const {
-                        settings,
-                        capabilities,
-                        id,
-                        givenDisplayName,
-                        ...rest
-                    } = device;
+                    // Usuń stare pola Settings i Capabilities
+                    const { Settings, Capabilities, Id, GivenDisplayName, ...rest } = device;
 
-                    // Finalny obiekt
                     return {
-                        ...capitalizeKeysDeep(rest),
+                        ...capitalizeNestedFields(rest),
                         Type: type,
-                        DeviceID: id,
-                        DeviceName: givenDisplayName,
+                        DeviceID: Id,
+                        DeviceName: GivenDisplayName,
                         Device: deviceObject,
                         Headers: headers
                     };
                 };
 
-                // Przykład użycia:
                 return [
-                    ...(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)
-                    )
+                    ...(building.airToAirUnits || []).map(d => createDevice(capitalizeKeys(d), 0)),
+                    ...(building.airToWaterUnits || []).map(d => createDevice(capitalizeKeys(d), 1)),
+                    ...(building.airToVentilationUnits || []).map(d => createDevice(capitalizeKeys(d), 3))
                 ];
-
             });
 
             const devicesCount = devices.length;