rename folder .github t .gitea

fix crash when no bus found in map

.gitea/workflows/build.yml

@@ -0,0 +1,48 @@
+name: Build Go Binaries
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        goos: [linux, windows]
+        goarch: [amd64, arm, arm64]
+        exclude:
+          - goos: windows
+            goarch: arm
+          - goos: windows
+            goarch: arm64
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.24.0'
+
+      - name: Set up Git credentials for private modules
+        run: |
+          git config --global url."https://${{ secrets.GH_PAT }}@github.com/".insteadOf "https://github.com/"
+          echo "GOPRIVATE=github.com/tecamino/*" >> $GITHUB_ENV
+
+      - name: Build binary
+        run: |
+          mkdir -p build
+          if [ "${{ matrix.goos }}" == "windows" ]; then
+            GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go build -ldflags="-s -w" -trimpath -o build/tecamino-driver-artNet-${{ matrix.goos }}-${{ matrix.goarch }}.exe main.go
+          else
+            GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go build -ldflags="-s -w" -trimpath -o build/tecamino-driver-artNet-${{ matrix.goos }}-${{ matrix.goarch }} main.go
+          fi
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: binaries-${{ matrix.goos }}-${{ matrix.goarch }}
+          path: build/

.gitignore

@@ -1,2 +1,5 @@
+.DS_Store
 *.cfg
-*.log
+*.log
+artNetDriver-arm64
+tecamino-driver-artNet-linux-arm64

auth/auth.go

@@ -13,3 +13,11 @@ func GetIDFromAuth(c *gin.Context) (string, error) {
 	}
 	return "", errors.New("authorization token missing")
 }
+
+func GetIDFromQuery(c *gin.Context) (string, error) {
+	auth, exists := c.GetQuery("id")
+	if !exists {
+		return "", errors.New("id missing")
+	}
+	return auth, nil
+}

driver/artNet.go

@@ -3,19 +3,21 @@ package driver
 import (
 	"artNet/cfg"
 	"artNet/models"
-	serverModels "artNet/server/models"
+	ws "artNet/websocket"
+	"encoding/json"
 	"fmt"
 	"path"
 
+	json_data "github.com/tecamino/tecamino-json_data"
 	"github.com/tecamino/tecamino-logger/logging"
 )
 
 type ArtNetDriver struct {
-	Name        string                 `yaml:"driver" json:"driver"`
+	Name          string                 `yaml:"driver" json:"driver"`
-	Buses       map[string]*models.Bus `yaml:"buses,omitempty" json:"buses,omitempty"`
+	Buses         map[string]*models.Bus `yaml:"buses,omitempty" json:"buses,omitempty"`
-	cfgHandler  *cfg.Cfg               `yaml:"-" json:"-"`
+	cfgHandler    *cfg.Cfg               `yaml:"-" json:"-"`
-	Connections serverModels.Clients   `yaml:"-"`
+	Subscriptions models.Subscriptions   `yaml:"-" json:"-"`
-	Log         *logging.Logger        `yaml:"-"`
+	Log           *logging.Logger        `yaml:"-" json:"-"`
 }
 
 // initialize new Art-Net driver
@@ -39,18 +41,16 @@ func NewDriver(cfgDir, name string, debug bool) (*ArtNetDriver, error) {
 
 	logger.Debug("artNet.NewDriver", "initialize "+name+" driver")
 	d := ArtNetDriver{
-		Name:        name,
+		Name:       name,
-		Buses:       make(map[string]*models.Bus),
+		Buses:      make(map[string]*models.Bus),
-		cfgHandler:  cfg.NewCfgHandler(cfgDir, name),
+		cfgHandler: cfg.NewCfgHandler(cfgDir, name),
-		Connections: serverModels.NewClients(),
+		Log:        logger,
-		Log:         logger,
 	}
 
 	if err := d.LoadCfg(); err != nil {
 		logger.Error("artNet.NewDriver.LoadCfg", "error load driver configuration: "+err.Error())
 		return nil, err
 	}
-
 	return &d, nil
 }
 
@@ -61,8 +61,8 @@ func (d *ArtNetDriver) LoadCfg() error {
 		return err
 	}
 
-	for _, b := range d.Buses {
+	for name, b := range d.Buses {
-		d.NewBus(b.Name, b.Ip, *b.Port)
+		d.NewBus(name, b.Ip, *b.Port)
 	}
 	return nil
 }
