modify drivers

models/bus.go

@@ -0,0 +1,36 @@
+package models
+
+import "slices"
+
+// bus model
+type Bus struct {
+	Name    string `json:"name,omitempty"`
+	Address []uint `json:"address,omitempty"` // address of bus
+	Topic   *Topic `json:"topic,omitempty"`   // address of bus
+}
+
+func (b *Bus) AddAddress(address ...uint) {
+	for _, a := range address {
+		if slices.Contains(b.Address, a) {
+			continue
+		}
+		b.Address = append(b.Address, a)
+		slices.Sort(b.Address)
+
+	}
+
+}
+
+func (b *Bus) AddSubscription(sub ...string) {
+	if b.Topic == nil {
+		b.Topic = &Topic{}
+	}
+	b.Topic.AddSubscription(sub...)
+}
+
+func (b *Bus) AddPublish(pub ...string) {
+	if b.Topic == nil {
+		b.Topic = &Topic{}
+	}
+	b.Topic.AddPublish(pub...)
+}

models/driver.go

@@ -0,0 +1,43 @@
+package models
+
+// driver model
+type Driver struct {
+	Type  string          `json:"type"`  // driver type name of driver in collection
+	Buses map[string]*Bus `json:"buses"` // name of driver bus
+}
+
+func (d *Driver) AddNewBus(name string) *Bus {
+	if d.Buses == nil {
+		d.Buses = make(map[string]*Bus)
+	}
+	if b, ok := d.Buses[name]; ok {
+		return b
+	}
+	d.Buses[name] = &Bus{Name: name}
+	return d.Buses[name]
+}
+
+func (d *Driver) AddBuses(buses map[string]*Bus) {
+	if d.Buses == nil {
+		d.Buses = make(map[string]*Bus)
+	}
+	for key, newBus := range buses {
+		if currentBus, ok := d.Buses[key]; ok {
+			currentBus.AddAddress(newBus.Address...)
+			if newBus.Topic == nil {
+				continue
+			}
+			currentBus.AddSubscription(newBus.Topic.Subscribe...)
+			currentBus.AddPublish(newBus.Topic.Publish...)
+			continue
+		}
+		d.Buses[key] = newBus
+	}
+}
+
+func (d *Driver) GetBus(name string) *Bus {
+	if b, ok := d.Buses[name]; ok {
+		return b
+	}
+	return nil
+}

models/drivers.go

@@ -3,23 +3,18 @@ package models
 // collection of drivers ordered in map
 type Drivers map[string]*Driver
 
