homebridge-melcloud-control 2.5.0-beta.78 → 2.5.0-beta.8

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, melCloud, accountInfo, accountName, contextKey, deviceId, deviceName, deviceTypeText, accountInfoFile, deviceInfoFile, deviceRefreshInterval) {
         super();
 
         Accessory = api.platformAccessory;
@@ -17,12 +17,12 @@ class DeviceErv extends EventEmitter {
         AccessoryUUID = api.hap.uuid;
 
         //account config
-        this.displayMode = device.displayMode || 0;
-        this.temperatureSensor = device.temperatureSensor || false;
-        this.temperatureSensorOutdoor = device.temperatureSensorOutdoor || false;
-        this.temperatureSensorSupply = device.temperatureSensorSupply || false;
-        this.presetsEnabled = device.presets || false;
-        this.buttons = device.buttons || [];
+        this.displayMode = account.ervDisplayMode || 0;
+        this.temperatureSensor = account.ervTemperatureSensor || false;
+        this.temperatureSensorOutdoor = account.ervTemperatureSensorOutdoor || false;
+        this.temperatureSensorSupply = account.ervTemperatureSensorSupply || false;
+        this.presetsEnabled = account.ervPresets || false;
+        this.buttons = account.ervButtons || [];
         this.disableLogInfo = account.disableLogInfo || false;
         this.disableLogDeviceInfo = account.disableLogDeviceInfo || false;
         this.enableDebugMode = account.enableDebugMode || false;
@@ -67,7 +67,7 @@ class DeviceErv extends EventEmitter {
             accountInfoFile: accountInfoFile,
             deviceInfoFile: deviceInfoFile,
             debugLog: account.enableDebugMode,
-            refreshInterval: refreshInterval
+            refreshInterval: deviceRefreshInterval
         });
 
         this.melCloudErv.on('externalIntegrations', (deviceData, deviceState) => {

package/src/melcloud.js

@@ -10,14 +10,12 @@ const CONSTANTS = require('./constants.json');
 class MelCloud extends EventEmitter {
     constructor(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, enableDebugMode, refreshInterval, connectForConfig) {
         super();
+        this.enableDebugMode = enableDebugMode;
         this.accountInfoFile = accountInfoFile;
         this.buildingsFile = buildingsFile;
         this.deviceInfoFile = deviceInfoFile;
-        this.enableDebugMode = enableDebugMode;
         this.refreshInterval = refreshInterval;
         this.connectForConfig = connectForConfig;
-        this.emitReady = true;
-        this.contextKey = '';
         this.devicesId = [];
 
         this.options = {
@@ -32,18 +30,16 @@ class MelCloud extends EventEmitter {
             }
         };
 
-        if (!connectForConfig) {
-            this.impulseGenerator = new ImpulseGenerator();
-            this.impulseGenerator.on('checkDevicesList', async () => {
-                try {
-                    await this.chackDevicesList(this.contextKey);
-                } catch (error) {
-                    this.emit('error', `Check devices list: ${error}.`);
-                };
-            }).on('state', (state) => { });
-
-            this.connect();
-        };
+        this.impulseGenerator = new ImpulseGenerator();
+        this.impulseGenerator.on('checkDevicesList', async () => {
+            try {
+                await this.chackDevicesList();
+            } catch (error) {
+                this.emit('error', `Check devices list: ${error}.`);
+            };
+        }).on('state', (state) => { });
+
+        this.connect();
     };
 
     async connect() {
@@ -83,26 +79,57 @@ class MelCloud extends EventEmitter {
                 this.emit('warn', `Context key: ${contextKey}, missing.`)
                 return;
             };
+
+            //create axios instance get
+            this.axiosInstanceGet = axios.create({
+                method: 'GET',
+                baseURL: CONSTANTS.ApiUrls.BaseURL,
+                timeout: 5000,
+                headers: {
+                    'X-MitsContextKey': contextKey
+                },
+                maxContentLength: 100000000,
+                maxBodyLength: 1000000000,
+                withCredentials: true,
+                httpsAgent: new https.Agent({
+                    keepAlive: false,
+                    rejectUnauthorized: false
+                })
+            });
+
+            //create axios instance post
+            this.axiosInstancePost = axios.create({
+                method: 'POST',
+                baseURL: CONSTANTS.ApiUrls.BaseURL,
+                timeout: 5000,
+                headers: {
+                    'X-MitsContextKey': contextKey,
+                    'content-type': 'application/json'
+                },
+                maxContentLength: 100000000,
+                maxBodyLength: 1000000000,
+                withCredentials: true,
+                httpsAgent: new https.Agent({
+                    keepAlive: false,
+                    rejectUnauthorized: false
+                })
+            });
+
             this.accountInfo = accountInfo;
             this.contextKey = contextKey;
 
-            //return if connect for config
-            if (this.connectForConfig) {
-                return contextKey;
-            };
-
             //save melcloud info to the file
             await this.saveData(this.accountInfoFile, accountInfo);
 
             //check devices list
-            await this.chackDevicesList(contextKey);
+            await this.chackDevicesList();
 
             //emit connect success
             this.emit('success', `Connect to MELCloud Success.`)
 
             //start impulse generator
             const timers = [{ name: 'checkDevicesList', sampling: this.refreshInterval }];
-            this.impulseGenerator.start(timers);
+            const startImpulseGenerator = this.connectForConfig ? false : this.impulseGenerator.start(timers);
 
             return true;
         } catch (error) {
@@ -110,27 +137,10 @@ class MelCloud extends EventEmitter {
         };
     }
 
-    async chackDevicesList(contextKey) {
+    async chackDevicesList() {
         try {
-            //create axios instance get
-            const axiosInstanceGet = axios.create({
-                method: 'GET',
-                baseURL: CONSTANTS.ApiUrls.BaseURL,
-                timeout: 5000,
-                headers: {
-                    'X-MitsContextKey': contextKey
-                },
-                maxContentLength: 100000000,
-                maxBodyLength: 1000000000,
-                withCredentials: true,
-                httpsAgent: new https.Agent({
-                    keepAlive: false,
-                    rejectUnauthorized: false
-                })
-            });
-
             const debug = this.enableDebugMode ? this.emit('debug', `Scanning for devices.`) : false;
-            const listDevicesData = await axiosInstanceGet(CONSTANTS.ApiUrls.ListDevices);
+            const listDevicesData = await this.axiosInstanceGet(CONSTANTS.ApiUrls.ListDevices);
             const buildingsList = listDevicesData.data;
             const debug1 = this.enableDebugMode ? this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`) : false;
 
@@ -166,10 +176,11 @@ class MelCloud extends EventEmitter {
             }
             const debug3 = this.enableDebugMode ? this.emit('debug', `Found: ${devicesCount} devices.`) : false;
 
-            //return devices list for config
+            //emit devices list for config
+            this.emit('devicesList', devices);
             if (this.connectForConfig) {
-                return devices;
-            };
+                return;
+            }
 
             //get device info fom devices
             for (const deviceInfo of devices) {
@@ -180,15 +191,17 @@ class MelCloud extends EventEmitter {
                 const deviceInfoFile = `${this.deviceInfoFile}${deviceId}`;
                 await this.saveData(deviceInfoFile, deviceInfo);
                 const debug = this.enableDebugMode ? this.emit('debug', `Device: ${deviceName} info saved.`) : false;
-            };
 
-            //emit check devices list complete
-            const emit = this.emitReady ? this.emit('checkDevicesListComplete', this.accountInfo, contextKey) : false;
-            this.emitReady = false;
+                //prepare device if not in devices array
+                if (!this.devicesId.includes(deviceId)) {
+                    this.devicesId.push(deviceId);
+                    this.emit('checkDevicesListComplete', this.accountInfo, this.contextKey, deviceInfo);
+                }
+            };
 
             return true;
         } catch (error) {
-            const stop = connectForConfig ? false : this.impulseGenerator.stop();
+            this.impulseGenerator.stop();
             throw new Error(`Scanning for devices error: ${error.message ?? error}.`);
         };
     }
@@ -205,29 +218,11 @@ class MelCloud extends EventEmitter {
 
     async send(accountInfo) {
         try {
-            //create axios instance post
-            const axiosInstancePost = axios.create({
-                method: 'POST',
-                baseURL: CONSTANTS.ApiUrls.BaseURL,
-                timeout: 5000,
-                headers: {
-                    'X-MitsContextKey': this.contextKey,
-                    'content-type': 'application/json'
-                },
-                maxContentLength: 100000000,
-                maxBodyLength: 1000000000,
-                withCredentials: true,
-                httpsAgent: new https.Agent({
-                    keepAlive: false,
-                    rejectUnauthorized: false
-                })
-            });
-
             const options = {
                 data: accountInfo
             };
 
-            await axiosInstancePost(CONSTANTS.ApiUrls.UpdateApplicationOptions, options);
+            await this.axiosInstancePost(CONSTANTS.ApiUrls.UpdateApplicationOptions, options);
             await this.saveData(this.accountInfoFile, accountInfo);
             return true;
         } catch (error) {