add status server for driver state

fix crash when no bus found in map

.gitea/workflows/build.yml

@@ -0,0 +1,89 @@
+name: Build ArtNet Driver
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  APP_NAME: tecamino-driver-artNet
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        include:
+          - os: windows
+            arch: amd64
+            ext: .exe
+          - os: linux
+            arch: amd64
+            ext: ""
+          - os: linux
+            arch: arm64
+            ext: ""
+          - os: linux
+            arch: arm
+            arm_version: 6
+            ext: ""
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Ensure latest Go is installed in /data/go
+        run: |
+          export GOROOT=/data/go/go
+          export PATH=$GOROOT/bin:$PATH
+          export GOCACHE=/data/gocache
+          export GOMODCACHE=/data/gomodcache
+          mkdir -p $GOCACHE $GOMODCACHE
+
+          if [ ! -x "$GOROOT/bin/go" ]; then
+            echo "Go not found in $GOROOT, downloading latest stable..."
+            
+            GO_VERSION=$(curl -s https://go.dev/VERSION?m=text | head -n1)
+            echo "Latest version is $GO_VERSION"
+
+            mkdir -p /data/go
+            curl -sSL "https://go.dev/dl/${GO_VERSION}.linux-amd64.tar.gz" -o /tmp/go.tar.gz
+            tar -C /data/go -xzf /tmp/go.tar.gz
+          else
+            echo "Using cached Go from $GOROOT"
+          fi
+
+          go version
+
+      - name: Download Go dependencies
+        run: |
+          export GOROOT=/data/go/go
+          export PATH=$GOROOT/bin:$PATH
+          export GOCACHE=/data/gocache
+          export GOMODCACHE=/data/gomodcache
+          mkdir -p $GOCACHE $GOMODCACHE
+          go mod download
+
+      - name: Build binary
+        run: |
+          export GOROOT=/data/go/go
+          export PATH=$GOROOT/bin:$PATH
+          export GOCACHE=/data/gocache
+          export GOMODCACHE=/data/gomodcache
+          mkdir -p $GOCACHE $GOMODCACHE
+
+          OUTPUT="bin/${APP_NAME}-${{ matrix.os }}-${{ matrix.arch }}"
+          if [ -n "${{ matrix.arm_version }}" ]; then
+            OUTPUT="${OUTPUT}v${{ matrix.arm_version }}"
+            export GOARM=${{ matrix.arm_version }}
+          fi
+          OUTPUT="${OUTPUT}${{ matrix.ext }}"
+          echo "Building $OUTPUT"
+          GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} go build -ldflags="-s -w" -trimpath -o "$OUTPUT"
+        shell: bash
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.APP_NAME }}-${{ matrix.os }}-${{ matrix.arch }}
+          path: bin/

.gitignore

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

client/client.go