@@ -70,16 +70,76 @@ func (d *ArtNetDriver) LoadCfg() error {
 // adds new Art-Net bus/interface to driver port 0 = 6454 (default art-net)
 func (d *ArtNetDriver) NewBus(name, ip string, port int) *models.Bus {
 	b := models.NewBus(name, ip, port)
-	b.Start(d.Log)
 	d.Buses[name] = b
 	return b
 }
 
-func (d *ArtNetDriver) SetValue(set models.Set) error {
+func (d *ArtNetDriver) SetValue(bus string, address uint, value uint8) error {
-	if _, ok := d.Buses[set.Bus]; !ok {
+	if _, ok := d.Buses[bus]; !ok {
-		return fmt.Errorf("no bus '%s' found", set.Bus)
+		return fmt.Errorf("no bus '%s' found", bus)
+	}
+	if d.Buses[bus].DMX.Data == nil {
+		return fmt.Errorf("no dmx data on bus '%s' found", bus)
+	}
+	d.Buses[bus].SetDMXData(address, value)
+	return nil
+}
+
+// connect to websocket server and listen to subscriptions
+// ip: ip address of server
+// id: id of driver
+// port: port of server
+func (d *ArtNetDriver) Connect(ip, id string, port uint) error {
+	errChan := make(chan error)
+	client, err := ws.NewClient(ip, id, port)
+	if err != nil {
+		return err
+	}
+
+	client.OnError = func(err error) {
+		d.Log.Error("websocket connection", err)
+		errChan <- err
+	}
+
+	client.OnMessage = func(data []byte) {
+		request := json_data.NewResponse()
+
+		err = json.Unmarshal(data, &request)
+		if err != nil {
+			return
+		}
+
+		if request.Subscribe != nil {
+			d.Subscribe(request.Subscribe...)
+		}
+
+		if request.Publish != nil {
+			d.Publish(request.Publish...)
+		}
+	}
+
+	if err != nil {
+		d.Log.Error("artNet.Connect", err)
+		return err
+	}
+
+	req := json_data.NewRequest()
+	req.AddDriverSubscription(".*", id, 0, true, false, false)
+
+	if err := client.SendRequest(req); err != nil {
+		errChan <- err
+		d.Log.Error("websocket send data", err)
+	}
+
+	for err := range errChan {
+		return err
+	}
+	return nil
+}
+
+// send data to all buses that the send flage is true
+func (d *ArtNetDriver) SendData() {
+	for _, bus := range d.Buses {
+		bus.Send = bus.Reachable
 	}
-	d.Buses[set.Bus].Data.SetValue(set.Address, set.Value)
-
-	return d.Buses[set.Bus].SendData()
 }

driver/bus.go

@@ -8,6 +8,8 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	json_data "github.com/tecamino/tecamino-json_data"
+	json_dataModels "github.com/tecamino/tecamino-json_data/models"
 )
 
 // sends a list of all buses in the driver
@@ -25,124 +27,170 @@ func (d *ArtNetDriver) GetAllBuses(c *gin.Context) {
 }
 
 func (d *ArtNetDriver) CreateBus(c *gin.Context) {
-	_, err := auth.GetIDFromAuth(c)
+	_, err := auth.GetIDFromQuery(c)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "id: " + err.Error()})
+		r := json_data.NewResponse()
+		r.SetError()
+		r.SetMessage(err.Error())
+		c.JSON(http.StatusBadRequest, r)
 		return
 	}
 
-	var payload models.Bus
+	busPayload := models.Bus{}
-
+	if err := busPayload.ParsePayload(c); err != nil {
-	if err := c.BindJSON(&payload); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "json: " + err.Error()})
 		return
 	}
 
-	if payload.Name == "" {
+	if addr := net.ParseIP(busPayload.Ip); addr == nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "bus name missing"})
+		r := json_data.NewResponse()
-		return
+		r.SetError()
-	} else if addr := net.ParseIP(payload.Ip); addr == nil {
+		r.SetMessage("wrong ip '" + busPayload.Ip + "'")
-		c.JSON(http.StatusBadRequest, gin.H{"error": "wrong ip '" + payload.Ip + "'"})
+		c.JSON(http.StatusBadRequest, r)
 		return
 	}
 
-	if _, ok := d.Buses[payload.Name]; ok {
+	if _, ok := d.Buses[busPayload.Name]; ok {
-		c.JSON(http.StatusOK, gin.H{"message": "bus " + payload.Name + " exists already"})
+		r := json_data.NewResponse()
+		r.SetError()
+		r.SetMessage("bus " + busPayload.Name + " exists already")
+		c.JSON(http.StatusOK, r)
 		return
 	}
 
-	bus := d.NewBus(payload.Name, payload.Ip, payload.GetPort())
+	bus := d.NewBus(busPayload.Name, busPayload.Ip, busPayload.GetPort())
 
-	c.JSON(http.StatusOK, gin.H{
+	r := json_data.NewResponse()
-		"message": fmt.Sprintf("bus '%s' successfully created with ip: %s and on port: %d", bus.Name, bus.Ip, bus.GetPort()),
+	r.SetMessage(fmt.Sprintf("bus '%s' successfully created with ip: %s and on port: %d", bus.Name, bus.Ip, bus.GetPort()))
-	})
+	c.JSON(http.StatusOK, r)
 	d.cfgHandler.SaveCfg(*d)
 }
 
 func (d *ArtNetDriver) RemoveBus(c *gin.Context) {
-	_, err := auth.GetIDFromAuth(c)
+	_, err := auth.GetIDFromQuery(c)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "id: " + err.Error()})
+		r := json_data.NewResponse()
+		r.SetError()
+		r.SetMessage("id: " + err.Error())
+		c.JSON(http.StatusBadRequest, r)
 		return
 	}
 
-	var payload models.Bus
+	busPayload := models.Bus{}
-
+	if err := busPayload.ParsePayload(c); err != nil {
-	if err := c.BindJSON(&payload); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "json: " + err.Error()})
 		return
 	}
 
