paadi/tecamino-dbm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify websocketserver to broker with callback functions

Browse Source
This commit is contained in:
Adrian Zürcher
2025-06-19 19:22:23 +02:00
parent 9605b50198
commit 659cbe4072
19 changed files with 367 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dbm/dbmHandler.go
View File

@@ -11,13 +11,13 @@ import (
"github.com/tecamino/tecamino-dbm/args"
"github.com/tecamino/tecamino-dbm/models"
serverModels "github.com/tecamino/tecamino-dbm/server/models"
ws "github.com/tecamino/tecamino-dbm/websocket"
"github.com/tecamino/tecamino-logger/logging"
)
type DBMHandler struct {
DBM *models.DBM
Conns *serverModels.Connections
Conns *ws.ClientHandler
sync.RWMutex
Log *logging.Logger
arg *args.Args
@@ -43,7 +43,7 @@ func NewDbmHandler(a *args.Args) (*DBMHandler, error) {
logger.Info("main", "start dma handler")
//initialize connection map
conns := serverModels.NewConnections()
conns := ws.NewConnectionHandler()
// Initialize dtabase manager handler
dmaHandler := DBMHandler{
@@ -74,8 +74,8 @@ func NewDbmHandler(a *args.Args) (*DBMHandler, error) {
var line int
for scanner.Scan() {
line++
dp := models.Datapoint{}
if err = json.Unmarshal(scanner.Bytes(), &dp); err != nil {
dp := &models.Datapoint{}
if err = json.Unmarshal(scanner.Bytes(), dp); err != nil {
dmaHandler.Log.Error("dmbHandler.NewDmbHandler", "error in line "+fmt.Sprint(line)+" "+scanner.Text())
dmaHandler.Log.Error("dmbHandler.NewDmbHandler", err.Error())

1
dbm/json_data.go
View File

@@ -51,7 +51,6 @@ func (d *DBMHandler) Json_Data(c *gin.Context) {
return
}
}
c.JSON(200, resp)
}

20
dbm/subscribe.go
View File

@@ -36,7 +36,14 @@ func (d *DBMHandler) Subscribe(req *json_dataModels.Request, id string) {
continue
}
}
dp.AddSubscribtion(id, sub)
client := d.DBM.Conns.GetClient(id)
if client == nil {
d.Log.Warning("subscribe", "id "+id+" not found")
continue
}
dp.AddSubscribtion(client, sub)
resp.AddSubscription(json_dataModels.Subscription{
Uuid: dp.Uuid,
Path: dp.Path,
@@ -68,10 +75,17 @@ func (d *DBMHandler) Unsubscribe(req *json_dataModels.Request, id string) {
for _, sub := range req.Unsubscribe {
for _, dp := range d.DBM.QueryDatapoints(sub.Depth, sub.Uuid, sub.Path) {
if _, ok := dp.Subscriptions[id]; !ok {
client := d.DBM.Conns.GetClient(id)
if client == nil {
d.Log.Warning("subscribe", "id "+id+" not found")
continue
}
dp.RemoveSubscribtion(id)
if _, ok := dp.Subscriptions[client]; !ok {
continue
}
dp.RemoveSubscribtion(client)
resp.AddUnsubscription(json_dataModels.Subscription{
Uuid: dp.Uuid,
Path: dp.Path,

67
dbm/webSocket.go
View File

@@ -2,11 +2,7 @@ package dbm
import (
"encoding/json"
"errors"
"fmt"
"io"
"github.com/coder/websocket"
"github.com/gin-gonic/gin"
"github.com/tecamino/tecamino-dbm/auth"
json_dataModels "github.com/tecamino/tecamino-json_data/models"
@@ -26,76 +22,33 @@ func (d *DBMHandler) WebSocket(c *gin.Context) {
}
d.Log.Debug("dbmHandler.webSocket.Websocket", "authorization id token: "+id)
err = d.Conns.ConnectRecievingWsConnection(id, c)
defer d.Conns.RemoveClient(id)
client, err := d.Conns.ConnectNewClient(id, c)
if err != nil {
d.Log.Error("dbmHandler.webSocket.Websocket", "error connecting recieving websocket conection: "+err.Error())
d.Log.Error("dbmHandler.webSocket.Websocket", err)
return
}
defer d.Conns.DisconnectWsConnection(id, websocket.StatusInternalError, "Internal error")
//Read loop
for {
request, err := d.readJsonData(id)
client.OnMessage = func(data []byte) {
request, err := d.readJsonData(data)
if err != nil {
d.Log.Error("websocket.WebSocket", err.Error())
break
d.Log.Error("dbmHandler.webSocket.Websocket", "read json: "+err.Error())
}
// Sets
d.Get(request, id)
// Sets
d.Set(request, id)
// Subscribe
d.Subscribe(request, id)
// Unsubscribe
d.Unsubscribe(request, id)
}
request.Get = make([]json_dataModels.Get, 0)
request.Set = make([]json_dataModels.Set, 0)
request.Subscribe = make([]json_dataModels.Subscription, 0)
request.Unsubscribe = make([]json_dataModels.Subscription, 0)
request = nil
client.OnError = func(err error) {
d.Log.Error("dbmHandler.webSocket.Websocket", "error on websocket connection: "+err.Error())
}
}
func (d *DBMHandler) readJsonData(id string) (request *json_dataModels.Request, err error) {
client, ok := d.Conns.Clients[id]
if !ok {
return request, errors.New("client id not found")
}
_, reader, err := client.Conn.Reader(client.Ctx)
if err != nil {
d.Log.Info("webSocket.readJsonData", fmt.Sprintf("WebSocket reader: %v\n", err))
return request, nil
}
b, err := io.ReadAll(reader)
if err != nil {
code := websocket.CloseStatus(err)
switch code {
case websocket.StatusNormalClosure,
websocket.StatusGoingAway,
websocket.StatusNoStatusRcvd:
d.Log.Info("webSocket.readJsonData", fmt.Sprintf("WebSocket closed: %v (code: %v)\n", err, code))
return
default:
d.Log.Error("webSocket.readJsonData", fmt.Sprintf("WebSocket read error: %v (code: %v)\n", err, code))
return
}
}
if err := json.Unmarshal(b, &request); err != nil {
return request, err
}
func (d *DBMHandler) readJsonData(data []byte) (request *json_dataModels.Request, err error) {
err = json.Unmarshal(data, &request)
return
}