add new ip ping for udp device

add new function start and stop bus

cfg/cfg.go

@@ -1,7 +1,6 @@
 package cfg
 
 import (
-	"fmt"
 	"os"
 	"path"
 
@@ -51,7 +50,7 @@ func (c *Cfg) SaveCfg(data any) error {
 func (c *Cfg) LoadCfg(data any) error {
 	p := path.Join(c.Dir, c.Name) + ".cfg"
 	if _, err := os.Stat(p); err != nil {
-		return fmt.Errorf("no configuration file: '%s' found", p)
+		return nil
 	}
 
 	b, err := os.ReadFile(p)

driver/artNet.go

@@ -5,6 +5,7 @@ import (
 	"artNet/models"
 	serverModels "artNet/server/models"
 	"fmt"
+	"path"
 
 	"github.com/tecamino/tecamino-logger/logging"
 )
@@ -25,7 +26,13 @@ func NewDriver(cfgDir, name string, debug bool) (*ArtNetDriver, error) {
 		cfgDir = "./cfg"
 	}
 
-	logger, err := logging.NewLogger(name, debug)
+	logger, err := logging.NewLogger(path.Join(cfgDir, name+".log"), &logging.Config{
+		MaxSize:     1,
+		MaxBackup:   3,
+		MaxAge:      28,
+		Debug:       debug,
+		TerminalOut: true,
+	})
 	if err != nil {
 		panic(err)
 	}
@@ -40,7 +47,7 @@ func NewDriver(cfgDir, name string, debug bool) (*ArtNetDriver, error) {
 	}
 
 	if err := d.LoadCfg(); err != nil {
-		logger.Error("artNet.NewDriver", "error load driver configuration: "+err.Error())
+		logger.Error("artNet.NewDriver.LoadCfg", "error load driver configuration: "+err.Error())
 		return nil, err
 	}
 
@@ -63,6 +70,7 @@ 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
 }

driver/bus.go

@@ -42,7 +42,6 @@ func (d *ArtNetDriver) CreateBus(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"error": "bus name missing"})
 		return
 	} else if addr := net.ParseIP(payload.Ip); addr == nil {
-
 		c.JSON(http.StatusBadRequest, gin.H{"error": "wrong ip '" + payload.Ip + "'"})
 		return
 	}
@@ -53,6 +52,7 @@ func (d *ArtNetDriver) CreateBus(c *gin.Context) {
 	}
 
 	bus := d.NewBus(payload.Name, payload.Ip, payload.GetPort())
+
 	c.JSON(http.StatusOK, gin.H{
 		"message": fmt.Sprintf("bus '%s' successfully created with ip: %s and on port: %d", bus.Name, bus.Ip, bus.GetPort()),
 	})
@@ -92,3 +92,57 @@ func (d *ArtNetDriver) RemoveBus(c *gin.Context) {
 	})
 	d.cfgHandler.SaveCfg(*d)
 }
+
+func (d *ArtNetDriver) Start(c *gin.Context) {
+	_, err := auth.GetIDFromAuth(c)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "id: " + err.Error()})
+		return
+	}
+
+	var payload models.Bus
+
+	if err := c.BindJSON(&payload); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "json: " + err.Error()})
+		return
+	}
+
+	if payload.Name == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "bus name missing"})
+		return
+	}
+
+	d.Buses[payload.Name].Start(d.Log)
+
+	c.JSON(http.StatusOK, models.JsonResponse{
+		Message: fmt.Sprintf("bus '%s' running", payload.Name),
+	})
+	d.cfgHandler.SaveCfg(*d)
+}
+
+func (d *ArtNetDriver) Stop(c *gin.Context) {
+	_, err := auth.GetIDFromAuth(c)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "id: " + err.Error()})
+		return
+	}
+
+	var payload models.Bus
+
+	if err := c.BindJSON(&payload); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "json: " + err.Error()})
+		return
+	}
+
+	if payload.Name == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "bus name missing"})
+		return
+	}
+
+	d.Buses[payload.Name].Stop()
+
+	c.JSON(http.StatusOK, models.JsonResponse{
+		Message: fmt.Sprintf("bus '%s' stopped", payload.Name),
+	})
+	d.cfgHandler.SaveCfg(*d)
+}