@@ -1,66 +0,0 @@
-package client
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/coder/websocket"
-	"github.com/coder/websocket/wsjson"
-	json_data "github.com/tecamino/tecamino-json_data"
-	json_dataModels "github.com/tecamino/tecamino-json_data/models"
-	"github.com/tecamino/tecamino-logger/logging"
-)
-
-type Client struct {
-	conn   *websocket.Conn
-	ctx    context.Context
-	cancel context.CancelFunc
-	log    *logging.Logger
-}
-
-// Initialize new websocket server
-func NewClient(log *logging.Logger) *Client {
-	c := Client{
-		log: log,
-	}
-	c.ctx, c.cancel = context.WithCancel(context.Background())
-	return &c
-}
-
-func (c *Client) Connect(ip, id string, port uint) (err error) {
-	c.conn, _, err = websocket.Dial(c.ctx, fmt.Sprintf("ws://%s:%d/ws?id=%s", ip, port, id), nil)
-	return
-}
-
-func (c *Client) Disconnect() {
-	c.cancel()
-}
-func (c *Client) Subscribe(id string) error {
-
-	req := json_data.NewRequest()
-	req.AddDriverSubscription(".*", id, 0, true, false, false)
-	if err := wsjson.Write(c.ctx, c.conn, req); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (c *Client) ReadJsonData() (response json_dataModels.Response, err error) {
-
-	err = wsjson.Read(c.ctx, c.conn, &response)
-	if err != nil {
-		code := websocket.CloseStatus(err)
-
-		switch code {
-		case websocket.StatusNormalClosure,
-			websocket.StatusGoingAway,
-			websocket.StatusNoStatusRcvd:
-			c.log.Info("webSocket.readJsonData", fmt.Sprintf("WebSocket closed: %v (code: %v)\n", err, code))
-			return
-		default:
-			c.log.Error("webSocket.readJsonData", fmt.Sprintf("WebSocket read error: %v (code: %v)\n", err, code))
-			return
-		}
-	}
-	return
-}

driver/artNet.go

@@ -2,19 +2,24 @@ package driver
 
 import (
 	"artNet/cfg"
-	"artNet/client"
 	"artNet/models"
+	ws "artNet/websocket"
+	"encoding/json"
+	"errors"
 	"fmt"
 	"path"
 
-	"github.com/tecamino/tecamino-logger/logging"
+	"gitea.tecamino.com/paadi/statusServer"
+	json_data "gitea.tecamino.com/paadi/tecamino-json_data"
+	"gitea.tecamino.com/paadi/tecamino-logger/logging"
+	"github.com/gin-gonic/gin"
 )
 
 type ArtNetDriver struct {
+	statusServer  *statusServer.StatusClient `yaml:"-" json:"-"`
 	Name          string                     `yaml:"driver" json:"driver"`
 	Buses         map[string]*models.Bus     `yaml:"buses,omitempty" json:"buses,omitempty"`
 	cfgHandler    *cfg.Cfg                   `yaml:"-" json:"-"`
-	Conn          *client.Client         `yaml:"-" json:"-"`
 	Subscriptions models.Subscriptions       `yaml:"-" json:"-"`
 	Log           *logging.Logger            `yaml:"-" json:"-"`
 }
@@ -22,7 +27,7 @@ type ArtNetDriver struct {
 // initialize new Art-Net driver
 // cfgDir config directory
 // name name of driver
-func NewDriver(cfgDir, name string, debug bool) (*ArtNetDriver, error) {
+func NewDriver(cfgDir, name, ip string, port uint, debug bool) (*ArtNetDriver, error) {
 	if cfgDir == "" {
 		cfgDir = "./cfg"
 	}
@@ -38,8 +43,14 @@ func NewDriver(cfgDir, name string, debug bool) (*ArtNetDriver, error) {
 		panic(err)
 	}
 
+	statusS, err := statusServer.NewStatusClient(name, ip, "api/status", port, false)
+	if err != nil {
+		return nil, errors.New("status server: " + err.Error())
+	}
+
 	logger.Debug("artNet.NewDriver", "initialize "+name+" driver")
 	d := ArtNetDriver{
+		statusServer: statusS,
 		Name:         name,
 		Buses:        make(map[string]*models.Bus),
 		cfgHandler:   cfg.NewCfgHandler(cfgDir, name),
@@ -50,9 +61,6 @@ func NewDriver(cfgDir, name string, debug bool) (*ArtNetDriver, error) {
 		logger.Error("artNet.NewDriver.LoadCfg", "error load driver configuration: "+err.Error())
 		return nil, err
 	}
-
-	d.Conn = client.NewClient(logger)
-
 	return &d, nil
 }
 
@@ -63,8 +71,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
 }
@@ -80,35 +88,86 @@ func (d *ArtNetDriver) SetValue(bus string, address uint, value uint8) error {
 	if _, ok := d.Buses[bus]; !ok {
 		return fmt.Errorf("no bus '%s' found", bus)
 	}
-	d.Buses[bus].Data.SetValue(address, value)
+	if d.Buses[bus].DMX.Data == nil {
-
+		return fmt.Errorf("no dmx data on bus '%s' found", bus)
-	return d.Buses[bus].SendData()
+	}
+	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 {
-	if err := d.Conn.Connect(ip, id, port); err != nil {
+	topic := "status/" + id
-		return err
-	}
-	defer d.Conn.Disconnect()
 
-	if err := d.Conn.Subscribe(id); err != nil {
+	d.statusServer.Publish(topic, gin.H{
-		return err
+		"state": "Starting",
-	}
+	})
-
+	defer d.statusServer.Publish(topic, gin.H{
-	for {
+		"state": "Stopped",
-		respond, err := d.Conn.ReadJsonData()
+	})
+	errChan := make(chan error)
+	client, err := ws.NewClient(ip, id, port)
 	if err != nil {
+		d.statusServer.Publish(topic, gin.H{
+			"state":   "Error",
+			"message": err.Error()})
 		return err
 	}
 
-		d.Subscribe(respond.Subscribe...)
+	client.OnError = func(err error) {
+		d.statusServer.Publish(topic, gin.H{"state": "Error", "message": err.Error()})
+		d.Log.Error("websocket connection", err)
+		errChan <- err
+	}
 
-		for _, pub := range respond.Publish {
+	client.OnMessage = func(data []byte) {
-			if sub, ok := d.Subscriptions[pub.Uuid]; ok {
+		request := json_data.NewResponse()
-				if err := d.SetValue(sub.Bus, sub.Address, uint8(pub.Value.(float64))); err != nil {
+
-					d.Log.Info("artNet.Connect", err.Error())
+		err = json.Unmarshal(data, &request)
+		if err != nil {
+			d.statusServer.Publish(topic, gin.H{"state": "Error", "message": err.Error()})
+			return
+		}
+
+		if request.Subscribe != nil {
+			d.Subscribe(request.Subscribe...)
+		}
+
+		if request.Publish != nil {
+			d.Publish(request.Publish...)
 		}
 	}
+
+	if err != nil {
+		d.statusServer.Publish("error", err.Error())
+		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)
+	}
+
+	d.statusServer.Publish(topic, gin.H{"state": "Running"})
+
+	for err := range errChan {
+		d.statusServer.Publish(topic, gin.H{"state": "Error", "message": err.Error()})
+		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
 	}
 }

driver/bus.go

@@ -7,9 +7,9 @@ import (
 	"net"
 	"net/http"
 
+	json_data "gitea.tecamino.com/paadi/tecamino-json_data"
+	json_dataModels "gitea.tecamino.com/paadi/tecamino-json_data/models"
 	"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
@@ -30,7 +30,8 @@ func (d *ArtNetDriver) CreateBus(c *gin.Context) {
 	_, err := auth.GetIDFromQuery(c)
 	if err != nil {
 		r := json_data.NewResponse()
-		r.SendError(err.Error())
+		r.SetError()
+		r.SetMessage(err.Error())
 		c.JSON(http.StatusBadRequest, r)
 		return
 	}
@@ -42,14 +43,16 @@ func (d *ArtNetDriver) CreateBus(c *gin.Context) {
 
 	if addr := net.ParseIP(busPayload.Ip); addr == nil {
 		r := json_data.NewResponse()
-		r.SendError("wrong ip '" + busPayload.Ip + "'")
+		r.SetError()
+		r.SetMessage("wrong ip '" + busPayload.Ip + "'")
 		c.JSON(http.StatusBadRequest, r)
 		return
 	}
 
 	if _, ok := d.Buses[busPayload.Name]; ok {
 		r := json_data.NewResponse()
-		r.SendError("bus " + busPayload.Name + " exists already")
+		r.SetError()
+		r.SetMessage("bus " + busPayload.Name + " exists already")
 		c.JSON(http.StatusOK, r)
 		return
 	}
@@ -57,7 +60,7 @@ func (d *ArtNetDriver) CreateBus(c *gin.Context) {
 	bus := d.NewBus(busPayload.Name, busPayload.Ip, busPayload.GetPort())
 
 	r := json_data.NewResponse()
-	r.SendMessage(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)
 }
@@ -66,7 +69,8 @@ func (d *ArtNetDriver) RemoveBus(c *gin.Context) {
 	_, err := auth.GetIDFromQuery(c)
 	if err != nil {
 		r := json_data.NewResponse()
-		r.SendError("id: " + err.Error())
+		r.SetError()
+		r.SetMessage("id: " + err.Error())
 		c.JSON(http.StatusBadRequest, r)
 		return
 	}
@@ -78,14 +82,14 @@ func (d *ArtNetDriver) RemoveBus(c *gin.Context) {
 
 	if _, ok := d.Buses[busPayload.Name]; !ok {
 		r := json_dataModels.NewResponse()
-		r.SendMessage("bus " + busPayload.Name + " not found")
+		r.SetMessage("bus " + busPayload.Name + " not found")
-		c.JSON(http.StatusOK, r)
+		c.JSON(http.StatusBadRequest, r)
 		return
 	} else {
 		delete(d.Buses, busPayload.Name)
 	}
 	r := json_dataModels.NewResponse()
-	r.SendMessage(fmt.Sprintf("bus '%s' successfully removed", busPayload.Name))
+	r.SetMessage(fmt.Sprintf("bus '%s' successfully removed", busPayload.Name))
 	c.JSON(http.StatusOK, r)
 	d.cfgHandler.SaveCfg(*d)
 }
@@ -94,29 +98,31 @@ func (d *ArtNetDriver) Start(c *gin.Context) {
 	_, err := auth.GetIDFromQuery(c)
 	if err != nil {
 		r := json_data.NewResponse()
-		r.SendError("id: " + err.Error())
+		r.SetError()
+		r.SetMessage("id: " + err.Error())
 		c.JSON(http.StatusBadRequest, r)
 		return
 	}
 
 	busPayload := models.Bus{}
-	if busPayload.ParsePayload(c); err != nil {
+	if err := busPayload.ParsePayload(c); err != nil {
 		return
 	}
 
 	d.Buses[busPayload.Name].Start(d.Log)
+	d.statusServer.Publish(fmt.Sprintf("status/%s/%s", d.Name, busPayload.Name), "Running")
 
 	r := json_dataModels.NewResponse()
-	r.SendMessage(fmt.Sprintf("bus '%s' running", busPayload.Name))
+	r.SetMessage(fmt.Sprintf("bus '%s' running", busPayload.Name))
 	c.JSON(http.StatusOK, r)
-	d.cfgHandler.SaveCfg(*d)
 }
 
 func (d *ArtNetDriver) Stop(c *gin.Context) {
 	_, err := auth.GetIDFromQuery(c)
 	if err != nil {
 		r := json_data.NewResponse()
-		r.SendError("id: " + err.Error())
+		r.SetError()
+		r.SetMessage("id: " + err.Error())
 		c.JSON(http.StatusBadRequest, r)
 		return
 	}
@@ -127,18 +133,52 @@ func (d *ArtNetDriver) Stop(c *gin.Context) {
 	}
 
 	d.Buses[busPayload.Name].Stop()
+	d.statusServer.Publish(fmt.Sprintf("status/%s/%s", d.Name, busPayload.Name), "Stopped")
 
 	r := json_dataModels.NewResponse()
-	r.SendMessage(fmt.Sprintf("bus '%s' stopped", busPayload.Name))
+	r.SetMessage(fmt.Sprintf("bus '%s' stopped", busPayload.Name))
 	c.JSON(http.StatusOK, r)
-	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.SendError("id: " + err.Error())
+		r.SetError()
+		r.SetMessage("id: " + err.Error())
 		c.JSON(http.StatusBadRequest, r)
 		return
 	}
@@ -153,6 +193,6 @@ func (d *ArtNetDriver) Status(c *gin.Context) {
 	if d.Buses[busPayload.Name].Status() {
 		state = "running"
 	}
-	r.SendMessage(fmt.Sprintf("bus '%s' %s", busPayload.Name, state))
+	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 "gitea.tecamino.com/paadi/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

@@ -3,10 +3,10 @@ package driver
 import (
 	"artNet/models"
 
-	json_dataModels "github.com/tecamino/tecamino-json_data/models"
+	json_dataModels "gitea.tecamino.com/paadi/tecamino-json_data/models"
 )
 
-func (d *ArtNetDriver) Subscribe(subs ...json_dataModels.Subscribe) {
+func (d *ArtNetDriver) Subscribe(subs ...json_dataModels.Subscription) {
 	if d.Subscriptions == nil {
 		d.Subscriptions = models.NewSubscriptions()
 	}
@@ -14,7 +14,13 @@ func (d *ArtNetDriver) Subscribe(subs ...json_dataModels.Subscribe) {
 	for _, sub := range subs {
 		if drv, ok := (*sub.Drivers)[sub.Driver]; ok {
 			d.Subscriptions.AddSubscription(sub.Uuid, drv)
-			d.SetValue(drv.Bus, drv.Address, uint8(sub.Value.(float64)))
+			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,49 +0,0 @@
-package driver
-
-const (
-	OnCreate = "onCreate"
-	OnChange = "onChange"
-	OnDelete = "onDelete"
-)
-
-//func (d *ArtNetDriver) Websocket(c *gin.Context) {
-// id, err := auth.GetIDFromQuery(c)
-// if err != nil {
-// 	d.Log.Error("artNet.webSocket.Websocket", "error GetIDFromAuth: "+err.Error())
-// 	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 any
-// //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
-// 	}
-// 	fmt.Println(request)
-// 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

@@ -1,46 +1,47 @@
 module artNet
 
-go 1.23.0
+go 1.24.0
-
-toolchain go1.23.8
 
 require (
-	github.com/coder/websocket v1.8.13
+	gitea.tecamino.com/paadi/statusServer v1.0.3
-	github.com/gin-gonic/gin v1.10.0
+	gitea.tecamino.com/paadi/tecamino-json_data v0.1.0
+	gitea.tecamino.com/paadi/tecamino-logger v0.2.1
+	github.com/gin-gonic/gin v1.10.1
 	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.11
-	github.com/tecamino/tecamino-logger v0.2.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/bytedance/sonic v1.11.6 // indirect
+	gitea.tecamino.com/paadi/pubSub v1.0.2 // indirect
-	github.com/bytedance/sonic/loader v0.1.1 // indirect
+	gitea.tecamino.com/paadi/tecamino-dbm v0.1.1 // indirect
-	github.com/cloudwego/base64x v0.1.4 // indirect
+	github.com/bytedance/sonic v1.13.3 // indirect
-	github.com/cloudwego/iasm v0.2.0 // indirect
+	github.com/bytedance/sonic/loader v0.2.4 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
+	github.com/cloudwego/base64x v0.1.5 // indirect
-	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.9 // indirect
+	github.com/gin-contrib/cors v1.7.6 // indirect
+	github.com/gin-contrib/sse v1.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.20.0 // indirect
+	github.com/go-playground/validator/v10 v10.26.0 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.12 // indirect
+	github.com/ugorji/go/codec v1.3.0 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/arch v0.8.0 // indirect
+	golang.org/x/arch v0.18.0 // indirect
-	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/crypto v0.39.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/net v0.41.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/text v0.26.0 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 )

go.sum

@@ -1,43 +1,59 @@
-github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0=
+gitea.tecamino.com/paadi/pubSub v1.0.2 h1:9Q9KLTIHRSjxrTkDyuF8mDYOLkI8DjjPNSnoS2GKflY=
-github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
+gitea.tecamino.com/paadi/pubSub v1.0.2/go.mod h1:SBPTSD/JQWRbwqsSNoSPhV81IDTreP0TMyvLhmK3P2M=
-github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
+gitea.tecamino.com/paadi/statusServer v1.0.3 h1:bRw+Jz9AIoiwqNLTBnrus2aUxq2Em2gA8NDANtqVHEA=
+gitea.tecamino.com/paadi/statusServer v1.0.3/go.mod h1:kNO/ASrrmsLGgo+k49TLpVP6PpxG3I3D1moJ6Ke+ocg=
+gitea.tecamino.com/paadi/tecamino-dbm v0.1.1 h1:vAq7mwUxlxJuLzCQSDMrZCwo8ky5usWi9Qz+UP+WnkI=
+gitea.tecamino.com/paadi/tecamino-dbm v0.1.1/go.mod h1:+tmf1rjPaKEoNeUcr1vdtoFIFweNG3aUGevDAl3NMBk=
+gitea.tecamino.com/paadi/tecamino-json_data v0.1.0 h1:zp3L8qUvkVqzuesQdMh/SgZZZbX3pGD9NYa6jtz+JvA=
+gitea.tecamino.com/paadi/tecamino-json_data v0.1.0/go.mod h1:/FKhbVYuhiNlQp4552rJJQIhynjLarDzfrgXpupkwZU=
+gitea.tecamino.com/paadi/tecamino-logger v0.2.1 h1:sQTBKYPdzn9mmWX2JXZBtGBvNQH7cuXIwsl4TD0aMgE=
+gitea.tecamino.com/paadi/tecamino-logger v0.2.1/go.mod h1:FkzRTldUBBOd/iy2upycArDftSZ5trbsX5Ira5OzJgM=
+github.com/bytedance/sonic v1.13.3 h1:MS8gmaH16Gtirygw7jV91pDCN33NyMrPbN7qiYhEsF0=
+github.com/bytedance/sonic v1.13.3/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
+github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY=
-github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
+github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
-github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
+github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
+github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
 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=
-github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
+github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY=
-github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
+github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
+github.com/gin-contrib/cors v1.7.6 h1:3gQ8GMzs1Ylpf70y8bMw4fVpycXIeX1ZemuSQIsnQQY=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gin-contrib/cors v1.7.6/go.mod h1:Ulcl+xN4jel9t1Ry8vqph23a60FwH9xVLd+3ykmTjOk=
-github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
+github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=
-github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
+github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
+github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ=
+github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8=
+github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k=
-github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
+github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
-github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
-github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 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=
-github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
+github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
-github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@@ -47,61 +63,53 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
+github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
-github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
+github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
+github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-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.11 h1:WVcF0tj+ElM9hRM1PccbSnY8DHJnLPauqzY0o0ib9O0=
-github.com/tecamino/tecamino-json_data v0.0.11/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=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
-github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
+github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA=
-github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/ugorji/go/codec v1.3.0/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
 go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/arch v0.18.0 h1:WN9poc33zL4AzGxqf8VtpKUnGvMi8O9lhNyBMF/85qc=
-golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
+golang.org/x/arch v0.18.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
-golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
+golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
+golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
+golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
-google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
-google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
-rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

main.go

@@ -17,10 +17,13 @@ func main() {
 	// cli flags
 	cfgDir := flag.String("cfg", "./cfg", "config directory")
 	workingDir := flag.String("workingDirectory", ".", "current working directory")
+	statusServerIp := flag.String("statusIp", "127.0.0.1", "ip address of status server")
+	statusServerPort := flag.Uint("statusPort", 9500, "port of status server")
 	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
@@ -29,9 +32,8 @@ func main() {
 	}
 
 	//initialize new ArtNet driver
-	artNetDriver, err := driver.NewDriver(*cfgDir, DriverName, *debug)
+	artNetDriver, err := driver.NewDriver(*cfgDir, DriverName, *statusServerIp, *statusServerPort, *debug)
 	if err != nil {
-		artNetDriver.Log.Error("main", "error initialize new artnet driver "+err.Error())
 		panic(err)
 	}
 
@@ -47,6 +49,7 @@ func main() {
 	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!")
@@ -54,14 +57,27 @@ func main() {
 
 	go func() {
 		if err := s.ServeHttp(*wsPort); err != nil {
-			artNetDriver.Log.Error("main", err.Error())
+			artNetDriver.Log.Error("main", err)
 		}
 	}()
 
-	artNetDriver.Log.Info("main", fmt.Sprintf("connect to server  ws://%s:%d with id %s", *serverIp, serverPort, DriverName))
+	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 {
-		artNetDriver.Log.Error("main", artNetDriver.Connect(*serverIp, DriverName, *serverPort))
+		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

@@ -6,12 +6,14 @@ import (
 	"fmt"
 	"net"
 	"net/http"
+	"sync"
 	"time"
 
+	json_data "gitea.tecamino.com/paadi/tecamino-json_data"
+	json_dataModels "gitea.tecamino.com/paadi/tecamino-json_data/models"
+	"gitea.tecamino.com/paadi/tecamino-logger/logging"
 	"github.com/gin-gonic/gin"
 	"github.com/tatsushid/go-fastping"
-	json_data "github.com/tecamino/tecamino-json_data"
-	"github.com/tecamino/tecamino-logger/logging"
 )
 
 // Art-Net constants
@@ -24,9 +26,12 @@ type Bus struct {
 	Name        string                          `yaml:"name" json:"name"`
 	Ip          string                          `yaml:"ip" json:"ip"`
 	Port        *int                            `yaml:"port" json:"port,omitempty"`
-	Data      *DMX               `yaml:"-" json:"-"`
+	DMX         *DMX                            `yaml:"-" json:"-"`
+	Resubscribe *[]json_dataModels.Subscription `yaml:"-" json:"resubscribe"`
 	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)
@@ -39,7 +44,7 @@ func NewBus(name, ip string, port int) *Bus {
 		Name: name,
 		Ip:   ip,
 		Port: &port,
-		Data: NewDMXUniverse(),
+		DMX:  NewDMXUniverse(),
 	}
 	return &i
 }
@@ -87,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
 		}
@@ -100,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():
@@ -123,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
 				}
@@ -130,26 +137,7 @@ func (b *Bus) Start(log *logging.Logger) {
 			}
 		}
 	}()
-}
 
-// stop bus
-func (b *Bus) Stop() {
-	if b.Watchdog != nil {
-		b.Watchdog()
-	}
-}
-
-// status bus
-func (b *Bus) Status() bool {
-	return b.Watchdog != nil
-}
-
-// 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,
@@ -158,31 +146,81 @@ 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.SendError("json: " + err.Error())
+		r.SetError()
+		r.SetMessage("json: " + err.Error())
 		c.JSON(http.StatusBadRequest, r)
 		return err
 	}
 
 	if b.Name == "" {
 		r := json_data.NewResponse()
-		r.SendError("bus name missing")
+		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 {
+	b.DMX.SetValue(channel, value)
+	b.Send = true
+	return nil
+}
+
 func isUDPReachable(ip string) (recieved bool, err error) {
 	p := fastping.NewPinger()
 	ra, err := net.ResolveIPAddr("ip4:icmp", ip)

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/package.go

@@ -23,7 +23,7 @@ func NewArtNetPackage(data *DMX) Package {
 	packet.WriteByte(0x00)                                         // Sequence
 	packet.WriteByte(0x00)                                         // Physical
 	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

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

server/models/clients.go

@@ -1,44 +0,0 @@
-package models
-
-// 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)
-// }

websocket/client.go

@@ -0,0 +1,195 @@
+package websocket
+
+import (
+	"encoding/json"
+	"fmt"
+	"log"
+	"time"
+
+	json_dataModels "gitea.tecamino.com/paadi/tecamino-json_data/models"
+	"github.com/gorilla/websocket"
+)
+
+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)
+		}
+	}
+}