allow multiple mqtt connections

cmd/root.go

@@ -98,9 +98,7 @@ func run(cmd *cobra.Command, args []string) {
 	deck.RegisterFactory(pulse.NewButtonFactory())
 	deck.RegisterFactory(hamlib.NewButtonFactory(deck, rootFlags.hamlibAddress))
 	deck.RegisterFactory(tci.NewButtonFactory(deck, rootFlags.tciAddress))
-	if rootFlags.mqttAddress != "" {
-		deck.RegisterFactory(mqtt.NewButtonFactory(rootFlags.mqttAddress, rootFlags.mqttUsername, rootFlags.mqttPassword))
-	}
+	deck.RegisterFactory(mqtt.NewButtonFactory(deck, rootFlags.mqttAddress, rootFlags.mqttUsername, rootFlags.mqttPassword))
 
 	err = configureHamDeck(deck, rootFlags.configFile)
 	if err != nil {

pkg/mqtt/factory.go

@@ -1,13 +1,17 @@
 package mqtt
 
 import (
+	"fmt"
 	"log"
 	"strings"
 
 	"github.com/ftl/hamdeck/pkg/hamdeck"
 )
 
 const (
+	ConfigAddress     = "address"
+	ConfigUsername    = "username"
+	ConfigPassword    = "password"
 	ConfigLabel       = "label"
 	ConfigPath        = "path"
 	ConfigInputTopic  = "inputTopic"
@@ -18,24 +22,43 @@ const (
 )
 
 const (
+	ConnectionType   = "mqtt"
 	TuneButtonType   = "mqtt.AT100Tune"
 	SwitchButtonType = "mqtt.Switch"
 )
 
-func NewButtonFactory(address string, username string, password string) *Factory {
-	client := NewClient(address, username, password)
+func NewButtonFactory(provider hamdeck.ConnectionConfigProvider, legacyAddress string, username string, password string) *Factory {
+	result := &Factory{}
+	result.connections = hamdeck.NewConnectionManager(ConnectionType, provider, result.createMQTTClient)
 
-	return &Factory{
-		client: client,
+	if legacyAddress != "" {
+		result.connections.SetLegacy(NewClient(legacyAddress, username, password))
 	}
+
+	return result
 }
 
 type Factory struct {
-	client *Client
+	connections *hamdeck.ConnectionManager[*Client]
+}
+
+func (f *Factory) createMQTTClient(name string, config hamdeck.ConnectionConfig) (*Client, error) {
+	address, ok := hamdeck.ToString(config[ConfigAddress])
+	if !ok {
+		return nil, fmt.Errorf("no address defined for mqtt connection %s", name)
+	}
+	username, _ := hamdeck.ToString(config[ConfigUsername])
+	password, _ := hamdeck.ToString(config[ConfigPassword])
+
+	client := NewClient(address, username, password)
+
+	return client, nil
 }
 
 func (f *Factory) Close() {
-	f.client.Disconnect()
+	f.connections.ForEach(func(client *Client) {
+		client.Disconnect()
+	})
 }
 
 func (f *Factory) CreateButton(config map[string]interface{}) hamdeck.Button {
@@ -58,7 +81,14 @@ func (f *Factory) createTuneButton(config map[string]interface{}) hamdeck.Button
 		return nil
 	}
 
-	return NewTuneButton(f.client, label, path)
+	connection, _ := hamdeck.ToString(config[hamdeck.ConfigConnection])
+	mqttClient, err := f.connections.Get(connection)
+	if err != nil {
+		log.Printf("Cannot create mqtt.ATU100Tune button: %v", err)
+		return nil
+	}
+
+	return NewTuneButton(mqttClient, label, path)
 }
 
 func (f *Factory) createSwitchButton(config map[string]interface{}) hamdeck.Button {
@@ -74,5 +104,12 @@ func (f *Factory) createSwitchButton(config map[string]interface{}) hamdeck.Butt
 		return nil
 	}
 
-	return NewSwitchButton(f.client, label, inputTopic, outputTopic, onPayload, offPayload, SwitchMode(strings.TrimSpace(strings.ToUpper(mode))))
+	connection, _ := hamdeck.ToString(config[hamdeck.ConfigConnection])
+	mqttClient, err := f.connections.Get(connection)
+	if err != nil {
+		log.Printf("Cannot create mqtt.Switch button: %v", err)
+		return nil
+	}
+
+	return NewSwitchButton(mqttClient, label, inputTopic, outputTopic, onPayload, offPayload, SwitchMode(strings.TrimSpace(strings.ToUpper(mode))))
 }