fix faulty data send to artNet with new chan queue

.gitignore

@@ -1,3 +1,4 @@
 *.cfg
 *.log
 artNetDriver-arm64
+tecamino-driver-artNet-linux-arm64

driver/artNet.go

@@ -4,9 +4,9 @@ import (
 	"artNet/cfg"
 	"artNet/models"
 	ws "artNet/websocket"
+	"encoding/json"
 	"fmt"
 	"path"
-	"time"
 
 	json_data "github.com/tecamino/tecamino-json_data"
 	"github.com/tecamino/tecamino-logger/logging"
@@ -82,7 +82,7 @@ func (d *ArtNetDriver) SetValue(bus string, address uint, value uint8) error {
 		return fmt.Errorf("no dmx data on bus '%s' found", bus)
 	}
 	d.Buses[bus].Data.SetValue(address, value)
-	return d.Buses[bus].SendData()
+	return nil
 }
 
 // connect to websocket server and listen to subscriptions
@@ -90,67 +90,54 @@ func (d *ArtNetDriver) SetValue(bus string, address uint, value uint8) error {
 // id: id of driver
 // port: port of server
 func (d *ArtNetDriver) Connect(ip, id string, port uint) error {
-	var err 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)
-	}
-	client.OnMessage = func(data []byte) {
-		//fmt.Println(100, string(data))
-		fmt.Println(100, string(data))
+		errChan <- err
 	}
 
-	client.Connect(5)
+	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.SendData(req); err != nil {
+	if err := client.SendRequest(req); err != nil {
+		errChan <- err
 		d.Log.Error("websocket send data", err)
 	}
 
-	for {
-		time.Sleep(1)
+	for err := range errChan {
+		return err
 	}
 	return nil
-
-	// d.Conn = websocket.NewClient()
-	// if err := d.Conn.Connect(ip, id, port); err != nil {
-	// 	return err
-	// }
-	// defer d.Conn.Disconnect()
-
-	// if err := d.Conn.Subscribe(id); err != nil {
-	// 	return err
-	// }
-
-	// Subscribe to websocket server
-	// 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
-	// }
-
-	// for {
-	// 	respond, err := d.Conn.ReadJsonData()
-	// 	if err != nil {
-	// 		return err
-	// 	}
-
-	// 	d.Subscribe(respond.Subscribe...)
-
-	// 	for _, pub := range respond.Publish {
-	// 		if sub, ok := d.Subscriptions[pub.Uuid]; ok {
-	// 			if err := d.SetValue(sub.Bus, sub.Address, uint8(pub.Value.(float64))); err != nil {
-	// 				d.Log.Info("artNet.Connect", err.Error())
-	// 			}
-	// 		}
-	// 	}
-	// }
+}
+
+// send data to all buses that the send flage is true
+func (d *ArtNetDriver) SendData() {
+	for _, bus := range d.Buses {
+		bus.Send <- bus.Data
+	}
 }

driver/bus.go

@@ -105,7 +105,7 @@ func (d *ArtNetDriver) Start(c *gin.Context) {
 	}
 
 	busPayload := models.Bus{}
-	if busPayload.ParsePayload(c); err != nil {
+	if err := busPayload.ParsePayload(c); err != nil {
 		return
 	}
 

driver/publish.go

@@ -0,0 +1,19 @@
+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 drv, ok := (d.Subscriptions)[pub.Uuid]; ok {
+			d.SetValue(drv.Bus, drv.Address, uint8(pub.Value.(float64)))
+		}
+	}
+	d.SendData()
+	return nil
+}

driver/subscribe.go

@@ -17,4 +17,5 @@ func (d *ArtNetDriver) Subscribe(subs ...json_dataModels.Subscription) {
 			d.SetValue(drv.Bus, drv.Address, uint8(sub.Value.(float64)))
 		}
 	}
+	d.SendData()
 }

main.go

@@ -75,7 +75,7 @@ func main() {
 		if err := artNetDriver.Connect(*serverIp, DriverName, *serverPort); err != nil {
 			artNetDriver.Log.Error("main", err)
 		}
-		fmt.Println(555)
+		artNetDriver.Log.Info("main", "next reconnecting attempt in 10 seconds")
 		time.Sleep(10 * time.Second)
 	}
 

models/bus.go