-	if payload.Name == "" {
+	if _, ok := d.Buses[busPayload.Name]; !ok {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "bus name missing"})
+		r := json_dataModels.NewResponse()
-		return
+		r.SetMessage("bus " + busPayload.Name + " not found")
-	}
+		c.JSON(http.StatusBadRequest, r)
-
-	if _, ok := d.Buses[payload.Name]; !ok {
-		c.JSON(http.StatusOK, gin.H{"message": "bus " + payload.Name + " not found"})
-		c.JSON(http.StatusOK, models.JsonResponse{
-			Message: "bus " + payload.Name + " not found"})
 		return
 	} else {
-		delete(d.Buses, payload.Name)
+		delete(d.Buses, busPayload.Name)
 	}
-
+	r := json_dataModels.NewResponse()
-	c.JSON(http.StatusOK, models.JsonResponse{
+	r.SetMessage(fmt.Sprintf("bus '%s' successfully removed", busPayload.Name))
-		Message: fmt.Sprintf("bus '%s' successfully removed", payload.Name),
+	c.JSON(http.StatusOK, r)
-	})
 	d.cfgHandler.SaveCfg(*d)
 }
 
 func (d *ArtNetDriver) Start(c *gin.Context) {
-	_, err := auth.GetIDFromAuth(c)
+	_, err := auth.GetIDFromQuery(c)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "id: " + err.Error()})
+		r := json_data.NewResponse()
+		r.SetError()
+		r.SetMessage("id: " + err.Error())
+		c.JSON(http.StatusBadRequest, r)
 		return
 	}
 
-	var payload models.Bus
+	busPayload := models.Bus{}
-
+	if err := busPayload.ParsePayload(c); err != nil {
-	if err := c.BindJSON(&payload); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "json: " + err.Error()})
 		return
 	}
 
-	if payload.Name == "" {
+	d.Buses[busPayload.Name].Start(d.Log)
-		c.JSON(http.StatusBadRequest, gin.H{"error": "bus name missing"})
-		return
-	}
 
-	d.Buses[payload.Name].Start(d.Log)
+	r := json_dataModels.NewResponse()
-
+	r.SetMessage(fmt.Sprintf("bus '%s' running", busPayload.Name))
-	c.JSON(http.StatusOK, models.JsonResponse{
+	c.JSON(http.StatusOK, r)
-		Message: fmt.Sprintf("bus '%s' running", payload.Name),
-	})
-	d.cfgHandler.SaveCfg(*d)
 }
 
 func (d *ArtNetDriver) Stop(c *gin.Context) {
-	_, err := auth.GetIDFromAuth(c)
+	_, err := auth.GetIDFromQuery(c)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "id: " + err.Error()})
+		r := json_data.NewResponse()
+		r.SetError()
+		r.SetMessage("id: " + err.Error())
+		c.JSON(http.StatusBadRequest, r)
 		return
 	}
 
-	var payload models.Bus
+	busPayload := models.Bus{}
-
+	if err := busPayload.ParsePayload(c); err != nil {
-	if err := c.BindJSON(&payload); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "json: " + err.Error()})
 		return
 	}
 
-	if payload.Name == "" {
+	d.Buses[busPayload.Name].Stop()
-		c.JSON(http.StatusBadRequest, gin.H{"error": "bus name missing"})
-		return
-	}
 
-	d.Buses[payload.Name].Stop()
+	r := json_dataModels.NewResponse()
-
+	r.SetMessage(fmt.Sprintf("bus '%s' stopped", busPayload.Name))
-	c.JSON(http.StatusOK, models.JsonResponse{
+	c.JSON(http.StatusOK, r)
-		Message: fmt.Sprintf("bus '%s' stopped", payload.Name),
+}
-	})
+
-	d.cfgHandler.SaveCfg(*d)
+func (d *ArtNetDriver) Resubscribe(c *gin.Context) {
+	_, err := auth.GetIDFromQuery(c)
+
+	if err != nil {
+		r := json_data.NewResponse()
+		r.SetError()
+		r.SetMessage("id: " + err.Error())
+		c.JSON(http.StatusBadRequest, r)
+		return
+	}
+
+	busPayload := models.Bus{}
+	if err := busPayload.ParsePayload(c); err != nil {
+		return
+	}
+
+	if _, ok := d.Buses[busPayload.Name]; !ok {
+		r := json_dataModels.NewResponse()
+		r.SetMessage("bus " + busPayload.Name + " not found")
+		c.JSON(http.StatusBadRequest, r)
+		return
+	}
+
+	if busPayload.Resubscribe == nil {
+		r := json_dataModels.NewResponse()
+		r.SetMessage("no resubscriptions in request")
+		c.JSON(http.StatusBadRequest, r)
+		return
+	}
+
+	d.Subscribe(*busPayload.Resubscribe...)
+}
+
+func (d *ArtNetDriver) Status(c *gin.Context) {
+	_, err := auth.GetIDFromQuery(c)
+	if err != nil {
+		r := json_data.NewResponse()
+		r.SetError()
+		r.SetMessage("id: " + err.Error())
+		c.JSON(http.StatusBadRequest, r)
+		return
+	}
+
+	busPayload := models.Bus{}
+	if err := busPayload.ParsePayload(c); err != nil {
+		return
+	}
+
+	r := json_dataModels.NewResponse()
+	state := "stopped"
+	if d.Buses[busPayload.Name].Status() {
+		state = "running"
+	}
+	r.SetMessage(fmt.Sprintf("bus '%s' %s", busPayload.Name, state))
+	c.JSON(http.StatusOK, r)
 }

driver/publish.go

