improve /targets api

- add deviceName
- use camelcase

Signed-off-by: Markus Blaschke <[email protected]>

Author: mblaschke

discovery/discovery.go

@@ -181,6 +181,15 @@ func (d *serviceDiscovery) MarkTarget(address string, healthy bool) {
 	d.cleanup()
 }
 
+func (d *serviceDiscovery) SetTargetDeviceName(address, deviceName string) {
+	d.lock.Lock()
+	defer d.lock.Unlock()
+
+	if _, exists := d.targetList[address]; exists {
+		d.targetList[address].DeviceName = &deviceName
+	}
+}
+
 func (d *serviceDiscovery) cleanup() {
 	for address, target := range d.targetList {
 		if target.Health <= TargetHealthDead {

discovery/discoverytarget.go

@@ -7,12 +7,13 @@ import (
 
 type (
 	DiscoveryTarget struct {
-		Hostname string
-		Address  string
-		Port     int
-		Health   int
-		Type     string
-		Static   bool
+		DeviceName *string `json:"deviceName"`
+		Hostname   string  `json:"hostname"`
+		Address    string  `json:"address"`
+		Port       int     `json:"port"`
+		Health     int     `json:"health"`
+		Type       string  `json:"type"`
+		Static     bool    `json:"isStatic"`
 	}
 )
 

shellyplug/prober.gen1.go

@@ -21,6 +21,7 @@ func (sp *ShellyPlug) collectFromTargetGen1(target discovery.DiscoveryTarget, lo
 	if result, err := shellyProber.GetSettings(); err == nil {
 		if discovery.ServiceDiscovery != nil {
 			discovery.ServiceDiscovery.MarkTarget(target.Address, discovery.TargetHealthy)
+			discovery.ServiceDiscovery.SetTargetDeviceName(target.Address, result.Name)
 		}
 
 		targetLabels["plugName"] = result.Name

shellyplug/prober.gen2.go

@@ -33,6 +33,7 @@ func (sp *ShellyPlug) collectFromTargetGen2(target discovery.DiscoveryTarget, lo
 		// target is healthy
 		if discovery.ServiceDiscovery != nil {
 			discovery.ServiceDiscovery.MarkTarget(target.Address, discovery.TargetHealthy)
+			discovery.ServiceDiscovery.SetTargetDeviceName(target.Address, infoLabels["plugName"])
 		}
 
 		// systemStatus