homebridge-melcloud-control 3.8.0-beta.8 → 3.8.0

package/src/deviceerv.js

@@ -75,7 +75,6 @@ class DeviceErv extends EventEmitter {
             const buttonServiceType = ['', Service.Outlet, Service.Switch, Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][displayType];
             const buttonCharacteristicType = ['', Characteristic.On, Characteristic.On, Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][displayType];
             button.name = button.name || 'Button'
-            button.namePrefix = buttonNamePrefix;
             button.serviceType = buttonServiceType;
             button.characteristicType = buttonCharacteristicType;
             button.state = false;
@@ -237,6 +236,7 @@ class DeviceErv extends EventEmitter {
     async startImpulseGenerator() {
         try {
             //start impule generator
+            await new Promise(resolve => setTimeout(resolve, 1000));
             await this.melCloudErv.impulseGenerator.start([{ name: 'checkState', sampling: this.refreshInterval }]);
             return true;
         } catch (error) {
@@ -677,18 +677,16 @@ class DeviceErv extends EventEmitter {
             if (this.presetsConfiguredCount > 0) {
                 const debug = this.enableDebugMode ? this.emit('debug', `Prepare presets services`) : false;
                 this.presetsServices = [];
-
-                for (let i = 0; i < this.presetsConfiguredCount; i++) {
-                    const preset = this.presetsConfigured[i];
+                this.presetsConfigured.forEach((preset, i) => {
                     const presetData = presetsOnServer.find(p => p.ID === preset.Id);
 
                     //get preset name
-                    const presetName = preset.name;
+                    const name = preset.name;
 
                     //get preset name prefix
-                    const presetNamePrefix = preset.namePrefix;
+                    const namePrefix = preset.namePrefix;
 
-                    const serviceName = presetNamePrefix ? `${accessoryName} ${presetName}` : presetName;
+                    const serviceName = namePrefix ? `${accessoryName} ${name}` : name;
                     const serviceType = preset.serviceType;
                     const characteristicType = preset.characteristicType;
                     const presetService = new serviceType(serviceName, `Preset ${deviceId} ${i}`);
@@ -722,12 +720,12 @@ class DeviceErv extends EventEmitter {
                                 };
 
                                 await this.melCloudErv.send(deviceData, this.displayMode);
-                                const info = this.disableLogInfo ? false : this.emit('message', `${state ? 'Set:' : 'Unset:'} ${presetName}`);
+                                const info = this.disableLogInfo ? false : this.emit('message', `${state ? 'Set:' : 'Unset:'} ${name}`);
                             } catch (error) {
                                 this.emit('warn', `Set preset error: ${error}`);
                             };
                         });
-                };
+                });
                 this.presetsServices.push(presetService);
                 accessory.addService(presetService);
             };
@@ -736,10 +734,7 @@ class DeviceErv extends EventEmitter {
             if (this.buttonsConfiguredCount > 0) {
                 const debug = this.enableDebugMode ? this.emit('debug', `Prepare buttons services`) : false;
                 this.buttonsServices = [];
-
-                for (let i = 0; i < this.buttonsConfiguredCount; i++) {
-                    const button = this.buttonsConfigured[i];
-
+                this.buttonsConfigured.forEach((button, i) => {
                     //get button mode
                     const mode = button.mode;
 
@@ -747,9 +742,9 @@ class DeviceErv extends EventEmitter {
                     const buttonName = button.name;
 
                     //get button name prefix
-                    const buttonNamePrefix = button.namePrefix;
+                    const namePrefix = button.namePrefix;
 
-                    const serviceName = buttonNamePrefix ? `${accessoryName} ${buttonName}` : buttonName;
+                    const serviceName = namePrefix ? `${accessoryName} ${buttonName}` : buttonName;
                     const serviceType = button.serviceType;
                     const characteristicType = button.characteristicType;
                     const buttonService = new serviceType(serviceName, `Button ${deviceId} ${i}`);
@@ -846,7 +841,7 @@ class DeviceErv extends EventEmitter {
                         });
                     this.buttonsServices.push(buttonService);
                     accessory.addService(buttonService);
-                };
+                });
             };
 
             return accessory;
@@ -889,7 +884,7 @@ class DeviceErv extends EventEmitter {
                 this.firmwareRevision = firmwareAppVersion;
                 this.displayDeviceInfo = false;
             })
-                .on('deviceState', (deviceData) => {
+                .on('deviceState', async (deviceData) => {
                     this.deviceData = deviceData;
 
                     //presets
@@ -1136,8 +1131,7 @@ class DeviceErv extends EventEmitter {
 
                     //update presets state
                     if (this.presetsConfigured.length > 0) {
-                        for (let i = 0; i < this.presetsConfigured.length; i++) {
-                            const preset = this.presetsConfigured[i];
+                        this.presetsConfigured.forEach((preset, i) => {
                             const presetData = presetsOnServer.find(p => p.ID === preset.Id);
 
                             preset.state = presetData ? (presetData.Power === power
@@ -1151,13 +1145,12 @@ class DeviceErv extends EventEmitter {
                                 this.presetsServices[i]
                                     .updateCharacteristic(characteristicType, preset.state)
                             };
-                        };
+                        });
                     };
 
                     //update buttons state
                     if (this.buttonsConfiguredCount > 0) {
-                        for (let i = 0; i < this.buttonsConfiguredCount; i++) {
-                            const button = this.buttonsConfigured[i];
+                        this.buttonsConfigured.forEach((button, i) => {
                             const mode = button.mode;;
                             switch (mode) {
                                 case 0: //POWER ON,OFF
@@ -1213,7 +1206,7 @@ class DeviceErv extends EventEmitter {
                                 this.buttonsServices[i]
                                     .updateCharacteristic(characteristicType, button.state)
                             };
-                        };
+                        });
                     };
 
                     //log current state
@@ -1234,6 +1227,13 @@ class DeviceErv extends EventEmitter {
                         const info7 = hasPM25Sensor ? this.emit('message', `PM2.5 air quality: ${Ventilation.PM25AirQuality[pM25AirQuality]}`) : false;
                         const info8 = hasPM25Sensor ? this.emit('message', `PM2.5 level: ${pM25Level} µg/m`) : false;
                     };
+
+                    //prepare accessory
+                    if (this.startPrepareAccessory) {
+                        const accessory = await this.prepareAccessory(this.accountInfo, deviceData, this.deviceId, this.deviceTypeText, this.deviceName, this.accountName);
+                        this.emit('publishAccessory', accessory);
+                        this.startPrepareAccessory = false;
+                    }
                 })
                 .on('success', (success) => {
                     this.emit('success', success);
@@ -1261,18 +1261,7 @@ class DeviceErv extends EventEmitter {
             const startExternalIntegrations = this.restFul.enable || this.mqtt.enable ? await this.externalIntegrations() : false;
 
             //check state
-            const deviceData = await this.melCloudErv.checkState();
-
-            if (deviceData === false) {
-                return null;
-            }
-
-            //prepare accessory
-            if (this.startPrepareAccessory) {
-                const accessory = await this.prepareAccessory(this.accountInfo, deviceData, this.deviceId, this.deviceTypeText, this.deviceName, this.accountName);
-                this.emit('publishAccessory', accessory);
-                this.startPrepareAccessory = false;
-            }
+            await this.melCloudErv.checkState();
 
             return true;
         } catch (error) {

package/src/melcloudata.js

@@ -354,7 +354,7 @@ class MelCloudAta extends EventEmitter {
             //emit state
             this.emit('deviceState', deviceData);
 
-            return deviceData;
+            return true;
         } catch (error) {
             throw new Error(`Check state error: ${error}`);
         };

package/src/melcloudatw.js

@@ -418,7 +418,7 @@ class MelCloudAtw extends EventEmitter {
             //emit state
             this.emit('deviceState', deviceData);
 
-            return deviceData;
+            return true;
         } catch (error) {
             throw new Error(`Check state error: ${error}`);
         };

package/src/melclouderv.js

@@ -342,7 +342,7 @@ class MelCloudErv extends EventEmitter {
             //emit state 
             this.emit('deviceState', deviceData);
 
-            return deviceData;
+            return true;
         } catch (error) {
             throw new Error(`Check state error: ${error}`);
         };