Adds tests, a new system, and bug fixes

.gitignore

@@ -9,6 +9,7 @@
 *_amac
 *_ilin
 *.sh
+*.html
 Makefile
 
 # Test binary, built with `go test -c`
@@ -24,7 +25,7 @@ vendor/
 
 # mbaigo
 *.json
-go.mod
-go.sum
 serviceRegistry.db
 *.pem
+**/files/
+

README.md

@@ -27,12 +27,15 @@ Many of the testing is done with the Raspberry Pi (3, 4, &5) with [GPIO](https:/
 - 20103  Orchestrator
 - 20104  Authorizer
 - 20105  Modeler (local cloud semantics with GraphDB)
+- 20106  Messenger
 - 20150  ds18b20 (1-wire sensor)
 - 20151  Parallax (PWM)
 - 20152  Thermostat
+- 20153  Revolutionary (Rev Pi PLC)
+- 20154  Levler (Level control)
 - 20160  Picam
 - 20161  USB microphone 
 - 20170  UA client (OPC UA)
 - 20171  Modboss (Modbus TCP)
 - 20172  Telegrapher (MQTT)
-- 20180  Influxer (Influx DB)
+- 20180  Influxer (Influx DB)

Influxer/README.md → collector/README.md

@@ -1,6 +1,6 @@
-# mbaigo System: influxer
+# mbaigo System: Collector
 
-The Influxer is a system that as for asset the time series database [InfluxDB](https://en.wikipedia.org/wiki/InfluxDB).
+The Collector is a system that as for asset the time series database [InfluxDB](https://en.wikipedia.org/wiki/InfluxDB).
 
 It offers one services, *squery*. squery provides a list of signals present in its bucket’s measurements.
 
@@ -12,33 +12,32 @@ As with the other systems, this is a prototype that shows that the mbaigo librar
 ## Compiling
 To compile the code, one needs to get the AiGo module
 ```go get github.com/vanDeventer/mbaigo```
-and initialize the *go.mod* file with ``` go mod init github.com/vanDeventer/arrowsys/inflxer``` before running *go mod tidy*.
+and initialize the *go.mod* file with ``` go mod init github.com/vanDeventer/arrowsys/collector``` before running *go mod tidy*.
 
 The reason the *go.mod* file is not included in the repository is that when developing the mbaigo module, a replace statement needs to be included to point to the development code.
 
-To run the code, one just needs to type in ```go run influxer.go thing.go``` within a terminal or at a command prompt.
+To run the code, one just needs to type in ```go run Collector.go thing.go``` within a terminal or at a command prompt.
 
 It is **important** to start the program from within its own directory (and each system should have their own directory) because it looks for its configuration file there. If it does not find it there, it will generate one and shutdown to allow the configuration file to be updated.
 
 The configuration and operation of the system can be verified using the system's web server using a standard web browser, whose address is provided by the system at startup.
 
 To build the software for one's own machine,
-```go build -o influxer```.
+```go build -o Collector```.
 
 
 ## Cross compiling/building
 The following commands enable one to build for different platforms:
-- Intel Mac:  ```GOOS=darwin GOARCH=amd64 go build -o influxer_imac influxer.go thing.go```
-- ARM Mac: ```GOOS=darwin GOARCH=arm64 go build -o influxer_amac influxer.go thing.go```
-- Windows 64: ```GOOS=windows GOARCH=amd64 go build -o influxer.exe influxer.go thing.go```
-- Raspberry Pi 64: ```GOOS=linux GOARCH=arm64 go build -o influxer_rpi64 influxer.go thing.go```
-- (new) Raspberry Pi 32: ```GOOS=linux GOARCH=arm GOARM=7 go build -o influxer_rpi32 influxer.go thing.go```
-- Linux: ```GOOS=linux GOARCH=amd64 go build -o influxer_linux influxer.go thing.go```
+- Intel Mac:  ```GOOS=darwin GOARCH=amd64 go build -o Collector_imac```
+- ARM Mac: ```GOOS=darwin GOARCH=arm64 go build -o Collector_amac ```
+- Windows 64: ```GOOS=windows GOARCH=amd64 go build -o Collector.exe```
+- Raspberry Pi 64: ```GOOS=linux GOARCH=arm64 go build -o Collector_rpi64```
+- Linux: ```GOOS=linux GOARCH=amd64 go build -o Collector_linux```
 
 One can find a complete list of platform by typing *‌go tool dist list* at the command prompt
 
 If one wants to secure copy it to a Raspberry pi,
-`scp influxer_rpi64 jan@192.168.1.6:Desktop/influxer/` where user is the *username* @ the *IP address* of the Raspberry Pi with a relative (to the user's home directory) target *Desktop/influxer/* directory.influxer
+`scp Collector_rpi64 jan@192.168.1.10:rpiExec/Collector/` where user is the *username* @ the *IP address* of the Raspberry Pi with a relative (to the user's home directory) target *rpiExec/Collector/* directory.Collector
 
 
 ## Deployment of the asset

Influxer/influxer.go → collector/collector.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"context"
+	"crypto/x509/pkix"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -34,14 +35,22 @@ func main() {
 	defer cancel()                                          // make sure all paths cancel the context to avoid context leak
 
 	// instantiate the System
-	sys := components.NewSystem("influxer", ctx)
+	sys := components.NewSystem("Collector", ctx)
 
-	// Instatiate the Capusle
+	// Instantiate the husk
 	sys.Husk = &components.Husk{
 		Description: " is a system that ingests time signals into an Influx database",
 		Details:     map[string][]string{"Developer": {"Synecdoque"}},
 		ProtoPort:   map[string]int{"https": 0, "http": 20180, "coap": 0},
 		InfoLink:    "https://github.com/sdoque/systems/tree/main/influxer",
+		DName: pkix.Name{
+			CommonName:         sys.Name,
+			Organization:       []string{"Synecdoque"},
+			OrganizationalUnit: []string{"Systems"},
+			Locality:           []string{"Luleå"},
+			Province:           []string{"Norrbotten"},
+			Country:            []string{"SE"},
+		},
 	}
 
 	// instantiate a template unit asset
@@ -50,17 +59,17 @@ func main() {
 	sys.UAssets[assetName] = &assetTemplate
 
 	// Configure the system
-	rawResources, servsTemp, err := usecases.Configure(&sys)
+	rawResources, err := usecases.Configure(&sys)
 	if err != nil {
 		log.Fatalf("Configuration error: %v\n", err)
 	}
 	sys.UAssets = make(map[string]*components.UnitAsset) // clear the unit asset map (from the template)
 	for _, raw := range rawResources {
-		var uac UnitAsset
+		var uac usecases.ConfigurableAsset
 		if err := json.Unmarshal(raw, &uac); err != nil {
 			log.Fatalf("Resource configuration error: %+v\n", err)
 		}
-		ua, cleanup := newResource(uac, &sys, servsTemp)
+		ua, cleanup := newResource(uac, &sys)
 		defer cleanup()
 		sys.UAssets[ua.GetName()] = &ua
 	}

Influxer/thing.go → collector/thing.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"log"
 	"net/http"
@@ -43,6 +44,15 @@ type MeasurementT struct {
 
 //-------------------------------------Define the unit asset
 
+// Traits are Asset-specific configurable parameters
+type Traits struct {
+	FluxURL      string         `json:"db_url"`
+	Token        string         `json:"token"`
+	Org          string         `json:"organization"`
+	Bucket       string         `json:"bucket"`
+	Measurements []MeasurementT `json:"measurements"`
+}
+
 // UnitAsset type models the unit asset (interface) of the system
 type UnitAsset struct {
 	Name        string              `json:"bucket_name"`
@@ -51,12 +61,8 @@ type UnitAsset struct {
 	ServicesMap components.Services `json:"-"`
 	CervicesMap components.Cervices `json:"-"`
 	//
-	FluxURL      string           `json:"db_url"`
-	Token        string           `json:"token"`
-	Org          string           `json:"organization"`
-	Bucket       string           `json:"bucket"`
-	Measurements []MeasurementT   `json:"measurements"`
-	client       influxdb2.Client // InfluxDB client
+	Traits
+	client influxdb2.Client // InfluxDB client
 }
 
 // GetName returns the name of the Resource.
@@ -79,6 +85,11 @@ func (ua *UnitAsset) GetDetails() map[string][]string {
 	return ua.Details
 }
 
+// GetTraits returns the traits of the Resource.
+func (ua *UnitAsset) GetTraits() any {
+	return ua.Traits
+}
+
 // ensure UnitAsset implements components.UnitAsset (this check is done at during the compilation)
 var _ components.UnitAsset = (*UnitAsset)(nil)
 
@@ -98,15 +109,17 @@ func initTemplate() components.UnitAsset {
 	uat := &UnitAsset{
 		Name:    "demo",
 		Details: map[string][]string{"Database": {"InfluxDB"}},
-		FluxURL: "http://10.0.0.33:8086",
-		Token:   "K1NTWNlToyUNXdii7IwNJ1W-kMsagUr8w1r4cRVYqK-N-R9vVT1MCJwHFBxOgiW85iKiMSsUpbrxQsQZJA8IzA==",
-		Org:     "mbaigo",
-		Bucket:  "demo",
-		Measurements: []MeasurementT{
-			{
-				Name:    "temperature",
-				Details: map[string][]string{"Location": {"Kitchen"}},
-				Period:  3,
+		Traits: Traits{
+			FluxURL: "http://10.0.0.33:8086",
+			Token:   "K1NTWNlToyUNXdii7IwNJ1W-kMsagUr8w1r4cRVYqK-N-R9vVT1MCJwHFBxOgiW85iKiMSsUpbrxQsQZJA8IzA==",
+			Org:     "mbaigo",
+			Bucket:  "demo",
+			Measurements: []MeasurementT{
+				{
+					Name:    "temperature",
+					Details: map[string][]string{"Location": {"Kitchen"}},
+					Period:  3,
+				},
 			},
 		},
 		ServicesMap: components.Services{
@@ -119,19 +132,26 @@ func initTemplate() components.UnitAsset {
 //-------------------------------------Instantiate the unit assets based on configuration
 
 // newResource creates a new UnitAsset resource based on the configuration
-func newResource(uac UnitAsset, sys *components.System, servs []components.Service) (components.UnitAsset, func()) {
+func newResource(configuredAsset usecases.ConfigurableAsset, sys *components.System) (components.UnitAsset, func()) {
 	ua := &UnitAsset{
-		Name:        uac.Name,
+		Name:        configuredAsset.Name,
 		Owner:       sys,
-		Details:     uac.Details,
-		ServicesMap: components.CloneServices(servs),
-		FluxURL:     uac.FluxURL,
-		Token:       uac.Token,
-		Org:         uac.Org,
-		Bucket:      uac.Bucket,
+		Details:     configuredAsset.Details,
+		ServicesMap: usecases.MakeServiceMap(configuredAsset.Services),
+		// FluxURL:     uac.FluxURL,
+		// Token:       uac.Token,
+		// Org:         uac.Org,
+		// Bucket:      uac.Bucket,
 		CervicesMap: make(map[string]*components.Cervice), // Initialize map
 	}
 
+	traits, err := UnmarshalTraits(configuredAsset.Traits)
+	if err != nil {
+		log.Println("Warning: could not unmarshal traits:", err)
+	} else if len(traits) > 0 {
+		ua.Traits = traits[0] // or handle multiple traits if needed
+	}
+
 	if ua.FluxURL == "" || ua.Token == "" || ua.Org == "" || ua.Bucket == "" {
 		log.Fatal("Invalid InfluxDB configuration: missing required parameters")
 	}
@@ -145,7 +165,7 @@ func newResource(uac UnitAsset, sys *components.System, servs []components.Servi
 	// Collect and ingest measurements
 	var wg sync.WaitGroup
 	sProtocols := components.SProtocols(sys.Husk.ProtoPort)
-	for _, measurement := range uac.Measurements {
+	for _, measurement := range ua.Traits.Measurements {
 		// determine the protocols that the system supports
 		cMeasurement := components.Cervice{
 			Definition: measurement.Name,
@@ -173,6 +193,19 @@ func newResource(uac UnitAsset, sys *components.System, servs []components.Servi
 	}
 }
 
+// UnmarshalTraits unmarshals a slice of json.RawMessage into a slice of Traits.
+func UnmarshalTraits(rawTraits []json.RawMessage) ([]Traits, error) {
+	var traitsList []Traits
+	for _, raw := range rawTraits {
+		var t Traits
+		if err := json.Unmarshal(raw, &t); err != nil {
+			return nil, fmt.Errorf("failed to unmarshal trait: %w", err)
+		}
+		traitsList = append(traitsList, t)
+	}
+	return traitsList, nil
+}
+
 //-------------------------------------Unit asset's functionalities
 
 // collectIngest

ds18b20/ds18b20.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"context"
+	"crypto/x509/pkix"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -43,6 +44,14 @@ func main() {
 		Details:     map[string][]string{"Developer": {"Synecdoque"}},
 		ProtoPort:   map[string]int{"https": 0, "http": 20150, "coap": 0},
 		InfoLink:    "https://github.com/sdoque/systems/tree/main/ds18b20",
+		DName: pkix.Name{
+			CommonName:         sys.Name,
+			Organization:       []string{"Synecdoque"},
+			OrganizationalUnit: []string{"Systems"},
+			Locality:           []string{"Luleå"},
+			Province:           []string{"Norrbotten"},
+			Country:            []string{"SE"},
+		},
 	}
 
 	// instantiate a template unit asset
@@ -51,18 +60,20 @@ func main() {
 	sys.UAssets[assetName] = &assetTemplate
 
 	// Configure the system
-	rawResources, servsTemp, err := usecases.Configure(&sys)
+	rawResources, err := usecases.Configure(&sys)
 	if err != nil {
 		log.Fatalf("configuration error: %v\n", err)
 	}
 	sys.UAssets = make(map[string]*components.UnitAsset) // clear the unit asset map (from the template)
+	var cleanups []func()
 	for _, raw := range rawResources {
-		var uac UnitAsset
+		var uac usecases.ConfigurableAsset
 		if err := json.Unmarshal(raw, &uac); err != nil {
 			log.Fatalf("resource configuration error: %+v\n", err)
 		}
-		ua, cleanup := newResource(uac, &sys, servsTemp)
-		defer cleanup()
+		ua, cleanup := newResource(uac, &sys)
+		cleanups = append(cleanups, cleanup)
+		defer cleanup() // ensure cleanup is called when the program exits
 		sys.UAssets[ua.GetName()] = &ua
 	}