repo name change

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

.github/workflows/build.yml

@@ -1,48 +0,0 @@
-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 -o build/tecamino-driver-artNet-${{ matrix.goos }}-${{ matrix.goarch }}.exe main.go
-          else
-            GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go build -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,3 +1,5 @@
+.DS_Store
 *.cfg
 *.log
 artNetDriver-arm64
+tecamino-driver-artNet-linux-arm64

driver/artNet.go

@@ -4,12 +4,12 @@ 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"
+	json_data "gitea.tecamino.com/paadi/tecamino-json_data"
+	"gitea.tecamino.com/paadi/tecamino-logger/logging"
 )
 
 type ArtNetDriver struct {
@@ -78,11 +78,11 @@ 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)
 	}
-	if d.Buses[bus].Data == nil {
+	if d.Buses[bus].DMX.Data == nil {
 		return fmt.Errorf("no dmx data on bus '%s' found", bus)
 	}
-	d.Buses[bus].Data.SetValue(address, value)
-	return d.Buses[bus].SendData()
+	d.Buses[bus].SetDMXData(address, value)
+	return nil
 }
 
 // connect to websocket server and listen to subscriptions
@@ -90,67 +90,56 @@ 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.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
@@ -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,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,7 +3,7 @@ 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.Subscription) {
@@ -14,7 +14,13 @@ func (d *ArtNetDriver) Subscribe(subs ...json_dataModels.Subscription) {
 	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()
 }

go.mod

@@ -5,12 +5,12 @@ go 1.23.0
 toolchain go1.23.8
 
 require (
+	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.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.13
-	github.com/tecamino/tecamino-logger v0.2.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 

go.sum

@@ -1,3 +1,7 @@
+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.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0=
 github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
 github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
@@ -65,10 +69,6 @@ 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.13 h1:hugbmCgXXh0F7YQAEbbJYHkSdq1caejD7SajDiMs42I=
-github.com/tecamino/tecamino-json_data v0.0.13/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=

main.go

@@ -75,7 +75,8 @@ 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

@@ -6,13 +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"
-	json_dataModels "github.com/tecamino/tecamino-json_data/models"
-	"github.com/tecamino/tecamino-logger/logging"
 )
 
 // Art-Net constants
@@ -25,10 +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)
@@ -41,7 +44,7 @@ func NewBus(name, ip string, port int) *Bus {
 		Name: name,
 		Ip:   ip,
 		Port: &port,
-		Data: NewDMXUniverse(),
+		DMX:  NewDMXUniverse(),
 	}
 	return &i
 }
@@ -89,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
 		}
@@ -102,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():
@@ -125,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
 				}
@@ -132,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,
@@ -160,11 +146,53 @@ 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 {
@@ -187,6 +215,13 @@ func (b *Bus) ParsePayload(c *gin.Context) error {
 	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) {
 	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
-	packet.Write(*data)
+	binary.Write(packet, binary.BigEndian, uint16(len(data.Data))) // Length
+	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,8 +17,11 @@ func NewSubscriptions() Subscriptions {
 }
 
 func (s *Subscriptions) AddSubscription(uid uuid.UUID, drv *json_dataModels.Driver) {
-	(*s)[uid] = Subscription{
-		Bus:     drv.Bus,
-		Address: drv.Address,
+	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,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,46 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
-	"sync"
 	"time"
 
+	json_dataModels "gitea.tecamino.com/paadi/tecamino-json_data/models"
 	"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
-	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
+	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,
+		send:       make(chan []byte, 256),
+		unregister: make(chan []byte, 256),
+	}
 
 	dialer := websocket.DefaultDialer
 	conn, resp, err := dialer.Dial(url, nil)
@@ -39,122 +55,108 @@ func NewClient(ip, id string, port uint) (*Client, error) {
 	}
 	c.conn = conn
 
-	// Setup control handlers
-	c.conn.SetPingHandler(func(appData string) error {
+	//Setup control handlers
+	conn.SetPingHandler(func(appData string) error {
 		if c.OnPing != nil {
 			c.OnPing()
 		}
-		return c.conn.WriteMessage(websocket.PongMessage, nil)
+		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
 	})
-	c.conn.SetPongHandler(func(appData string) error {
-		c.conn.SetReadDeadline(time.Now().Add(c.timeout))
+
+	conn.SetPongHandler(func(appData 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 {
-		if c.OnClose != nil {
-			c.OnClose(code, text)
-		}
-		return nil
-	})
 
-	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(pongWait))
 
-	c.conn.SetReadDeadline(time.Now().Add(c.timeout))
-	go func() {
-
-		for {
+	for c.Connected {
 		msgType, msg, err := c.conn.ReadMessage()
+		c.conn.SetReadDeadline(time.Now().Add(pongWait))
 		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 (ip:%s): %w", c.ip, 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 (ip:%s): %s", c.ip, string(msg))
 			}
 		default:
-				log.Printf("Unhandled message type: %d", msgType)
+			log.Printf("Unhandled message type %d (ip:%s)", msgType, c.ip)
 		}
 	}
-	}()
 }
 
-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() {
+	defer c.conn.Close()
 
-	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))
-			}
+	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
 				}
-		if c.OnPing != nil {
-			c.OnPing()
+				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) 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 +165,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 {
+			log.Println("error:", err)
+		}
+	}
+}