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

implement new json_data model

Browse Source
This commit is contained in:
Adrian Zürcher
2025-04-29 08:31:06 +02:00
parent 0a137c9d86
commit 49d8d03d8a
25 changed files with 609 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
dbm/webSocket.go
View File

@@ -1,13 +1,14 @@
package dbm
import (
"context"
"errors"
"fmt"
"github.com/coder/websocket"
"github.com/coder/websocket/wsjson"
"github.com/gin-gonic/gin"
"github.com/zuadi/tecamino-dbm/models"
"github.com/tecamino/tecamino-dbm/auth"
json_dataModels "github.com/tecamino/tecamino-json_data/models"
)
const (
@@ -17,62 +18,45 @@ const (
)
func (d *DBMHandler) WebSocket(c *gin.Context) {
// id, err := auth.GetIDFromAuth(c)
// if err != nil {
// d.Log.Error("dbmHandler.webSocket.Websocket", "error GetIDFromAuth: "+err.Error())
// return
// }
id := "test"
id, err := auth.GetIDFromQuery(c)
if err != nil {
d.Log.Error("dbmHandler.webSocket.Websocket", "error GetIDFromQuery: "+err.Error())
return
}
d.Log.Debug("dbmHandler.webSocket.Websocket", "authorization id token: "+id)
ctx, cancel := context.WithCancel(c.Request.Context())
defer cancel()
err := d.Clients.ConnectRecievingWsConnection(id, c)
defer d.Clients.RemoveClient(id)
err = d.Conns.ConnectRecievingWsConnection(id, c)
defer d.Conns.RemoveClient(id)
if err != nil {
d.Log.Error("dbmHandler.webSocket.Websocket", "error connecting recieving websocket conection: "+err.Error())
return
}
defer d.Clients.DisconnectWsConnection(id, websocket.StatusInternalError, "Internal error")
defer d.Conns.DisconnectWsConnection(id, websocket.StatusInternalError, "Internal error")
//Read loop
for {
request, err := d.readJsonData(ctx, id)
request, err := d.readJsonData(id)
if err != nil {
break
}
// Subscribe
if request.Subscribe != nil {
go func() {
for _, sub := range *request.Subscribe {
d.Subscribe(ctx, &sub, id)
}
}()
}
go d.Subscribe(request.Subscribe, id)
// Unsubscribe
if request.Unsubscribe != nil {
for _, unsub := range *request.Unsubscribe {
err = d.Unsubscribe(ctx, &unsub, id)
if err != nil {
d.Log.Error("dbmHandler.WebSocket unsubscribe", err)
break
}
}
}
go d.Unsubscribe(request.Unsubscribe, id)
if err != nil {
break
}
}
}
func (d *DBMHandler) readJsonData(ctx context.Context, id string) (*models.JsonData, error) {
var request models.JsonData
err := wsjson.Read(ctx, d.Clients[id].Conn, &request)
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")
}
err = wsjson.Read(client.Ctx, client.Conn, &request)
if err != nil {
code := websocket.CloseStatus(err)
@@ -81,11 +65,11 @@ func (d *DBMHandler) readJsonData(ctx context.Context, id string) (*models.JsonD
websocket.StatusGoingAway,
websocket.StatusNoStatusRcvd:
d.Log.Info("webSocket.readJsonData", fmt.Sprintf("WebSocket closed: %v (code: %v)\n", err, code))
return nil, err
return
default:
d.Log.Error("webSocket.readJsonData", fmt.Sprintf("WebSocket read error: %v (code: %v)\n", err, code))
return nil, err
return
}
}
return &request, nil
return
}