homebridge-melcloud-control 4.1.2-beta.18 → 4.1.2-beta.2

package/homebridge-ui/public/index.html

@@ -224,6 +224,8 @@
 
       document.getElementById('logIn').addEventListener('click', async () => {
         document.getElementById(`logIn`).className = "btn btn-primary";
+
+        updateInfo('info', 'Connecting...', 'yellow');
         homebridge.showSpinner();
 
         try {

package/package.json

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

package/src/deviceata.js

@@ -683,9 +683,8 @@ class DeviceAta extends EventEmitter {
             if (this.presets.length > 0) {
                 if (this.logDebug) this.emit('debug', `Prepare presets services`);
                 this.presetsServices = [];
-                const presetsIdKey = this.accountType === 'melcloud' ? 'ID' : 'Id';
                 this.presets.forEach((preset, i) => {
-                    const presetData = presetsOnServer.find(p => p[presetsIdKey] === preset.id);
+                    const presetData = presetsOnServer.find(p => p.ID === preset.Id);
 
                     //get preset name
                     const name = preset.name;
@@ -766,7 +765,7 @@ class DeviceAta extends EventEmitter {
                         })
                         .onSet(async (state) => {
                             try {
-                                const fanKey = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
+                                const key = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
                                 let effectiveFlags = null;
                                 switch (mode) {
                                     case 0: //POWER ON,OFF
@@ -1018,7 +1017,6 @@ class DeviceAta extends EventEmitter {
 
                     //keys
                     const presetsKey = this.accountType === 'melcloud' ? 'Presets' : 'Schedule';
-                    const presetsIdKey = this.accountType === 'melcloud' ? 'ID' : 'Id';
                     const setTempKey = this.accountType === 'melcloud' ? 'SetTemperature' : 'SetPoint';
                     const fanKey = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
                     const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
@@ -1035,12 +1033,12 @@ class DeviceAta extends EventEmitter {
                     const presetsOnServer = deviceData[presetsKey] ?? [];
 
                     //protection
-                    const frostProtectionEnabled = deviceData.FrostProtection?.Enabled;
-                    const frostProtectionActive = deviceData.FrostProtection?.Active;
-                    const overheatProtectionEnabled = deviceData.OverheatProtection?.Enabled;
-                    const overheatProtectionActive = deviceData.OverheatProtection?.Active;
-                    const holidayModeEnabled = deviceData.HolidayMode?.Enabled;
-                    const holidayModeActive = deviceData.HolidayMode?.Active;
+                    const frostProtectionEnabled = deviceData.FrostProtection?.enabled;
+                    const frostProtectionActive = deviceData.FrostProtection?.active;
+                    const overheatProtectionEnabled = deviceData.OverheatProtection?.enabled;
+                    const overheatProtectionActive = deviceData.OverheatProtection?.active;
+                    const holidayModeEnabled = deviceData.HolidayMode?.enabled;
+                    const holidayModeActive = deviceData.HolidayMode?.active;
                     const scheduleEnabled = deviceData.ScheduleEnabled;
 
                     //device control
@@ -1285,7 +1283,7 @@ class DeviceAta extends EventEmitter {
                     //update presets state
                     if (this.presets.length > 0) {
                         this.presets.forEach((preset, i) => {
-                            const presetData = presetsOnServer.find(p => p[presetsIdKey] === preset.id);
+                            const presetData = presetsOnServer.find(p => p.ID === preset.Id);
 
                             preset.state = presetData ? (presetData.Power === power
                                 && presetData[setTempKey] === setTemperature

package/src/deviceatw.js

@@ -1055,9 +1055,8 @@ class DeviceAtw extends EventEmitter {
             if (this.presets.length > 0) {
                 if (this.logDebug) this.emit('debug', `Prepare presets services`);
                 this.presetsServices = [];
-                const presetsIdKey = this.accountType === 'melcloud' ? 'ID' : 'Id';
                 this.presets.forEach((preset, i) => {
-                    const presetData = presetsOnServer.find(p => p[presetsIdKey] === preset.id);
+                    const presetData = presetsOnServer.find(p => p.ID === preset.Id);
 
                     //get preset name
                     const name = preset.name;
@@ -1331,13 +1330,11 @@ class DeviceAtw extends EventEmitter {
                     this.deviceData = deviceData;
 
                     //keys
-                    const presetsKey = this.accountType === 'melcloud' ? 'Presets' : 'Schedule';
-                    const presetsIdKey = accountType === 'melcloud' ? 'ID' : 'Id';
                     const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
                     const errorKey = this.accountType === 'melcloud' ? 'HasError' : 'IsInError';
 
                     //presets
-                    const presetsOnServer = deviceData[presetsKey] ?? [];
+                    const presetsOnServer = deviceData.Presets ?? [];
 
                     //device info
                     const hasHeatPump = ![1, 2, 3, 4, 5, 6, 7, 15].includes(this.hideZone);
@@ -1819,7 +1816,7 @@ class DeviceAtw extends EventEmitter {
                     //update presets state
                     if (this.presets.length > 0) {
                         this.presets.forEach((preset, i) => {
-                            const presetData = presetsOnServer.find(p => p[presetsIdKey] === preset.id);
+                            const presetData = presetsOnServer.find(p => p.ID === preset.Id);
 
                             preset.state = presetData ? (presetData.Power === power
                                 && presetData.EcoHotWater === ecoHotWater

package/src/deviceerv.js

@@ -675,7 +675,7 @@ class DeviceErv extends EventEmitter {
                 if (this.logDebug) this.emit('debug', `Prepare presets services`);
                 this.presetsServices = [];
                 this.presets.forEach((preset, i) => {
-                    const presetData = presetsOnServer.find(p => p.ID === preset.id);
+                    const presetData = presetsOnServer.find(p => p.ID === preset.Id);
 
                     //get preset name
                     const name = preset.name;
@@ -876,14 +876,12 @@ class DeviceErv extends EventEmitter {
                     this.deviceData = deviceData;
 
                     //keys
-                    const presetsKey = this.accountType === 'melcloud' ? 'Presets' : 'Schedule';
-                    const presetsIdKey = accountType === 'melcloud' ? 'ID' : 'Id';
                     const fanKey = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
                     const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
                     const errorKey = this.accountType === 'melcloud' ? 'HasError' : 'IsInError';
 
                     //presets
-                    const presetsOnServer = deviceData[presetsKey] ?? [];
+                    const presetsOnServer = deviceData.Presets ?? [];
 
                     //device control
                     const hideRoomTemperature = deviceData.HideRoomTemperature;
@@ -1115,7 +1113,7 @@ class DeviceErv extends EventEmitter {
                     //update presets state
                     if (this.presets.length > 0) {
                         this.presets.forEach((preset, i) => {
-                            const presetData = presetsOnServer.find(p => p[presetsIdKey] === preset.id);
+                            const presetData = presetsOnServer.find(p => p.ID === preset.Id);
 
                             preset.state = presetData ? (presetData.Power === power
                                 && presetData.SetTemperature === setTemperature

package/src/melcloud.js

@@ -236,18 +236,11 @@ class MelCloud extends EventEmitter {
 
             const devices = buildingsList.flatMap(building => {
                 // 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
+                // Rekurencyjna funkcja kapitalizująca klucze w całym obiekcie (łącznie z tablicami)
                 const capitalizeKeysDeep = obj => {
-                    if (Array.isArray(obj)) return obj.map(capitalizeKeysDeep);
-                    if (obj && typeof obj === 'object') {
+                    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]) => [
                                 key.charAt(0).toUpperCase() + key.slice(1),
@@ -259,8 +252,7 @@ class MelCloud extends EventEmitter {
                 };
 
                 // Funkcja tworząca finalny obiekt Device
-                const createDevice = (device, type) => {
-                    // Settings już kapitalizowane w nazwach
+                const createDevice = (device, type, headers = {}) => {
                     const settingsArray = device.Settings || [];
 
                     const settingsObject = Object.fromEntries(
@@ -268,48 +260,23 @@ class MelCloud extends EventEmitter {
                             let parsedValue = value;
                             if (value === "True") parsedValue = true;
                             else if (value === "False") parsedValue = false;
-                            else if (!isNaN(value) && value !== "") parsedValue = Number(value);
+                            else if (!isNaN(Number(value)) && value.trim() !== "") parsedValue = Number(value);
 
                             const key = name.charAt(0).toUpperCase() + name.slice(1);
                             return [key, parsedValue];
                         })
                     );
 
-                    // 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 brakujących obiektów/tablic
-                    const capitalizedRest = { ...rest };
-
-                    if (capitalizedRest.frostProtection) {
-                        capitalizedRest.FrostProtection = { ...capitalizeKeys(device.frostProtection || {}) };
-                        delete capitalizedRest.frostProtection;
-                    }
-
-                    if (capitalizedRest.overheatProtection) {
-                        capitalizedRest.OverheatProtection = { ...capitalizeKeys(device.overheatProtection || {}) };
-                        delete capitalizedRest.overheatProtection;
-                    }
-
-                    if (capitalizedRest.holidayMode) {
-                        capitalizedRest.HolidayMode = { ...capitalizeKeys(device.HolidayMode || {}) };
-                        delete capitalizedRest.holidayMode;
-                    }
-
-                    if (Array.isArray(capitalizedRest.schedule)) {
-                        capitalizedRest.Schedule = capitalizedRest.schedule.map(capitalizeKeysDeep);
-                        delete capitalizedRest.schedule;
-                    }
-
                     return {
-                        ...capitalizedRest,
+                        ...capitalizeKeysDeep(rest),
                         Type: type,
                         DeviceID: Id,
                         DeviceName: GivenDisplayName,
@@ -318,14 +285,14 @@ class MelCloud extends EventEmitter {
                     };
                 };
 
+                // Mapowanie urządzeń
                 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(capitalizeKeysDeep(d), 0)),
+                    ...(building.airToWaterUnits || []).map(d => createDevice(capitalizeKeysDeep(d), 1)),
+                    ...(building.airToVentilationUnits || []).map(d => createDevice(capitalizeKeysDeep(d), 3))
                 ];
             });
 
-
             const devicesCount = devices.length;
             if (devicesCount === 0) {
                 devicesList.Info = 'No devices found'