homebridge-melcloud-control 4.3.9-beta.1 → 4.3.9-beta.11

package/homebridge-ui/public/index.html

@@ -211,7 +211,7 @@
 
       for (let i = configDevices.length - 1; i >= 0; i--) {
         const device = configDevices[i];
-        if (device.id !== "0" && !melcloudIds.includes(device.id)) {
+        if (!melcloudIds.includes(device.id)) {
           removedDevices.push(device);
           configDevices.splice(i, 1);
         }
@@ -255,15 +255,15 @@
           if (device.Type === 3) devicesInMelCloudByType.erv.push(device);
         });
 
-        account.ataDevices ??= [];
-        account.atwDevices ??= [];
-        account.ervDevices ??= [];
+        account.ataDevices = (account.ataDevices ?? []).filter(d => String(d.id) !== '0');
+        account.atwDevices = (account.atwDevices ?? []).filter(d => String(d.id) !== '0');
+        account.ervDevices = (account.ervDevices ?? []).filter(d => String(d.id) !== '0');
 
         const removedAta = removeStaleDevices(account.ataDevices, devicesInMelCloudByType.ata);
         const removedAtw = removeStaleDevices(account.atwDevices, devicesInMelCloudByType.atw);
         const removedErv = removeStaleDevices(account.ervDevices, devicesInMelCloudByType.erv);
 
-        const handleDevices = (devicesInMelCloud, devicesInConfig, typeString, newDevices, newPresets, newSchedules, newScenes) => {
+        const handleDevices = (devicesInMelCloud, devicesInConfig, deviceTypeString, newDevices, newPresets, newSchedules, newScenes) => {
           try {
             const configDevicesMap = new Map(devicesInConfig.map(dev => [String(dev.id), dev]));
 
@@ -276,13 +276,9 @@
                 deviceInConfig = {
                   id: deviceId,
                   type: device.Type,
-                  typeString,
+                  deviceTypeString,
                   displayType: 0,
-                  name: device.DeviceName,
-                  presets: [],
-                  schedules: [],
-                  scenes: [],
-                  buttonsSensors: []
+                  name: device.DeviceName
                 };
                 devicesInConfig.push(deviceInConfig);
                 newDevices.push(deviceInConfig);
@@ -294,10 +290,9 @@
 
                 // === Process presets ===
                 const presetsInMelCloud = device.Presets || [];
-                const presetsInConfig = deviceInConfig.presets || [];
+                const presetsInConfig = (deviceInConfig.presets ?? []).filter(p => String(p.id) !== '0');
                 const presetIds = new Set(presetsInConfig.map(p => String(p.id)));
 
-                let addedNewPreset = false;
                 presetsInMelCloud.forEach((preset, index) => {
                   const presetId = String(preset.ID);
                   if (!presetIds.has(presetId)) {
@@ -310,20 +305,8 @@
                     presetsInConfig.push(presetObj);
                     newPresets.push(presetObj);
                     presetIds.add(presetId);
-                    addedNewPreset = true;
                   }
                 });
-
-                // === Remove placeholder presets/schedules (id === '0') if new ones were added ===
-                if (addedNewPreset) {
-                  const beforeCount = presetsInConfig.length;
-                  deviceInConfig.presets = presetsInConfig.filter(p => String(p.id) !== '0');
-                  const removedCount = beforeCount - deviceInConfig.presets.length;
-
-                  if (removedCount > 0 && removedCount < beforeCount) {
-                    updateInfo('info2', `Removed ${removedCount} placeholder preset from device ${device.DeviceID}`, 'yellow');
-                  }
-                }
               }
 
               //only for melcloudhome
@@ -331,10 +314,9 @@
 
                 // === Process schedules ===
                 const schedulesInMelCloud = device.Schedule || [];
-                const schedulesInConfig = deviceInConfig.schedules || [];
+                const schedulesInConfig = (deviceInConfig.schedules ?? []).filter(s => String(s.id) !== '0');
                 const scheduleIds = new Set(schedulesInConfig.map(s => String(s.id)));
 
-                let addedNewSchedule = false;
                 schedulesInMelCloud.forEach((schedule, index) => {
                   const scheduleId = String(schedule.Id);
                   if (!scheduleIds.has(scheduleId)) {
@@ -347,26 +329,13 @@
                     schedulesInConfig.push(scheduleObj);
                     newSchedules.push(scheduleObj);
                     scheduleIds.add(scheduleId);
-                    addedNewSchedule = true;
                   }
                 });
 
-                // === Remove placeholder schedules (id === '0') if new ones were added ===
-                if (addedNewSchedule) {
-                  const beforeCount = schedulesInConfig.length;
-                  deviceInConfig.schedules = schedulesInConfig.filter(s => String(s.id) !== '0');
-                  const removedCount = beforeCount - deviceInConfig.schedules.length;
-
-                  if (removedCount > 0 && removedCount < beforeCount) {
-                    updateInfo('info2', `Removed ${removedCount} placeholder schedule from device ${device.DeviceID}`, 'yellow');
-                  }
-                }
-
                 // === Process scenes ===
-                const scenesInConfig = deviceInConfig.scenes || [];
+                const scenesInConfig = (deviceInConfig.scenes ?? []).filter(s => String(s.id) !== '0');
                 const sceneIds = new Set(scenesInConfig.map(s => String(s.id)));
 
-                let addedNewScenes = false;
                 scenesInMelCloud.forEach((scene, index) => {
                   const sceneId = String(scene.Id);
                   if (!sceneIds.has(sceneId)) {
@@ -379,26 +348,13 @@
                     scenesInConfig.push(sceneObj);
                     newScenes.push(sceneObj);
                     sceneIds.add(sceneId);
-                    addedNewScenes = true;
                   }
                 });
-
-                // === Remove placeholder scenes (id === '0') if new ones were added ===
-                if (addedNewScenes) {
-                  const beforeCount = scenesInConfig.length;
-                  deviceInConfig.scenes = scenesInConfig.filter(s => String(s.id) !== '0');
-                  const removedCount = beforeCount - deviceInConfig.scenes.length;
-
-                  if (removedCount > 0 && removedCount < beforeCount) {
-                    updateInfo('info2', `Removed ${removedCount} placeholder scene from device ${device.DeviceID}`, 'yellow');
-                  }
-                }
               }
             });
 
             // Return filtered devicesInConfig to make sure upstream code uses it