@@ -0,0 +1,23 @@
+package driver
+
+import (
+	json_dataModels "github.com/tecamino/tecamino-json_data/models"
+)
+
+func (d *ArtNetDriver) Publish(pubs ...json_dataModels.Publish) error {
+	if d.Subscriptions == nil {
+		return nil
+	}
+
+	for _, pub := range pubs {
+		if subs, ok := (d.Subscriptions)[pub.Uuid]; ok {
+			for _, sub := range subs {
+				for _, address := range sub.Address {
+					d.SetValue(sub.Bus, address, uint8(pub.Value.(float64)))
+				}
+			}
+		}
+	}
+	d.SendData()
+	return nil
+}

driver/subscribe.go

@@ -0,0 +1,26 @@
+package driver
+
+import (
+	"artNet/models"
+
+	json_dataModels "github.com/tecamino/tecamino-json_data/models"
+)
+
+func (d *ArtNetDriver) Subscribe(subs ...json_dataModels.Subscription) {
+	if d.Subscriptions == nil {
+		d.Subscriptions = models.NewSubscriptions()
+	}
+
+	for _, sub := range subs {
+		if drv, ok := (*sub.Drivers)[sub.Driver]; ok {
+			d.Subscriptions.AddSubscription(sub.Uuid, drv)
+			for _, bus := range drv.Buses {
+				for _, address := range bus.Address {
+					d.SetValue(bus.Name, address, uint8(sub.Value.(float64)))
+				}
+			}
+
+		}
+	}
+	d.SendData()
+}

driver/webSocket.go

@@ -1,63 +0,0 @@
-package driver
-
-import (
-	"context"
-	"log"
-	"time"
-
-	"artNet/auth"
-	"artNet/models"
-
-	"github.com/coder/websocket"
-	"github.com/coder/websocket/wsjson"
-	"github.com/gin-gonic/gin"
-)
-
-const (
-	OnCreate = "onCreate"
-	OnChange = "onChange"
-	OnDelete = "onDelete"
-)
-
-func (d *ArtNetDriver) Websocket(c *gin.Context) {
-	id, err := auth.GetIDFromAuth(c)
-	if err != nil {
-		d.Log.Error("artNet.webSocket.Websocket", "error GetIDFromAuth: "+err.Error())
-		log.Println("error id:", err)
-		return
-	}
-	d.Log.Debug("artNet.webSocket.Websocket", "authorization id token: "+id)
-
-	ctx, cancel := context.WithTimeout(c.Request.Context(), 10*time.Minute)
-	defer cancel()
-	conn, err := d.Connections.ConnectRecievingWsConnection(id, c)
-	if err != nil {
-		d.Log.Error("artNet.webSocket.Websocket", "error connecting recieving websocket conection: "+err.Error())
-		return
-	}
-	defer d.Connections.DisconnectRecievingWsConnection(id, websocket.StatusInternalError, "Internal error")
-
-	var request models.JsonData
-	//Read loop
-	for {
-
-		err := wsjson.Read(ctx, conn, &request)
-		if err != nil {
-			d.Log.Error("artNet.webSocket.Websocket", "read error:"+err.Error())
-			log.Println("WebSocket read error:", err)
-			break
-		}
-
-		// Set
-		if request.Set != nil {
-			for _, set := range *request.Set {
-				if err = d.SetValue(set); err != nil {
-					d.Log.Error("artNet.webSocket.Websocket", "set value error"+err.Error())
-					log.Println(err)
-					continue
-				}
-				time.Sleep(23 * time.Millisecond)
-			}
-		}
-	}
-}

go.mod

@@ -5,9 +5,11 @@ go 1.23.0
 toolchain go1.23.8
 
 require (
-	github.com/coder/websocket v1.8.13
 	github.com/gin-gonic/gin v1.10.0
+	github.com/google/uuid v1.6.0
+	github.com/gorilla/websocket v1.5.3
 	github.com/tatsushid/go-fastping v0.0.0-20160109021039-d7bb493dee3e
+	github.com/tecamino/tecamino-json_data v0.0.31
 	github.com/tecamino/tecamino-logger v0.2.0
 	gopkg.in/yaml.v3 v3.0.1
 )

go.sum

@@ -6,8 +6,6 @@ github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/
 github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
 github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
-github.com/coder/websocket v1.8.13 h1:f3QZdXy7uGVz+4uCJy2nTZyM0yTBj8yANEHhqlXZ9FE=
-github.com/coder/websocket v1.8.13/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -30,6 +28,10 @@ github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MG
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
@@ -63,6 +65,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tatsushid/go-fastping v0.0.0-20160109021039-d7bb493dee3e h1:nt2877sKfojlHCTOBXbpWjBkuWKritFaGIfgQwbQUls=
 github.com/tatsushid/go-fastping v0.0.0-20160109021039-d7bb493dee3e/go.mod h1:B4+Kq1u5FlULTjFSM707Q6e/cOHFv0z/6QRoxubDIQ8=
+github.com/tecamino/tecamino-json_data v0.0.31 h1:7zFbANj1Lihr64CCCh3O+9hxxsMcEPniRJZ5NgPrS5Y=
+github.com/tecamino/tecamino-json_data v0.0.31/go.mod h1:LLlyD7Wwqplb2BP4PeO86EokEcTRidlW5MwgPd1T2JY=
 github.com/tecamino/tecamino-logger v0.2.0 h1:NPH/Gg9qRhmVoW8b39i1eXu/LEftHc74nyISpcRG+XU=
 github.com/tecamino/tecamino-logger v0.2.0/go.mod h1:0M1E9Uei/qw3e3WA1x3lBo1eP3H5oeYE7GjYrMahnj8=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=

