homebridge-melcloud-control 4.4.1-beta.36 → 4.4.1-beta.39

package/homebridge-ui/public/index.html

@@ -284,79 +284,81 @@
                 deviceTypeString,
                 displayType: 0,
                 name: device.DeviceName,
-                presets: [],
-                schedules: [],
-                scenes: []
               };
               devicesInConfig.push(deviceInConfig);
               newDevices.push(deviceInConfig);
               configDevicesMap.set(deviceId, deviceInConfig);
             }
 
-            // PRESETS
-            deviceInConfig.presets = deviceInConfig.presets ?? [];
-            const presetsInMelCloud = device.Presets || [];
-            removedFromConfig.ataPresets.push(...removeStaleEntities(deviceInConfig.presets, presetsInMelCloud, p => p.id, p => p.ID));
-            const presetIds = new Set(deviceInConfig.presets.map(p => String(p.id)));
-            presetsInMelCloud.forEach((preset, index) => {
-              const presetId = String(preset.ID);
-              if (!presetIds.has(presetId)) {
-                const presetObj = {
-                  id: presetId,
-                  displayType: 0,
-                  name: preset.NumberDescription || `Preset ${index}`,
-                  namePrefix: false
-                };
-                deviceInConfig.presets.push(presetObj);
-                newPresets.push(presetObj);
-              }
-            });
-
-            // SCHEDULES
-            deviceInConfig.schedules = deviceInConfig.schedules ?? [];
-            const schedulesInMelCloud = device.Schedule || [];
-            removedFromConfig.ataSchedules.push(...removeStaleEntities(deviceInConfig.schedules, schedulesInMelCloud, s => s.id, s => s.Id));
-            const scheduleIds = new Set(deviceInConfig.schedules.map(s => String(s.id)));
-            schedulesInMelCloud.forEach((schedule, index) => {
-              const scheduleId = String(schedule.Id);
-              if (!scheduleIds.has(scheduleId)) {
-                const scheduleObj = {
-                  id: scheduleId,
-                  displayType: 0,
-                  name: `Schedule ${index}`,
-                  namePrefix: false
-                };
-                deviceInConfig.schedules.push(scheduleObj);
-                newSchedules.push(scheduleObj);
-              }
-            });
-
-            // SCENES
-            deviceInConfig.scenes = deviceInConfig.scenes ?? [];
-            removedFromConfig.scenes.push(...removeStaleEntities(deviceInConfig.scenes, scenesInMelCloud, s => s.id, s => s.Id));
-            const sceneIds = new Set(deviceInConfig.scenes.map(s => String(s.id)));
-            scenesInMelCloud.forEach((scene, index) => {
-              const sceneId = String(scene.Id);
-              if (!sceneIds.has(sceneId)) {
-                const sceneObj = {
-                  id: sceneId,
-                  displayType: 0,
-                  name: scene.Name || `Scene ${index}`,
-                  namePrefix: false
-                };
-                deviceInConfig.scenes.push(sceneObj);
-                newScenes.push(sceneObj);
-              }
-            });
+            //ONLY MELCLOUD - PRESETS
+            if (account.type === 'melcloud') {
+              deviceInConfig.presets = deviceInConfig.presets ?? [];
+              const presetsInMelCloud = device.Presets || [];
+              removedFromConfig.ataPresets.push(...removeStaleEntities(deviceInConfig.presets, presetsInMelCloud, p => p.id, p => p.ID));
+              const presetIds = new Set(deviceInConfig.presets.map(p => String(p.id)));
+              presetsInMelCloud.forEach((preset, index) => {
+                const presetId = String(preset.ID);
+                if (!presetIds.has(presetId)) {
+                  const presetObj = {
+                    id: presetId,
+                    displayType: 0,
+                    name: preset.NumberDescription || `Preset ${index}`,
+                    namePrefix: false
+                  };
+                  deviceInConfig.presets.push(presetObj);
+                  newPresets.push(presetObj);
+                }
+              });
+            }
+
+            //ONLY MELCLOUD HOME - SCHEDULES & SCENES
+            if (account.type === 'melcloudhome') {
+              // SCHEDULES
+              deviceInConfig.schedules = deviceInConfig.schedules ?? [];
+              const schedulesInMelCloud = device.Schedule || [];
+              removedFromConfig.ataSchedules.push(...removeStaleEntities(deviceInConfig.schedules, schedulesInMelCloud, s => s.id, s => s.Id));
+              const scheduleIds = new Set(deviceInConfig.schedules.map(s => String(s.id)));
+              schedulesInMelCloud.forEach((schedule, index) => {
+                const scheduleId = String(schedule.Id);
+                if (!scheduleIds.has(scheduleId)) {
+                  const scheduleObj = {
+                    id: scheduleId,
+                    displayType: 0,
+                    name: `Schedule ${index}`,
+                    namePrefix: false
+                  };
+                  deviceInConfig.schedules.push(scheduleObj);
+                  newSchedules.push(scheduleObj);
+                }
+              });
+
+              // SCENES
+              deviceInConfig.scenes = deviceInConfig.scenes ?? [];
+              removedFromConfig.scenes.push(...removeStaleEntities(deviceInConfig.scenes, scenesInMelCloud, s => s.id, s => s.Id));
+              const sceneIds = new Set(deviceInConfig.scenes.map(s => String(s.id)));
+              scenesInMelCloud.forEach((scene, index) => {
+                const sceneId = String(scene.Id);
+                if (!sceneIds.has(sceneId)) {
+                  const sceneObj = {
+                    id: sceneId,
+                    displayType: 0,
+                    name: scene.Name || `Scene ${index}`,
+                    namePrefix: false
+                  };
+                  deviceInConfig.scenes.push(sceneObj);
+                  if (index === 0) newScenes.push(sceneObj);
+                }
+              });
+            }
           });
 
           return devicesInConfig;
         };
 
         // Execute device handlers
