chore: refactor plugin structure (#18335)

This commit is contained in:
andig 2025-01-23 14:43:04 +01:00 • committed by GitHub
parent 9127e1a913
commit 07fa1b64f8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
127 changed files with 861 additions and 938 deletions

238
plugin/mqtt/client.go Normal file
View file

@ -0,0 +1,238 @@
package mqtt
import (
"crypto/tls"
"crypto/x509"
"fmt"
"math/rand/v2"
"strings"
"sync"
"sync/atomic"
"time"
paho "github.com/eclipse/paho.mqtt.golang"
"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/util"
"github.com/evcc-io/evcc/util/request"
)
// Instance is the paho Mqtt client singleton
var Instance *Client
// ClientID created unique mqtt client id
func ClientID() string {
return fmt.Sprintf("evcc-%d", rand.Int32())
}
// Config is the public configuration
type Config struct {
Broker string `json:"broker"`
User string `json:"user"`
Password string `json:"password"`
ClientID string `json:"clientID"`
Insecure bool `json:"insecure"`
CaCert string `json:"caCert"`
ClientCert string `json:"clientCert"`
ClientKey string `json:"clientKey"`
}
// Client encapsulates mqtt publish/subscribe functions
type Client struct {
log *util.Logger
mux sync.Mutex
Client paho.Client
broker string
Qos byte
inflight uint32
listener map[string][]func(string)
}
type Option func(*paho.ClientOptions)
const secure = "tls://"
// NewClient creates new Mqtt publisher
func NewClient(log *util.Logger, broker, user, password, clientID string, qos byte, insecure bool, caCert, clientCert, clientKey string, opts ...Option) (*Client, error) {
broker, isSecure := strings.CutPrefix(broker, secure)
// strip schema as it breaks net.SplitHostPort
broker = util.DefaultPort(broker, 1883)
if isSecure {
broker = secure + broker
}
mc := &Client{
log: log,
Qos: qos,
listener: make(map[string][]func(string)),
}
options := paho.NewClientOptions()
options.AddBroker(broker)
options.SetUsername(user)
options.SetPassword(password)
options.SetClientID(clientID)
options.SetCleanSession(true)
options.SetAutoReconnect(true)
options.SetOnConnectHandler(mc.ConnectionHandler)
options.SetConnectionLostHandler(mc.ConnectionLostHandler)
options.SetConnectTimeout(request.Timeout)
options.SetWriteTimeout(request.Timeout)
tlsConfig := &tls.Config{
InsecureSkipVerify: insecure,
}
if caCert != "" {
caCertPool := x509.NewCertPool()
if ok := caCertPool.AppendCertsFromPEM([]byte(caCert)); !ok {
return nil, fmt.Errorf("failed to add ca cert to cert pool")
}
tlsConfig.RootCAs = caCertPool
}
if clientCert != "" && clientKey != "" {
clientKeyPair, err := tls.X509KeyPair([]byte(clientCert), []byte(clientKey))
if err != nil {
return nil, fmt.Errorf("failed to add client cert: %w", err)
}
tlsConfig.Certificates = []tls.Certificate{clientKeyPair}
}
options.SetTLSConfig(tlsConfig)
// additional options
for _, o := range opts {
o(options)
}
client := paho.NewClient(options)
or := client.OptionsReader()
mc.broker = fmt.Sprintf("%v", or.Servers())
if len(or.Servers()) == 1 {
mc.broker = or.Servers()[0].String()
}
log.INFO.Printf("connecting %s at %s", clientID, mc.broker)
if token := client.Connect(); token.Wait() && token.Error() != nil {
return nil, fmt.Errorf("error connecting: %w", token.Error())
}
mc.Client = client
return mc, nil
}
// ConnectionLostHandler logs cause of connection loss as warning
func (m *Client) ConnectionLostHandler(client paho.Client, reason error) {
m.log.ERROR.Printf("%s connection lost: %v", m.broker, reason.Error())
}
// ConnectionHandler restores listeners
func (m *Client) ConnectionHandler(client paho.Client) {
m.log.DEBUG.Printf("%s connected", m.broker)
m.mux.Lock()
defer m.mux.Unlock()
for topic := range m.listener {
m.log.DEBUG.Printf("%s subscribe %s", m.broker, topic)
go m.listen(topic)
}
}
// Cleanup recursively removes a topic
func (m *Client) Cleanup(topic string, retained bool) error {
statusTopic := topic + "/status"
if !m.Client.Subscribe(topic+"/#", m.Qos, func(c paho.Client, msg paho.Message) {
if len(msg.Payload()) == 0 || msg.Topic() == statusTopic {
return
}
m.log.TRACE.Printf("delete: %s", msg.Topic())
m.Client.Publish(msg.Topic(), m.Qos, true, []byte{})
}).WaitTimeout(request.Timeout) {
return api.ErrTimeout
}
time.Sleep(time.Second)
if !m.Client.Unsubscribe(topic + "/#").WaitTimeout(request.Timeout) {
return api.ErrTimeout
}
return nil
}
// Publish synchronously publishes payload using client qos
func (m *Client) Publish(topic string, retained bool, payload interface{}) error {
m.log.TRACE.Printf("send %s: '%v'", topic, payload)
token := m.Client.Publish(topic, m.Qos, retained, payload)
go m.WaitForToken("send", topic, token)
return nil
}
// Listen attaches listener to slice of listeners for given topic
func (m *Client) Listen(topic string, callback func(string)) error {
m.mux.Lock()
m.listener[topic] = append(m.listener[topic], callback)
m.mux.Unlock()
token := m.listen(topic)
select {
case <-time.After(request.Timeout):
return fmt.Errorf("subscribe: %s: %w", topic, api.ErrTimeout)
case <-token.Done():
return nil
}
}
// ListenSetter creates a /set listener that resets the payload after handling
func (m *Client) ListenSetter(topic string, callback func(string) error) error {
topic += "/set"
err := m.Listen(topic, func(payload string) {
if err := callback(payload); err != nil {
m.log.ERROR.Printf("set %s: %v", topic, err)
}
if err := m.Publish(topic, true, ""); err != nil {
m.log.ERROR.Printf("clear: %s: %v", topic, err)
}
})
return err
}
// listen attaches listener to topic
func (m *Client) listen(topic string) paho.Token {
token := m.Client.Subscribe(topic, m.Qos, func(c paho.Client, msg paho.Message) {
payload := string(msg.Payload())
m.log.TRACE.Printf("recv %s: '%v'", topic, payload)
if len(payload) > 0 {
m.mux.Lock()
callbacks := m.listener[topic]
m.mux.Unlock()
for _, cb := range callbacks {
cb(payload)
}
}
})
return token
}
// WaitForToken synchronously waits until token operation completed
func (m *Client) WaitForToken(action, topic string, token paho.Token) {
if inflight := atomic.LoadUint32(&m.inflight); inflight > 64 {
return
}
// track inflight token waits
atomic.AddUint32(&m.inflight, 1)
defer atomic.AddUint32(&m.inflight, ^uint32(0))
err := api.ErrTimeout
if token.WaitTimeout(request.Timeout) {
err = token.Error()
}
if err != nil {
m.log.ERROR.Printf("%s: %s: %v", action, topic, err)
}
}

68
plugin/mqtt/registry.go Normal file
View file

@ -0,0 +1,68 @@
package mqtt
import (
"errors"
"fmt"
"sync"
"github.com/evcc-io/evcc/util"
)
type clientRegistry map[string]*Client
func (r clientRegistry) Add(broker string, client *Client) {
if _, exists := r[broker]; exists {
panic(fmt.Sprintf("cannot register duplicate broker: %s", broker))
}
r[broker] = client
}
func (r clientRegistry) Get(broker string) (*Client, error) {
client, exists := r[broker]
if !exists {
return nil, fmt.Errorf("missing mqtt broker configuration: %s", broker)
}
return client, nil
}
var (
mu sync.Mutex
registry clientRegistry = make(map[string]*Client)
)
// RegisteredClient reuses an registered Mqtt publisher or creates a new one
func RegisteredClient(log *util.Logger, broker, user, password, clientID string, qos byte, insecure bool, caCert, clientCert, clientKey string, opts ...Option) (*Client, error) {
key := fmt.Sprintf("%s.%s:%s", broker, user, password)
mu.Lock()
defer mu.Unlock()
client, err := registry.Get(key)
if err != nil {
if clientID == "" {
clientID = ClientID()
}
if client, err = NewClient(log, broker, user, password, clientID, qos, insecure, caCert, clientCert, clientKey, opts...); err == nil {
registry.Add(key, client)
}
}
return client, err
}
// RegisteredClientOrDefault reuses an registered Mqtt publisher or creates a new one.
// If no publisher is configured, it uses the default instance.
func RegisteredClientOrDefault(log *util.Logger, cc Config) (*Client, error) {
client := Instance
var err error
if cc.Broker != "" {
client, err = RegisteredClient(log, cc.Broker, cc.User, cc.Password, cc.ClientID, 1, cc.Insecure, cc.CaCert, cc.ClientCert, cc.ClientKey)
}
if client == nil && err == nil {
err = errors.New("missing mqtt broker configuration")
}
return client, err
}