main.go

@@ -6,6 +6,7 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"time"
 
 	"github.com/gin-gonic/gin"
 )
@@ -14,10 +15,13 @@ const DriverName string = "ArtNetDriver"
 
 func main() {
 	// cli flags
-	port := flag.Uint("port-http", 8110, "http server listening port")
 	cfgDir := flag.String("cfg", "./cfg", "config directory")
 	workingDir := flag.String("workingDirectory", ".", "current working directory")
+	serverIp := flag.String("serverIp", "127.0.0.1", "ip address of server")
+	serverPort := flag.Uint("serverPort", 8100, "port of server")
+	wsPort := flag.Uint("port", 8200, "websocket port")
 	debug := flag.Bool("debug", false, "debug logging")
+	start := flag.Bool("start", false, "starts all buses on startup")
 	flag.Parse()
 
 	//change working directory only if value is given
@@ -38,21 +42,42 @@ func main() {
 
 	//set routes
 	artNetDriver.Log.Debug("main", "setting routes")
-	s.Routes.GET("/ws", artNetDriver.Websocket)
 	s.Routes.GET("/buses/all", artNetDriver.GetAllBuses)
 	s.Routes.POST("/buses/create", artNetDriver.CreateBus)
 	s.Routes.POST("/buses/remove", artNetDriver.RemoveBus)
 	s.Routes.POST("/buses/start", artNetDriver.Start)
+	s.Routes.POST("/buses/status", artNetDriver.Status)
 	s.Routes.POST("/buses/stop", artNetDriver.Stop)
+	s.Routes.POST("/buses/resubscribe", artNetDriver.Resubscribe)
 
 	s.Routes.GET("/", func(c *gin.Context) {
 		c.String(200, "ArtNet Driver WebSocket Server is running!")
 	})
 
-	artNetDriver.Log.Info("main", fmt.Sprintf("listen on %d", *port))
+	go func() {
-	// start http server
+		if err := s.ServeHttp(*wsPort); err != nil {
-	if err := s.ServeHttp(*port); err != nil {
+			artNetDriver.Log.Error("main", err)
-		artNetDriver.Log.Error("main", "error http server "+err.Error())
+		}
-		panic(err)
+	}()
+
+	artNetDriver.Log.Info("main", fmt.Sprintf("connect to server  ws://%s:%d with id %s", *serverIp, *serverPort, DriverName))
+
+	if *start {
+		for busName, bus := range artNetDriver.Buses {
+			artNetDriver.Log.Info("main", fmt.Sprintf("starting bus %s", busName))
+			// start bus and listen to subscriptions
+			bus.Start(artNetDriver.Log)
+		}
 	}
+
+	// connect to server
+	for {
+		if err := artNetDriver.Connect(*serverIp, DriverName, *serverPort); err != nil {
+			artNetDriver.Log.Error("main", err)
+		}
+
+		artNetDriver.Log.Info("main", "next reconnecting attempt in 10 seconds")
+		time.Sleep(10 * time.Second)
+	}
+
 }

models/bus.go

@@ -2,11 +2,17 @@ package models
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net"
+	"net/http"
+	"sync"
 	"time"
 
+	"github.com/gin-gonic/gin"
 	"github.com/tatsushid/go-fastping"
+	json_data "github.com/tecamino/tecamino-json_data"
+	json_dataModels "github.com/tecamino/tecamino-json_data/models"
 	"github.com/tecamino/tecamino-logger/logging"
 )
 
@@ -17,12 +23,15 @@ const (
 
 // Art-Net Interface
 type Bus struct {
-	Name      string             `yaml:"name" json:"name"`
+	Name        string                          `yaml:"name" json:"name"`
-	Ip        string             `yaml:"ip" json:"ip"`
+	Ip          string                          `yaml:"ip" json:"ip"`
-	Port      *int               `yaml:"port" json:"port,omitempty"`
+	Port        *int                            `yaml:"port" json:"port,omitempty"`
-	Data      *DMX               `yaml:"-" json:"-"`
+	DMX         *DMX                            `yaml:"-" json:"-"`
-	Watchdog  context.CancelFunc `yaml:"-" json:"-"`
+	Resubscribe *[]json_dataModels.Subscription `yaml:"-" json:"resubscribe"`
-	Reachable bool               `yaml:"-" json:"-"`
+	Watchdog    context.CancelFunc              `yaml:"-" json:"-"`
+	mu          sync.Mutex                      `yaml:"-" json:"-"`
+	Reachable   bool                            `yaml:"-" json:"-"`
+	Send        bool                            `yaml:"-" json:"-"`
 }
 
 // adds new Art-Net interface to driver port 0 = 6454 (default art-net)
@@ -35,7 +44,7 @@ func NewBus(name, ip string, port int) *Bus {
 		Name: name,
 		Ip:   ip,
 		Port: &port,
-		Data: NewDMXUniverse(),
+		DMX:  NewDMXUniverse(),
 	}
 	return &i
 }
@@ -83,7 +92,7 @@ func (b *Bus) Poll(interval time.Duration) error {
 			}
 		}()
 
