homebridge-melcloud-control 4.1.2-beta.3 → 4.1.2-beta.5

package/homebridge-ui/public/index.html

@@ -224,8 +224,6 @@
 
       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.3",
+  "version": "4.1.2-beta.5",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/deviceata.js

@@ -683,8 +683,9 @@ 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.ID === preset.id);
+                    const presetData = presetsOnServer.find(p => p[presetsIdKey] === preset.id);
 
                     //get preset name
                     const name = preset.name;
@@ -765,7 +766,7 @@ class DeviceAta extends EventEmitter {
                         })
                         .onSet(async (state) => {
                             try {
-                                const key = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
+                                const fanKey = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
                                 let effectiveFlags = null;
                                 switch (mode) {
                                     case 0: //POWER ON,OFF
@@ -1017,7 +1018,7 @@ class DeviceAta extends EventEmitter {
 
                     //keys
                     const presetsKey = this.accountType === 'melcloud' ? 'Presets' : 'Schedule';
-                    const presetsIdKey = account.type === 'melcloud' ? 'ID' : 'Id';
+                    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';

package/src/deviceatw.js

@@ -1055,8 +1055,9 @@ 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.ID === preset.id);
+                    const presetData = presetsOnServer.find(p => p[presetsIdKey] === preset.id);
 
                     //get preset name
                     const name = preset.name;
@@ -1331,7 +1332,7 @@ class DeviceAtw extends EventEmitter {
 
                     //keys
                     const presetsKey = this.accountType === 'melcloud' ? 'Presets' : 'Schedule';
-                    const presetsIdKey = account.type === 'melcloud' ? 'ID' : 'Id';
+                    const presetsIdKey = accountType === 'melcloud' ? 'ID' : 'Id';
                     const tempStepKey = this.accountType === 'melcloud' ? 'TemperatureIncrement' : 'HasHalfDegreeIncrements';
                     const errorKey = this.accountType === 'melcloud' ? 'HasError' : 'IsInError';
 

package/src/deviceerv.js

@@ -877,7 +877,7 @@ class DeviceErv extends EventEmitter {
 
                     //keys
                     const presetsKey = this.accountType === 'melcloud' ? 'Presets' : 'Schedule';
-                    const presetsIdKey = account.type === 'melcloud' ? 'ID' : 'Id';
+                    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';

package/src/melcloud.js

@@ -235,17 +235,18 @@ class MelCloud extends EventEmitter {
             if (this.logDebug) this.emit('debug', `Buildings list saved`);
 
             const devices = buildingsList.flatMap(building => {
-                // Funkcja kapitalizująca klucze obiektu
-                // Rekurencyjna funkcja kapitalizująca klucze w całym obiekcie (łącznie z tablicami)
+                // Rekurencyjna funkcja kapitalizująca klucze w całym obiekcie (bezpieczna)
                 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]) => [
-                                key.charAt(0).toUpperCase() + key.slice(1),
-                                capitalizeKeysDeep(value)
-                            ])
+                            Object.entries(obj).map(([key, value]) => {
+                                const safeKey = typeof key === 'string'
+                                    ? key.charAt(0).toUpperCase() + key.slice(1)
+                                    : key;
+                                return [safeKey, capitalizeKeysDeep(value)];
+                            })
                         );
                     }
                     return obj;
@@ -253,18 +254,20 @@ class MelCloud extends EventEmitter {
 
                 // Funkcja tworząca finalny obiekt Device
                 const createDevice = (device, type, headers = {}) => {
-                    const settingsArray = device.Settings || [];
+                    const settingsArray = Array.isArray(device.Settings) ? 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(Number(value)) && value.trim() !== "") parsedValue = Number(value);
-
-                            const key = name.charAt(0).toUpperCase() + name.slice(1);
-                            return [key, parsedValue];
-                        })
+                        settingsArray
+                            .filter(item => item && typeof item.name === 'string') // 🔒 tylko poprawne wpisy
+                            .map(({ name, value }) => {
+                                let parsedValue = value;
+                                if (value === "True") parsedValue = true;
+                                else if (value === "False") parsedValue = false;
+                                else if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== "") parsedValue = Number(value);
+
+                                const key = name.charAt(0).toUpperCase() + name.slice(1);
+                                return [key, parsedValue];
+                            })
                     );
 
                     const deviceObject = {
@@ -291,6 +294,7 @@ class MelCloud extends EventEmitter {
                     ...(building.airToWaterUnits || []).map(d => createDevice(capitalizeKeysDeep(d), 1)),
                     ...(building.airToVentilationUnits || []).map(d => createDevice(capitalizeKeysDeep(d), 3))
                 ];
+
             });
 
             const devicesCount = devices.length;