@@ -29,6 +29,7 @@ type Bus struct {
 	Resubscribe *[]json_dataModels.Subscription `yaml:"-" json:"resubscribe"`
 	Watchdog    context.CancelFunc              `yaml:"-" json:"-"`
 	Reachable   bool                            `yaml:"-" json:"-"`
+	Send        chan *DMX                       `yaml:"-" json:"-"`
 }
 
 // adds new Art-Net interface to driver port 0 = 6454 (default art-net)
@@ -102,7 +103,7 @@ 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())
 
@@ -132,26 +133,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,
@@ -160,11 +142,38 @@ func (b *Bus) SendData() error {
 	if err != nil {
 		return err
 	}
+
+	b.Send = make(chan *DMX, 1024)
+
+	go func() {
 		defer conn.Close()
+		//close send channel
+		close(b.Send)
+		for send := range b.Send {
+			_, err = conn.Write(NewArtNetPackage(send))
+			if err != nil {
+				log.Error("bus.Start", err)
+				return
+			}
+			time.Sleep(23 * time.Millisecond)
+		}
+	}()
+	return nil
+}
 
-	_, err = conn.Write(NewArtNetPackage(b.Data))
+// stop bus
+func (b *Bus) Stop() {
+	if b.Watchdog != nil {
+		//cancels context
+		b.Watchdog()
+		//close send channel
+		close(b.Send)
+	}
+}
 