-// driver model
-type Driver struct {
-	Type    string `json:"type,omitempty"` // driver type name of driver in collection
-	Bus     string `json:"bus"`            // name of driver bus
-	Address uint   `json:"address"`        // address of bus
+func (d *Drivers) AddNewDriver(typ string) *Driver {
+	if drv, ok := (*d)[typ]; ok {
+		return drv
+	}
+	(*d)[typ] = &Driver{Type: typ}
+	return (*d)[typ]
 }
 
-// returns a new collection of drivers
-func NewDrivers() Drivers {
-	return make(Drivers)
-}
-
-// Add new driver to driver collection
-// typ is the name of the driver in driver collection
-func (d *Drivers) AddDriver(typ, bus string, address uint) {
-	(*d)[typ] = &Driver{
-		Bus:     bus,
-		Address: address,
+func (d *Drivers) AddDriver(drv Driver) {
+	if driver, ok := (*d)[drv.Type]; ok {
+		driver.AddBuses(drv.Buses)
+		(*d)[drv.Type] = driver
 	}
+	(*d)[drv.Type] = &drv
 }

models/get.go

@@ -7,9 +7,10 @@ type Get struct {
 	Uuid     uuid.UUID `json:"uuid"`               //  universally unique identifier
 	Path     string    `json:"path"`               // dbm path
 	Query    *Query    `json:"query,omitempty"`    // query paramater
-	Drivers *Drivers  `json:"driver,omitempty"` // assigned drivers
+	Drivers  *Drivers  `json:"drivers,omitempty"`  // assigned drivers
 	Type     Type      `json:"type,omitempty"`     // dbm datatype
 	Value    any       `json:"value,omitempty"`    // dbm value
+	HasChild bool      `json:"hasChild,omitempty"` // inidicates path has children
 	Rights   Rights    `json:"rights,omitempty"`   // dbm read /write rights
 }
 

models/response.go

@@ -49,7 +49,7 @@ func (r *Response) AddUnsubscription(sub Subscription) {
 }
 
 // Add new data publish to response
-func (r *Response) AddUPublish(pub Publish) {
+func (r *Response) AddPublish(pub Publish) {
 	r.Publish = append(r.Publish, pub)
 }
 

models/set.go

@@ -11,6 +11,8 @@ type Set struct {
 	Type     Type      `json:"type,omitempty"`     // dbm datatype
 	Value    any       `json:"value,omitempty"`    // dbm value
 	Rights   Rights    `json:"rights,omitempty"`   // dbm read /write rights
+	Create   bool      `json:"create,omitempty"`   // dbm create new datapoint
+	HasChild bool      `json:"hasChild,omitempty"` // inidicates path has children
 	Updated  bool      `json:"-"`
 }
 
@@ -35,10 +37,31 @@ func (s *Set) New(path string, typ Type, value any, rights Rights) {
 }
 
 // sets new driver typ with bus and address
-func (s *Set) NewDriver(typ, bus string, address uint) {
-	s.Driver = &Driver{
-		Type:    typ,
-		Bus:     bus,
-		Address: address,
+func (s *Set) NewDriverAddress(typ, bus string, address uint) {
+	if s.Drivers == nil {
+		s.Drivers = &Drivers{}
 	}
+	drv := s.Drivers.AddNewDriver(typ)
+	b := drv.AddNewBus(bus)
+	b.AddAddress(address)
+}
+
+// sets new driver typ with bus and subscription
+func (s *Set) NewDriverSubscribe(typ, bus string, sub string) {
+	if s.Drivers == nil {
+		s.Drivers = &Drivers{}
+	}
+	drv := s.Drivers.AddNewDriver(typ)
+	b := drv.AddNewBus(bus)
+	b.AddSubscription(sub)
+}
+
+// sets new driver typ with bus and publish
+func (s *Set) NewDriverPublish(typ, bus string, pub string) {
+	if s.Drivers == nil {
+		s.Drivers = &Drivers{}
+	}
+	drv := s.Drivers.AddNewDriver(typ)
+	b := drv.AddNewBus(bus)
+	b.AddPublish(pub)
 }

models/subscription.go

@@ -8,6 +8,8 @@ type Subscription struct {
 	Path     string    `json:"path,omitempty"`     // dbm path
 	Depth    uint      `json:"depth,omitempty"`    // depth of subscriptions from found path or uuid
 	Value    any       `json:"value,omitempty"`    // current value
+	Rights   Rights    `json:"rights,omitempty"`   // read /write rights
+	HasChild bool      `json:"hasChild,omitempty"` // inidicates path has children
 	Drivers  *Drivers  `json:"drivers,omitempty"`  // assigned drivers
 	Driver   string    `json:"driver,omitempty"`   // driver type to assign this subscription
 	OnCreate bool      `json:"onCreate,omitempty"` // notify at datapoint creation

models/topic.go

@@ -0,0 +1,29 @@
+package models
+
+import "slices"
+
+// topic model
+type Topic struct {
+	Publish   []string `json:"Publish,omitempty"`
+	Subscribe []string `json:"subscribe,omitempty"`
+}
+
+func (t *Topic) AddSubscription(subs ...string) {
+	for _, sub := range subs {
+		if slices.Contains(t.Subscribe, sub) {
+			continue
+		}
+		t.Subscribe = append(t.Subscribe, sub)
+		slices.Sort(t.Subscribe)
+	}
+}
+
+func (t *Topic) AddPublish(pubs ...string) {
+	for _, pub := range pubs {
+		if slices.Contains(t.Publish, pub) {
+			continue
+		}
+		t.Subscribe = append(t.Publish, pub)
+		slices.Sort(t.Publish)
+	}
+}

models/type.go

@@ -20,7 +20,7 @@ const (
 	LOU  Type = "LOU" // UINT64
 	F32  Type = "F32" // FLOAT32
 	F64  Type = "F64" // FLOAT64
-	STR  Type = "STRING" // STRING
+	STR  Type = "STR" // STRING
 )
 
 // dbm datatype model

utils/convert.go

@@ -36,8 +36,8 @@ func Float32From(v any) float32 {
 	case uint64:
 		return float32(val)
 	case string:
-		if i, err := strconv.Atoi(val); err == nil {
-			return float32(i)
+		if f64, err := strconv.ParseFloat(val, 32); err == nil {
+			return float32(f64)
 		}
 		return 0
 	default:
@@ -76,8 +76,8 @@ func Float64From(v any) float64 {
 	case uint64:
 		return float64(val)
 	case string:
-		if i, err := strconv.Atoi(val); err == nil {
-			return float64(i)
+		if f64, err := strconv.ParseFloat(val, 32); err == nil {
+			return f64
 		}
 		return 0
 	default:
@@ -433,7 +433,14 @@ func BoolFrom(v any) bool {
 	case float64:
 		return val >= 1
 	case string:
-		return strings.ToLower(val) == "false" || v == "0"
+		if strings.ToLower(val) == "true" {
+			return true
+		} else if strings.ToLower(val) == "false" {
+			return false
+		} else if i, err := strconv.Atoi(val); err == nil {
+			return i > 0
+		}
+		return false
 	default:
 		return false
 	}