homebridge-melcloud-control 4.3.3-beta.0 → 4.3.3-beta.2

package/package.json

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

package/src/constants.js

@@ -107,8 +107,8 @@ export const HeatPump = {
     ForceDhwMapEnumToString: { 0: "Normal", 1: "Heat Now" },
     HolidayMapStringToEnum: { "Normal": 0, "Holiday": 1 },
     HolidayMapEnumToString: { 0: "Normal", 1: "Holiday" },
-    ZoneOperationMapStringToEnum: { "Heat Thermostat": 0, "Heat Flow": 1, "Heat Curve": 2, "Cool Thermostat": 3, "Cool Flow": 4, "Flor Dry Up": 5, "Idle": 6 },
-    ZoneOperationMapEnumToString: { 0: "Heat Thermostat", 1: "Heat Flow", 2: "Heat Curve", 3: "Cool Thermostat", 4: "Cool Flow", 5: "Flor Dry Up", 6: "Idle" },
+    OperationModeZoneMapStringToEnum: { "Heat Thermostat": 0, "Heat Flow": 1, "Heat Curve": 2, "Cool Thermostat": 3, "Cool Flow": 4, "Flor Dry Up": 5, "Idle": 6 },
+    OperationModeZoneMapEnumToString: { 0: "Heat Thermostat", 1: "Heat Flow", 2: "Heat Curve", 3: "Cool Thermostat", 4: "Cool Flow", 5: "Flor Dry Up", 6: "Idle" },
     EffectiveFlags: {
         Power: 1,
         OperationMode: 2,

package/src/melcloudata.js

@@ -145,7 +145,6 @@ class MelCloudAta extends EventEmitter {
 
     async checkState() {
         try {
-
             //read device info from file
             const devicesData = await this.functions.readData(this.devicesFile, true);
             if (!devicesData) return;
@@ -369,7 +368,14 @@ class MelCloudAta extends EventEmitter {
                             path = ApiUrlsHome.PutAta.replace('deviceid', deviceData.DeviceID);
                             headers.Referer = ApiUrlsHome.Referers.PutDeviceSettings;
                             updateState = false;
-                            break;
+                            this.socket.send(JSON.stringify([{
+                                messageType: 'setUnitSettings',
+                                Data: {
+                                    id: deviceData.DeviceID,
+                                    settings: payload
+                                }
+                            }]));
+                            return;
                     }
 
                     //sens payload

package/src/melcloudatw.js

@@ -1,3 +1,4 @@
+import WebSocket from 'ws';
 import axios from 'axios';
 import EventEmitter from 'events';
 import ImpulseGenerator from './impulsegenerator.js';
@@ -26,8 +27,12 @@ class MelCloudAtw extends EventEmitter {
         //set default values
         this.deviceData = {};
         this.headers = {};
+        this.socket = null;
+        this.connecting = false;
+        this.socketConnected = false;
+        this.heartbeat = null;
 
-        //lock flags
+        //lock flag
         this.locks = false;
         this.impulseGenerator = new ImpulseGenerator()
             .on('checkState', () => this.handleWithLock(async () => {
@@ -51,20 +56,29 @@ class MelCloudAtw extends EventEmitter {
         }
     }
 
-    async checkState() {
-        try {
-            //read device info from file
-            const devicesData = await this.functions.readData(this.devicesFile, true);
-            if (!devicesData) return;
+    cleanupSocket() {
+        if (this.heartbeat) {
+            clearInterval(this.heartbeat);
+            this.heartbeat = null;
+        }
 
-            this.headers = devicesData.Headers;
-            const deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
+        if (this.socket) {
+            try { this.socket.close(); } catch { }
+            this.socket = null;
+        }
+
+        this.socketConnected = false;
+    }
+
+    async updateState(deviceData) {
+        try {
             if (this.accountType === 'melcloudhome') {
-                deviceData.Scenes = devicesData.Scenes ?? [];
+                deviceData.Device.OperationMode = HeatPump.OperationModeMapStringToEnum[deviceData.Device.OperationMode] ?? deviceData.Device.OperationMode;
+                deviceData.Device.OperationModeZone1 = HeatPump.OperationModeZoneMapStringToEnum[deviceData.Device.OperationModeZone1] ?? deviceData.Device.OperationModeZone1;
+                deviceData.Device.OperationModeZone2 = HeatPump.OperationModeZoneMapStringToEnum[deviceData.Device.OperationModeZone2] ?? deviceData.Device.OperationModeZone2;
             }
             if (this.logDebug) this.emit('debug', `Device Data: ${JSON.stringify(deviceData, null, 2)}`);
 
-            //device
             //device
             const serialNumber = deviceData.SerialNumber || '4.0.0';
             const firmwareAppVersion = deviceData.Device?.FirmwareAppVersion || '4.0.0';
@@ -123,6 +137,105 @@ class MelCloudAtw extends EventEmitter {
         };
     };
 
+    async checkState() {
+        try {
+            //read device info from file
+            const devicesData = await this.functions.readData(this.devicesFile, true);
+            if (!devicesData) return;
+
+            this.headers = devicesData.Headers;
+            const deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
+            deviceData.Scenes = devicesData.Scenes ?? [];
+
+            //web cocket connection
+            if (this.accountType === 'melcloudhome' && !this.connecting && !this.socketConnected) {
+                this.connecting = true;
+
+                const url = `${ApiUrlsHome.WebSocketURL}${devicesData.WebSocketOptions.Hash}`;
+                try {
+                    const socket = new WebSocket(url, { headers: devicesData.WebSocketOptions.Headers })
+                        .on('error', (error) => {
+                            if (this.logError) this.emit('error', `Socket error: ${error}`);
+                            socket.close();
+                        })
+                        .on('close', () => {
+                            if (this.logDebug) this.emit('debug', `Socket closed`);
+                            this.cleanupSocket();
+                        })
+                        .on('open', () => {
+                            this.socket = socket;
+                            this.socketConnected = true;
+                            this.connecting = false;
+                            if (this.logSuccess) this.emit('success', `Socket Connect Success`);
+
+                            // heartbeat
+                            this.heartbeat = setInterval(() => {
+                                if (socket.readyState === socket.OPEN) {
+                                    if (this.logDebug) this.emit('debug', `Socket send heartbeat`);
+                                    socket.ping();
+                                }
+                            }, 30000);
+                        })
+                        .on('pong', () => {
+                            if (this.logDebug) this.emit('debug', `Socket received heartbeat`);
+                        })
+                        .on('message', async (message) => {
+                            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) return;
+
+                            let updateState = false;
+                            const unitId = messageData?.id;
+                            switch (unitId) {
+                                case this.deviceId:
+                                    const messageType = parsedMessage[0].messageType;
+                                    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);
+                                            updateState = true;
+                                            break;
+                                        case 'unitWifiSignalChanged':
+                                            deviceData.Rssi = messageData.rssi;
+                                            updateState = true;
+                                            break;
+                                        default:
+                                            if (this.logDebug) this.emit('debug', `Unit ${unitId}, received unknown message type: ${stringifyMessage}`);
+                                            return;
+                                    }
+                                    break;
+                                default:
+                                    if (this.logDebug) this.emit('debug', `Incoming unknown unit id: ${stringifyMessage}`);
+                                    return;
+                            }
+
+                            //update state
+                            if (updateState) await this.updateState(deviceData);
+                        });
+                } catch (error) {
+                    if (this.logError) this.emit('error', `Socket connection failed: ${error}`);
+                    this.cleanupSocket();
+                }
+            }
+
+            //update state
+            await this.updateState(deviceData);
+
+            return true;
+        } catch (error) {
+            throw new Error(`Check state error: ${error.message}`);
+        };
+    };
+
     async send(accountType, displayType, deviceData, flag, flagData) {
         try {
 
@@ -248,6 +361,7 @@ class MelCloudAtw extends EventEmitter {
                         headers: headers,
                         data: payload
                     });
+
                     this.updateData(deviceData, updateState);
                     return true;
                 default:

package/src/melclouderv.js

@@ -1,3 +1,4 @@
+import WebSocket from 'ws';
 import axios from 'axios';
 import EventEmitter from 'events';
 import ImpulseGenerator from './impulsegenerator.js';

package/src/melcloudhome.js

@@ -267,11 +267,11 @@ class MelCloudHome extends EventEmitter {
                     '--no-zygote'
                 ]
             });
-            browser.on('disconnected', () => this.emit('debug', 'Browser disconnected'));
+            browser.on('disconnected', () => this.logDebug && this.emit('debug', 'Browser disconnected'));
 
             const page = await browser.newPage();
-            page.on('error', error => this.emit('error', `Page crashed: ${error.message}`));
-            page.on('pageerror', error => this.emit('error', `Browser error: ${error.message}`));
+            page.on('error', error => this.logError && this.emit('error', `Page crashed: ${error.message}`));
+            page.on('pageerror', error => this.logError && this.emit('error', `Browser error: ${error.message}`));
             page.setDefaultTimeout(GLOBAL_TIMEOUT);
             page.setDefaultNavigationTimeout(GLOBAL_TIMEOUT);