go.mod

@@ -8,7 +8,8 @@ require (
 	github.com/coder/websocket v1.8.13
 	github.com/gin-gonic/gin v1.10.0
 	github.com/tatsushid/go-fastping v0.0.0-20160109021039-d7bb493dee3e
-	github.com/tecamino/tecamino-logger v0.1.1
+	github.com/tecamino/tecamino-logger v0.2.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
@@ -39,5 +40,5 @@ require (
 	golang.org/x/sys v0.20.0 // indirect
 	golang.org/x/text v0.15.0 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 )

go.sum

@@ -63,8 +63,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-logger v0.1.1 h1:bK0SEQpbjui42OsnM6JCDThaGMBoqwVj/Op6ESqDwV4=
+github.com/tecamino/tecamino-logger v0.2.0 h1:NPH/Gg9qRhmVoW8b39i1eXu/LEftHc74nyISpcRG+XU=
-github.com/tecamino/tecamino-logger v0.1.1/go.mod h1:sGysmiFGIdr4vLJRAI+fJgsa7EoRRuxvRrKW7GnGQkw=
+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=
@@ -94,6 +94,8 @@ google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFW
 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/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=

main.go

@@ -4,6 +4,7 @@ import (
 	"artNet/driver"
 	"artNet/server"
 	"flag"
+	"fmt"
 	"os"
 
 	"github.com/gin-gonic/gin"
@@ -32,20 +33,23 @@ func main() {
 	}
 
 	//initialize new server
-	artNetDriver.Log.Error("main", "initialize new server instance")
+	artNetDriver.Log.Debug("main", "initialize new server instance")
 	s := server.NewServer()
 
 	//set routes
-	artNetDriver.Log.Error("main", "setting 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/stop", artNetDriver.Stop)
 
 	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))
 	// start http server
 	if err := s.ServeHttp(*port); err != nil {
 		artNetDriver.Log.Error("main", "error http server "+err.Error())

models/bus.go

@@ -1,12 +1,13 @@
 package models
 
 import (
+	"context"
 	"fmt"
-	"log"
 	"net"
 	"time"
 
 	"github.com/tatsushid/go-fastping"
+	"github.com/tecamino/tecamino-logger/logging"
 )
 
 // Art-Net constants
@@ -16,10 +17,12 @@ 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:"-"`
+	Data      *DMX               `yaml:"-" json:"-"`
+	Watchdog  context.CancelFunc `yaml:"-" json:"-"`
+	Reachable bool               `yaml:"-" json:"-"`
 }
 
 // adds new Art-Net interface to driver port 0 = 6454 (default art-net)
@@ -92,8 +95,51 @@ func (b *Bus) Poll(interval time.Duration) error {
 	}
 }
 
-// start polling dmx data in milliseconds 0 = aprox. 44Hertz
+// start bus
+func (b *Bus) Start(log *logging.Logger) {
+	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))
+		for {
+			select {
+			case <-ctx.Done():
+				log.Info("bus.Start", fmt.Sprintf("device:%s ip:%s watchdog stopped", b.Name, b.Ip))
+				b.Reachable = false
+				return
+			default:
+				b.Reachable = false
+				if reached, err := isUDPReachable(b.Ip); err != nil {
+					log.Error("bus.Start", err)
+					interval = 5 * time.Second
+				} else if !reached {
+					log.Error("bus.Start", fmt.Sprintf("device:%s ip:%s not reached", b.Name, b.Ip))
+					interval = 5 * time.Second
+				} else {
+					b.Reachable = true
+					log.Info("bus.Start", fmt.Sprintf("device:%s ip:%s watchdog running", b.Name, b.Ip))
+					interval = 30 * time.Second
+				}
+				time.Sleep(interval)
+			}
+		}
+	}()
+}
+
+// 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),
@@ -105,16 +151,6 @@ func (b *Bus) SendData() error {
 	}
 	defer conn.Close()
 
-	go func() {
-		if reached, err := isUDPReachable(b.Ip); err != nil {
-			log.Println(err)
-			return
-		} else if !reached {
-			log.Println("device not reachable")
-			return
-		}
-	}()
-
 	_, err = conn.Write(NewArtNetPackage(b.Data))
 
 	return err