homebridge-melcloud-control 4.1.2-beta.15 → 4.1.2-beta.17

package/package.json

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

package/src/melcloud.js

@@ -235,11 +235,19 @@ class MelCloud extends EventEmitter {
             if (this.logDebug) this.emit('debug', `Buildings list saved`);
 
             const devices = buildingsList.flatMap(building => {
-                // Rekurencyjna kapitalizacja wszystkich kluczy w obiekcie/tablicy
+                // Funkcja kapitalizująca klucze obiektu
+                const capitalizeKeys = obj =>
+                    Object.fromEntries(
+                        Object.entries(obj).map(([key, value]) => [
+                            key.charAt(0).toUpperCase() + key.slice(1),
+                            value
+                        ])
+                    );
+
+                // Rekurencyjna kapitalizacja kluczy w obiekcie lub tablicy
                 const capitalizeKeysDeep = obj => {
-                    if (Array.isArray(obj)) {
-                        return obj.map(capitalizeKeysDeep);
-                    } else if (obj && typeof obj === 'object') {
+                    if (Array.isArray(obj)) return obj.map(capitalizeKeysDeep);
+                    if (obj && typeof obj === 'object') {
                         return Object.fromEntries(
                             Object.entries(obj).map(([key, value]) => [
                                 key.charAt(0).toUpperCase() + key.slice(1),
@@ -250,35 +258,9 @@ class MelCloud extends EventEmitter {
                     return obj;
                 };
 
-                // Funkcja kapitalizująca tylko wybrane pola w głównym obiekcie
-                const capitalizeSelectedFields = obj => {
-                    const copy = { ...obj };
-
-                    if (copy.frostProtection) {
-                        copy.FrostProtection = capitalizeKeysDeep(copy.frostProtection);
-                        delete copy.frostProtection;
-                    }
-
-                    if (copy.overheatProtection) {
-                        copy.OverheatProtection = capitalizeKeysDeep(copy.overheatProtection);
-                        delete copy.overheatProtection;
-                    }
-
-                    if (copy.holidayMode) {
-                        copy.HolidayMode = capitalizeKeysDeep(copy.holidayMode);
-                        delete copy.holidayMode;
-                    }
-
-                    if (Array.isArray(copy.schedule)) {
-                        copy.Schedule = copy.schedule.map(capitalizeKeysDeep);
-                        delete copy.schedule;
-                    }
-
-                    return copy;
-                };
-
-                // Funkcja tworząca pojedyncze urządzenie
+                // Funkcja tworząca finalny obiekt Device
                 const createDevice = (device, type) => {
+                    // Settings już kapitalizowane w nazwach
                     const settingsArray = device.Settings || [];
 
                     const settingsObject = Object.fromEntries(
@@ -288,20 +270,46 @@ class MelCloud extends EventEmitter {
                             else if (value === "False") parsedValue = false;
                             else if (!isNaN(value) && value !== "") parsedValue = Number(value);
 
-                            return [name.charAt(0).toUpperCase() + name.slice(1), parsedValue];
+                            const key = name.charAt(0).toUpperCase() + name.slice(1);
+                            return [key, parsedValue];
                         })
                     );
 
+                    // Scal Capabilities + Settings + DeviceType w Device
                     const deviceObject = {
-                        ...capitalizeKeysDeep(device.Capabilities || {}),
+                        ...capitalizeKeys(device.Capabilities || {}),
                         ...settingsObject,
                         DeviceType: type
                     };
 
+                    // Usuń stare pola Settings i Capabilities
                     const { Settings, Capabilities, Id, GivenDisplayName, ...rest } = device;
 
+                    // Kapitalizacja brakujących obiektów/tablic
+                    const capitalizedRest = { ...rest };
+
+                    if (capitalizedRest.frostProtection) {
+                        capitalizedRest.FrostProtection = capitalizeKeysDeep(capitalizedRest.frostProtection);
+                        delete capitalizedRest.frostProtection;
+                    }
+
+                    if (capitalizedRest.overheatProtection) {
+                        capitalizedRest.OverheatProtection = capitalizeKeysDeep(capitalizedRest.overheatProtection);
+                        delete capitalizedRest.overheatProtection;
+                    }
+
+                    if (capitalizedRest.holidayMode) {
+                        capitalizedRest.HolidayMode = capitalizeKeysDeep(capitalizedRest.holidayMode);
+                        delete capitalizedRest.holidayMode;
+                    }
+
+                    if (Array.isArray(capitalizedRest.schedule)) {
+                        capitalizedRest.Schedule = capitalizedRest.schedule.map(capitalizeKeysDeep);
+                        delete capitalizedRest.schedule;
+                    }
+
                     return {
-                        ...capitalizeSelectedFields(rest),
+                        ...capitalizedRest,
                         Type: type,
                         DeviceID: Id,
                         DeviceName: GivenDisplayName,
@@ -311,14 +319,13 @@ class MelCloud extends EventEmitter {
                 };
 
                 return [
-                    ...(building.airToAirUnits || []).map(d => createDevice(d, 0)),
-                    ...(building.airToWaterUnits || []).map(d => createDevice(d, 1)),
-                    ...(building.airToVentilationUnits || []).map(d => createDevice(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))
                 ];
             });
 
 
-
             const devicesCount = devices.length;
             if (devicesCount === 0) {
                 devicesList.Info = 'No devices found'