tipo .gitea

.gitea/workflows/build.yml

@@ -0,0 +1,89 @@
+name: Build DBM Service
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  APP_NAME: tecamino-dbm
+
+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 -ldflags="-s -w" -trimpath -o build/tecamino-dbm-${{ matrix.goos }}-${{ matrix.goarch }}.exe main.go
-          else
-            GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go build -ldflags="-s -w" -trimpath -o build/tecamino-dbm-${{ matrix.goos }}-${{ matrix.goarch }} main.go
-          fi
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: binaries-${{ matrix.goos }}-${{ matrix.goarch }}
-          path: build/

args/args.go

@@ -3,8 +3,8 @@ package args
 import (
 	"flag"
 
-	"github.com/tecamino/tecamino-dbm/cert"
+	"gitea.tecamino.com/paadi/tecamino-dbm/cert"
-	"github.com/tecamino/tecamino-dbm/models"
+	"gitea.tecamino.com/paadi/tecamino-dbm/models"
 )
 
 // DBM cli arguments

dbm/db.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"time"
 
+	json_dataModels "gitea.tecamino.com/paadi/tecamino-json_data/models"
 	"github.com/gin-gonic/gin"
-	json_dataModels "github.com/tecamino/tecamino-json_data/models"
 )
 
 func (d *DBMHandler) SaveData(c *gin.Context) {

dbm/dbmHandler.go

@@ -9,10 +9,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/tecamino/tecamino-dbm/args"
+	"gitea.tecamino.com/paadi/tecamino-dbm/args"
-	"github.com/tecamino/tecamino-dbm/models"
+	"gitea.tecamino.com/paadi/tecamino-dbm/models"
-	ws "github.com/tecamino/tecamino-dbm/websocket"
+	ws "gitea.tecamino.com/paadi/tecamino-dbm/websocket"
-	"github.com/tecamino/tecamino-logger/logging"
+	"gitea.tecamino.com/paadi/tecamino-logger/logging"
 )
 
 type DBMHandler struct {

dbm/get.go

@@ -1,8 +1,8 @@
 package dbm
 
 import (
-	json_data "github.com/tecamino/tecamino-json_data"
+	json_data "gitea.tecamino.com/paadi/tecamino-json_data"
-	json_dataModels "github.com/tecamino/tecamino-json_data/models"
+	json_dataModels "gitea.tecamino.com/paadi/tecamino-json_data/models"
 )
 
 func (d *DBMHandler) Get(req *json_dataModels.Request, id string) {

dbm/json_data.go

@@ -1,12 +1,11 @@
 package dbm
 
 import (
-	"fmt"
 	"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"
 )
 
 func (d *DBMHandler) Json_Data(c *gin.Context) {
@@ -46,10 +45,6 @@ func (d *DBMHandler) Json_Data(c *gin.Context) {
 	}
 	if len(payload.Set) > 0 {
 		resp.Set, err = d.DBM.CreateDatapoints(payload.Set...)
-		for i, o := range resp.Set {
-			fmt.Println(1000, i, o)
-			fmt.Println(1001, o.HasChild)
-		}
 		if err != nil {
 			r := json_data.NewResponse()
 			r.SetError()

dbm/set.go

@@ -3,7 +3,7 @@ package dbm
 import (
 	"fmt"
 
-	json_dataModels "github.com/tecamino/tecamino-json_data/models"
+	json_dataModels "gitea.tecamino.com/paadi/tecamino-json_data/models"
 )
 
 func (d *DBMHandler) Set(req *json_dataModels.Request, id string) {

dbm/subscribe.go

@@ -3,7 +3,7 @@ package dbm
 import (
 	"fmt"
 
-	json_dataModels "github.com/tecamino/tecamino-json_data/models"
+	json_dataModels "gitea.tecamino.com/paadi/tecamino-json_data/models"
 )
 
 func (d *DBMHandler) Subscribe(req *json_dataModels.Request, id string) {

dbm/system.go

@@ -1,9 +1,9 @@
 package dbm
 
 import (
+	"gitea.tecamino.com/paadi/tecamino-dbm/models"
+	json_dataModels "gitea.tecamino.com/paadi/tecamino-json_data/models"
 	"github.com/google/uuid"
-	"github.com/tecamino/tecamino-dbm/models"
-	json_dataModels "github.com/tecamino/tecamino-json_data/models"
 )
 
 func (d *DBMHandler) AddSystemDps() (err error) {

dbm/webSocket.go

@@ -3,9 +3,9 @@ package dbm
 import (
 	"encoding/json"
 
+	"gitea.tecamino.com/paadi/tecamino-dbm/auth"
+	json_dataModels "gitea.tecamino.com/paadi/tecamino-json_data/models"
 	"github.com/gin-gonic/gin"
-	"github.com/tecamino/tecamino-dbm/auth"
-	json_dataModels "github.com/tecamino/tecamino-json_data/models"
 )
 
 const (

drivers/drivers.go

@@ -3,5 +3,8 @@ package drivers
 type Drivers []Driver
 
 type Driver interface {
+	NewArtNetDriver(string)
 	AddAddress()
 }
+
+//func Add

go.mod

@@ -1,14 +1,14 @@
-module github.com/tecamino/tecamino-dbm
+module gitea.tecamino.com/paadi/tecamino-dbm
 
 go 1.24.0
 
 require (
+	gitea.tecamino.com/paadi/tecamino-json_data v0.1.0
+	gitea.tecamino.com/paadi/tecamino-logger v0.2.1
 	github.com/gin-contrib/cors v1.7.5
 	github.com/gin-gonic/gin v1.10.0
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.3
-	github.com/tecamino/tecamino-json_data v0.0.21
-	github.com/tecamino/tecamino-logger v0.2.0
 )
 
 require (

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.13.2 h1:8/H1FempDZqC4VqjptGo14QQlJx8VdZJegxs6wwfqpQ=
 github.com/bytedance/sonic v1.13.2/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
@@ -71,10 +75,6 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 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.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tecamino/tecamino-json_data v0.0.21 h1:ZRN9wyn+p6J1T4b0e9xf1HStVaAy4wb+3yZ9xn5LFc0=
-github.com/tecamino/tecamino-json_data v0.0.21/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

@@ -3,10 +3,10 @@ package main
 import (
 	"fmt"
 
+	"gitea.tecamino.com/paadi/tecamino-dbm/args"
+	"gitea.tecamino.com/paadi/tecamino-dbm/dbm"
+	ws "gitea.tecamino.com/paadi/tecamino-dbm/websocket"
 	"github.com/gin-gonic/gin"
-	"github.com/tecamino/tecamino-dbm/args"
-	"github.com/tecamino/tecamino-dbm/dbm"
-	ws "github.com/tecamino/tecamino-dbm/websocket"
 )
 
 func main() {

models/datapoint.go

@@ -2,18 +2,17 @@ package models
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"regexp"
 	"strings"
 	"time"
 
+	"gitea.tecamino.com/paadi/tecamino-dbm/utils"
+	ws "gitea.tecamino.com/paadi/tecamino-dbm/websocket"
+	wsModels "gitea.tecamino.com/paadi/tecamino-dbm/websocket/models"
+	json_data "gitea.tecamino.com/paadi/tecamino-json_data"
+	json_dataModels "gitea.tecamino.com/paadi/tecamino-json_data/models"
 	"github.com/google/uuid"
-	"github.com/tecamino/tecamino-dbm/utils"
-	ws "github.com/tecamino/tecamino-dbm/websocket"
-	wsModels "github.com/tecamino/tecamino-dbm/websocket/models"
-	json_data "github.com/tecamino/tecamino-json_data"
-	json_dataModels "github.com/tecamino/tecamino-json_data/models"
 )
 
 const (
@@ -70,17 +69,13 @@ func (d *Datapoint) Set(path string, set json_dataModels.Set) (bool, error) {
 	if set.Driver == nil {
 		return changed, nil
 	}
-	if set.Driver.Type == "" {
-		return changed, errors.New("driver type missing")
-	}
-	if set.Driver.Bus == "" {
-		return changed, errors.New("driver bus name missing")
-	}
 
 	if d.Drivers == nil {
-		d.Drivers = json_dataModels.NewDrivers()
+		d.Drivers = json_dataModels.Drivers{}
 	}
-	d.Drivers.AddDriver(set.Driver.Type, set.Driver.Bus, set.Driver.Address)
+	d.Drivers.AddDriver(set.Driver)
+
+	changed = true
 	d.UpdateDateTime = time.Now().UnixMilli()
 
 	return changed, nil
@@ -99,6 +94,27 @@ func (d *Datapoint) CreateDatapoints(uuids *Uuids, sets ...json_dataModels.Set)
 
 	for _, dp := range sets {
 
+		if dp.Path == "" && dp.Uuid != uuid.Nil {
+			existing := uuids.GetDatapoint(dp.Uuid)
+			_, err := existing.Set("", dp)
+			if err != nil {
+				return nil, err
+			}
+			created = append(created, json_dataModels.Set{
+				Uuid:     existing.Uuid,
+				Path:     existing.Path,
+				Type:     existing.Type,
+				Value:    existing.Value,
+				Rights:   existing.ReadWrite,
+				Drivers:  &existing.Drivers,
+				Updated:  true,
+				HasChild: existing.HasChild,
+			})
+
+			existing.Publish(OnChange)
+			continue
+		}
+
 		parts := strings.Split(dp.Path, ":")
 
 		current := d
@@ -106,6 +122,7 @@ func (d *Datapoint) CreateDatapoints(uuids *Uuids, sets ...json_dataModels.Set)
 			if current.Datapoints == nil {
 				current.Datapoints = make(map[string]*Datapoint)
 			}
+
 			if i == len(parts)-1 {
 				// Leaf node: create or update datapoint
 				if existing, ok := current.Datapoints[part]; ok {
@@ -126,7 +143,6 @@ func (d *Datapoint) CreateDatapoints(uuids *Uuids, sets ...json_dataModels.Set)
 					})
 
 					existing.Publish(OnChange)
-
 				} else {
 					var uid uuid.UUID = uuid.New()
 					if dp.Uuid != uuid.Nil {
@@ -147,8 +163,8 @@ func (d *Datapoint) CreateDatapoints(uuids *Uuids, sets ...json_dataModels.Set)
 					}
 
 					//add uuid to flat map for faster lookup
-					uuids.AddDatapoint(current, ndp)
+					renamedDps := uuids.AddDatapoint(current, ndp)
-
+					created = append(created, renamedDps...)
 					created = append(created, json_dataModels.Set{
 						Uuid:     ndp.Uuid,
 						Path:     ndp.Path,
@@ -183,8 +199,8 @@ func (d *Datapoint) CreateDatapoints(uuids *Uuids, sets ...json_dataModels.Set)
 				}
 
 				//add uuid to flat map for faster lookup
-				uuids.AddDatapoint(current, newDp)
+				renamedDps := uuids.AddDatapoint(current, newDp)
-
+				created = append(created, renamedDps...)
 				created = append(created, json_dataModels.Set{
 					Uuid:     newDp.Uuid,
 					Path:     newDp.Path,
@@ -304,6 +320,8 @@ func (d *Datapoint) UpdateValue(value any) error {
 	return nil
 }
 
+// removes datapoint and its children if path is given
+// if path and
 func (d *Datapoint) RemoveDatapoint(set json_dataModels.Set) (sets []json_dataModels.Set, err error) {
 	parts := strings.Split(set.Path, ":")
 
@@ -324,20 +342,37 @@ func (d *Datapoint) RemoveDatapoint(set json_dataModels.Set) (sets []json_dataMo
 
 	toDelete := parts[len(parts)-1]
 	if dp, ok := current.Datapoints[toDelete]; ok {
-		s, p := removeChildren(dp)
+		//if driver information found, remoove only driver information
-		sets = append(sets, s...)
+		if set.Driver != nil {
-		publishes = append(publishes, p...)
+			dp.RemoveDriver(set.Driver)
-		publishes = append(publishes, json_dataModels.Publish{
+			publishes = append(publishes, json_dataModels.Publish{
-			Event: OnDelete,
+				Event:   OnChange,
-			Uuid:  dp.Uuid,
+				Uuid:    dp.Uuid,
-			Path:  dp.Path,
+				Path:    dp.Path,
-		})
+				Value:   dp.Value,
-		sets = append(sets, json_dataModels.Set{
+				Drivers: &dp.Drivers,
-			Uuid: dp.Uuid,
+			})
-			Path: dp.Path,
+			sets = append(sets, json_dataModels.Set{
-		})
+				Uuid:    dp.Uuid,
-		delete(current.Datapoints, toDelete)
+				Path:    dp.Path,
-
+				Drivers: &dp.Drivers,
+				Value:   dp.Value,
+			})
+		} else {
+			s, pubs := removeChildren(dp)
+			sets = append(sets, s...)
+			publishes = append(publishes, pubs...)
+			publishes = append(publishes, json_dataModels.Publish{
+				Event: OnDelete,
+				Uuid:  dp.Uuid,
+				Path:  dp.Path,
+			})
+			sets = append(sets, json_dataModels.Set{
+				Uuid: dp.Uuid,
+				Path: dp.Path,
+			})
+			delete(current.Datapoints, toDelete)
+		}
 		r := json_data.NewResponse()
 		r.Publish = append(r.Publish, publishes...)
 
@@ -442,7 +477,7 @@ func (d *Datapoint) AddSubscribtion(conn *wsModels.Client, sub json_dataModels.S
 	}
 }
 
-func (d *Datapoint) RenamePaths(oldPath string) {
+func (d *Datapoint) RenamePaths(oldPath string) (renamed []json_dataModels.Set) {
 	visited := make(map[*Datapoint]bool)
 
 	if len(d.Datapoints) == 0 {
@@ -451,11 +486,22 @@ func (d *Datapoint) RenamePaths(oldPath string) {
 
 	for _, dp := range d.Datapoints {
 		dp.Path = strings.Replace(dp.Path, oldPath, d.Path, 1)
-		dp.renameSubPaths(oldPath, d.Path, visited)
+		renamedDps := dp.renameSubPaths(oldPath, d.Path, visited)
+		renamed = append(renamed, renamedDps...)
+		renamed = append(renamed, json_dataModels.Set{
+			Uuid:     dp.Uuid,
+			Path:     dp.Path,
+			Type:     dp.Type,
+			Value:    dp.Value,
+			Rights:   dp.ReadWrite,
+			Drivers:  &dp.Drivers,
+			HasChild: dp.HasChild,
+		})
 	}
+	return
 }
 
-func (d *Datapoint) renameSubPaths(oldPath, newPath string, visited map[*Datapoint]bool) {
+func (d *Datapoint) renameSubPaths(oldPath, newPath string, visited map[*Datapoint]bool) (renamed []json_dataModels.Set) {
 	if visited[d] {
 		return
 	}
@@ -467,14 +513,29 @@ func (d *Datapoint) renameSubPaths(oldPath, newPath string, visited map[*Datapoi
 
 	for _, dp := range d.Datapoints {
 		dp.Path = strings.Replace(dp.Path, oldPath, newPath, 1)
-		dp.renameSubPaths(oldPath, newPath, visited)
+		renamedDps := dp.renameSubPaths(oldPath, newPath, visited)
+		renamed = append(renamed, renamedDps...)
+		renamed = append(renamed, json_dataModels.Set{
+			Uuid:     dp.Uuid,
+			Path:     dp.Path,
+			Type:     dp.Type,
+			Value:    dp.Value,
+			Rights:   dp.ReadWrite,
+			Drivers:  &dp.Drivers,
+			HasChild: dp.HasChild,
+		})
 	}
+	return
 }
 
 func (d *Datapoint) RemoveSubscribtion(client *wsModels.Client) {
 	delete(d.Subscriptions, client)
 }
 
+func (d *Datapoint) RemoveDriver(driver *json_dataModels.Driver) {
+	d.Drivers.RemoveDriver(driver)
+}
+
 func (d *Datapoint) Publish(eventType string) error {
 	r := json_data.NewResponse()
 	r.AddPublish(json_dataModels.Publish{

models/dbm.go

@@ -5,11 +5,11 @@ import (
 	"runtime"
 	"time"
 
+	"gitea.tecamino.com/paadi/tecamino-dbm/utils"
+	ws "gitea.tecamino.com/paadi/tecamino-dbm/websocket"
+	json_dataModels "gitea.tecamino.com/paadi/tecamino-json_data/models"
+	"gitea.tecamino.com/paadi/tecamino-logger/logging"
 	"github.com/google/uuid"
-	"github.com/tecamino/tecamino-dbm/utils"
-	ws "github.com/tecamino/tecamino-dbm/websocket"
-	json_dataModels "github.com/tecamino/tecamino-json_data/models"
-	"github.com/tecamino/tecamino-logger/logging"
 )
 
 type DBM struct {

models/subscribtion.go

@@ -1,6 +1,6 @@
 package models
 
-import wsModels "github.com/tecamino/tecamino-dbm/websocket/models"
+import wsModels "gitea.tecamino.com/paadi/tecamino-dbm/websocket/models"
 
 type Subscriptions map[*wsModels.Client]*Subscription
 

models/uuids.go

@@ -1,10 +1,8 @@
 package models
 
 import (
-	"fmt"
+	json_dataModels "gitea.tecamino.com/paadi/tecamino-json_data/models"
-
 	"github.com/google/uuid"
-	json_dataModels "github.com/tecamino/tecamino-json_data/models"
 )
 
 type Uuids map[uuid.UUID]*Datapoint
@@ -13,7 +11,7 @@ func NewUuids() *Uuids {
 	return &Uuids{}
 }
 
-func (u *Uuids) AddDatapoint(parentDp, newDp *Datapoint) {
+func (u *Uuids) AddDatapoint(parentDp, newDp *Datapoint) (renamed []json_dataModels.Set) {
 	if odp, ok := (*u)[newDp.Uuid]; ok {
 		if odp.Path == newDp.Path {
 			return
@@ -21,14 +19,14 @@ func (u *Uuids) AddDatapoint(parentDp, newDp *Datapoint) {
 		newDp.Datapoints = odp.Datapoints
 		newDp.HasChild = len(odp.Datapoints) > 0
 		odp.Datapoints = map[string]*Datapoint{}
-		newDp.RenamePaths(odp.Path)
+		renamed = newDp.RenamePaths(odp.Path)
 		rmDps, _ := parentDp.RemoveDatapoint(json_dataModels.Set{Path: odp.Path})
 		datapoints := u.GetDatapointByPath("System:Datapoints")
 		datapoints.UpdateValue(datapoints.Value.(uint64) - uint64(len(rmDps)))
-		fmt.Println(11, newDp.HasChild)
 	}
 
 	(*u)[newDp.Uuid] = newDp
+	return
 }
 
 func (u *Uuids) GetDatapoint(uuid uuid.UUID) *Datapoint {

test/dbm_test.go

@@ -7,13 +7,13 @@ import (
 	"testing"
 	"time"
 
+	"gitea.tecamino.com/paadi/tecamino-dbm/args"
+	"gitea.tecamino.com/paadi/tecamino-dbm/cert"
+	"gitea.tecamino.com/paadi/tecamino-dbm/dbm"
+	"gitea.tecamino.com/paadi/tecamino-dbm/models"
+	"gitea.tecamino.com/paadi/tecamino-dbm/utils"
+	ws "gitea.tecamino.com/paadi/tecamino-dbm/websocket"
 	"github.com/google/uuid"
-	"github.com/tecamino/tecamino-dbm/args"
-	"github.com/tecamino/tecamino-dbm/cert"
-	"github.com/tecamino/tecamino-dbm/dbm"
-	"github.com/tecamino/tecamino-dbm/models"
-	"github.com/tecamino/tecamino-dbm/utils"
-	ws "github.com/tecamino/tecamino-dbm/websocket"
 )
 
 func TestCreateDps(t *testing.T) {

websocket/clientHandler.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"sync"
 
+	"gitea.tecamino.com/paadi/tecamino-dbm/websocket/models"
+	wsModels "gitea.tecamino.com/paadi/tecamino-dbm/websocket/models"
+	json_dataModels "gitea.tecamino.com/paadi/tecamino-json_data/models"
 	"github.com/gin-gonic/gin"
-	"github.com/tecamino/tecamino-dbm/websocket/models"
-	wsModels "github.com/tecamino/tecamino-dbm/websocket/models"
-	json_dataModels "github.com/tecamino/tecamino-json_data/models"
 )
 
 // serves as connection handler of websocket
@@ -38,7 +38,6 @@ func (cH *ClientHandler) ConnectNewClient(id string, c *gin.Context) (client *mo
 
 	client, err = models.ConnectNewClient(id, c)
 	client.OnClose = func(code int, reason string) {
-		fmt.Println(23, "closing", id)
 		delete(cH.Clients, id)
 	}
 

websocket/models/client.go

@@ -17,7 +17,7 @@ var Broadcast Clients = make(Clients)
 
 const (
 	// Time allowed to write a message to the peer.
-	writeWait = 30 * time.Second
+	writeWait = 10 * time.Second
 
 	// Time allowed to read the next pong message from the peer.
 	pongWait = 30 * time.Second
@@ -69,12 +69,15 @@ func ConnectNewClient(id string, c *gin.Context) (*Client, error) {
 
 	Broadcast[client.Id] = client
 
+	conn.SetReadDeadline(time.Now().Add(pongWait))
+
 	conn.SetPingHandler(func(appData string) error {
 		if client.OnPing != nil {
 			client.OnPing()
 		}
+
+		conn.SetReadDeadline(time.Now().Add(pongWait))
 		conn.SetWriteDeadline(time.Now().Add(writeWait))
-		conn.SetReadDeadline(time.Now().Add(writeWait))
 		if err := client.conn.WriteControl(websocket.PongMessage, []byte(appData), time.Now().Add(pongWait)); err != nil {
 			client.OnError(err)
 		}
@@ -162,6 +165,11 @@ func (c *Client) PingInterval(interval time.Duration) {
 	ticker := time.NewTicker(interval)
 	defer ticker.Stop()
 
+	if err := c.conn.WriteControl(websocket.PingMessage, []byte("ping"), time.Now().Add(pongWait)); err != nil {
+		c.OnError(err)
+		return
+	}
+
 	for range ticker.C {
 		if c.OnPing != nil {
 			c.OnPing()

websocket/server.go

@@ -6,11 +6,11 @@ import (
 	"sync"
 	"time"
 
+	"gitea.tecamino.com/paadi/tecamino-dbm/cert"
+	"gitea.tecamino.com/paadi/tecamino-dbm/utils"
+	"gitea.tecamino.com/paadi/tecamino-logger/logging"
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
-	"github.com/tecamino/tecamino-dbm/cert"
-	"github.com/tecamino/tecamino-dbm/utils"
-	"github.com/tecamino/tecamino-logger/logging"
 )
 
 // server model for database manager websocket