refactor(agent): ♻️ fetch config from context rather than passing dir…

…ectly
joshuar · Jan 12, 2024 · 00dbc00 · 00dbc00
1 parent fb2524c
commit 00dbc00
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -5,7 +5,8 @@
         "vscode",
         "ui",
         "README",
-        "go"
+        "go",
+        "all"
     ],
     "go.lintTool": "golangci-lint",
     "go.lintFlags": [

diff --git a/internal/agent/agent.go b/internal/agent/agent.go
@@ -103,7 +103,7 @@ func Run(options Options) {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			agent.runNotificationsWorker(ctx, cfg, options)
+			agent.runNotificationsWorker(ctx, options)
 		}()
 	}()
 

diff --git a/internal/agent/notifications.go b/internal/agent/notifications.go
@@ -9,12 +9,11 @@ import (
 	"context"
 	"sync"
 
-	"github.com/joshuar/go-hass-agent/internal/agent/config"
 	"github.com/joshuar/go-hass-agent/internal/hass/api"
 	"github.com/rs/zerolog/log"
 )
 
-func (agent *Agent) runNotificationsWorker(ctx context.Context, cfg config.Config, options Options) {
+func (agent *Agent) runNotificationsWorker(ctx context.Context, options Options) {
 	if options.Headless {
 		log.Warn().Msg("Will not send notifications as there is no supported windowing environment.")
 		return
@@ -46,7 +45,7 @@ func (agent *Agent) runNotificationsWorker(ctx context.Context, cfg config.Confi
 				log.Debug().Msg("Stopping websocket.")
 				return
 			default:
-				api.StartWebsocket(ctx, cfg, notifyCh)
+				api.StartWebsocket(ctx, notifyCh)
 			}
 		}
 	}()

diff --git a/internal/hass/api/websocket.go b/internal/hass/api/websocket.go
@@ -59,7 +59,13 @@ type websocketResponse struct {
 	Success bool   `json:"success,omitempty"`
 }
 
-func StartWebsocket(ctx context.Context, cfg config.Config, notifyCh chan [2]string) {
+func StartWebsocket(ctx context.Context, notifyCh chan [2]string) {
+	cfg := config.FetchFromContext(ctx)
+	if cfg == nil {
+		log.Warn().Msg("Cannot retrieve config. Cannot listen for notifications.")
+		return
+	}
+
 	var websocketURL string
 	if err := cfg.Get(config.PrefWebsocketURL, &websocketURL); err != nil {
 		log.Warn().Err(err).Msg("Could not retrieve websocket URL from config.")