* use the right qos level

* use retained flag where it is meaningful

Author: rainu

cmd/samsung-remote-mqtt/config.go

@@ -31,8 +31,8 @@ var Config applicationConfig
 func LoadConfig() {
 	Config = applicationConfig{
 		Broker:       flag.String("broker", "", "The broker URI. ex: tcp://127.0.0.1:1883"),
-		SubscribeQOS: flag.Int("sub-qos", 0, "The Quality of Service for subscription 0,1,2 (default 0)"),
-		PublishQOS:   flag.Int("pub-qos", 0, "The Quality of Service for publishing 0,1,2 (default 0)"),
+		SubscribeQOS: flag.Int("sub-qos", 1, "The Quality of Service for subscription 0,1,2 (default 1)"),
+		PublishQOS:   flag.Int("pub-qos", 1, "The Quality of Service for publishing 0,1,2 (default 1)"),
 		Username:     flag.String("user", "", "The User (optional)"),
 		Password:     flag.String("password", "", "The password (optional)"),
 		ClientId:     flag.String("client-id", "samsung-remote", "The ClientID (default samsung-remote)"),
@@ -83,6 +83,7 @@ func (c *applicationConfig) GetMQTTOpts(
 	}
 
 	opts.WillEnabled = true
+	opts.WillRetained = true
 	opts.WillQos = byte(*c.PublishQOS)
 	opts.WillPayload = []byte(internal.StatusOffline)
 	opts.WillTopic = fmt.Sprintf("%s/status", *c.TopicPrefix)

internal/mqtt/executor.go

@@ -198,7 +198,7 @@ func (e *Executor) stateWrapper(delegate MQTT.MessageHandler) MQTT.MessageHandle
 }
 
 func (e *Executor) sendStatus(client MQTT.Client, message MQTT.Message, state []byte) {
-	client.Publish(fmt.Sprintf("%s/state", message.Topic()), e.publishQOS, false, state)
+	client.Publish(fmt.Sprintf("%s/state", message.Topic()), e.publishQOS, true, state)
 }
 
 func (e *Executor) sendAnswer(client MQTT.Client, message MQTT.Message, answer []byte, err error) {

internal/mqtt/hassio/client.go

@@ -88,18 +88,18 @@ func (c *Client) PublishDiscoveryConfig() {
 
 	targetTopic := fmt.Sprintf("%ssensor/%s_status/config", c.HassioTopicPrefix, c.deviceId())
 	payload := c.generatePayloadForApplicationStatus()
-	c.MqttClient.Publish(targetTopic, byte(0), false, payload)
+	c.MqttClient.Publish(targetTopic, byte(1), true, payload)
 
 	targetTopic = fmt.Sprintf("%ssensor/%s_tv_status/config", c.HassioTopicPrefix, c.deviceId())
 	payload = c.generatePayloadForTvStatus()
-	c.MqttClient.Publish(targetTopic, byte(0), false, payload)
+	c.MqttClient.Publish(targetTopic, byte(1), true, payload)
 
 	for topic, payload := range c.generatePayloadsForTvWakeUp() {
-		c.MqttClient.Publish(topic, byte(0), false, payload)
+		c.MqttClient.Publish(topic, byte(1), true, payload)
 	}
 	for keyName, description := range SamsungRemoteKeys {
 		for topic, payload := range c.generatePayloadsForSendKey(keyName, description) {
-			c.MqttClient.Publish(topic, byte(0), false, payload)
+			c.MqttClient.Publish(topic, byte(1), true, payload)
 		}
 	}
 }

internal/status.go

@@ -47,16 +47,8 @@ func (s *StatusWorker) runApplicationStatus(statusTopic string, ctx context.Cont
 	//first one
 	s.sendStatus(statusTopic, true)
 
-	ticker := time.Tick(30 * time.Second)
-	for {
-		//wait until next tick or shutdown
-		select {
-		case <-ticker:
-			s.sendStatus(statusTopic, true)
-		case <-ctx.Done():
-			return
-		}
-	}
+	//wait until shutdown
+	<-ctx.Done()
 }
 
 func (s *StatusWorker) runTvStatus(statusTopic, tvHost string, ctx context.Context) {
@@ -104,7 +96,7 @@ func (s *StatusWorker) sendStatus(statusTopic string, status bool) MQTT.Token {
 		payload = StatusOffline
 	}
 
-	return s.MqttClient.Publish(statusTopic, byte(0), false, payload)
+	return s.MqttClient.Publish(statusTopic, byte(1), true, payload)
 }
 
 func isPortOpen(tvHost string) bool {