diff --git a/.gitignore b/.gitignore index 2a775a7..97c9753 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ testing/ -.vscode/launch.json \ No newline at end of file +.vscode/launch.json diff --git a/app.go b/app.go index e7db2fe..907b63a 100644 --- a/app.go +++ b/app.go @@ -2,8 +2,9 @@ package gomeassistant import ( "context" + "errors" "fmt" - "log" + "log/slog" "time" "github.com/golang-module/carbon" @@ -18,6 +19,8 @@ import ( // Returned by NewApp() if authentication fails var ErrInvalidToken = ws.ErrInvalidToken +var ErrInvalidArgs = errors.New("invalid arguments provided") + type App struct { ctx context.Context ctxCancel context.CancelFunc @@ -82,7 +85,8 @@ you can use to register schedules and listeners. */ func NewApp(request NewAppRequest) (*App, error) { if request.IpAddress == "" || request.HAAuthToken == "" || request.HomeZoneEntityId == "" { - log.Fatalln("IpAddress, HAAuthToken, and HomeZoneEntityId are all required arguments in NewAppRequest.") + slog.Error("IpAddress, HAAuthToken, and HomeZoneEntityId are all required arguments in NewAppRequest") + return nil, ErrInvalidArgs } port := request.Port if port == "" { @@ -149,7 +153,8 @@ func (a *App) RegisterSchedules(schedules ...DailySchedule) { func (a *App) RegisterIntervals(intervals ...Interval) { for _, i := range intervals { if i.frequency == 0 { - log.Fatalf("A schedule must use either set frequency via Every().\n") + slog.Error("A schedule must use either set frequency via Every()") + panic(ErrInvalidArgs) } i.nextRunTime = internal.ParseTime(string(i.startTime)).Carbon2Time() @@ -165,7 +170,8 @@ func (a *App) RegisterEntityListeners(etls ...EntityListener) { for _, etl := range etls { etl := etl if etl.delay != 0 && etl.toState == "" { - log.Fatalln("EntityListener error: you have to use ToState() when using Duration()") + slog.Error("EntityListener error: you have to use ToState() when using Duration()") + panic(ErrInvalidArgs) } for _, entity := range etl.entityIds { @@ -211,7 +217,9 @@ func getSunriseSunset(s *StateImpl, sunrise bool, dateToUse carbon.Carbon, offse if len(offset) == 1 { t, err = time.ParseDuration(string(offset[0])) if err != nil { - log.Fatalf(fmt.Sprintf("Could not parse offset passed to %s: \"%s\"\n", printString, offset[0])) + parsingErr := fmt.Errorf("could not parse offset passed to %s: \"%s\": %w", printString, offset[0], err) + slog.Error(parsingErr.Error()) + panic(parsingErr) } } @@ -234,9 +242,9 @@ func getNextSunRiseOrSet(a *App, sunrise bool, offset ...DurationString) carbon. } func (a *App) Start() { - log.Default().Println("Starting", a.schedules.Len(), "schedules") - log.Default().Println("Starting", len(a.entityListeners), "entity listeners") - log.Default().Println("Starting", len(a.eventListeners), "event listeners") + slog.Info("Starting", "schedules", a.schedules.Len()) + slog.Info("Starting", "entity listeners", len(a.entityListeners)) + slog.Info("Starting", "event listeners", len(a.eventListeners)) go runSchedules(a) go runIntervals(a) @@ -254,7 +262,7 @@ func (a *App) Start() { if etl.runOnStartup && !etl.runOnStartupCompleted { entityState, err := a.state.Get(eid) if err != nil { - log.Default().Println("Failed to get entity state \"", eid, "\" during startup, skipping RunOnStartup") + slog.Warn("Failed to get entity state \"", eid, "\" during startup, skipping RunOnStartup") } etl.runOnStartupCompleted = true diff --git a/example/example.go b/example/example.go index fa5dc74..6d77d46 100644 --- a/example/example.go +++ b/example/example.go @@ -2,7 +2,7 @@ package example import ( "encoding/json" - "log" + "log/slog" "os" "time" @@ -16,7 +16,8 @@ func main() { HomeZoneEntityId: "zone.home", }) if err != nil { - log.Fatalln("Error connecting to HASS:", err) + slog.Error("Error connecting to HASS:", err) + os.Exit(1) } defer app.Cleanup() @@ -69,7 +70,7 @@ func onEvent(service *ga.Service, state ga.State, data ga.EventData) { // the eventTypes.go file :) ev := ga.EventZWaveJSValueNotification{} json.Unmarshal(data.RawEventJSON, &ev) - log.Default().Println(ev) + slog.Info("On event invoked", "event", ev) } func lightsOut(service *ga.Service, state ga.State) { @@ -77,7 +78,7 @@ func lightsOut(service *ga.Service, state ga.State) { service.Light.TurnOff("light.outside_lights") s, err := state.Get("binary_sensor.living_room_motion") if err != nil { - log.Default().Println("couldnt get living room motion state, doing nothing") + slog.Warn("couldnt get living room motion state, doing nothing") return } diff --git a/example/example_live_test.go b/example/example_live_test.go index e88611b..e636a22 100644 --- a/example/example_live_test.go +++ b/example/example_live_test.go @@ -6,6 +6,7 @@ import ( "testing" "time" + "github.com/golang-cz/devslog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "gopkg.in/yaml.v3" @@ -33,7 +34,20 @@ type ( } ) +func setupLogging() { + opts := &devslog.Options{ + HandlerOptions: &slog.HandlerOptions{ + Level: slog.LevelDebug, + AddSource: true, + }, + NewLineAfterLog: true, + } + slog.SetDefault(slog.New(devslog.NewHandler(os.Stdout, opts))) +} + func (s *MySuite) SetupSuite() { + setupLogging() + slog.Debug("Setting up test suite...") s.suiteCtx = make(map[string]any) configFile, err := os.ReadFile("./config.yaml") @@ -44,7 +58,7 @@ func (s *MySuite) SetupSuite() { // either env var or config file can be used to set HA auth. token s.config.Hass.HAAuthToken = os.Getenv("HA_AUTH_TOKEN") if err := yaml.Unmarshal(configFile, s.config); err != nil { - slog.Error("Error unmarshalling config file:", err) + slog.Error("Error unmarshalling config file", err) } s.app, err = ga.NewApp(ga.NewAppRequest{ @@ -53,17 +67,25 @@ func (s *MySuite) SetupSuite() { HomeZoneEntityId: s.config.Hass.HomeZoneEntityId, }) if err != nil { - slog.Error("Failed to createw new app:", err) + slog.Error("Failed to createw new app", err) s.T().FailNow() } + // Register all automations entityId := s.config.Entities.LightEntityId if entityId != "" { s.suiteCtx["entityCallbackInvoked"] = false etl := ga.NewEntityListener().EntityIds(entityId).Call(s.entityCallback).Build() s.app.RegisterEntityListeners(etl) - go s.app.Start() } + + s.suiteCtx["dailyScheduleCallbackInvoked"] = false + runTime := time.Now().Add(1 * time.Minute).Format("15:04") + dailySchedule := ga.NewDailySchedule().Call(s.dailyScheduleCallback).At(runTime).Build() + s.app.RegisterSchedules(dailySchedule) + + // start GA app + go s.app.Start() } func (s *MySuite) TearDownSuite() { @@ -91,19 +113,32 @@ func (s *MySuite) TestLightService() { } } -// Test if event has been captured after light entity state changed +// Basic test of daily schedule and callback +func (s *MySuite) TestSchedule() { + assert.EventuallyWithT(s.T(), func(c *assert.CollectT) { + assert.True(c, s.suiteCtx["dailyScheduleCallbackInvoked"].(bool)) + }, 2*time.Minute, 1*time.Second, "Daily schedule callback was not invoked") +} + +// Capture event after light entity state has changed func (s *MySuite) entityCallback(se *ga.Service, st ga.State, e ga.EntityData) { - slog.Info("Entity callback called.", "entity id:", e.TriggerEntityId, "from state:", e.FromState, "to state:", e.ToState) + slog.Info("Entity callback called.", "entity id", e.TriggerEntityId, "from state", e.FromState, "to state", e.ToState) s.suiteCtx["entityCallbackInvoked"] = true } +// Capture planned daily schedule +func (s *MySuite) dailyScheduleCallback(se *ga.Service, st ga.State) { + slog.Info("Daily schedule callback called.") + s.suiteCtx["dailyScheduleCallbackInvoked"] = true +} + func getEntityState(s *MySuite, entityId string) string { state, err := s.app.GetState().Get(entityId) if err != nil { - slog.Error("Error getting entity state:", err) + slog.Error("Error getting entity state", err) s.T().FailNow() } - slog.Info("State of entity:", "state", state.State) + slog.Info("State of entity", "state", state.State) return state.State } diff --git a/example/go.mod b/example/go.mod index 95813bf..49184a0 100644 --- a/example/go.mod +++ b/example/go.mod @@ -1,8 +1,9 @@ module example -go 1.21.0 +go 1.21 require ( + github.com/golang-cz/devslog v0.0.8 github.com/stretchr/testify v1.8.4 gopkg.in/yaml.v3 v3.0.1 saml.dev/gome-assistant v0.2.0 diff --git a/example/go.sum b/example/go.sum new file mode 100644 index 0000000..232d6d1 --- /dev/null +++ b/example/go.sum @@ -0,0 +1,100 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= +github.com/gobuffalo/envy v1.10.2 h1:EIi03p9c3yeuRCFPOKcSfajzkLb3hrRjEpHGI8I2Wo4= +github.com/gobuffalo/envy v1.10.2/go.mod h1:qGAGwdvDsaEtPhfBzb3o0SfDea8ByGn9j8bKmVft9z8= +github.com/gobuffalo/logger v1.0.0/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs= +github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q= +github.com/gobuffalo/packd v1.0.2 h1:Yg523YqnOxGIWCp69W12yYBKsoChwI7mtu6ceM9Bwfw= +github.com/gobuffalo/packd v1.0.2/go.mod h1:sUc61tDqGMXON80zpKGp92lDb86Km28jfvX7IAyxFT8= +github.com/gobuffalo/packr v1.30.1 h1:hu1fuVR3fXEZR7rXNW3h8rqSML8EVAf6KNm0NKO/wKg= +github.com/gobuffalo/packr v1.30.1/go.mod h1:ljMyFO2EcrnzsHsN99cvbq055Y9OhRrIaviy289eRuk= +github.com/gobuffalo/packr/v2 v2.5.1/go.mod h1:8f9c96ITobJlPzI44jj+4tHnEKNt0xXWSVlXRN9X1Iw= +github.com/golang-cz/devslog v0.0.8 h1:53ipA2rC5JzWBWr9qB8EfenvXppenNiF/8DwgtNT5Q4= +github.com/golang-cz/devslog v0.0.8/go.mod h1:bSe5bm0A7Nyfqtijf1OMNgVJHlWEuVSXnkuASiE1vV8= +github.com/golang-module/carbon v1.7.3 h1:p5mUZj7Tg62MblrkF7XEoxVPvhVs20N/kimqsZOQ+/U= +github.com/golang-module/carbon v1.7.3/go.mod h1:nUMnXq90Rv8a7h2+YOo2BGKS77Y0w/hMPm4/a8h19N8= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/karrick/godirwalk v1.10.12/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/nathan-osman/go-sunrise v1.1.0 h1:ZqZmtmtzs8Os/DGQYi0YMHpuUqR/iRoJK+wDO0wTCw8= +github.com/nathan-osman/go-sunrise v1.1.0/go.mod h1:RcWqhT+5ShCZDev79GuWLayetpJp78RSjSWxiDowmlM= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= +golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +saml.dev/gome-assistant v0.2.0 h1:Clo5DrziTdsYydVUTQfroeBVmToMnNHoObr+k6HhbMY= +saml.dev/gome-assistant v0.2.0/go.mod h1:jsZUtnxANCP0zB2B7iyy4j7sZohMGop8g+5EB2MER3o= diff --git a/go.mod b/go.mod index e4a89fe..4c9b4d1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module saml.dev/gome-assistant -go 1.19 +go 1.21 require ( github.com/golang-module/carbon v1.7.1 diff --git a/internal/internal.go b/internal/internal.go index f8c752d..f5efc14 100644 --- a/internal/internal.go +++ b/internal/internal.go @@ -2,7 +2,7 @@ package internal import ( "fmt" - "log" + "log/slog" "reflect" "runtime" "time" @@ -27,7 +27,9 @@ func GetId() int64 { func ParseTime(s string) carbon.Carbon { t, err := time.Parse("15:04", s) if err != nil { - log.Fatalf("Failed to parse time string \"%s\"; format must be HH:MM.\n", s) + parsingErr := fmt.Errorf("failed to parse time string \"%s\"; format must be HH:MM.: %w", s, err) + slog.Error(parsingErr.Error()) + panic(parsingErr) } return carbon.Now().SetTimeMilli(t.Hour(), t.Minute(), 0, 0) } @@ -35,7 +37,9 @@ func ParseTime(s string) carbon.Carbon { func ParseDuration(s string) time.Duration { d, err := time.ParseDuration(s) if err != nil { - log.Fatalf(fmt.Sprintf("Couldn't parse string duration: \"%s\" see https://pkg.go.dev/time#ParseDuration for valid time units\n", s)) + parsingErr := fmt.Errorf("couldn't parse string duration: \"%s\" see https://pkg.go.dev/time#ParseDuration for valid time units: %w", s, err) + slog.Error(parsingErr.Error()) + panic(parsingErr) } return d } diff --git a/internal/websocket/reader.go b/internal/websocket/reader.go index 95977cb..6ac4640 100644 --- a/internal/websocket/reader.go +++ b/internal/websocket/reader.go @@ -3,8 +3,7 @@ package websocket import ( "context" "encoding/json" - "fmt" - "log" + "log/slog" "github.com/gorilla/websocket" ) @@ -25,9 +24,8 @@ type ChanMsg struct { func ListenWebsocket(conn *websocket.Conn, ctx context.Context, c chan ChanMsg) { for { bytes, err := ReadMessage(conn, ctx) - if err != nil { - log.Default().Println("Error reading from websocket:", err) + slog.Error("Error reading from websocket:", err) close(c) break } @@ -38,7 +36,7 @@ func ListenWebsocket(conn *websocket.Conn, ctx context.Context, c chan ChanMsg) } json.Unmarshal(bytes, &base) if !base.Success { - fmt.Println("WARNING: received unsuccessful response:", string(bytes)) + slog.Warn("Received unsuccessful response", "response", string(bytes)) } chanMsg := ChanMsg{ Type: base.Type, diff --git a/internal/websocket/websocket.go b/internal/websocket/websocket.go index f8c81ec..70bf7c4 100644 --- a/internal/websocket/websocket.go +++ b/internal/websocket/websocket.go @@ -9,7 +9,7 @@ import ( "encoding/json" "errors" "fmt" - "log" + "log/slog" "sync" "time" @@ -17,9 +17,7 @@ import ( i "saml.dev/gome-assistant/internal" ) -var ( - ErrInvalidToken = errors.New("invalid authentication token") -) +var ErrInvalidToken = errors.New("invalid authentication token") type AuthMessage struct { MsgType string `json:"type"` @@ -59,7 +57,7 @@ func SetupConnection(ip, port, authToken string) (*websocket.Conn, context.Conte conn, _, err := dialer.DialContext(ctx, fmt.Sprintf("ws://%s:%s/api/websocket", ip, port), nil) if err != nil { ctxCancel() - log.Printf("ERROR: Failed to connect to websocket at ws://%s:%s/api/websocket. Check IP address and port\n", ip, port) + slog.Error("Failed to connect to websocket at ws://%s:%s/api/websocket. Check IP address and port\n", ip, port) return nil, nil, nil, err } @@ -67,7 +65,7 @@ func SetupConnection(ip, port, authToken string) (*websocket.Conn, context.Conte _, err = ReadMessage(conn, ctx) if err != nil { ctxCancel() - log.Printf("Unknown error creating websocket client\n") + slog.Error("Unknown error creating websocket client\n") return nil, nil, nil, err } @@ -75,7 +73,7 @@ func SetupConnection(ip, port, authToken string) (*websocket.Conn, context.Conte err = SendAuthMessage(conn, ctx, authToken) if err != nil { ctxCancel() - log.Printf("Unknown error creating websocket client\n") + slog.Error("Unknown error creating websocket client\n") return nil, nil, nil, err } @@ -83,7 +81,7 @@ func SetupConnection(ip, port, authToken string) (*websocket.Conn, context.Conte err = VerifyAuthResponse(conn, ctx) if err != nil { ctxCancel() - log.Printf("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 } @@ -143,7 +141,9 @@ func SubscribeToEventType(eventType string, conn *WebsocketWriter, ctx context.C } err := conn.WriteMessage(e, ctx) if err != nil { - log.Fatalf("Error writing to websocket: %s\n", err) + wrappedErr := fmt.Errorf("error writing to websocket: %w", err) + slog.Error(wrappedErr.Error()) + panic(wrappedErr) } // m, _ := ReadMessage(conn, ctx) // log.Default().Println(string(m)) diff --git a/schedule.go b/schedule.go index 2325890..77a26d5 100644 --- a/schedule.go +++ b/schedule.go @@ -2,7 +2,7 @@ package gomeassistant import ( "fmt" - "log" + "log/slog" "time" "github.com/golang-module/carbon" @@ -168,7 +168,7 @@ func runSchedules(a *App) { sched = popSchedule(a) } - log.Println("Next schedule:", sched.nextRunTime) + slog.Info("Next schedule", "start_time", sched.nextRunTime) time.Sleep(time.Until(sched.nextRunTime)) sched.maybeRunCallback(a) requeueSchedule(a, sched)