-        account.ataDevices = handleDevices(devicesInMelCloudByType.ata, account.ataDevices, "Air Conditioner", newInMelCloud.ata, newInMelCloud.ataPresets, newInMelCloud.ataSchedules, newInMelCloud.ataScenes);
-        account.atwDevices = handleDevices(devicesInMelCloudByType.atw, account.atwDevices, "Heat Pump", newInMelCloud.atw, newInMelCloud.atwPresets, newInMelCloud.atwSchedules, newInMelCloud.atwScenes);
-        account.ervDevices = handleDevices(devicesInMelCloudByType.erv, account.ervDevices, "Energy Recovery Ventilation", newInMelCloud.erv, newInMelCloud.ervPresets, newInMelCloud.ervSchedules, newInMelCloud.ervScenes);
+        account.ataDevices = handleDevices(devicesInMelCloudByType.ata, account.ataDevices, "Air Conditioner", newInMelCloud.ata, newInMelCloud.ataPresets, newInMelCloud.ataSchedules, newInMelCloud.scenes);
+        account.atwDevices = handleDevices(devicesInMelCloudByType.atw, account.atwDevices, "Heat Pump", newInMelCloud.atw, newInMelCloud.atwPresets, newInMelCloud.atwSchedules, newInMelCloud.scenes);
+        account.ervDevices = handleDevices(devicesInMelCloudByType.erv, account.ervDevices, "Energy Recovery Ventilation", newInMelCloud.erv, newInMelCloud.ervPresets, newInMelCloud.ervSchedules, newInMelCloud.scenes);
 
         // Summary
         const newDevicesCount = newInMelCloud.ata.length + newInMelCloud.atw.length + newInMelCloud.erv.length;

package/index.js

@@ -137,12 +137,24 @@ class MelCloudPlatform {
 									}
 
 									//chack device from config exist on melcloud
