Add option to MQTT for retain flag

arthurkrupa · Mar 21, 2020 · 3a7b2e8 · 3a7b2e8
1 parent 2090a56
commit 3a7b2e8
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -142,19 +142,24 @@ As of 1.2.0 the Hassio addon supports multiple devices by running paralell NodeJ
 config example:
 
 ```json
-"mqtt": {
- "broker_url": "mqtt:https://localhost",
-},
-"devices": [
- {
- "hvac_host": "192.168.0.255",
- "mqtt_topic_prefix": "/home/hvac01"
- },
- {
- "hvac_host": "192.168.0.254",
- "mqtt_topic_prefix": "/home/hvac02"
- }
-]
+{
+ "mqtt": {
+ "broker_url": "mqtt:https://localhost",
+ "username": "user",
+ "password": "pass",
+ "retain": false
+ },
+ "devices": [
+ {
+ "hvac_host": "192.168.0.255",
+ "mqtt_topic_prefix": "/home/hvac01"
+ },
+ {
+ "hvac_host": "192.168.0.254",
+ "mqtt_topic_prefix": "/home/hvac02"
+ }
+ ]
+}
 ```
 
 ## Configuring HVAC WiFi
@@ -175,6 +180,7 @@ Note: This command may vary depending on your OS (e.g. Linux, macOS, CygWin). If
 
 - Fix run script for single device with same configuration
 - Run single device as a systemd service
+- Add option to MQTT for retain flag
 
 [1.2.2]
 

diff --git a/index.js b/index.js
@@ -45,9 +45,15 @@ const deviceState = {
  * @param {string} mqttTopic Topic (without prefix) to send with new value
  */
 const publishIfChanged = function (stateProp, newValue, mqttTopic) {
+ const pubmqttOptions = {
+ retain: false
+ }
+ if (argv['mqtt-retain']) {
+ pubmqttOptions.retain = (argv['mqtt-retain'] == "true")
+ }
  if (newValue !== deviceState[stateProp]) {
  deviceState[stateProp] = newValue
- client.publish(mqttTopicPrefix + mqttTopic, newValue)
+ client.publish(mqttTopicPrefix + mqttTopic, newValue, pubmqttOptions)
  }
 }
 

diff --git a/run.sh b/run.sh
@@ -8,7 +8,12 @@ MQTT_BROKER_URL=$(jq -r ".mqtt.broker_url" $CONFIG_PATH)
 MQTT_TOPIC_PREFIX=$(jq -r ".mqtt.topic_prefix" $CONFIG_PATH)
 MQTT_USERNAME=$(jq -r ".mqtt.username" $CONFIG_PATH)
 MQTT_PASSWORD=$(jq -r ".mqtt.password" $CONFIG_PATH)
+MQTT_RETAIN=$(jq -r ".mqtt.retain" $CONFIG_PATH)
+if [ "$MQTT_RETAIN" = null ]; then
+ MQTT_RETAIN=false
+fi
 
+echo "MQTT_RETAIN: ${MQTT_RETAIN}"
 npm install
 
 INSTANCES=$(jq '.devices | length' $CONFIG_PATH)
@@ -25,7 +30,8 @@ if [ "$INSTANCES" -gt 1 ]; then
  --mqtt-broker-url="${MQTT_BROKER_URL}" \
  --mqtt-topic-prefix="${MQTT_TOPIC_PREFIX}" \
  --mqtt-username="${MQTT_USERNAME}" \
- --mqtt-password="${MQTT_PASSWORD}"
+ --mqtt-password="${MQTT_PASSWORD}" \
+ --mqtt-retain="${MQTT_RETAIN}"
  done
  npx pm2 logs /HVAC_/
 else
@@ -38,5 +44,6 @@ else
  --mqtt-broker-url="${MQTT_BROKER_URL}" \
  --mqtt-topic-prefix="${MQTT_TOPIC_PREFIX}" \
  --mqtt-username="${MQTT_USERNAME}" \
- --mqtt-password="${MQTT_PASSWORD}"
+ --mqtt-password="${MQTT_PASSWORD}" \
+ --mqtt-retain="${MQTT_RETAIN}"
 fi