Add some new MQTT adaptor functions with QOS

 hybridgroup#644

platforms/mqtt/mqtt_adaptor.go

@@ -9,6 +9,12 @@ import (
 
 	paho "github.com/eclipse/paho.mqtt.golang"
 	multierror "github.com/hashicorp/go-multierror"
+	"github.com/pkg/errors"
+)
+
+var (
+	// ErrNilClient is returned when a client action can't be taken because the struct has no client
+	ErrNilClient = errors.New("no MQTT client available")
 )
 
 // Message is a message received from the broker.
@@ -131,21 +137,43 @@ func (a *Adaptor) Finalize() (err error) {
 
 // Publish a message under a specific topic
 func (a *Adaptor) Publish(topic string, message []byte) bool {
-	if a.client == nil {
+	_, err := a.PublishWithQOS(topic, a.qos, message)
+	if err != nil {
 		return false
 	}
-	a.client.Publish(topic, byte(a.qos), false, message)
+
 	return true
 }
 
-// On subscribes to a topic, and then calls the message handler function when data is received
-func (a *Adaptor) On(event string, f func(msg Message)) bool {
+// PublishWithQOS allows per-publish QOS values to be set and returns a poken.Token
+func (a *Adaptor) PublishWithQOS(topic string, qos int, message []byte) (paho.Token, error) {
 	if a.client == nil {
-		return false
+		return nil, ErrNilClient
+	}
+
+	token := a.client.Publish(topic, byte(qos), false, message)
+	return token, nil
+}
+
+// OnWithQOS allows per-subscribe QOS values to be set and returns a paho.Token
+func (a *Adaptor) OnWithQOS(event string, qos int, f func(msg Message)) (paho.Token, error) {
+	if a.client == nil {
+		return nil, ErrNilClient
 	}
-	a.client.Subscribe(event, byte(a.qos), func(client paho.Client, msg paho.Message) {
+
+	token := a.client.Subscribe(event, byte(qos), func(client paho.Client, msg paho.Message) {
 		f(msg)
 	})
+
+	return token, nil
+}
+
+// On subscribes to a topic, and then calls the message handler function when data is received
+func (a *Adaptor) On(event string, f func(msg Message)) bool {
+	_, err := a.OnWithQOS(event, a.qos, f)
+	if err != nil {
+		return false
+	}
 	return true
 }