louis/oktopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(controller): connect to websockets via tls

Browse Source
This commit is contained in:
leandrofars 2024-02-17 11:15:32 -03:00
parent 7d1df69a69
commit 4c0da5ab71
3 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/services/controller/.env
View File

@ -36,4 +36,5 @@ WS_TLS=""
WS_AUTH=""
WS_ROUTE=""
WS_DISABLE=""
WS_SKIP_VERIFY=""
# ---------------------------------------------------------------------------- #

2
backend/services/controller/cmd/oktopus/main.go
View File

@ -77,6 +77,7 @@ func main() {
flWsPort := flag.String("ws_port", lookupEnvOrString("WS_PORT", "8080"), "Websocket server port")
flWsRoute := flag.String("ws_route", lookupEnvOrString("WS_ROUTE", "/ws/controller"), "Websocket server route")
flWsTls := flag.Bool("ws_tls", lookupEnvOrBool("WS_TLS", false), "Websocket server tls")
flWsSkipVerify := flag.Bool("ws_skip_verify", lookupEnvOrBool("WS_SKIP_VERIFY", false), "Websocket skip tls certificate verify")
flDisableWs := flag.Bool("ws_disable", lookupEnvOrBool("WS_DISABLE", false), "Disable WS MTP")
flDisableStomp := flag.Bool("stomp_disable", lookupEnvOrBool("STOMP_DISABLE", false), "Disable STOMP MTP")
flDisableMqtt := flag.Bool("mqtt_disable", lookupEnvOrBool("MQTT_DISABLE", false), "Disable MQTT MTP")
@ -175,6 +176,7 @@ func main() {
Route: *flWsRoute,
Auth: *flWsAuth,
TLS: *flWsTls,
InsecureSkipVerify: *flWsSkipVerify,
DB: database,
Ctx: ctx,
}

32
backend/services/controller/internal/ws/ws.go
View File

@ -2,6 +2,7 @@ package ws
import (
"context"
"crypto/tls"
"encoding/json"
"log"
"reflect"
@ -23,6 +24,7 @@ type Ws struct {
Route string
Auth bool
TLS bool
InsecureSkipVerify bool
Ctx context.Context
NewDeviceQueue map[string]string
NewDevQMutex *sync.Mutex
@ -47,9 +49,14 @@ type deviceStatus struct {
var wsConn *websocket.Conn
func (w *Ws) Connect() {
log.Println("Connecting to WS endpoint...")
// communication with devices
wsUrl := "ws://" + w.Addr + ":" + w.Port + w.Route
prefix := "ws://"
if w.TLS {
prefix = "wss://"
}
wsUrl := prefix + w.Addr + ":" + w.Port + w.Route
if w.Auth {
log.Println("WS token:", w.Token)
@ -57,10 +64,16 @@ func (w *Ws) Connect() {
wsUrl = wsUrl + "?token=" + w.Token
}
dialer := websocket.Dialer{
TLSClientConfig: &tls.Config{
InsecureSkipVerify: w.InsecureSkipVerify,
},
}
// Keeps trying to connect to the WS endpoint until it succeeds or receives a stop signal
go func() {
go func(dialer websocket.Dialer) {
for {
c, _, err := websocket.DefaultDialer.Dial(wsUrl, nil)
c, _, err := dialer.Dial(wsUrl, nil)
if err != nil {
log.Printf("Error to connect to %s, err: %s", wsUrl, err)
time.Sleep(WS_CONNECTION_RETRY)
@ -72,7 +85,7 @@ func (w *Ws) Connect() {
go w.Subscribe()
break
}
}()
}(dialer)
}
func (w *Ws) Disconnect() {
@ -100,13 +113,18 @@ func (w *Ws) Subscribe() {
w.NewDeviceQueue = make(map[string]string)
for {
//TODO: deal with message in new go routine
msgType, wsMsg, err := wsConn.ReadMessage()
if err != nil {
log.Println("read:", err)
if websocket.IsCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) {
log.Printf("websocket error: %v", err)
w.Connect()
return
}
log.Println("websocket unexpected error:", err)
return
}
//TODO: deal with message in new go routine
if msgType == websocket.TextMessage {
var deviceStatus deviceStatus
err = json.Unmarshal(wsMsg, &deviceStatus)