-		_, err = conn.Write(NewArtNetPackage(b.Data))
+		_, err = conn.Write(NewArtNetPackage(b.DMX))
 		if err != nil {
 			return err
 		}
@@ -96,13 +105,13 @@ func (b *Bus) Poll(interval time.Duration) error {
 }
 
 // start bus
-func (b *Bus) Start(log *logging.Logger) {
+func (b *Bus) Start(log *logging.Logger) error {
 	var ctx context.Context
 	ctx, b.Watchdog = context.WithCancel(context.Background())
 
 	go func() {
 		var interval time.Duration = 10 * time.Second
-		log.Info("bus.Start", fmt.Sprintf("device:%s ip:%s watchdog stopped", b.Name, b.Ip))
+		log.Info("bus.Start", fmt.Sprintf("device:%s ip:%s watchdog starting", b.Name, b.Ip))
 		for {
 			select {
 			case <-ctx.Done():
@@ -119,6 +128,8 @@ func (b *Bus) Start(log *logging.Logger) {
 					interval = 5 * time.Second
 				} else {
 					b.Reachable = true
+					// send data as a heartbeat for she ArtNet Protocol
+					b.Send = true
 					log.Info("bus.Start", fmt.Sprintf("device:%s ip:%s watchdog running", b.Name, b.Ip))
 					interval = 30 * time.Second
 				}
@@ -126,21 +137,7 @@ func (b *Bus) Start(log *logging.Logger) {
 			}
 		}
 	}()
-}
 
-// stop bus
-func (b *Bus) Stop() {
-	if b.Watchdog != nil {
-		b.Watchdog()
-	}
-}
-
-// send dmx data
-func (b *Bus) SendData() error {
-	if !b.Reachable {
-		return nil
-	}
-	// Send packet over UDP
 	conn, err := net.DialUDP("udp", nil, &net.UDPAddr{
 		IP:   net.ParseIP(b.Ip),
 		Port: *b.Port,
@@ -149,11 +146,80 @@ func (b *Bus) SendData() error {
 	if err != nil {
 		return err
 	}
-	defer conn.Close()
 
-	_, err = conn.Write(NewArtNetPackage(b.Data))
+	go func() {
+		ticker := time.NewTicker(23 * time.Millisecond)
 
-	return err
+		defer func() {
+			b.Send = false
+			conn.Close()
+			ticker.Stop()
+		}()
+
+		for range ticker.C {
+
+			if !b.Send {
+				continue
+			}
+
+			b.Send = false
+
+			b.mu.Lock()
+			data := NewDMXUniverse()
+			copy(data.Data, b.DMX.GetDMXData())
+			b.mu.Unlock()
+
+			_, err = conn.Write(NewArtNetPackage(data))
+			if err != nil {
+				log.Error("bus.Start", err)
+				return
+			}
+		}
+
+	}()
+	return nil
+}
+
+// stop bus
+func (b *Bus) Stop() {
+	if b.Watchdog != nil {
+		//cancels context
+		b.Watchdog()
+
+		b.Send = false
+	}
+}
+
+// status bus
+func (b *Bus) Status() bool {
+	return b.Watchdog != nil
+}
+
+func (b *Bus) ParsePayload(c *gin.Context) error {
+
+	if err := c.BindJSON(b); err != nil {
+		r := json_data.NewResponse()
+		r.SetError()
+		r.SetMessage("json: " + err.Error())
+		c.JSON(http.StatusBadRequest, r)
+		return err
+	}
+
+	if b.Name == "" {
+		r := json_data.NewResponse()
+		r.SetError()
+		r.SetMessage("bus name missing")
+		c.JSON(http.StatusBadRequest, r)
+		return errors.New("bus name missing")
+	}
+	return nil
+}
+
+func (b *Bus) SetDMXData(channel uint, value uint8) error {
+	fmt.Println(100, channel, value)
+	b.DMX.SetValue(channel, value)
+	b.Send = true
+	return nil
 }
 
 func isUDPReachable(ip string) (recieved bool, err error) {

models/dmx.go

@@ -1,12 +1,29 @@
 package models
 
-type DMX []byte
+import (
+	"sync"
+)
+
+type DMX struct {
+	Data []byte
+	mu   sync.Mutex
+}
 
 func NewDMXUniverse() *DMX {
-	dmx := make(DMX, 512)
+	return &DMX{
-	return &dmx
+		Data: make([]byte, 512),
+	}
+}
+
+func (d *DMX) GetDMXData() (data []byte) {
+	d.mu.Lock()
+	data = d.Data
+	d.mu.Unlock()
+	return
 }
 
 func (d *DMX) SetValue(channel uint, value uint8) {
-	(*d)[channel] = value
+	d.mu.Lock()
+	d.Data[channel] = value
+	d.mu.Unlock()
 }

models/jsonData.go

@@ -1,23 +0,0 @@
-package models
-
-type JsonData struct {
-	Set    *[]Set `json:"set,omitempty"`
-	Create *[]Bus `json:"create,omitempty"`
-}
-
-func NewRequest() *JsonData {
-	return &JsonData{}
-
-}
-
-func (r *JsonData) AddSet(bus string, address uint, value uint8) {
-	if r.Set == nil {
-		r.Set = &[]Set{}
-	}
-
-	*r.Set = append(*r.Set, Set{
-		Bus:     bus,
-		Address: address,
-		Value:   value,
-	})
-}

models/jsonResponse.go

@@ -1,7 +0,0 @@
-package models
-
-type JsonResponse struct {
-	Error   bool   `json:"error,omitempty"`
-	Message string `json:"message,omitempty"`
-	Data    string `json:"data,omitempty"`
-}

models/package.go

@@ -16,14 +16,14 @@ type Package []byte
 func NewArtNetPackage(data *DMX) Package {
 	// Build ArtDMX packet
 	packet := &bytes.Buffer{}
-	packet.WriteString(protocolID)                             // Art-Net ID
+	packet.WriteString(protocolID)                                 // Art-Net ID
-	binary.Write(packet, binary.LittleEndian, uint16(opCode))  // OpCode (OpDmx)
+	binary.Write(packet, binary.LittleEndian, uint16(opCode))      // OpCode (OpDmx)
-	packet.WriteByte(0x00)                                     // Protocol Version High
+	packet.WriteByte(0x00)                                         // Protocol Version High
-	packet.WriteByte(14)                                       // Protocol Version Low (14 for Art-Net 4)
+	packet.WriteByte(14)                                           // Protocol Version Low (14 for Art-Net 4)
-	packet.WriteByte(0x00)                                     // Sequence
+	packet.WriteByte(0x00)                                         // Sequence
-	packet.WriteByte(0x00)                                     // Physical
+	packet.WriteByte(0x00)                                         // Physical
-	binary.Write(packet, binary.BigEndian, uint16(0))          // Universe (net:subuni, usually 0)
+	binary.Write(packet, binary.BigEndian, uint16(0))              // Universe (net:subuni, usually 0)
-	binary.Write(packet, binary.BigEndian, uint16(len(*data))) // Length
+	binary.Write(packet, binary.BigEndian, uint16(len(data.Data))) // Length
-	packet.Write(*data)
+	packet.Write(data.Data)
 	return packet.Bytes()
 }

models/subscriptions.go

@@ -0,0 +1,27 @@
+package models
+
+import (
+	"github.com/google/uuid"
+	json_dataModels "github.com/tecamino/tecamino-json_data/models"
+)
+
+type Subscriptions map[uuid.UUID][]Subscription
+
+type Subscription struct {
+	Bus     string
+	Address []uint
+}
+
+func NewSubscriptions() Subscriptions {
+	return make(Subscriptions)
+}
+
+func (s *Subscriptions) AddSubscription(uid uuid.UUID, drv *json_dataModels.Driver) {
+	subs := []Subscription{}
+	for _, bus := range drv.Buses {
+		sub := Subscription{Bus: bus.Name}
+		sub.Address = append(sub.Address, bus.Address...)
+		subs = append(subs, sub)
+	}
+	(*s)[uid] = subs
+}

server/models/clients.go

@@ -1,51 +0,0 @@
-package models
-
-import (
-	"fmt"
-
-	"github.com/coder/websocket"
-	"github.com/gin-gonic/gin"
-)
-
-type Clients map[string]Client
-
-type Client struct {
-	Connected *bool           `json:"connected"`
-	SndConn   *websocket.Conn `json:"-"` //sending connection
-	RvcConn   *websocket.Conn `json:"-"` // revieving connection
-}
-
-func NewClients() Clients {
-	return make(Clients)
-}
-
-// Connect a recieving websocket connection
-func (c *Clients) ConnectRecievingWsConnection(id string, ctx *gin.Context) (*websocket.Conn, error) {
-	conn, err := websocket.Accept(ctx.Writer, ctx.Request, &websocket.AcceptOptions{
-		OriginPatterns: []string{"*"},
-	})
-
-	if err != nil {
-		return nil, fmt.Errorf("error accept websocket client: %s", err)
-	}
-
-	b := true
-	(*c)[id] = Client{
-		Connected: &b,
-		RvcConn:   conn,
-	}
-	return conn, nil
-}
-
-func (c *Clients) RemoveClient(id string) {
-	delete(*c, id)
-}
-
-func (c *Clients) GetClientPointer(id string) *bool {
-	return (*c)[id].Connected
-}
-
-func (c *Clients) DisconnectRecievingWsConnection(id string, code websocket.StatusCode, reason string) {
-	*(*c)[id].Connected = false
-	(*c)[id].RvcConn.Close(code, reason)
-}

server/server.go

@@ -1,9 +1,8 @@
 package server
 
 import (
-	"fmt"
-
 	"artNet/cert"
+	"fmt"
 
 	"github.com/gin-gonic/gin"
 )
@@ -12,6 +11,17 @@ type Server struct {
 	Routes *gin.Engine
 }
 
+type Send struct {
+	Set []Set `json:"subscribe"`
+}
+
+type Set struct {
+	Path     string `json:"path"`
+	OnChange bool   `json:"onChange"`
+	Depth    int    `json:"depth"`
+	Driver   string `json:"driver"`
+}
+
 // Initialize new websocket server
 func NewServer() *Server {
 	return &Server{

websocket/client.go

@@ -0,0 +1,194 @@
+package websocket
+
+import (
+	"encoding/json"
+	"fmt"
+	"log"
+	"time"
+
+	"github.com/gorilla/websocket"
+	json_dataModels "github.com/tecamino/tecamino-json_data/models"
+)
+
+const (
+	// Time allowed to write a message to the peer.
+	writeWait = 40 * time.Second
+
+	// Time allowed to read the next pong message from the peer.
+	pongWait = 40 * time.Second
+)
+
+type Client struct {
+	ip         string
+	port       uint
+	Connected  bool
+	conn       *websocket.Conn
+	OnOpen     func()
+	OnMessage  func(data []byte)
+	OnClose    func(code int, reason string)
+	OnError    func(err error)
+	OnPing     func()
+	OnPong     func()
+	send       chan []byte
+	unregister chan []byte
+}
+
+// Connect to websocket server
+// ip: ip address of server
+func NewClient(ip, id string, port uint) (*Client, error) {
+	url := fmt.Sprintf("ws://%s:%d/ws?id=%s", ip, port, id)
+	c := &Client{
+		ip:         ip,
+		port:       port,
+		Connected:  true,
+		send:       make(chan []byte, 256),
+		unregister: make(chan []byte, 256),
+	}
+
+	dialer := websocket.DefaultDialer
+	conn, resp, err := dialer.Dial(url, nil)
+	if err != nil {
+		if c.OnError != nil {
+			c.OnError(err)
+		}
+		return nil, fmt.Errorf("dial error %v (status %v)", err, resp)
+	}
+	c.conn = conn
+
+	//Setup control handlers
+	conn.SetPingHandler(func(appData string) error {
+		if c.OnPing != nil {
+			c.OnPing()
+		}
+		conn.SetReadDeadline(time.Now().Add(pongWait))
+		conn.SetWriteDeadline(time.Now().Add(pongWait))
+		if err := conn.WriteControl(websocket.PongMessage, []byte(appData), time.Now().Add(2*pongWait)); err != nil {
+			c.OnError(err)
+			return err
+		}
+		return nil
+	})
+
+	conn.SetPongHandler(func(appData string) error {
+		conn.SetReadDeadline(time.Now().Add(pongWait))
+		if c.OnPong != nil {
+			c.OnPong()
+		}
+		return nil
+	})
+
+	// Start reading messages from client
+	go c.Read()
+	go c.Write()
+	return c, nil
+}
+
+func (c *Client) Read() {
+	if c.OnOpen != nil {
+		c.OnOpen()
+	}
+
+	c.conn.SetReadDeadline(time.Now().Add(pongWait))
+
+	for c.Connected {
+		msgType, msg, err := c.conn.ReadMessage()
+		c.conn.SetReadDeadline(time.Now().Add(pongWait))
+		if err != nil {
+			c.handleError(fmt.Errorf("read error (ip:%s): %w", c.ip, err))
+			return
+		}
+
+		switch msgType {
+		case websocket.CloseMessage:
+			c.Close(websocket.CloseNormalClosure, "Client closed")
+			return
+		case websocket.TextMessage:
+			if c.OnMessage != nil {
+				c.OnMessage(msg)
+			} else {
+				log.Printf("Received message but no handler set (ip:%s): %s", c.ip, string(msg))
+			}
+		default:
+			log.Printf("Unhandled message type %d (ip:%s)", msgType, c.ip)
+		}
+	}
+}
+
+func (c *Client) Write() {
+	defer c.conn.Close()
+
+	c.conn.SetWriteDeadline(time.Now().Add(writeWait))
+	for {
+		select {
+		case message, ok := <-c.send:
+			c.conn.SetWriteDeadline(time.Now().Add(writeWait))
+			if !ok {
+				// The hub closed the channel.
+				if err := c.conn.WriteMessage(websocket.CloseMessage, []byte("ping")); err != nil {
+					c.handleError(err)
+					return
+				}
+				c.handleError(fmt.Errorf("server %s closed channel", c.ip))
+				return
+			} else {
+				if err := c.conn.WriteMessage(websocket.TextMessage, message); err != nil {
+					c.handleError(err)
+					return
+				}
+			}
+		case message := <-c.unregister:
+			c.conn.WriteMessage(websocket.CloseMessage, message)
+			c.Connected = false
+			close(c.send)
+			close(c.unregister)
+			return
+		}
+
+	}
+}
+
+func (c *Client) SendRequest(req *json_dataModels.Request) error {
+	if !c.Connected {
+		return nil
+	}
+
+	data, err := json.Marshal(*req)
+	if err != nil {
+		return err
+	}
+	c.send <- data
+	return nil
+}
+
+func (c *Client) ReadJsonData(data []byte) (json_dataModels.Response, error) {
+	var resp json_dataModels.Response
+	err := json.Unmarshal(data, &resp)
+	return resp, err
+}
+
+// Close connection to websocket server
+func (c *Client) Close(code int, reason string) error {
+	closeMsg := websocket.FormatCloseMessage(code, reason)
+	select {
+	case c.unregister <- closeMsg: // Attempt to send
+	default: // If the channel is full, this runs
+		return fmt.Errorf("attempt close client socket failed")
+	}
+	if c.OnClose != nil {
+		c.OnClose(code, reason)
+	}
+	return nil
+}
+
+func (c *Client) handleError(err error) {
+	if c.OnError != nil {
+		c.OnError(err)
+	}
+	if err := c.Close(websocket.CloseInternalServerErr, err.Error()); err != nil {
+		if c.OnError != nil {
+			c.OnError(err)
+		} else {
+			log.Println("error:", err)
+		}
+	}
+}