Dreaded_X/automation
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Started work on significant refactor of the codebase

Browse Source
This commit is contained in:
Dreaded_X
2022-11-18 19:51:58 +01:00
parent c49ee841fd
commit 2df59cdb17
8 changed files with 220 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
integration/mqtt/mqtt.go
View File

@@ -2,59 +2,36 @@ package mqtt
import (
"fmt"
"os"
"github.com/eclipse/paho.mqtt.golang"
paho "github.com/eclipse/paho.mqtt.golang"
)
type MQTT struct {
client mqtt.Client
}
// This is the default message handler, it just prints out the topic and message
var defaultHandler mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message) {
var defaultHandler paho.MessageHandler = func(client paho.Client, msg paho.Message) {
fmt.Printf("TOPIC: %s\n", msg.Topic())
fmt.Printf("MSG: %s\n", msg.Payload())
}
func Connect(config Config) MQTT {
opts := mqtt.NewClientOptions().AddBroker(fmt.Sprintf("%s:%s", config.Host, config.Port))
func New(config Config) paho.Client {
opts := paho.NewClientOptions().AddBroker(fmt.Sprintf("%s:%s", config.Host, config.Port))
opts.SetClientID(config.ClientID)
opts.SetDefaultPublishHandler(defaultHandler)
opts.SetUsername(config.Username)
opts.SetPassword(config.Password)
opts.SetOrderMatters(false)
client := mqtt.NewClient(opts)
client := paho.NewClient(opts)
if token := client.Connect(); token.Wait() && token.Error() != nil {
panic(token.Error())
}
m := MQTT{client: client}
return m
return client
}
func (m *MQTT) Disconnect() {
if token := m.client.Unsubscribe("automation/presence/+"); token.Wait() && token.Error() != nil {
func Delete(m paho.Client) {
if token := m.Unsubscribe("automation/presence/+"); token.Wait() && token.Error() != nil {
fmt.Println(token.Error())
os.Exit(1)
}
m.client.Disconnect(250)
}
func (m *MQTT) AddHandler(topic string, handler func(client mqtt.Client, msg mqtt.Message)) {
if token := m.client.Subscribe(topic, 0, handler); token.Wait() && token.Error() != nil {
fmt.Println(token.Error())
os.Exit(1)
}
}
func (m *MQTT) Publish(topic string, qos byte, retained bool, payload interface{}) {
if token := m.client.Publish(topic, qos, retained, payload); token.Wait() && token.Error() != nil {
fmt.Println(token.Error())
// Do not exit here as it might break during production, just log the error
// os.Exit(1)
}
m.Disconnect(250)
}

10
integration/ntfy/ntfy.go
View File

@@ -6,11 +6,11 @@ import (
"strings"
)
type ntfy struct {
type Notify struct {
presence string
}
func (ntfy *ntfy) Presence(home bool) {
func (n *Notify) Presence(home bool) {
// @TODO Maybe add list the devices that are home currently?
var description string
var actions string
@@ -22,7 +22,7 @@ func (ntfy *ntfy) Presence(home bool) {
actions = "broadcast, Set as home, extras.cmd=presence, extras.state=1, clear=true"
}
req, err := http.NewRequest("POST", fmt.Sprintf("https://ntfy.sh/%s", ntfy.presence), strings.NewReader(description))
req, err := http.NewRequest("POST", fmt.Sprintf("https://ntfy.sh/%s", n.presence), strings.NewReader(description))
if err != nil {
panic(err)
}
@@ -35,8 +35,8 @@ func (ntfy *ntfy) Presence(home bool) {
http.DefaultClient.Do(req)
}
func Connect(config Config) ntfy {
ntfy := ntfy{presence: config.Presence}
func New(config Config) Notify {
ntfy := Notify{presence: config.Presence}
// @TODO Make sure the topic is valid?