wip

charger/vaillant.go

@@ -20,10 +20,11 @@
 import (
 	"context"
 
 	"github.com/WulfgarW/sensonet"
 	"github.com/evcc-io/evcc/api"
 	"github.com/evcc-io/evcc/util"
 	"github.com/evcc-io/evcc/util/request"
+	"golang.org/x/oauth2"
 )
 
 func init() {
@@ -55,18 +56,15 @@
 
 	log := util.NewLogger("vaillant").Redact(cc.User, cc.Password)
 	client := request.NewClient(log)
+	clientCtx := context.WithValue(ctx, oauth2.HTTPClient, client)
 
-	identity, err := sensonet.NewIdentity(client, cc.Realm)
+	oc := sensonet.Oauth2ConfigForRealm(cc.Realm)
+	token, err := oc.PasswordCredentialsToken(clientCtx, cc.User, cc.Password)
 	if err != nil {
 		return nil, err
 	}
 
-	ts, err := identity.Login(cc.User, cc.Password)
-	if err != nil {
-		return nil, err
-	}
-
-	conn, err := sensonet.NewConnection(client, ts)
+	conn, err := sensonet.NewConnection(client, oc.TokenSource(clientCtx, token))
 	if err != nil {
 		return nil, err
 	}
@@ -89,7 +87,7 @@
 	set := func(mode int64) error {
 		switch mode {
 		case Normal:
-			_, err := conn.StopStrategybased(systemID, 0, &heatingPar, &hotwaterPar)
+			_, err := conn.StopStrategybased(systemID, &heatingPar, &hotwaterPar)
 			return err
 		case Boost:
 			strategy := sensonet.STRATEGY_HOTWATER_THEN_HEATING

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/BurntSushi/toml v1.4.0
 	github.com/Masterminds/sprig/v3 v3.3.0
 	github.com/PuerkitoBio/goquery v1.10.0
-	github.com/WulfgarW/sensonet v0.0.2-0.20241212184816-18cb23f466e6
+	github.com/WulfgarW/sensonet v0.0.2-0.20241223212731-a6f5f75e6bc3
 	github.com/andig/go-powerwall v0.2.1-0.20230808194509-dd70cdb6e140
 	github.com/andig/gosunspec v0.0.0-20240918203654-860ce51d602b
 	github.com/andig/mbserver v0.0.0-20230310211055-1d29cbb5820e
@@ -210,6 +210,4 @@ replace github.com/grid-x/modbus => github.com/evcc-io/modbus v0.0.0-20241027151
 
 replace github.com/lorenzodonini/ocpp-go => github.com/evcc-io/ocpp-go v0.0.0-20240914122959-0d109e403130
 
-// replace github.com/WulfgarW/sensonet => ../wsensonet
-
-replace github.com/WulfgarW/sensonet => github.com/andig/sensonet-1 v0.0.2-0.20241221141704-b9d5353336c1
+replace github.com/WulfgarW/sensonet => ../wsensonet

go.sum

@@ -23,6 +23,8 @@ github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWX
 github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
+github.com/WulfgarW/sensonet v0.0.2-0.20241223212731-a6f5f75e6bc3 h1:SAOrJO8pVZpnH0gqqZGufhxqkkO9Rqar2DqY24htz4o=
+github.com/WulfgarW/sensonet v0.0.2-0.20241223212731-a6f5f75e6bc3/go.mod h1:QZodMch+UskApzlhhGa5ydSY0v5knlF4uQ5WO78xrEs=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
 github.com/ahmetb/go-linq/v3 v3.2.0 h1:BEuMfp+b59io8g5wYzNoFe9pWPalRklhlhbiU3hYZDE=
 github.com/ahmetb/go-linq/v3 v3.2.0/go.mod h1:haQ3JfOeWK8HpVxMtHHEMPVgBKiYyQ+f1/kLZh/cj9U=
@@ -37,8 +39,6 @@ github.com/andig/gosunspec v0.0.0-20240918203654-860ce51d602b h1:81UMfM949I7StrR
 github.com/andig/gosunspec v0.0.0-20240918203654-860ce51d602b/go.mod h1:c6P6szcR+ROkqZruOR4f6qbDKFjZX6OitPpj+yJ/r8k=
 github.com/andig/mbserver v0.0.0-20230310211055-1d29cbb5820e h1:m/NTP3JWpR7M0ljLxiQU4fzR25jjhe1LDtxLMNcoNJQ=
 github.com/andig/mbserver v0.0.0-20230310211055-1d29cbb5820e/go.mod h1:4VtYzTm//oUipwvO3yh0g/udTE7pYJM+U/kyAuFDsgM=
-github.com/andig/sensonet-1 v0.0.2-0.20241221141704-b9d5353336c1 h1:l7vFbfYyhkGqlk91kySa3kqPJSE1eYWBAEm+X/v/Q00=
-github.com/andig/sensonet-1 v0.0.2-0.20241221141704-b9d5353336c1/go.mod h1:txWeNF3TKSUNkaeQZXT//BiZPY4+xOZ4VXsFN+taQe4=
 github.com/andig/yaml v0.0.0-20240531135838-1ff5761ab467 h1:JqIoHxsQSV39xaemvVRu3HOkSf5AbhQ1YEENJa2cL3Q=
 github.com/andig/yaml v0.0.0-20240531135838-1ff5761ab467/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss=