homebridge-melcloud-control 3.1.4-beta.0 → 3.1.4-beta.10

package/homebridge-ui/public/index.html

@@ -150,7 +150,7 @@
         const response = await homebridge.request('/connect', payload);
         const info = response.info ?? '';
         const status = response.status;
-        const devices = response.data ?? [];
+        const devicesInMelCloud = response.data ?? [];
 
         //response status
         switch (status) {
@@ -165,24 +165,24 @@
               ervPresets: [],
             };
 
-            const devicesByType = {
+            const devicesByTypeInMelCloud = {
               ata: [],
               atw: [],
               erv: []
             };
 
-            //get devices by type
-            for (const device of devices) {
-              const deviceType = device.Type;
-              const pusDeviceTypeAta = deviceType === 0 ? devicesByType.ata.push(device) : false;
-              const pusDeviceTypeAtw = deviceType === 1 ? devicesByType.atw.push(device) : false;
-              const pusDeviceTypeErv = deviceType === 3 ? devicesByType.erv.push(device) : false;
+            //get devices from melcloud by type
+            for (const deviceInMelcloud of devicesInMelCloud) {
+              const deviceType = devicesInMelCloud.Type;
+              const pusDeviceTypeAta = deviceType === 0 ? devicesByTypeInMelCloud.ata.push(deviceInMelcloud) : false;
+              const pusDeviceTypeAtw = deviceType === 1 ? devicesByTypeInMelCloud.atw.push(deviceInMelcloud) : false;
+              const pusDeviceTypeErv = deviceType === 3 ? devicesByTypeInMelCloud.erv.push(deviceInMelcloud) : false;
             };
 
-            //devices from config
-            const ataDevices = pluginConfig[0].accounts[this.deviceIndex].ataDevices ?? [];
-            const atwDevices = pluginConfig[0].accounts[this.deviceIndex].atwDevices ?? [];
-            const ervDevices = pluginConfig[0].accounts[this.deviceIndex].ervDevices ?? [];
+            //devices in config
+            const ataDevicesInConfig = pluginConfig[0].accounts[this.deviceIndex].ataDevices ?? [];
+            const atwDevicesInConfig = pluginConfig[0].accounts[this.deviceIndex].atwDevices ?? [];
+            const ervDevicesInConfig = pluginConfig[0].accounts[this.deviceIndex].ervDevices ?? [];
 
             //info text
             let textAta = 'ATA: 0';
@@ -196,7 +196,7 @@
             let ervPresetsCount = 0;
 
             //device ata
-            devicesByType.ata.forEach((device, index) => {
+            devicesByTypeInMelCloud.ata.forEach((device, index) => {
               const deviceId = device.DeviceID;
               const deviceType = device.Type;
               const deviceName = device.DeviceName;
@@ -217,14 +217,14 @@
                 buttonsSensors: []
               };
 
-              const deviceExistsInConfig = ataDevices.find(device => device.id === deviceId);
+              const deviceExistsInConfig = ataDevicesInConfig.some(device => device.id === deviceId);
               if (!deviceExistsInConfig) {
-                ataDevices.push(deviceAta);
+                ataDevicesInConfig.push(deviceAta);
                 newDevices.ata.push(deviceAta);
               };
 
-              //presets
-              for (const preset of devicePresets) {
+              //presets of device in melcloud
+              devicePresets.forEach((preset) => {
                 const presetId = preset.ID;
                 const presetName = preset.NumberDescription;
 
@@ -233,26 +233,21 @@
                 preset.displayType == 0;
                 preset.namePrefix = false;
 
-                let presetExistsInConfig = false;
-                for (const ataDevice of ataDevices) {
-                  if (ataDevice.presets?.some(preset => preset.id === presetId)) {
-                    presetExistsInConfig = true;
-                    break;
-                  }
+                //find the specific ataDevice to which the preset belongs
+                const ataDevice = ataDevicesInConfig.find((configDevice) => configDevice.id === deviceId);
+                if (ataDevice && !ataDevice.presets.some((p) => p.id === presetId)) {
+                  ataDevice.presets.push(preset);
+                  newDevices.ataPresets.push(preset);
                 }
 
-                if (!presetExistsInConfig) {
-                  ataDevices[index].presets.push(preset);
-                  newDevices.ataPresets.push(preset);
-                };
-              };
+              });
               ataPresetsCount = newDevices.ataPresets.length;
               textAtaPresets = `ATA Presets: ${ataPresetsCount}`
             });
             textAta = `ATA: ${newDevices.ata.length}`
 
             //device atw
-            devicesByType.atw.forEach((device, index) => {
+            devicesByTypeInMelCloud.atw.forEach((device, index) => {
               const deviceId = device.DeviceID;
               const deviceType = device.Type;
               const deviceName = device.DeviceName;
@@ -279,14 +274,14 @@
                 buttonsSensors: []
               };
 
-              const deviceExistsInConfig = atwDevices.find(device => device.id === deviceId);
+              const deviceExistsInConfig = atwDevicesInConfig.some(device => device.id === deviceId);
               if (!deviceExistsInConfig) {
-                atwDevices.push(deviceAtw);
+                atwDevicesInConfig.push(deviceAtw);
                 newDevices.atw.push(deviceAtw);
               };
 
-              //presets
-              for (const preset of devicePresets) {
+              //presets of device in melcloud
+              devicePresets.forEach((preset) => {
                 const presetId = preset.ID;
                 const presetName = preset.NumberDescription;
 
@@ -295,26 +290,21 @@
                 preset.displayType == 0;
                 preset.namePrefix = false;
 
-                let presetExistsInConfig = false;
-                for (const atwDevice of atwDevices) {
-                  if (atwDevice.presets?.some(preset => preset.id === presetId)) {
-                    presetExistsInConfig = true;
-                    break;
-                  }
+                //find the specific ataDevice to which the preset belongs
+                const atwDevice = atwDevicesInConfig.find((configDevice) => configDevice.id === deviceId);
+                if (atwDevice && !atwDevice.presets.some((p) => p.id === presetId)) {
+                  atwDevice.presets.push(preset);
+                  newDevices.atwPresets.push(preset);
                 }
 
-                if (!presetExistsInConfig) {
-                  atwDevices[index].presets.push(preset);
-                  newDevices.atwPresets.push(preset);
-                };
-              };
+              });
               atwPresetsCount = newDevices.atwPresets.length;
               textAtwPresets = `ATW Presets: ${atwPresetsCount}`
             });
             textAtw = `ATW: ${newDevices.atw.length}`
 
             //device erv
-            devicesByType.erv.forEach((device, index) => {
+            devicesByTypeInMelCloud.erv.forEach((device, index) => {
               const deviceId = device.DeviceID;
               const deviceType = device.Type;
               const deviceName = device.DeviceName;
@@ -335,14 +325,14 @@
                 buttonsSensors: []
               };
 
-              const deviceExistsInConfig = ervDevices.find(device => device.id === deviceId);
+              const deviceExistsInConfig = ervDevicesInConfig.some(device => device.id === deviceId);
               if (!deviceExistsInConfig) {
-                ervDevices.push(deviceErv);
+                ervDevicesInConfig.push(deviceErv);
                 newDevices.erv.push(deviceErv);
               };
 
-              //presets
-              for (const preset of devicePresets) {
+              //presets of device in melcloud
+              devicePresets.forEach((preset) => {
                 const presetId = preset.ID;
                 const presetName = preset.NumberDescription;
 
@@ -351,19 +341,14 @@
                 preset.displayType == 0;
                 preset.namePrefix = false;
 
-                let presetExistsInConfig = false;
-                for (const ervDevice of ervDevices) {
-                  if (ervDevice.presets?.some(preset => preset.id === presetId)) {
-                    presetExistsInConfig = true;
-                    break;
-                  }
+                //find the specific ataDevice to which the preset belongs
+                const ervDevice = ervDevicesInConfig.find((configDevice) => configDevice.id === deviceId);
+                if (ervDevice && !ervDevice.presets.some((p) => p.id === presetId)) {
+                  ervDevice.presets.push(preset);
+                  newDevices.ervPresets.push(preset);
                 }
 
-                if (!presetExistsInConfig) {
-                  ervDevices[index].presets.push(preset);
-                  newDevices.ervPresets.push(preset);
-                };
-              };
+              });
               ervPresetsCount = newDevices.ervPresets.length;
               textErvPresets = `ERV Presets: ${ervPresetsCount}`
             });

package/index.js

@@ -55,9 +55,9 @@ class MelCloudPlatform {
 
 				//define directory and file paths
 				const prefDir = path.join(api.user.storagePath(), 'melcloud');
-				const accountInfoFile = `${prefDir}/${accountName}_Account`;
+				const accountFile = `${prefDir}/${accountName}_Account`;
 				const buildingsFile = `${prefDir}/${accountName}_Buildings`;
-				const deviceFile = `${prefDir}/${accountName}_Device_`;
+				const devicesFile = `${prefDir}/${accountName}_Devices`;
 
 				//create directory if it doesn't exist
 				try {
@@ -74,7 +74,7 @@ class MelCloudPlatform {
 
 				try {
 					//melcloud account
-					const melCloud = new MelCloud(user, passwd, language, accountInfoFile, buildingsFile, deviceFile, enableDebugMode, false);
+					const melCloud = new MelCloud(user, passwd, language, accountFile, buildingsFile, devicesFile, enableDebugMode, false);
 					melCloud.on('success', (message) => {
 						log.success(`Account ${accountName}, ${message}`);
 					})
@@ -103,19 +103,18 @@ class MelCloudPlatform {
 					const timers = [{ name: 'checkDevicesList', sampling: refreshInterval }];
 					melCloud.impulseGenerator.start(timers);
 
-					//Air Conditioner
+					//Air Conditioner 0
 					for (const device of account.ataDevices) {
 						//chack device from config exist on melcloud
-						const deviceExistInMelCloud = devices.some(dev => dev.DeviceID === device.id);
+						const deviceId = device.id;
+						const deviceExistInMelCloud = devices.some(dev => dev.DeviceID === deviceId);
 						if (!deviceExistInMelCloud || device.displayMode === 0) {
 							continue;
 						};
 
-						const deviceId = device.id.toString();
 						const deviceName = device.name;
 						const deviceTypeText = device.typeString;
-						const deviceInfoFile = `${prefDir}/${accountName}_Device_${deviceId}`;
-						const airConditioner = new DeviceAta(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, accountInfoFile, deviceInfoFile, deviceRefreshInterval)
+						const airConditioner = new DeviceAta(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, accountFile, devicesFile, deviceRefreshInterval)
 						airConditioner.on('publishAccessory', (accessory) => {
 
 							//publish device
@@ -142,20 +141,18 @@ class MelCloudPlatform {
 							});
 					};
 
-					//Heat Pump
+					//Heat Pump 1
 					for (const device of account.atwDevices) {
 						//chack device from config exist on melcloud
+						const deviceId = device.id;
 						const deviceExistInMelCloud = devices.some(dev => dev.DeviceID === device.id);
 						if (!deviceExistInMelCloud || device.displayMode === 0) {
 							continue;
 						};
 
-						const deviceId = device.id.toString();
-						const deviceType = device.type ?? 1;
 						const deviceName = device.name;
-						const deviceTypeText = CONSTANTS.DeviceType[deviceType];
-						const deviceInfoFile = `${prefDir}/${accountName}_Device_${deviceId}`;
-						const heatPump = new DeviceAtw(api, account, melCloud, device, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, accountInfoFile, deviceInfoFile, deviceRefreshInterval)
+						const deviceTypeText = device.typeString;
+						const heatPump = new DeviceAtw(api, account, melCloud, device, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, accountFile, devicesFile, deviceRefreshInterval)
 						heatPump.on('publishAccessory', (accessory) => {
 
 							//publish device
@@ -182,20 +179,18 @@ class MelCloudPlatform {
 							});
 					};
 
-					//Energy Recovery Ventilation
+					//Energy Recovery Ventilation 3
 					for (const device of account.ervDevices) {
 						//chack device from config exist on melcloud
+						const deviceId = device.id;
 						const deviceExistInMelCloud = devices.some(dev => dev.DeviceID === device.id);
 						if (!deviceExistInMelCloud || device.displayMode === 0) {
 							continue;
 						};
 
-						const deviceId = device.id.toString();
-						const deviceType = device.type ?? 3;
 						const deviceName = device.name;
-						const deviceTypeText = CONSTANTS.DeviceType[deviceType];
-						const deviceInfoFile = `${prefDir}/${accountName}_Device_${deviceId}`;
-						const energyRecoveryVentilation = new DeviceErv(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, accountInfoFile, deviceInfoFile, deviceRefreshInterval)
+						const deviceTypeText = device.typeString;
+						const energyRecoveryVentilation = new DeviceErv(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, accountFile, devicesFile, deviceRefreshInterval)
 						energyRecoveryVentilation.on('publishAccessory', (accessory) => {
 
 							//publish device
@@ -222,7 +217,7 @@ class MelCloudPlatform {
 							});
 					};
 				} catch (error) {
-					log.error(`Account: ${accountName}, MELCloud error: ${error.message ?? error}`);
+					log.error(`Account: ${accountName}, Did finish launching error: ${error.message ?? error}`);
 				}
 			};
 		});

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "3.1.4-beta.0",
+  "version": "3.1.4-beta.10",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -29,7 +29,7 @@
   ],
   "engines": {
     "homebridge": "^1.6.0 || ^2.0.0-beta.0",
-    "node": "^18.20.4 || ^20.15.1"
+    "node": "^18.20.4 || ^20.15.1 || ^22.7.0"
   },
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^1.0.3",

package/src/deviceata.js

@@ -7,7 +7,7 @@ const CONSTANTS = require('./constants.json');
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class DeviceAta extends EventEmitter {
-    constructor(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, accountInfoFile, deviceInfoFile, refreshInterval) {
+    constructor(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, accountFile, devicesFile, refreshInterval) {
         super();
 
         Accessory = api.platformAccessory;
@@ -94,8 +94,9 @@ class DeviceAta extends EventEmitter {
         //melcloud device
         this.melCloudAta = new MelCloudAta({
             contextKey: contextKey,
-            accountInfoFile: accountInfoFile,
-            deviceInfoFile: deviceInfoFile,
+            accountFile: accountFile,
+            devicesFile: devicesFile,
+            deviceId: deviceId,
             debugLog: account.enableDebugMode,
             refreshInterval: refreshInterval
         });
@@ -192,7 +193,6 @@ class DeviceAta extends EventEmitter {
             .on('deviceState', async (deviceData, deviceState, useFahrenheit) => {
                 //device info
                 const displayMode = this.displayMode;
-                const inStandbyMode = deviceData.Device.InStandbyMode;
                 const hasAutomaticFanSpeed = deviceData.Device.HasAutomaticFanSpeed ?? false;
                 const airDirectionFunction = deviceData.Device.AirDirectionFunction ?? false;
                 const hasOutdoorTemperature = deviceData.Device.HasOutdoorTemperature ?? false;
@@ -213,6 +213,9 @@ class DeviceAta extends EventEmitter {
                 const presetsOnServer = deviceData.Presets ?? [];
 
                 //device state
+                const power = deviceState.Power;
+                const offline = deviceState.Offline;
+                const inStandbyMode = deviceState.InStandbyMode;
                 const roomTemperature = deviceState.RoomTemperature;
                 const setTemperature = deviceState.SetTemperature;
                 const setFanSpeed = deviceState.SetFanSpeed;
@@ -224,8 +227,6 @@ class DeviceAta extends EventEmitter {
                 const prohibitSetTemperature = deviceState.ProhibitSetTemperature;
                 const prohibitOperationMode = deviceState.ProhibitOperationMode;
                 const prohibitPower = deviceState.ProhibitPower;
-                const power = deviceState.Power;
-                const offline = deviceState.Offline;
 
                 //accessory
                 this.accessory.presetsOnServer = presetsOnServer;

package/src/deviceatw.js

@@ -7,7 +7,7 @@ const CONSTANTS = require('./constants.json');
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class DeviceAtw extends EventEmitter {
-    constructor(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, accountInfoFile, deviceInfoFile, refreshInterval) {
+    constructor(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, accountFile, devicesFile, refreshInterval) {
         super();
 
         Accessory = api.platformAccessory;
@@ -90,8 +90,9 @@ class DeviceAtw extends EventEmitter {
         //melcloud device
         this.melCloudAtw = new MelCloudAtw({
             contextKey: contextKey,
-            accountInfoFile: accountInfoFile,
-            deviceInfoFile: deviceInfoFile,
+            accountFile: accountFile,
+            devicesFile: devicesFile,
+            deviceId: deviceId,
             debugLog: account.enableDebugMode,
             refreshInterval: refreshInterval
         });

package/src/deviceerv.js

@@ -7,7 +7,7 @@ const CONSTANTS = require('./constants.json');
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class DeviceErv extends EventEmitter {
-    constructor(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, accountInfoFile, deviceInfoFile, refreshInterval) {
+    constructor(api, account, device, melCloud, accountInfo, contextKey, accountName, deviceId, deviceName, deviceTypeText, accountFile, devicesFile, refreshInterval) {
         super();
 
         Accessory = api.platformAccessory;
@@ -93,8 +93,9 @@ class DeviceErv extends EventEmitter {
         //melcloud device
         this.melCloudErv = new MelCloudErv({
             contextKey: contextKey,
-            accountInfoFile: accountInfoFile,
-            deviceInfoFile: deviceInfoFile,
+            accountFile: accountFile,
+            devicesFile: devicesFile,
+            deviceId: deviceId,
             debugLog: account.enableDebugMode,
             refreshInterval: refreshInterval
         });

package/src/melcloud.js

@@ -8,14 +8,15 @@ const ImpulseGenerator = require('./impulsegenerator.js');
 const CONSTANTS = require('./constants.json');
 
 class MelCloud extends EventEmitter {
-    constructor(user, passwd, language, accountInfoFile, buildingsFile, deviceFile, enableDebugMode, requestConfig) {
+    constructor(user, passwd, language, accountFile, buildingsFile, devicesFile, enableDebugMode, requestConfig) {
         super();
-        this.accountInfoFile = accountInfoFile;
+        this.accountFile = accountFile;
         this.buildingsFile = buildingsFile;
-        this.deviceFile = deviceFile;
+        this.devicesFile = devicesFile;
         this.enableDebugMode = enableDebugMode;
         this.requestConfig = requestConfig;
         this.contextKey = '';
+        this.useFahrenheit = 0;
         this.devicesId = [];
 
         this.options = {
@@ -62,6 +63,7 @@ class MelCloud extends EventEmitter {
             const account = accountData.data;
             const accountInfo = account.LoginData;
             const contextKey = accountInfo.ContextKey;
+            this.useFahrenheit = accountInfo.UseFahrenheit
             this.contextKey = contextKey;
 
             //remove sensitive data
@@ -82,7 +84,7 @@ class MelCloud extends EventEmitter {
             };
 
             //save melcloud info to the file
-            await this.saveData(this.accountInfoFile, accountInfo);
+            await this.saveData(this.accountFile, accountInfo);
 
             //emit connect success
             this.emit('success', `Connect to MELCloud Success.`)
@@ -144,6 +146,7 @@ class MelCloud extends EventEmitter {
                 ];
 
                 //add all devices to the devices array
+                devices.useFahrenheit = this.useFahrenheit;
                 devices.push(...allDevices);
             }
 
@@ -152,18 +155,10 @@ class MelCloud extends EventEmitter {
                 this.emit('warn', `No devices found.`);
                 return;
             }
-            const debug3 = this.enableDebugMode ? this.emit('debug', `Found: ${devicesCount} devices.`) : false;
-
-            //get device info fom devices
-            for (const deviceInfo of devices) {
-                const deviceId = deviceInfo.DeviceID
-                const deviceName = deviceInfo.DeviceName;
 
-                //save every device info to the file
-                const deviceFile = `${this.deviceFile}${deviceId}`;
-                await this.saveData(deviceFile, deviceInfo);
-                const debug = this.enableDebugMode ? this.emit('debug', `Device: ${deviceName} info saved.`) : false;
-            };
+            //save buildings to the file
+            await this.saveData(this.devicesFile, devices);
+            const debug3 = this.enableDebugMode ? this.emit('debug', `${devicesCount} devices saved.`) : false;
 
             return devices;
         } catch (error) {

package/src/melcloudata.js

@@ -11,8 +11,9 @@ class MelCloudAta extends EventEmitter {
     constructor(config) {
         super();
         const contextKey = config.contextKey;
-        const accountInfoFile = config.accountInfoFile;
-        const deviceInfoFile = config.deviceInfoFile;
+        const accountFile = config.accountFile;
+        const devicesFile = config.devicesFile;
+        const deviceId = config.deviceId;
         const debugLog = config.debugLog;
         const refreshInterval = config.refreshInterval;
 
@@ -39,7 +40,7 @@ class MelCloudAta extends EventEmitter {
         impulseGenerator.on('checkDevice', async () => {
             try {
                 //read account info from file
-                const accountInfo = await this.readData(accountInfoFile);
+                const accountInfo = await this.readData(accountFile);
 
                 //remove sensitive data
                 const debugData = {
@@ -56,8 +57,9 @@ class MelCloudAta extends EventEmitter {
                 this.useFahrenheit = useFahrenheit;
 
                 //read device info from file
-                const deviceData = await this.readData(deviceInfoFile);
-                const debug1 = debugLog ? this.emit('debug', `Device Info: ${JSON.stringify(deviceData, null, 2)}`) : false;
+                const devicesData = await this.readData(devicesFile);
+                const debug1 = debugLog ? this.emit('debug', `Device Info: ${JSON.stringify(devicesData, null, 2)}`) : false;
+                const deviceData = devicesData.find((device) => device.DeviceID === deviceId);
 
                 if (!deviceData) {
                     this.emit('warn', `Device data not found.`);
@@ -65,7 +67,6 @@ class MelCloudAta extends EventEmitter {
                 }
 
                 //device info
-                const deviceId = deviceData.DeviceID.toString();
                 const deviceName = deviceData.DeviceName;
                 const buildingId = deviceData.BuildingID;
                 const buildingName = deviceData.BuildingName;
@@ -413,7 +414,7 @@ class MelCloudAta extends EventEmitter {
 
             await this.axiosInstancePost(CONSTANTS.ApiUrls.SetAta, options);
             this.emit('deviceState', this.deviceData, deviceState, this.useFahrenheit);
-            return true;;
+            return true;
         } catch (error) {
             throw new Error(error.message ?? error);
         };

package/src/melcloudatw.js

@@ -11,8 +11,9 @@ class MelCloudAtw extends EventEmitter {
     constructor(config) {
         super();
         const contextKey = config.contextKey;
-        const accountInfoFile = config.accountInfoFile;
-        const deviceInfoFile = config.deviceInfoFile;
+        const accountFile = config.accountFile;
+        const devicesFile = config.devicesFile;
+        const deviceId = config.deviceId;
         const debugLog = config.debugLog;
         const refreshInterval = config.refreshInterval;
 
@@ -39,7 +40,7 @@ class MelCloudAtw extends EventEmitter {
         impulseGenerator.on('checkDevice', async () => {
             try {
                 //read account info from file
-                const accountInfo = await this.readData(accountInfoFile);
+                const accountInfo = await this.readData(accountFile);
 
                 //remove sensitive data
                 const debugData = {
@@ -56,8 +57,9 @@ class MelCloudAtw extends EventEmitter {
                 this.useFahrenheit = useFahrenheit;
 
                 //read device info from file
-                const deviceData = await this.readData(deviceInfoFile);
-                const debug1 = debugLog ? this.emit('debug', `Device Info: ${JSON.stringify(deviceData, null, 2)}`) : false;
+                const devicesData = await this.readData(devicesFile);
+                const debug1 = debugLog ? this.emit('debug', `Device Info: ${JSON.stringify(devicesData, null, 2)}`) : false;
+                const deviceData = devicesData.find((device) => device.DeviceID === deviceId);
 
                 if (!deviceData) {
                     this.emit('warn', `Device data not found.`);
@@ -65,7 +67,6 @@ class MelCloudAtw extends EventEmitter {
                 }
 
                 //device info
-                const deviceId = deviceData.DeviceID.toString();
                 const deviceName = deviceData.DeviceName;
                 const buildingId = deviceData.BuildingID;
                 const buildingName = deviceData.BuildingName;

package/src/melclouderv.js

@@ -11,8 +11,9 @@ class MelCloudErv extends EventEmitter {
     constructor(config) {
         super();
         const contextKey = config.contextKey;
-        const accountInfoFile = config.accountInfoFile;
-        const deviceInfoFile = config.deviceInfoFile;
+        const accountFile = config.accountFile;
+        const devicesFile = config.devicesFile;
+        const deviceId = config.deviceId;
         const debugLog = config.debugLog;
         const refreshInterval = config.refreshInterval;
 
@@ -39,7 +40,7 @@ class MelCloudErv extends EventEmitter {
         impulseGenerator.on('checkDevice', async () => {
             try {
                 //read account info from file
-                const accountInfo = await this.readData(accountInfoFile);
+                const accountInfo = await this.readData(accountFile);
 
                 //remove sensitive data
                 const debugData = {
@@ -56,8 +57,9 @@ class MelCloudErv extends EventEmitter {
                 this.useFahrenheit = useFahrenheit;
 
                 //read device info from file
-                const deviceData = await this.readData(deviceInfoFile);
-                const debug1 = debugLog ? this.emit('debug', `Device Info: ${JSON.stringify(deviceData, null, 2)}`) : false;
+                const devicesData = await this.readData(devicesFile);
+                const debug1 = debugLog ? this.emit('debug', `Device Info: ${JSON.stringify(devicesData, null, 2)}`) : false;
+                const deviceData = devicesData.find((device) => device.DeviceID === deviceId);
 
                 if (!deviceData) {
                     this.emit('warn', `Device data not found.`);
@@ -65,7 +67,6 @@ class MelCloudErv extends EventEmitter {
                 }
 
                 //deviceData
-                const deviceId = deviceData.DeviceID.toString();
                 const deviceName = deviceData.DeviceName;
                 const buildingId = deviceData.BuildingID;
                 const buildingName = deviceData.BuildingName;