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

12
device/computer.go
View File

@@ -46,9 +46,7 @@ func (c *computer) Execute(execution google.Execution, updateState *google.Devic
switch execution.Name {
case google.CommandActivateScene:
if !execution.ActivateScene.Deactivate {
http.Get(c.url)
}
c.SetState(!execution.ActivateScene.Deactivate)
default:
errCode = "actionNotAvailable"
log.Printf("Command (%s) not supported\n", execution.Name)
@@ -61,6 +59,10 @@ func (c *computer) GetID() string {
return c.macAddress
}
func (c *computer) TurnOff() {
// Scene does not implement this
func (c *computer) SetState(state bool) {
if state {
http.Get(c.url)
} else {
// Scene does not implement this
}
}

119
device/kettle.go
View File

@@ -1,9 +1,7 @@
package device
import (
"automation/integration/mqtt"
"automation/integration/google"
"context"
"encoding/json"
"fmt"
"log"
@@ -15,9 +13,13 @@ import (
type kettle struct {
Info DeviceInfo
m *mqtt.MQTT
client paho.Client
updated chan bool
timerLength time.Duration
timer *time.Timer
stop chan interface{}
isOn bool
online bool
}
@@ -26,49 +28,67 @@ func (k *kettle) getState() google.DeviceState {
return google.NewDeviceState(k.online).RecordOnOff(k.isOn)
}
func NewKettle(info DeviceInfo, m *mqtt.MQTT, s *google.Service) *kettle {
k := &kettle{Info: info, m: m, updated: make(chan bool, 1)}
func (k *kettle) stateHandler(client paho.Client, msg paho.Message) {
var payload struct {
State string `json:"state"`
}
json.Unmarshal(msg.Payload(), &payload)
const length = 5 * time.Minute
timer := time.NewTimer(length)
timer.Stop()
// Update the internal state
k.isOn = payload.State == "ON"
k.online = true
go func() {
for {
<- timer.C
// Notify that the state has updated
for len(k.updated) > 0 {
<- k.updated
}
k.updated <- true
// Notify google of the updated state
// @TODO Fix this
// id := k.GetID()
// s.ReportState(context.Background(), id, map[string]google.DeviceState{
// id: k.getState(),
// })
if k.isOn {
k.timer.Reset(k.timerLength)
} else {
k.timer.Stop()
}
}
func (k *kettle) timerFunc() {
for {
select {
case <- k.timer.C:
log.Println("Turning kettle automatically off")
m.Publish("zigbee2mqtt/kitchen/kettle/set", 1, false, `{"state": "OFF"}`)
if token := k.client.Publish(fmt.Sprintf("zigbee2mqtt/%s/set", k.Info.FriendlyName), 1, false, `{"state": "OFF"}`); token.Wait() && token.Error() != nil {
log.Println(token.Error())
}
case <- k.stop:
return
}
}()
}
}
k.m.AddHandler(fmt.Sprintf("zigbee2mqtt/%s", k.Info.FriendlyName), func (_ paho.Client, msg paho.Message) {
var payload struct {
State string `json:"state"`
}
json.Unmarshal(msg.Payload(), &payload)
func (k *kettle) Delete() {
// The the timer function that it needs to stop
k.stop <- struct{}{}
}
// Update the internal state
k.isOn = payload.State == "ON"
k.online = true
func NewKettle(info DeviceInfo, client paho.Client, s *google.Service) *kettle {
k := &kettle{Info: info, client: client, updated: make(chan bool, 1), timerLength: 5 * time.Minute, stop: make(chan interface{})}
k.timer = time.NewTimer(k.timerLength)
k.timer.Stop()
// Notify that the state has updated
for len(k.updated) > 0 {
<- k.updated
}
k.updated <- true
// Start function
go k.timerFunc()
// Notify google of the updated state
id := k.GetID()
s.ReportState(context.Background(), id, map[string]google.DeviceState{
id: k.getState(),
})
if k.isOn {
timer.Reset(length)
} else {
timer.Stop()
}
})
if token := k.client.Subscribe(fmt.Sprintf("zigbee2mqtt/%s", k.Info.FriendlyName), 1, k.stateHandler); token.Wait() && token.Error() != nil {
log.Println(token.Error())
}
return k
}
@@ -94,6 +114,8 @@ func (k *kettle) Sync() *google.Device {
Name: name,
}
// @TODO Fix reporting
// device.WillReportState = true
device.WillReportState = true
if len(name) > 1 {
device.RoomHint = room
@@ -105,8 +127,6 @@ func (k *kettle) Sync() *google.Device {
SwVersion: k.Info.SoftwareBuildID,
}
k.m.Publish(fmt.Sprintf("zigbee2mqtt/%s/get", k.Info.FriendlyName), 1, false, `{ "state": "" }`)
return device
}
@@ -128,17 +148,13 @@ func (k *kettle) Execute(execution google.Execution, updatedState *google.Device
switch execution.Name {
case google.CommandOnOff:
state := "OFF"
if execution.OnOff.On {
state = "ON"
}
// Clear the updated channel
for len(k.updated) > 0 {
<- k.updated
}
// Update the state
k.m.Publish(fmt.Sprintf("zigbee2mqtt/%s/set", k.Info.FriendlyName), 1, false, fmt.Sprintf(`{ "state": "%s" }`, state))
k.SetState(execution.OnOff.On)
// Start timeout timer
timer := time.NewTimer(time.Second)
@@ -167,6 +183,13 @@ func (k *kettle) GetID() string {
return k.Info.IEEEAdress
}
func (k *kettle) TurnOff() {
k.m.Publish(fmt.Sprintf("zigbee2mqtt/%s/set", k.Info.FriendlyName), 1, false, fmt.Sprintf(`{ "state": "OFF" }`))
func (k *kettle) SetState(state bool) {
msg := "OFF"
if state {
msg = "ON"
}
if token := k.client.Publish(fmt.Sprintf("zigbee2mqtt/%s/set", k.Info.FriendlyName), 1, false, fmt.Sprintf(`{ "state": "%s" }`, msg)); token.Wait() && token.Error() != nil {
log.Println(token.Error())
}
}

57
device/provider.go
View File

@@ -2,7 +2,6 @@ package device
import (
"automation/integration/google"
"automation/integration/mqtt"
"context"
"encoding/base64"
"encoding/json"
@@ -26,7 +25,7 @@ type DeviceInfo struct {
type DeviceInterface interface {
google.DeviceInterface
TurnOff()
SetState(state bool)
}
type Provider struct {
@@ -49,7 +48,31 @@ func (c *credentials) Decode(value string) error {
return err
}
func NewProvider(config Config, m *mqtt.MQTT) *Provider {
// Auto populate and update the device list
func (p *Provider) devicesHandler(client paho.Client, msg paho.Message) {
var devices []DeviceInfo
json.Unmarshal(msg.Payload(), &devices)
log.Println("zigbee2mqtt devices:")
pretty.Logln(devices)
// Remove all automatically added devices
p.devices = p.manualDevices
for _, device := range devices {
switch device.Description {
case "Kettle":
kettle := NewKettle(device, client, p.Service)
p.devices[device.IEEEAdress] = kettle
log.Printf("Added Kettle (%s) %s\n", device.IEEEAdress, device.FriendlyName)
}
}
// Send sync request
p.Service.RequestSync(context.Background(), p.userID)
}
func NewProvider(config Config, client paho.Client) *Provider {
provider := &Provider{userID: "Dreaded_X", devices: make(map[string]DeviceInterface), manualDevices: make(map[string]DeviceInterface)}
homegraphService, err := homegraph.NewService(context.Background(), option.WithCredentialsJSON(config.Credentials))
@@ -59,29 +82,9 @@ func NewProvider(config Config, m *mqtt.MQTT) *Provider {
provider.Service = google.NewService(provider, homegraphService)
// Auto populate and update the device list
m.AddHandler("zigbee2mqtt/bridge/devices", func(_ paho.Client, msg paho.Message) {
var devices []DeviceInfo
json.Unmarshal(msg.Payload(), &devices)
log.Println("zigbee2mqtt devices:")
pretty.Logln(devices)
// Remove all automatically added devices
provider.devices = provider.manualDevices
for _, device := range devices {
switch device.Description {
case "Kettle":
kettle := NewKettle(device, m, provider.Service)
provider.devices[device.IEEEAdress] = kettle
log.Printf("Added Kettle (%s) %s\n", device.IEEEAdress, device.FriendlyName)
}
}
// Send sync request
provider.Service.RequestSync(context.Background(), provider.userID)
})
if token := client.Subscribe("zigbee2mqtt/bridge/devices", 1, provider.devicesHandler); token.Wait() && token.Error() != nil {
log.Println(token.Error())
}
return provider
}
@@ -150,6 +153,6 @@ func (p *Provider) Execute(_ context.Context, _ string, commands []google.Comman
func (p *Provider) TurnAllOff() {
for _, device := range p.devices {
device.TurnOff()
device.SetState(false)
}
}