rasperrypi-home/hassio-plejd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert mqtt v5 code since not supported by HassIO Mosquitto plugin

Browse source
This commit is contained in:
Victor Hagelbäck 2021-04-23 10:42:18 +02:00
parent c646bc55eb
commit aacf87a50c
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
plejd/MqttClient.js
View file

@ -125,6 +125,7 @@ class MqttClient extends EventEmitter {
this.client = mqtt.connect(this.config.mqttBroker, { this.client = mqtt.connect(this.config.mqttBroker, {
clientId: `hassio-plejd_${Math.random().toString(16).substr(2, 8)}`, clientId: `hassio-plejd_${Math.random().toString(16).substr(2, 8)}`,
password: this.config.mqttPassword, password: this.config.mqttPassword,
protocolVersion: 4, // v5 not supported by HassIO Mosquitto
queueQoSZero: true, queueQoSZero: true,
username: this.config.mqttUsername, username: this.config.mqttUsername,
}); });
@ -136,13 +137,22 @@ class MqttClient extends EventEmitter {
this.client.on('connect', () => { this.client.on('connect', () => {
logger.info('Connected to MQTT.'); logger.info('Connected to MQTT.');
this.client.subscribe(startTopics, (err) => { this.client.subscribe(
if (err) { startTopics,
logger.error('Unable to subscribe to status topics', err); // Add below when mqtt v5 is supported in Mosquitto 1.6 or 2.0 and forward
} // {
// qos: 1,
// nl: true, // don't echo back messages sent
// rap: true, // retain as published - don't force retain = 0
// },
(err) => {
if (err) {
logger.error('Unable to subscribe to status topics', err);
}
this.emit(MqttClient.EVENTS.connected); this.emit(MqttClient.EVENTS.connected);
}); },
);
this.client.subscribe(getSubscribePath(), (err) => { this.client.subscribe(getSubscribePath(), (err) => {
if (err) { if (err) {
@ -162,7 +172,7 @@ class MqttClient extends EventEmitter {
logger.info('Home Assistant has started. lets do discovery.'); logger.info('Home Assistant has started. lets do discovery.');
this.emit(MqttClient.EVENTS.connected); this.emit(MqttClient.EVENTS.connected);
} else { } else {
logger.verbose(`Mqtt command ${topic}`); logger.verbose(`Received mqtt message on ${topic}`);
const decodedTopic = decodeTopic(topic); const decodedTopic = decodeTopic(topic);
if (decodedTopic) { if (decodedTopic) {
/** @type {import('types/DeviceRegistry').OutputDevice} */ /** @type {import('types/DeviceRegistry').OutputDevice} */