Use openWB timeout topic (evcc-io#529)

charger/openwb.go

@@ -32,7 +32,7 @@ func NewOpenWBFromConfig(other map[string]interface{}) (api.Charger, error) {
 	}{
 		Topic:   "openWB",
 		ID:      1,
-		Timeout: 5 * time.Second,
+		Timeout: 15 * time.Second,
 	}
 
 	if err := util.DecodeOther(other, &cc); err != nil {
@@ -47,13 +47,30 @@ func NewOpenWBFromConfig(other map[string]interface{}) (api.Charger, error) {
 		return nil, err
 	}
 
+	// timeout handler
+	timer := provider.NewMqtt(log, client,
+		fmt.Sprintf("%s/system/%s", cc.Topic, openwb.TimestampTopic), "", 1, cc.Timeout,
+	).IntGetter()
+
 	// getters
 	boolG := func(topic string) func() (bool, error) {
-		return provider.NewMqtt(log, client, topic, "", 1, cc.Timeout).BoolGetter()
+		g := provider.NewMqtt(log, client, topic, "", 1, 0).BoolGetter()
+		return func() (val bool, err error) {
+			if val, err = g(); err == nil {
+				_, err = timer()
+			}
+			return val, err
+		}
 	}
 
 	floatG := func(topic string) func() (float64, error) {
-		return provider.NewMqtt(log, client, topic, "", 1, cc.Timeout).FloatGetter()
+		g := provider.NewMqtt(log, client, topic, "", 1, 0).FloatGetter()
+		return func() (val float64, err error) {
+			if val, err = g(); err == nil {
+				_, err = timer()
+			}
+			return val, err
+		}
 	}
 
 	// check if loadpoint configured

charger/openwb/topics.go

@@ -2,6 +2,9 @@ package openwb
 
 // predefined openWB topic names
 const (
+	// alive
+	TimestampTopic = "Timestamp"
+
 	// status
 	PluggedTopic    = "boolPlugStat"
 	ChargingTopic   = "boolChargeStat"

provider/mqtt/registry.go

@@ -28,11 +28,12 @@ var 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) (*Client, error) {
-	client, err := registry.Get(broker)
+	key := fmt.Sprintf("%s.%s", broker, log.Name())
+	client, err := registry.Get(key)
 
 	if err != nil {
 		if client, err = NewClient(log, broker, user, password, ClientID(), qos); err == nil {
-			registry.Add(broker, client)
+			registry.Add(key, client)
 		}
 	}
 

util/log.go

@@ -31,6 +31,7 @@ const padding = 6 // padding of log areas
 // Logger wraps a jww notepad to avoid leaking implementation detail
 type Logger struct {
 	*jww.Notepad
+	name string
 }
 
 // NewLogger creates a logger with the given log area and adds it to the registry
@@ -46,11 +47,19 @@ func NewLogger(area string) *Logger {
 	loggersMux.Lock()
 	defer loggersMux.Unlock()
 
-	logger := &Logger{notepad}
+	logger := &Logger{
+		Notepad: notepad,
+		name:    area,
+	}
 	loggers[area] = logger
 	return logger
 }
 
+// Name returns the loggers name
+func (l *Logger) Name() string {
+	return l.name
+}
+
 // Loggers invokes callback for each configured logger
 func Loggers(cb func(string, *Logger)) {
 	for name, logger := range loggers {

util/net_test.go

@@ -0,0 +1,18 @@
+package util
+
+import (
+	"testing"
+)
+
+// DefaultPort appends given port to connection if not specified
+func TestDefaultPort(t *testing.T) {
+	expect := "foo:7090"
+
+	if uri := DefaultPort("foo:7090", 7090); uri != expect {
+		t.Errorf("expected %s, got %s", expect, uri)
+	}
+
+	if uri := DefaultPort("foo", 7090); uri != expect {
+		t.Errorf("expected %s, got %s", expect, uri)
+	}
+}