new send datapoint type and one fix typo

args/args.go

@@ -43,6 +43,7 @@ func Init() *Args {
 	keyFile := flag.String("keyFile", "./cert/key.pem", "path of keyfile")
 	portHttp := flag.Uint("http-port", 8100, "json server communication for http/ws")
 	portHttps := flag.Uint("https-port", 8101, "json server communication for http/wss")
+	remotePort := flag.Uint("remotePort", 9500, "remote Port of gui user interface")
 	rootDir := flag.String("workingDir", "./", "working directory")
 	dbmFile := flag.String("dbm", "/test/test", "dbm file name")
 	debug := flag.Bool("debug", false, "debug flag")
@@ -56,8 +57,9 @@ func Init() *Args {
 			KeyFile:      *keyFile,
 		},
 		Port: models.Port{
-			Http:  *portHttp,
+			Http:   *portHttp,
-			Https: *portHttps,
+			Https:  *portHttps,
+			Remote: *remotePort,
 		},
 		RootDir: *rootDir,
 		DBMFile: *dbmFile,

dbm/json_data.go

@@ -35,6 +35,7 @@ func (d *DBMHandler) Json_Data(c *gin.Context) {
 					Path:     res.Path,
 					Type:     res.Type,
 					Value:    res.Value,
+					Drivers:  &res.Drivers,
 					HasChild: res.Datapoints != nil,
 					Rights:   res.ReadWrite,
 				})

go.mod

@@ -7,7 +7,7 @@ require (
 	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.16
+	github.com/tecamino/tecamino-json_data v0.0.17
 	github.com/tecamino/tecamino-logger v0.2.0
 )
 

go.sum

@@ -71,8 +71,8 @@ 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.16 h1:aZFxnhm4g6WMDPoqy4HosUk7vl0DB0iIcVs8bbT4MzU=
+github.com/tecamino/tecamino-json_data v0.0.17 h1:M12UzKbfIgu/q3ERsEhGNDV3DYOvc0TioU288kQjDCA=
-github.com/tecamino/tecamino-json_data v0.0.16/go.mod h1:LLlyD7Wwqplb2BP4PeO86EokEcTRidlW5MwgPd1T2JY=
+github.com/tecamino/tecamino-json_data v0.0.17/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=

main.go

@@ -23,7 +23,7 @@ func main() {
 
 	//initialize new server
 	dbmHandler.Log.Debug("main", "initialize new server instance")
-	s := ws.NewServer(a.AllowOrigins)
+	s := ws.NewServer(a.AllowOrigins, a.Port.Remote)
 
 	//set routes
 	dbmHandler.Log.Debug("main", "setting routes")

models/datapoint.go

@@ -385,6 +385,7 @@ func (d *Datapoint) Publish(eventType string) error {
 			Event: eventType,
 			Uuid:  d.Uuid,
 			Path:  d.Path,
+			Type:  d.Type,
 			Value: d.Value,
 		})
 

models/port.go

@@ -1,6 +1,7 @@
 package models
 
 type Port struct {
-	Http  uint
+	Http   uint
-	Https uint
+	Https  uint
+	Remote uint
 }

test/dbm_test.go