-									const deviceExistInMelCloud = melcloudDevicesList.Devices.some(dev => dev.DeviceID === device.id);
-									if (!deviceExistInMelCloud) {
+									const deviceInMelCloud = melcloudDevicesList.Devices.find(d => d.DeviceID === device.id);
+									if (!deviceInMelCloud) {
 										if (logLevel.warn) log.warn(`${name}, ${deviceTypeString}, ${deviceName}, not exist on server, please login to MELCLoud from plugin UI to fix this issue.`);
 										continue;
 									}
 
+									//presets
+									const presetIds = (deviceInMelCloud.Presets ?? []).map(p => String(p.ID));
+									const presets = account.type === 'melcloud' ? (device.presets || []).filter(p => (p.displayType ?? 0) > 0 && p.id !== '0' && presetIds.includes(p.id)) : [];
+
+									//schedules
+									const schedulesIds = (deviceInMelCloud.Schedule ?? []).map(s => String(s.Id));
+									const schedules = account.type === 'melcloudhome' ? (device.schedules || []).filter(s => (s.displayType ?? 0) > 0 && s.id !== '0' && schedulesIds.includes(s.id)) : [];
+
+									//scenes
+									const scenesIds = (melcloudDevicesList.Scenes ?? []).map(s => String(s.Id));
+									const scenes = account.type === 'melcloudhome' ? (device.scenes || []).filter(s => (s.displayType ?? 0) > 0 && s.id !== '0' && scenesIds.includes(s.id)) : [];
+
 									// set rest ful port
 									account.restFul.port = (device.id).slice(-4).replace(/^0/, '9');
 
@@ -168,15 +180,15 @@ class MelCloudPlatform {
 									let configuredDevice;
 									switch (deviceType) {
 										case 0: //ATA
-											configuredDevice = new DeviceAta(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
+											configuredDevice = new DeviceAta(api, account, device, presets, schedules, scenes, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
 											break;
 										case 1: //ATW
-											configuredDevice = new DeviceAtw(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
+											configuredDevice = new DeviceAtw(api, account, device, presets, schedules, scenes, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
 											break;
 										case 2:
 											break;
 										case 3: //ERV
-											configuredDevice = new DeviceErv(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
+											configuredDevice = new DeviceErv(api, account, device, presets, schedules, scenes, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
 											break;
 										default:
 											if (logLevel.warn) log.warn(`${name}, ${deviceTypeString}, ${deviceName}, unknown device: ${deviceType}.`);

package/package.json

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

package/src/deviceata.js

@@ -7,7 +7,7 @@ import { TemperatureDisplayUnits, AirConditioner } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class DeviceAta extends EventEmitter {
-    constructor(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList) {
+    constructor(api, account, device, presets, schedules, scenes, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList) {
         super();
 
         Accessory = api.platformAccessory;
@@ -44,9 +44,9 @@ class DeviceAta extends EventEmitter {
         this.frostProtectionSupport = device.frostProtectionSupport || false;
         this.overheatProtectionSupport = device.overheatProtectionSupport || false;
         this.holidayModeSupport = device.holidayModeSupport || false;
-        this.presets = this.accountType === 'melcloud' ? (device.presets || []).filter(preset => (preset.displayType ?? 0) > 0 && preset.id !== '0') : [];
-        this.schedules = this.accountType === 'melcloudhome' ? (device.schedules || []).filter(schedule => (schedule.displayType ?? 0) > 0 && schedule.id !== '0') : [];
-        this.scenes = this.accountType === 'melcloudhome' ? (device.scenes || []).filter(scene => (scene.displayType ?? 0) > 0 && scene.id !== '0') : [];
+        this.presets = presets;
+        this.schedules = schedules;
+        this.scenes = scenes;
         this.buttons = (device.buttonsSensors || []).filter(button => (button.displayType ?? 0) > 0);
 
         //files

package/src/deviceatw.js

@@ -7,7 +7,7 @@ import { TemperatureDisplayUnits, HeatPump } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class DeviceAtw extends EventEmitter {
-    constructor(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList) {
+    constructor(api, account, device, presets, schedules, scenes,  defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList) {
         super();
 
         Accessory = api.platformAccessory;
@@ -48,9 +48,9 @@ class DeviceAtw extends EventEmitter {
         this.errorSensor = device.errorSensor || false;
         this.frostProtectionSupport = device.frostProtectionSupport || false;
         this.holidayModeSupport = device.holidayModeSupport || false;
-        this.presets = this.accountType === 'melcloud' ? (device.presets || []).filter(preset => (preset.displayType ?? 0) > 0 && preset.id !== '0') : [];
-        this.schedules = this.accountType === 'melcloudhome' ? (device.schedules || []).filter(schedule => (schedule.displayType ?? 0) > 0 && schedule.id !== '0') : [];
-        this.scenes = this.accountType === 'melcloudhome' ? (device.scenes || []).filter(scene => (scene.displayType ?? 0) > 0 && scene.id !== '0') : [];
+         this.presets = presets;
+        this.schedules = schedules;
+        this.scenes = scenes;
         this.buttons = (device.buttonsSensors || []).filter(button => (button.displayType ?? 0) > 0);
 
         //files

package/src/deviceerv.js

@@ -7,7 +7,7 @@ import { TemperatureDisplayUnits, Ventilation } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class DeviceErv extends EventEmitter {
-    constructor(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList) {
+    constructor(api, account, device, presets, schedules, scenes, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList) {
         super();
 
         Accessory = api.platformAccessory;
@@ -40,9 +40,9 @@ class DeviceErv extends EventEmitter {
         this.connectSensor = device.connectSensor || false;
         this.errorSensor = device.errorSensor || false;
         this.holidayModeSupport = device.holidayModeSupport || false;
-        this.presets = this.accountType === 'melcloud' ? (device.presets || []).filter(preset => (preset.displayType ?? 0) > 0 && preset.id !== '0') : [];
-        this.schedules = this.accountType === 'melcloudhome' ? (device.schedules || []).filter(schedule => (schedule.displayType ?? 0) > 0 && schedule.id !== '0') : [];
-        this.scenes = this.accountType === 'melcloudhome' ? (device.scenes || []).filter(scene => (scene.displayType ?? 0) > 0 && scene.id !== '0') : [];
+        this.presets = presets;
+        this.schedules = schedules;
+        this.scenes = scenes;
         this.buttons = (device.buttonsSensors || []).filter(button => (button.displayType ?? 0) > 0);
 
         //files

package/src/melcloud.js

@@ -54,7 +54,7 @@ class MelCloud extends EventEmitter {
 
     async checkDevicesList() {
         try {
-            const devicesList = { State: false, Info: null, Devices: [], Scenes: [] }
+            const devicesList = { State: false, Info: null, Buildings: [], Devices: [], Scenes: [] }
             if (this.logDebug) this.emit('debug', `Scanning for devices...`);
             const listDevicesData = await this.client(ApiUrls.Get.ListDevices, { method: 'GET', });
 
@@ -71,9 +71,6 @@ class MelCloud extends EventEmitter {
                 return devicesList;
             }
 
-            await this.functions.saveData(this.buildingsFile, buildingsList);
-            if (this.logDebug) this.emit('debug', `Buildings list saved`);
-
             const devices = [];
             for (const building of buildingsList) {
                 if (!building.Structure) {
@@ -108,7 +105,12 @@ class MelCloud extends EventEmitter {
 
             devicesList.State = true;
             devicesList.Info = `Found ${devicesCount} devices`;
+            devicesList.Buildings = buildingsList;
             devicesList.Devices = devices;
+
+            await this.functions.saveData(this.buildingsFile, devicesList);
+            if (this.logDebug) this.emit('debug', `Buildings list saved`);
+
             this.emit('devicesList', devicesList);
 
             return devicesList;

package/src/melcloudhome.js

@@ -107,7 +107,7 @@ class MelCloudHome extends EventEmitter {
 
     async checkDevicesList() {
         try {
-            const devicesList = { State: false, Info: null, Devices: [], Scenes: [] }
+            const devicesList = { State: false, Info: null, Buildings: {}, Devices: [], Scenes: [] }
             if (this.logDebug) this.emit('debug', `Scanning for devices`);
             const listDevicesData = await this.client(ApiUrls.Home.Get.ListDevices, { method: 'GET' });
 
@@ -122,9 +122,6 @@ class MelCloudHome extends EventEmitter {
                 return devicesList;
             }
 
-            await this.functions.saveData(this.buildingsFile, userContext);
-            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]));
@@ -205,8 +202,13 @@ class MelCloudHome extends EventEmitter {
 
             devicesList.State = true;
             devicesList.Info = `Found ${devicesCount} devices ${scenes.length > 0 ? `and ${scenes.length} scenes` : ''}`;
+            devicesList.Buildings = userContext;
             devicesList.Devices = devices;
             devicesList.Scenes = scenes;
+
+            await this.functions.saveData(this.buildingsFile, devicesList);
+            if (this.logDebug) this.emit('debug', `Buildings list saved`);
+
             this.emit('devicesList', devicesList);
 
             return devicesList;