homebridge-xbox-tv 2.13.1 → 2.13.2

package/README.md

@@ -144,8 +144,8 @@ Homebridge plugin for Microsoft game Consoles. Tested with Xbox One X/S and Xbox
 
 | Direction | Topic | Message | Payload Data |
 | --- | --- | --- | --- |
-|  Publish   | `Info`, `State`, `Consoles List`, `Profile`, `Apps`, `Storages`, `Status` | `{power: true, app: Xbox.Dashboard_8wekyb3d8bbwe!Xbox.Dashboard.Application}` | JSON object. |
-|  Subscribe   | `Set` | `{Power: true}` | JSON object. |
+|  Publish   | `Info`, `State`, `Consoles List`, `Profile`, `Apps`, `Storages`, `Status` | `{"power": true, "app": Xbox.Dashboard_8wekyb3d8bbwe!Xbox.Dashboard.Application}` | JSON object. |
+|  Subscribe   | `Set` | `{"Power": true}` | JSON object. |
 
 | Subscribe | Key | Value | Type | Description |
 | --- | --- | --- | --- | --- |

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Xbox TV",
   "name": "homebridge-xbox-tv",
-  "version": "2.13.1",
+  "version": "2.13.2",
   "description": "Homebridge plugin to control Xbox game consoles.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/mqtt.js

@@ -2,70 +2,52 @@
 const AsyncMqtt = require("async-mqtt");
 const EventEmitter = require('events');
 
-class MQTTCLIENT extends EventEmitter {
+class Mqtt extends EventEmitter {
     constructor(config) {
         super();
-        this.mqttHost = config.host;
-        this.mqttPort = config.port;
-        this.mqttClientId = config.clientId;
-        this.mqttPrefix = config.prefix;
-        this.mqttUser = config.user;
-        this.mqttPasswd = config.passwd;
-        this.mqttDebug = config.debug;
-        this.isConnected = false;
-
-        this.connect();
-    };
-
-    async connect() {
-        try {
-            const options = {
-                clientId: this.mqttClientId,
-                username: this.mqttUser,
-                password: this.mqttPasswd
-            }
-            const url = `mqtt://${this.mqttHost}:${this.mqttPort}`;
-            this.mqttClient = await AsyncMqtt.connectAsync(url, options);
-            this.emit('connected', 'MQTT Connected.');
-            this.isConnected = true;
-
-            this.subscribe();
-        } catch (error) {
-            this.isConnected = false;
-            this.emit('error', `MQTT Connect error: ${error}`);
-        };
-    };
-
-    async subscribe() {
-        try {
-            this.mqttClient.on('message', (topic, message) => {
-                const subscribehMessage = JSON.parse(message.toString());
-                const emitDebug = this.mqttDebug ? this.emit('debug', `MQTT Received topic: ${topic}, message: ${JSON.stringify(subscribehMessage, null, 2)}`) : false;
-                this.emit('changeState', subscribehMessage);
-            });
-
-            const topic = `${this.mqttPrefix}/Set`;
-            await this.mqttClient.subscribe(topic);
-            this.emit('connected', `MQTT Subscribe topic: ${topic}.`);
-        } catch (error) {
-            this.emit('error', `MQTT Subscribe error: ${error}`);
-        };
-    };
-
-    async send(topic, message) {
-        if (!this.isConnected) {
-            const debug = this.mqttDebug ? this.emit('debug', `MQTT client not connected.`) : false;
-            return
-        };
-
-        try {
-            const fullTopic = `${this.mqttPrefix}/${topic}`;
-            const publishMessage = JSON.stringify(message, null, 2);
-            await this.mqttClient.publish(fullTopic, publishMessage);
-            const debug = this.mqttDebug ? this.emit('debug', `MQTT publish: ${fullTopic}: ${publishMessage}`) : false;
-        } catch (error) {
-            this.emit('error', `MQTT Publish error: ${error}`);
-        };
+        const options = {
+            clientId: config.clientId,
+            username: config.user,
+            password: config.passwd
+        }
+        const url = `mqtt://${config.host}:${config.port}`;
+        const subscribeTopic = `${config.prefix}/Set`;
+
+        this.on('connect', async () => {
+            try {
+                //connect
+                this.mqttClient = await AsyncMqtt.connectAsync(url, options);
+                this.emit('connected', 'MQTT Connected.');
+
+                //subscribe
+                await this.mqttClient.subscribe(subscribeTopic);
+                this.emit('subscribed', `MQTT Subscribe topic: ${subscribeTopic}.`);
+
+                //subscribed message
+                this.mqttClient.on('message', (topic, message) => {
+                    try {
+                        const subscribedMessage = JSON.parse(message.toString());
+                        const emitDebug = config.debug ? this.emit('debug', `MQTT Received topic: ${topic}, message: ${JSON.stringify(subscribedMessage, null, 2)}`) : false;
+                        this.emit('subscribedMessage', subscribedMessage);
+                    } catch (error) {
+                        this.emit('error', `MQTT Parse message error: ${error}`);
+                    };
+                });
+            } catch (error) {
+                this.emit('error', `MQTT Connect error: ${error}`);
+            };
+        }).on('publish', async (topic, message) => {
+            try {
+                const fullTopic = `${config.prefix}/${topic}`;
+                const publishMessage = JSON.stringify(message, null, 2);
+                await this.mqttClient.publish(fullTopic, publishMessage);
+                const emitDebug = config.debug ? this.emit('debug', `MQTT Publish topic: ${fullTopic}, message: ${publishMessage}`) : false;
+            } catch (error) {
+                this.emit('error', `MQTT Publish error: ${error}`);
+            };
+        });
+
+        this.emit('connect');
     };
 };
-module.exports = MQTTCLIENT;
+module.exports = Mqtt;

package/src/xboxdevice.js

@@ -280,8 +280,8 @@ class XboxDevice extends EventEmitter {
                     });
 
                     this.restFul.on('connected', (message) => {
-                        this.emit('message', message);
                         this.restFulConnected = true;
+                        this.emit('message', message);
                     })
                         .on('error', (error) => {
                             this.emit('error', error);
@@ -305,8 +305,8 @@ class XboxDevice extends EventEmitter {
                     });
 
                     this.mqtt.on('connected', (message) => {
-                        this.emit('message', message);
                         this.mqttConnected = true;
+                        this.emit('message', message);
                     })
                         .on('changeState', async (data) => {
                             const key = Object.keys(data)[0];
@@ -368,7 +368,7 @@ class XboxDevice extends EventEmitter {
                                         break;
                                 };
                             } catch (error) {
-                                this.emit('error', `set: ${key}, over MQTT, error: ${error}`);
+                                this.emit('error', `MQTT send error: ${error}.`);
                             };
                         })
                         .on('debug', (debug) => {
@@ -427,7 +427,7 @@ class XboxDevice extends EventEmitter {
                 const restFul = this.restFulConnected ? this.restFul.update(path, data) : false;
             })
             .on('mqtt', (topic, message) => {
-                const mqtt = this.mqttConnected ? this.mqtt.send(topic, message) : false;
+                const mqtt = this.mqttConnected ? this.mqtt.emit('publish', topic, message) : false;
             });
     }