homebridge-melcloud-control 4.1.2-beta.1 → 4.1.2-beta.10

package/README.md

@@ -229,7 +229,7 @@ Homebridge plugin for Air Conditioner, Heat Pump and Energy Recovery Ventilation
 | `ataDevices[].frostProtectionSensor` | This enable extra `Frost Protectio` sensor to use with automations in HomeKit app. |
 | `ataDevices[].overHeatProtectionSensor` | This enable extra `Overheat Protection` sensor to use with automations in HomeKit app. |
 | `ataDevices[].holidayModeSensor` | This enable extra `Holiday Mode` sensor to use with automations in HomeKit app. |
-| `ataDevices[].sheduleSensor` | This enable extra `Shedule` sensor to use with automations in HomeKit app. |
+| `ataDevices[].scheduleSensor` | This enable extra `Shedule` sensor to use with automations in HomeKit app. |
 | `ataDevices[].errorSensor` | This enable `Error` sensor to use with automations in HomeKit app. |
 | `ataDevices[].refreshInterval` | Here set the background devices state refresh time in (sec), default `5s`. |
 | `ataDevices[].presets[]` | Array of ATA device Presets created automatically after login to MELCloud from plugin config UI. |

package/config.schema.json

@@ -235,8 +235,7 @@
                 "properties": {
                   "id": {
                     "title": "ID",
-                    "type": "string",
-                    "default": "0"
+                    "type": "string"
                   },
                   "type": {
                     "title": "Type",
@@ -279,7 +278,7 @@
                   "name": {
                     "title": "Name",
                     "type": "string",
-                    "default": "Air Conditioner"
+                    "placeholder": "Device name"
                   },
                   "heatDryFanMode": {
                     "title": "Heat",
@@ -401,7 +400,7 @@
                     "default": false,
                     "description": "This enable extra frost protection sensor to use with automations in HomeKit app.",
                     "condition": {
-                      "functionBody": "return model.accounts[arrayIndices[0]].type === melcloudhome;"
+                      "functionBody": "return model.accounts[arrayIndices[0]].type === 'melcloudhome';"
                     }
                   },
                   "overheatProtectionSensor": {
@@ -422,11 +421,11 @@
                       "functionBody": "return model.accounts[arrayIndices[0]].type === 'melcloudhome';"
                     }
                   },
-                  "sheduleSensor": {
+                  "scheduleSensor": {
                     "title": "Shedule",
                     "type": "boolean",
                     "default": false,
-                    "description": "This enable extra shedule sensor to use with automations in HomeKit app.",
+                    "description": "This enable extra schedule sensor to use with automations in HomeKit app.",
                     "condition": {
                       "functionBody": "return model.accounts[arrayIndices[0]].type === 'melcloudhome';"
                     }
@@ -453,7 +452,7 @@
                       "properties": {
                         "id": {
                           "title": "ID",
-                          "type": "integer"
+                          "type": "string"
                         },
                         "displayType": {
                           "title": "Display Type",
@@ -840,8 +839,7 @@
                 "properties": {
                   "id": {
                     "title": "ID",
-                    "type": "string",
-                    "default": "0"
+                    "type": "string"
                   },
                   "type": {
                     "title": "Type",
@@ -856,7 +854,7 @@
                   "name": {
                     "title": "Name",
                     "type": "string",
-                    "default": "Heat Pump"
+                    "placeholder": "Device name"
                   },
                   "displayType": {
                     "title": "Display Type",
@@ -1068,7 +1066,7 @@
                       "properties": {
                         "id": {
                           "title": "ID",
-                          "type": "integer"
+                          "type": "string"
                         },
                         "displayType": {
                           "title": "Display Type",
@@ -1375,8 +1373,7 @@
                 "properties": {
                   "id": {
                     "title": "ID",
-                    "type": "string",
-                    "default": "0"
+                    "type": "string"
                   },
                   "type": {
                     "title": "Type",
@@ -1391,7 +1388,7 @@
                   "name": {
                     "title": "Name",
                     "type": "string",
-                    "default": "Ventilation"
+                    "placeholder": "Device name"
                   },
                   "displayType": {
                     "title": "Display Type",
@@ -1461,7 +1458,7 @@
                       "properties": {
                         "id": {
                           "title": "ID",
-                          "type": "integer",
+                          "type": "string",
                           "readonly": true
                         },
                         "displayType": {
@@ -1976,7 +1973,7 @@
                                 "accounts[].ataDevices[].frostProtectionSensor",
                                 "accounts[].ataDevices[].overheatProtectionSensor",
                                 "accounts[].ataDevices[].holidayModeSensor",
-                                "accounts[].ataDevices[].sheduleSensor",
+                                "accounts[].ataDevices[].scheduleSensor",
                                 "accounts[].ataDevices[].errorSensor"
                               ]
                             },
@@ -2007,7 +2004,7 @@
                         }
                       ],
                       "condition": {
-                        "functionBody": "return model.accounts[arrayIndices[0]].ataDevices[arrayIndices[1]].id !== '0';"
+                        "functionBody": "return model.accounts[arrayIndices[0]].ataDevices[arrayIndices[1]].id !== null;"
                       }
                     }
                   ]
@@ -2127,7 +2124,7 @@
                         }
                       ],
                       "condition": {
-                        "functionBody": "return model.accounts[arrayIndices[0]].atwDevices[arrayIndices[1]].id !== '0';"
+                        "functionBody": "return model.accounts[arrayIndices[0]].atwDevices[arrayIndices[1]].id !== null;"
                       }
                     }
                   ]
@@ -2240,7 +2237,7 @@
                         }
                       ],
                       "condition": {
-                        "functionBody": "return model.accounts[arrayIndices[0]].ervDevices[arrayIndices[1]].id !== '0';"
+                        "functionBody": "return model.accounts[arrayIndices[0]].ervDevices[arrayIndices[1]].id !== null;"
                       }
                     }
                   ]

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 {
@@ -272,17 +270,19 @@
                 newArr.push(deviceObj);
               }
 
-              const presets = device.Presets || [];
-              presets.forEach(preset => {
+              const presetsKey = account.type === 'melcloud' ? 'Presets' : 'Schedule';
+              const presetsIdKey = account.type === 'melcloud' ? 'ID' : 'Id';
+              const presets = device[presetsKey] || [];
+              presets.forEach((preset, index) => {
                 const presetObj = {
-                  id: preset.ID,
+                  id: preset[presetsIdKey],
                   displayType: 0,
-                  name: preset.NumberDescription,
+                  name: preset.NumberDescription || `Preset ${index}`,
                   namePrefix: false
                 };
 
                 const deviceInConfig = devicesInConfig.find(device => String(device.id) === deviceObj.id);
-                if (deviceInConfig && !deviceInConfig.presets.some(preset => preset.id === presetObj.id)) {
+                if (deviceInConfig && !deviceInConfig.presets.some(preset => String(preset.id) === presetObj.id)) {
                   deviceInConfig.presets.push(presetObj);
                   newPresets.push(presetObj);
                 }

package/package.json

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

package/src/deviceata.js

@@ -32,7 +32,7 @@ class DeviceAta extends EventEmitter {
         this.frostProtectionSensor = device.frostProtectionSensor || false;
         this.overheatProtectionSensor = device.overheatProtectionSensor || false;
         this.holidayModeSensor = device.holidayModeSensor || false;
-        this.sheduleSensor = device.sheduleSensor || false;
+        this.scheduleSensor = device.scheduleSensor || false;
         this.errorSensor = device.errorSensor || false;
         this.heatDryFanMode = device.heatDryFanMode || 1; //NONE, HEAT, DRY, FAN
         this.coolDryFanMode = device.coolDryFanMode || 1; //NONE, COOL, DRY, FAN
@@ -651,18 +651,18 @@ class DeviceAta extends EventEmitter {
                 accessory.addService(this.holidayModeSensorService);
             }
 
-            //shedule sensor
-            if (this.sheduleSensor && this.accessory.sheduleEnabled !== null) {
-                if (this.logDebug) this.emit('debug', `Prepare shedule service`);
-                this.sheduleSensorService = new Service.ContactSensor(`${serviceName} Shedule`, `Shedule Sensor ${deviceId}`);
-                this.sheduleSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
-                this.sheduleSensorService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Shedule`);
-                this.sheduleSensorService.getCharacteristic(Characteristic.ContactSensorState)
+            //schedule sensor
+            if (this.scheduleSensor && this.accessory.scheduleEnabled !== null) {
+                if (this.logDebug) this.emit('debug', `Prepare schedule service`);
+                this.scheduleSensorService = new Service.ContactSensor(`${serviceName} Schedule`, `Schedule Sensor ${deviceId}`);
+                this.scheduleSensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
+                this.scheduleSensorService.setCharacteristic(Characteristic.ConfiguredName, `${accessoryName} Schedule`);
+                this.scheduleSensorService.getCharacteristic(Characteristic.ContactSensorState)
                     .onGet(async () => {
-                        const state = this.accessory.sheduleEnabled;
+                        const state = this.accessory.scheduleEnabled;
                         return state;
                     })
-                accessory.addService(this.sheduleSensorService);
+                accessory.addService(this.scheduleSensorService);
             }
 
             //error sensor
@@ -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;
@@ -705,6 +706,7 @@ class DeviceAta extends EventEmitter {
                         })
                         .onSet(async (state) => {
                             try {
+                                const setTempKey = this.accountType === 'melcloud' ? 'SetTemperature' : 'SetPoint';
                                 const fanKey = this.accountType === 'melcloud' ? 'FanSpeed' : 'SetFanSpeed';
                                 switch (state) {
                                     case true:
@@ -764,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
@@ -1015,6 +1017,9 @@ class DeviceAta extends EventEmitter {
                     this.deviceData = deviceData;
 
                     //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';
                     const errorKey = this.accountType === 'melcloud' ? 'HasError' : 'IsInError';
@@ -1026,17 +1031,17 @@ class DeviceAta extends EventEmitter {
                     const supportDryKey = this.accountType === 'melcloud' ? 'ModelSupportsDry' : 'HasDryOperationMode';
                     const supportCoolKey = this.accountType === 'melcloud' ? 'ModelSupportsCool' : 'HasCoolOperationMode';
 
-                    //presets
-                    const presetsOnServer = deviceData.Presets ?? [];
+                    //presets schedule
+                    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 sheduleEnabled = deviceData.ScheduleEnabled;
+                    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
                     const hideVaneControls = deviceData.HideVaneControls ?? false;
@@ -1129,7 +1134,7 @@ class DeviceAta extends EventEmitter {
                         overheatProtectionActive: overheatProtectionActive,
                         holidayModeEnabled: holidayModeEnabled,
                         holidayModeActive: holidayModeActive,
-                        sheduleEnabled: sheduleEnabled
+                        scheduleEnabled: scheduleEnabled
                     };
 
                     //operating mode 0, HEAT, DRY, COOL, 4, 5, 6, FAN, AUTO, ISEE HEAT, ISEE DRY, ISEE COOL
@@ -1274,16 +1279,16 @@ class DeviceAta extends EventEmitter {
                     this.frostProtectionSensorService?.updateCharacteristic(Characteristic.ContactSensorState, frostProtectionActive);
                     this.overheatProtectionSensorService?.updateCharacteristic(Characteristic.ContactSensorState, overheatProtectionActive);
                     this.holidayModeSensorService?.updateCharacteristic(Characteristic.ContactSensorState, holidayModeActive);
-                    this.sheduleSensorService?.updateCharacteristic(Characteristic.ContactSensorState, sheduleEnabled);
+                    this.scheduleSensorService?.updateCharacteristic(Characteristic.ContactSensorState, scheduleEnabled);
                     this.errorService?.updateCharacteristic(Characteristic.ContactSensorState, isInError);
 
                     //update presets state
                     if (this.presets.length > 0) {
                         this.presets.forEach((preset, i) => {
-                            const presetData = presetsOnServer.find(p => p.ID === preset.Id);
+                            const presetData = presetsOnServer.find(p => p[presetsIdKey] === preset.id);
 
                             preset.state = presetData ? (presetData.Power === power
-                                && presetData.SetTemperature === setTemperature
+                                && presetData[setTempKey] === setTemperature
                                 && presetData.OperationMode === operationMode
                                 && presetData.VaneHorizontalDirection === vaneHorizontalDirection
                                 && presetData.VaneVerticalDirection === vaneVerticalDirection

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;
@@ -1330,11 +1331,13 @@ 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.Presets ?? [];
+                    const presetsOnServer = deviceData[presetsKey] ?? [];
 
                     //device info
                     const hasHeatPump = ![1, 2, 3, 4, 5, 6, 7, 15].includes(this.hideZone);
@@ -1816,7 +1819,7 @@ class DeviceAtw extends EventEmitter {
                     //update presets state
                     if (this.presets.length > 0) {
                         this.presets.forEach((preset, i) => {
-                            const presetData = presetsOnServer.find(p => p.ID === preset.Id);
+                            const presetData = presetsOnServer.find(p => p[presetsIdKey] === 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,12 +876,14 @@ 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.Presets ?? [];
+                    const presetsOnServer = deviceData[presetsKey] ?? [];
 
                     //device control
                     const hideRoomTemperature = deviceData.HideRoomTemperature;
@@ -1113,7 +1115,7 @@ class DeviceErv extends EventEmitter {
                     //update presets state
                     if (this.presets.length > 0) {
                         this.presets.forEach((preset, i) => {
-                            const presetData = presetsOnServer.find(p => p.ID === preset.Id);
+                            const presetData = presetsOnServer.find(p => p[presetsIdKey] === preset.id);
 
                             preset.state = presetData ? (presetData.Power === power
                                 && presetData.SetTemperature === setTemperature

package/src/melcloud.js

@@ -235,18 +235,26 @@ class MelCloud extends EventEmitter {
             if (this.logDebug) this.emit('debug', `Buildings list saved`);
 
             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 funkcja kapitalizująca klucze 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 safeKey =
+                                    typeof key === 'string'
+                                        ? key.charAt(0).toUpperCase() + key.slice(1)
+                                        : key;
+                                return [safeKey, capitalizeKeysDeep(value)];
+                            })
+                        );
+                    }
+                    return obj;
+                };
 
                 // Funkcja tworząca finalny obiekt Device
                 const createDevice = (device, type) => {
-                    // Settings już kapitalizowane w nazwach
                     const settingsArray = device.Settings || [];
 
                     const settingsObject = Object.fromEntries(
@@ -258,21 +266,22 @@ class MelCloud extends EventEmitter {
 
                             const key = name.charAt(0).toUpperCase() + name.slice(1);
                             return [key, parsedValue];
-                        })
-                    );
+                        }))
+
 
-                    // Scal Capabilities + Settings + DeviceType w Device
+                    // Połącz Capabilities + Settings + DeviceType
                     const deviceObject = {
-                        ...capitalizeKeys(device.Capabilities || {}),
+                        ...capitalizeKeysDeep(device.Capabilities || {}),
                         ...settingsObject,
                         DeviceType: type
                     };
 
-                    // Usuń stare pola Settings i Capabilities
+                    // Usuń pola, które nie mają trafić do finalnego obiektu
                     const { Settings, Capabilities, Id, GivenDisplayName, ...rest } = device;
 
+                    // Zwróć gotowy obiekt urządzenia
                     return {
-                        ...rest,
+                        ...capitalizeKeysDeep(rest),
                         Type: type,
                         DeviceID: Id,
                         DeviceName: GivenDisplayName,
@@ -281,10 +290,11 @@ class MelCloud extends EventEmitter {
                     };
                 };
 
+                // Mapowanie urządzeń w budynku
                 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))
                 ];
             });