* the status is now retained

* sensor commands can now be retained (configurable)

Author: rainu

README.md

@@ -38,6 +38,7 @@ Create a configuration file named "config.json"
   "sensor": [{
     "name": "Free Memory",
     "topic": "tele/__DEVICE_ID__/memory/free",
+    "retained": false,
     "unit": "kB",       //used for hassio
     "icon": "hass:eye", //used for hassio
     "interval": "10s",

cmd/mqtt-executor/config.go

@@ -92,6 +92,7 @@ func (c *applicationConfig) GetMQTTOpts(
 
 	if c.TopicConfigurations.Availability != nil {
 		opts.WillEnabled = true
+		opts.WillRetained = true
 		opts.WillQos = byte(*c.PublishQOS)
 		opts.WillPayload = []byte(c.TopicConfigurations.Availability.Payload.Unavailable)
 		opts.WillTopic = c.TopicConfigurations.Availability.Topic

internal/mqtt/config/topic.go

@@ -17,9 +17,8 @@ type TopicConfigurations struct {
 }
 
 type Availability struct {
-	Topic    string              `json:"topic"`
-	Payload  availabilityPayload `json:"payload"`
-	Interval *Interval           `json:"interval"`
+	Topic   string              `json:"topic"`
+	Payload availabilityPayload `json:"payload"`
 }
 type availabilityPayload struct {
 	Available   string `json:"available"`
@@ -36,6 +35,7 @@ type Trigger struct {
 type Sensor struct {
 	Name        string   `json:"name"`
 	ResultTopic string   `json:"topic"`
+	Retained    bool     `json:"retained"`
 	Interval    Interval `json:"interval"`
 	Unit        string   `json:"unit"`
 	Icon        string   `json:"icon"`
@@ -68,10 +68,6 @@ func LoadTopicConfiguration(configFilePath, deviceId string) (TopicConfiguration
 	//replace DEVICE_ID
 	if topicConfig.Availability != nil {
 		topicConfig.Availability.Topic = strings.Replace(topicConfig.Availability.Topic, "__DEVICE_ID__", deviceId, -1)
-		if topicConfig.Availability.Interval == nil {
-			defaultInterval := Interval(30 * time.Second)
-			topicConfig.Availability.Interval = &defaultInterval
-		}
 		if topicConfig.Availability.Payload.Available == "" {
 			topicConfig.Availability.Payload.Available = "Online"
 		}

internal/mqtt/sensor.go

@@ -51,11 +51,11 @@ func (s *SensorWorker) runSensor(ctx context.Context, publishQOS byte, sensorCon
 func (s *SensorWorker) executeCommand(ctx context.Context, publishQOS byte, sensorConf config.Sensor) {
 	output, execErr := s.Executor.ExecuteCommandWithContext(sensorConf.Command.Name, sensorConf.Command.Arguments, ctx)
 	if execErr != nil {
-		s.MqttClient.Publish(sensorConf.ResultTopic, publishQOS, false, "<FAILED>;"+execErr.Error())
+		s.MqttClient.Publish(sensorConf.ResultTopic, publishQOS, sensorConf.Retained, "<FAILED>;"+execErr.Error())
 		return
 	}
 
-	s.MqttClient.Publish(sensorConf.ResultTopic, publishQOS, false, output)
+	s.MqttClient.Publish(sensorConf.ResultTopic, publishQOS, sensorConf.Retained, output)
 }
 
 func (s *SensorWorker) Close(timeout time.Duration) error {

internal/mqtt/status.go

@@ -29,25 +29,16 @@ func (s *StatusWorker) Initialise(availabilityConfigs config.Availability) {
 func (s *StatusWorker) runStatus(ctx context.Context, availabilityConfig config.Availability) {
 	defer s.waitGroup.Done()
 	defer func() {
-		token := s.MqttClient.Publish(availabilityConfig.Topic, byte(1), false, availabilityConfig.Payload.Unavailable)
+		token := s.MqttClient.Publish(availabilityConfig.Topic, byte(1), true, availabilityConfig.Payload.Unavailable)
 
 		//we should wait for the last state publish (graceful shutdown dont trigger the mqtt-last-will!)
 		token.Wait()
 	}()
 
-	//first one
-	s.MqttClient.Publish(availabilityConfig.Topic, byte(1), false, availabilityConfig.Payload.Available)
+	s.MqttClient.Publish(availabilityConfig.Topic, byte(1), true, availabilityConfig.Payload.Available)
 
-	ticker := time.Tick(time.Duration(*availabilityConfig.Interval))
-	for {
-		//wait until next tick or shutdown
-		select {
-		case <-ticker:
-			s.MqttClient.Publish(availabilityConfig.Topic, byte(1), false, availabilityConfig.Payload.Available)
-		case <-ctx.Done():
-			return
-		}
-	}
+	//wait until shutdown
+	<-ctx.Done()
 }
 
 func (s *StatusWorker) Close(timeout time.Duration) error {