xevion/go-ha
1
0
Fork 0
mirror of https://github.com/Xevion/go-ha.git synced 2025-12-06 07:15:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix always cancelled connection context, improper ctx

Browse Source
This commit is contained in:
Xevion
2025-08-01 13:21:02 -05:00
parent 2bcb4c2594
commit b3001e7f6e
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
internal/websocket/websocket.go
View File

@@ -16,7 +16,7 @@ import (
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
i "github.com/Xevion/gome-assistant/internal" "github.com/Xevion/gome-assistant/internal"
) )
var ErrInvalidToken = errors.New("invalid authentication token") var ErrInvalidToken = errors.New("invalid authentication token")
@@ -47,7 +47,9 @@ func ReadMessage(conn *websocket.Conn) ([]byte, error) {
} }
func ConnectionFromUri(baseURL *url.URL, authToken string) (*websocket.Conn, context.Context, context.CancelFunc, error) { func ConnectionFromUri(baseURL *url.URL, authToken string) (*websocket.Conn, context.Context, context.CancelFunc, error) {
ctx, ctxCancel := context.WithTimeout(context.Background(), time.Second*3) // Create a short timeout context for the connection only
connCtx, connCtxCancel := context.WithTimeout(context.Background(), time.Second*3)
defer connCtxCancel() // Always cancel the connection context when we're done
// Shallow copy the URL to avoid modifying the original // Shallow copy the URL to avoid modifying the original
urlWebsockets := *baseURL urlWebsockets := *baseURL
@@ -61,9 +63,8 @@ func ConnectionFromUri(baseURL *url.URL, authToken string) (*websocket.Conn, con
// Init websocket connection // Init websocket connection
dialer := websocket.DefaultDialer dialer := websocket.DefaultDialer
conn, _, err := dialer.DialContext(ctx, urlWebsockets.String(), nil) conn, _, err := dialer.DialContext(connCtx, urlWebsockets.String(), nil)
if err != nil { if err != nil {
ctxCancel()
slog.Error("Failed to connect to websocket. Check URI\n", "url", urlWebsockets) slog.Error("Failed to connect to websocket. Check URI\n", "url", urlWebsockets)
return nil, nil, nil, err return nil, nil, nil, err
} }
@@ -71,28 +72,28 @@ func ConnectionFromUri(baseURL *url.URL, authToken string) (*websocket.Conn, con
// Read auth_required message // Read auth_required message
_, err = ReadMessage(conn) _, err = ReadMessage(conn)
if err != nil { if err != nil {
ctxCancel()
slog.Error("Unknown error creating websocket client\n") slog.Error("Unknown error creating websocket client\n")
return nil, nil, nil, err return nil, nil, nil, err
} }
// Send auth message // Send auth message
err = SendAuthMessage(conn, ctx, authToken) err = SendAuthMessage(conn, connCtx, authToken)
if err != nil { if err != nil {
ctxCancel()
slog.Error("Unknown error creating websocket client\n") slog.Error("Unknown error creating websocket client\n")
return nil, nil, nil, err return nil, nil, nil, err
} }
// Verify auth message was successful // Verify auth message was successful
err = VerifyAuthResponse(conn, ctx) err = VerifyAuthResponse(conn, connCtx)
if err != nil { if err != nil {
ctxCancel()
slog.Error("Auth token is invalid. Please double check it or create a new token in your Home Assistant profile\n") slog.Error("Auth token is invalid. Please double check it or create a new token in your Home Assistant profile\n")
return nil, nil, nil, err return nil, nil, nil, err
} }
return conn, ctx, ctxCancel, nil // Create a new background context for the application lifecycle (no timeout)
appCtx, appCtxCancel := context.WithCancel(context.Background())
return conn, appCtx, appCtxCancel, nil
} }
func SendAuthMessage(conn *websocket.Conn, ctx context.Context, token string) error { func SendAuthMessage(conn *websocket.Conn, ctx context.Context, token string) error {
@@ -139,7 +140,7 @@ func SubscribeToStateChangedEvents(id int64, conn *WebsocketWriter, ctx context.
func SubscribeToEventType(eventType string, conn *WebsocketWriter, ctx context.Context, id ...int64) { func SubscribeToEventType(eventType string, conn *WebsocketWriter, ctx context.Context, id ...int64) {
var finalId int64 var finalId int64
if len(id) == 0 { if len(id) == 0 {
finalId = i.GetId() finalId = internal.GetId()
} else { } else {
finalId = id[0] finalId = id[0]
} }