-            const filteredDevices = devicesInConfig.filter(d => String(d.id) !== '0');
-            return filteredDevices;
+            return devicesInConfig;
           } catch (error) {
             updateInfo('info', `Error while processing device: ${JSON.stringify(error)}`, 'red');
           }

package/package.json

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

package/src/constants.js

@@ -58,15 +58,21 @@ export const TemperatureDisplayUnits = ["°C", "°F"];
 
 export const AirConditioner = {
     SystemMapEnumToString: { 0: "Air Conditioner Off", 1: "Air Conditioner On", 2: "Air Conditioner Offline" },
-    OperationModeMapStringToEnum: { "0": 0, "Heat": 1, "Dry": 2, "Cool": 3, "4": 7, "5": 8, "6": 6, "Fan": 7, "Automatic": 8, "Isee Heat": 9, "Isee Dry": 10, "Isee Cool": 11 },
+    OperationModeMapStringToEnum: { "0": 0, "Heat": 1, "Dry": 2, "Cool": 3, "4": 4, "5": 5, "6": 6, "Fan": 7, "Automatic": 8, "Isee Heat": 9, "Isee Dry": 10, "Isee Cool": 11 },
     OperationModeMapEnumToString: { 0: "0", 1: "Heat", 2: "Dry", 3: "Cool", 4: "4", 5: "5", 6: "6", 7: "Fan", 8: "Automatic", 9: "Isee Heat", 10: "Isee Dry", 11: "Isee Cool" },
-    FanSpeedMapStringToEnum: { "Auto": 0, "One": 1, "Two": 2, "Three": 3, "Four": 4, "Five": 5 },
+    OperationModeMapEnumToEnumWs: { 0: 0, 1: 1, 2: 2, 3: 3, 4: 7, 5: 8, 6: 9, 7: 10, 8: 11 },
+    FanSpeedMapStringToEnum: { "Auto": 0, "One": 1, "Two": 2, "Three": 3, "Four": 4, "Five": 5, "0": 0, "1": 1, "2": 2, "3": 3, "4": 4, "5": 5 },
     FanSpeedMapEnumToString: { 0: "Auto", 1: "One", 2: "Two", 3: "Three", 4: "Four", 5: "Five" },
+    SetFanSpeedMapStringToEnum: { "Auto": 0, "One": 1, "Two": 2, "Three": 3, "Four": 4, "Five": 5, "0": 0, "1": 1, "2": 2, "3": 3, "4": 4, "5": 5 },
+    SetFanSpeedMapEnumToString: { 0: "Auto", 1: "One", 2: "Two", 3: "Three", 4: "Four", 5: "Five" },
+    AktualFanSpeedMapStringToEnum: { "Auto": 0, "One": 1, "Two": 2, "Three": 3, "Four": 4, "Five": 5, "0": 0, "1": 1, "2": 2, "3": 3, "4": 4, "5": 5 },
     AktualFanSpeedMapEnumToString: { 0: "Quiet", 1: "One", 2: "Two", 3: "Three", 4: "Four", 5: "Five" },
     VaneVerticalDirectionMapStringToEnum: { "Auto": 0, "One": 1, "Two": 2, "Three": 3, "Four": 4, "Five": 5, "Six": 6, "Swing": 7 },
     VaneVerticalDirectionMapEnumToString: { 0: "Auto", 1: "One", 2: "Two", 3: "Three", 4: "Four", 5: "Five", 6: "Six", 7: "Swing" },
+    VaneVerticalDirectionMapEnumToEnumWs: { 6: 7 },
     VaneHorizontalDirectionMapStringToEnum: { "Auto": 0, "Left": 1, "LeftCentre": 2, "Centre": 3, "RightCentre": 4, "Right": 5, "Six": 6, "Seven": 7, "Split": 8, "Nine": 9, "Ten": 10, "Eleven": 11, "Swing": 12 },
     VaneHorizontalDirectionMapEnumToString: { 0: "Auto", 1: "Left", 2: "LeftCentre", 3: "Centre", 4: "RightCentre", 5: "Right", 6: "Six", 7: "Seven", 8: "Split", 9: "Nine", 10: "Ten", 11: "Eleven", 12: "Swing" },
+    VaneHorizontalDirectionMapEnumToEnumWs: { 7: 12 },
     AirDirectionMapEnumToString: { 0: "Auto", 1: "Swing" },
     CurrentOperationModeMapEnumToStringHeatherCooler: { 0: "Inactive", 1: "Idle", 2: "Heating", 3: "Cooling" },
     CurrentOperationModeMapEnumToStringThermostat: { 0: "Inactive", 1: "Heating", 2: "Cooling" },

package/src/deviceata.js

@@ -439,7 +439,8 @@ class DeviceAta extends EventEmitter {
                     if (supportsSwingFunction) {
                         melCloudService.getCharacteristic(Characteristic.SwingMode)
                             .onGet(async () => {
-                                //Vane Horizontal: Auto, 1, 2, 3, 4, 5, 6, 7 = Sp;it, 12 = Swing //Vertical: Auto, 1, 2, 3, 4, 5, 7 = Swing
+                                //Vane Horizontal: Auto, 1, 2, 3, 4, 5, 6, 7 = Split, 12 = Swing //Vertical: Auto, 1, 2, 3, 4, 5, 7 = Swing
+                                //Home Vane Horizontal: Auto, 1, 2, 3, 4, 5, 6, 7 = Swing, 8 = Split //Vertical: Auto, 1, 2, 3, 4, 5, 6 = Swing
                                 const value = this.accessory.currentSwingMode;
                                 return value;
                             })

package/src/melcloudata.js

@@ -35,6 +35,7 @@ class MelCloudAta extends EventEmitter {
             deviceData.Scenes = devicesData.Scenes ?? [];
 
             //update state
+            if (!this.logDebug) this.emit('debug', `Request update device settings: ${JSON.stringify(deviceData.Device, null, 2)}`);
             await this.updateState(deviceData);
         }).on('webSocket', async (parsedMessage) => {
             try {
@@ -53,18 +54,21 @@ class MelCloudAta extends EventEmitter {
                                 //update values
                                 for (const [key, value] of Object.entries(settings)) {
                                     if (!this.functions.isValidValue(value)) continue;
+                                    let parsedValue = this.functions.convertValue(value);
 
                                     //update holiday mode
                                     if (key === 'HolidayMode') {
-                                        deviceData.HolidayMode.Enabled = value;
+                                        deviceData.HolidayMode.Enabled = parsedValue;
                                         continue;
                                     }
 
                                     //update device settings
                                     if (key in deviceData.Device) {
-                                        deviceData.Device[key] = value;
+                                        deviceData.Device[key] = parsedValue;
                                     }
                                 }
+
+                                if (!this.logDebug) this.emit('debug', `WS update device settings: ${JSON.stringify(deviceData.Device, null, 2)}`);
                                 updateState = true;
                                 break;
                             case 'unitHolidayModeTriggered':
@@ -88,21 +92,28 @@ class MelCloudAta extends EventEmitter {
                 }
 
                 //update state
-                if (updateState) await this.updateState(deviceData);
+                if (updateState) await this.updateState(deviceData, 'ws');
             } catch (error) {
                 if (this.logError) this.emit('error', `Web socket process message error: ${error}`);
             }
         });
     }
 
-    async updateState(deviceData) {
+    async updateState(deviceData, type) {
         try {
             if (this.accountType === 'melcloudhome') {
-                deviceData.Device.OperationMode = AirConditioner.OperationModeMapStringToEnum[deviceData.Device.OperationMode] ?? deviceData.Device.OperationMode;
-                deviceData.Device.ActualFanSpeed = AirConditioner.FanSpeedMapStringToEnum[deviceData.Device.ActualFanSpeed] ?? deviceData.Device.ActualFanSpeed;
-                deviceData.Device.SetFanSpeed = AirConditioner.FanSpeedMapStringToEnum[deviceData.Device.SetFanSpeed] ?? deviceData.Device.SetFanSpeed;
-                deviceData.Device.VaneHorizontalDirection = AirConditioner.VaneHorizontalDirectionMapStringToEnum[deviceData.Device.VaneHorizontalDirection] ?? deviceData.Device.VaneHorizontalDirection
-                deviceData.Device.VaneVerticalDirection = AirConditioner.VaneVerticalDirectionMapStringToEnum[deviceData.Device.VaneVerticalDirection] ?? deviceData.Device.VaneVerticalDirection;
+
+                if (type === 'ws') {
+                    deviceData.Device.OperationMode = AirConditioner.OperationModeMapEnumToEnumWs[deviceData.Device.OperationMode] ?? deviceData.Device.OperationMode;
+                    deviceData.Device.VaneHorizontalDirection = AirConditioner.VaneHorizontalDirectionMapEnumToEnumWs[deviceData.Device.VaneHorizontalDirection] ?? deviceData.Device.VaneHorizontalDirection;
+                    deviceData.Device.VaneVerticalDirection = AirConditioner.VaneVerticalDirectionMapEnumToEnumWs[deviceData.Device.VaneVerticalDirection] ?? deviceData.Device.VaneVerticalDirection;
+                } else {
+                    deviceData.Device.OperationMode = AirConditioner.OperationModeMapStringToEnum[deviceData.Device.OperationMode] ?? deviceData.Device.OperationMode;
+                    deviceData.Device.ActualFanSpeed = AirConditioner.AktualFanSpeedMapStringToEnum[deviceData.Device.ActualFanSpeed] ?? deviceData.Device.ActualFanSpeed;
+                    deviceData.Device.SetFanSpeed = AirConditioner.SetFanSpeedMapStringToEnum[deviceData.Device.SetFanSpeed] ?? deviceData.Device.SetFanSpeed;
+                    deviceData.Device.VaneHorizontalDirection = AirConditioner.VaneHorizontalDirectionMapStringToEnum[deviceData.Device.VaneHorizontalDirection] ?? deviceData.Device.VaneHorizontalDirection;
+                    deviceData.Device.VaneVerticalDirection = AirConditioner.VaneVerticalDirectionMapStringToEnum[deviceData.Device.VaneVerticalDirection] ?? deviceData.Device.VaneVerticalDirection;
+                }
 
                 //read default temps
                 const temps = await this.functions.readData(this.defaultTempsFile, true);
@@ -224,7 +235,7 @@ class MelCloudAta extends EventEmitter {
                     }
 
                     if (this.logDebug) this.emit('debug', `Send Data: ${JSON.stringify(payload, null, 2)}`);
-                    
+
                     await axios(path, {
                         method: 'POST',
                         baseURL: ApiUrls.BaseURL,
@@ -313,7 +324,7 @@ class MelCloudAta extends EventEmitter {
                     //sens payload
                     headers['Content-Type'] = 'application/json; charset=utf-8';
                     headers.Origin = ApiUrlsHome.Origin;
-                    if (this.logDebug) this.emit('debug', `Send Data: ${JSON.stringify(payload, null, 2)}`);
+                    if (!this.logDebug) this.emit('debug', `Send Data: ${JSON.stringify(payload, null, 2)}`);
 
                     await axios(path, {
                         method: method,

package/src/melcloudatw.js

@@ -35,14 +35,10 @@ class MelCloudAtw extends EventEmitter {
             deviceData.Scenes = devicesData.Scenes ?? [];
 
             //update state
+            if (this.logDebug) this.emit('debug', `Request update device settings: ${JSON.stringify(deviceData.Device, null, 2)}`);
             await this.updateState(deviceData);
-        }).on('message', async (message) => {
+        }).on('webSocket', async (parsedMessage) => {
             try {
-                const parsedMessage = JSON.parse(message);
-                const stringifyMessage = JSON.stringify(parsedMessage, null, 2);
-                if (this.logDebug) this.emit('debug', `Incoming message: ${stringifyMessage}`);
-                if (parsedMessage.message === 'Forbidden') return;
-
                 const messageData = parsedMessage?.[0]?.Data;
                 if (!messageData || !deviceData) return;
 
@@ -51,15 +47,28 @@ class MelCloudAtw extends EventEmitter {
                 switch (unitId) {
                     case this.deviceId:
                         const messageType = parsedMessage[0].messageType;
+                        const settings = this.functions.parseArrayNameValue(messageData.settings);
                         switch (messageType) {
                             case 'unitStateChanged':
-                                const settings = Object.fromEntries(
-                                    messageData.settings.map(({ name, value }) => {
-                                        let parsedValue = this.functions.convertValue(value);
-                                        return [name, parsedValue];
-                                    })
-                                );
-                                Object.assign(deviceData.Device, settings);
+
+                                //update values
+                                for (const [key, value] of Object.entries(settings)) {
+                                    if (!this.functions.isValidValue(value)) continue;
+                                    let parsedValue = this.functions.convertValue(value);
+
+                                    //update holiday mode
+                                    if (key === 'HolidayMode') {
+                                        deviceData.HolidayMode.Enabled = parsedValue;
+                                        continue;
+                                    }
+
+                                    //update device settings
+                                    if (key in deviceData.Device) {
+                                        deviceData.Device[key] = parsedValue;
+                                    }
+                                }
+
+                                if (this.logDebug) this.emit('debug', `WS update device settings: ${JSON.stringify(deviceData.Device, null, 2)}`);
                                 updateState = true;
                                 break;
                             case 'unitHolidayModeTriggered':
@@ -83,7 +92,7 @@ class MelCloudAtw extends EventEmitter {
                 }
 
                 //update state
-                if (updateState) await this.updateState(deviceData);
+                if (updateState) await this.updateState(deviceData, 'ws');
             } catch (error) {
                 if (this.logError) this.emit('error', `Web socket process message error: ${error}`);
             }
@@ -228,7 +237,7 @@ class MelCloudAtw extends EventEmitter {
                     }
 
                     if (this.logDebug) this.emit('debug', `Send Data: ${JSON.stringify(payload, null, 2)}`);
-                    
+
                     await axios(path, {
                         method: 'POST',
                         baseURL: ApiUrls.BaseURL,

package/src/melclouderv.js

@@ -35,6 +35,7 @@ class MelCloudErv extends EventEmitter {
             deviceData.Scenes = devicesData.Scenes ?? [];
 
             //update state
+            if (this.logDebug) this.emit('debug', `Request update device settings: ${JSON.stringify(deviceData.Device, null, 2)}`);
             await this.updateState(deviceData);
         }).on('webSocket', async (parsedMessage) => {
             try {
@@ -53,18 +54,21 @@ class MelCloudErv extends EventEmitter {
                                 //update values
                                 for (const [key, value] of Object.entries(settings)) {
                                     if (!this.functions.isValidValue(value)) continue;
+                                    let parsedValue = this.functions.convertValue(value);
 
                                     //update holiday mode
                                     if (key === 'HolidayMode') {
-                                        deviceData.HolidayMode.Enabled = value;
+                                        deviceData.HolidayMode.Enabled = parsedValue;
                                         continue;
                                     }
 
                                     //update device settings
                                     if (key in deviceData.Device) {
-                                        deviceData.Device[key] = value;
+                                        deviceData.Device[key] = parsedValue;
                                     }
                                 }
+
+                                if (this.logDebug) this.emit('debug', `WS update device settings: ${JSON.stringify(deviceData.Device, null, 2)}`);
                                 updateState = true;
                                 break;
                             case 'unitHolidayModeTriggered':
@@ -88,7 +92,7 @@ class MelCloudErv extends EventEmitter {
                 }
 
                 //update state
-                if (updateState) await this.updateState(deviceData);
+                if (updateState) await this.updateState(deviceData, 'ws');
             } catch (error) {
                 if (this.logError) this.emit('error', `Web socket process message error: ${error}`);
             }
@@ -233,7 +237,7 @@ class MelCloudErv extends EventEmitter {
                     }
 
                     if (this.logDebug) this.emit('debug', `Send Data: ${JSON.stringify(payload, null, 2)}`);
-                    
+
                     await axios(path, {
                         method: 'POST',
                         baseURL: ApiUrls.BaseURL,