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

package/src/mqtt.js

@@ -1,56 +1,103 @@
-import asyncMqtt from 'async-mqtt';
-const { connectAsync } = asyncMqtt;
+import { connect } from 'mqtt';
 import EventEmitter from 'events';
 
 class Mqtt extends EventEmitter {
     constructor(config) {
         super();
+
+        const url = `mqtt://${config.host}:${config.port}`;
+        const subscribeTopic = `${config.prefix}/Set`;
+
         const options = {
             clientId: config.clientId,
             username: config.user,
-            password: config.passwd
-        }
-        const url = `mqtt://${config.host}:${config.port}`;
-        const subscribeTopic = `${config.prefix}/Set`;
+            password: config.passwd,
+            protocolVersion: 5,
+            clean: false,
+            properties: {
+                sessionExpiryInterval: 60 * 60, // 1 hour
+                userProperties: {
+                    source: 'node-client'
+                }
+            }
+        };
+
+        this.mqttClient = connect(url, options);
+
+        // === CONNECTED ===
+        this.mqttClient.on('connect', async (packet) => {
+            this.emit('connected', 'MQTT v5 connected.');
 
-        this.on('connect', async () => {
             try {
-                //connect
-                this.mqttClient = await connectAsync(url, options);
-                this.emit('connected', 'MQTT Connected.');
+                const result = await this.mqttClient.subscribeAsync(subscribeTopic, {
+                    qos: 1,
+                    properties: {
+                        userProperties: {
+                            type: 'subscription'
+                        }
+                    }
+                });
 
-                //subscribe
-                await this.mqttClient.subscribe(subscribeTopic);
+                // MQTT v5 subscription results contain reason codes
+                if (config.logDebug) this.emit('debug', `Subscribed to ${subscribeTopic}, reason codes: ${JSON.stringify(result)}`);
                 this.emit('subscribed', `MQTT Subscribe topic: ${subscribeTopic}`);
 
-                //subscribed message
-                this.mqttClient.on('message', (topic, message) => {
-                    try {
-                        const obj = JSON.parse(message.toString());
-                        if (config.logDebug) this.emit('debug', `MQTT Received topic: ${topic}, message: ${JSON.stringify(obj, null, 2)}`);
-                        const key = Object.keys(obj)[0];
-                        const value = Object.values(obj)[0];
-                        this.emit('set', key, value);
-                    } catch (error) {
-                        if (config.logWarn) this.emit('warn', `MQTT Parse object error: ${error}`);
-                    };
-                });
             } catch (error) {
-                if (config.logWarn) this.emit('warn', `MQTT Connect error: ${error}`);
-            };
-        }).on('publish', async (topic, message) => {
+                if (config.logWarn) this.emit('warn', `MQTT Subscribe error: ${error}`);
+            }
+        });
+
+        // === MESSAGE ===
+        this.mqttClient.on('message', (topic, payload, packet) => {
+            try {
+                const obj = JSON.parse(payload.toString());
+                if (config.logDebug) this.emit('debug', `MQTT Received:\nTopic: ${topic}\nPayload: ${JSON.stringify(obj, null, 2)}\nProperties: ${JSON.stringify(packet.properties, null, 2)}`);
+
+                const key = Object.keys(obj)[0];
+                const value = Object.values(obj)[0];
+                this.emit('set', key, value);
+
+            } catch (error) {
+                if (config.logWarn) this.emit('warn', `MQTT Parse error: ${error}`);
+            }
+        });
+
+        // === PUBLISH EVENT ===
+        this.on('publish', async (topic, message) => {
             try {
                 const fullTopic = `${config.prefix}/${topic}`;
-                const publishMessage = JSON.stringify(message, null, 2);
-                await this.mqttClient.publish(fullTopic, publishMessage);
-                if (config.logDebug) this.emit('debug', `MQTT Publish topic: ${fullTopic}, message: ${publishMessage}`);
+                const publishMessage = JSON.stringify(message);
+
+                await this.mqttClient.publishAsync(fullTopic, publishMessage, {
+                    qos: 1,
+                    properties: {
+                        contentType: 'application/json',
+                        userProperties: {
+                            source: 'node',
+                            action: 'set'
+                        }
+                    }
+                });
+
+                if (config.logDebug) this.emit('debug', `MQTT Publish:\nTopic: ${fullTopic}\nPayload: ${publishMessage}`);
             } catch (error) {
                 if (config.logWarn) this.emit('warn', `MQTT Publish error: ${error}`);
-            };
+            }
+        });
+
+        // === ERRORS / STATE ===
+        this.mqttClient.on('error', (err) => {
+            if (config.logWarn) this.emit('warn', `MQTT Error: ${err.message}`);
         });
 
-        this.emit('connect');
+        this.mqttClient.on('reconnect', () => {
+            if (config.logDebug) this.emit('debug', 'MQTT Reconnecting...');
+        });
+
+        this.mqttClient.on('close', () => {
+            if (config.logDebug) this.emit('debug', 'MQTT Connection closed.');
+        });
     }
 }
 
-export default Mqtt;
+export default Mqtt;