@@ -142,7 +142,7 @@ func TestUpdateDps(t *testing.T) {
 
 func TestServer(t *testing.T) {
 	fmt.Println("start")
-	server := ws.NewServer([]string{".*"})
+	server := ws.NewServer([]string{".*"}, 9500)
 
 	t.Fatal(server.ServeHttp("http://localhost", 8100))
 }

utils/utils.go

@@ -1,5 +1,10 @@
 package utils
 
+import (
+	"fmt"
+	"net"
+)
+
 func ListofA2ZZ() (list []string) {
 	for i := 'A'; i <= 'Z'; i++ {
 		list = append(list, string(i))
@@ -9,12 +14,21 @@ func ListofA2ZZ() (list []string) {
 			list = append(list, string(i)+string(j))
 		}
 	}
-	// for i := 'A'; i <= 'Z'; i++ {
-	// 	for j := 'A'; j <= 'Z'; j++ {
-	// 		for k := 'A'; k <= 'Z'; k++ {
-	// 			list = append(list, string(i)+string(j)+string(k))
-	// 		}
-	// 	}
-	// }
 	return
 }
+
+func GetLocalIP() (string, error) {
+	addrs, err := net.InterfaceAddrs()
+	if err != nil {
+		return "", err
+	}
+
+	for _, addr := range addrs {
+		if ipNet, ok := addr.(*net.IPNet); ok && !ipNet.IP.IsLoopback() {
+			if ipNet.IP.To4() != nil {
+				return ipNet.IP.String(), nil
+			}
+		}
+	}
+	return "", fmt.Errorf("no local IP address found")
+}

websocket/models/client.go

@@ -27,13 +27,14 @@ const (
 type Client struct {
 	Id         string
 	Connected  bool            `json:"connected"`
-	Conn       *websocket.Conn `json:"-"`
+	conn       *websocket.Conn `json:"-"`
 	OnOpen     func()
 	OnMessage  func(data []byte)
 	OnClose    func(code int, reason string)
 	OnError    func(err error)
 	OnPing     func()
 	OnPong     func()
+	sendPong   chan string
 	send       chan []byte
 	unregister chan []byte
 }
@@ -66,7 +67,8 @@ func ConnectNewClient(id string, c *gin.Context) (*Client, error) {
 	client := &Client{
 		Id:         id,
 		Connected:  true,
-		Conn:       conn,
+		conn:       conn,
+		sendPong:   make(chan string),
 		send:       make(chan []byte),
 		unregister: make(chan []byte),
 	}
@@ -77,7 +79,8 @@ func ConnectNewClient(id string, c *gin.Context) (*Client, error) {
 		}
 		conn.SetWriteDeadline(time.Now().Add(writeWait))
 		conn.SetReadDeadline(time.Now().Add(writeWait))
-		return conn.WriteMessage(websocket.PongMessage, []byte(appData))
+		client.sendPong <- appData
+		return nil
 	})
 
 	conn.SetPongHandler(func(string) error {
@@ -99,9 +102,9 @@ func (c *Client) Read() {
 		c.OnOpen()
 	}
 
-	c.Conn.SetReadDeadline(time.Now().Add(writeWait))
+	c.conn.SetReadDeadline(time.Now().Add(writeWait))
 	for c.Connected {
-		msgType, msg, err := c.Conn.ReadMessage()
+		msgType, msg, err := c.conn.ReadMessage()
 		if err != nil {
 			c.handleError(fmt.Errorf("read error (id:%s): %w", c.Id, err))
 			return
@@ -128,30 +131,30 @@ func (c *Client) Write() {
 	ticker := time.NewTicker(pingPeriod)
 	defer func() {
 		ticker.Stop()
-		c.Conn.Close()
+		c.conn.Close()
 	}()
 	for {
 
 		select {
 		case message, ok := <-c.send:
-			c.Conn.SetWriteDeadline(time.Now().Add(writeWait))
+			c.conn.SetWriteDeadline(time.Now().Add(writeWait))
 			if !ok {
 				// The hub closed the channel.
-				if err := c.Conn.WriteMessage(websocket.CloseMessage, []byte{}); err != nil {
+				if err := c.conn.WriteMessage(websocket.CloseMessage, []byte{}); err != nil {
 					c.handleError(err)
 					return
 				}
 				c.handleError(fmt.Errorf("server %s closed channel", c.Id))
 				return
 			} else {
-				if err := c.Conn.WriteMessage(websocket.TextMessage, message); err != nil {
+				if err := c.conn.WriteMessage(websocket.TextMessage, message); err != nil {
 					c.handleError(err)
 					return
 				}
 			}
 		case <-ticker.C:
-			c.Conn.SetWriteDeadline(time.Now().Add(writeWait))
+			c.conn.SetWriteDeadline(time.Now().Add(writeWait))
-			if err := c.Conn.WriteMessage(websocket.PingMessage, nil); err != nil {
+			if err := c.conn.WriteMessage(websocket.PingMessage, nil); err != nil {
 				c.handleError(err)
 				return
 			}
@@ -159,9 +162,15 @@ func (c *Client) Write() {
 			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.conn.WriteMessage(websocket.CloseMessage, message)
 			c.Connected = false
+			close(c.sendPong)
 			close(c.send)
 			close(c.unregister)
 			return
@@ -175,7 +184,7 @@ func (c *Client) handleJsonPing(msg []byte) (isPing bool) {
 	err := json.Unmarshal(msg, &wsMsg)
 
 	if err == nil && wsMsg.IsPing() {
-		c.Conn.SetReadDeadline(time.Now().Add(writeWait))
+		c.conn.SetReadDeadline(time.Now().Add(writeWait))
 		// Respond with pong JSON
 		select {
 		case c.send <- GetPongByteSlice():

websocket/server.go

@@ -2,12 +2,14 @@ package websocket
 
 import (
 	"fmt"
+	"log"
 	"sync"
 	"time"
 
 	"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"
 )
 
@@ -19,8 +21,17 @@ type Server struct {
 }
 
 // initalizes new dbm server
-func NewServer(allowOrigins []string) *Server {
+func NewServer(allowOrigins []string, port uint) *Server {
 	r := gin.Default()
+
+	allowOrigins = append(allowOrigins, fmt.Sprintf("http://localhost:%d", port))
+
+	localIP, err := utils.GetLocalIP()
+	if err != nil {
+		log.Printf("get local ip : %s", err.Error())
+	} else {
+		allowOrigins = append(allowOrigins, fmt.Sprintf("http://%s:%d", localIP, port))
+	}
 	r.Use(cors.New(cors.Config{
 		AllowOrigins:     allowOrigins,
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},