homebridge-melcloud-control 4.1.2-beta.13 → 4.1.2-beta.14

package/package.json

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

package/src/melcloud.js

@@ -235,56 +235,22 @@ class MelCloud extends EventEmitter {
             if (this.logDebug) this.emit('debug', `Buildings list saved`);
 
             const devices = buildingsList.flatMap(building => {
-                const capitalizeKeys = obj =>
-                    Object.fromEntries(
-                        Object.entries(obj).map(([key, value]) => [
-                            key.charAt(0).toUpperCase() + key.slice(1),
-                            value
-                        ])
-                    );
-
-                // Rekurencyjna kapitalizacja kluczy tylko dla wybranych pól
-                const capitalizeNestedDeep = obj => {
+                const capitalizeKeysDeep = obj => {
                     if (Array.isArray(obj)) {
-                        return obj.map(capitalizeNestedDeep);
-                    } else if (obj && typeof obj === 'object' && obj.constructor === Object) {
+                        return obj.map(capitalizeKeysDeep);
+                    } else if (obj && typeof obj === 'object') {
                         return Object.fromEntries(
-                            Object.entries(obj).map(([k, v]) => [
-                                k.charAt(0).toUpperCase() + k.slice(1),
-                                capitalizeNestedDeep(v)
+                            Object.entries(obj).map(([key, value]) => [
+                                key.charAt(0).toUpperCase() + key.slice(1),
+                                capitalizeKeysDeep(value)
                             ])
                         );
                     }
                     return obj;
                 };
 
-                const capitalizeNestedFields = device => {
-                    const copy = { ...device };
-
-                    if (copy.frostProtection) {
-                        copy.FrostProtection = capitalizeNestedDeep(copy.frostProtection);
-                        delete copy.frostProtection;
-                    }
-
-                    if (copy.overheatProtection) {
-                        copy.OverheatProtection = capitalizeNestedDeep(copy.overheatProtection);
-                        delete copy.overheatProtection;
-                    }
-
-                    if (copy.holidayMode) {
-                        copy.HolidayMode = capitalizeNestedDeep(copy.holidayMode);
-                        delete copy.holidayMode;
-                    }
-
-                    if (Array.isArray(copy.schedule)) {
-                        copy.Schedule = copy.schedule.map(capitalizeNestedDeep);
-                        delete copy.schedule;
-                    }
-
-                    return copy;
-                };
-
                 const createDevice = (device, type) => {
+                    // Settings już kapitalizowane w nazwach
                     const settingsArray = device.Settings || [];
 
                     const settingsObject = Object.fromEntries(
@@ -299,16 +265,41 @@ class MelCloud extends EventEmitter {
                         })
                     );
 
+                    // Scal Capabilities + Settings + DeviceType w Device
                     const deviceObject = {
-                        ...capitalizeKeys(device.Capabilities || {}),
+                        ...capitalizeKeysDeep(device.Capabilities || {}),
                         ...settingsObject,
                         DeviceType: type
                     };
 
+                    // Usuń stare pola Settings i Capabilities
                     const { Settings, Capabilities, Id, GivenDisplayName, ...rest } = device;
 
+                    // Kapitalizacja wybranych pól z głównego obiektu
+                    const capitalizedNested = { ...rest };
+
+                    if (capitalizedNested.frostProtection) {
+                        capitalizedNested.FrostProtection = capitalizeKeysDeep(capitalizedNested.frostProtection);
+                        delete capitalizedNested.frostProtection;
+                    }
+
+                    if (capitalizedNested.overheatProtection) {
+                        capitalizedNested.OverheatProtection = capitalizeKeysDeep(capitalizedNested.overheatProtection);
+                        delete capitalizedNested.overheatProtection;
+                    }
+
+                    if (capitalizedNested.holidayMode) {
+                        capitalizedNested.HolidayMode = capitalizeKeysDeep(capitalizedNested.holidayMode);
+                        delete capitalizedNested.holidayMode;
+                    }
+
+                    if (Array.isArray(capitalizedNested.schedule)) {
+                        capitalizedNested.Schedule = capitalizedNested.schedule.map(capitalizeKeysDeep);
+                        delete capitalizedNested.schedule;
+                    }
+
                     return {
-                        ...capitalizeNestedFields(rest),
+                        ...capitalizedNested,
                         Type: type,
                         DeviceID: Id,
                         DeviceName: GivenDisplayName,
@@ -318,13 +309,12 @@ class MelCloud extends EventEmitter {
                 };
 
                 return [
-                    ...(building.airToAirUnits || []).map(d => createDevice(capitalizeKeys(d), 0)),
-                    ...(building.airToWaterUnits || []).map(d => createDevice(capitalizeKeys(d), 1)),
-                    ...(building.airToVentilationUnits || []).map(d => createDevice(capitalizeKeys(d), 3))
+                    ...(building.airToAirUnits || []).map(d => createDevice(d, 0)),
+                    ...(building.airToWaterUnits || []).map(d => createDevice(d, 1)),
+                    ...(building.airToVentilationUnits || []).map(d => createDevice(d, 3))
                 ];
             });
 
-
             const devicesCount = devices.length;
             if (devicesCount === 0) {
                 devicesList.Info = 'No devices found'