Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Config UI: improve device error handling (#19267)

Browse source
This commit is contained in:
Michael Geers 2025-03-02 13:28:54 +01:00 • committed by GitHub
parent 3d52db4837
commit 90a437a688
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 84 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

58
server/http_config_device_handler.go
View file

@ -206,8 +206,8 @@ func deviceStatusHandler(w http.ResponseWriter, r *http.Request) {
jsonResult(w, testInstance(instance))
}
func newDevice[T any](class templates.Class, req map[string]any, newFromConf newFromConfFunc[T], h config.Handler[T]) (*config.Config, error) {
instance, err := newFromConf(context.TODO(), typeTemplate, req)
func newDevice[T any](ctx context.Context, class templates.Class, req map[string]any, newFromConf newFromConfFunc[T], h config.Handler[T]) (*config.Config, error) {
instance, err := newFromConf(ctx, typeTemplate, req)
if err != nil {
return nil, err
}
@ -217,7 +217,7 @@ func newDevice[T any](class templates.Class, req map[string]any, newFromConf new
return nil, err
}
return &conf, h.Add(config.NewConfigurableDevice[T](&conf, instance))
return &conf, h.Add(config.NewConfigurableDevice(&conf, instance))
}
// newDeviceHandler creates a new device by class
@ -240,28 +240,33 @@ func newDeviceHandler(w http.ResponseWriter, r *http.Request) {
delete(req, "type")
var conf *config.Config
ctx, cancel, done := startDeviceTimeout()
switch class {
case templates.Charger:
conf, err = newDevice(class, req, charger.NewFromConfig, config.Chargers())
conf, err = newDevice(ctx, class, req, charger.NewFromConfig, config.Chargers())
case templates.Meter:
conf, err = newDevice(class, req, meter.NewFromConfig, config.Meters())
conf, err = newDevice(ctx, class, req, meter.NewFromConfig, config.Meters())
case templates.Vehicle:
conf, err = newDevice(class, req, vehicle.NewFromConfig, config.Vehicles())
conf, err = newDevice(ctx, class, req, vehicle.NewFromConfig, config.Vehicles())
case templates.Circuit:
conf, err = newDevice(class, req, func(_ context.Context, _ string, other map[string]interface{}) (api.Circuit, error) {
return circuit.NewFromConfig(util.NewLogger("circuit"), other)
conf, err = newDevice(ctx, class, req, func(ctx context.Context, _ string, other map[string]interface{}) (api.Circuit, error) {
return circuit.NewFromConfig(ctx, util.NewLogger("circuit"), other)
}, config.Circuits())
}
if err != nil {
cancel()
jsonError(w, http.StatusBadRequest, err)
return
}
// prevent context from being cancelled
close(done)
setConfigDirty()
res := struct {
@ -275,8 +280,8 @@ func newDeviceHandler(w http.ResponseWriter, r *http.Request) {
jsonResult(w, res)
}
func updateDevice[T any](id int, class templates.Class, conf map[string]any, newFromConf newFromConfFunc[T], h config.Handler[T]) error {
dev, instance, merged, err := deviceInstanceFromMergedConfig(id, class, conf, newFromConf, h)
func updateDevice[T any](ctx context.Context, id int, class templates.Class, conf map[string]any, newFromConf newFromConfFunc[T], h config.Handler[T]) error {
dev, instance, merged, err := deviceInstanceFromMergedConfig(ctx, id, class, conf, newFromConf, h)
if err != nil {
return err
}
@ -314,29 +319,35 @@ func updateDeviceHandler(w http.ResponseWriter, r *http.Request) {
}
delete(req, "type")
ctx, cancel, done := startDeviceTimeout()
switch class {
case templates.Charger:
err = updateDevice(id, class, req, charger.NewFromConfig, config.Chargers())
err = updateDevice(ctx, id, class, req, charger.NewFromConfig, config.Chargers())
case templates.Meter:
err = updateDevice(id, class, req, meter.NewFromConfig, config.Meters())
err = updateDevice(ctx, id, class, req, meter.NewFromConfig, config.Meters())
case templates.Vehicle:
err = updateDevice(id, class, req, vehicle.NewFromConfig, config.Vehicles())
err = updateDevice(ctx, id, class, req, vehicle.NewFromConfig, config.Vehicles())
case templates.Circuit:
err = updateDevice(id, class, req, func(_ context.Context, _ string, other map[string]interface{}) (api.Circuit, error) {
return circuit.NewFromConfig(util.NewLogger("circuit"), other)
err = updateDevice(ctx, id, class, req, func(ctx context.Context, _ string, other map[string]interface{}) (api.Circuit, error) {
return circuit.NewFromConfig(ctx, util.NewLogger("circuit"), other)
}, config.Circuits())
}
setConfigDirty()
if err != nil {
cancel()
jsonError(w, http.StatusBadRequest, err)
return
}
// prevent context from being cancelled
close(done)
res := struct {
ID int `json:"id"`
}{
@ -412,12 +423,12 @@ func deleteDeviceHandler(w http.ResponseWriter, r *http.Request) {
jsonResult(w, res)
}
func testConfig[T any](id int, class templates.Class, conf map[string]any, newFromConf newFromConfFunc[T], h config.Handler[T]) (T, error) {
func testConfig[T any](ctx context.Context, id int, class templates.Class, conf map[string]any, newFromConf newFromConfFunc[T], h config.Handler[T]) (T, error) {
if id == 0 {
return newFromConf(context.TODO(), typeTemplate, conf)
return newFromConf(ctx, typeTemplate, conf)
}
_, instance, _, err := deviceInstanceFromMergedConfig(id, class, conf, newFromConf, h)
_, instance, _, err := deviceInstanceFromMergedConfig(ctx, id, class, conf, newFromConf, h)
return instance, err
}
@ -450,25 +461,30 @@ func testConfigHandler(w http.ResponseWriter, r *http.Request) {
delete(req, "type")
var instance any
ctx, cancel, done := startDeviceTimeout()
switch class {
case templates.Charger:
instance, err = testConfig(id, class, req, charger.NewFromConfig, config.Chargers())
instance, err = testConfig(ctx, id, class, req, charger.NewFromConfig, config.Chargers())
case templates.Meter:
instance, err = testConfig(id, class, req, meter.NewFromConfig, config.Meters())
instance, err = testConfig(ctx, id, class, req, meter.NewFromConfig, config.Meters())
case templates.Vehicle:
instance, err = testConfig(id, class, req, vehicle.NewFromConfig, config.Vehicles())
instance, err = testConfig(ctx, id, class, req, vehicle.NewFromConfig, config.Vehicles())
case templates.Circuit:
err = api.ErrNotAvailable
}
if err != nil {
cancel()
jsonError(w, http.StatusBadRequest, err)
return
}
// prevent context from being cancelled
close(done)
jsonResult(w, testInstance(instance))
}