Merge remote-tracking branch 'upstream/master'

Author: WulfgarW

.eslintrc.cjs

@@ -32,6 +32,10 @@ builds:
         goarch: arm
       - goos: windows
         goarch: arm64
+    overrides:
+      - goos: darwin
+        ldflags:
+          - "-B gobuildid"
 
 env:
   - CGO_ENABLED=0

.goreleaser.yml

@@ -77,7 +77,7 @@ build::
 	CGO_ENABLED=0 go build -v $(BUILD_TAGS) $(BUILD_ARGS)
 
 snapshot::
-	goreleaser --snapshot --skip-publish --clean
+	goreleaser --snapshot --skip publish --clean
 
 release::
 	goreleaser --clean

Makefile

@@ -68,7 +68,7 @@ type CurrentGetter interface {
 	GetMaxCurrent() (float64, error)
 }
 
-// BatteryController optionally allows to control home battery (dis)charging behaviour
+// BatteryController optionally allows to control home battery (dis)charging behavior
 type BatteryController interface {
 	SetBatteryMode(BatteryMode) error
 }
@@ -120,7 +120,7 @@ type Authorizer interface {
 	Authorize(key string) error
 }
 
-// PhaseDescriber returns the number of availablephases
+// PhaseDescriber returns the number of available phases
 type PhaseDescriber interface {
 	Phases() int
 }
@@ -241,3 +241,8 @@ type Circuit interface {
 	ValidateCurrent(old, new float64) float64
 	ValidatePower(old, new float64) float64
 }
+
+// Redactor is an interface to redact sensitive data
+type Redactor interface {
+	Redacted() any
+}

api/api.go

@@ -6,6 +6,7 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/evcc-io/evcc/api"
 	"github.com/evcc-io/evcc/provider/mqtt"
 	"github.com/evcc-io/evcc/push"
 	"github.com/evcc-io/evcc/server/eebus"
@@ -30,7 +31,7 @@ type All struct {
 	Go           []Go
 	Influx       Influx
 	EEBus        eebus.Config
-	HEMS         config.Typed
+	HEMS         Hems
 	Messaging    Messaging
 	Meters       []config.Named
 	Chargers     []config.Named
@@ -57,6 +58,20 @@ type ModbusProxy struct {
 	modbus.Settings `mapstructure:",squash"`
 }
 
+var _ api.Redactor = (*Hems)(nil)
+
+type Hems config.Typed
+
+func (c Hems) Redacted() any {
+	return struct {
+		Type string `json:"type,omitempty"`
+	}{
+		Type: c.Type,
+	}
+}
+
+var _ api.Redactor = (*Mqtt)(nil)
+
 type Mqtt struct {
 	mqtt.Config `mapstructure:",squash"`
 	Topic       string `json:"topic"`
@@ -68,9 +83,9 @@ func (m Mqtt) Redacted() any {
 	return struct {
 		Broker   string `json:"broker"`
 		Topic    string `json:"topic"`
-		User     string `json:"user"`
-		ClientID string `json:"clientID"`
-		Insecure bool   `json:"insecure"`
+		User     string `json:"user,omitempty"`
+		ClientID string `json:"clientID,omitempty"`
+		Insecure bool   `json:"insecure,omitempty"`
 	}{
 		Broker:   m.Broker,
 		Topic:    m.Topic,