-	return err
+// status bus
+func (b *Bus) Status() bool {
+	return b.Watchdog != nil
 }
 
 func (b *Bus) ParsePayload(c *gin.Context) error {

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

@@ -4,30 +4,51 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
-	"sync"
 	"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 = 10 * time.Second
+
+	// Time allowed to read the next pong message from the peer.
+	pongWait = 10 * time.Second
+
+	// Send pings to peer with this period. Must be less than pongWait.
+	pingPeriod = (pongWait * 9) / 10
+)
+
 type Client struct {
+	ip         string
+	port       uint
+	Connected  bool
 	conn       *websocket.Conn
-	writeMu   sync.Mutex
-	OnMessage func(data []byte)
 	OnOpen     func()
+	OnMessage  func(data []byte)
 	OnClose    func(code int, reason string)
 	OnError    func(err error)
 	OnPing     func()
 	OnPong     func()
-	timeout   time.Duration
+	sendPong   chan string
+	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{}
+	c := &Client{
+		ip:         ip,
+		port:       port,
+		Connected:  true,
+		sendPong:   make(chan string),
+		send:       make(chan []byte),
+		unregister: make(chan []byte),
+	}
 
 	dialer := websocket.DefaultDialer
 	conn, resp, err := dialer.Dial(url, nil)
@@ -40,20 +61,25 @@ func NewClient(ip, id string, port uint) (*Client, error) {
 	c.conn = conn
 
 	// Setup control handlers
-	c.conn.SetPingHandler(func(appData string) error {
+	conn.SetPingHandler(func(appData string) error {
 		if c.OnPing != nil {
 			c.OnPing()
 		}
-		return c.conn.WriteMessage(websocket.PongMessage, nil)
+		conn.SetWriteDeadline(time.Now().Add(writeWait))
+		conn.SetReadDeadline(time.Now().Add(writeWait))
+		c.sendPong <- appData
+		return nil
 	})
-	c.conn.SetPongHandler(func(appData string) error {
-		c.conn.SetReadDeadline(time.Now().Add(c.timeout))
+
+	conn.SetPongHandler(func(string) error {
+		conn.SetReadDeadline(time.Now().Add(pongWait))
 		if c.OnPong != nil {
 			c.OnPong()
 		}
 		return nil
 	})
-	c.conn.SetCloseHandler(func(code int, text string) error {
+
+	conn.SetCloseHandler(func(code int, text string) error {
 		if c.OnClose != nil {
 			c.OnClose(code, text)
 		}
@@ -63,98 +89,103 @@ func NewClient(ip, id string, port uint) (*Client, error) {
 	if c.OnOpen != nil {
 		c.OnOpen()
 	}
+
+	// Start reading messages from client
+	go c.Read()
+	go c.Write()
 	return c, nil
 }
 
-func (c *Client) Connect(timeout uint) {
-	if timeout > 0 {
-		fmt.Println(1234, timeout)
-		c.timeout = time.Duration(timeout) * time.Second
+func (c *Client) Read() {
+	if c.OnOpen != nil {
+		c.OnOpen()
 	}
 
-	go c.pingLoop()
-
-	c.conn.SetReadDeadline(time.Now().Add(c.timeout))
-	go func() {
-
-		for {
+	c.conn.SetReadDeadline(time.Now().Add(writeWait))
+	for c.Connected {
 		msgType, msg, err := c.conn.ReadMessage()
 		if err != nil {
-				if websocket.IsCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) {
-					log.Println("WebSocket closed:", err)
-				}
-				if c.OnError != nil {
-					c.OnError(fmt.Errorf("read error: %w", err))
-				}
+			c.handleError(fmt.Errorf("read error (id:%s:%d): %w", c.ip, c.port, err))
 			return
 		}
 		switch msgType {
-			case websocket.TextMessage, websocket.BinaryMessage:
+		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 (id:%s:%d): %s", c.ip, c.port, string(msg))
 			}
 		default:
-				log.Printf("Unhandled message type: %d", msgType)
+			log.Printf("Unhandled message type %d (id:%s:%d)", msgType, c.ip, c.port)
 		}
 	}
-	}()
 }
 
-func (c *Client) pingLoop() {
-	interval := c.timeout / 2
-	if interval <= 0 {
-		interval = 5 * time.Second
-	}
-	ticker := time.NewTicker(interval)
-	defer ticker.Stop()
+func (c *Client) Write() {
+	ticker := time.NewTicker(pingPeriod)
+	defer func() {
+		ticker.Stop()
+		c.conn.Close()
+	}()
+	for {
 
-	for range ticker.C {
-		if err := c.Write(websocket.PingMessage, nil); err != nil {
-			if c.OnError != nil {
-				c.OnError(fmt.Errorf("ping error: %w", err))
-			}
+		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{}); err != nil {
+					c.handleError(err)
 					return
 				}
+				c.handleError(fmt.Errorf("server %s:%d closed channel", c.ip, c.port))
+				return
+			} else {
+				if err := c.conn.WriteMessage(websocket.TextMessage, message); err != nil {
+					c.handleError(err)
+					return
+				}
+			}
+		case <-ticker.C:
+			c.conn.SetWriteDeadline(time.Now().Add(writeWait))
+			if err := c.conn.WriteMessage(websocket.PingMessage, nil); err != nil {
+				c.handleError(err)
+				return
+			}
+
 			if c.OnPing != nil {
 				c.OnPing()
 			}
+
+		case message, ok := <-c.sendPong:
+			if ok {
+				c.conn.WriteMessage(websocket.PongMessage, []byte(message))
+			}
+		case message := <-c.unregister:
+			c.conn.WriteMessage(websocket.CloseMessage, message)
+			c.Connected = false
+			close(c.send)
+			close(c.sendPong)
+			close(c.unregister)
+			return
+		}
+
 	}
 }
 
-func (c *Client) Write(msgType int, data []byte) error {
-	c.writeMu.Lock()
-	defer c.writeMu.Unlock()
-
-	c.conn.SetWriteDeadline(time.Now().Add(c.timeout))
-
-	if err := c.conn.WriteMessage(msgType, data); err != nil {
-		if c.OnError != nil {
-			c.OnError(err)
-		}
-		return err
-	}
+func (c *Client) SendRequest(req *json_dataModels.Request) error {
+	if !c.Connected {
 		return nil
-}
+	}
 
-// Close connection to websocket server
-func (c *Client) Close(code int, reason string) {
-	if c.conn != nil {
-		if c.OnClose != nil {
-			c.OnClose(code, reason)
-		}
-		c.conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(code, reason))
-		c.conn.Close()
-	}
-}
-
-func (c *Client) SendData(data any) error {
-	c.conn.SetWriteDeadline(time.Now().Add(c.timeout))
-	if err := c.conn.WriteJSON(data); err != nil {
-		if c.OnError != nil {
-			c.OnError(err)
-		}
+	data, err := json.Marshal(*req)
+	if err != nil {
 		return err
 	}
+	c.send <- data
 	return nil
 }
 
@@ -163,3 +194,30 @@ func (c *Client) ReadJsonData(data []byte) (json_dataModels.Response, error) {
 	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 {
+			fmt.Println("error: ", err)
+		}
+	}
+}